From 1cd47839acdbab37fd85407434c9cdfda801f057 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Fri, 23 Dec 2022 13:53:36 +0000
Subject: [PATCH 001/348] CONFIG: Reset version post-release

---
 etc/bashrc | 2 +-
 etc/cshrc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index a935a16f93..02d084f060 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -55,7 +55,7 @@
 
 # [WM_PROJECT_VERSION] - A human-readable version name
 # A development version is often named 'com' - as in www.openfoam.com
-export WM_PROJECT_VERSION=v2212
+export WM_PROJECT_VERSION=com
 
 #------------------------------------------------------------------------------
 # Configuration environment variables.
diff --git a/etc/cshrc b/etc/cshrc
index 7b4f4c3e2b..7f19beec7b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -55,7 +55,7 @@
 
 # [WM_PROJECT_VERSION] - A human-readable version name
 # A development version is often named 'com' - as in www.openfoam.com
-setenv WM_PROJECT_VERSION v2212
+setenv WM_PROJECT_VERSION com
 
 #------------------------------------------------------------------------------
 # Configuration environment variables.

From d74572cae86d5227cc6401d16ce7cbbc253fafd8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Dec 2022 09:33:42 +0000
Subject: [PATCH 002/348] CONFIG: set API level to 2212

---
 doc/Build.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/Build.md b/doc/Build.md
index 6b3ad62356..490a3c6c94 100644
--- a/doc/Build.md
+++ b/doc/Build.md
@@ -1,23 +1,23 @@
 ## Getting the code
 
-Links to all code packs are available on https://dl.openfoam.com. For OpenFOAM-v2206:
+Links to all code packs are available on https://dl.openfoam.com. For OpenFOAM-v2212:
 
 - https://dl.openfoam.com/source/latest/
-- Source: https://dl.openfoam.com/source/v2206/OpenFOAM-v2206.tgz
-- ThirdParty: https://dl.openfoam.com/source/v2206/ThirdParty-v2206.tgz
+- Source: https://dl.openfoam.com/source/v2212/OpenFOAM-v2212.tgz
+- ThirdParty: https://dl.openfoam.com/source/v2212/ThirdParty-v2212.tgz
 
 ## OpenFOAM&reg; Quick Build Guide
 
 Prior to building, ensure that the [system requirements][link openfoam-require]
 are satisfied (including any special [cross-compiling][wiki-cross-compile]
 considerations), and source the correct OpenFOAM environment.
-For example, for the OpenFOAM-v2206 version:
+For example, for the OpenFOAM-v2212 version:
 ```
-source <installation path>/OpenFOAM-v2206/etc/bashrc
+source <installation path>/OpenFOAM-v2212/etc/bashrc
 ```
 e.g. if installed under the `~/openfoam` directory
 ```
-source ~/openfoam/OpenFOAM-v2206/etc/bashrc
+source ~/openfoam/OpenFOAM-v2212/etc/bashrc
 ```
 
 

From f08392010f2c58ceb6684d6fdcd2c7197b795800 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 11 Jan 2023 11:46:09 +0100
Subject: [PATCH 003/348] ENH: label version of neg0(). Add noexcept to
 sign/pos/neg etc.

---
 src/OpenFOAM/primitives/Scalar/Scalar.H       | 16 +++++------
 .../primitives/ints/label/labelSpecific.H     | 28 +++++++++++++++----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index dc5361f9bb..7e0d0784b9 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -233,42 +233,42 @@ inline constexpr Scalar component(const Scalar val, const direction) noexcept
 
 
 //- Return 1 if s is greater_equal zero, or otherwise -1
-inline Scalar sign(const Scalar s)
+inline Scalar sign(const Scalar s) noexcept
 {
     return (s >= 0)? 1: -1;
 }
 
 
 //- Return 1 if s is greater than zero, otherwise 1
-inline Scalar pos(const Scalar s)
+inline Scalar pos(const Scalar s) noexcept
 {
     return (s > 0)? 1: 0;
 }
 
 
 //- Return 1 if s is greater_equal zero, or otherwise 0
-inline Scalar pos0(const Scalar s)
+inline Scalar pos0(const Scalar s) noexcept
 {
     return (s >= 0)? 1: 0;
 }
 
 
 //- Return 1 if s is less than zero, or otherwise 0
-inline Scalar neg(const Scalar s)
+inline Scalar neg(const Scalar s) noexcept
 {
     return (s < 0)? 1: 0;
 }
 
 
 //- Return 1 if s is less_equal zero, or otherwise 0
-inline Scalar neg0(const Scalar s)
+inline Scalar neg0(const Scalar s) noexcept
 {
     return (s <= 0)? 1: 0;
 }
 
 
 //- Return the positive part of s, otherwise zero. Same as max(0, s).
-inline Scalar posPart(const Scalar s)
+inline Scalar posPart(const Scalar s) noexcept
 {
     return (s > 0)? s: 0;
 }
@@ -276,7 +276,7 @@ inline Scalar posPart(const Scalar s)
 
 //- Return the negative part of s, otherwise zero. Same as min(0, s).
 //  Does not change the sign
-inline Scalar negPart(const Scalar s)
+inline Scalar negPart(const Scalar s) noexcept
 {
     return (s < 0)? s: 0;
 }
diff --git a/src/OpenFOAM/primitives/ints/label/labelSpecific.H b/src/OpenFOAM/primitives/ints/label/labelSpecific.H
index 4f63951f6b..dc24d4c21e 100644
--- a/src/OpenFOAM/primitives/ints/label/labelSpecific.H
+++ b/src/OpenFOAM/primitives/ints/label/labelSpecific.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,27 +39,44 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-inline label sign(const label s)
+//- Return 1 if s is greater_equal zero, or otherwise -1
+inline label sign(const label s) noexcept
 {
     return (s >= 0)? 1: -1;
 }
 
-inline label pos0(const label s)
+
+//- Return 1 if s is greater_equal zero, or otherwise 0
+inline label pos0(const label s) noexcept
 {
     return (s >= 0)? 1: 0;
 }
 
-inline label neg(const label s)
+
+//- Return 1 if s is less than zero, or otherwise 0
+inline label neg(const label s) noexcept
 {
     return (s < 0)? 1: 0;
 }
 
-inline label posPart(const label s)
+
+//- Return 1 if s is less_equal zero, or otherwise 0
+inline label neg0(const label s) noexcept
+{
+    return (s <= 0)? 1: 0;
+}
+
+
+//- Return the positive part of s, otherwise zero. Same as max(0, s).
+inline label posPart(const label s) noexcept
 {
     return (s > 0)? s: 0;
 }
 
-inline label negPart(const label s)
+
+//- Return the negative part of s, otherwise zero. Same as min(0, s).
+//  Does not change the sign
+inline label negPart(const label s) noexcept
 {
     return (s < 0)? s: 0;
 }

From 33c9df77414fbcbacd10197fba2ff44cc79da773 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 11 Jan 2023 08:58:38 +0100
Subject: [PATCH 004/348] ENH: construct DynamicField, DynamicList from subset
 of elements

STYLE: inline some size(), empty() members
---
 .../containers/Bits/PackedList/PackedList.H   | 10 ++---
 .../containers/Bits/PackedList/PackedListI.H  | 14 -------
 .../HashTables/HashTable/HashTable.H          | 10 ++---
 .../HashTables/HashTable/HashTableCore.H      |  2 +-
 .../HashTables/HashTable/HashTableI.H         | 21 ----------
 .../BiIndirectList/BiIndirectList.H           |  6 +--
 .../IndirectLists/IndirectList/IndirectList.H |  2 +-
 .../IndirectListBase/IndirectListBase.H       |  6 +--
 .../IndirectLists/IndirectListsFwd.H          |  4 +-
 .../linkTypes/DLListBase/DLListBase.H         |  8 ++--
 .../linkTypes/DLListBase/DLListBaseI.H        | 12 ------
 .../linkTypes/SLListBase/SLListBase.H         |  8 ++--
 .../linkTypes/SLListBase/SLListBaseI.H        | 12 ------
 .../Lists/DynamicList/DynamicList.H           |  9 ++--
 .../Lists/DynamicList/DynamicListI.H          | 42 ++++++++++++-------
 src/OpenFOAM/containers/Lists/List/List.H     |  2 +-
 src/OpenFOAM/containers/Lists/List/SubList.H  |  2 +-
 src/OpenFOAM/containers/Lists/List/UList.H    |  9 ++--
 src/OpenFOAM/containers/Lists/List/UListI.H   | 14 -------
 .../PtrLists/PtrDynList/PtrDynListI.H         |  8 ++--
 .../containers/PtrLists/UPtrList/UPtrList.H   |  6 +--
 .../containers/PtrLists/UPtrList/UPtrListI.H  |  8 ++--
 .../fields/Fields/DynamicField/DynamicField.H | 26 +++++++-----
 .../Fields/DynamicField/DynamicFieldI.H       | 33 ++++++++++-----
 src/OpenFOAM/fields/Fields/Field/Field.H      | 12 ++++--
 25 files changed, 124 insertions(+), 162 deletions(-)

diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
index 14150bc832..872911dfe6 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
@@ -283,13 +283,13 @@ public:
         //- Check index is within valid range [0,size)
         inline void checkIndex(const label i) const;
 
-        //- Number of entries.
-        inline label size() const noexcept;
-
         //- True if the list is empty (ie, size() is zero).
-        inline bool empty() const noexcept;
+        bool empty() const noexcept { return !size_; }
 
-        //- The number of elements that can be stored with reallocating
+        //- Number of entries.
+        label size() const noexcept { return size_; }
+
+        //- Number of elements that can be stored without reallocating
         inline label capacity() const noexcept;
 
         //- True if all entries have identical values, and list is non-empty
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H b/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H
index d4db13d316..216ea59b7d 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H
@@ -373,20 +373,6 @@ inline void Foam::PackedList<Width>::checkIndex(const label i) const
 }
 
 
-template<unsigned Width>
-inline Foam::label Foam::PackedList<Width>::size() const noexcept
-{
-    return size_;
-}
-
-
-template<unsigned Width>
-inline bool Foam::PackedList<Width>::empty() const noexcept
-{
-    return !size_;
-}
-
-
 template<unsigned Width>
 inline Foam::label Foam::PackedList<Width>::capacity() const noexcept
 {
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 2e4549e471..d46dd8eae6 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -257,14 +257,14 @@ public:
 
     // Access
 
-        //- The size of the underlying table
-        inline label capacity() const noexcept;
+        //- True if the hash table is empty
+        bool empty() const noexcept { return !size_; }
 
         //- The number of elements in table
-        inline label size() const noexcept;
+        label size() const noexcept { return size_; }
 
-        //- True if the hash table is empty
-        inline bool empty() const noexcept;
+        //- The size of the underlying table
+        label capacity() const noexcept { return capacity_; }
 
         //- Find and return a hashed entry. FatalError if it does not exist.
         inline T& at(const Key& key);
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.H
index aa5377ad19..b9af32082a 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.H
@@ -90,8 +90,8 @@ struct HashTableCore
         //- Construct begin/end pair for table
         inline const_iterator_pair(const TableType& tbl);
 
-        label size() const noexcept { return size_; }
         bool empty() const noexcept { return !size_; }
+        label size() const noexcept { return size_; }
 
         inline IteratorType begin() const;
         inline IteratorType cbegin() const;
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index ab96a64b94..86fd95a488 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -41,27 +41,6 @@ Foam::HashTable<T, Key, Hash>::hashKeyIndex(const Key& key) const
 
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
 
-template<class T, class Key, class Hash>
-inline Foam::label Foam::HashTable<T, Key, Hash>::capacity() const noexcept
-{
-    return capacity_;
-}
-
-
-template<class T, class Key, class Hash>
-inline Foam::label Foam::HashTable<T, Key, Hash>::size() const noexcept
-{
-    return size_;
-}
-
-
-template<class T, class Key, class Hash>
-inline bool Foam::HashTable<T, Key, Hash>::empty() const noexcept
-{
-    return !size_;
-}
-
-
 template<class T, class Key, class Hash>
 inline T& Foam::HashTable<T, Key, Hash>::at(const Key& key)
 {
diff --git a/src/OpenFOAM/containers/IndirectLists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/IndirectLists/BiIndirectList/BiIndirectList.H
index cf0331da8d..63d990c571 100644
--- a/src/OpenFOAM/containers/IndirectLists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/IndirectLists/BiIndirectList/BiIndirectList.H
@@ -84,12 +84,12 @@ public:
 
     // Access
 
-        //- The number of elements in the list
-        label size() const noexcept { return addr_.size(); }
-
         //- True if the list is empty (ie, size() is zero).
         bool empty() const noexcept { return addr_.empty(); }
 
+        //- The number of elements in the list
+        label size() const noexcept { return addr_.size(); }
+
         //- The list of positive values (without addressing)
         const UList<T>& posList() const noexcept { return posList_; }
 
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H
index 5e802a6b57..38260ce2f6 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H
@@ -53,8 +53,8 @@ SourceFiles
 #define Foam_IndirectList_H
 
 #include "List.H"
-#include "IndirectListBase.H"
 #include "IndirectListAddressing.H"
+#include "IndirectListBase.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H
index de5a183582..16b4d2c81a 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H
@@ -122,12 +122,12 @@ public:
 
     // Access
 
-        //- The number of elements in the list
-        label size() const noexcept { return addr_.size(); }
-
         //- True if the list is empty (ie, size() is zero).
         bool empty() const noexcept { return addr_.empty(); }
 
+        //- The number of elements in the list
+        label size() const noexcept { return addr_.size(); }
+
         //- The list of values (without addressing)
         const UList<T>& values() const noexcept { return values_; }
 
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListsFwd.H b/src/OpenFOAM/containers/IndirectLists/IndirectListsFwd.H
index 5d09dcc3b6..6ef74db472 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectListsFwd.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectListsFwd.H
@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IndirectListsFwd_H
-#define IndirectListsFwd_H
+#ifndef Foam_IndirectListsFwd_H
+#define Foam_IndirectListsFwd_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 87b5925aab..d87622e9c1 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -150,11 +150,11 @@ public:
 
     // Member Functions
 
-        //- The number of elements in list
-        inline label size() const noexcept;
-
         //- True if the list is empty
-        inline bool empty() const noexcept;
+        bool empty() const noexcept { return !size_; }
+
+        //- The number of elements in list
+        label size() const noexcept { return size_; }
 
         //- Return first entry
         inline link* front();
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
index c3ec916324..76ebe1979a 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
@@ -99,18 +99,6 @@ Foam::DLListBase::crend() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::DLListBase::size() const noexcept
-{
-    return size_;
-}
-
-
-inline bool Foam::DLListBase::empty() const noexcept
-{
-    return !size_;
-}
-
-
 inline Foam::DLListBase::link*
 Foam::DLListBase::front()
 {
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index 841efa8211..b0c6abe7da 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -141,11 +141,11 @@ public:
 
     // Member Functions
 
-        //- The number of elements in list
-        inline label size() const noexcept;
-
         //- True if the list is empty
-        inline bool empty() const noexcept;
+        bool empty() const noexcept { return !size_; }
+
+        //- The number of elements in list
+        label size() const noexcept { return size_; }
 
         //- Return first entry
         inline link* front();
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
index a3fc487667..4cd8d3cf5f 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
@@ -70,18 +70,6 @@ inline IteratorType Foam::SLListBase::iterator_last() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::SLListBase::size() const noexcept
-{
-    return size_;
-}
-
-
-inline bool Foam::SLListBase::empty() const noexcept
-{
-    return !size_;
-}
-
-
 inline Foam::SLListBase::link*
 Foam::SLListBase::front()
 {
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 38b203c18e..ab0a35039e 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,7 +89,7 @@ class DynamicList
 
         //- Copy assignment from another list
         template<class ListType>
-        inline void assignDynList(const ListType& list);
+        inline void doAssignDynList(const ListType& list);
 
         //- Alter the size of the underlying storage
         //  The 'nocopy' option will not attempt to recover old content
@@ -133,6 +133,9 @@ public:
         //  Also constructs from DynamicList with different sizing parameters.
         inline explicit DynamicList(const UList<T>& lst);
 
+        //- Copy construct subset of list
+        inline DynamicList(const UList<T>& list, const labelUList& indices);
+
         //- Construct from a FixedList
         template<unsigned N>
         inline explicit DynamicList(const FixedList<T, N>& lst);
@@ -166,7 +169,7 @@ public:
         static constexpr label min_size() noexcept { return SizeMin; }
 
         //- Size of the underlying storage.
-        inline label capacity() const noexcept;
+        label capacity() const noexcept { return capacity_; }
 
         //- Number of contiguous bytes of the underlying storage.
         //  \note Only meaningful for contiguous data
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 2d2bc765b4..822bbc803a 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 template<class T, int SizeMin>
 template<class ListType>
-inline void Foam::DynamicList<T, SizeMin>::assignDynList
+inline void Foam::DynamicList<T, SizeMin>::doAssignDynList
 (
     const ListType& list
 )
@@ -210,6 +210,18 @@ inline Foam::DynamicList<T, SizeMin>::DynamicList
 {}
 
 
+template<class T, int SizeMin>
+inline Foam::DynamicList<T, SizeMin>::DynamicList
+(
+    const UList<T>& list,
+    const labelUList& indices
+)
+:
+    List<T>(list, indices),
+    capacity_(List<T>::size())
+{}
+
+
 template<class T, int SizeMin>
 template<unsigned N>
 inline Foam::DynamicList<T, SizeMin>::DynamicList
@@ -283,13 +295,6 @@ inline Foam::DynamicList<T, SizeMin>::DynamicList
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T, int SizeMin>
-inline Foam::label Foam::DynamicList<T, SizeMin>::capacity() const noexcept
-{
-    return capacity_;
-}
-
-
 template<class T, int SizeMin>
 inline std::streamsize
 Foam::DynamicList<T, SizeMin>::capacity_bytes() const noexcept
@@ -791,7 +796,7 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
     const UList<T>& lst
 )
 {
-    assignDynList(lst);
+    doAssignDynList(lst);
 }
 
 
@@ -802,7 +807,7 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
     const FixedList<T, N>& lst
 )
 {
-    assignDynList(lst);
+    doAssignDynList(lst);
 }
 
 
@@ -817,7 +822,7 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
         return;  // Self-assignment is a no-op
     }
 
-    assignDynList(lst);
+    doAssignDynList(lst);
 }
 
 
@@ -837,7 +842,7 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
         return;  // Self-assignment is a no-op
     }
 
-    assignDynList(list);
+    doAssignDynList(list);
 }
 
 
@@ -847,7 +852,7 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
     std::initializer_list<T> lst
 )
 {
-    assignDynList(lst);
+    doAssignDynList(lst);
 }
 
 
@@ -858,7 +863,14 @@ inline void Foam::DynamicList<T, SizeMin>::operator=
     const IndirectListBase<T, Addr>& lst
 )
 {
-    assignDynList(lst);
+    // NOTE: Self-assignment needs special handling
+    /// if
+    /// (
+    ///     static_cast<const UList<T>*>(this)
+    ///  == static_cast<const UList<T>*>(&list.values())
+    /// )
+
+    doAssignDynList(lst);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index acd6a3e311..4539f2e815 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/OpenFOAM/containers/Lists/List/SubList.H b/src/OpenFOAM/containers/Lists/List/SubList.H
index d393db4a89..addd12055d 100644
--- a/src/OpenFOAM/containers/Lists/List/SubList.H
+++ b/src/OpenFOAM/containers/Lists/List/SubList.H
@@ -159,7 +159,7 @@ public:
 
 #include "SubListI.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Implementations * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::SubList<Type>
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index a2a7ed77c8..eecbb82904 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -74,6 +74,7 @@ template<class T> class List;
 template<class T> class SubList;
 template<class T> class UList;
 template<class T> class IndirectList;
+template<class T> class UIndirectList;
 template<class T, class Addr> class IndirectListBase;
 
 template<class T> Istream& operator>>(Istream&, UList<T>&);
@@ -448,11 +449,11 @@ public:
 
     // STL member functions
 
-        //- The number of elements in the UList
-        inline label size() const noexcept;
+        //- True if List is empty (ie, size() is zero)
+        bool empty() const noexcept { return !size_; }
 
-        //- True if the UList is empty (ie, size() is zero)
-        inline bool empty() const noexcept;
+        //- The number of elements in the List
+        label size() const noexcept { return size_; }
 
         //- The size of the largest possible UList
         static constexpr label max_size() noexcept { return labelMax; }
diff --git a/src/OpenFOAM/containers/Lists/List/UListI.H b/src/OpenFOAM/containers/Lists/List/UListI.H
index 4c91bbe336..053109c50e 100644
--- a/src/OpenFOAM/containers/Lists/List/UListI.H
+++ b/src/OpenFOAM/containers/Lists/List/UListI.H
@@ -416,20 +416,6 @@ inline void Foam::UList<T>::setAddressableSize(const label n) noexcept
 }
 
 
-template<class T>
-inline Foam::label Foam::UList<T>::size() const noexcept
-{
-    return size_;
-}
-
-
-template<class T>
-inline bool Foam::UList<T>::empty() const noexcept
-{
-    return !size_;
-}
-
-
 template<class T>
 inline void Foam::UList<T>::swap(UList<T>& list)
 {
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index e635e2ea44..746b9c2b86 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,10 +42,10 @@ inline constexpr Foam::PtrDynList<T, SizeMin>::PtrDynList() noexcept
 template<class T, int SizeMin>
 inline Foam::PtrDynList<T, SizeMin>::PtrDynList(const label len)
 :
-    PtrList<T>(len),
-    capacity_(len)
+    PtrList<T>(),
+    capacity_(0)
 {
-    PtrList<T>::setAddressableSize(0);
+    reserve(len);
 }
 
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index 88bf25242c..b546ac0541 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -211,12 +211,12 @@ public:
 
     // Access
 
-        //- The number of elements in the list
-        inline label size() const noexcept;
-
         //- True if the list is empty (ie, size() is zero)
         inline bool empty() const noexcept;
 
+        //- The number of elements in the list
+        inline label size() const noexcept;
+
         //- Reference to the first element of the list
         inline T& front();
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index 781b26cc0d..d0c29ba2c1 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -103,16 +103,16 @@ inline Foam::UPtrList<T>::UPtrList(UList<T>& list)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::label Foam::UPtrList<T>::size() const noexcept
+inline bool Foam::UPtrList<T>::empty() const noexcept
 {
-    return ptrs_.size();
+    return ptrs_.empty();
 }
 
 
 template<class T>
-inline bool Foam::UPtrList<T>::empty() const noexcept
+inline Foam::label Foam::UPtrList<T>::size() const noexcept
 {
-    return ptrs_.empty();
+    return ptrs_.size();
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 8f10988ccf..3c62700783 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,7 +76,7 @@ class DynamicField
 
         //- Copy assignment from another list
         template<class ListType>
-        inline void assignDynList(const ListType& list);
+        inline void doAssignDynList(const ListType& list);
 
         //- Alter the size of the underlying storage
         //  The 'nocopy' option will not attempt to recover old content
@@ -178,21 +178,18 @@ public:
 
     // Member Functions
 
-    // Access
+    // Sizing
 
         //- Normal lower capacity limit - the SizeMin template parameter
         static constexpr label min_size() noexcept { return SizeMin; }
 
         //- Size of the underlying storage.
-        inline label capacity() const noexcept;
+        label capacity() const noexcept { return capacity_; }
 
         //- Number of contiguous bytes of the underlying storage.
         //  \note Only meaningful for contiguous data
         inline std::streamsize capacity_bytes() const noexcept;
 
-
-    // Sizing
-
         //- Alter the size of the underlying storage.
         //  The addressed size will be truncated if needed to fit, but will
         //  remain otherwise untouched.
@@ -305,10 +302,7 @@ public:
         inline Istream& readList(Istream& is);
 
 
-    // Member Operators
-
-        //- Return non-const access to an element, resizing list if needed
-        inline T& operator()(const label i);
+    // Assignment
 
         //- Assign addressed entries to the given value
         inline void operator=(const T& val);
@@ -322,6 +316,10 @@ public:
         //- Copy assignment
         inline void operator=(const DynamicField<T, SizeMin>& list);
 
+        //- Copy assign from IndirectList
+        template<class Addr>
+        inline void operator=(const IndirectListBase<T, Addr>& rhs);
+
         //- Move assignment
         inline void operator=(List<T>&& list);
 
@@ -337,6 +335,12 @@ public:
         inline void operator=(DynamicField<T, AnySizeMin>&& list);
 
 
+    // Member Operators
+
+        //- Return non-const access to an element, resizing list if needed
+        inline T& operator()(const label i);
+
+
     // IOstream Operators
 
         //- Use the readList() method to read contents from Istream.
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index e64fe817ee..d7b81fcd9e 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,7 @@ License
 
 template<class T, int SizeMin>
 template<class ListType>
-inline void Foam::DynamicField<T, SizeMin>::assignDynList
+inline void Foam::DynamicField<T, SizeMin>::doAssignDynList
 (
     const ListType& list
 )
@@ -323,13 +323,6 @@ Foam::DynamicField<T, SizeMin>::clone() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T, int SizeMin>
-inline Foam::label Foam::DynamicField<T, SizeMin>::capacity() const noexcept
-{
-    return capacity_;
-}
-
-
 template<class T, int SizeMin>
 inline std::streamsize
 Foam::DynamicField<T, SizeMin>::capacity_bytes() const noexcept
@@ -716,7 +709,7 @@ inline void Foam::DynamicField<T, SizeMin>::operator=
     const UList<T>& list
 )
 {
-    assignDynList(list);
+    doAssignDynList(list);
 }
 
 
@@ -731,7 +724,25 @@ inline void Foam::DynamicField<T, SizeMin>::operator=
         return;  // Self-assignment is a no-op
     }
 
-    assignDynList(list);
+    doAssignDynList(list);
+}
+
+
+template<class T, int SizeMin>
+template<class Addr>
+inline void Foam::DynamicField<T, SizeMin>::operator=
+(
+    const IndirectListBase<T, Addr>& list
+)
+{
+    // NOTE: Self-assignment needs special handling
+    /// if
+    /// (
+    ///     static_cast<const UList<T>*>(this)
+    ///  == static_cast<const UList<T>*>(&list.values())
+    /// )
+
+    doAssignDynList(list);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 7ab65e03f6..2cbdb712e1 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -440,7 +440,7 @@ public:
         const SubField<Type> slice(const labelRange& range) const;
 
 
-    // Member Operators
+    // Assignment
 
         //- Copy assignment
         void operator=(const Field<Type>&);
@@ -460,14 +460,18 @@ public:
         template<int SizeMin>
         inline void operator=(DynamicList<Type, SizeMin>&& rhs);
 
-
-        //- Value assignment
+        //- Assign entries to the given value
         inline void operator=(const Type& val);
+
+        //- Assign entries to zero
         inline void operator=(const Foam::zero);
 
         template<class Form, class Cmpt, direction nCmpt>
         void operator=(const VectorSpace<Form,Cmpt,nCmpt>&);
 
+
+    // Member Operators
+
         void operator+=(const UList<Type>&);
         void operator+=(const tmp<Field<Type>>&);
 
@@ -487,7 +491,7 @@ public:
         void operator/=(const scalar&);
 
 
-    // IOstream operators
+    // IOstream Operators
 
         friend Ostream& operator<< <Type>
         (Ostream&, const Field<Type>&);

From 248e5ff86fed94b2f419eaa55d81f814fc0bb305 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 9 Jan 2023 20:19:10 +0100
Subject: [PATCH 005/348] ENH: simpler logic for doTransform() check

- test pTraits rank first (compile-time) and then parallel()
---
 .../constraint/cyclic/cyclicPointPatchField.H        |  6 +++---
 .../constraint/processor/processorPointPatchField.H  | 12 ++++++------
 .../processorCyclic/processorCyclicPointPatchField.H | 12 ++++++------
 .../constraint/cyclic/cyclicFaPatchField.H           |  6 +++---
 .../constraint/processor/processorFaPatchField.H     |  6 +++---
 .../constraint/cyclic/cyclicFvPatchField.H           |  6 +++---
 .../constraint/cyclicACMI/cyclicACMIFvPatchField.C   |  2 +-
 .../constraint/cyclicACMI/cyclicACMIFvPatchField.H   |  7 +++----
 .../constraint/cyclicAMI/cyclicAMIFvPatchField.C     |  2 +-
 .../constraint/cyclicAMI/cyclicAMIFvPatchField.H     |  8 +++-----
 .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.C        |  2 +-
 .../constraint/processor/processorFvPatchField.H     |  8 +++-----
 .../processorCyclic/processorCyclicFvPatchField.H    |  6 +++---
 .../cyclicACMIPointPatchField.H                      | 10 +++-------
 .../cyclicAMIPointPatchField.H                       | 10 +++-------
 15 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index 6012a219d5..e3c19117c9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicPointPatchField_H
-#define cyclicPointPatchField_H
+#ifndef Foam_cyclicPointPatchField_H
+#define Foam_cyclicPointPatchField_H
 
 #include "coupledPointPatchField.H"
 #include "cyclicPointPatch.H"
@@ -142,7 +142,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return !(cyclicPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !cyclicPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 4aeee50e46..6741795e03 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorPointPatchField_H
-#define processorPointPatchField_H
+#ifndef Foam_processorPointPatchField_H
+#define Foam_processorPointPatchField_H
 
 #include "coupledPointPatchField.H"
 #include "processorPointPatch.H"
@@ -145,10 +145,10 @@ public:
             virtual bool doTransform() const
             {
                 return
-                   !(
-                        procPatch_.procPolyPatch().parallel()
-                     || pTraits<Type>::rank == 0
-                    );
+                (
+                    pTraits<Type>::rank
+                 && !procPatch_.procPolyPatch().parallel()
+                );
             }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index fc63899af6..25a8ec9f6b 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorCyclicPointPatchField_H
-#define processorCyclicPointPatchField_H
+#ifndef Foam_processorCyclicPointPatchField_H
+#define Foam_processorCyclicPointPatchField_H
 
 #include "coupledPointPatchField.H"
 #include "processorCyclicPointPatch.H"
@@ -149,10 +149,10 @@ public:
             virtual bool doTransform() const
             {
                 return
-                   !(
-                        pTraits<Type>::rank == 0
-                     || procPatch_.procPolyPatch().parallel()
-                    );
+                (
+                    pTraits<Type>::rank
+                 && !procPatch_.procPolyPatch().parallel()
+                );
             }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
index 63da81ed38..5b505bb37b 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicFaPatchField_H
-#define cyclicFaPatchField_H
+#ifndef Foam_cyclicFaPatchField_H
+#define Foam_cyclicFaPatchField_H
 
 #include "coupledFaPatchField.H"
 #include "cyclicLduInterfaceField.H"
@@ -205,7 +205,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return !(cyclicPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !cyclicPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
index 10d01e42a1..033bf6f5df 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorFaPatchField_H
-#define processorFaPatchField_H
+#ifndef Foam_processorFaPatchField_H
+#define Foam_processorFaPatchField_H
 
 #include "coupledFaPatchField.H"
 #include "processorLduInterfaceField.H"
@@ -254,7 +254,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return !(procPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !procPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index 33abab3bc7..b2b3595ae5 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -53,8 +53,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicFvPatchField_H
-#define cyclicFvPatchField_H
+#ifndef Foam_cyclicFvPatchField_H
+#define Foam_cyclicFvPatchField_H
 
 #include "coupledFvPatchField.H"
 #include "cyclicLduInterfaceField.H"
@@ -220,7 +220,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return !(cyclicPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !cyclicPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index 9eb8e6169f..b796999044 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -183,7 +183,7 @@ Foam::cyclicACMIFvPatchField<Type>::patchNeighbourField() const
 
     if (doTransform())
     {
-        tpnf.ref() = transform(forwardT(), tpnf());
+        transform(tpnf.ref(), forwardT(), tpnf());
     }
 
     return tpnf;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
index da1097b06c..a3664e5937 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
@@ -52,8 +52,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicACMIFvPatchField_H
-#define cyclicACMIFvPatchField_H
+#ifndef Foam_cyclicACMIFvPatchField_H
+#define Foam_cyclicACMIFvPatchField_H
 
 #include "coupledFvPatchField.H"
 #include "cyclicACMILduInterfaceField.H"
@@ -255,8 +255,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return
-                    !(cyclicACMIPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !cyclicACMIPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index fb0b880cfc..61a7e49820 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -168,7 +168,7 @@ Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
 
     if (doTransform())
     {
-        tpnf.ref() = transform(forwardT(), tpnf());
+        transform(tpnf.ref(), forwardT(), tpnf());
     }
 
     return tpnf;
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index 08ddce2aa7..44efff7915 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -57,9 +57,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicAMIFvPatchField_H
-#define cyclicAMIFvPatchField_H
-
+#ifndef Foam_cyclicAMIFvPatchField_H
+#define Foam_cyclicAMIFvPatchField_H
 
 #include "coupledFvPatchField.H"
 #include "cyclicAMILduInterfaceField.H"
@@ -242,8 +241,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return
-                    !(cyclicAMIPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !cyclicAMIPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
index f96eaa1468..dcd345fc87 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
@@ -120,7 +120,7 @@ Foam::jumpCyclicAMIFvPatchField<Type>::patchNeighbourField() const
 
     if (this->doTransform())
     {
-        tpnf = transform(this->forwardT(), tpnf);
+        transform(tpnf.ref(), this->forwardT(), tpnf());
     }
 
     tmp<Field<Type>> tjf = jump();
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 029683e8bb..ffa43402c6 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -47,8 +47,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorFvPatchField_H
-#define processorFvPatchField_H
+#ifndef Foam_processorFvPatchField_H
+#define Foam_processorFvPatchField_H
 
 #include "coupledFvPatchField.H"
 #include "processorLduInterfaceField.H"
@@ -251,7 +251,6 @@ public:
                 const scalarField& coeffs,
                 const Pstream::commsTypes commsType
             ) const;
-            
 
 
         //- Processor coupled interface functions
@@ -277,7 +276,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return !(procPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !procPatch_.parallel());
             }
 
             //- Return face transformation tensor
@@ -291,7 +290,6 @@ public:
             {
                 return pTraits<Type>::rank;
             }
-
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
index b823d574d6..f8068ac40a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
@@ -53,8 +53,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorCyclicFvPatchField_H
-#define processorCyclicFvPatchField_H
+#ifndef Foam_processorCyclicFvPatchField_H
+#define Foam_processorCyclicFvPatchField_H
 
 #include "processorCyclicFvPatch.H"
 #include "processorFvPatchField.H"
@@ -162,7 +162,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return !(procPatch_.parallel() || pTraits<Type>::rank == 0);
+                return (pTraits<Type>::rank && !procPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 861ff876a4..0c4017cd8d 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicACMIPointPatchField_H
-#define cyclicACMIPointPatchField_H
+#ifndef Foam_cyclicACMIPointPatchField_H
+#define Foam_cyclicACMIPointPatchField_H
 
 #include "coupledPointPatchField.H"
 #include "cyclicACMIPointPatch.H"
@@ -189,11 +189,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return
-                   !(
-                        cyclicACMIPatch_.parallel()
-                     || pTraits<Type>::rank == 0
-                    );
+                return (pTraits<Type>::rank && !cyclicACMIPatch_.parallel());
             }
 
             //- Return face transformation tensor
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index 87fbaf5a8e..d3237db8e5 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicAMIPointPatchField_H
-#define cyclicAMIPointPatchField_H
+#ifndef Foam_cyclicAMIPointPatchField_H
+#define Foam_cyclicAMIPointPatchField_H
 
 #include "coupledPointPatchField.H"
 #include "cyclicAMIPointPatch.H"
@@ -189,11 +189,7 @@ public:
             //- Does the patch field perform the transformation
             virtual bool doTransform() const
             {
-                return
-                   !(
-                        cyclicAMIPatch_.parallel()
-                     || pTraits<Type>::rank == 0
-                    );
+                return (pTraits<Type>::rank && !cyclicAMIPatch_.parallel());
             }
 
             //- Return face transformation tensor

From 06f479fbd4100d4e07649b8ca5ea4ceb2bb534c0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 11 Jan 2023 19:01:31 +0100
Subject: [PATCH 006/348] ENH: improve handling of wait/finished requests

- now simply a no-op for out-of-range values (instead of an error),
  which simplifies the calling code.

  Previously
  ==========

      if (request_ >= 0 && request_ < UPstream::nRequests())
      {
          UPstream::waitRequest(request_);
      }

  Updated
  =======

      UPstream::waitRequest(request_);

- when 'recycling' freed request indices, ensure they are actually
  within the currently addressable range

- MPI finalization now checks outstanding requests against
  MPI_REQUEST_NULL to verify that they have been waited or tested on.
  Previously simply checked against freed request indices

ENH: consistent initialisation of send/receive bookkeeping
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  19 +-
 .../lduCalculatedProcessorField.C             |  88 +++------
 .../lduCalculatedProcessorField.H             |  18 +-
 .../processorGAMGInterfaceField.C             |  40 ++--
 .../processorGAMGInterfaceField.H             |  14 +-
 src/Pstream/dummy/Make/files                  |   1 +
 src/Pstream/dummy/UPstream.C                  |  24 +--
 src/Pstream/dummy/UPstreamRequest.C           |  43 ++++
 src/Pstream/mpi/Make/files                    |   1 +
 src/Pstream/mpi/PstreamGlobals.C              |   7 +-
 src/Pstream/mpi/PstreamGlobals.H              |  41 ++--
 src/Pstream/mpi/UPstream.C                    | 174 +---------------
 src/Pstream/mpi/UPstreamRequest.C             | 185 ++++++++++++++++++
 .../calculatedProcessorFvPatchField.C         | 121 ++++--------
 .../calculatedProcessorFvPatchField.H         |  19 +-
 .../processor/processorFvPatchField.C         | 172 ++++++----------
 .../processor/processorFvPatchField.H         |  17 +-
 .../calculatedProcessorGAMGInterfaceField.C   |  40 ++--
 .../calculatedProcessorGAMGInterfaceField.H   |  16 +-
 19 files changed, 473 insertions(+), 567 deletions(-)
 create mode 100644 src/Pstream/dummy/UPstreamRequest.C
 create mode 100644 src/Pstream/mpi/UPstreamRequest.C

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index a5111d019e..ea1b63a7fe 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -447,21 +447,26 @@ public:
             //- Number of outstanding requests
             static label nRequests() noexcept;
 
-            //- Truncate outstanding requests to given length
+            //- Truncate outstanding requests to given length, which is
+            //- expected to be in the range 0 to nRequests.
+            //  A no-op for out-of-range values.
             static void resetRequests(const label n);
 
             //- Wait until all requests (from start onwards) have finished.
-            //  A no-op if parRun() == false
+            //  A no-op if parRun() == false, if there are no pending requests
+            //  or if the start is out-of-range (0 to nRequests)
             static void waitRequests(const label start = 0);
 
             //- Wait until request i has finished.
-            //  A no-op if parRun() == false
-            //  or for placeholder (negative) request indices
+            //  A no-op if parRun() == false,
+            //  there are no pending requests,
+            //  or if the index is out-of-range (0 to nRequests)
             static void waitRequest(const label i);
 
             //- Non-blocking comms: has request i finished?
-            //  A no-op and returns true if parRun() == false
-            //  or for placeholder (negative) request indices
+            //  A no-op and returns true if parRun() == false,
+            //  there are no pending requests,
+            //  or if the index is out-of-range (0 to nRequests)
             static bool finishedRequest(const label i);
 
             static int allocateTag(const char* const msg = nullptr);
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
index b72ad7e7b8..0212005b24 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,12 +37,8 @@ Foam::lduCalculatedProcessorField<Type>::lduCalculatedProcessorField
 :
     LduInterfaceField<Type>(interface),
     procInterface_(refCast<const lduPrimitiveProcessorInterface>(interface)),
-    sendBuf_(procInterface_.faceCells().size()),
-    receiveBuf_(procInterface_.faceCells().size()),
-    scalarSendBuf_(procInterface_.faceCells().size()),
-    scalarReceiveBuf_(procInterface_.faceCells().size()),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -54,12 +50,8 @@ Foam::lduCalculatedProcessorField<Type>::lduCalculatedProcessorField
 :
     LduInterfaceField<Type>(refCast<const lduInterface>(ptf)),
     procInterface_(ptf.procInterface_),
-    sendBuf_(procInterface_.faceCells().size()),
-    receiveBuf_(procInterface_.faceCells().size()),
-    scalarSendBuf_(procInterface_.faceCells().size()),
-    scalarReceiveBuf_(procInterface_.faceCells().size()),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -68,31 +60,11 @@ Foam::lduCalculatedProcessorField<Type>::lduCalculatedProcessorField
 template<class Type>
 bool Foam::lduCalculatedProcessorField<Type>::ready() const
 {
-    if
-    (
-        this->outstandingSendRequest_ >= 0
-     && this->outstandingSendRequest_ < UPstream::nRequests()
-    )
-    {
-        if (!UPstream::finishedRequest(this->outstandingSendRequest_))
-        {
-            return false;
-        }
-    }
-    this->outstandingSendRequest_ = -1;
+    if (!UPstream::finishedRequest(this->sendRequest_)) return false;
+    this->sendRequest_ = -1;
 
-    if
-    (
-        this->outstandingRecvRequest_ >= 0
-     && this->outstandingRecvRequest_ < UPstream::nRequests()
-    )
-    {
-        if (!UPstream::finishedRequest(this->outstandingRecvRequest_))
-        {
-            return false;
-        }
-    }
-    this->outstandingRecvRequest_ = -1;
+    if (!UPstream::finishedRequest(this->recvRequest_)) return false;
+    this->recvRequest_ = -1;
 
     return true;
 }
@@ -111,6 +83,13 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
+    if (!this->ready())
+    {
+        FatalErrorInFunction
+            << "Outstanding request."
+            << abort(FatalError);
+    }
+
     // Bypass patchInternalField since uses fvPatch addressing
     const labelList& fc = lduAddr.patchAddr(patchId);
 
@@ -120,21 +99,12 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
         scalarSendBuf_[i] = psiInternal[fc[i]];
     }
 
-    if (!this->ready())
-    {
-        FatalErrorInFunction
-            << "On patch "
-            << " outstanding request."
-            << abort(FatalError);
-    }
-
-
     scalarReceiveBuf_.setSize(scalarSendBuf_.size());
-    outstandingRecvRequest_ = UPstream::nRequests();
 
+    recvRequest_ = UPstream::nRequests();
     UIPstream::read
     (
-        Pstream::commsTypes::nonBlocking,
+        UPstream::commsTypes::nonBlocking,
         procInterface_.neighbProcNo(),
         scalarReceiveBuf_.data_bytes(),
         scalarReceiveBuf_.size_bytes(),
@@ -142,11 +112,10 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
         procInterface_.comm()
     );
 
-    outstandingSendRequest_ = UPstream::nRequests();
-
+    sendRequest_ = UPstream::nRequests();
     UOPstream::write
     (
-        Pstream::commsTypes::nonBlocking,
+        UPstream::commsTypes::nonBlocking,
         procInterface_.neighbProcNo(),
         scalarSendBuf_.cdata_bytes(),
         scalarSendBuf_.size_bytes(),
@@ -207,19 +176,12 @@ void Foam::lduCalculatedProcessorField<Type>::updateInterfaceMatrix
         return;
     }
 
-    if
-    (
-        outstandingRecvRequest_ >= 0
-     && outstandingRecvRequest_ < UPstream::nRequests()
-    )
-    {
-        UPstream::waitRequest(outstandingRecvRequest_);
-    }
-    // Recv finished so assume sending finished as well.
-    outstandingSendRequest_ = -1;
-    outstandingRecvRequest_ = -1;
+    // Treat send as finished when recv is done
+    UPstream::waitRequest(recvRequest_);
+    recvRequest_ = -1;
+    sendRequest_ = -1;
 
-    // Consume straight from scalarReceiveBuf_. Note use of our own
+    // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
     addToInternalField(result, !add, coeffs, scalarReceiveBuf_);
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
index 60c188626e..1bb956585a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lduCalculatedProcessorField_H
-#define lduCalculatedProcessorField_H
+#ifndef Foam_lduCalculatedProcessorField_H
+#define Foam_lduCalculatedProcessorField_H
 
 #include "lduPrimitiveProcessorInterface.H"
 #include "processorLduInterfaceField.H"
@@ -74,6 +74,12 @@ protected:
 
         // Sending and receiving
 
+            //- Current (non-blocking) send request
+            mutable label sendRequest_;
+
+            //- Current (non-blocking) recv request
+            mutable label recvRequest_;
+
             //- Send buffer
             mutable Field<Type> sendBuf_;
 
@@ -86,12 +92,6 @@ protected:
             //- Scalar receive buffer
             mutable solveScalarField scalarReceiveBuf_;
 
-            //- Outstanding request
-            mutable label outstandingSendRequest_;
-
-            //- Outstanding request
-            mutable label outstandingRecvRequest_;
-
 
     // Protected Member Functions
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index bcc476d840..9e75568ace 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,10 +61,11 @@ Foam::processorGAMGInterfaceField::processorGAMGInterfaceField
     GAMGInterfaceField(GAMGCp, fineInterface),
     procInterface_(refCast<const processorGAMGInterface>(GAMGCp)),
     doTransform_(false),
-    rank_(0)
+    rank_(0),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
-    const processorLduInterfaceField& p =
-        refCast<const processorLduInterfaceField>(fineInterface);
+    const auto& p = refCast<const processorLduInterfaceField>(fineInterface);
 
     doTransform_ = p.doTransform();
     rank_ = p.rank();
@@ -81,7 +82,9 @@ Foam::processorGAMGInterfaceField::processorGAMGInterfaceField
     GAMGInterfaceField(GAMGCp, doTransform, rank),
     procInterface_(refCast<const processorGAMGInterface>(GAMGCp)),
     doTransform_(doTransform),
-    rank_(rank)
+    rank_(rank),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -109,10 +112,11 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
     {
         // Fast path.
         scalarReceiveBuf_.setSize(scalarSendBuf_.size());
-        outstandingRecvRequest_ = UPstream::nRequests();
+
+        recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
             scalarReceiveBuf_.data_bytes(),
             scalarReceiveBuf_.size_bytes(),
@@ -120,10 +124,10 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
             comm()
         );
 
-        outstandingSendRequest_ = UPstream::nRequests();
+        sendRequest_ = UPstream::nRequests();
         UOPstream::write
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
             scalarSendBuf_.cdata_bytes(),
             scalarSendBuf_.size_bytes(),
@@ -165,20 +169,12 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
      && !Pstream::floatTransfer
     )
     {
-        // Fast path.
-        if
-        (
-            outstandingRecvRequest_ >= 0
-         && outstandingRecvRequest_ < UPstream::nRequests()
-        )
-        {
-            UPstream::waitRequest(outstandingRecvRequest_);
-        }
-        // Recv finished so assume sending finished as well.
-        outstandingSendRequest_ = -1;
-        outstandingRecvRequest_ = -1;
+        // Fast path: consume straight from receive buffer
 
-        // Consume straight from scalarReceiveBuf_
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
 
         // Transform according to the transformation tensor
         transformCoupleField(scalarReceiveBuf_, cmpt);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index c4f9457427..ee07b013d9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorGAMGInterfaceField_H
-#define processorGAMGInterfaceField_H
+#ifndef Foam_processorGAMGInterfaceField_H
+#define Foam_processorGAMGInterfaceField_H
 
 #include "GAMGInterfaceField.H"
 #include "processorGAMGInterface.H"
@@ -70,11 +70,11 @@ class processorGAMGInterfaceField
 
         // Sending and receiving
 
-            //- Outstanding request
-            mutable label outstandingSendRequest_;
+            //- Current (non-blocking) send request
+            mutable label sendRequest_;
 
-            //- Outstanding request
-            mutable label outstandingRecvRequest_;
+            //- Current (non-blocking) recv request
+            mutable label recvRequest_;
 
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
diff --git a/src/Pstream/dummy/Make/files b/src/Pstream/dummy/Make/files
index 7ba370e470..d5e68ac408 100644
--- a/src/Pstream/dummy/Make/files
+++ b/src/Pstream/dummy/Make/files
@@ -3,6 +3,7 @@ UPstreamAllToAll.C
 UPstreamBroadcast.C
 UPstreamGatherScatter.C
 UPstreamReduce.C
+UPstreamRequest.C
 
 UIPstreamRead.C
 UOPstreamWrite.C
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index a586c1ef1a..db934c00e3 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,7 +26,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Pstream.H"
+#include "UPstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,28 +87,12 @@ void Foam::UPstream::freePstreamCommunicator(const label)
 {}
 
 
-Foam::label Foam::UPstream::nRequests() noexcept
-{
-    return 0;
-}
+int Foam::UPstream::allocateTag(const char* const msg) { return 0; }
 
 
-void Foam::UPstream::resetRequests(const label n)
+void Foam::UPstream::freeTag(const int tag, const char* const msg)
 {}
 
 
-void Foam::UPstream::waitRequests(const label start)
-{}
-
-
-void Foam::UPstream::waitRequest(const label i)
-{}
-
-
-bool Foam::UPstream::finishedRequest(const label i)
-{
-    return true;
-}
-
 
 // ************************************************************************* //
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
new file mode 100644
index 0000000000..ab104e0b3e
--- /dev/null
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "UPstream.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::UPstream::nRequests() noexcept { return 0; }
+
+void Foam::UPstream::resetRequests(const label n) {}
+
+void Foam::UPstream::waitRequests(const label start) {}
+
+void Foam::UPstream::waitRequest(const label i) {}
+
+bool Foam::UPstream::finishedRequest(const label i) { return true; }
+
+
+// ************************************************************************* //
diff --git a/src/Pstream/mpi/Make/files b/src/Pstream/mpi/Make/files
index 217347cc29..48a99bac40 100644
--- a/src/Pstream/mpi/Make/files
+++ b/src/Pstream/mpi/Make/files
@@ -4,6 +4,7 @@ UPstreamAllToAll.C
 UPstreamBroadcast.C
 UPstreamGatherScatter.C
 UPstreamReduce.C
+UPstreamRequest.C
 
 UIPstreamRead.C
 UOPstreamWrite.C
diff --git a/src/Pstream/mpi/PstreamGlobals.C b/src/Pstream/mpi/PstreamGlobals.C
index f6b09aa4cd..2d6e65aa10 100644
--- a/src/Pstream/mpi/PstreamGlobals.C
+++ b/src/Pstream/mpi/PstreamGlobals.C
@@ -29,16 +29,15 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+Foam::DynamicList<MPI_Comm> Foam::PstreamGlobals::MPICommunicators_;
+Foam::DynamicList<MPI_Group> Foam::PstreamGlobals::MPIGroups_;
+
 Foam::DynamicList<MPI_Request> Foam::PstreamGlobals::outstandingRequests_;
 Foam::DynamicList<Foam::label> Foam::PstreamGlobals::freedRequests_;
 
 int Foam::PstreamGlobals::nTags_ = 0;
-
 Foam::DynamicList<int> Foam::PstreamGlobals::freedTags_;
 
-Foam::DynamicList<MPI_Comm> Foam::PstreamGlobals::MPICommunicators_;
-Foam::DynamicList<MPI_Group> Foam::PstreamGlobals::MPIGroups_;
-
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index 33287c6c9a..859d0aa64b 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,6 +49,13 @@ namespace Foam
 namespace PstreamGlobals
 {
 
+// Current communicators, which may be allocated or predefined
+// (eg, MPI_COMM_SELF, MPI_COMM_WORLD)
+extern DynamicList<MPI_Comm> MPICommunicators_;
+
+// Groups associated with the currrent communicators.
+extern DynamicList<MPI_Group> MPIGroups_;
+
 //- Outstanding non-blocking operations.
 extern DynamicList<MPI_Request> outstandingRequests_;
 extern DynamicList<label> freedRequests_;
@@ -59,39 +66,33 @@ extern int nTags_;
 //- Free'd message tags
 extern DynamicList<int> freedTags_;
 
-// Current communicators, which may be allocated or predefined
-// (eg, MPI_COMM_SELF, MPI_COMM_WORLD)
-extern DynamicList<MPI_Comm> MPICommunicators_;
-
-// Groups associated with the currrent communicators.
-extern DynamicList<MPI_Group> MPIGroups_;
-
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 //- Fatal if comm is outside the allocated range
 void checkCommunicator(const label comm, const label toProcNo);
 
-//- Reuse previously freed request locations or push request onto list
-//- of outstanding requests.
+//- Push request onto list of outstanding requests,
+//- optionally reusing previously freed request locations
 //
 //  \return index of request within outstandingRequests_
 inline label push_request(MPI_Request request)
 {
-    label index;
-
-    if (freedRequests_.size())
+    while (!freedRequests_.empty())
     {
-        index = freedRequests_.back();
+        const label index = freedRequests_.back();
         freedRequests_.pop_back();
-        outstandingRequests_[index] = request;
-    }
-    else
-    {
-        index = outstandingRequests_.size();
-        outstandingRequests_.push_back(request);
+
+        if (index < outstandingRequests_.size())
+        {
+            outstandingRequests_[index] = request;
+            return index;
+        }
     }
 
+    const label index = outstandingRequests_.size();
+    outstandingRequests_.push_back(request);
+
     return index;
 }
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index f4f21af3f0..81be44c3ca 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,11 +31,9 @@ License
 #include "PstreamGlobals.H"
 #include "profilingPstream.H"
 #include "int.H"
-#include "SubList.H"
 #include "UPstreamWrapping.H"
 #include "collatedFileOperation.H"
 
-#include <mpi.h>
 #include <cstring>
 #include <cstdlib>
 #include <csignal>
@@ -428,21 +426,22 @@ void Foam::UPstream::shutdown(int errNo)
     {
         label nOutstanding = 0;
 
-        forAll(PstreamGlobals::outstandingRequests_, requestID)
+        for (MPI_Request request : PstreamGlobals::outstandingRequests_)
         {
-            if (!PstreamGlobals::freedRequests_.found(requestID))
+            if (MPI_REQUEST_NULL != request)
             {
                 ++nOutstanding;
             }
         }
 
         PstreamGlobals::outstandingRequests_.clear();
+        PstreamGlobals::freedRequests_.clear();
 
         if (nOutstanding)
         {
             WarningInFunction
                 << "There were still " << nOutstanding
-                << " outstanding MPI_Requests." << nl
+                << " outstanding MPI requests." << nl
                 << "Which means your code exited before doing a "
                 << " UPstream::waitRequests()." << nl
                 << "This should not happen for a normal code exit."
@@ -658,169 +657,6 @@ void Foam::UPstream::freePstreamCommunicator(const label communicator)
 }
 
 
-Foam::label Foam::UPstream::nRequests() noexcept
-{
-    return PstreamGlobals::outstandingRequests_.size();
-}
-
-
-void Foam::UPstream::resetRequests(const label n)
-{
-    if (n >= 0 && n < PstreamGlobals::outstandingRequests_.size())
-    {
-        PstreamGlobals::outstandingRequests_.resize(n);
-    }
-}
-
-
-void Foam::UPstream::waitRequests(const label start)
-{
-    if (!UPstream::parRun())
-    {
-        return;  // No-op for non-parallel
-    }
-
-    if (UPstream::debug)
-    {
-        Pout<< "UPstream::waitRequests : starting wait for "
-            << PstreamGlobals::outstandingRequests_.size()-start
-            << " outstanding requests starting at " << start << endl;
-    }
-
-    // TBD: check for
-    // (start < 0 || start > PstreamGlobals::outstandingRequests_.size())
-
-    if (PstreamGlobals::outstandingRequests_.size())
-    {
-        SubList<MPI_Request> waitRequests
-        (
-            PstreamGlobals::outstandingRequests_,
-            PstreamGlobals::outstandingRequests_.size() - start,
-            start
-        );
-
-        profilingPstream::beginTiming();
-
-        // On success: sets each request to MPI_REQUEST_NULL
-        if
-        (
-            MPI_Waitall
-            (
-                waitRequests.size(),
-                waitRequests.data(),
-                MPI_STATUSES_IGNORE
-            )
-        )
-        {
-            FatalErrorInFunction
-                << "MPI_Waitall returned with error" << Foam::endl;
-        }
-
-        profilingPstream::addWaitTime();
-
-        PstreamGlobals::outstandingRequests_.resize(start);
-    }
-
-    if (debug)
-    {
-        Pout<< "UPstream::waitRequests : finished wait." << endl;
-    }
-}
-
-
-void Foam::UPstream::waitRequest(const label i)
-{
-    if (!UPstream::parRun() || i < 0)
-    {
-        return;  // No-op for non-parallel, or placeholder indices
-    }
-
-    if (debug)
-    {
-        Pout<< "UPstream::waitRequest : starting wait for request:" << i
-            << endl;
-    }
-
-    if (i >= PstreamGlobals::outstandingRequests_.size())
-    {
-        FatalErrorInFunction
-            << "You asked for request=" << i
-            << " from " << PstreamGlobals::outstandingRequests_.size()
-            << " outstanding requests!" << nl
-            << "Mixing use of blocking/non-blocking comms?"
-            << Foam::abort(FatalError);
-    }
-
-    profilingPstream::beginTiming();
-
-    // On success: sets request to MPI_REQUEST_NULL
-    if
-    (
-        MPI_Wait
-        (
-           &PstreamGlobals::outstandingRequests_[i],
-            MPI_STATUS_IGNORE
-        )
-    )
-    {
-        FatalErrorInFunction
-            << "MPI_Wait returned with error" << Foam::endl;
-    }
-
-    profilingPstream::addWaitTime();
-    // Push index onto free cache
-    PstreamGlobals::freedRequests_.push_back(i);
-
-    if (debug)
-    {
-        Pout<< "UPstream::waitRequest : finished wait for request:" << i
-            << endl;
-    }
-}
-
-
-bool Foam::UPstream::finishedRequest(const label i)
-{
-    if (!UPstream::parRun() || i < 0)
-    {
-        return true;  // No-op for non-parallel, or placeholder indices
-    }
-
-    if (debug)
-    {
-        Pout<< "UPstream::finishedRequest : checking request:" << i
-            << endl;
-    }
-
-    if (i >= PstreamGlobals::outstandingRequests_.size())
-    {
-        FatalErrorInFunction
-            << "You asked for request=" << i
-            << " from " << PstreamGlobals::outstandingRequests_.size()
-            << " outstanding requests!" << nl
-            << "Mixing use of blocking/non-blocking comms?"
-            << Foam::abort(FatalError);
-    }
-
-    // On success: sets request to MPI_REQUEST_NULL
-    int flag;
-    MPI_Test
-    (
-       &PstreamGlobals::outstandingRequests_[i],
-       &flag,
-        MPI_STATUS_IGNORE
-    );
-
-    if (debug)
-    {
-        Pout<< "UPstream::finishedRequest : finished request:" << i
-            << endl;
-    }
-
-    return flag != 0;
-}
-
-
 int Foam::UPstream::allocateTag(const char* const msg)
 {
     int tag;
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
new file mode 100644
index 0000000000..3d72acc1b6
--- /dev/null
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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 "UPstreamWrapping.H"
+#include "PstreamGlobals.H"
+#include "profilingPstream.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::UPstream::nRequests() noexcept
+{
+    return PstreamGlobals::outstandingRequests_.size();
+}
+
+
+void Foam::UPstream::resetRequests(const label n)
+{
+    if (n >= 0 && n < PstreamGlobals::outstandingRequests_.size())
+    {
+        PstreamGlobals::outstandingRequests_.resize(n);
+    }
+}
+
+
+void Foam::UPstream::waitRequests(const label start)
+{
+    // No-op for non-parallel, no pending requests or out-of-range
+    if
+    (
+        !UPstream::parRun()
+     || start < 0
+     || start >= PstreamGlobals::outstandingRequests_.size()
+    )
+    {
+        return;
+    }
+
+    const label count = (PstreamGlobals::outstandingRequests_.size() - start);
+    auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + start);
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::waitRequests : starting wait for "
+            << count << " requests starting at " << start << endl;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets each request to MPI_REQUEST_NULL
+    if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Waitall returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    // ie, resetRequests(start)
+    PstreamGlobals::outstandingRequests_.resize(start);
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::waitRequests : finished wait." << endl;
+    }
+}
+
+
+void Foam::UPstream::waitRequest(const label i)
+{
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if
+    (
+        !UPstream::parRun()
+     || i < 0
+     || i >= PstreamGlobals::outstandingRequests_.size()
+    )
+    {
+        return;
+    }
+
+    // Push index onto free cache (for later reuse)
+    PstreamGlobals::freedRequests_.push_back(i);
+
+    auto& request = PstreamGlobals::outstandingRequests_[i];
+
+    // No-op for null request
+    if (MPI_REQUEST_NULL == request)
+    {
+        return;
+    }
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::waitRequest : starting wait for request:"
+            << i << endl;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets request to MPI_REQUEST_NULL
+    if (MPI_Wait(&request, MPI_STATUS_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Wait returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::waitRequest : finished wait for request:"
+            << i << endl;
+    }
+}
+
+
+bool Foam::UPstream::finishedRequest(const label i)
+{
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if
+    (
+        !UPstream::parRun()
+     || i < 0
+     || i >= PstreamGlobals::outstandingRequests_.size()
+    )
+    {
+        return true;
+    }
+
+    auto& request = PstreamGlobals::outstandingRequests_[i];
+
+    // No-op for null request
+    if (MPI_REQUEST_NULL == request)
+    {
+        return true;
+    }
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::finishedRequest : checking request:"
+            << i << endl;
+    }
+
+    // On success: sets request to MPI_REQUEST_NULL
+    int flag = 0;
+    MPI_Test(&request, &flag, MPI_STATUS_IGNORE);
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::finishedRequest : finished request:" << i
+            << endl;
+    }
+
+    return flag != 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
index 08acdaa41b..2c93f08061 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,12 +39,8 @@ Foam::calculatedProcessorFvPatchField<Type>::calculatedProcessorFvPatchField
 :
     coupledFvPatchField<Type>(p, iF),
     procInterface_(refCast<const lduPrimitiveProcessorInterface>(interface)),
-    sendBuf_(interface.faceCells().size()),
-    receiveBuf_(interface.faceCells().size()),
-    scalarSendBuf_(interface.faceCells().size()),
-    scalarReceiveBuf_(interface.faceCells().size()),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -56,13 +52,8 @@ Foam::calculatedProcessorFvPatchField<Type>::calculatedProcessorFvPatchField
 :
     coupledFvPatchField<Type>(ptf),
     procInterface_(ptf.procInterface_),
-    sendBuf_(procInterface_.faceCells().size()),
-    receiveBuf_(procInterface_.faceCells().size()),
-    scalarSendBuf_(procInterface_.faceCells().size()),
-    scalarReceiveBuf_(procInterface_.faceCells().size()),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1)
-
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -75,12 +66,8 @@ Foam::calculatedProcessorFvPatchField<Type>::calculatedProcessorFvPatchField
 :
     coupledFvPatchField<Type>(ptf, iF),
     procInterface_(ptf.procInterface_),
-    sendBuf_(procInterface_.faceCells().size()),
-    receiveBuf_(procInterface_.faceCells().size()),
-    scalarSendBuf_(procInterface_.faceCells().size()),
-    scalarReceiveBuf_(procInterface_.faceCells().size()),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -89,31 +76,11 @@ Foam::calculatedProcessorFvPatchField<Type>::calculatedProcessorFvPatchField
 template<class Type>
 bool Foam::calculatedProcessorFvPatchField<Type>::ready() const
 {
-    if
-    (
-        this->outstandingSendRequest_ >= 0
-     && this->outstandingSendRequest_ < UPstream::nRequests()
-    )
-    {
-        if (!UPstream::finishedRequest(this->outstandingSendRequest_))
-        {
-            return false;
-        }
-    }
-    this->outstandingSendRequest_ = -1;
+    if (!UPstream::finishedRequest(this->sendRequest_)) return false;
+    this->sendRequest_ = -1;
 
-    if
-    (
-        this->outstandingRecvRequest_ >= 0
-     && this->outstandingRecvRequest_ < UPstream::nRequests()
-    )
-    {
-        if (!UPstream::finishedRequest(this->outstandingRecvRequest_))
-        {
-            return false;
-        }
-    }
-    this->outstandingRecvRequest_ = -1;
+    if (!UPstream::finishedRequest(this->recvRequest_)) return false;
+    this->recvRequest_ = -1;
 
     return true;
 }
@@ -165,10 +132,11 @@ void Foam::calculatedProcessorFvPatchField<Type>::initEvaluate
 
         // Receive straight into *this
         this->setSize(sendBuf_.size());
-        outstandingRecvRequest_ = UPstream::nRequests();
+
+        recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
             this->data_bytes(),
             this->size_bytes(),
@@ -176,10 +144,10 @@ void Foam::calculatedProcessorFvPatchField<Type>::initEvaluate
             procInterface_.comm()
         );
 
-        outstandingSendRequest_ = UPstream::nRequests();
+        sendRequest_ = UPstream::nRequests();
         UOPstream::write
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
             sendBuf_.cdata_bytes(),
             sendBuf_.size_bytes(),
@@ -198,16 +166,10 @@ void Foam::calculatedProcessorFvPatchField<Type>::evaluate
 {
     if (Pstream::parRun())
     {
-        if
-        (
-            outstandingRecvRequest_ >= 0
-         && outstandingRecvRequest_ < UPstream::nRequests()
-        )
-        {
-            UPstream::waitRequest(outstandingRecvRequest_);
-        }
-        outstandingSendRequest_ = -1;
-        outstandingRecvRequest_ = -1;
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
     }
 }
 
@@ -225,16 +187,6 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
-    // Bypass patchInternalField since uses fvPatch addressing
-
-    const labelList& fc = lduAddr.patchAddr(patchId);
-
-    scalarSendBuf_.setSize(fc.size());
-    forAll(fc, i)
-    {
-        scalarSendBuf_[i] = psiInternal[fc[i]];
-    }
-
     if (!this->ready())
     {
         FatalErrorInFunction
@@ -243,14 +195,21 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
             << abort(FatalError);
     }
 
+    // Bypass patchInternalField since uses fvPatch addressing
+    const labelList& fc = lduAddr.patchAddr(patchId);
 
+    scalarSendBuf_.setSize(fc.size());
+    forAll(fc, i)
+    {
+        scalarSendBuf_[i] = psiInternal[fc[i]];
+    }
 
     scalarReceiveBuf_.setSize(scalarSendBuf_.size());
-    outstandingRecvRequest_ = UPstream::nRequests();
 
+    recvRequest_ = UPstream::nRequests();
     UIPstream::read
     (
-        Pstream::commsTypes::nonBlocking,
+        UPstream::commsTypes::nonBlocking,
         procInterface_.neighbProcNo(),
         scalarReceiveBuf_.data_bytes(),
         scalarReceiveBuf_.size_bytes(),
@@ -258,11 +217,10 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
         procInterface_.comm()
     );
 
-    outstandingSendRequest_ = UPstream::nRequests();
-
+    sendRequest_ = UPstream::nRequests();
     UOPstream::write
     (
-        Pstream::commsTypes::nonBlocking,
+        UPstream::commsTypes::nonBlocking,
         procInterface_.neighbProcNo(),
         scalarSendBuf_.cdata_bytes(),
         scalarSendBuf_.size_bytes(),
@@ -323,20 +281,15 @@ void Foam::calculatedProcessorFvPatchField<Type>::updateInterfaceMatrix
         return;
     }
 
-
-    if
-    (
-        outstandingRecvRequest_ >= 0
-     && outstandingRecvRequest_ < UPstream::nRequests()
-    )
+    if (Pstream::parRun())
     {
-        UPstream::waitRequest(outstandingRecvRequest_);
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
     }
-    // Recv finished so assume sending finished as well.
-    outstandingSendRequest_ = -1;
-    outstandingRecvRequest_ = -1;
 
-    // Consume straight from scalarReceiveBuf_. Note use of our own
+    // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
     addToInternalField(result, !add, coeffs, scalarReceiveBuf_);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
index b2fd32a7bc..22cd2ae1fa 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,8 +44,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedProcessorFvPatchField_H
-#define calculatedProcessorFvPatchField_H
+#ifndef Foam_calculatedProcessorFvPatchField_H
+#define Foam_calculatedProcessorFvPatchField_H
 
 #include "lduPrimitiveProcessorInterface.H"
 #include "coupledFvPatchField.H"
@@ -73,8 +73,15 @@ protected:
          //- Local reference cast into the interface
          const lduPrimitiveProcessorInterface& procInterface_;
 
+
         // Sending and receiving
 
+            //- Current (non-blocking) send request
+            mutable label sendRequest_;
+
+            //- Current (non-blocking) recv request
+            mutable label recvRequest_;
+
             //- Send buffer
             mutable Field<Type> sendBuf_;
 
@@ -87,12 +94,6 @@ protected:
             //- Scalar receive buffer
             mutable solveScalarField scalarReceiveBuf_;
 
-            //- Outstanding request
-            mutable label outstandingSendRequest_;
-
-            //- Outstanding request
-            mutable label outstandingRecvRequest_;
-
 
     // Protected Member Functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 5d0e817d77..ff3ae21aa1 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,12 +42,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 :
     coupledFvPatchField<Type>(p, iF),
     procPatch_(refCast<const processorFvPatch>(p)),
-    sendBuf_(0),
-    receiveBuf_(0),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1),
-    scalarSendBuf_(0),
-    scalarReceiveBuf_(0)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -61,12 +57,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 :
     coupledFvPatchField<Type>(p, iF, f),
     procPatch_(refCast<const processorFvPatch>(p)),
-    sendBuf_(0),
-    receiveBuf_(0),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1),
-    scalarSendBuf_(0),
-    scalarReceiveBuf_(0)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -80,12 +72,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 :
     coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
     procPatch_(refCast<const processorFvPatch>(p, dict)),
-    sendBuf_(0),
-    receiveBuf_(0),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1),
-    scalarSendBuf_(0),
-    scalarReceiveBuf_(0)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
     if (!isA<processorFvPatch>(p))
     {
@@ -117,12 +105,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 :
     coupledFvPatchField<Type>(ptf, p, iF, mapper),
     procPatch_(refCast<const processorFvPatch>(p)),
-    sendBuf_(0),
-    receiveBuf_(0),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1),
-    scalarSendBuf_(0),
-    scalarReceiveBuf_(0)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
     if (!isA<processorFvPatch>(this->patch()))
     {
@@ -151,10 +135,10 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     processorLduInterfaceField(),
     coupledFvPatchField<Type>(ptf),
     procPatch_(refCast<const processorFvPatch>(ptf.patch())),
+    sendRequest_(-1),
+    recvRequest_(-1),
     sendBuf_(std::move(ptf.sendBuf_)),
     receiveBuf_(std::move(ptf.receiveBuf_)),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1),
     scalarSendBuf_(std::move(ptf.scalarSendBuf_)),
     scalarReceiveBuf_(std::move(ptf.scalarReceiveBuf_))
 {
@@ -176,12 +160,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 :
     coupledFvPatchField<Type>(ptf, iF),
     procPatch_(refCast<const processorFvPatch>(ptf.patch())),
-    sendBuf_(0),
-    receiveBuf_(0),
-    outstandingSendRequest_(-1),
-    outstandingRecvRequest_(-1),
-    scalarSendBuf_(0),
-    scalarReceiveBuf_(0)
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
     if (debug && !ptf.ready())
     {
@@ -194,6 +174,19 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+bool Foam::processorFvPatchField<Type>::ready() const
+{
+    if (!UPstream::finishedRequest(sendRequest_)) return false;
+    sendRequest_ = -1;
+
+    if (!UPstream::finishedRequest(recvRequest_)) return false;
+    recvRequest_ = -1;
+
+    return true;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::processorFvPatchField<Type>::patchNeighbourField() const
@@ -234,10 +227,11 @@ void Foam::processorFvPatchField<Type>::initEvaluate
 
             // Receive straight into *this
             this->setSize(sendBuf_.size());
-            outstandingRecvRequest_ = UPstream::nRequests();
+
+            recvRequest_ = UPstream::nRequests();
             UIPstream::read
             (
-                Pstream::commsTypes::nonBlocking,
+                UPstream::commsTypes::nonBlocking,
                 procPatch_.neighbProcNo(),
                 this->data_bytes(),
                 this->size_bytes(),
@@ -245,10 +239,10 @@ void Foam::processorFvPatchField<Type>::initEvaluate
                 procPatch_.comm()
             );
 
-            outstandingSendRequest_ = UPstream::nRequests();
+            sendRequest_ = UPstream::nRequests();
             UOPstream::write
             (
-                Pstream::commsTypes::nonBlocking,
+                UPstream::commsTypes::nonBlocking,
                 procPatch_.neighbProcNo(),
                 sendBuf_.cdata_bytes(),
                 sendBuf_.size_bytes(),
@@ -278,18 +272,12 @@ void Foam::processorFvPatchField<Type>::evaluate
          && !Pstream::floatTransfer
         )
         {
-            // Fast path. Received into *this
+            // Fast path: received into *this
 
-            if
-            (
-                outstandingRecvRequest_ >= 0
-             && outstandingRecvRequest_ < UPstream::nRequests()
-            )
-            {
-                UPstream::waitRequest(outstandingRecvRequest_);
-            }
-            outstandingSendRequest_ = -1;
-            outstandingRecvRequest_ = -1;
+            // Treat send as finished when recv is done
+            UPstream::waitRequest(recvRequest_);
+            recvRequest_ = -1;
+            sendRequest_ = -1;
         }
         else
         {
@@ -355,10 +343,11 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
 
 
         scalarReceiveBuf_.setSize(scalarSendBuf_.size());
-        outstandingRecvRequest_ = UPstream::nRequests();
+
+        recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procPatch_.neighbProcNo(),
             scalarReceiveBuf_.data_bytes(),
             scalarReceiveBuf_.size_bytes(),
@@ -366,10 +355,10 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
             procPatch_.comm()
         );
 
-        outstandingSendRequest_ = UPstream::nRequests();
+        sendRequest_ = UPstream::nRequests();
         UOPstream::write
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procPatch_.neighbProcNo(),
             scalarSendBuf_.cdata_bytes(),
             scalarSendBuf_.size_bytes(),
@@ -412,19 +401,12 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
      && !Pstream::floatTransfer
     )
     {
-        // Fast path.
-        if
-        (
-            outstandingRecvRequest_ >= 0
-         && outstandingRecvRequest_ < UPstream::nRequests()
-        )
-        {
-            UPstream::waitRequest(outstandingRecvRequest_);
-        }
-        // Recv finished so assume sending finished as well.
-        outstandingSendRequest_ = -1;
-        outstandingRecvRequest_ = -1;
-        // Consume straight from scalarReceiveBuf_
+        // Fast path: consume straight from receive buffer
+
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
 
         if (!std::is_arithmetic<Type>::value)
         {
@@ -505,10 +487,11 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
 
 
         receiveBuf_.setSize(sendBuf_.size());
-        outstandingRecvRequest_ = UPstream::nRequests();
+
+        recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procPatch_.neighbProcNo(),
             receiveBuf_.data_bytes(),
             receiveBuf_.size_bytes(),
@@ -516,10 +499,10 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
             procPatch_.comm()
         );
 
-        outstandingSendRequest_ = UPstream::nRequests();
+        sendRequest_ = UPstream::nRequests();
         UOPstream::write
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procPatch_.neighbProcNo(),
             sendBuf_.cdata_bytes(),
             sendBuf_.size_bytes(),
@@ -561,20 +544,12 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
      && !Pstream::floatTransfer
     )
     {
-        // Fast path.
-        if
-        (
-            outstandingRecvRequest_ >= 0
-         && outstandingRecvRequest_ < UPstream::nRequests()
-        )
-        {
-            UPstream::waitRequest(outstandingRecvRequest_);
-        }
-        // Recv finished so assume sending finished as well.
-        outstandingSendRequest_ = -1;
-        outstandingRecvRequest_ = -1;
+        // Fast path: consume straight from receive buffer
 
-        // Consume straight from receiveBuf_
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
 
         // Transform according to the transformation tensor
         transformCoupleField(receiveBuf_);
@@ -600,37 +575,4 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
 }
 
 
-template<class Type>
-bool Foam::processorFvPatchField<Type>::ready() const
-{
-    if
-    (
-        outstandingSendRequest_ >= 0
-     && outstandingSendRequest_ < UPstream::nRequests()
-    )
-    {
-        if (!UPstream::finishedRequest(outstandingSendRequest_))
-        {
-            return false;
-        }
-    }
-    outstandingSendRequest_ = -1;
-
-    if
-    (
-        outstandingRecvRequest_ >= 0
-     && outstandingRecvRequest_ < UPstream::nRequests()
-    )
-    {
-        if (!UPstream::finishedRequest(outstandingRecvRequest_))
-        {
-            return false;
-        }
-    }
-    outstandingRecvRequest_ = -1;
-
-    return true;
-}
-
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index ffa43402c6..1971a1a6b3 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,25 +69,26 @@ class processorFvPatchField
     public processorLduInterfaceField,
     public coupledFvPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the processor patch
         const processorFvPatch& procPatch_;
 
+
         // Sending and receiving
 
+            //- Current (non-blocking) send request
+            mutable label sendRequest_;
+
+            //- Current (non-blocking) recv request
+            mutable label recvRequest_;
+
             //- Send buffer.
             mutable Field<Type> sendBuf_;
 
             //- Receive buffer.
             mutable Field<Type> receiveBuf_;
 
-            //- Outstanding request
-            mutable label outstandingSendRequest_;
-
-            //- Outstanding request
-            mutable label outstandingRecvRequest_;
-
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
 
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
index 8d91292b58..40512a0f1f 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,10 +61,11 @@ calculatedProcessorGAMGInterfaceField
     GAMGInterfaceField(GAMGCp, fineInterface),
     procInterface_(refCast<const calculatedProcessorGAMGInterface>(GAMGCp)),
     doTransform_(false),
-    rank_(0)
+    rank_(0),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
-    const processorLduInterfaceField& p =
-        refCast<const processorLduInterfaceField>(fineInterface);
+    const auto& p = refCast<const processorLduInterfaceField>(fineInterface);
 
     doTransform_ = p.doTransform();
     rank_ = p.rank();
@@ -82,7 +83,9 @@ calculatedProcessorGAMGInterfaceField
     GAMGInterfaceField(GAMGCp, doTransform, rank),
     procInterface_(refCast<const calculatedProcessorGAMGInterface>(GAMGCp)),
     doTransform_(doTransform),
-    rank_(rank)
+    rank_(rank),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -110,10 +113,11 @@ void Foam::calculatedProcessorGAMGInterfaceField::initInterfaceMatrixUpdate
     {
         // Fast path.
         scalarReceiveBuf_.setSize(scalarSendBuf_.size());
-        outstandingRecvRequest_ = UPstream::nRequests();
+
+        recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
             scalarReceiveBuf_.data_bytes(),
             scalarReceiveBuf_.size_bytes(),
@@ -121,10 +125,10 @@ void Foam::calculatedProcessorGAMGInterfaceField::initInterfaceMatrixUpdate
             comm()
         );
 
-        outstandingSendRequest_ = UPstream::nRequests();
+        sendRequest_ = UPstream::nRequests();
         UOPstream::write
         (
-            Pstream::commsTypes::nonBlocking,
+            UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
             scalarSendBuf_.cdata_bytes(),
             scalarSendBuf_.size_bytes(),
@@ -167,20 +171,12 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
      && !Pstream::floatTransfer
     )
     {
-        // Fast path.
-        if
-        (
-            outstandingRecvRequest_ >= 0
-         && outstandingRecvRequest_ < UPstream::nRequests()
-        )
-        {
-            UPstream::waitRequest(outstandingRecvRequest_);
-        }
-        // Recv finished so assume sending finished as well.
-        outstandingSendRequest_ = -1;
-        outstandingRecvRequest_ = -1;
+        // Fast path: consume straight from receive buffer
 
-        // Consume straight from scalarReceiveBuf_
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
 
         // Transform according to the transformation tensor
         transformCoupleField(scalarReceiveBuf_, cmpt);
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H
index 53101421b3..ad6f4ed478 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedProcessorGAMGInterfaceField_H
-#define calculatedProcessorGAMGInterfaceField_H
+#ifndef Foam_calculatedProcessorGAMGInterfaceField_H
+#define Foam_calculatedProcessorGAMGInterfaceField_H
 
 #include "GAMGInterfaceField.H"
 #include "calculatedProcessorGAMGInterface.H"
@@ -55,7 +55,7 @@ class calculatedProcessorGAMGInterfaceField
     public GAMGInterfaceField,
     public processorLduInterfaceField
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the processor interface
         const calculatedProcessorGAMGInterface& procInterface_;
@@ -69,11 +69,11 @@ class calculatedProcessorGAMGInterfaceField
 
         // Sending and receiving
 
-            //- Outstanding request
-            mutable label outstandingSendRequest_;
+            //- Current (non-blocking) send request
+            mutable label sendRequest_;
 
-            //- Outstanding request
-            mutable label outstandingRecvRequest_;
+            //- Current (non-blocking) recv request
+            mutable label recvRequest_;
 
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;

From 94a7945be316334f58042b60c252c76d38a92550 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 3 Jan 2023 18:52:40 +0100
Subject: [PATCH 007/348] ENH: make lduInterfaceField::updatedMatrix mutable

- simplifies code, consistent with other matrix transfer functions.
  Use a setter method.

STYLE: AMIInterpolation::upToDate(bool) setter method

ENH: add guards to avoid float-compressed transfer of integral types

STYLE: drop unused debug member from abstract interface classes
---
 etc/controlDict                               |  3 --
 .../LUscalarMatrix/procLduInterface.H         | 27 ++++------
 .../lduInterface/cyclicLduInterface.C         |  2 +-
 .../lduInterface/cyclicLduInterface.H         | 11 ++--
 .../lduCalculatedProcessorField.C             | 10 +---
 .../lduAddressing/lduInterface/lduInterface.C |  2 +-
 .../lduAddressing/lduInterface/lduInterface.H |  8 ++-
 .../lduPrimitiveProcessorInterface.H          |  7 +--
 .../lduInterface/processorLduInterface.C      | 17 +-----
 .../lduInterface/processorLduInterface.H      | 14 +++--
 .../processorLduInterfaceTemplates.C          | 14 ++++-
 .../lduInterfaceField/lduInterfaceField.H     | 53 ++++++++++++-------
 .../processorLduInterfaceField.H              |  3 +-
 .../lduMatrixUpdateMatrixInterfaces.C         | 43 +++++++--------
 .../processorGAMGInterfaceField.C             | 10 ++--
 .../processor/processorFaPatchField.C         |  8 +--
 .../calculatedProcessorFvPatchField.C         | 10 +---
 .../processor/processorFvPatchField.C         | 20 +++----
 .../AMIInterpolation/AMIInterpolation.H       | 23 +++++---
 .../AMIInterpolation/AMIInterpolationI.H      | 12 -----
 .../cyclicAMIGAMGInterface.H                  |  4 +-
 .../cyclicACMILduInterface.C                  |  2 +-
 .../cyclicACMILduInterface.H                  | 10 ++--
 .../cyclicAMILduInterface.C                   |  2 +-
 .../cyclicAMILduInterface.H                   | 11 ++--
 .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C   |  8 +--
 .../mappedPolyPatch/mappedPatchBase.C         |  2 +-
 .../mappedPolyPatch/mappedPatchBaseI.H        |  6 +--
 .../calculatedProcessorGAMGInterfaceField.C   | 12 ++---
 .../oversetLduInterface/oversetLduInterface.C |  7 +--
 .../oversetLduInterface/oversetLduInterface.H | 13 +++--
 31 files changed, 179 insertions(+), 195 deletions(-)

diff --git a/etc/controlDict b/etc/controlDict
index 2cbd7bdec0..cd6746fc9e 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -499,7 +499,6 @@ DebugSwitches
     cubicUpwindFit      0;
     curve               0;
     cyclic              0;
-    cyclicLduInterface  0;
     cyclicLduInterfaceField 0;
     cylinderToCell      0;
     cylindrical         0;
@@ -684,7 +683,6 @@ DebugSwitches
     laplace             0;
     layerAdditionRemoval 0;
     layered             0;
-    lduInterface        0;
     lduInterfaceField   0;
     lduMatrix           1;
     lduMesh             0;
@@ -823,7 +821,6 @@ DebugSwitches
     primitiveMeshGeometry 0;
     probes              0;
     processor           0;
-    processorLduInterface 0;
     processorLduInterfaceField 0;
     pureMixture<constTransport<thermo<hConstThermo<perfectGas>>>> 0;
     pureMixture<sutherlandTransport<thermo<hConstThermo<perfectGas>>>> 0;
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
index f33ac9d826..c0e74aeb97 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef procLduInterface_H
-#define procLduInterface_H
+#ifndef Foam_procLduInterface_H
+#define Foam_procLduInterface_H
 
 #include "labelList.H"
 #include "scalarField.H"
@@ -45,23 +45,19 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class lduInterfaceField;
-
-
-// Forward declaration of friend functions and operators
-
 class procLduInterface;
 
 Ostream& operator<<(Ostream&, const procLduInterface&);
 
-
 /*---------------------------------------------------------------------------*\
                            Class procLduInterface Declaration
 \*---------------------------------------------------------------------------*/
 
 class procLduInterface
 {
-    // Private data
+    // Private Data
 
         labelList faceCells_;
         scalarField coeffs_;
@@ -70,18 +66,17 @@ class procLduInterface
         label tag_;
         label comm_;
 
-
-    // Private Member Functions
-
-        //- No copy construct
-        procLduInterface(const procLduInterface&) = delete;
-
-
 public:
 
     friend class LUscalarMatrix;
 
 
+    // Generated Methods
+
+        //- No copy construct
+        procLduInterface(const procLduInterface&) = delete;
+
+
     // Constructors
 
         procLduInterface
@@ -104,7 +99,7 @@ public:
         }
 
 
-    // Ostream operator
+    // Ostream Operator
 
         friend Ostream& operator<<(Ostream&, const procLduInterface&);
 };
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.C
index 4e20831b4a..4b25bcf165 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.C
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(cyclicLduInterface, 0);
+    defineTypeName(cyclicLduInterface);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
index e69816f2a9..966602be3d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicLduInterface_H
-#define cyclicLduInterface_H
+#ifndef Foam_cyclicLduInterface_H
+#define Foam_cyclicLduInterface_H
 
 #include "lduInterface.H"
 #include "primitiveFieldsFwd.H"
@@ -55,12 +55,13 @@ class cyclicLduInterface
 public:
 
     //- Runtime type information
-    TypeName("cyclicLduInterface");
+    TypeNameNoDebug("cyclicLduInterface");
+
 
     // Constructors
 
-        //- Construct null
-        cyclicLduInterface() = default;
+        //- Default construct
+        cyclicLduInterface() noexcept = default;
 
 
     //- Destructor
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
index 0212005b24..c00354d358 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
@@ -123,10 +123,7 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
         procInterface_.comm()
     );
 
-    const_cast<lduInterfaceField&>
-    (
-        static_cast<const lduInterfaceField&>(*this)
-    ).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -185,10 +182,7 @@ void Foam::lduCalculatedProcessorField<Type>::updateInterfaceMatrix
     // helper to avoid using fvPatch addressing
     addToInternalField(result, !add, coeffs, scalarReceiveBuf_);
 
-    const_cast<lduInterfaceField&>
-    (
-        static_cast<const lduInterfaceField&>(*this)
-    ).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.C
index a1b0171d3a..8a08d2e089 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.C
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(lduInterface, 0);
+    defineTypeName(lduInterface);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 872cb383b1..d8cfb31d4e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -60,13 +60,13 @@ class lduInterface
 public:
 
     //- Runtime type information
-    TypeName("lduInterface");
+    TypeNameNoDebug("lduInterface");
 
 
     // Constructors
 
-        //- Construct null
-        lduInterface() = default;
+        //- Default construct
+        lduInterface() noexcept = default;
 
 
     //- Destructor
@@ -75,7 +75,6 @@ public:
 
     // Member Functions
 
-
         // Access
 
             //- Return faceCell addressing
@@ -123,7 +122,6 @@ public:
                 const Pstream::commsTypes commsType,
                 const labelUList& iF
             ) const = 0;
-
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H
index f13a2b7f96..7314557de6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lduPrimitiveProcessorInterface_H
-#define lduPrimitiveProcessorInterface_H
+#ifndef Foam_lduPrimitiveProcessorInterface_H
+#define Foam_lduPrimitiveProcessorInterface_H
 
 #include "GAMGInterface.H"
 #include "processorLduInterface.H"
@@ -86,7 +86,7 @@ class lduPrimitiveProcessorInterface
 public:
 
     //- Runtime type information
-    TypeName("calculatedProcessor");
+    TypeNameNoDebug("processorInterface");
 
 
     // Constructors
@@ -108,6 +108,7 @@ public:
             const lduPrimitiveProcessorInterface&
         );
 
+
     //- Destructor
     virtual ~lduPrimitiveProcessorInterface() = default;
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.C
index 8c6df7a971..bb60f75605 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.C
@@ -5,8 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2012 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2011 OpenFOAM Foundation
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,19 +31,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(processorLduInterface, 0);
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions *  * * * * * * * * * * //
-
-void Foam::processorLduInterface::resizeBuf(List<char>& buf, const label len)
-{
-    if (buf.size() < len)
-    {
-        // Use nocopy variant since it will be overwritten
-        buf.resize_nocopy(len);
-    }
+    defineTypeName(processorLduInterface);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 28c13b7e25..64ddf7ea3d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -67,19 +67,25 @@ class processorLduInterface
     // Private Member Functions
 
         //- Increase buffer size if required
-        static void resizeBuf(List<char>& buf, const label len);
-
+        //  Uses the nocopy variant since it will be overwritten
+        static void resizeBuf(List<char>& buf, const label len)
+        {
+            if (buf.size() < len)
+            {
+                buf.resize_nocopy(len);
+            }
+        }
 
 public:
 
     //- Runtime type information
-    TypeName("processorLduInterface");
+    TypeNameNoDebug("processorLduInterface");
 
 
     // Constructors
 
         //- Default construct
-        processorLduInterface() = default;
+        processorLduInterface() noexcept = default;
 
 
     //- Destructor
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index 875d202faa..4b75ba207b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -155,7 +155,12 @@ void Foam::processorLduInterface::compressedSend
     const UList<Type>& f
 ) const
 {
-    if (sizeof(scalar) != sizeof(float) && Pstream::floatTransfer && f.size())
+    if
+    (
+        f.size()
+     && UPstream::floatTransfer
+     && (!std::is_integral<Type>::value && sizeof(scalar) != sizeof(float))
+    )
     {
         static const label nCmpts = sizeof(Type)/sizeof(scalar);
         label nm1 = (f.size() - 1)*nCmpts;
@@ -236,7 +241,12 @@ void Foam::processorLduInterface::compressedReceive
     UList<Type>& f
 ) const
 {
-    if (sizeof(scalar) != sizeof(float) && Pstream::floatTransfer && f.size())
+    if
+    (
+        f.size()
+     && UPstream::floatTransfer
+     && (!std::is_integral<Type>::value && sizeof(scalar) != sizeof(float))
+    )
     {
         static const label nCmpts = sizeof(Type)/sizeof(scalar);
         label nm1 = (f.size() - 1)*nCmpts;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index cb3e9da1fd..f61e43e1d7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef lduInterfaceField_H
-#define lduInterfaceField_H
+#ifndef Foam_lduInterfaceField_H
+#define Foam_lduInterfaceField_H
 
 #include "lduInterface.H"
 #include "primitiveFieldsFwd.H"
@@ -49,8 +49,9 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class lduMatrix;
+class lduInterfaceField;
 
 /*---------------------------------------------------------------------------*\
                      Class lduInterfaceField Declaration
@@ -64,17 +65,8 @@ class lduInterfaceField
         const lduInterface& interface_;
 
         //- Update index used so that updateInterfaceMatrix is called only once
-        //  during the construction of the matrix
-        bool updatedMatrix_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        lduInterfaceField(const lduInterfaceField&) = delete;
-
-        //- No copy assignment
-        void operator=(const lduInterfaceField&) = delete;
+        //- during the construction of the matrix
+        mutable bool updatedMatrix_;
 
 
 public:
@@ -83,6 +75,15 @@ public:
     TypeName("lduInterfaceField");
 
 
+    // Generated Methods
+
+        //- No copy construct
+        lduInterfaceField(const lduInterfaceField&) = delete;
+
+        //- No copy assignment
+        void operator=(const lduInterfaceField&) = delete;
+
+
     // Constructors
 
         //- Construct given coupled patch
@@ -102,7 +103,7 @@ public:
         // Access
 
             //- Return the interface
-            const lduInterface& interface() const
+            const lduInterface& interface() const noexcept
             {
                 return interface_;
             }
@@ -117,15 +118,17 @@ public:
         // Coupled interface matrix update
 
             //- Whether matrix has been updated
-            bool updatedMatrix() const
+            bool updatedMatrix() const noexcept
             {
                 return updatedMatrix_;
             }
 
-            //- Whether matrix has been updated
-            bool& updatedMatrix()
+            //- Set matrix as update-to-date, return the previous value
+            bool updatedMatrix(bool flag) const noexcept
             {
-                return updatedMatrix_;
+                bool old(updatedMatrix_);
+                updatedMatrix_ = flag;
+                return old;
             }
 
             //- Is all data available
@@ -173,6 +176,16 @@ public:
                 const scalarField& coeffs,
                 const Field<Type>& vals
             ) const;
+
+
+    // Housekeeping
+
+        //- Adjust whether matrix has been updated.
+        //  \deprecated Prefer the updatedMatrix(bool) setter (JAN-2023)
+        bool& updatedMatrix() noexcept
+        {
+            return updatedMatrix_;
+        }
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
index 6eb771dc00..ec59e2b10c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
@@ -52,7 +52,6 @@ namespace Foam
 
 class processorLduInterfaceField
 {
-
 public:
 
     //- Runtime type information
@@ -61,7 +60,7 @@ public:
 
     // Constructors
 
-        //- Construct null
+        //- Default construct
         processorLduInterfaceField() = default;
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 3562159057..d2e78b4cba 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,28 +149,29 @@ void Foam::lduMatrix::updateMatrixInterfaces
 
             forAll(interfaces, interfacei)
             {
-                if (interfaces.set(interfacei))
+                if
+                (
+                    interfaces.set(interfacei)
+                && !interfaces[interfacei].updatedMatrix()
+                )
                 {
-                    if (!interfaces[interfacei].updatedMatrix())
+                    if (interfaces[interfacei].ready())
                     {
-                        if (interfaces[interfacei].ready())
-                        {
-                            interfaces[interfacei].updateInterfaceMatrix
-                            (
-                                result,
-                                add,
-                                mesh().lduAddr(),
-                                interfacei,
-                                psiif,
-                                coupleCoeffs[interfacei],
-                                cmpt,
-                                commsType
-                            );
-                        }
-                        else
-                        {
-                            allUpdated = false;
-                        }
+                        interfaces[interfacei].updateInterfaceMatrix
+                        (
+                            result,
+                            add,
+                            mesh().lduAddr(),
+                            interfacei,
+                            psiif,
+                            coupleCoeffs[interfacei],
+                            cmpt,
+                            commsType
+                        );
+                    }
+                    else
+                    {
+                        allUpdated = false;
                     }
                 }
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 9e75568ace..61dca087e0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -107,7 +107,7 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && !UPstream::floatTransfer
     )
     {
         // Fast path.
@@ -140,7 +140,7 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
         procInterface_.compressedSend(commsType, scalarSendBuf_);
     }
 
-    const_cast<processorGAMGInterfaceField&>(*this).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -156,7 +156,7 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
     const Pstream::commsTypes commsType
 ) const
 {
-    if (updatedMatrix())
+    if (this->updatedMatrix())
     {
         return;
     }
@@ -166,7 +166,7 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && !UPstream::floatTransfer
     )
     {
         // Fast path: consume straight from receive buffer
@@ -197,7 +197,7 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
         addToInternalField(result, !add, faceCells, coeffs, pnf);
     }
 
-    const_cast<processorGAMGInterfaceField&>(*this).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index 3649700be4..50b03d0790 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -197,7 +197,7 @@ void Foam::processorFaPatchField<Type>::initInterfaceMatrixUpdate
         this->patch().patchInternalField(psiInternal)()
     );
 
-    const_cast<processorFaPatchField<Type>&>(*this).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -235,7 +235,7 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
     // Multiply the field by coefficients and add into the result
     this->addToInternalField(result, !add, faceCells, coeffs, pnf);
 
-    const_cast<processorFaPatchField<Type>&>(*this).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
@@ -257,7 +257,7 @@ void Foam::processorFaPatchField<Type>::initInterfaceMatrixUpdate
         this->patch().patchInternalField(psiInternal)()
     );
 
-    const_cast<processorFaPatchField<Type>&>(*this).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -291,7 +291,7 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
     // Multiply the field by coefficients and add into the result
     this->addToInternalField(result, !add, faceCells, coeffs, pnf);
 
-    const_cast<processorFaPatchField<Type>&>(*this).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
index 2c93f08061..74878841fb 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
@@ -228,10 +228,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
         procInterface_.comm()
     );
 
-    const_cast<lduInterfaceField&>
-    (
-        static_cast<const lduInterfaceField&>(*this)
-    ).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -293,10 +290,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::updateInterfaceMatrix
     // helper to avoid using fvPatch addressing
     addToInternalField(result, !add, coeffs, scalarReceiveBuf_);
 
-    const_cast<lduInterfaceField&>
-    (
-        static_cast<const lduInterfaceField&>(*this)
-    ).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index ff3ae21aa1..7aa36a5c32 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -215,7 +215,7 @@ void Foam::processorFvPatchField<Type>::initEvaluate
         if
         (
             commsType == Pstream::commsTypes::nonBlocking
-         && !Pstream::floatTransfer
+         && (std::is_integral<Type>::value || !UPstream::floatTransfer)
         )
         {
             if (!is_contiguous<Type>::value)
@@ -269,7 +269,7 @@ void Foam::processorFvPatchField<Type>::evaluate
         if
         (
             commsType == Pstream::commsTypes::nonBlocking
-         && !Pstream::floatTransfer
+         && (std::is_integral<Type>::value || !UPstream::floatTransfer)
         )
         {
             // Fast path: received into *this
@@ -329,7 +329,7 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && !UPstream::floatTransfer
     )
     {
         // Fast path.
@@ -371,7 +371,7 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
         procPatch_.compressedSend(commsType, scalarSendBuf_);
     }
 
-    const_cast<processorFvPatchField<Type>&>(*this).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -398,7 +398,7 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && !UPstream::floatTransfer
     )
     {
         // Fast path: consume straight from receive buffer
@@ -445,7 +445,7 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
         this->addToInternalField(result, !add, faceCells, coeffs, pnf);
     }
 
-    const_cast<processorFvPatchField<Type>&>(*this).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
@@ -473,7 +473,7 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && (std::is_integral<Type>::value || !UPstream::floatTransfer)
     )
     {
         // Fast path.
@@ -515,7 +515,7 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
         procPatch_.compressedSend(commsType, sendBuf_);
     }
 
-    const_cast<processorFvPatchField<Type>&>(*this).updatedMatrix() = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -541,7 +541,7 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && (std::is_integral<Type>::value || !UPstream::floatTransfer)
     )
     {
         // Fast path: consume straight from receive buffer
@@ -571,7 +571,7 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
         this->addToInternalField(result, !add, faceCells, coeffs, pnf);
     }
 
-    const_cast<processorFvPatchField<Type>&>(*this).updatedMatrix() = true;
+    this->updatedMatrix(true);
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index 5111a50ff2..e8a69e5eae 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,8 +48,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef AMIInterpolation_H
-#define AMIInterpolation_H
+#ifndef Foam_AMIInterpolation_H
+#define Foam_AMIInterpolation_H
 
 #include "className.H"
 #include "searchableSurface.H"
@@ -81,7 +81,7 @@ class AMIInterpolation
 {
 public:
 
-    // Public data types
+    // Public Data Types
 
         static bool cacheIntersections_;
 
@@ -350,11 +350,20 @@ public:
 
         // Access
 
-            //- Access to the up-to-date flag
-            inline bool upToDate() const;
+            //- Is up-to-date?
+            bool upToDate() const noexcept { return upToDate_; }
+
+            //- Set as up-to-date, return the previous value
+            bool upToDate(bool flag) noexcept
+            {
+                bool old(upToDate_);
+                upToDate_ = flag;
+                return old;
+            }
 
             //- Access to the up-to-date flag
-            inline bool& upToDate();
+            //  \deprecated Prefer the upToDate(bool) setter (JAN-2023)
+            bool upToDate() noexcept { return upToDate_; }
 
             //- Access to the distributed flag
             inline bool distributed() const;
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
index cb9401d885..fa0c51c943 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
@@ -53,18 +53,6 @@ inline const Foam::primitivePatch& Foam::AMIInterpolation::tgtPatch0() const
 }
 
 
-inline bool Foam::AMIInterpolation::upToDate() const
-{
-    return upToDate_;
-}
-
-
-inline bool& Foam::AMIInterpolation::upToDate()
-{
-    return upToDate_;
-}
-
-
 inline bool Foam::AMIInterpolation::distributed() const
 {
     return singlePatchProc_ == -1;
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index 3b4cf8c999..9d8e7c78f1 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicAMIGAMGInterface_H
-#define cyclicAMIGAMGInterface_H
+#ifndef Foam_cyclicAMIGAMGInterface_H
+#define Foam_cyclicAMIGAMGInterface_H
 
 #include "GAMGInterface.H"
 #include "cyclicAMILduInterface.H"
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.C
index ca1549b857..a68de1ad01 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.C
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(cyclicACMILduInterface, 0);
+    defineTypeName(cyclicACMILduInterface);
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.H
index 2d855c0ab5..05eb09aa85 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMILduInterfaceField/cyclicACMILduInterface.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicACMILduInterface_H
-#define cyclicACMILduInterface_H
+#ifndef Foam_cyclicACMILduInterface_H
+#define Foam_cyclicACMILduInterface_H
 
 #include "cyclicAMILduInterface.H"
 
@@ -56,13 +56,13 @@ class cyclicACMILduInterface
 public:
 
     //- Runtime type information
-    TypeName("cyclicACMILduInterface");
+    TypeNameNoDebug("cyclicACMILduInterface");
 
 
     // Constructors
 
-        //- Construct null
-        cyclicACMILduInterface() = default;
+        //- Default construct
+        cyclicACMILduInterface() noexcept = default;
 
 
     //- Destructor
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
index db62818fb1..80583460af 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(cyclicAMILduInterface, 0);
+    defineTypeName(cyclicAMILduInterface);
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H
index da50e61fc0..cc31fa2364 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMILduInterfaceField/cyclicAMILduInterface.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicAMILduInterface_H
-#define cyclicAMILduInterface_H
+#ifndef Foam_cyclicAMILduInterface_H
+#define Foam_cyclicAMILduInterface_H
 
 #include "primitiveFieldsFwd.H"
 #include "AMIPatchToPatchInterpolation.H"
@@ -52,17 +52,16 @@ namespace Foam
 
 class cyclicAMILduInterface
 {
-
 public:
 
     //- Runtime type information
-    TypeName("cyclicAMILduInterface");
+    TypeNameNoDebug("cyclicAMILduInterface");
 
 
     // Constructors
 
-        //- Construct null
-        cyclicAMILduInterface() = default;
+        //- Default construct
+        cyclicAMILduInterface() noexcept = default;
 
 
     //- Destructor
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index b81b905323..5fba5daa5a 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -434,7 +434,7 @@ void Foam::cyclicAMIPolyPatch::resetAMI(const UList<point>& points) const
     }
 
     // Construct/apply AMI interpolation to determine addressing and weights
-    AMIPtr_->upToDate() = false;
+    AMIPtr_->upToDate(false);
     AMIPtr_->calculate(patch0, nbrPatch0, surfPtr());
 
     if (debug)
@@ -485,7 +485,7 @@ void Foam::cyclicAMIPolyPatch::initGeometry(PstreamBuffers& pBufs)
     DebugInFunction << endl;
 
     // Flag AMI as needing update
-    AMIPtr_->upToDate() = false;
+    AMIPtr_->upToDate(false);
 
     polyPatch::initGeometry(pBufs);
 
@@ -531,7 +531,7 @@ void Foam::cyclicAMIPolyPatch::initMovePoints
     }
     else
     {
-        AMIPtr_->upToDate() = false;
+        AMIPtr_->upToDate(false);
     }
 
     // Early calculation of transforms. See above.
@@ -591,7 +591,7 @@ void Foam::cyclicAMIPolyPatch::clearGeom()
 
     if (!updatingAMI_)
     {
-        AMIPtr_->upToDate() = false;
+        AMIPtr_->upToDate(false);
     }
 
     polyPatch::clearGeom();
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 2daa2cb6dd..7c1ed9f155 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -1571,7 +1571,7 @@ void Foam::mappedPatchBase::clearOut()
 {
     mapPtr_.reset(nullptr);
     surfPtr_.reset(nullptr);
-    AMIPtr_->upToDate() = false;
+    AMIPtr_->upToDate(false);
 }
 
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index c2dbee34be..e671f9948d 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@@ -275,7 +275,7 @@ inline const Foam::mapDistribute& Foam::mappedPatchBase::map() const
 
         if (AMIPtr_)
         {
-            AMIPtr_->upToDate() = false;
+            AMIPtr_->upToDate(false);
         }
     }
 
@@ -296,12 +296,12 @@ inline const Foam::AMIPatchToPatchInterpolation& Foam::mappedPatchBase::AMI
     if (!upToDate())
     {
         mapPtr_.reset(nullptr);
-        AMIPtr_->upToDate() = false;
+        AMIPtr_->upToDate(false);
     }
 
     if (forceUpdate)
     {
-        AMIPtr_->upToDate() = false;
+        AMIPtr_->upToDate(false);
     }
 
     calcAMI();
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
index 40512a0f1f..e3f667e34a 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
@@ -108,7 +108,7 @@ void Foam::calculatedProcessorGAMGInterfaceField::initInterfaceMatrixUpdate
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && !UPstream::floatTransfer
     )
     {
         // Fast path.
@@ -141,8 +141,7 @@ void Foam::calculatedProcessorGAMGInterfaceField::initInterfaceMatrixUpdate
         procInterface_.compressedSend(commsType, scalarSendBuf_);
     }
 
-    const_cast<calculatedProcessorGAMGInterfaceField&>(*this).updatedMatrix()
-        = false;
+    this->updatedMatrix(false);
 }
 
 
@@ -158,7 +157,7 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
     const Pstream::commsTypes commsType
 ) const
 {
-    if (updatedMatrix())
+    if (this->updatedMatrix())
     {
         return;
     }
@@ -168,7 +167,7 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
     if
     (
         commsType == Pstream::commsTypes::nonBlocking
-     && !Pstream::floatTransfer
+     && !UPstream::floatTransfer
     )
     {
         // Fast path: consume straight from receive buffer
@@ -199,8 +198,7 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
         addToInternalField(result, !add, faceCells, coeffs, pnf);
     }
 
-    const_cast<calculatedProcessorGAMGInterfaceField&>(*this).updatedMatrix()
-        = true;
+    this->updatedMatrix(true);
 }
 
 
diff --git a/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.C b/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.C
index 121e3132df..5798d54cd7 100644
--- a/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.C
+++ b/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.C
@@ -32,13 +32,8 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(oversetLduInterface, 0);
+    defineTypeName(oversetLduInterface);
 }
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::oversetLduInterface::~oversetLduInterface()
-{}
-
 
 // ************************************************************************* //
diff --git a/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.H b/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.H
index e7ff2874f3..66815587fd 100644
--- a/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.H
+++ b/src/overset/oversetCoupledPolyPatch/oversetLduInterface/oversetLduInterface.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef oversetLduInterface_H
-#define oversetLduInterface_H
+#ifndef Foam_oversetLduInterface_H
+#define Foam_oversetLduInterface_H
 
 #include "typeInfo.H"
 
@@ -53,18 +53,17 @@ class oversetLduInterface
 public:
 
     //- Runtime type information
-    TypeName("oversetLduInterface");
+    TypeNameNoDebug("oversetLduInterface");
 
 
     // Constructors
 
-        //- Construct null
-        oversetLduInterface()
-        {}
+        //- Default construct
+        oversetLduInterface() noexcept = default;
 
 
     //- Destructor
-    virtual ~oversetLduInterface();
+    virtual ~oversetLduInterface() = default;
 };
 
 

From 2d4ecc43263bea849b084a6fdbbef8bfab796461 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 12 Jan 2023 14:27:40 +0100
Subject: [PATCH 008/348] GIT: remove unnecessary PatchField Fwd headers

- reduces clutter. In some cases the Fwd typedefs were also incorrect

STYLE: combine Scalar specialisations into corresponding PatchFields.C

- reduces clutter, simplifies future adjustments
---
 .../codedFixedValuePointPatchFieldsFwd.H      |  52 ------
 .../porousBafflePressureFvPatchFieldFwd.H     |  52 ------
 src/finiteArea/Make/files                     |   4 +-
 .../basicSymmetryFaPatchFields.C              |  33 ++--
 .../basicSymmetryFaPatchScalarField.C         |  56 ------
 .../calculated/calculatedFaPatchFieldsFwd.H   |  57 ------
 .../basic/coupled/coupledFaPatchFieldsFwd.H   |  52 ------
 .../fixedGradientFaPatchFieldsFwd.H           |  57 ------
 .../fixedValue/fixedValueFaPatchFieldsFwd.H   |  52 ------
 .../basic/mixed/mixedFaPatchFieldsFwd.H       |  52 ------
 .../basic/transform/transformFaPatchFields.C  |  15 +-
 .../transform/transformFaPatchScalarField.C   |  40 -----
 .../zeroGradientFaPatchFieldsFwd.H            |  52 ------
 .../cyclic/cyclicFaPatchFieldsFwd.H           |  53 ------
 .../constraint/empty/emptyFaPatchFieldsFwd.H  |  52 ------
 .../symmetry/symmetryFaPatchFieldsFwd.H       |  53 ------
 .../constraint/wedge/wedgeFaPatchFields.C     |  26 ++-
 .../constraint/wedge/wedgeFaPatchFieldsFwd.H  |  58 -------
 .../wedge/wedgeFaPatchScalarField.C           |  53 ------
 .../clampedPlateFaPatchFieldsFwd.H            |  52 ------
 .../fixedValueOutflowFaPatchFieldsFwd.H       |  52 ------
 .../inletOutlet/inletOutletFaPatchFieldsFwd.H |  52 ------
 .../derived/slip/slipFaPatchFieldsFwd.H       |  53 ------
 ...VaryingUniformFixedValueFaPatchFieldsFwd.H |  54 ------
 .../calculated/calculatedFaePatchFieldsFwd.H  |  57 ------
 .../basic/coupled/coupledFaePatchFieldsFwd.H  |  55 ------
 .../fixedValue/fixedValueFaePatchFieldsFwd.H  |  52 ------
 .../cyclic/cyclicFaePatchFieldsFwd.H          |  53 ------
 .../constraint/empty/emptyFaePatchFieldsFwd.H |  52 ------
 .../processor/processorFaePatchFieldsFwd.H    |  52 ------
 .../symmetry/symmetryFaePatchFieldsFwd.H      |  53 ------
 .../constraint/wedge/wedgeFaePatchFieldsFwd.H |  52 ------
 src/finiteVolume/Make/files                   |   5 +-
 .../exprFixedValueFvPatchFieldsFwd.H          |  52 ------
 .../fvPatchFields/exprMixedFvPatchFieldsFwd.H |  52 ------
 ...arField.C => basicSymmetryFvPatchFields.C} |   4 +-
 .../calculated/calculatedFvPatchFieldsFwd.H   |  52 ------
 .../basic/coupled/coupledFvPatchFieldsFwd.H   |  52 ------
 .../directionMixedFvPatchFieldsFwd.H          |  52 ------
 .../extrapolatedCalculatedFvPatchFieldsFwd.H  |  52 ------
 .../fixedGradientFvPatchFieldsFwd.H           |  52 ------
 .../fixedValue/fixedValueFvPatchFieldsFwd.H   |  52 ------
 .../basic/mixed/mixedFvPatchFieldsFwd.H       |  52 ------
 .../basic/sliced/slicedFvPatchFieldsFwd.H     |  52 ------
 .../basic/transform/transformFvPatchFields.C  |  26 ++-
 .../transform/transformFvPatchFieldsFwd.H     |  52 ------
 .../transform/transformFvPatchScalarField.C   |  51 ------
 .../zeroGradientFvPatchFieldsFwd.H            |  52 ------
 .../calculatedProcessorFvPatchFieldsFwd.H     |  52 ------
 .../cyclic/cyclicFvPatchFieldsFwd.H           |  52 ------
 .../cyclicACMI/cyclicACMIFvPatchFieldsFwd.H   |  52 ------
 .../cyclicAMI/cyclicAMIFvPatchFieldsFwd.H     |  52 ------
 .../cyclicSlip/cyclicSlipFvPatchFieldsFwd.H   |  52 ------
 .../constraint/empty/emptyFvPatchFieldsFwd.H  |  52 ------
 .../jumpCyclic/jumpCyclicFvPatchFieldsFwd.H   |  52 ------
 .../jumpCyclicAMIFvPatchFieldsFwd.H           |  52 ------
 ...onuniformTransformCyclicFvPatchFieldsFwd.H |  52 ------
 .../processor/processorFvPatchFieldsFwd.H     |  52 ------
 .../processorCyclicFvPatchFieldsFwd.H         |  52 ------
 .../symmetry/symmetryFvPatchFieldsFwd.H       |  52 ------
 .../symmetryPlaneFvPatchFields.C              |  31 +++-
 .../symmetryPlaneFvPatchFieldsFwd.H           |  52 ------
 .../symmetryPlaneFvPatchScalarField.C         |  57 ------
 .../constraint/wedge/wedgeFvPatchFields.C     |  30 +++-
 .../constraint/wedge/wedgeFvPatchFieldsFwd.H  |  52 ------
 .../wedge/wedgeFvPatchScalarField.C           |  61 -------
 ...acousticWaveTransmissiveFvPatchFieldsFwd.H |  52 ------
 .../advective/advectiveFvPatchFieldsFwd.H     |  52 ------
 .../codedFixedValueFvPatchFieldsFwd.H         |  52 ------
 .../codedMixed/codedMixedFvPatchFieldsFwd.H   |  52 ------
 .../derived/fan/fanFvPatchFieldsFwd.H         |  52 ------
 .../fixedJump/fixedJumpFvPatchFieldsFwd.H     |  52 ------
 .../fixedJumpAMIFvPatchFieldsFwd.H            |  52 ------
 .../fixedMean/fixedMeanFvPatchFieldsFwd.H     |  52 ------
 .../fixedMeanOutletInletFvPatchFieldsFwd.H    |  52 ------
 .../fixedNormalSlipFvPatchFieldsFwd.H         |  53 ------
 .../fixedProfileFvPatchFieldsFwd.H            |  52 ------
 .../freestream/freestreamFvPatchFieldsFwd.H   |  52 ------
 .../inletOutlet/inletOutletFvPatchFieldsFwd.H |  52 ------
 .../mappedField/mappedFieldFvPatchFieldsFwd.H |  52 ------
 ...mappedFixedInternalValueFvPatchFieldsFwd.H |  52 ------
 ...FixedPushedInternalValueFvPatchFieldsFwd.H |  52 ------
 .../mappedFixedValueFvPatchFieldsFwd.H        |  52 ------
 .../outletInlet/outletInletFvPatchFieldsFwd.H |  52 ------
 ...outletMappedUniformInletFvPatchFieldsFwd.H |  52 ------
 .../partialSlip/partialSlipFvPatchFieldsFwd.H |  52 ------
 .../scaledFixedValueFvPatchFieldsFwd.H        |  52 ------
 .../derived/slip/slipFvPatchFieldsFwd.H       |  52 ------
 ...eVaryingMappedFixedValueFvPatchFieldsFwd.H |  52 ------
 ...bulentDigitalFilterInletFvPatchFieldsFwd.H |  52 ------
 .../turbulentInletFvPatchFieldsFwd.H          |  52 ------
 .../uniformFixedGradientFvPatchFieldsFwd.H    |  52 ------
 .../uniformFixedValueFvPatchFieldsFwd.H       |  52 ------
 .../uniformInletOutletFvPatchFieldsFwd.H      |  52 ------
 .../uniformJump/uniformJumpFvPatchFieldsFwd.H |  52 ------
 .../uniformJumpAMIFvPatchFieldsFwd.H          |  52 ------
 .../waveTransmissiveFvPatchFieldsFwd.H        |  52 ------
 .../calculated/calculatedFvsPatchFieldsFwd.H  |  57 ------
 .../basic/coupled/coupledFvsPatchFieldsFwd.H  |  55 ------
 .../fixedValue/fixedValueFvsPatchFieldsFwd.H  |  52 ------
 .../basic/sliced/slicedFvsPatchFieldsFwd.H    |  55 ------
 .../cyclic/cyclicFvsPatchFieldsFwd.H          |  52 ------
 .../cyclicACMI/cyclicACMIFvsPatchFieldsFwd.H  |  52 ------
 .../cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H    |  52 ------
 .../cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H  |  52 ------
 .../constraint/empty/emptyFvsPatchFieldsFwd.H |  52 ------
 ...nuniformTransformCyclicFvsPatchFieldsFwd.H |  52 ------
 .../processor/processorFvsPatchFieldsFwd.H    |  52 ------
 .../processorCyclicFvsPatchFieldsFwd.H        |  52 ------
 .../symmetry/symmetryFvsPatchFieldsFwd.H      |  52 ------
 .../symmetryPlaneFvsPatchFieldsFwd.H          |  52 ------
 .../constraint/wedge/wedgeFvsPatchFieldsFwd.H |  52 ------
 .../externalCoupledMixedFvPatchFieldsFwd.H    |  52 ------
 .../cellMotion/cellMotionFvPatchFieldsFwd.H   |  52 ------
 .../surfaceSlipDisplacementFvPatchFieldsFwd.H |  52 ------
 .../adjointOutletFluxFvPatchFieldsFwd.H       |  53 ------
 .../adjointOutletFluxFvPatchScalarField.C     | 151 ----------------
 .../adjointOutletFluxFvPatchScalarField.H     | 163 ------------------
 118 files changed, 131 insertions(+), 5971 deletions(-)
 delete mode 100644 src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFieldsFwd.H
 delete mode 100644 src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
 delete mode 100644 src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFieldsFwd.H
 delete mode 100644 src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFieldsFwd.H
 rename src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/{basicSymmetryFvPatchScalarField.C => basicSymmetryFvPatchFields.C} (95%)
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchFieldsFwd.H
 delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFieldsFwd.H
 delete mode 100644 src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
 delete mode 100644 src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFieldsFwd.H
 delete mode 100644 src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFieldsFwd.H
 delete mode 100644 src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchFieldsFwd.H
 delete mode 100644 src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C
 delete mode 100644 src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.H

diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFieldsFwd.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFieldsFwd.H
deleted file mode 100644
index 8323b1ea1b..0000000000
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedFixedValuePointPatchFieldsFwd_H
-#define codedFixedValuePointPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class codedFixedValuePointPatchField;
-
-makePatchTypeFieldTypedefs(codedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H
deleted file mode 100644
index dc33b70a07..0000000000
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef porousBafflePressureFvPatchFieldFwd_H
-#define porousBafflePressureFvPatchFieldFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class porousBafflePressureFvPatchField;
-
-makePatchTypeFieldTypedefs(porousBafflePressure);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index fd0d7f92a9..8bcad5e551 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -42,7 +42,7 @@ $(faPatchFields)/faPatchField/faPatchFieldBase.C
 $(faPatchFields)/faPatchField/faPatchFields.C
 
 basicFaPatchFields = $(faPatchFields)/basic
-$(basicFaPatchFields)/basicSymmetry/basicSymmetryFaPatchScalarField.C
+$(basicFaPatchFields)/basicSymmetry/basicSymmetryFaPatchFields.C
 $(basicFaPatchFields)/calculated/calculatedFaPatchFields.C
 $(basicFaPatchFields)/coupled/coupledFaPatchFields.C
 $(basicFaPatchFields)/zeroGradient/zeroGradientFaPatchFields.C
@@ -50,13 +50,11 @@ $(basicFaPatchFields)/fixedValue/fixedValueFaPatchFields.C
 $(basicFaPatchFields)/fixedGradient/fixedGradientFaPatchFields.C
 $(basicFaPatchFields)/mixed/mixedFaPatchFields.C
 $(basicFaPatchFields)/transform/transformFaPatchFields.C
-$(basicFaPatchFields)/transform/transformFaPatchScalarField.C
 
 constraintFaPatchFields = $(faPatchFields)/constraint
 $(constraintFaPatchFields)/empty/emptyFaPatchFields.C
 $(constraintFaPatchFields)/processor/processorFaPatchFields.C
 $(constraintFaPatchFields)/wedge/wedgeFaPatchFields.C
-$(constraintFaPatchFields)/wedge/wedgeFaPatchScalarField.C
 $(constraintFaPatchFields)/cyclic/cyclicFaPatchFields.C
 $(constraintFaPatchFields)/symmetry/symmetryFaPatchFields.C
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.C b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.C
index fde78f9419..5eb0ce55dd 100644
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.C
@@ -25,22 +25,35 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicSymmetryFaPatchFields.H"
-#include "faPatchFields.H"
-#include "areaFaMesh.H"
-#include "addToRunTimeSelectionTable.H"
+#include "basicSymmetryFaPatchField.H"
+#include "areaFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// No run-time selection
 
-namespace Foam
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
+
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::basicSymmetryFaPatchField<Foam::scalar>::snGrad() const
 {
+    return tmp<scalarField>::New(size(), Zero);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makeFaPatchFields(basicSymmetry);
+template<>
+void Foam::basicSymmetryFaPatchField<Foam::scalar>::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!updated())
+    {
+        updateCoeffs();
+    }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    scalarField::operator=(patchInternalField());
+    transformFaPatchField<scalar>::evaluate();
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
deleted file mode 100644
index 3f27ab01e2..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchScalarField.C
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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 "basicSymmetryFaPatchField.H"
-#include "areaFields.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-Foam::tmp<Foam::scalarField>
-Foam::basicSymmetryFaPatchField<Foam::scalar>::snGrad() const
-{
-    return tmp<scalarField>::New(size(), Zero);
-}
-
-
-template<>
-void Foam::basicSymmetryFaPatchField<Foam::scalar>::evaluate
-(
-    const Pstream::commsTypes
-)
-{
-    if (!updated())
-    {
-        updateCoeffs();
-    }
-    scalarField::operator=(patchInternalField());
-    transformFaPatchField<scalar>::evaluate();
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFieldsFwd.H
deleted file mode 100644
index ddd2cd3146..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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::calculatedFaPatchField
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef calculatedFaPatchFieldsFwd_H
-#define calculatedFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class calculatedFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(calculated)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFieldsFwd.H
deleted file mode 100644
index 9864ec8683..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef coupledFaPatchFieldsFwd_H
-#define coupledFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class coupledFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(coupled)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFieldsFwd.H
deleted file mode 100644
index c3c82db18b..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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::fixedGradientFaPatchField
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedGradientFaPatchFieldsFwd_H
-#define fixedGradientFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedGradientFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(fixedGradient)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFieldsFwd.H
deleted file mode 100644
index 0b52325864..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedValueFaPatchFieldsFwd_H
-#define fixedValueFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedValueFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(fixedValue)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFieldsFwd.H
deleted file mode 100644
index b65af92735..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mixedFaPatchFieldsFwd_H
-#define mixedFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class mixedFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(mixed)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.C b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.C
index dec6e949c0..80e8e0bec1 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.C
@@ -29,17 +29,22 @@ License
 #include "transformFaPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makeFaPatchFieldsTypeName(transform);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makeFaPatchFieldsTypeName(transform);
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::transformFaPatchField<Foam::scalar>::gradientInternalCoeffs() const
+{
+    return tmp<scalarField>::New(size(), Zero);
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
deleted file mode 100644
index 65216baf43..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchScalarField.C
+++ /dev/null
@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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 "transformFaPatchField.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-Foam::tmp<Foam::scalarField>
-Foam::transformFaPatchField<Foam::scalar>::gradientInternalCoeffs() const
-{
-    return tmp<scalarField>::New(size(), Zero);
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFieldsFwd.H
deleted file mode 100644
index 17f172d621..0000000000
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef zeroGradientFaPatchFieldsFwd_H
-#define zeroGradientFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class zeroGradientFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(zeroGradient)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFieldsFwd.H
deleted file mode 100644
index 9573ca5865..0000000000
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicFaPatchFieldsFwd_H
-#define cyclicFaPatchFieldsFwd_H
-
-// #include "faPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(cyclic)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFieldsFwd.H
deleted file mode 100644
index 0e3ccab6e2..0000000000
--- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef emptyFaPatchFieldsFwd_H
-#define emptyFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class emptyFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(empty)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFieldsFwd.H
deleted file mode 100644
index dcf609885b..0000000000
--- a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef symmetryFaPatchFieldsFwd_H
-#define symmetryFaPatchFieldsFwd_H
-
-#include "faPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class symmetryFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(symmetry)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.C b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.C
index e530df9baf..15a0ff125f 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.C
@@ -29,17 +29,33 @@ License
 #include "wedgeFaPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makeFaPatchFields(wedge);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
 
-makeFaPatchFields(wedge);
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::wedgeFaPatchField<Foam::scalar>::snGrad() const
+{
+    return tmp<scalarField>::New(size(), Zero);
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+template<>
+void Foam::wedgeFaPatchField<Foam::scalar>::evaluate(const Pstream::commsTypes)
+{
+    if (!updated())
+    {
+        updateCoeffs();
+    }
+
+    this->operator==(patchInternalField());
+}
+
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFieldsFwd.H
deleted file mode 100644
index 654ba35a88..0000000000
--- a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,58 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef wedgeFaPatchFieldsFwd_H
-#define wedgeFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class wedgeFaPatchField;
-
-// typedef wedgeFaPatchField<scalar> wedgeFaPatchScalarField;
-// typedef wedgeFaPatchField<vector> wedgeFaPatchVectorField;
-// typedef wedgeFaPatchField<tensor> wedgeFaPatchTensorField;
-
-// template<class Type> class wedgeFvPatchField;
-
-makeFaPatchTypeFieldTypedefs(wedge)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
deleted file mode 100644
index 71d413785c..0000000000
--- a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchScalarField.C
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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 "wedgeFaPatchField.H"
-#include "areaFields.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-Foam::tmp<Foam::scalarField>
-Foam::wedgeFaPatchField<Foam::scalar>::snGrad() const
-{
-    return tmp<scalarField>::New(size(), Zero);
-}
-
-
-template<>
-void Foam::wedgeFaPatchField<Foam::scalar>::evaluate(const Pstream::commsTypes)
-{
-    if (!updated())
-    {
-        updateCoeffs();
-    }
-
-    this->operator==(patchInternalField());
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFieldsFwd.H
deleted file mode 100644
index 949f510afc..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +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/>
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef clampedPlateFaPatchFieldsFwd_H
-#define clampedPlateFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class clampedPlateFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(clampedPlate)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFieldsFwd.H
deleted file mode 100644
index 964c69f9a3..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedValueOutflowFaPatchFieldsFwd_H
-#define fixedValueOutflowFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedValueOutflowFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(fixedValueOutflow)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFieldsFwd.H
deleted file mode 100644
index 7088112320..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef inletOutletFaPatchFieldsFwd_H
-#define inletOutletFaPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class inletOutletFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(inletOutlet)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFieldsFwd.H
deleted file mode 100644
index 4480e31460..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef slipFaPatchFieldsFwd_H
-#define slipFaPatchFieldsFwd_H
-
-#include "faPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class slipFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(slip)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFieldsFwd.H
deleted file mode 100644
index 6691ec7fc2..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFieldsFwd.H
+++ /dev/null
@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki Ltd
-    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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef timeVaryingUniformFixedValueFaPatchFieldsFwd_H
-#define timeVaryingUniformFixedValueFaPatchFieldsFwd_H
-
-#include "faPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class timeVaryingUniformFixedValueFaPatchField;
-
-makeFaPatchTypeFieldTypedefs(timeVaryingUniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFieldsFwd.H
deleted file mode 100644
index 9ec6da312b..0000000000
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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::calculatedFaePatchField
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef calculatedFaePatchFieldsFwd_H
-#define calculatedFaePatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class calculatedFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(calculated)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFieldsFwd.H
deleted file mode 100644
index a5fb4d4b3e..0000000000
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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::coupledFaePatchField
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef coupledFaePatchFieldsFwd_H
-#define coupledFaePatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class coupledFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(coupled)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFieldsFwd.H
deleted file mode 100644
index 967c9990a6..0000000000
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedValueFaePatchFieldsFwd_H
-#define fixedValueFaePatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedValueFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(fixedValue)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFieldsFwd.H
deleted file mode 100644
index e8f495cae7..0000000000
--- a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicFaePatchFieldsFwd_H
-#define cyclicFaePatchFieldsFwd_H
-
-#include "faePatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(cyclic)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFieldsFwd.H
deleted file mode 100644
index a10b263f67..0000000000
--- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef emptyFaePatchFieldsFwd_H
-#define emptyFaePatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class emptyFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(empty)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFieldsFwd.H
deleted file mode 100644
index 46fcbc3f61..0000000000
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorFaePatchFieldsFwd_H
-#define processorFaePatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class processorFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(processor)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFieldsFwd.H
deleted file mode 100644
index a66435e41c..0000000000
--- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef symmetryFaePatchFieldsFwd_H
-#define symmetryFaePatchFieldsFwd_H
-
-#include "faPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class symmetryFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(symmetry)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFieldsFwd.H
deleted file mode 100644
index dc282b724d..0000000000
--- a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef wedgeFaePatchFieldsFwd_H
-#define wedgeFaePatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class wedgeFaePatchField;
-
-makeFaePatchTypeFieldTypedefs(wedge)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 81e58615eb..5c74143d8f 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -126,7 +126,7 @@ $(fvPatchFields)/fvPatchField/fvPatchFieldBase.C
 $(fvPatchFields)/fvPatchField/fvPatchFields.C
 
 basicFvPatchFields = $(fvPatchFields)/basic
-$(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchScalarField.C
+$(basicFvPatchFields)/basicSymmetry/basicSymmetryFvPatchFields.C
 $(basicFvPatchFields)/calculated/calculatedFvPatchFields.C
 $(basicFvPatchFields)/extrapolatedCalculated/extrapolatedCalculatedFvPatchFields.C
 $(basicFvPatchFields)/coupled/coupledFvPatchFields.C
@@ -136,7 +136,6 @@ $(basicFvPatchFields)/fixedValue/fixedValueFvPatchFields.C
 $(basicFvPatchFields)/mixed/mixedFvPatchFields.C
 $(basicFvPatchFields)/sliced/slicedFvPatchFields.C
 $(basicFvPatchFields)/transform/transformFvPatchFields.C
-$(basicFvPatchFields)/transform/transformFvPatchScalarField.C
 $(basicFvPatchFields)/zeroGradient/zeroGradientFvPatchFields.C
 
 constraintFvPatchFields = $(fvPatchFields)/constraint
@@ -152,10 +151,8 @@ $(constraintFvPatchFields)/processor/processorFvPatchFields.C
 $(constraintFvPatchFields)/processorCyclic/processorCyclicFvPatchFields.C
 $(constraintFvPatchFields)/calculatedProcessor/calculatedProcessorFvPatchFields.C
 $(constraintFvPatchFields)/symmetryPlane/symmetryPlaneFvPatchFields.C
-$(constraintFvPatchFields)/symmetryPlane/symmetryPlaneFvPatchScalarField.C
 $(constraintFvPatchFields)/symmetry/symmetryFvPatchFields.C
 $(constraintFvPatchFields)/wedge/wedgeFvPatchFields.C
-$(constraintFvPatchFields)/wedge/wedgeFvPatchScalarField.C
 
 derivedFvPatchFields = $(fvPatchFields)/derived
 $(derivedFvPatchFields)/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index 375adc50be..0000000000
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprFixedValueFvPatchFieldsFwd_H
-#define exprFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class exprFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(exprFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFieldsFwd.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFieldsFwd.H
deleted file mode 100644
index 2db491b761..0000000000
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprMixedFvPatchFieldsFwd_H
-#define exprMixedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class exprMixedFvPatchField;
-
-makePatchTypeFieldTypedefs(exprMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C
similarity index 95%
rename from src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
rename to src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C
index 003e9d40e3..484a7354f5 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchFields.C
@@ -28,7 +28,9 @@ License
 #include "basicSymmetryFvPatchField.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// No run-time selection
+
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
 
 template<>
 Foam::tmp<Foam::scalarField>
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFieldsFwd.H
deleted file mode 100644
index dff1d303fd..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef calculatedFvPatchFieldsFwd_H
-#define calculatedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class calculatedFvPatchField;
-
-makePatchTypeFieldTypedefs(calculated);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchFieldsFwd.H
deleted file mode 100644
index c6015b8eca..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef coupledFvPatchFieldsFwd_H
-#define coupledFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class coupledFvPatchField;
-
-makePatchTypeFieldTypedefs(coupled);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchFieldsFwd.H
deleted file mode 100644
index 6fa1c5ab6d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef directionMixedFvPatchFieldsFwd_H
-#define directionMixedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class directionMixedFvPatchField;
-
-makePatchTypeFieldTypedefs(directionMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H
deleted file mode 100644
index c1d09a40f8..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef extrapolatedCalculatedFvPatchFieldsFwd_H
-#define extrapolatedCalculatedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class extrapolatedCalculatedFvPatchField;
-
-makePatchTypeFieldTypedefs(extrapolatedCalculated);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchFieldsFwd.H
deleted file mode 100644
index c2b149d0ef..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedGradientFvPatchFieldsFwd_H
-#define fixedGradientFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedGradientFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedGradient);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index cddab62a8a..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedValueFvPatchFieldsFwd_H
-#define fixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchFieldsFwd.H
deleted file mode 100644
index 3a420254bf..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mixedFvPatchFieldsFwd_H
-#define mixedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class mixedFvPatchField;
-
-makePatchTypeFieldTypedefs(mixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchFieldsFwd.H
deleted file mode 100644
index 2a2246332c..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef slicedFvPatchFieldsFwd_H
-#define slicedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class slicedFvPatchField;
-
-makePatchTypeFieldTypedefs(sliced);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFields.C
index 0c8cbca2b2..ffb781a7f1 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFields.C
@@ -29,17 +29,33 @@ License
 #include "fvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makePatchFieldTypeNames(transform);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFieldTypeNames(transform);
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::transformFvPatchField<Foam::scalar>::valueInternalCoeffs
+(
+    const tmp<scalarField>&
+) const
+{
+    return tmp<scalarField>::New(size(), 1.0);
+}
+
+
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::transformFvPatchField<Foam::scalar>::gradientInternalCoeffs() const
+{
+    return tmp<scalarField>::New(size(), Zero);
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFieldsFwd.H
deleted file mode 100644
index da99322ad3..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef transformFvPatchFieldsFwd_H
-#define transformFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class transformFvPatchField;
-
-makePatchTypeFieldTypedefs(transform);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
deleted file mode 100644
index b92cd4d34d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2015 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 "transformFvPatchField.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-Foam::tmp<Foam::scalarField>
-Foam::transformFvPatchField<Foam::scalar>::valueInternalCoeffs
-(
-    const tmp<scalarField>&
-) const
-{
-    return tmp<scalarField>::New(size(), 1.0);
-}
-
-
-template<>
-Foam::tmp<Foam::scalarField>
-Foam::transformFvPatchField<Foam::scalar>::gradientInternalCoeffs() const
-{
-    return tmp<scalarField>::New(size(), Zero);
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFieldsFwd.H
deleted file mode 100644
index 9645f76fc2..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef zeroGradientFvPatchFieldsFwd_H
-#define zeroGradientFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class zeroGradientFvPatchField;
-
-makePatchTypeFieldTypedefs(zeroGradient);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchFieldsFwd.H
deleted file mode 100644
index c14320c84f..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef calculatedProcessorFvPatchFieldsFwd_H
-#define calculatedProcessorFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class calculatedProcessorFvPatchField;
-
-makePatchTypeFieldTypedefs(calculatedProcessor);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFieldsFwd.H
deleted file mode 100644
index 7aadba4532..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicFvPatchFieldsFwd_H
-#define cyclicFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicFvPatchField;
-
-makePatchTypeFieldTypedefs(cyclic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchFieldsFwd.H
deleted file mode 100644
index 60e43c41d4..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicACMIFvPatchFieldsFwd_H
-#define cyclicACMIFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicACMIFvPatchField;
-
-makePatchTypeFieldTypedefs(cyclicACMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFieldsFwd.H
deleted file mode 100644
index 82ac80d0b0..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicAMIFvPatchFieldsFwd_H
-#define cyclicAMIFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicAMIFvPatchField;
-
-makePatchTypeFieldTypedefs(cyclicAMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H
deleted file mode 100644
index 324daa6eb6..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicSlipFvPatchFieldsFwd_H
-#define cyclicSlipFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicSlipFvPatchField;
-
-makePatchTypeFieldTypedefs(cyclicSlip);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFieldsFwd.H
deleted file mode 100644
index 1798a0a309..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef emptyFvPatchFieldsFwd_H
-#define emptyFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class emptyFvPatchField;
-
-makePatchTypeFieldTypedefs(empty);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFieldsFwd.H
deleted file mode 100644
index 22cb1547b9..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef jumpCyclicFvPatchFieldsFwd_H
-#define jumpCyclicFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class jumpCyclicFvPatchField;
-
-makePatchTypeFieldTypedefs(jumpCyclic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFieldsFwd.H
deleted file mode 100644
index 368c2d40ce..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef jumpCyclicAMIFvPatchFieldsFwd_H
-#define jumpCyclicAMIFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class jumpCyclicAMIFvPatchField;
-
-makePatchTypeFieldTypedefs(jumpCyclicAMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H
deleted file mode 100644
index 4196d885e6..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nonuniformTransformCyclicFvPatchFieldsFwd_H
-#define nonuniformTransformCyclicFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class nonuniformTransformCyclicFvPatchField;
-
-makePatchTypeFieldTypedefs(nonuniformTransformCyclic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFieldsFwd.H
deleted file mode 100644
index 5522552607..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorFvPatchFieldsFwd_H
-#define processorFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class processorFvPatchField;
-
-makePatchTypeFieldTypedefs(processor);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H
deleted file mode 100644
index cf9724b277..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorCyclicFvPatchFieldsFwd_H
-#define processorCyclicFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class processorCyclicFvPatchField;
-
-makePatchTypeFieldTypedefs(processor);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFieldsFwd.H
deleted file mode 100644
index 288db3c9f7..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef symmetryFvPatchFieldsFwd_H
-#define symmetryFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class symmetryFvPatchField;
-
-makePatchTypeFieldTypedefs(symmetry);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C
index 0e04f3f098..e3ed414075 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFields.C
@@ -29,17 +29,38 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makePatchFields(symmetryPlane);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(symmetryPlane);
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::symmetryPlaneFvPatchField<Foam::scalar>::snGrad() const
+{
+    return tmp<scalarField>::New(size(), Zero);
+}
+
+
+template<>
+void Foam::symmetryPlaneFvPatchField<Foam::scalar>::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!updated())
+    {
+        updateCoeffs();
+    }
+
+    scalarField::operator=(patchInternalField());
+    transformFvPatchField<scalar>::evaluate();
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFieldsFwd.H
deleted file mode 100644
index 9e6b21083a..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef symmetryPlaneFvPatchFieldsFwd_H
-#define symmetryPlaneFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class symmetryPlaneFvPatchField;
-
-makePatchTypeFieldTypedefs(symmetryPlane);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
deleted file mode 100644
index a9cfc0aeed..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchScalarField.C
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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 "symmetryPlaneFvPatchField.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-Foam::tmp<Foam::scalarField>
-Foam::symmetryPlaneFvPatchField<Foam::scalar>::snGrad() const
-{
-    return tmp<scalarField>::New(size(), Zero);
-}
-
-
-template<>
-void Foam::symmetryPlaneFvPatchField<Foam::scalar>::evaluate
-(
-    const Pstream::commsTypes
-)
-{
-    if (!updated())
-    {
-        updateCoeffs();
-    }
-
-    scalarField::operator=(patchInternalField());
-    transformFvPatchField<scalar>::evaluate();
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C
index 478eeeee4b..7225ce6108 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFields.C
@@ -29,17 +29,37 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makePatchFields(wedge);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(wedge);
+// * * * * * * * * * * * * * * * Specialisations * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::wedgeFvPatchField<Foam::scalar>::snGrad() const
+{
+    return tmp<scalarField>::New(size(), Zero);
+}
+
+
+template<>
+void Foam::wedgeFvPatchField<Foam::scalar>::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!updated())
+    {
+        updateCoeffs();
+    }
+
+    this->operator==(patchInternalField());
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFieldsFwd.H
deleted file mode 100644
index 7c840cf6ad..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef wedgeFvPatchFieldsFwd_H
-#define wedgeFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class wedgeFvPatchField;
-
-makePatchTypeFieldTypedefs(wedge);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
deleted file mode 100644
index 50230f8b25..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C
+++ /dev/null
@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2012 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 "wedgeFvPatchField.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-tmp<scalarField> wedgeFvPatchField<scalar>::snGrad() const
-{
-    return tmp<scalarField>::New(size(), Zero);
-}
-
-
-template<>
-void wedgeFvPatchField<scalar>::evaluate(const Pstream::commsTypes)
-{
-    if (!updated())
-    {
-        updateCoeffs();
-    }
-
-    this->operator==(patchInternalField());
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchFieldsFwd.H
deleted file mode 100644
index cf54c57098..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef acousticWaveTransmissiveFvPatchFieldsFwd_H
-#define acousticWaveTransmissiveFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class acousticWaveTransmissiveFvPatchField;
-
-makePatchTypeFieldTypedefs(acousticWaveTransmissive);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchFieldsFwd.H
deleted file mode 100644
index 35b85dab80..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef advectiveFvPatchFieldsFwd_H
-#define advectiveFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class advectiveFvPatchField;
-
-makePatchTypeFieldTypedefs(advective);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index 1dbbe78eb8..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedFixedValueFvPatchFieldsFwd_H
-#define codedFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class codedFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(codedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFieldsFwd.H
deleted file mode 100644
index 7c15bf2e76..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedMixedFvPatchFieldsFwd_H
-#define codedMixedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class codedMixedFvPatchField;
-
-makePatchTypeFieldTypedefs(codedMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFieldsFwd.H
deleted file mode 100644
index a6187aeb1d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fanFvPatchFieldsFwd_H
-#define fanFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fanFvPatchField;
-
-makePatchTypeFieldTypedefs(fan);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchFieldsFwd.H
deleted file mode 100644
index e40421d564..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedJumpFvPatchFieldsFwd_H
-#define fixedJumpFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedJumpFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedJump);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchFieldsFwd.H
deleted file mode 100644
index ddcc385c7f..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedJumpAMIFvPatchFieldsFwd_H
-#define fixedJumpAMIFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedJumpAMIFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedJumpAMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H
deleted file mode 100644
index 6c0e32d233..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedMeanFvPatchFieldsFwd_H
-#define fixedMeanFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedMeanFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedMean);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchFieldsFwd.H
deleted file mode 100644
index a5e9f4be3b..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2018 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedMeanOutletInletFvPatchFieldsFwd_H
-#define fixedMeanOutletInletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedMeanOutletInletFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedMeanOutletInlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFieldsFwd.H
deleted file mode 100644
index cc74407a86..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedNormalSlipFvPatchFieldsFwd_H
-#define fixedNormalSlipFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedNormalSlipFvPatchField;
-
-typedef fixedNormalSlipFvPatchField<vector> fixedNormalSlipFvPatchVectorField;
-typedef fixedNormalSlipFvPatchField<tensor> fixedNormalSlipFvPatchTensorField;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H
deleted file mode 100644
index eac50525c4..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedProfileFvPatchFieldsFwd_H
-#define fixedProfileFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedProfileFvPatchField;
-
-makePatchTypeFieldTypedefs(fixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchFieldsFwd.H
deleted file mode 100644
index 8e114dd435..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef freestreamFvPatchFieldsFwd_H
-#define freestreamFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class freestreamFvPatchField;
-
-makePatchTypeFieldTypedefs(freestream);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFieldsFwd.H
deleted file mode 100644
index 6c4cee401b..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef inletOutletFvPatchFieldsFwd_H
-#define inletOutletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class inletOutletFvPatchField;
-
-makePatchTypeFieldTypedefs(inletOutlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFieldsFwd.H
deleted file mode 100644
index b917e30fa4..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mappedFieldFvPatchFieldsFwd_H
-#define mappedFieldFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class mappedFieldFvPatchField;
-
-makePatchTypeFieldTypedefs(mappedField)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H
deleted file mode 100644
index eaa892f62e..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mappedFixedInternalValueFvPatchFieldsFwd_H
-#define mappedFixedInternalValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class mappedFixedInternalValueFvPatchField;
-
-makePatchTypeFieldTypedefs(mappedFixedInternalValue)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H
deleted file mode 100644
index 62dc6d16b9..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mappedFixedPushedInternalValueFvPatchFieldsFwd_H
-#define mappedFixedPushedInternalValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class mappedFixedPushedInternalValueFvPatchField;
-
-makePatchTypeFieldTypedefs(mappedFixedInternalValue)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index 9555231c0d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mappedFixedValueFvPatchFieldsFwd_H
-#define mappedFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class mappedFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(mappedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchFieldsFwd.H
deleted file mode 100644
index 64df427d01..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef outletInletFvPatchFieldsFwd_H
-#define outletInletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class outletInletFvPatchField;
-
-makePatchTypeFieldTypedefs(outletInlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchFieldsFwd.H
deleted file mode 100644
index 4d5a773227..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef outletMappedUniformInletFvPatchFieldsFwd_H
-#define outletMappedUniformInletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class outletMappedUniformInletFvPatchField;
-
-makePatchTypeFieldTypedefs(outletMappedUniformInlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchFieldsFwd.H
deleted file mode 100644
index b253dabc03..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef partialSlipFvPatchFieldsFwd_H
-#define partialSlipFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class partialSlipFvPatchField;
-
-makePatchTypeFieldTypedefs(partialSlip);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index 270f5aef3c..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef scaledFixedValueFvPatchFieldsFwd_H
-#define scaledFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class scaledFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(scaledFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFieldsFwd.H
deleted file mode 100644
index 051dc6b097..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef slipFvPatchFieldsFwd_H
-#define slipFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class slipFvPatchField;
-
-makePatchTypeFieldTypedefs(slip);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index 083547c715..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef timeVaryingMappedFixedValueFvPatchFieldsFwd_H
-#define timeVaryingMappedFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class timeVaryingMappedFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(timeVaryingMappedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFieldsFwd.H
deleted file mode 100644
index 2c19e3fe6d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2022 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef turbulentDigitalFilterInletFvPatchFieldsFwd_H
-#define turbulentDigitalFilterInletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class turbulentDigitalFilterInletFvPatchField;
-
-makePatchTypeFieldTypedefs(turbulentDigitalFilterInlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchFieldsFwd.H
deleted file mode 100644
index dc49e56070..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef turbulentInletFvPatchFieldsFwd_H
-#define turbulentInletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class turbulentInletFvPatchField;
-
-makePatchTypeFieldTypedefs(turbulentInlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H
deleted file mode 100644
index 8540e93986..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef uniformFixedGradientFvPatchFieldsFwd_H
-#define uniformFixedGradientFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class uniformFixedGradientFvPatchField;
-
-makePatchTypeFieldTypedefs(uniformFixedGradient);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFieldsFwd.H
deleted file mode 100644
index 7990d0b9f2..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef uniformFixedValueFvPatchFieldsFwd_H
-#define uniformFixedValueFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class uniformFixedValueFvPatchField;
-
-makePatchTypeFieldTypedefs(uniform);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFieldsFwd.H
deleted file mode 100644
index c25e487be4..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef uniformInletOutletFvPatchFieldsFwd_H
-#define uniformInletOutletFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class uniformInletOutletFvPatchField;
-
-makePatchTypeFieldTypedefs(uniformInletOutlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchFieldsFwd.H
deleted file mode 100644
index a7b71751f8..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef uniformJumpFvPatchFieldsFwd_H
-#define uniformJumpFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class uniformJumpFvPatchField;
-
-makePatchTypeFieldTypedefs(uniformJump);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchFieldsFwd.H
deleted file mode 100644
index c79e905417..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef uniformJumpAMIFvPatchFieldsFwd_H
-#define uniformJumpAMIFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class uniformJumpAMIFvPatchField;
-
-makePatchTypeFieldTypedefs(uniformJumpAMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchFieldsFwd.H
deleted file mode 100644
index 8d40f62ada..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef waveTransmissiveFvPatchFieldsFwd_H
-#define waveTransmissiveFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class waveTransmissiveFvPatchField;
-
-makePatchTypeFieldTypedefs(waveTransmissive);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFieldsFwd.H
deleted file mode 100644
index 352bbdac4f..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-InClass
-    Foam::calculatedFvsPatchField
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef calculatedFvsPatchFieldsFwd_H
-#define calculatedFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class calculatedFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(calculated);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchFieldsFwd.H
deleted file mode 100644
index 44ec3296f6..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-InClass
-    Foam::coupledFvsPatchField
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef coupledFvsPatchFieldsFwd_H
-#define coupledFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class coupledFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(coupled);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFieldsFwd.H
deleted file mode 100644
index 1d5f8bdc24..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedValueFvsPatchFieldsFwd_H
-#define fixedValueFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class fixedValueFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(fixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFieldsFwd.H
deleted file mode 100644
index c0a07ba0ff..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-InClass
-    Foam::slicedFvsPatchField
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef slicedFvsPatchFieldsFwd_H
-#define slicedFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class slicedFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(sliced);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFieldsFwd.H
deleted file mode 100644
index d00d23fd54..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicFvsPatchFieldsFwd_H
-#define cyclicFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(cyclic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchFieldsFwd.H
deleted file mode 100644
index 6e29b30d49..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicACMIFvsPatchFieldsFwd_H
-#define cyclicACMIFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicACMIFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(cyclicACMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H
deleted file mode 100644
index 62fc67f3b4..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicAMIFvsPatchFieldsFwd_H
-#define cyclicAMIFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicAMIFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(cyclicAMI);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H
deleted file mode 100644
index 862a00c45f..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cyclicSlipFvsPatchFieldsFwd_H
-#define cyclicSlipFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cyclicSlipFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(cyclicSlip);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFieldsFwd.H
deleted file mode 100644
index dd411ca7c5..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef emptyFvsPatchFieldsFwd_H
-#define emptyFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class emptyFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(empty);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H
deleted file mode 100644
index ed7f96c8ad..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nonuniformTransformCyclicFvsPatchFieldsFwd_H
-#define nonuniformTransformCyclicFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class nonuniformTransformCyclicFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(nonuniformTransformCyclic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFieldsFwd.H
deleted file mode 100644
index 980e91dcf3..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorFvsPatchFieldsFwd_H
-#define processorFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class processorFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(processor);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H
deleted file mode 100644
index 996f485332..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorCyclicFvsPatchFieldsFwd_H
-#define processorCyclicFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class processorCyclicFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(processor);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFieldsFwd.H
deleted file mode 100644
index 1ac55640c7..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef symmetryFvsPatchFieldsFwd_H
-#define symmetryFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class symmetryFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(symmetry);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchFieldsFwd.H
deleted file mode 100644
index 19aee826cd..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef symmetryPlaneFvsPatchFieldsFwd_H
-#define symmetryPlaneFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class symmetryPlaneFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(symmetryPlane);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFieldsFwd.H
deleted file mode 100644
index 91964dcec7..0000000000
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef wedgeFvsPatchFieldsFwd_H
-#define wedgeFvsPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class wedgeFvsPatchField;
-
-makeFvsPatchTypeFieldTypedefs(wedge);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H b/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
deleted file mode 100644
index 8d949cb195..0000000000
--- a/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef externalCoupledMixedFvPatchFieldsFwd_H
-#define externalCoupledMixedFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class externalCoupledMixedFvPatchField;
-
-makePatchTypeFieldTypedefs(externalCoupledMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFieldsFwd.H b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFieldsFwd.H
deleted file mode 100644
index a90fa2dd2b..0000000000
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cellMotionFvPatchFieldsFwd_H
-#define cellMotionFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class cellMotionFvPatchField;
-
-makePatchTypeFieldTypedefs(cellMotion);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFieldsFwd.H b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFieldsFwd.H
deleted file mode 100644
index 7be7da0d63..0000000000
--- a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef surfaceSlipDisplacementFvPatchFieldsFwd_H
-#define surfaceSlipDisplacementFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class surfaceSlipDisplacementFvPatchField;
-
-makePatchTypeFieldTypedefs(slip);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchFieldsFwd.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchFieldsFwd.H
deleted file mode 100644
index aa754baa61..0000000000
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchFieldsFwd.H
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2007-2022 PCOpt/NTUA
-    Copyright (C) 2013-2022 FOSS GP
--------------------------------------------------------------------------------
-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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef adjointOutletFluxFvPatchFieldsFwd_H
-#define adjointOutletFluxFvPatchFieldsFwd_H
-
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type> class adjointOutletFluxFvPatchField;
-
-makePatchTypeFieldTypedefs(adjointOutletFlux);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C
deleted file mode 100644
index c9c2cdebf6..0000000000
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C
+++ /dev/null
@@ -1,151 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2007-2019 PCOpt/NTUA
-    Copyright (C) 2013-2019 FOSS GP
-    Copyright (C) 2019 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 "adjointOutletFluxFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-adjointOutletFluxFvPatchScalarField::adjointOutletFluxFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF)
-{}
-
-
-adjointOutletFluxFvPatchScalarField::adjointOutletFluxFvPatchScalarField
-(
-    const adjointOutletFluxFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-adjointOutletFluxFvPatchScalarField::adjointOutletFluxFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF)
-{
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
-}
-
-
-adjointOutletFluxFvPatchScalarField::adjointOutletFluxFvPatchScalarField
-(
-    const adjointOutletFluxFvPatchScalarField& tppsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(tppsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void adjointOutletFluxFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    operator==(scalarField(patch().size(), Zero));
-
-    fixedValueFvPatchScalarField::updateCoeffs();
-}
-
-
-tmp<Field<scalar>> adjointOutletFluxFvPatchScalarField::valueInternalCoeffs
-(
-    const tmp<scalarField>&
-) const
-{
-    return tmp<Field<scalar>>::New(this->size(), Zero);
-}
-
-
-tmp<Field<scalar>> adjointOutletFluxFvPatchScalarField::valueBoundaryCoeffs
-(
-    const tmp<scalarField>&
-) const
-{
-    return tmp<Field<scalar>>::New(this->size(), Zero);
-}
-
-
-tmp<Field<scalar>>
-adjointOutletFluxFvPatchScalarField::gradientBoundaryCoeffs() const
-{
-    return tmp<Field<scalar>>::New(this->size(), Zero);
-}
-
-
-tmp<Field<scalar>>
-adjointOutletFluxFvPatchScalarField::gradientInternalCoeffs() const
-{
-    return tmp<Field<scalar>>::New(this->size(), Zero);
-}
-
-
-void adjointOutletFluxFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField(fvPatchScalarField, adjointOutletFluxFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.H
deleted file mode 100644
index 4efe56af5a..0000000000
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.H
+++ /dev/null
@@ -1,163 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2007-2020 PCOpt/NTUA
-    Copyright (C) 2013-2020 FOSS GP
-    Copyright (C) 2019 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::adjointOutletFluxFvPatchScalarField
-
-Description
-
-SourceFiles
-    adjointOutletFluxFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef adjointOutletFluxFvPatchScalarField_H
-#define adjointOutletFluxFvPatchScalarField_H
-
-#include "fixedValueFvPatchFields.H"
-#include "adjointBoundaryConditions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                   Class adjointOutletFluxFvPatch Declaration
-\*---------------------------------------------------------------------------*/
-
-class adjointOutletFluxFvPatchScalarField
-:
-    public fixedValueFvPatchScalarField
-{
-public:
-
-    //- Runtime type information
-    TypeName("adjointOutletFlux");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        adjointOutletFluxFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        adjointOutletFluxFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given adjointOutletFluxFvPatchScalarField
-        //- onto a new patch
-        adjointOutletFluxFvPatchScalarField
-        (
-            const adjointOutletFluxFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new adjointOutletFluxFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        adjointOutletFluxFvPatchScalarField
-        (
-            const adjointOutletFluxFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new adjointOutletFluxFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Return the matrix diagonal coefficients corresponding to the
-            //- evaluation of the value of this patchField with given weights
-            virtual tmp<Field<scalar>> valueInternalCoeffs
-            (
-                const tmp<scalarField>&
-            ) const;
-
-            //- Return the matrix source coefficients corresponding to the
-            //- evaluation of the value of this patchField with given weights
-            virtual tmp<Field<scalar>> valueBoundaryCoeffs
-            (
-                const tmp<scalarField>&
-
-            ) const;
-
-            //- Return the matrix source coefficients corresponding to the
-            //- evaluation of the gradient of this patchField
-            virtual tmp<Field<scalar>> gradientBoundaryCoeffs() const;
-
-            //- Return the matrix diagonal coefficients corresponding to the
-            //- evaluation of the gradient of this patchField
-            virtual tmp<Field<scalar>> gradientInternalCoeffs() const;
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From 568ced68e270ce1260de4aafd46eeaeb1b145759 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 10 Jan 2023 12:14:31 +0100
Subject: [PATCH 009/348] ENH: support independent handling of MPI requests
 (#2674)

- UPstream::Request wrapping class provides an opaque wrapper for
  vendor MPI_Request values, independent of global lists.

ENH: support for MPI barrier (blocking or non-blocking)
ENH: support for MPI sync-send variants

STYLE: deprecate waitRequests() without a position parameter

- in many cases this can indicate a problem in the program logic since
  normally the startOfRequests should be tracked locally.
---
 .../Test-parallel-nonBlocking.C               |  49 +++--
 .../db/IOstreams/Pstreams/IPBstreams.C        |   4 +-
 src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H |   6 +-
 .../db/IOstreams/Pstreams/IPstreams.C         |   8 +-
 .../db/IOstreams/Pstreams/OPBstreams.C        |   6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H |   6 +-
 .../db/IOstreams/Pstreams/OPstreams.C         |   6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |   4 +-
 .../db/IOstreams/Pstreams/PstreamReduceOps.H  |  59 ++++-
 .../db/IOstreams/Pstreams/UIPstream.H         |  43 +++-
 .../db/IOstreams/Pstreams/UIPstreamBase.C     |   4 +-
 .../db/IOstreams/Pstreams/UOPstream.H         |  44 +++-
 .../db/IOstreams/Pstreams/UOPstreamBase.C     |   6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |   3 +
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 161 +++++++++++++-
 .../IOstreams/Pstreams/UPstreamCommsStruct.C  |   9 -
 src/Pstream/dummy/UIPBstreamRead.C            |   6 +-
 src/Pstream/dummy/UIPstreamRead.C             |   7 +-
 src/Pstream/dummy/UOPBstreamWrite.C           |   6 +-
 src/Pstream/dummy/UOPstreamWrite.C            |   6 +-
 src/Pstream/dummy/UPstream.C                  |   3 +
 src/Pstream/dummy/UPstreamReduce.C            |  25 ++-
 src/Pstream/dummy/UPstreamRequest.C           |  25 ++-
 src/Pstream/mpi/UIPBstreamRead.C              |   4 +-
 src/Pstream/mpi/UIPstreamRead.C               |  27 ++-
 src/Pstream/mpi/UOPBstreamWrite.C             |   6 +-
 src/Pstream/mpi/UOPstreamWrite.C              |  96 +++++---
 src/Pstream/mpi/UPstream.C                    |  46 ++++
 src/Pstream/mpi/UPstreamAllToAll.C            |   1 -
 src/Pstream/mpi/UPstreamBroadcast.C           |   2 -
 src/Pstream/mpi/UPstreamGatherScatter.C       |   1 -
 src/Pstream/mpi/UPstreamReduce.C              |  40 +++-
 src/Pstream/mpi/UPstreamRequest.C             | 205 +++++++++++++++++-
 src/Pstream/mpi/UPstreamWrapping.H            |  50 +++--
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 188 +++++++++++-----
 35 files changed, 939 insertions(+), 223 deletions(-)

diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
index fc13771c73..ce00f4d8cb 100644
--- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
+++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
@@ -50,9 +50,8 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
-    #include "createTime.H"
-
+    argList::noCheckProcessorDirectories();
+    argList args(argc, argv);
 
     // Test PstreamBuffers
     // ~~~~~~~~~~~~~~~~~~~
@@ -83,13 +82,13 @@ int main(int argc, char *argv[])
         if (Pstream::master())
         {
             // Collect my own data
-            allData.append(data);
+            allData.push_back(data);
 
             for (const int proci : Pstream::subProcs())
             {
                 Perr << "master receiving from " << proci << endl;
                 UIPstream fromProc(proci, pBufs);
-                allData.append(vector(fromProc));
+                allData.push_back(vector(fromProc));
             }
         }
 
@@ -102,7 +101,7 @@ int main(int argc, char *argv[])
             {
                 Perr << "master sending to " << proci << endl;
                 UOPstream toProc(proci, pBufs);
-                toSlave << allData;
+                toProc << allData;
             }
         }
 
@@ -125,13 +124,27 @@ int main(int argc, char *argv[])
     scalar data1 = 1.0;
     label request1 = -1;
     {
-        Foam::reduce(data1, sumOp<scalar>(), UPstream::msgType(), request1);
+        Foam::reduce
+        (
+            data1,
+            sumOp<scalar>(),
+            UPstream::msgType(),
+            UPstream::worldComm,
+            request1
+        );
     }
 
     scalar data2 = 0.1;
-    label request2 = -1;
+    UPstream::Request request2;
     {
-        Foam::reduce(data2, sumOp<scalar>(), UPstream::msgType(), request2);
+        Foam::reduce
+        (
+            data2,
+            sumOp<scalar>(),
+            UPstream::msgType(),
+            UPstream::worldComm,
+            request2
+        );
     }
 
 
@@ -168,23 +181,23 @@ int main(int argc, char *argv[])
 
     if (request1 != -1)
     {
-        Pout<< "Waiting for non-blocking reduce with request " << request1
-            << endl;
-        Pstream::waitRequest(request1);
+        Pout<< "Waiting for non-blocking reduce with request "
+            << request1 << endl;
+        UPstream::waitRequest(request1);
     }
     Info<< "Reduced data1:" << data1 << endl;
 
-    if (request2 != -1)
+    if (request2.good())
     {
-        Pout<< "Waiting for non-blocking reduce with request " << request1
-            << endl;
-        Pstream::waitRequest(request2);
+        Pout<< "Waiting for non-blocking reduce with request "
+            << Foam::name(request2.pointer()) << endl;
+        UPstream::waitRequest(request2);
     }
     Info<< "Reduced data2:" << data2 << endl;
 
 
-    // Clear any outstanding requests
-    Pstream::resetRequests(0);
+    // Clear all outstanding requests
+    UPstream::resetRequests(0);
 
     Info<< "End\n" << endl;
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C
index 3bcb9142e8..5540777f09 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C
@@ -33,7 +33,7 @@ License
 
 Foam::UIPBstream::UIPBstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& receiveBuf,
     label& receiveBufPosition,
@@ -61,7 +61,7 @@ Foam::UIPBstream::UIPBstream
 
 Foam::IPBstream::IPBstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     const label bufSize,
     const int tag,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
index fa577369a2..43152570b1 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,7 +69,7 @@ public:
         //- and optional buffer size, read format
         IPstream
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int fromProcNo,
             const label bufSize = 0,
             const int tag = UPstream::msgType(),
@@ -102,7 +102,7 @@ public:
         //- Construct for broadcast root, optional buffer size, read format
         IPBstream
         (
-            const commsTypes commsType,     //!< ignored
+            const UPstream::commsTypes,     //!< ignored
             const int rootProcNo,           //!< normally UPstream::masterNo()
             const label bufSize = 0,
             const int tag = UPstream::msgType(),  //!< ignored
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C
index 232a8d0754..caabf931d7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C
@@ -33,7 +33,7 @@ License
 
 Foam::UIPstream::UIPstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& receiveBuf,
     label& receiveBufPosition,
@@ -55,7 +55,7 @@ Foam::UIPstream::UIPstream
         fmt
     )
 {
-    if (commsType == commsTypes::nonBlocking)
+    if (commsType == UPstream::commsTypes::nonBlocking)
     {
         // Message is already received into buffer
     }
@@ -70,7 +70,7 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
 :
     UIPstreamBase(fromProcNo, buffers)
 {
-    if (commsType() == commsTypes::nonBlocking)
+    if (commsType() == UPstream::commsTypes::nonBlocking)
     {
         // Message is already received into buffer
         messageSize_ = recvBuf_.size();
@@ -93,7 +93,7 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
 
 Foam::IPstream::IPstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     const label bufSize,
     const int tag,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPBstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPBstreams.C
index 182597b193..487cdf6716 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPBstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPBstreams.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,7 +33,7 @@ License
 
 Foam::UOPBstream::UOPBstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int toProcNo,
     DynamicList<char>& sendBuf,
     const int tag,
@@ -48,7 +48,7 @@ Foam::UOPBstream::UOPBstream
 
 Foam::OPBstream::OPBstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int toProcNo,
     const label bufSize,
     const int tag,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
index dd071d9b35..154ed87d31 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,7 +64,7 @@ public:
         //- and optional buffer size, write format
         OPstream
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int toProcNo,
             const label bufSize = 0,
             const int tag = UPstream::msgType(),
@@ -92,7 +92,7 @@ public:
         //- Construct for broadcast root, optional buffer size, write format
         OPBstream
         (
-            const commsTypes commsType,     //!< ignored
+            const UPstream::commsTypes,     //!< ignored
             const int rootProcNo,           //!< normally UPstream::masterNo()
             const label bufSize = 0,
             const int tag = UPstream::msgType(),  //!< ignored
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
index 70e557ab3f..9f1d70f42f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,7 +33,7 @@ License
 
 Foam::UOPstream::UOPstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int toProcNo,
     DynamicList<char>& sendBuf,
     const int tag,
@@ -54,7 +54,7 @@ Foam::UOPstream::UOPstream(const int toProcNo, PstreamBuffers& buffers)
 
 Foam::OPstream::OPstream
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int toProcNo,
     const label bufSize,
     const int tag,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 0af7d9fa6a..d4fd86c480 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -102,13 +102,13 @@ protected:
 
 public:
 
-    // Declare name of the class and its debug switch
+    //- Declare name of the class and its debug switch
     ClassName("Pstream");
 
 
     // Constructors
 
-        //- Construct for given commsTypes, with optional buffer size
+        //- Construct for given communication type, with optional buffer size
         explicit Pstream
         (
             const UPstream::commsTypes commsType,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index bc8dbfc965..e047d399bb 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,6 +101,21 @@ void reduce
     NotImplemented;
 }
 
+//- Non-blocking reduce inplace (cf. MPI Iallreduce)
+//- single value. Sets request.
+template<class T, class BinaryOp>
+void reduce
+(
+    T& Value,
+    const BinaryOp&,
+    const int tag,
+    const label comm,
+    UPstream::Request& req
+)
+{
+    NotImplemented;
+}
+
 //- Non-blocking reduce inplace (cf. MPI Iallreduce)
 //- single value. Sets request.
 template<class T, class BinaryOp>
@@ -117,8 +132,23 @@ void reduce
 }
 
 //- Non-blocking reduce inplace (cf. MPI Iallreduce)
-//- of multiple values (same size on all processes!)
-//  Sets request.
+//- of multiple values (same size on all processes!). Sets request.
+template<class T, class BinaryOp>
+void reduce
+(
+    T values[],
+    const int size,
+    const BinaryOp&,
+    const int tag,
+    const label comm,
+    UPstream::Request& req
+)
+{
+    NotImplemented;
+}
+
+//- Non-blocking reduce inplace (cf. MPI Iallreduce)
+//- of multiple values (same size on all processes!). Sets request.
 template<class T, class BinaryOp>
 void reduce
 (
@@ -272,6 +302,18 @@ Pstream_CommonReductions(Native);                                             \
                                                                               \
 /*! \brief Non-blocking reduce (sum) multiple Native values. Sets request */  \
 void reduce                                                                   \
+(                                                                             \
+    Native values[],                                                          \
+    const int size,                                                           \
+    const sumOp<Native>&,                                                     \
+    const int tag,  /*!< (ignored) */                                         \
+    const label comm,                                                         \
+    UPstream::Request& req  /*!< [out] request information */                 \
+);                                                                            \
+                                                                              \
+/*! \brief Non-blocking reduce (sum) multiple Native values. Sets request */  \
+/*! \deprecated prefer version with UPstream::Request */                      \
+void reduce                                                                   \
 (                                                                             \
     Native values[],                                                          \
     const int size,                                                           \
@@ -283,6 +325,17 @@ void reduce                                                                   \
                                                                               \
 /*! \brief Non-blocking reduce (sum) single Native value. Sets request */     \
 void reduce                                                                   \
+(                                                                             \
+    Native& value,                                                            \
+    const sumOp<Native>&,                                                     \
+    const int tag,  /*!< (ignored) */                                         \
+    const label comm,                                                         \
+    UPstream::Request& req  /*!< [out] request information */                 \
+);                                                                            \
+                                                                              \
+/*! \brief Non-blocking reduce (sum) single Native value. Sets request */     \
+/*! \deprecated prefer version with UPstream::Request */                      \
+void reduce                                                                   \
 (                                                                             \
     Native& value,                                                            \
     const sumOp<Native>&,                                                     \
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index e51b0ac9f6..b29042280f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,7 +107,7 @@ protected:
         //- and IO format
         UIPstreamBase
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int fromProcNo,
             DynamicList<char>& receiveBuf,
             label& receiveBufPosition,
@@ -225,7 +225,7 @@ public:
         //- and IO format
         UIPstream
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int fromProcNo,
             DynamicList<char>& receiveBuf,
             label& receiveBufPosition,
@@ -255,13 +255,40 @@ public:
         //  \return the message size
         static label read
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int fromProcNo,
             char* buf,
             const std::streamsize bufSize,
             const int tag = UPstream::msgType(),
-            const label comm = UPstream::worldComm
+            const label comm = UPstream::worldComm,
+            //! [out] request information (for non-blocking)
+            UPstream::Request* req = nullptr
         );
+
+        //- Read buffer contents (non-blocking) from given processor
+        //  \return the message size
+        inline static label read
+        (
+            //! [out] request information
+            UPstream::Request& req,
+            const int fromProcNo,
+            char* buf,
+            const std::streamsize bufSize,
+            const int tag,
+            const label communicator
+        )
+        {
+            return UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                fromProcNo,
+                buf,
+                bufSize,
+                tag,
+                communicator,
+               &req
+            );
+        }
 };
 
 
@@ -290,7 +317,7 @@ public:
         //- and IO format
         UIPBstream
         (
-            const commsTypes commsType,     //!< ignored
+            const UPstream::commsTypes,     //!< ignored
             const int rootProcNo,           //!< normally UPstream::masterNo()
             DynamicList<char>& receiveBuf,
             label& receiveBufPosition,
@@ -317,11 +344,9 @@ public:
         //  \return the message size
         static label read
         (
-            const commsTypes commsTypes,    //!< ignored
-            const int rootProcNo,           //!< normally UPstream::masterNo()
+            const int rootProcNo,  //!< normally UPstream::masterNo()
             char* buf,
             const std::streamsize bufSize,
-            const int tag = UPstream::msgType(),  //!< ignored
             const label comm = UPstream::worldComm
         );
 };
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
index 9df7380c52..21adb26831 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -146,7 +146,7 @@ inline Foam::Istream& Foam::UIPstreamBase::readString(std::string& str)
 
 Foam::UIPstreamBase::UIPstreamBase
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& receiveBuf,
     label& receiveBufPosition,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index 80d5684b81..d2c344da43 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -110,7 +110,7 @@ protected:
         //- and IO format
         UOPstreamBase
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int toProcNo,
             DynamicList<char>& sendBuf,
             const int tag = UPstream::msgType(),
@@ -298,7 +298,7 @@ public:
         //- and IO format
         UOPstream
         (
-            const commsTypes commsType,
+            const UPstream::commsTypes commsType,
             const int toProcNo,
             DynamicList<char>& sendBuf,
             const int tag = UPstream::msgType(),
@@ -332,8 +332,38 @@ public:
             const char* buf,
             const std::streamsize bufSize,
             const int tag = UPstream::msgType(),
-            const label comm = UPstream::worldComm
+            const label comm = UPstream::worldComm,
+            //! [out] request information (for non-blocking)
+            UPstream::Request* req = nullptr,
+            const UPstream::sendModes sendMode = UPstream::sendModes::normal
         );
+
+        //- Write buffer contents (non-blocking) to given processor
+        //  \return True on success
+        inline static bool write
+        (
+            //! [out] request information
+            UPstream::Request& req,
+            const int toProcNo,
+            const char* buf,
+            const std::streamsize bufSize,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            const UPstream::sendModes sendMode = UPstream::sendModes::normal
+        )
+        {
+            return UOPstream::write
+            (
+                UPstream::commsTypes::nonBlocking,
+                toProcNo,
+                buf,
+                bufSize,
+                tag,
+                comm,
+               &req,
+                sendMode
+            );
+        }
 };
 
 
@@ -364,7 +394,7 @@ public:
         //- and IO format
         UOPBstream
         (
-            const commsTypes commsType,     //!< ignored
+            const UPstream::commsTypes,     //!< ignored
             const int toProcNo,             //!< normally UPstream::masterNo()
             DynamicList<char>& sendBuf,
             const int tag = UPstream::msgType(),  //!< ignored
@@ -390,11 +420,9 @@ public:
         //  \return True on success
         static bool write
         (
-            const commsTypes commsType,     //!< ignored
-            const int rootProcNo,           //!< normally UPstream::masterNo()
+            const int rootProcNo,  //!< normally UPstream::masterNo()
             const char* buf,
             const std::streamsize bufSize,
-            const int tag = UPstream::msgType(),  //!< ignored
             const label comm = UPstream::worldComm
         );
 };
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
index 871bef8a01..631818b772 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -117,7 +117,7 @@ inline void Foam::UOPstreamBase::putChar(const char c)
     {
         sendBuf_.setCapacity(1000);
     }
-    sendBuf_.append(c);
+    sendBuf_.push_back(c);
 }
 
 
@@ -133,7 +133,7 @@ inline void Foam::UOPstreamBase::putString(const std::string& str)
 
 Foam::UOPstreamBase::UOPstreamBase
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int toProcNo,
     DynamicList<char>& sendBuf,
     const int tag,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index d4ef48da5e..d1be6447e6 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -519,6 +519,8 @@ Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
     )
 );
 
+
+//! \cond file_scope
 namespace Foam
 {
     //- Registered reader for UPstream::defaultCommsType
@@ -549,6 +551,7 @@ namespace Foam
 
     addcommsTypeToOpt addcommsTypeToOpt_("commsType");
 }
+//! \endcond
 
 int Foam::UPstream::nPollProcInterfaces
 (
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index ea1b63a7fe..ed16d3a770 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -52,6 +52,10 @@ SourceFiles
 namespace Foam
 {
 
+//- Implementation details for UPstream/Pstream/MPI etc.
+namespace PstreamDetail {}
+
+
 /*---------------------------------------------------------------------------*\
                           Class UPstream Declaration
 \*---------------------------------------------------------------------------*/
@@ -63,7 +67,7 @@ public:
     //- Int ranges are used for MPI ranks (processes)
     typedef IntRange<int> rangeType;
 
-    //- Types of communications
+    //- Communications types
     enum class commsTypes : char
     {
         blocking,       //!< "blocking"    : (MPI_Bsend, MPI_Recv)
@@ -74,9 +78,21 @@ public:
     //- Enumerated names for the communication types
     static const Enum<commsTypes> commsTypeNames;
 
+    //- Different MPI-send modes (ignored for commsTypes::blocking)
+    enum class sendModes : char
+    {
+        normal,         //!< (MPI_Send, MPI_Isend)
+        sync            //!< (MPI_Ssend, MPI_Issend)
+    };
+
 
     // Public Classes
 
+        // Forward Declarations
+
+        //- Wrapper for MPI_Request
+        class Request;
+
         //- Structure for communicating between processors
         class commsStruct
         {
@@ -100,8 +116,8 @@ public:
 
             // Constructors
 
-                //- Default construct. Above == -1
-                commsStruct() noexcept;
+                //- Default construct with above == -1
+                commsStruct() noexcept : above_(-1) {}
 
                 //- Construct from components
                 commsStruct
@@ -166,7 +182,6 @@ public:
                 friend Ostream& operator<<(Ostream&, const commsStruct&);
         };
 
-
         //- combineReduce operator for lists. Used for counting.
         struct listEq
         {
@@ -305,7 +320,7 @@ public:
     // Constructors
 
         //- Construct for given communication type
-        explicit UPstream(const commsTypes commsType)
+        explicit UPstream(const commsTypes commsType) noexcept
         :
             commsType_(commsType)
         {}
@@ -441,6 +456,13 @@ public:
         //      Fatal if MPI has already been finalized.
         static bool initNull();
 
+        //- Impose a synchronisation barrier (optionally non-blocking)
+        static void barrier
+        (
+            const label communicator,
+            UPstream::Request* req = nullptr
+        );
+
 
         // Non-blocking comms
 
@@ -452,10 +474,14 @@ public:
             //  A no-op for out-of-range values.
             static void resetRequests(const label n);
 
-            //- Wait until all requests (from start onwards) have finished.
+            //- Wait until all requests (from position onwards) have finished.
             //  A no-op if parRun() == false, if there are no pending requests
             //  or if the start is out-of-range (0 to nRequests)
-            static void waitRequests(const label start = 0);
+            static void waitRequests(const label pos);
+
+            //- Wait until all requests have finished.
+            //  A no-op if parRun() == false or the list is empty
+            static void waitRequests(UList<UPstream::Request>& requests);
 
             //- Wait until request i has finished.
             //  A no-op if parRun() == false,
@@ -463,12 +489,21 @@ public:
             //  or if the index is out-of-range (0 to nRequests)
             static void waitRequest(const label i);
 
+            //- Wait until specified request has finished.
+            //  A no-op if parRun() == false or for a null-request
+            static void waitRequest(UPstream::Request& req);
+
             //- Non-blocking comms: has request i finished?
             //  A no-op and returns true if parRun() == false,
             //  there are no pending requests,
             //  or if the index is out-of-range (0 to nRequests)
             static bool finishedRequest(const label i);
 
+            //- Non-blocking comms: has request finished?
+            //  A no-op and returns true if parRun() == false
+            //  or for a null-request
+            static bool finishedRequest(UPstream::Request& req);
+
             static int allocateTag(const char* const msg = nullptr);
             static void freeTag(const int tag, const char* const msg = nullptr);
 
@@ -789,6 +824,12 @@ public:
 
     // Housekeeping
 
+        //- Wait for all requests to finish.
+        //  \deprecated(2023-01) Probably not what you want.
+        //     Should normally be restricted to a particular starting request.
+        FOAM_DEPRECATED_FOR(2023-01, "waitRequests(int) method")
+        static void waitRequests() { waitRequests(0); }
+
         //- Process index of first sub-process
         //  \deprecated(2020-09) use subProcs() method instead
         static constexpr int firstSlave() noexcept
@@ -805,8 +846,114 @@ public:
 };
 
 
+/*---------------------------------------------------------------------------*\
+                      Class UPstream::Request Declaration
+\*---------------------------------------------------------------------------*/
+
+//- An opaque wrapper for MPI_Request with a vendor-independent
+//- representation independent of any \c <mpi.h> header
+//
+//  The MPI standard states that MPI_Request is always an opaque object.
+//  Generally it is either an integer (eg, mpich) or a pointer (eg, openmpi).
+class UPstream::Request
+{
+public:
+
+    // Public Types
+
+        //- Storage for MPI_Request (as integer or pointer)
+        typedef std::intptr_t value_type;
+
+
+private:
+
+    // Private Data
+
+        //- The MPI_Request (as wrapped value)
+        value_type value_;
+
+public:
+
+    // Generated Methods
+
+        //- Copy construct
+        Request(const Request&) noexcept = default;
+
+        //- Move construct
+        Request(Request&&) noexcept = default;
+
+        //- Copy assignment
+        Request& operator=(const Request&) noexcept = default;
+
+        //- Move assignment
+        Request& operator=(Request&&) noexcept = default;
+
+
+    // Member Operators
+
+        //- Test for equality
+        bool operator==(const Request& rhs) const noexcept
+        {
+            return (value_ == rhs.value_);
+        }
+
+        //- Test for inequality
+        bool operator!=(const Request& rhs) const noexcept
+        {
+            return (value_ != rhs.value_);
+        }
+
+
+    // Constructors
+
+        //- Default construct as MPI_REQUEST_NULL
+        Request() noexcept;
+
+        //- Construct from MPI_Request (as pointer type)
+        explicit Request(const void* p) noexcept
+        :
+            value_(reinterpret_cast<value_type>(p))
+        {}
+
+        //- Construct from MPI_Request (as integer type)
+        explicit Request(value_type val) noexcept
+        :
+            value_(val)
+        {}
+
+
+    // Member Functions
+
+        //- Return raw value
+        value_type value() const noexcept { return value_; }
+
+        //- Return as pointer value
+        const void* pointer() const noexcept
+        {
+            return reinterpret_cast<const void*>(value_);
+        }
+
+        //- True if not equal to MPI_REQUEST_NULL
+        bool good() const noexcept;
+
+        //- Reset to default constructed value (MPI_REQUEST_NULL)
+        void reset() noexcept;
+
+        //- Same as calling UPstream::waitRequest()
+        void wait() { UPstream::waitRequest(*this); }
+
+        //- Same as calling UPstream::finishedRequest()
+        bool finished() { return UPstream::finishedRequest(*this); }
+};
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
 Ostream& operator<<(Ostream&, const UPstream::commsStruct&);
 
+
+// * * * * * * * * * * * * Template Specialisations  * * * * * * * * * * * * //
+
 // Template specialisation for access of commsStruct
 template<>
 UPstream::commsStruct&
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
index e854bc7182..760c77d2bf 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
@@ -30,15 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::UPstream::commsStruct::commsStruct() noexcept
-:
-    above_(-1),
-    below_(),
-    allBelow_(),
-    allNotBelow_()
-{}
-
-
 Foam::UPstream::commsStruct::commsStruct
 (
     const label above,
diff --git a/src/Pstream/dummy/UIPBstreamRead.C b/src/Pstream/dummy/UIPBstreamRead.C
index 94e4dcd7c4..ac23ba916d 100644
--- a/src/Pstream/dummy/UIPBstreamRead.C
+++ b/src/Pstream/dummy/UIPBstreamRead.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,12 +39,10 @@ void Foam::UIPBstream::bufferIPCrecv()
 
 Foam::label Foam::UIPBstream::read
 (
-    const commsTypes commsType,
     const int rootProcNo,
     char* buf,
     const std::streamsize bufSize,
-    const int tag,
-    const label communicator
+    const label comm
 )
 {
     NotImplemented;
diff --git a/src/Pstream/dummy/UIPstreamRead.C b/src/Pstream/dummy/UIPstreamRead.C
index 3fef73615b..316550769e 100644
--- a/src/Pstream/dummy/UIPstreamRead.C
+++ b/src/Pstream/dummy/UIPstreamRead.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,12 +40,13 @@ void Foam::UIPstream::bufferIPCrecv()
 
 Foam::label Foam::UIPstream::read
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     char* buf,
     const std::streamsize bufSize,
     const int tag,
-    const label communicator
+    const label communicator,
+    UPstream::Request* req
 )
 {
     NotImplemented;
diff --git a/src/Pstream/dummy/UOPBstreamWrite.C b/src/Pstream/dummy/UOPBstreamWrite.C
index 3951b48a0d..72c702f034 100644
--- a/src/Pstream/dummy/UOPBstreamWrite.C
+++ b/src/Pstream/dummy/UOPBstreamWrite.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,12 +40,10 @@ bool Foam::UOPBstream::bufferIPCsend()
 
 bool Foam::UOPBstream::write
 (
-    const commsTypes commsType,
     const int rootProcNo,
     const char* buf,
     const std::streamsize bufSize,
-    const int tag,
-    const label communicator
+    const label comm
 )
 {
     NotImplemented;
diff --git a/src/Pstream/dummy/UOPstreamWrite.C b/src/Pstream/dummy/UOPstreamWrite.C
index 7589556b5d..24078ca924 100644
--- a/src/Pstream/dummy/UOPstreamWrite.C
+++ b/src/Pstream/dummy/UOPstreamWrite.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,9 @@ bool Foam::UOPstream::write
     const char* buf,
     const std::streamsize bufSize,
     const int tag,
-    const label communicator
+    const label communicator,
+    UPstream::Request* req,
+    const UPstream::sendModes sendMode
 )
 {
     NotImplemented;
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index db934c00e3..381d7d3c22 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -94,5 +94,8 @@ void Foam::UPstream::freeTag(const int tag, const char* const msg)
 {}
 
 
+void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/Pstream/dummy/UPstreamReduce.C b/src/Pstream/dummy/UPstreamReduce.C
index 00dda3899f..ce1e19e2a0 100644
--- a/src/Pstream/dummy/UPstreamReduce.C
+++ b/src/Pstream/dummy/UPstreamReduce.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -133,6 +133,18 @@ void Foam::reduce                                                             \
 Pstream_CommonReductions(Native);                                             \
                                                                               \
 void Foam::reduce                                                             \
+(                                                                             \
+    Native values[],                                                          \
+    const int size,                                                           \
+    const sumOp<Native>&,                                                     \
+    const int tag,                                                            \
+    const label comm,                                                         \
+    UPstream::Request& req                                                    \
+)                                                                             \
+{}                                                                            \
+                                                                              \
+/* Deprecated: prefer version with UPstream::Request */                       \
+void Foam::reduce                                                             \
 (                                                                             \
     Native values[],                                                          \
     const int size,                                                           \
@@ -144,6 +156,17 @@ void Foam::reduce                                                             \
 {}                                                                            \
                                                                               \
 void Foam::reduce                                                             \
+(                                                                             \
+    Native& value,                                                            \
+    const sumOp<Native>&,                                                     \
+    const int tag,                                                            \
+    const label comm,                                                         \
+    UPstream::Request& req                                                    \
+)                                                                             \
+{}                                                                            \
+                                                                              \
+/* Deprecated: prefer version with UPstream::Request */                       \
+void Foam::reduce                                                             \
 (                                                                             \
     Native& value,                                                            \
     const sumOp<Native>&,                                                     \
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index ab104e0b3e..efd2427c14 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -27,17 +27,40 @@ License
 
 #include "UPstream.H"
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::UPstream::Request::Request() noexcept
+:
+    UPstream::Request(nullptr)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::UPstream::Request::good() const noexcept
+{
+    return false;
+}
+
+
+void Foam::UPstream::Request::reset() noexcept
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::label Foam::UPstream::nRequests() noexcept { return 0; }
 
 void Foam::UPstream::resetRequests(const label n) {}
 
-void Foam::UPstream::waitRequests(const label start) {}
+void Foam::UPstream::waitRequests(const label pos) {}
+void Foam::UPstream::waitRequests(UList<UPstream::Request>&) {}
 
 void Foam::UPstream::waitRequest(const label i) {}
+void Foam::UPstream::waitRequest(UPstream::Request&) {}
 
 bool Foam::UPstream::finishedRequest(const label i) { return true; }
+bool Foam::UPstream::finishedRequest(UPstream::Request&) { return true; }
 
 
 // ************************************************************************* //
diff --git a/src/Pstream/mpi/UIPBstreamRead.C b/src/Pstream/mpi/UIPBstreamRead.C
index f71a66826e..2cb5dd78bf 100644
--- a/src/Pstream/mpi/UIPBstreamRead.C
+++ b/src/Pstream/mpi/UIPBstreamRead.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -113,11 +113,9 @@ void Foam::UIPBstream::bufferIPCrecv()
 
 Foam::label Foam::UIPBstream::read
 (
-    const commsTypes commsType,
     const int rootProcNo,
     char* buf,
     const std::streamsize bufSize,
-    const int tag,
     const label comm
 )
 {
diff --git a/src/Pstream/mpi/UIPstreamRead.C b/src/Pstream/mpi/UIPstreamRead.C
index 40d67eabc9..e2ecbc0da8 100644
--- a/src/Pstream/mpi/UIPstreamRead.C
+++ b/src/Pstream/mpi/UIPstreamRead.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,8 +31,6 @@ License
 #include "profilingPstream.H"
 #include "IOstreams.H"
 
-#include <mpi.h>
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::UIPstream::bufferIPCrecv()
@@ -99,12 +97,13 @@ void Foam::UIPstream::bufferIPCrecv()
 
 Foam::label Foam::UIPstream::read
 (
-    const commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const int fromProcNo,
     char* buf,
     const std::streamsize bufSize,
     const int tag,
-    const label communicator
+    const label communicator,
+    UPstream::Request* req
 )
 {
     if (debug)
@@ -130,8 +129,8 @@ Foam::label Foam::UIPstream::read
 
     if
     (
-        commsType == commsTypes::blocking
-     || commsType == commsTypes::scheduled
+        commsType == UPstream::commsTypes::blocking
+     || commsType == UPstream::commsTypes::scheduled
     )
     {
         MPI_Status status;
@@ -182,7 +181,7 @@ Foam::label Foam::UIPstream::read
 
         return messageSize;
     }
-    else if (commsType == commsTypes::nonBlocking)
+    else if (commsType == UPstream::commsTypes::nonBlocking)
     {
         MPI_Request request;
 
@@ -214,11 +213,19 @@ Foam::label Foam::UIPstream::read
             Pout<< "UIPstream::read : started read from:" << fromProcNo
                 << " tag:" << tag << " read size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
-                << " request:" << PstreamGlobals::outstandingRequests_.size()
+                <<
+                (req ? label(-1) : PstreamGlobals::outstandingRequests_.size())
                 << Foam::endl;
         }
 
-        PstreamGlobals::outstandingRequests_.push_back(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+        }
+        else
+        {
+            PstreamGlobals::outstandingRequests_.push_back(request);
+        }
 
         // Assume the message is completely received.
         return bufSize;
diff --git a/src/Pstream/mpi/UOPBstreamWrite.C b/src/Pstream/mpi/UOPBstreamWrite.C
index 059965e72a..c01bff64b3 100644
--- a/src/Pstream/mpi/UOPBstreamWrite.C
+++ b/src/Pstream/mpi/UOPBstreamWrite.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,6 @@ License
 #include "UOPstream.H"
 #include "PstreamGlobals.H"
 
-#include <mpi.h>
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 bool Foam::UOPBstream::bufferIPCsend()
@@ -92,11 +90,9 @@ bool Foam::UOPBstream::bufferIPCsend()
 
 bool Foam::UOPBstream::write
 (
-    const commsTypes commsType,  /* unused */
     const int rootProcNo,
     const char* buf,
     const std::streamsize bufSize,
-    const int tag,  /* unused */
     const label comm
 )
 {
diff --git a/src/Pstream/mpi/UOPstreamWrite.C b/src/Pstream/mpi/UOPstreamWrite.C
index 3c61afecbe..5982e99cae 100644
--- a/src/Pstream/mpi/UOPstreamWrite.C
+++ b/src/Pstream/mpi/UOPstreamWrite.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,8 +30,6 @@ License
 #include "PstreamGlobals.H"
 #include "profilingPstream.H"
 
-#include <mpi.h>
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 bool Foam::UOPstream::bufferIPCsend()
@@ -57,7 +55,9 @@ bool Foam::UOPstream::write
     const char* buf,
     const std::streamsize bufSize,
     const int tag,
-    const label communicator
+    const label communicator,
+    UPstream::Request* req,
+    const UPstream::sendModes sendMode
 )
 {
     if (debug)
@@ -87,7 +87,7 @@ bool Foam::UOPstream::write
 
     profilingPstream::beginTiming();
 
-    if (commsType == commsTypes::blocking)
+    if (commsType == UPstream::commsTypes::blocking)
     {
         failed = MPI_Bsend
         (
@@ -110,17 +110,32 @@ bool Foam::UOPstream::write
                 << Foam::endl;
         }
     }
-    else if (commsType == commsTypes::scheduled)
+    else if (commsType == UPstream::commsTypes::scheduled)
     {
-        failed = MPI_Send
-        (
-            const_cast<char*>(buf),
-            bufSize,
-            MPI_BYTE,
-            toProcNo,
-            tag,
-            PstreamGlobals::MPICommunicators_[communicator]
-        );
+        if (UPstream::sendModes::sync == sendMode)
+        {
+            failed = MPI_Ssend
+            (
+                const_cast<char*>(buf),
+                bufSize,
+                MPI_BYTE,
+                toProcNo,
+                tag,
+                PstreamGlobals::MPICommunicators_[communicator]
+            );
+        }
+        else
+        {
+            failed = MPI_Send
+            (
+                const_cast<char*>(buf),
+                bufSize,
+                MPI_BYTE,
+                toProcNo,
+                tag,
+                PstreamGlobals::MPICommunicators_[communicator]
+            );
+        }
 
         // Assume these are from scatters ...
         profilingPstream::addScatterTime();
@@ -133,20 +148,36 @@ bool Foam::UOPstream::write
                 << Foam::endl;
         }
     }
-    else if (commsType == commsTypes::nonBlocking)
+    else if (commsType == UPstream::commsTypes::nonBlocking)
     {
         MPI_Request request;
 
-        failed = MPI_Isend
-        (
-            const_cast<char*>(buf),
-            bufSize,
-            MPI_BYTE,
-            toProcNo,
-            tag,
-            PstreamGlobals::MPICommunicators_[communicator],
-            &request
-        );
+        if (UPstream::sendModes::sync == sendMode)
+        {
+            failed = MPI_Issend
+            (
+                const_cast<char*>(buf),
+                bufSize,
+                MPI_BYTE,
+                toProcNo,
+                tag,
+                PstreamGlobals::MPICommunicators_[communicator],
+               &request
+            );
+        }
+        else
+        {
+            failed = MPI_Isend
+            (
+                const_cast<char*>(buf),
+                bufSize,
+                MPI_BYTE,
+                toProcNo,
+                tag,
+                PstreamGlobals::MPICommunicators_[communicator],
+               &request
+            );
+        }
 
         profilingPstream::addWaitTime();
 
@@ -155,11 +186,20 @@ bool Foam::UOPstream::write
             Pout<< "UOPstream::write : started write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commType:" << UPstream::commsTypeNames[commsType]
-                << " request:" << PstreamGlobals::outstandingRequests_.size()
+                << " request:"
+                <<
+                (req ? label(-1) : PstreamGlobals::outstandingRequests_.size())
                 << Foam::endl;
         }
 
-        PstreamGlobals::outstandingRequests_.push_back(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+        }
+        else
+        {
+            PstreamGlobals::outstandingRequests_.push_back(request);
+        }
     }
     else
     {
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 81be44c3ca..cfb0c2ebdc 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -693,4 +693,50 @@ void Foam::UPstream::freeTag(const int tag, const char* const msg)
 }
 
 
+void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    if (req)
+    {
+        MPI_Request request;
+
+        if
+        (
+            MPI_Ibarrier
+            (
+                PstreamGlobals::MPICommunicators_[communicator],
+               &request
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Ibarrier returned with error"
+                << Foam::abort(FatalError);
+        }
+
+        *req = UPstream::Request(request);
+    }
+    else
+    {
+        if
+        (
+            MPI_Barrier
+            (
+                PstreamGlobals::MPICommunicators_[communicator]
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Barrier returned with error"
+                << Foam::abort(FatalError);
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/Pstream/mpi/UPstreamAllToAll.C b/src/Pstream/mpi/UPstreamAllToAll.C
index c2551d3e59..8bc5b5ebac 100644
--- a/src/Pstream/mpi/UPstreamAllToAll.C
+++ b/src/Pstream/mpi/UPstreamAllToAll.C
@@ -28,7 +28,6 @@ License
 #include "Pstream.H"
 #include "UPstreamWrapping.H"
 
-#include <mpi.h>
 #include <cinttypes>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/UPstreamBroadcast.C b/src/Pstream/mpi/UPstreamBroadcast.C
index cdb09bf2a4..af061bd76c 100644
--- a/src/Pstream/mpi/UPstreamBroadcast.C
+++ b/src/Pstream/mpi/UPstreamBroadcast.C
@@ -29,8 +29,6 @@ License
 #include "PstreamGlobals.H"
 #include "profilingPstream.H"
 
-#include <mpi.h>
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::UPstream::broadcast
diff --git a/src/Pstream/mpi/UPstreamGatherScatter.C b/src/Pstream/mpi/UPstreamGatherScatter.C
index cf14937ae9..4937be2e1d 100644
--- a/src/Pstream/mpi/UPstreamGatherScatter.C
+++ b/src/Pstream/mpi/UPstreamGatherScatter.C
@@ -28,7 +28,6 @@ License
 #include "Pstream.H"
 #include "UPstreamWrapping.H"
 
-#include <mpi.h>
 #include <cinttypes>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/UPstreamReduce.C b/src/Pstream/mpi/UPstreamReduce.C
index dafa6d42c2..5314dd17ce 100644
--- a/src/Pstream/mpi/UPstreamReduce.C
+++ b/src/Pstream/mpi/UPstreamReduce.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,7 +29,6 @@ License
 #include "PstreamReduceOps.H"
 #include "UPstreamWrapping.H"
 
-#include <mpi.h>
 #include <cinttypes>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -177,6 +176,23 @@ void Foam::reduce                                                             \
 Pstream_CommonReductions(Native, TaggedType);                                 \
                                                                               \
 void Foam::reduce                                                             \
+(                                                                             \
+    Native values[],                                                          \
+    const int size,                                                           \
+    const sumOp<Native>&,                                                     \
+    const int tag,  /* (unused) */                                            \
+    const label comm,                                                         \
+    UPstream::Request& req                                                    \
+)                                                                             \
+{                                                                             \
+    PstreamDetail::allReduce<Native>                                          \
+    (                                                                         \
+        values, size, TaggedType, MPI_SUM, comm, &req, nullptr                \
+    );                                                                        \
+}                                                                             \
+                                                                              \
+/* Deprecated: prefer version with UPstream::Request */                       \
+void Foam::reduce                                                             \
 (                                                                             \
     Native values[],                                                          \
     const int size,                                                           \
@@ -188,11 +204,27 @@ void Foam::reduce                                                             \
 {                                                                             \
     PstreamDetail::allReduce<Native>                                          \
     (                                                                         \
-        values, size, TaggedType, MPI_SUM, comm, &requestID                   \
+        values, size, TaggedType, MPI_SUM, comm, nullptr, &requestID          \
     );                                                                        \
 }                                                                             \
                                                                               \
 void Foam::reduce                                                             \
+(                                                                             \
+    Native& value,                                                            \
+    const sumOp<Native>&,                                                     \
+    const int tag,  /* (unused) */                                            \
+    const label comm,                                                         \
+    UPstream::Request& req                                                    \
+)                                                                             \
+{                                                                             \
+    PstreamDetail::allReduce<Native>                                          \
+    (                                                                         \
+        &value, 1, TaggedType, MPI_SUM, comm, &req, nullptr                   \
+    );                                                                        \
+}                                                                             \
+                                                                              \
+/* Deprecated: prefer version with UPstream::Request */                       \
+void Foam::reduce                                                             \
 (                                                                             \
     Native& value,                                                            \
     const sumOp<Native>&,                                                     \
@@ -203,7 +235,7 @@ void Foam::reduce                                                             \
 {                                                                             \
     PstreamDetail::allReduce<Native>                                          \
     (                                                                         \
-        &value, 1, TaggedType, MPI_SUM, comm, &requestID                      \
+        &value, 1, TaggedType, MPI_SUM, comm, nullptr, &requestID             \
     );                                                                        \
 }                                                                             \
                                                                               \
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index 3d72acc1b6..d3f6884f96 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -30,6 +30,28 @@ License
 #include "PstreamGlobals.H"
 #include "profilingPstream.H"
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::UPstream::Request::Request() noexcept
+:
+    UPstream::Request(MPI_REQUEST_NULL)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::UPstream::Request::good() const noexcept
+{
+    return MPI_REQUEST_NULL != PstreamDetail::Request::get(*this);
+}
+
+
+void Foam::UPstream::Request::reset() noexcept
+{
+    *this = UPstream::Request(MPI_REQUEST_NULL);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::label Foam::UPstream::nRequests() noexcept
@@ -47,26 +69,35 @@ void Foam::UPstream::resetRequests(const label n)
 }
 
 
-void Foam::UPstream::waitRequests(const label start)
+void Foam::UPstream::waitRequests(const label pos)
 {
     // No-op for non-parallel, no pending requests or out-of-range
     if
     (
         !UPstream::parRun()
-     || start < 0
-     || start >= PstreamGlobals::outstandingRequests_.size()
+     || pos < 0
+     || pos >= PstreamGlobals::outstandingRequests_.size()
+     /// || !len
     )
     {
         return;
     }
 
-    const label count = (PstreamGlobals::outstandingRequests_.size() - start);
-    auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + start);
+    label count = (PstreamGlobals::outstandingRequests_.size() - pos);
+
+    /// // Treat len < 0 like npos (ie, the rest of the list) but also
+    /// // apply range checking to avoid bad slices
+    /// if (len > 0 && len < count)
+    /// {
+    ///     count = len;
+    /// }
+
+    auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
 
     if (UPstream::debug)
     {
         Pout<< "UPstream::waitRequests : starting wait for "
-            << count << " requests starting at " << start << endl;
+            << count << " requests starting at " << pos << endl;
     }
 
     profilingPstream::beginTiming();
@@ -81,8 +112,8 @@ void Foam::UPstream::waitRequests(const label start)
 
     profilingPstream::addWaitTime();
 
-    // ie, resetRequests(start)
-    PstreamGlobals::outstandingRequests_.resize(start);
+    // ie, resetRequests(pos)
+    PstreamGlobals::outstandingRequests_.resize(pos);
 
     if (UPstream::debug)
     {
@@ -91,6 +122,104 @@ void Foam::UPstream::waitRequests(const label start)
 }
 
 
+void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
+{
+    // No-op for non-parallel or no pending requests
+    if (!UPstream::parRun() || requests.empty())
+    {
+        return;
+    }
+
+    // Looks ugly but is legitimate since UPstream::Request is an intptr_t,
+    // which is always large enough to hold an MPI_Request (int or pointer)
+
+    label count = 0;
+    auto* waitRequests = reinterpret_cast<MPI_Request*>(requests.data());
+
+    for (auto& req : requests)
+    {
+        if (req.good())
+        {
+            waitRequests[count] = PstreamDetail::Request::get(req);
+            ++count;
+        }
+    }
+
+    if (!count)
+    {
+        return;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets request to MPI_REQUEST_NULL
+    if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Waitall returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    // Everything handled, reset all to MPI_REQUEST_NULL
+    for (auto& req : requests)
+    {
+        req.reset();
+    }
+}
+
+
+// FUTURE?
+//
+/// void Foam::UPstream::waitRequests
+/// (
+///     UPstream::Request& req1,
+///     UPstream::Request& req2
+/// )
+/// {
+///     // No-op for non-parallel
+///     if (!UPstream::parRun())
+///     {
+///         return;
+///     }
+///
+///     int count = 0;
+///     MPI_Request waitRequests[2];
+///
+///     waitRequests[count] = PstreamDetail::Request::get(req1);
+///     if (MPI_REQUEST_NULL != waitRequests[count])
+///     {
+///         req1.reset();
+///         ++count;
+///     }
+///
+///     waitRequests[count] = PstreamDetail::Request::get(req2);
+///     if (MPI_REQUEST_NULL != waitRequests[count])
+///     {
+///         req2.reset();
+///         ++count;
+///     }
+///
+///     if (!count)
+///     {
+///         return;
+///     }
+///
+///     profilingPstream::beginTiming();
+///
+///     // On success: sets request to MPI_REQUEST_NULL
+///     if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
+///     {
+///         FatalErrorInFunction
+///             << "MPI_Waitall returned with error"
+///             << Foam::abort(FatalError);
+///     }
+///
+///     profilingPstream::addWaitTime();
+/// }
+
+
 void Foam::UPstream::waitRequest(const label i)
 {
     // No-op for non-parallel, or out-of-range (eg, placeholder indices)
@@ -141,6 +270,37 @@ void Foam::UPstream::waitRequest(const label i)
 }
 
 
+void Foam::UPstream::waitRequest(UPstream::Request& req)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    MPI_Request request = PstreamDetail::Request::get(req);
+
+    // No-op for null request
+    if (MPI_REQUEST_NULL == request)
+    {
+        return;
+    }
+
+    profilingPstream::beginTiming();
+
+    if (MPI_Wait(&request, MPI_STATUS_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Wait returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    req.reset();  // Handled, reset to MPI_REQUEST_NULL
+}
+
+
 bool Foam::UPstream::finishedRequest(const label i)
 {
     // No-op for non-parallel, or out-of-range (eg, placeholder indices)
@@ -182,4 +342,33 @@ bool Foam::UPstream::finishedRequest(const label i)
 }
 
 
+bool Foam::UPstream::finishedRequest(UPstream::Request& req)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return true;
+    }
+
+    MPI_Request request = PstreamDetail::Request::get(req);
+
+    // No-op for null request
+    if (MPI_REQUEST_NULL == request)
+    {
+        return true;
+    }
+
+    int flag = 0;
+    MPI_Test(&request, &flag, MPI_STATUS_IGNORE);
+
+    if (flag)
+    {
+        // Done - reset to MPI_REQUEST_NULL
+        req.reset();
+    }
+
+    return flag != 0;
+}
+
+
 // ************************************************************************* //
diff --git a/src/Pstream/mpi/UPstreamWrapping.H b/src/Pstream/mpi/UPstreamWrapping.H
index f1553125e3..355bf3bf86 100644
--- a/src/Pstream/mpi/UPstreamWrapping.H
+++ b/src/Pstream/mpi/UPstreamWrapping.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,12 +24,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Namespace
-    Foam::PstreamDetail
-
-Description
-    Some implementation details for Pstream and/or MPI.
-
 InNamespace
     Foam::PstreamDetail
 
@@ -54,6 +48,27 @@ namespace Foam
 namespace PstreamDetail
 {
 
+// Helper for casting to MPI_Request
+struct Request
+{
+    // To pointer
+    template<typename Type = MPI_Request>
+    static typename std::enable_if<std::is_pointer<Type>::value, Type>::type
+    get(const UPstream::Request& req) noexcept
+    {
+        return reinterpret_cast<Type>(req.value());
+    }
+
+    // To integer
+    template<typename Type = MPI_Request>
+    static typename std::enable_if<std::is_integral<Type>::value, Type>::type
+    get(const UPstream::Request& req) noexcept
+    {
+        return static_cast<Type>(req.value());
+    }
+};
+
+
 // MPI_Bcast, using root=0
 template<class Type>
 void broadcast0
@@ -84,7 +99,8 @@ void allReduce
     MPI_Datatype datatype,
     MPI_Op optype,
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Iallreduce
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
@@ -96,7 +112,8 @@ void allToAll
     UList<Type>& recvData,
     MPI_Datatype datatype,
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Ialltoall
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
@@ -114,7 +131,8 @@ void allToAllv
 
     MPI_Datatype datatype,
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Ialltoallv
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
@@ -130,7 +148,8 @@ void gather
 
     MPI_Datatype datatype,              // The send/recv data type
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Igather
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
@@ -146,7 +165,8 @@ void scatter
 
     MPI_Datatype datatype,              // The send/recv data type
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Iscatter
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
@@ -163,7 +183,8 @@ void gatherv
 
     MPI_Datatype datatype,              // The send/recv data type
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Igatherv
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
@@ -180,7 +201,8 @@ void scatterv
 
     MPI_Datatype datatype,              // The send/recv data type
     const label comm,                   // Communicator
-    label* requestID = nullptr          // Non-null for MPI_Igatherv
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
 );
 
 
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 65139268f4..109e6b7f45 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2015 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,6 +119,8 @@ void Foam::PstreamDetail::allReduce
     MPI_Datatype datatype,
     MPI_Op optype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
@@ -127,9 +129,11 @@ void Foam::PstreamDetail::allReduce
         return;
     }
 
+    const bool immediate = (req || requestID);
+
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Iallreduce (non-blocking):";
         }
@@ -155,10 +159,11 @@ void Foam::PstreamDetail::allReduce
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
+
         if
         (
             MPI_Iallreduce
@@ -179,16 +184,23 @@ void Foam::PstreamDetail::allReduce
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Allreduce
@@ -220,14 +232,18 @@ void Foam::PstreamDetail::allToAll
     UList<Type>& recvData,
     MPI_Datatype datatype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
+    const bool immediate = (req || requestID);
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Ialltoall (non-blocking):";
         }
@@ -262,11 +278,12 @@ void Foam::PstreamDetail::allToAll
 
     bool handled(false);
 
-    #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
+
         if
         (
             MPI_Ialltoall
@@ -290,17 +307,23 @@ void Foam::PstreamDetail::allToAll
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
-
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Alltoall
@@ -341,14 +364,18 @@ void Foam::PstreamDetail::allToAllv
 
     MPI_Datatype datatype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
+    const bool immediate = (req || requestID);
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Ialltoallv (non-blocking):";
         }
@@ -402,7 +429,7 @@ void Foam::PstreamDetail::allToAllv
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
@@ -431,16 +458,23 @@ void Foam::PstreamDetail::allToAllv
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Alltoallv
@@ -480,6 +514,8 @@ void Foam::PstreamDetail::gather
 
     MPI_Datatype datatype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
@@ -489,11 +525,13 @@ void Foam::PstreamDetail::gather
         return;
     }
 
+    const bool immediate = (req || requestID);
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Igather (non-blocking):";
         }
@@ -514,10 +552,11 @@ void Foam::PstreamDetail::gather
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
+
         if
         (
             MPI_Igather
@@ -541,16 +580,23 @@ void Foam::PstreamDetail::gather
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Gather
@@ -589,6 +635,8 @@ void Foam::PstreamDetail::scatter
 
     MPI_Datatype datatype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
@@ -598,11 +646,13 @@ void Foam::PstreamDetail::scatter
         return;
     }
 
+    const bool immediate = (req || requestID);
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Iscatter (non-blocking):";
         }
@@ -623,10 +673,11 @@ void Foam::PstreamDetail::scatter
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
+
         if
         (
             MPI_Iscatter
@@ -650,16 +701,23 @@ void Foam::PstreamDetail::scatter
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Scatter
@@ -676,7 +734,7 @@ void Foam::PstreamDetail::scatter
         )
         {
             FatalErrorInFunction
-                << "MPI_Iscatter [comm: " << comm << "] failed."
+                << "MPI_Scatter [comm: " << comm << "] failed."
                 << " sendCount " << sendCount
                 << " recvCount " << recvCount
                 << Foam::abort(FatalError);
@@ -699,6 +757,8 @@ void Foam::PstreamDetail::gatherv
 
     MPI_Datatype datatype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
@@ -709,11 +769,13 @@ void Foam::PstreamDetail::gatherv
         return;
     }
 
+    const bool immediate = (req || requestID);
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Igatherv (non-blocking):";
         }
@@ -757,10 +819,11 @@ void Foam::PstreamDetail::gatherv
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
+
         if
         (
             MPI_Igatherv
@@ -785,16 +848,23 @@ void Foam::PstreamDetail::gatherv
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Gatherv
@@ -835,6 +905,8 @@ void Foam::PstreamDetail::scatterv
 
     MPI_Datatype datatype,
     const label comm,
+
+    UPstream::Request* req,
     label* requestID
 )
 {
@@ -844,11 +916,13 @@ void Foam::PstreamDetail::scatterv
         return;
     }
 
+    const bool immediate = (req || requestID);
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        if (requestID != nullptr)
+        if (immediate)
         {
             Pout<< "** MPI_Iscatterv (non-blocking):";
         }
@@ -886,10 +960,11 @@ void Foam::PstreamDetail::scatterv
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    if (requestID != nullptr)
+    if (immediate)
     {
         handled = true;
         MPI_Request request;
+
         if
         (
             MPI_Iscatterv
@@ -914,16 +989,23 @@ void Foam::PstreamDetail::scatterv
                 << Foam::abort(FatalError);
         }
 
-        *requestID = PstreamGlobals::push_request(request);
+        if (req)
+        {
+            *req = UPstream::Request(request);
+            if (requestID) *requestID = -1;
+        }
+        else
+        {
+            *requestID = PstreamGlobals::push_request(request);
+        }
     }
 #endif
 
     if (!handled)
     {
-        if (requestID != nullptr)
-        {
-            *requestID = -1;
-        }
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
+
         if
         (
             MPI_Scatterv

From bd0ad07d403c24c1dc4858464105eef1756cc8bd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 12 Jan 2023 19:59:52 +0100
Subject: [PATCH 010/348] ENH: restrict scope of waitRequests() in LduMatrix
 update

- Only wait for locally invoked requests.
  Reflects behaviour of lduMatrix update.
---
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H    |  5 +++--
 .../LduMatrix/LduMatrix/LduMatrixATmul.C        | 17 +++++++++++++----
 .../LduMatrix/LduMatrixUpdateMatrixInterfaces.C | 17 +++++++++--------
 .../GaussSeidel/TGaussSeidelSmoother.C          |  7 +++++--
 src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C  |  7 ++++---
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index db730d7a97..96e9fd14f4 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -637,7 +637,8 @@ public:
                 const bool add,
                 const FieldField<Field, LUType>& interfaceCoeffs,
                 const Field<Type>& psiif,
-                Field<Type>& result
+                Field<Type>& result,
+                const label startRequest // starting request (for non-blocking)
             ) const;
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index 9ae8571e86..565068d4d9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,6 +80,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Amul
     const LUType* const __restrict__ upperPtr = upper().begin();
     const LUType* const __restrict__ lowerPtr = lower().begin();
 
+    const label startRequest = UPstream::nRequests();
+
     // Initialise the update of interfaced interfaces
     initMatrixInterfaces
     (
@@ -109,7 +111,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Amul
         true,
         interfacesUpper_,
         psi,
-        Apsi
+        Apsi,
+        startRequest
     );
 
     tpsi.clear();
@@ -136,6 +139,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Tmul
     const LUType* const __restrict__ lowerPtr = lower().begin();
     const LUType* const __restrict__ upperPtr = upper().begin();
 
+    const label startRequest = UPstream::nRequests();
+
     // Initialise the update of interfaced interfaces
     initMatrixInterfaces
     (
@@ -164,7 +169,8 @@ void Foam::LduMatrix<Type, DType, LUType>::Tmul
         true,
         interfacesLower_,
         psi,
-        Tpsi
+        Tpsi,
+        startRequest
     );
 
     tpsi.clear();
@@ -242,6 +248,8 @@ void Foam::LduMatrix<Type, DType, LUType>::residual
     // Note: there is a change of sign in the coupled
     // interface update to add the contibution to the r.h.s.
 
+    const label startRequest = UPstream::nRequests();
+
     // Initialise the update of interfaced interfaces
     initMatrixInterfaces
     (
@@ -271,7 +279,8 @@ void Foam::LduMatrix<Type, DType, LUType>::residual
         false,
         interfacesUpper_,
         psi,
-        rA
+        rA,
+        startRequest
     );
 }
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index f3679554e8..0b63849d53 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -111,23 +111,24 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
     const bool add,
     const FieldField<Field, LUType>& interfaceCoeffs,
     const Field<Type>& psiif,
-    Field<Type>& result
+    Field<Type>& result,
+    const label startRequest
 ) const
 {
     const UPstream::commsTypes commsType = UPstream::defaultCommsType;
 
+    // Block until sends/receives have finished
+    if (commsType == UPstream::commsTypes::nonBlocking)
+    {
+        UPstream::waitRequests(startRequest);
+    }
+
     if
     (
         commsType == UPstream::commsTypes::blocking
      || commsType == UPstream::commsTypes::nonBlocking
     )
     {
-        // Block until all sends/receives have been finished
-        if (commsType == UPstream::commsTypes::nonBlocking)
-        {
-            UPstream::waitRequests();
-        }
-
         forAll(interfaces_, interfacei)
         {
             if (interfaces_.set(interfacei))
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
index f4a7ca0e17..61a90dba53 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -98,6 +98,8 @@ void Foam::TGaussSeidelSmoother<Type, DType, LUType>::smooth
     {
         bPrime = matrix_.source();
 
+        const label startRequest = UPstream::nRequests();
+
         matrix_.initMatrixInterfaces
         (
             false,
@@ -111,7 +113,8 @@ void Foam::TGaussSeidelSmoother<Type, DType, LUType>::smooth
             false,
             matrix_.interfacesUpper(),
             psi,
-            bPrime
+            bPrime,
+            startRequest
         );
 
         Type curPsi;
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index 5bade23b55..8f0c928b39 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019,2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,6 +116,8 @@ Foam::labelListList Foam::lduPrimitiveMesh::globalCellCells
     // Get the interface cells
     PtrList<labelList> nbrGlobalCells(interfaces.size());
     {
+        const label startOfRequests = UPstream::nRequests();
+
         // Initialise transfer of restrict addressing on the interface
         forAll(interfaces, inti)
         {
@@ -129,8 +131,7 @@ Foam::labelListList Foam::lduPrimitiveMesh::globalCellCells
             }
         }
 
-        // Wait for all
-        UPstream::waitRequests();
+        UPstream::waitRequests(startOfRequests);
 
         forAll(interfaces, inti)
         {

From bf99c104eb38233b468e22defa18b508fe2fdc8b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 09:33:00 +0100
Subject: [PATCH 011/348] ENH: avoid faPatch/fvPatch patchInternalField
 ambiguity

- with alternative faceCell addressing, use the three-parameter
  version only. This avoids potential future ambiguity with the
  two-parameter version (eg, with a label type)

ENH: add faPatchField patchInternalField() for symmetry with fvPatchField

ENH: direct reference to mesh thisDb instead of inferring

ENH: pointMesh::boundaryMesh() method (eg, similar to fvMesh)
---
 .../pointPatchField/pointPatchField.C         | 10 +---
 .../pointPatchField/pointPatchField.H         | 26 +++++----
 .../pointPatchField/pointPatchFieldBase.C     |  2 +-
 .../pointBoundaryMesh/pointBoundaryMesh.C     |  8 +--
 src/OpenFOAM/meshes/pointMesh/pointMesh.H     | 15 ++++-
 .../constraint/cyclic/cyclicFaPatch.C         |  4 +-
 .../constraint/processor/processorFaPatch.C   |  4 +-
 .../faMesh/faPatches/faPatch/faPatch.H        | 42 ++++++++------
 .../faPatches/faPatch/faPatchTemplates.C      | 55 ++++++++-----------
 .../clampedPlate/clampedPlateFaPatchField.C   | 11 ++--
 .../clampedPlate/clampedPlateFaPatchField.H   | 12 ++--
 .../faPatchFields/faPatchField/faPatchField.C | 19 +++----
 .../faPatchFields/faPatchField/faPatchField.H | 20 ++++---
 .../faPatchField/faPatchFieldBase.C           | 10 ++--
 .../faePatchField/faePatchField.C             | 12 ----
 .../faePatchField/faePatchField.H             | 10 ++--
 .../faePatchField/faePatchFieldBase.C         | 10 ++--
 .../fvPatchFields/fvPatchField/fvPatchField.C |  8 +--
 .../fvPatchFields/fvPatchField/fvPatchField.H | 12 ++--
 .../fvPatchField/fvPatchFieldBase.C           |  2 +-
 .../fvsPatchField/fvsPatchField.C             |  4 --
 .../fvsPatchField/fvsPatchField.H             |  5 +-
 .../fvsPatchField/fvsPatchFieldBase.C         |  2 +-
 .../constraint/cyclic/cyclicFvPatch.C         |  6 +-
 .../constraint/cyclicACMI/cyclicACMIFvPatch.C |  7 ++-
 .../constraint/cyclicAMI/cyclicAMIFvPatch.C   |  6 +-
 .../constraint/processor/processorFvPatch.C   |  4 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.H        | 42 +++++++++-----
 .../fvPatches/fvPatch/fvPatchTemplates.C      | 55 ++++++++-----------
 src/overset/oversetPolyPatch/oversetFvPatch.C |  6 +-
 .../oversetPolyPatch/oversetFvPatchField.H    | 10 ++--
 31 files changed, 222 insertions(+), 217 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 69ae3130c7..f2f775ccc4 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -122,7 +122,7 @@ Foam::tmp<Foam::Field<Type1>>
 Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF,
-    const labelList& meshPoints
+    const labelUList& meshPoints
 ) const
 {
     // Check size
@@ -194,7 +194,7 @@ void Foam::pointPatchField<Type>::addToInternalField
 (
     Field<Type1>& iF,
     const Field<Type1>& pF,
-    const labelList& points
+    const labelUList& points
 ) const
 {
     // Check size
@@ -233,7 +233,7 @@ void Foam::pointPatchField<Type>::setInInternalField
 (
     Field<Type1>& iF,
     const Field<Type1>& pF,
-    const labelList& meshPoints
+    const labelUList& meshPoints
 ) const
 {
     // Check size
@@ -310,8 +310,4 @@ Foam::Ostream& Foam::operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "pointPatchFieldNew.C"
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 8ea1f2f63f..32e1ad2d7e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -390,24 +390,27 @@ public:
                 return patch().size();
             }
 
-            //- Return dimensioned internal field reference
+            //- Return const-reference to the dimensioned internal field
             const DimensionedField<Type, pointMesh>& internalField()
             const noexcept
             {
                 return internalField_;
             }
 
-            //- Return internal field reference
+            //- Return const-reference to the internal field values
             const Field<Type>& primitiveField() const noexcept
             {
                 return internalField_;
             }
 
+
+        // Evaluation Functions
+
             //- Return field created from appropriate internal field values
             tmp<Field<Type>> patchInternalField() const;
 
             //- Return field created from appropriate internal field values
-            //  given internal field reference
+            //- given internal field reference
             template<class Type1>
             tmp<Field<Type1>> patchInternalField
             (
@@ -415,16 +418,16 @@ public:
             ) const;
 
             //- Return field created from selected internal field values
-            //  given internal field reference
+            //- given internal field reference
             template<class Type1>
             tmp<Field<Type1>> patchInternalField
             (
                 const Field<Type1>& iF,
-                const labelList& meshPoints
+                const labelUList& meshPoints
             ) const;
 
             //- Given the internal field and a patch field,
-            //  add the patch field to the internal field
+            //- add the patch field to the internal field
             template<class Type1>
             void addToInternalField
             (
@@ -433,27 +436,27 @@ public:
             ) const;
 
             //- Given the internal field and a patch field,
-            //  add selected elements of the patch field to the internal field
+            //- add selected elements of the patch field to the internal field
             template<class Type1>
             void addToInternalField
             (
                 Field<Type1>& iF,
                 const Field<Type1>& pF,
-                const labelList& points
+                const labelUList& points
             ) const;
 
             //- Given the internal field and a patch field,
-            //  set the patch field in the internal field
+            //- set the patch field in the internal field
             template<class Type1>
             void setInInternalField
             (
                 Field<Type1>& iF,
                 const Field<Type1>& pF,
-                const labelList& meshPoints
+                const labelUList& meshPoints
             ) const;
 
             //- Given the internal field and a patch field,
-            //  set the patch field in the internal field
+            //- set the patch field in the internal field
             template<class Type1>
             void setInInternalField
             (
@@ -581,6 +584,7 @@ const pointPatchField<Type>& operator+
 
 #ifdef NoRepository
     #include "pointPatchField.C"
+    #include "pointPatchFieldNew.C"
     #include "calculatedPointPatchField.H"
     #include "zeroGradientPointPatchField.H"
 #endif
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C
index 3ecd9e583c..3c6db48140 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C
@@ -105,7 +105,7 @@ void Foam::pointPatchFieldBase::readDict(const dictionary& dict)
 
 const Foam::objectRegistry& Foam::pointPatchFieldBase::db() const
 {
-    return patch_.boundaryMesh().mesh()();
+    return patch_.boundaryMesh().mesh().thisDb();
 }
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
index 7f7ea57cd7..6c6ff54bb0 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,7 +67,7 @@ Foam::labelList Foam::pointBoundaryMesh::indices
     const bool useGroups
 ) const
 {
-    return mesh()().boundaryMesh().indices(matcher, useGroups);
+    return mesh().boundaryMesh().indices(matcher, useGroups);
 }
 
 
@@ -77,13 +77,13 @@ Foam::labelList Foam::pointBoundaryMesh::indices
     const bool useGroups
 ) const
 {
-    return mesh()().boundaryMesh().indices(matcher, useGroups);
+    return mesh().boundaryMesh().indices(matcher, useGroups);
 }
 
 
 Foam::label Foam::pointBoundaryMesh::findPatchID(const word& patchName) const
 {
-    return mesh()().boundaryMesh().findPatchID(patchName);
+    return mesh().boundaryMesh().findPatchID(patchName);
 }
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
index 16e9b92319..ea960a5485 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -112,7 +112,7 @@ public:
         }
 
         //- Return reference to boundary mesh
-        const pointBoundaryMesh& boundary() const
+        const pointBoundaryMesh& boundary() const noexcept
         {
             return boundary_;
         }
@@ -136,7 +136,16 @@ public:
         }
 
 
-    // Mesh motion
+    // Volume Mesh
+
+        //- Return boundary mesh for underlying volume mesh
+        const polyBoundaryMesh& boundaryMesh() const
+        {
+            return GeoMesh<polyMesh>::mesh_.boundaryMesh();
+        }
+
+
+    // Mesh Motion
 
         //- Move points
         bool movePoints();
diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
index cb3612260f..d1ebed1da7 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
@@ -321,7 +321,9 @@ Foam::tmp<Foam::labelField> Foam::cyclicFaPatch::interfaceInternalField
     const labelUList& edgeFaces
 ) const
 {
-    return patchInternalField(internalData, edgeFaces);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, edgeFaces, tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index 2b3a1a5df9..3312cb8173 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -492,7 +492,9 @@ Foam::tmp<Foam::labelField> Foam::processorFaPatch::interfaceInternalField
     const labelUList& edgeFaces
 ) const
 {
-    return patchInternalField(internalData, edgeFaces);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, edgeFaces, tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
index 7c2cecc140..625b940cce 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -421,32 +421,42 @@ public:
 
         // Evaluation
 
-            //- Extract internal field next to patch using edgeFaces mapping
+            //- Extract internal field next to patch using specified addressing
+            // \param internalData The internal field to extract from
+            // \param addressing Addressing from patch into internal field
+            // \param [out] pfld The extracted patch field.
+            //     It is always resized according to the patch size(),
+            //     which can be smaller than the addressing size
             template<class Type>
             inline void patchInternalField
             (
-                const UList<Type>& f,
-                const labelUList& edgeFaces,
+                const UList<Type>& internalData,
+                const labelUList& addressing,
+                Field<Type>& pfld
+            ) const;
+
+            //- Extract internal field next to patch as patch field
+            //- using edgeFaces() mapping.
+            // \param internalData The internal field to extract from
+            // \param [out] pfld The extracted patch field.
+            //     It is always resized according to the patch size(),
+            //     which can be smaller than the edgeFaces() size
+            template<class Type>
+            void patchInternalField
+            (
+                const UList<Type>& internalData,
                 Field<Type>& pfld
             ) const;
 
             //- Return given internal field next to patch as patch field
+            //- using edgeFaces() mapping.
+            // \param internalData The internal field to extract from
             template<class Type>
-            tmp<Field<Type>> patchInternalField(const UList<Type>&) const;
-
-            //- Return given internal field next to patch as patch field
-            //- using provided addressing
-            template<class Type>
-            tmp<Foam::Field<Type>> patchInternalField
+            tmp<Field<Type>> patchInternalField
             (
-                const UList<Type>& f,
-                const labelUList& edgeFaces
+                const UList<Type>& internalData
             ) const;
 
-            //- Extract internal field next to patch as patch field
-            template<class Type>
-            void patchInternalField(const UList<Type>&, Field<Type>&) const;
-
             //- Return the patch field of the GeometricField
             //- corresponding to this patch.
             template<class GeometricField, class AnyType = bool>
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatchTemplates.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatchTemplates.C
index f4550c216a..892e54280c 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatchTemplates.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatchTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,53 +33,42 @@ License
 template<class Type>
 void Foam::faPatch::patchInternalField
 (
-    const UList<Type>& f,
-    const labelUList& edgeFaces,
+    const UList<Type>& internalData,
+    const labelUList& addressing,
     Field<Type>& pfld
 ) const
 {
-    pfld.resize(size());
+    const label len = this->size();
 
-    forAll(pfld, i)
+    pfld.resize_nocopy(len);
+
+    for (label i = 0; i < len; ++i)
     {
-        pfld[i] = f[edgeFaces[i]];
+        pfld[i] = internalData[addressing[i]];
     }
 }
 
 
-template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::faPatch::patchInternalField
-(
-    const UList<Type>& f
-) const
-{
-    auto tpfld = tmp<Field<Type>>::New(size());
-    patchInternalField(f, this->edgeFaces(), tpfld.ref());
-    return tpfld;
-}
-
-
-template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::faPatch::patchInternalField
-(
-    const UList<Type>& f,
-    const labelUList& edgeFaces
-) const
-{
-    auto tpfld = tmp<Field<Type>>::New(size());
-    patchInternalField(f, edgeFaces, tpfld.ref());
-    return tpfld;
-}
-
-
 template<class Type>
 void Foam::faPatch::patchInternalField
 (
-    const UList<Type>& f,
+    const UList<Type>& internalData,
     Field<Type>& pfld
 ) const
 {
-    patchInternalField(f, this->edgeFaces(), pfld);
+    patchInternalField(internalData, this->edgeFaces(), pfld);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::faPatch::patchInternalField
+(
+    const UList<Type>& internalData
+) const
+{
+    auto tpfld = tmp<Field<Type>>::New();
+    patchInternalField(internalData, this->edgeFaces(), tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
index d4f257b80e..d1d340b8d9 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
@@ -128,18 +128,17 @@ void clampedPlateFaPatchField<scalar>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-tmp<Field<Type> > clampedPlateFaPatchField<Type>::valueInternalCoeffs
+tmp<Field<Type>> clampedPlateFaPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type>>
-        (new Field<Type>(this->size(), pTraits<Type>::zero));
+    return tmp<Field<Type>>::New(this->size(), Zero);
 }
 
 
 template<class Type>
-tmp<Field<Type> > clampedPlateFaPatchField<Type>::valueBoundaryCoeffs
+tmp<Field<Type>> clampedPlateFaPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -149,7 +148,7 @@ tmp<Field<Type> > clampedPlateFaPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 clampedPlateFaPatchField<Type>::gradientInternalCoeffs() const
 {
     return -Type(pTraits<Type>::one)*this->patch().deltaCoeffs();
@@ -157,7 +156,7 @@ clampedPlateFaPatchField<Type>::gradientInternalCoeffs() const
 
 
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 clampedPlateFaPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return this->patch().deltaCoeffs()*(*this);
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
index 4178ffb782..ad740c900b 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
@@ -131,12 +131,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<faPatchField<Type> > clone
+        virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type> >
+            return tmp<faPatchField<Type>>
             (
                 new clampedPlateFaPatchField<Type>(*this, iF)
             );
@@ -169,25 +169,25 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //- evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix source coefficients corresponding to the
             //- evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const;
 
             //- Return the matrix diagonal coefficients corresponding to the
             //- evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientInternalCoeffs() const;
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
 
             //- Return the matrix source coefficients corresponding to the
             //- evaluation of the gradient of this patchField
-            virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
 
 
         // IO
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index 60f7368ed8..ff5fc8f317 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -128,14 +128,6 @@ Foam::faPatchField<Type>::faPatchField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-const Foam::objectRegistry& Foam::faPatchField<Type>::db() const
-{
-    // Note: Lookup fields from the field DB rather than the mesh
-    return internalField_.db();
-}
-
-
 template<class Type>
 void Foam::faPatchField<Type>::check(const faPatchField<Type>& rhs) const
 {
@@ -158,6 +150,13 @@ Foam::faPatchField<Type>::patchInternalField() const
 }
 
 
+template<class Type>
+void Foam::faPatchField<Type>::patchInternalField(Field<Type>& pfld) const
+{
+    patch().patchInternalField(internalField_, pfld);
+}
+
+
 template<class Type>
 void Foam::faPatchField<Type>::autoMap(const faPatchFieldMapper& m)
 {
@@ -407,8 +406,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const faPatchField<Type>& ptf)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "faPatchFieldNew.C"
-
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index de98d4ebef..bc915135c5 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -143,7 +143,7 @@ public:
     // Access
 
         //- The associated objectRegistry
-        /// const objectRegistry& db() const;
+        const objectRegistry& db() const;
 
         //- Return the patch
         const faPatch& patch() const noexcept
@@ -394,17 +394,14 @@ public:
 
         // Access
 
-            //- Return local objectRegistry
-            const objectRegistry& db() const;
-
-            //- Return dimensioned internal field reference
-            const DimensionedField<Type, areaMesh>&
-            internalField() const noexcept
+            //- Return const-reference to the dimensioned internal field
+            const DimensionedField<Type, areaMesh>& internalField()
+            const noexcept
             {
                 return internalField_;
             }
 
-            //- Return internal field reference
+            //- Return const-reference to the internal field values
             const Field<Type>& primitiveField() const noexcept
             {
                 return internalField_;
@@ -432,9 +429,13 @@ public:
             //- Return patch-normal gradient
             virtual tmp<Field<Type>> snGrad() const;
 
-            //- Return internal field next to patch as patch field
+            //- Return internal field next to patch
             virtual tmp<Field<Type>> patchInternalField() const;
 
+            //- Extract internal field next to patch
+            //  \param [out] pfld The extracted patch field.
+            virtual void patchInternalField(Field<Type>& pfld) const;
+
             //- Return patchField on the opposite patch of a coupled patch
             virtual tmp<Field<Type>> patchNeighbourField() const
             {
@@ -556,6 +557,7 @@ public:
 
 #ifdef NoRepository
     #include "faPatchField.C"
+    #include "faPatchFieldNew.C"
     #include "calculatedFaPatchField.H"
     #include "zeroGradientFaPatchField.H"
 #endif
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldBase.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldBase.C
index 8edc4781b2..eb99171134 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldBase.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldBase.C
@@ -26,6 +26,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "faPatchField.H"
+#include "faBoundaryMesh.H"
+#include "faMesh.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -103,10 +105,10 @@ void Foam::faPatchFieldBase::readDict(const dictionary& dict)
 }
 
 
-// const Foam::objectRegistry& Foam::faPatchFieldBase::db() const
-// {
-//     return patch_.boundaryMesh().mesh().thisDb();
-// }
+const Foam::objectRegistry& Foam::faPatchFieldBase::db() const
+{
+    return patch_.boundaryMesh().mesh().thisDb();
+}
 
 
 void Foam::faPatchFieldBase::checkPatch(const faPatchFieldBase& rhs) const
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
index c9c93d5af2..d45518577a 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
@@ -125,14 +125,6 @@ Foam::faePatchField<Type>::faePatchField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-const Foam::objectRegistry& Foam::faePatchField<Type>::db() const
-{
-    // Note: Lookup fields from the field DB rather than the mesh
-    return internalField_.db();
-}
-
-
 template<class Type>
 void Foam::faePatchField<Type>::check(const faePatchField<Type>& rhs) const
 {
@@ -373,8 +365,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const faePatchField<Type>& ptf)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "faePatchFieldNew.C"
-
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index 950f9d5de1..720a4f00e5 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -128,7 +128,7 @@ public:
     // Access
 
         //- The associated objectRegistry
-        /// const objectRegistry& db() const;
+        const objectRegistry& db() const;
 
         //- Return the patch
         const faPatch& patch() const noexcept
@@ -358,17 +358,14 @@ public:
 
         // Access
 
-            //- Return local objectRegistry
-            const objectRegistry& db() const;
-
-            //- Return dimensioned internal field reference
+            //- Return const-reference to the dimensioned internal field
             const DimensionedField<Type, edgeMesh>& internalField()
             const noexcept
             {
                 return internalField_;
             }
 
-            //- Return internal field reference
+            //- Return const-reference to the internal field values
             const Field<Type>& primitiveField() const noexcept
             {
                 return internalField_;
@@ -445,6 +442,7 @@ public:
 
 #ifdef NoRepository
     #include "faePatchField.C"
+    #include "faePatchFieldNew.C"
     #include "calculatedFaePatchField.H"
 #endif
 
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldBase.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldBase.C
index 8dcd03a3ae..0c039570c5 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldBase.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldBase.C
@@ -26,6 +26,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "faePatchField.H"
+#include "faBoundaryMesh.H"
+#include "faMesh.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -93,10 +95,10 @@ void Foam::faePatchFieldBase::readDict(const dictionary& dict)
 {}
 
 
-// const Foam::objectRegistry& Foam::faePatchFieldBase::db() const
-// {
-//     return patch_.boundaryMesh().mesh().thisDb();
-// }
+const Foam::objectRegistry& Foam::faePatchFieldBase::db() const
+{
+    return patch_.boundaryMesh().mesh().thisDb();
+}
 
 
 void Foam::faePatchFieldBase::checkPatch(const faePatchFieldBase& rhs) const
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 33d7d5fc30..f2a7c4133f 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -193,9 +193,9 @@ Foam::fvPatchField<Type>::patchInternalField() const
 
 
 template<class Type>
-void Foam::fvPatchField<Type>::patchInternalField(Field<Type>& pif) const
+void Foam::fvPatchField<Type>::patchInternalField(Field<Type>& pfld) const
 {
-    patch().patchInternalField(internalField_, pif);
+    patch().patchInternalField(internalField_, pfld);
 }
 
 
@@ -552,8 +552,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvPatchField<Type>& ptf)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "fvPatchFieldNew.C"
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 976d9e778d..84d1e333cb 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -461,14 +461,14 @@ public:
 
         // Access
 
-            //- Return dimensioned internal field reference
+            //- Return const-reference to the dimensioned internal field
             const DimensionedField<Type, volMesh>& internalField()
             const noexcept
             {
                 return internalField_;
             }
 
-            //- Return internal field reference
+            //- Return const-reference to the internal field values
             const Field<Type>& primitiveField() const noexcept
             {
                 return internalField_;
@@ -517,11 +517,12 @@ public:
             //  patches. Sets Updated to true
             virtual void updateWeightedCoeffs(const scalarField& weights);
 
-            //- Return internal field next to patch as patch field
+            //- Return internal field next to patch
             virtual tmp<Field<Type>> patchInternalField() const;
 
-            //- Return internal field next to patch as patch field
-            virtual void patchInternalField(Field<Type>&) const;
+            //- Extract internal field next to patch
+            // \param [out] pfld The extracted patch field.
+            virtual void patchInternalField(Field<Type>& pfld) const;
 
             //- Return patchField on the opposite patch of a coupled patch
             virtual tmp<Field<Type>> patchNeighbourField() const
@@ -684,6 +685,7 @@ public:
 
 #ifdef NoRepository
     #include "fvPatchField.C"
+    #include "fvPatchFieldNew.C"
     #include "calculatedFvPatchField.H"
     #include "zeroGradientFvPatchField.H"
 #endif
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C
index f075ada6ec..1adbf72d62 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C
@@ -112,7 +112,7 @@ void Foam::fvPatchFieldBase::readDict(const dictionary& dict)
 
 const Foam::objectRegistry& Foam::fvPatchFieldBase::db() const
 {
-    return patch_.boundaryMesh().mesh();
+    return patch_.boundaryMesh().mesh().thisDb();
 }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index acb52ae74f..c88be8b532 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -365,8 +365,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "fvsPatchFieldNew.C"
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 1542e9a743..3ee2f1dc26 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -357,14 +357,14 @@ public:
 
         // Access
 
-            //- Return dimensioned internal field reference
+            //- Return const-reference to the dimensioned internal field
             const DimensionedField<Type, surfaceMesh>& internalField()
             const noexcept
             {
                 return internalField_;
             }
 
-            //- Return internal field reference
+            //- Return const-reference to the internal field values
             const Field<Type>& primitiveField() const noexcept
             {
                 return internalField_;
@@ -441,6 +441,7 @@ public:
 
 #ifdef NoRepository
     #include "fvsPatchField.C"
+    #include "fvsPatchFieldNew.C"
     #include "calculatedFvsPatchField.H"
 #endif
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C
index 3abe281ccf..5375772156 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C
@@ -83,7 +83,7 @@ void Foam::fvsPatchFieldBase::readDict(const dictionary& dict)
 
 const Foam::objectRegistry& Foam::fvsPatchFieldBase::db() const
 {
-    return patch_.boundaryMesh().mesh();
+    return patch_.boundaryMesh().mesh().thisDb();
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
index 7a04296170..a8eccd2c9f 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -108,7 +108,9 @@ Foam::tmp<Foam::labelField> Foam::cyclicFvPatch::interfaceInternalField
     const labelUList& faceCells
 ) const
 {
-    return patchInternalField(internalData, faceCells);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, faceCells, tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
index 3e6db16b4d..8ddab7a43e 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2019,2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -295,7 +295,9 @@ Foam::tmp<Foam::labelField> Foam::cyclicACMIFvPatch::interfaceInternalField
     const labelUList& faceCells
 ) const
 {
-    return patchInternalField(internalData, faceCells);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, faceCells, tpfld.ref());
+    return tpfld;
 }
 
 
@@ -402,4 +404,5 @@ void Foam::cyclicACMIFvPatch::movePoints()
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
index 5b74ec455d..4bb5537ad3 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020,2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -228,7 +228,9 @@ Foam::tmp<Foam::labelField> Foam::cyclicAMIFvPatch::interfaceInternalField
     const labelUList& faceCells
 ) const
 {
-    return patchInternalField(internalData, faceCells);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, faceCells, tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
index dbf04fa225..2af6d7ee1a 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
@@ -117,7 +117,9 @@ Foam::tmp<Foam::labelField> Foam::processorFvPatch::interfaceInternalField
     const labelUList& faceCells
 ) const
 {
-    return patchInternalField(internalData, faceCells);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, faceCells, tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 0e575be72d..b787c0e920 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,6 +33,8 @@ Description
 SourceFiles
     fvPatch.C
     fvPatchNew.C
+    fvPatchTemplates.C
+    fvPatchFvMeshTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -274,32 +276,42 @@ public:
 
         // Evaluation Functions
 
-            //- Extract internal field next to patch using faceCells mapping
+            //- Extract internal field next to patch using specified addressing
+            // \param internalData The internal field to extract from
+            // \param addressing Addressing from patch into internal field
+            // \param [out] pfld The extracted patch field.
+            //     It is always resized according to the patch size(),
+            //     which can be smaller than the addressing size
             template<class Type>
             inline void patchInternalField
             (
-                const UList<Type>& f,
-                const labelUList& faceCells,
+                const UList<Type>& internalData,
+                const labelUList& addressing,
+                Field<Type>& pfld
+            ) const;
+
+            //- Extract internal field next to patch as patch field
+            //- using faceCells() mapping.
+            // \param internalData The internal field to extract from
+            // \param [out] pfld The extracted patch field.
+            //     It is always resized according to the patch size(),
+            //     which can be smaller than the faceCells() size
+            template<class Type>
+            void patchInternalField
+            (
+                const UList<Type>& internalData,
                 Field<Type>& pfld
             ) const;
 
             //- Return given internal field next to patch as patch field
-            template<class Type>
-            tmp<Field<Type>> patchInternalField(const UList<Type>&) const;
-
-            //- Return given internal field next to patch as patch field
-            //- using provided addressing
+            //- using faceCells() mapping.
+            // \param internalData The internal field to extract from
             template<class Type>
             tmp<Field<Type>> patchInternalField
             (
-                const UList<Type>& f,
-                const labelUList& faceCells
+                const UList<Type>& internalData
             ) const;
 
-            //- Return given internal field next to patch as patch field
-            template<class Type>
-            void patchInternalField(const UList<Type>&, Field<Type>&) const;
-
             //- Return the patch field of the GeometricField
             //- corresponding to this patch.
             template<class GeometricField, class AnyType = bool>
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
index 1b405d94a5..ec72dead9c 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,53 +33,42 @@ License
 template<class Type>
 void Foam::fvPatch::patchInternalField
 (
-    const UList<Type>& f,
-    const labelUList& faceCells,
+    const UList<Type>& internalData,
+    const labelUList& addressing,
     Field<Type>& pfld
 ) const
 {
-    pfld.resize(size());
+    const label len = this->size();
 
-    forAll(pfld, i)
+    pfld.resize_nocopy(len);
+
+    for (label i = 0; i < len; ++i)
     {
-        pfld[i] = f[faceCells[i]];
+        pfld[i] = internalData[addressing[i]];
     }
 }
 
 
-template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::fvPatch::patchInternalField
-(
-    const UList<Type>& f
-) const
-{
-    auto tpfld = tmp<Field<Type>>::New(size());
-    patchInternalField(f, this->faceCells(), tpfld.ref());
-    return tpfld;
-}
-
-
-template<class Type>
-Foam::tmp<Foam::Field<Type>> Foam::fvPatch::patchInternalField
-(
-    const UList<Type>& f,
-    const labelUList& faceCells
-) const
-{
-    auto tpfld = tmp<Field<Type>>::New(size());
-    patchInternalField(f, faceCells, tpfld.ref());
-    return tpfld;
-}
-
-
 template<class Type>
 void Foam::fvPatch::patchInternalField
 (
-    const UList<Type>& f,
+    const UList<Type>& internalData,
     Field<Type>& pfld
 ) const
 {
-    patchInternalField(f, this->faceCells(), pfld);
+    patchInternalField(internalData, this->faceCells(), pfld);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::fvPatch::patchInternalField
+(
+    const UList<Type>& internalData
+) const
+{
+    auto tpfld = tmp<Field<Type>>::New();
+    patchInternalField(internalData, this->faceCells(), tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/overset/oversetPolyPatch/oversetFvPatch.C b/src/overset/oversetPolyPatch/oversetFvPatch.C
index c1f4b68cf2..4abb67aa29 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatch.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatch.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,9 @@ Foam::tmp<Foam::labelField> Foam::oversetFvPatch::interfaceInternalField
     const labelUList& faceCells
 ) const
 {
-    return patchInternalField(internalData, faceCells);
+    auto tpfld = tmp<labelField>::New();
+    patchInternalField(internalData, faceCells, tpfld.ref());
+    return tpfld;
 }
 
 
diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.H b/src/overset/oversetPolyPatch/oversetFvPatchField.H
index 340132d94a..f681a9cd64 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.H
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.H
@@ -166,7 +166,7 @@ public:
         // Coupled and adjust flux
 
             //- Return neighbour field.  Dummy
-            virtual tmp<Field<Type> > patchNeighbourField() const;
+            virtual tmp<Field<Type>> patchNeighbourField() const;
 
             //- Adjust psi for mass correction. Requires storeFringeCoefficients
             //  to have been called before
@@ -196,7 +196,7 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //- evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueInternalCoeffs
+            virtual tmp<Field<Type>> valueInternalCoeffs
             (
                 const tmp<scalarField>&
             ) const
@@ -209,7 +209,7 @@ public:
 
             //- Return the matrix source coefficients corresponding to the
             //- evaluation of the value of this patchField with given weights
-            virtual tmp<Field<Type> > valueBoundaryCoeffs
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
             (
                 const tmp<scalarField>&
             ) const
@@ -222,7 +222,7 @@ public:
 
             //- Return the matrix diagonal coefficients corresponding to the
             //- evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientInternalCoeffs() const
+            tmp<Field<Type>> gradientInternalCoeffs() const
             {
                 return tmp<Field<Type>>
                 (
@@ -232,7 +232,7 @@ public:
 
             //- Return the matrix source coefficients corresponding to the
             //- evaluation of the gradient of this patchField
-            tmp<Field<Type> > gradientBoundaryCoeffs() const
+            tmp<Field<Type>> gradientBoundaryCoeffs() const
             {
                 return tmp<Field<Type>>
                 (

From bf2f87f7e36da68de4cef8f7e5a2eb94b5a232af Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 11 Jan 2023 17:55:31 +0100
Subject: [PATCH 012/348] ENH: use isolated request wait in PPCG solver

---
 .../matrices/lduMatrix/solvers/PPCG/PPCG.C    | 19 ++++++-------------
 .../matrices/lduMatrix/solvers/PPCG/PPCG.H    |  8 ++++----
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
index ec7cb8bb25..53c0900de0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2019-2020 Mattijs Janssens
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,7 +49,7 @@ void Foam::PPCG::gSumMagProd
     const solveScalarField& b,
     const solveScalarField& c,
     const solveScalarField& sumMag,
-    label& outstandingRequest,
+    UPstream::Request& request,
     const label comm
 ) const
 {
@@ -72,7 +72,7 @@ void Foam::PPCG::gSumMagProd
             sumOp<solveScalar>(),
             Pstream::msgType(),
             comm,
-            outstandingRequest
+            request
         );
     }
 }
@@ -136,7 +136,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
     solveScalarField m(nCells);
 
     FixedList<solveScalar, 3> globalSum;
-    label outstandingRequest = -1;
+    UPstream::Request outstandingRequest;
     if (cgMode)
     {
         // --- Start global reductions for inner products
@@ -170,11 +170,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
     )
     {
         // Make sure gamma,delta are available
-        if (outstandingRequest != -1)
-        {
-            UPstream::waitRequest(outstandingRequest);
-            outstandingRequest = -1;
-        }
+        outstandingRequest.wait();
 
         const solveScalar gammaOld = gamma;
         gamma = globalSum[0];
@@ -249,10 +245,7 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
     }
 
     // Cleanup any outstanding requests
-    if (outstandingRequest != -1)
-    {
-        UPstream::waitRequest(outstandingRequest);
-    }
+    outstandingRequest.wait();
 
     return solverPerf;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
index 5a8926a7c4..a15bdf8ca2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2019-2020 Mattijs Janssens
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,8 +48,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PPCG_H
-#define PPCG_H
+#ifndef Foam_PPCG_H
+#define Foam_PPCG_H
 
 #include "lduMatrix.H"
 
@@ -76,7 +76,7 @@ class PPCG
             const solveScalarField& b,
             const solveScalarField& c,
             const solveScalarField& sumMag,
-            label& outstandingRequest,
+            UPstream::Request& request,
             const label comm
         ) const;
 

From b15638a2d25dafbfb303abe42fbe0ab0570c7696 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 12 Jan 2023 18:48:07 +0100
Subject: [PATCH 013/348] ENH: consistent use of resize_nocopy for processor
 transfers

STYLE: rename some internal buffers with the data types

  low-level  : byteSendBuf_, byteRecvBuf_
  field level: sendBuf_, recvBuf_
  solve level: scalarSendBuf_, scalarRecvBuf_
---
 .../processorCyclicPointPatchField.C          | 40 +++-----
 .../processorCyclicPointPatchField.H          |  7 +-
 .../lduCalculatedProcessorField.C             | 10 +-
 .../lduCalculatedProcessorField.H             |  6 +-
 .../lduInterface/processorLduInterface.H      | 19 ++--
 .../processorLduInterfaceTemplates.C          | 80 ++++++++--------
 .../processorGAMGInterfaceField.C             | 32 +++----
 .../processorGAMGInterfaceField.H             |  4 +-
 .../faMesh/faMeshDemandDrivenData.C           |  2 +-
 .../calculatedProcessorFvPatchField.C         | 14 +--
 .../calculatedProcessorFvPatchField.H         |  6 +-
 .../processor/processorFvPatchField.C         | 94 +++++++------------
 .../processor/processorFvPatchField.H         |  6 +-
 .../calculatedProcessorGAMGInterfaceField.C   | 32 +++----
 .../calculatedProcessorGAMGInterfaceField.H   |  4 +-
 15 files changed, 152 insertions(+), 204 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
index 5abd549408..8dee733480 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,8 +41,7 @@ Foam::processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
 )
 :
     coupledPointPatchField<Type>(p, iF),
-    procPatch_(refCast<const processorCyclicPointPatch>(p)),
-    receiveBuf_(0)
+    procPatch_(refCast<const processorCyclicPointPatch>(p))
 {}
 
 
@@ -55,8 +54,7 @@ Foam::processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
 )
 :
     coupledPointPatchField<Type>(p, iF, dict),
-    procPatch_(refCast<const processorCyclicPointPatch>(p, dict)),
-    receiveBuf_(0)
+    procPatch_(refCast<const processorCyclicPointPatch>(p, dict))
 {}
 
 
@@ -70,8 +68,7 @@ Foam::processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
 )
 :
     coupledPointPatchField<Type>(ptf, p, iF, mapper),
-    procPatch_(refCast<const processorCyclicPointPatch>(ptf.patch())),
-    receiveBuf_(0)
+    procPatch_(refCast<const processorCyclicPointPatch>(ptf.patch()))
 {}
 
 
@@ -83,15 +80,7 @@ Foam::processorCyclicPointPatchField<Type>::processorCyclicPointPatchField
 )
 :
     coupledPointPatchField<Type>(ptf, iF),
-    procPatch_(refCast<const processorCyclicPointPatch>(ptf.patch())),
-    receiveBuf_(0)
-{}
-
-
-// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::processorCyclicPointPatchField<Type>::~processorCyclicPointPatchField()
+    procPatch_(refCast<const processorCyclicPointPatch>(ptf.patch()))
 {}
 
 
@@ -118,13 +107,13 @@ void Foam::processorCyclicPointPatchField<Type>::initSwapAddSeparated
 
         if (commsType == Pstream::commsTypes::nonBlocking)
         {
-            receiveBuf_.setSize(pf.size());
+            recvBuf_.resize_nocopy(pf.size());
             UIPstream::read
             (
                 commsType,
                 procPatch_.neighbProcNo(),
-                receiveBuf_.data_bytes(),
-                receiveBuf_.size_bytes(),
+                recvBuf_.data_bytes(),
+                recvBuf_.size_bytes(),
                 procPatch_.tag(),
                 procPatch_.comm()
             );
@@ -151,16 +140,17 @@ void Foam::processorCyclicPointPatchField<Type>::swapAddSeparated
 {
     if (Pstream::parRun())
     {
-        // If nonblocking data has already been received into receiveBuf_
+        // If nonblocking, data is already in receive buffer
+
         if (commsType != Pstream::commsTypes::nonBlocking)
         {
-            receiveBuf_.setSize(this->size());
+            recvBuf_.resize_nocopy(this->size());
             UIPstream::read
             (
                 commsType,
                 procPatch_.neighbProcNo(),
-                receiveBuf_.data_bytes(),
-                receiveBuf_.size_bytes(),
+                recvBuf_.data_bytes(),
+                recvBuf_.size_bytes(),
                 procPatch_.tag(),
                 procPatch_.comm()
             );
@@ -172,11 +162,11 @@ void Foam::processorCyclicPointPatchField<Type>::swapAddSeparated
                 procPatch_.procCyclicPolyPatch();
             const tensor& forwardT = ppp.forwardT()[0];
 
-            transform(receiveBuf_, forwardT, receiveBuf_);
+            transform(recvBuf_, forwardT, recvBuf_);
         }
 
         // All points are separated
-        this->addToInternalField(pField, receiveBuf_);
+        this->addToInternalField(pField, recvBuf_);
     }
 }
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index 25a8ec9f6b..50d8243521 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,13 +55,13 @@ class processorCyclicPointPatchField
 :
     public coupledPointPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference to processor patch
         const processorCyclicPointPatch& procPatch_;
 
         //- Receive buffer for non-blocking communication
-        mutable Field<Type> receiveBuf_;
+        mutable Field<Type> recvBuf_;
 
 
 public:
@@ -132,7 +133,7 @@ public:
 
 
     //- Destructor
-    virtual ~processorCyclicPointPatchField();
+    virtual ~processorCyclicPointPatchField() = default;
 
 
     // Member functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
index c00354d358..11e837c530 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
@@ -93,21 +93,21 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
     // Bypass patchInternalField since uses fvPatch addressing
     const labelList& fc = lduAddr.patchAddr(patchId);
 
-    scalarSendBuf_.setSize(fc.size());
+    scalarSendBuf_.resize_nocopy(fc.size());
     forAll(fc, i)
     {
         scalarSendBuf_[i] = psiInternal[fc[i]];
     }
 
-    scalarReceiveBuf_.setSize(scalarSendBuf_.size());
+    scalarRecvBuf_.resize_nocopy(scalarSendBuf_.size());
 
     recvRequest_ = UPstream::nRequests();
     UIPstream::read
     (
         UPstream::commsTypes::nonBlocking,
         procInterface_.neighbProcNo(),
-        scalarReceiveBuf_.data_bytes(),
-        scalarReceiveBuf_.size_bytes(),
+        scalarRecvBuf_.data_bytes(),
+        scalarRecvBuf_.size_bytes(),
         procInterface_.tag(),
         procInterface_.comm()
     );
@@ -180,7 +180,7 @@ void Foam::lduCalculatedProcessorField<Type>::updateInterfaceMatrix
 
     // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
-    addToInternalField(result, !add, coeffs, scalarReceiveBuf_);
+    addToInternalField(result, !add, coeffs, scalarRecvBuf_);
 
     this->updatedMatrix(true);
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
index 1bb956585a..bb2cba44e4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
@@ -84,13 +84,13 @@ protected:
             mutable Field<Type> sendBuf_;
 
             //- Receive buffer
-            mutable Field<Type> receiveBuf_;
+            mutable Field<Type> recvBuf_;
 
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
 
-            //- Scalar receive buffer
-            mutable solveScalarField scalarReceiveBuf_;
+            //- Scalar recv buffer
+            mutable solveScalarField scalarRecvBuf_;
 
 
     // Protected Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 64ddf7ea3d..8005cdc131 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,11 +57,11 @@ class processorLduInterface
 
         //- Send buffer.
         //  Only sized and used when compressed or non-blocking comms used.
-        mutable List<char> sendBuf_;
+        mutable List<char> byteSendBuf_;
 
         //- Receive buffer.
         //  Only sized and used when compressed or non-blocking comms used.
-        mutable List<char> receiveBuf_;
+        mutable List<char> byteRecvBuf_;
 
 
     // Private Member Functions
@@ -76,6 +76,7 @@ class processorLduInterface
             }
         }
 
+
 public:
 
     //- Runtime type information
@@ -118,7 +119,7 @@ public:
             template<class Type>
             void send
             (
-                const Pstream::commsTypes commsType,
+                const UPstream::commsTypes commsType,
                 const UList<Type>& f
             ) const;
 
@@ -126,7 +127,7 @@ public:
             template<class Type>
             void receive
             (
-                const Pstream::commsTypes commsType,
+                const UPstream::commsTypes commsType,
                 UList<Type>& f
             ) const;
 
@@ -134,7 +135,7 @@ public:
             template<class Type>
             tmp<Field<Type>> receive
             (
-                const Pstream::commsTypes commsType,
+                const UPstream::commsTypes commsType,
                 const label size
             ) const;
 
@@ -143,7 +144,7 @@ public:
             template<class Type>
             void compressedSend
             (
-                const Pstream::commsTypes commsType,
+                const UPstream::commsTypes commsType,
                 const UList<Type>& f
             ) const;
 
@@ -151,7 +152,7 @@ public:
             template<class Type>
             void compressedReceive
             (
-                const Pstream::commsTypes commsType,
+                const UPstream::commsTypes commsType,
                 UList<Type>& f
             ) const;
 
@@ -159,7 +160,7 @@ public:
             template<class Type>
             tmp<Field<Type>> compressedReceive
             (
-                const Pstream::commsTypes commsType,
+                const UPstream::commsTypes commsType,
                 const label size
             ) const;
 };
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index 4b75ba207b..2ccb499292 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,7 +35,7 @@ License
 template<class Type>
 void Foam::processorLduInterface::send
 (
-    const Pstream::commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const UList<Type>& f
 ) const
 {
@@ -43,8 +43,8 @@ void Foam::processorLduInterface::send
 
     if
     (
-        commsType == Pstream::commsTypes::blocking
-     || commsType == Pstream::commsTypes::scheduled
+        commsType == UPstream::commsTypes::blocking
+     || commsType == UPstream::commsTypes::scheduled
     )
     {
         UOPstream::write
@@ -57,31 +57,31 @@ void Foam::processorLduInterface::send
             comm()
         );
     }
-    else if (commsType == Pstream::commsTypes::nonBlocking)
+    else if (commsType == UPstream::commsTypes::nonBlocking)
     {
-        resizeBuf(receiveBuf_, nBytes);
+        resizeBuf(byteSendBuf_, nBytes);
+        std::memcpy
+        (
+            static_cast<void*>(byteSendBuf_.data()), f.cdata(), nBytes
+        );
+
+        resizeBuf(byteRecvBuf_, nBytes);
 
         UIPstream::read
         (
             commsType,
             neighbProcNo(),
-            receiveBuf_.data(),
+            byteRecvBuf_.data(),
             nBytes,
             tag(),
             comm()
         );
 
-        resizeBuf(sendBuf_, nBytes);
-        std::memcpy
-        (
-            static_cast<void*>(sendBuf_.data()), f.cdata(), nBytes
-        );
-
         UOPstream::write
         (
             commsType,
             neighbProcNo(),
-            sendBuf_.cdata(),
+            byteSendBuf_.cdata(),
             nBytes,
             tag(),
             comm()
@@ -99,14 +99,16 @@ void Foam::processorLduInterface::send
 template<class Type>
 void Foam::processorLduInterface::receive
 (
-    const Pstream::commsTypes commsType,
+    const UPstream::commsTypes commsType,
     UList<Type>& f
 ) const
 {
+    const label nBytes = f.byteSize();
+
     if
     (
-        commsType == Pstream::commsTypes::blocking
-     || commsType == Pstream::commsTypes::scheduled
+        commsType == UPstream::commsTypes::blocking
+     || commsType == UPstream::commsTypes::scheduled
     )
     {
         UIPstream::read
@@ -114,16 +116,16 @@ void Foam::processorLduInterface::receive
             commsType,
             neighbProcNo(),
             f.data_bytes(),
-            f.byteSize(),
+            nBytes,
             tag(),
             comm()
         );
     }
-    else if (commsType == Pstream::commsTypes::nonBlocking)
+    else if (commsType == UPstream::commsTypes::nonBlocking)
     {
         std::memcpy
         (
-            static_cast<void*>(f.data()), receiveBuf_.cdata(), f.byteSize()
+            static_cast<void*>(f.data()), byteRecvBuf_.cdata(), nBytes
         );
     }
     else
@@ -138,7 +140,7 @@ void Foam::processorLduInterface::receive
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::receive
 (
-    const Pstream::commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const label size
 ) const
 {
@@ -151,7 +153,7 @@ Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::receive
 template<class Type>
 void Foam::processorLduInterface::compressedSend
 (
-    const Pstream::commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const UList<Type>& f
 ) const
 {
@@ -170,8 +172,8 @@ void Foam::processorLduInterface::compressedSend
 
         const scalar *sArray = reinterpret_cast<const scalar*>(f.cdata());
         const scalar *slast = &sArray[nm1];
-        resizeBuf(sendBuf_, nBytes);
-        float *fArray = reinterpret_cast<float*>(sendBuf_.data());
+        resizeBuf(byteSendBuf_, nBytes);
+        float *fArray = reinterpret_cast<float*>(byteSendBuf_.data());
 
         for (label i=0; i<nm1; i++)
         {
@@ -182,29 +184,29 @@ void Foam::processorLduInterface::compressedSend
 
         if
         (
-            commsType == Pstream::commsTypes::blocking
-         || commsType == Pstream::commsTypes::scheduled
+            commsType == UPstream::commsTypes::blocking
+         || commsType == UPstream::commsTypes::scheduled
         )
         {
             UOPstream::write
             (
                 commsType,
                 neighbProcNo(),
-                sendBuf_.cdata(),
+                byteSendBuf_.cdata(),
                 nBytes,
                 tag(),
                 comm()
             );
         }
-        else if (commsType == Pstream::commsTypes::nonBlocking)
+        else if (commsType == UPstream::commsTypes::nonBlocking)
         {
-            resizeBuf(receiveBuf_, nBytes);
+            resizeBuf(byteRecvBuf_, nBytes);
 
             UIPstream::read
             (
                 commsType,
                 neighbProcNo(),
-                receiveBuf_.data(),
+                byteRecvBuf_.data(),
                 nBytes,
                 tag(),
                 comm()
@@ -214,7 +216,7 @@ void Foam::processorLduInterface::compressedSend
             (
                 commsType,
                 neighbProcNo(),
-                sendBuf_.cdata(),
+                byteSendBuf_.cdata(),
                 nBytes,
                 tag(),
                 comm()
@@ -237,7 +239,7 @@ void Foam::processorLduInterface::compressedSend
 template<class Type>
 void Foam::processorLduInterface::compressedReceive
 (
-    const Pstream::commsTypes commsType,
+    const UPstream::commsTypes commsType,
     UList<Type>& f
 ) const
 {
@@ -256,23 +258,23 @@ void Foam::processorLduInterface::compressedReceive
 
         if
         (
-            commsType == Pstream::commsTypes::blocking
-         || commsType == Pstream::commsTypes::scheduled
+            commsType == UPstream::commsTypes::blocking
+         || commsType == UPstream::commsTypes::scheduled
         )
         {
-            resizeBuf(receiveBuf_, nBytes);
+            resizeBuf(byteRecvBuf_, nBytes);
 
             UIPstream::read
             (
                 commsType,
                 neighbProcNo(),
-                receiveBuf_.data(),
+                byteRecvBuf_.data(),
                 nBytes,
                 tag(),
                 comm()
             );
         }
-        else if (commsType != Pstream::commsTypes::nonBlocking)
+        else if (commsType != UPstream::commsTypes::nonBlocking)
         {
             FatalErrorInFunction
                 << "Unsupported communications type " << int(commsType)
@@ -280,7 +282,7 @@ void Foam::processorLduInterface::compressedReceive
         }
 
         const float *fArray =
-            reinterpret_cast<const float*>(receiveBuf_.cdata());
+            reinterpret_cast<const float*>(byteRecvBuf_.cdata());
         f.last() = reinterpret_cast<const Type&>(fArray[nm1]);
         scalar *sArray = reinterpret_cast<scalar*>(f.data());
         const scalar *slast = &sArray[nm1];
@@ -300,7 +302,7 @@ void Foam::processorLduInterface::compressedReceive
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::compressedReceive
 (
-    const Pstream::commsTypes commsType,
+    const UPstream::commsTypes commsType,
     const label size
 ) const
 {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 61dca087e0..8309c1b31a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -111,15 +111,15 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
     )
     {
         // Fast path.
-        scalarReceiveBuf_.setSize(scalarSendBuf_.size());
+        scalarRecvBuf_.resize_nocopy(scalarSendBuf_.size());
 
         recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
             UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
-            scalarReceiveBuf_.data_bytes(),
-            scalarReceiveBuf_.size_bytes(),
+            scalarRecvBuf_.data_bytes(),
+            scalarRecvBuf_.size_bytes(),
             procInterface_.tag(),
             comm()
         );
@@ -175,28 +175,20 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
         UPstream::waitRequest(recvRequest_);
         recvRequest_ = -1;
         sendRequest_ = -1;
-
-        // Transform according to the transformation tensor
-        transformCoupleField(scalarReceiveBuf_, cmpt);
-
-        // Multiply the field by coefficients and add into the result
-        addToInternalField(result, !add, faceCells, coeffs, scalarReceiveBuf_);
     }
     else
     {
-        solveScalarField pnf
-        (
-            procInterface_.compressedReceive<solveScalar>
-            (
-                commsType,
-                coeffs.size()
-            )
-        );
-        transformCoupleField(pnf, cmpt);
-
-        addToInternalField(result, !add, faceCells, coeffs, pnf);
+        scalarRecvBuf_.resize_nocopy(coeffs.size());
+        procInterface_.compressedReceive(commsType, scalarRecvBuf_);
     }
 
+
+    // Transform according to the transformation tensor
+    transformCoupleField(scalarRecvBuf_, cmpt);
+
+    // Multiply the field by coefficients and add into the result
+    addToInternalField(result, !add, faceCells, coeffs, scalarRecvBuf_);
+
     this->updatedMatrix(true);
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index ee07b013d9..c42c448c95 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -79,8 +79,8 @@ class processorGAMGInterfaceField
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
 
-            //- Scalar receive buffer
-            mutable solveScalarField scalarReceiveBuf_;
+            //- Scalar recv buffer
+            mutable solveScalarField scalarRecvBuf_;
 
 
 
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 0a7620fc8c..9cfd9eda45 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -1590,7 +1590,7 @@ void Foam::faMesh::calcPointAreaNormals(vectorField& result) const
             }
 
             // Receive neighbour values
-            patchPointNormals.resize(nbrPatchPoints.size());
+            patchPointNormals.resize_nocopy(nbrPatchPoints.size());
 
             {
                 UIPstream::read
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
index 74878841fb..875c98105f 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
@@ -123,7 +123,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::initEvaluate
         {
             const Field<Type>& iF = this->internalField();
             const labelList& fc = procInterface_.faceCells();
-            sendBuf_.setSize(fc.size());
+            sendBuf_.resize_nocopy(fc.size());
             forAll(fc, i)
             {
                 sendBuf_[i] = iF[fc[i]];
@@ -131,7 +131,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::initEvaluate
         }
 
         // Receive straight into *this
-        this->setSize(sendBuf_.size());
+        this->resize_nocopy(sendBuf_.size());
 
         recvRequest_ = UPstream::nRequests();
         UIPstream::read
@@ -198,21 +198,21 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
     // Bypass patchInternalField since uses fvPatch addressing
     const labelList& fc = lduAddr.patchAddr(patchId);
 
-    scalarSendBuf_.setSize(fc.size());
+    scalarSendBuf_.resize_nocopy(fc.size());
     forAll(fc, i)
     {
         scalarSendBuf_[i] = psiInternal[fc[i]];
     }
 
-    scalarReceiveBuf_.setSize(scalarSendBuf_.size());
+    scalarRecvBuf_.resize_nocopy(scalarSendBuf_.size());
 
     recvRequest_ = UPstream::nRequests();
     UIPstream::read
     (
         UPstream::commsTypes::nonBlocking,
         procInterface_.neighbProcNo(),
-        scalarReceiveBuf_.data_bytes(),
-        scalarReceiveBuf_.size_bytes(),
+        scalarRecvBuf_.data_bytes(),
+        scalarRecvBuf_.size_bytes(),
         procInterface_.tag(),
         procInterface_.comm()
     );
@@ -288,7 +288,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::updateInterfaceMatrix
 
     // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
-    addToInternalField(result, !add, coeffs, scalarReceiveBuf_);
+    addToInternalField(result, !add, coeffs, scalarRecvBuf_);
 
     this->updatedMatrix(true);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
index 22cd2ae1fa..7367148a71 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
@@ -86,13 +86,13 @@ protected:
             mutable Field<Type> sendBuf_;
 
             //- Receive buffer
-            mutable Field<Type> receiveBuf_;
+            mutable Field<Type> recvBuf_;
 
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
 
-            //- Scalar receive buffer
-            mutable solveScalarField scalarReceiveBuf_;
+            //- Scalar recv buffer
+            mutable solveScalarField scalarRecvBuf_;
 
 
     // Protected Member Functions
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 7aa36a5c32..4175ed06c2 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -138,9 +138,9 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     sendRequest_(-1),
     recvRequest_(-1),
     sendBuf_(std::move(ptf.sendBuf_)),
-    receiveBuf_(std::move(ptf.receiveBuf_)),
+    recvBuf_(std::move(ptf.recvBuf_)),
     scalarSendBuf_(std::move(ptf.scalarSendBuf_)),
-    scalarReceiveBuf_(std::move(ptf.scalarReceiveBuf_))
+    scalarRecvBuf_(std::move(ptf.scalarRecvBuf_))
 {
     if (debug && !ptf.ready())
     {
@@ -226,7 +226,7 @@ void Foam::processorFvPatchField<Type>::initEvaluate
             }
 
             // Receive straight into *this
-            this->setSize(sendBuf_.size());
+            this->resize_nocopy(sendBuf_.size());
 
             recvRequest_ = UPstream::nRequests();
             UIPstream::read
@@ -320,7 +320,7 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
 
     const labelUList& faceCells = lduAddr.patchAddr(patchId);
 
-    scalarSendBuf_.setSize(this->patch().size());
+    scalarSendBuf_.resize_nocopy(this->patch().size());
     forAll(scalarSendBuf_, facei)
     {
         scalarSendBuf_[facei] = psiInternal[faceCells[facei]];
@@ -341,16 +341,15 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
                 << abort(FatalError);
         }
 
-
-        scalarReceiveBuf_.setSize(scalarSendBuf_.size());
+        scalarRecvBuf_.resize_nocopy(scalarSendBuf_.size());
 
         recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
             UPstream::commsTypes::nonBlocking,
             procPatch_.neighbProcNo(),
-            scalarReceiveBuf_.data_bytes(),
-            scalarReceiveBuf_.size_bytes(),
+            scalarRecvBuf_.data_bytes(),
+            scalarRecvBuf_.size_bytes(),
             procPatch_.tag(),
             procPatch_.comm()
         );
@@ -407,44 +406,23 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
         UPstream::waitRequest(recvRequest_);
         recvRequest_ = -1;
         sendRequest_ = -1;
-
-        if (!std::is_arithmetic<Type>::value)
-        {
-            // Transform non-scalar data according to the transformation tensor
-            transformCoupleField(scalarReceiveBuf_, cmpt);
-        }
-
-        // Multiply the field by coefficients and add into the result
-        this->addToInternalField
-        (
-            result,
-            !add,
-            faceCells,
-            coeffs,
-            scalarReceiveBuf_
-        );
     }
     else
     {
-        solveScalarField pnf
-        (
-            procPatch_.compressedReceive<solveScalar>
-            (
-                commsType,
-                this->size()
-            )()
-        );
-
-        if (!std::is_arithmetic<Type>::value)
-        {
-            // Transform non-scalar data according to the transformation tensor
-            transformCoupleField(pnf, cmpt);
-        }
-
-        // Multiply the field by coefficients and add into the result
-        this->addToInternalField(result, !add, faceCells, coeffs, pnf);
+        scalarRecvBuf_.resize_nocopy(this->size());
+        procPatch_.compressedReceive(commsType, scalarRecvBuf_);
     }
 
+
+    if (!std::is_arithmetic<Type>::value)
+    {
+        // Transform non-scalar data according to the transformation tensor
+        transformCoupleField(scalarRecvBuf_, cmpt);
+    }
+
+    // Multiply the field by coefficients and add into the result
+    this->addToInternalField(result, !add, faceCells, coeffs, scalarRecvBuf_);
+
     this->updatedMatrix(true);
 }
 
@@ -461,7 +439,7 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
-    sendBuf_.setSize(this->patch().size());
+    sendBuf_.resize_nocopy(this->patch().size());
 
     const labelUList& faceCells = lduAddr.patchAddr(patchId);
 
@@ -485,16 +463,15 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
                 << abort(FatalError);
         }
 
-
-        receiveBuf_.setSize(sendBuf_.size());
+        recvBuf_.resize_nocopy(sendBuf_.size());
 
         recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
             UPstream::commsTypes::nonBlocking,
             procPatch_.neighbProcNo(),
-            receiveBuf_.data_bytes(),
-            receiveBuf_.size_bytes(),
+            recvBuf_.data_bytes(),
+            recvBuf_.size_bytes(),
             procPatch_.tag(),
             procPatch_.comm()
         );
@@ -550,27 +527,20 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
         UPstream::waitRequest(recvRequest_);
         recvRequest_ = -1;
         sendRequest_ = -1;
-
-        // Transform according to the transformation tensor
-        transformCoupleField(receiveBuf_);
-
-        // Multiply the field by coefficients and add into the result
-        this->addToInternalField(result, !add, faceCells, coeffs, receiveBuf_);
     }
     else
     {
-        Field<Type> pnf
-        (
-            procPatch_.compressedReceive<Type>(commsType, this->size())()
-        );
-
-        // Transform according to the transformation tensor
-        transformCoupleField(pnf);
-
-        // Multiply the field by coefficients and add into the result
-        this->addToInternalField(result, !add, faceCells, coeffs, pnf);
+        recvBuf_.resize_nocopy(this->size());
+        procPatch_.compressedReceive(commsType, recvBuf_);
     }
 
+
+    // Transform according to the transformation tensor
+    transformCoupleField(recvBuf_);
+
+    // Multiply the field by coefficients and add into the result
+    this->addToInternalField(result, !add, faceCells, coeffs, recvBuf_);
+
     this->updatedMatrix(true);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 1971a1a6b3..48e2f092ba 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -87,13 +87,13 @@ class processorFvPatchField
             mutable Field<Type> sendBuf_;
 
             //- Receive buffer.
-            mutable Field<Type> receiveBuf_;
+            mutable Field<Type> recvBuf_;
 
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
 
-            //- Scalar receive buffer
-            mutable solveScalarField scalarReceiveBuf_;
+            //- Scalar recv buffer
+            mutable solveScalarField scalarRecvBuf_;
 
 
 public:
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
index e3f667e34a..cc58546967 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
@@ -112,15 +112,15 @@ void Foam::calculatedProcessorGAMGInterfaceField::initInterfaceMatrixUpdate
     )
     {
         // Fast path.
-        scalarReceiveBuf_.setSize(scalarSendBuf_.size());
+        scalarRecvBuf_.resize_nocopy(scalarSendBuf_.size());
 
         recvRequest_ = UPstream::nRequests();
         UIPstream::read
         (
             UPstream::commsTypes::nonBlocking,
             procInterface_.neighbProcNo(),
-            scalarReceiveBuf_.data_bytes(),
-            scalarReceiveBuf_.size_bytes(),
+            scalarRecvBuf_.data_bytes(),
+            scalarRecvBuf_.size_bytes(),
             procInterface_.tag(),
             comm()
         );
@@ -176,28 +176,20 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
         UPstream::waitRequest(recvRequest_);
         recvRequest_ = -1;
         sendRequest_ = -1;
-
-        // Transform according to the transformation tensor
-        transformCoupleField(scalarReceiveBuf_, cmpt);
-
-        // Multiply the field by coefficients and add into the result
-        addToInternalField(result, !add, faceCells, coeffs, scalarReceiveBuf_);
     }
     else
     {
-        solveScalarField pnf
-        (
-            procInterface_.compressedReceive<solveScalar>
-            (
-                commsType,
-                this->size()
-            )()
-        );
-        transformCoupleField(pnf, cmpt);
-
-        addToInternalField(result, !add, faceCells, coeffs, pnf);
+        scalarRecvBuf_.resize_nocopy(this->size());
+        procInterface_.compressedReceive(commsType, scalarRecvBuf_);
     }
 
+
+    // Transform according to the transformation tensor
+    transformCoupleField(scalarRecvBuf_, cmpt);
+
+    // Multiply the field by coefficients and add into the result
+    addToInternalField(result, !add, faceCells, coeffs, scalarRecvBuf_);
+
     this->updatedMatrix(true);
 }
 
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H
index ad6f4ed478..6a0b14d372 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.H
@@ -78,8 +78,8 @@ class calculatedProcessorGAMGInterfaceField
             //- Scalar send buffer
             mutable solveScalarField scalarSendBuf_;
 
-            //- Scalar receive buffer
-            mutable solveScalarField scalarReceiveBuf_;
+            //- Scalar recv buffer
+            mutable solveScalarField scalarRecvBuf_;
 
 
 

From 2641dc4c3a2281525d1c683335de72d854435a5b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 12 Jan 2023 20:21:07 +0100
Subject: [PATCH 014/348] ENH: direct, non-blocking transfer for finiteArea
 processor patch

STYLE: pTraits::rank instead of std::is_arithmetic to suppress transform

- more consistent with doTransform() coding, potentially useful for
  complex
---
 .../processor/processorFaPatchField.C         | 270 +++++++++++++++---
 .../processor/processorFaPatchField.H         |  26 +-
 .../processor/processorFvPatchField.C         |   2 +-
 3 files changed, 261 insertions(+), 37 deletions(-)

diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index 50b03d0790..a1b1c1eb2e 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "processorFaPatchField.H"
-#include "processorFaPatch.H"
 #include "transformField.H"
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -40,7 +39,9 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 )
 :
     coupledFaPatchField<Type>(p, iF),
-    procPatch_(refCast<const processorFaPatch>(p))
+    procPatch_(refCast<const processorFaPatch>(p)),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -53,7 +54,9 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 )
 :
     coupledFaPatchField<Type>(p, iF, f),
-    procPatch_(refCast<const processorFaPatch>(p))
+    procPatch_(refCast<const processorFaPatch>(p)),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {}
 
 
@@ -67,7 +70,9 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 )
 :
     coupledFaPatchField<Type>(ptf, p, iF, mapper),
-    procPatch_(refCast<const processorFaPatch>(p))
+    procPatch_(refCast<const processorFaPatch>(p)),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
     if (!isType<processorFaPatch>(this->patch()))
     {
@@ -79,6 +84,12 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
             << " in file " << this->internalField().objectPath()
             << exit(FatalError);
     }
+    if (debug && !ptf.ready())
+    {
+        FatalErrorInFunction
+            << "On patch " << procPatch_.name() << " outstanding request."
+            << abort(FatalError);
+    }
 }
 
 
@@ -91,7 +102,9 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 )
 :
     coupledFaPatchField<Type>(p, iF, dict),
-    procPatch_(refCast<const processorFaPatch>(p, dict))
+    procPatch_(refCast<const processorFaPatch>(p, dict)),
+    sendRequest_(-1),
+    recvRequest_(-1)
 {
     if (!isType<processorFaPatch>(p))
     {
@@ -114,8 +127,21 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 :
     processorLduInterfaceField(),
     coupledFaPatchField<Type>(ptf),
-    procPatch_(refCast<const processorFaPatch>(ptf.patch()))
-{}
+    procPatch_(refCast<const processorFaPatch>(ptf.patch())),
+    sendRequest_(-1),
+    recvRequest_(-1),
+    sendBuf_(std::move(ptf.sendBuf_)),
+    recvBuf_(std::move(ptf.recvBuf_)),
+    scalarSendBuf_(std::move(ptf.scalarSendBuf_)),
+    scalarRecvBuf_(std::move(ptf.scalarRecvBuf_))
+{
+    if (debug && !ptf.ready())
+    {
+        FatalErrorInFunction
+            << "On patch " << procPatch_.name() << " outstanding request."
+            << abort(FatalError);
+    }
+}
 
 
 template<class Type>
@@ -126,16 +152,45 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 )
 :
     coupledFaPatchField<Type>(ptf, iF),
-    procPatch_(refCast<const processorFaPatch>(ptf.patch()))
-{}
+    procPatch_(refCast<const processorFaPatch>(ptf.patch())),
+    sendRequest_(-1),
+    recvRequest_(-1)
+{
+    if (debug && !ptf.ready())
+    {
+        FatalErrorInFunction
+            << "On patch " << procPatch_.name() << " outstanding request."
+            << abort(FatalError);
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type>
+bool Foam::processorFaPatchField<Type>::ready() const
+{
+    if (!UPstream::finishedRequest(sendRequest_)) return false;
+    sendRequest_ = -1;
+
+    if (!UPstream::finishedRequest(recvRequest_)) return false;
+    recvRequest_ = -1;
+
+    return true;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::processorFaPatchField<Type>::patchNeighbourField() const
 {
+    if (debug && !this->ready())
+    {
+        FatalErrorInFunction
+            << "On patch " << procPatch_.name()
+            << " outstanding request."
+            << abort(FatalError);
+    }
     return *this;
 }
 
@@ -148,7 +203,46 @@ void Foam::processorFaPatchField<Type>::initEvaluate
 {
     if (Pstream::parRun())
     {
-        procPatch_.send(commsType, this->patchInternalField()());
+        this->patchInternalField(sendBuf_);
+
+        if (commsType == UPstream::commsTypes::nonBlocking)
+        {
+            if (!is_contiguous<Type>::value)
+            {
+                FatalErrorInFunction
+                    << "Invalid for non-contiguous data types"
+                    << abort(FatalError);
+            }
+
+            // Receive straight into *this
+            this->resize_nocopy(sendBuf_.size());
+
+            recvRequest_ = UPstream::nRequests();
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                procPatch_.neighbProcNo(),
+                this->data_bytes(),
+                this->size_bytes(),
+                procPatch_.tag(),
+                procPatch_.comm()
+            );
+
+            sendRequest_ = UPstream::nRequests();
+            UOPstream::write
+            (
+                UPstream::commsTypes::nonBlocking,
+                procPatch_.neighbProcNo(),
+                sendBuf_.cdata_bytes(),
+                sendBuf_.size_bytes(),
+                procPatch_.tag(),
+                procPatch_.comm()
+            );
+        }
+        else
+        {
+            procPatch_.send(commsType, sendBuf_);
+        }
     }
 }
 
@@ -161,7 +255,19 @@ void Foam::processorFaPatchField<Type>::evaluate
 {
     if (Pstream::parRun())
     {
-        procPatch_.receive<Type>(commsType, *this);
+        if (commsType == UPstream::commsTypes::nonBlocking)
+        {
+            // Fast path. Received into *this
+
+            // Treat send as finished when recv is done
+            UPstream::waitRequest(recvRequest_);
+            recvRequest_ = -1;
+            sendRequest_ = -1;
+        }
+        else
+        {
+            procPatch_.receive<Type>(commsType, *this);
+        }
 
         if (doTransform())
         {
@@ -191,11 +297,47 @@ void Foam::processorFaPatchField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
-    procPatch_.send
-    (
-        commsType,
-        this->patch().patchInternalField(psiInternal)()
-    );
+    this->patch().patchInternalField(psiInternal, scalarSendBuf_);
+
+    if (commsType == UPstream::commsTypes::nonBlocking)
+    {
+        // Fast path.
+        if (debug && !this->ready())
+        {
+            FatalErrorInFunction
+                << "On patch " << procPatch_.name()
+                << " outstanding request."
+                << abort(FatalError);
+        }
+
+        scalarRecvBuf_.resize_nocopy(scalarSendBuf_.size());
+
+        recvRequest_ = UPstream::nRequests();
+        UIPstream::read
+        (
+            UPstream::commsTypes::nonBlocking,
+            procPatch_.neighbProcNo(),
+            scalarRecvBuf_.data_bytes(),
+            scalarRecvBuf_.size_bytes(),
+            procPatch_.tag(),
+            procPatch_.comm()
+        );
+
+        sendRequest_ = UPstream::nRequests();
+        UOPstream::write
+        (
+            UPstream::commsTypes::nonBlocking,
+            procPatch_.neighbProcNo(),
+            scalarSendBuf_.cdata_bytes(),
+            scalarSendBuf_.size_bytes(),
+            procPatch_.tag(),
+            procPatch_.comm()
+        );
+    }
+    else
+    {
+        procPatch_.send(commsType, scalarSendBuf_);
+    }
 
     this->updatedMatrix(false);
 }
@@ -221,19 +363,30 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
 
     const labelUList& faceCells = this->patch().edgeFaces();
 
-    solveScalarField pnf
-    (
-        procPatch_.receive<solveScalar>(commsType, this->size())
-    );
+    if (commsType == UPstream::commsTypes::nonBlocking)
+    {
+        // Fast path: consume straight from receive buffer
 
-    if (!std::is_arithmetic<Type>::value)
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
+    }
+    else
+    {
+        scalarRecvBuf_.resize_nocopy(this->size());
+        procPatch_.receive(commsType, scalarRecvBuf_);
+    }
+
+
+    if (pTraits<Type>::rank)
     {
         // Transform non-scalar data according to the transformation tensor
-        transformCoupleField(pnf, cmpt);
+        transformCoupleField(scalarRecvBuf_, cmpt);
     }
 
     // Multiply the field by coefficients and add into the result
-    this->addToInternalField(result, !add, faceCells, coeffs, pnf);
+    this->addToInternalField(result, !add, faceCells, coeffs, scalarRecvBuf_);
 
     this->updatedMatrix(true);
 }
@@ -251,11 +404,47 @@ void Foam::processorFaPatchField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
-    procPatch_.send
-    (
-        commsType,
-        this->patch().patchInternalField(psiInternal)()
-    );
+    this->patch().patchInternalField(psiInternal, sendBuf_);
+
+    if (commsType == UPstream::commsTypes::nonBlocking)
+    {
+        // Fast path.
+        if (debug && !this->ready())
+        {
+            FatalErrorInFunction
+                << "On patch " << procPatch_.name()
+                << " outstanding request."
+                << abort(FatalError);
+        }
+
+        recvBuf_.resize_nocopy(sendBuf_.size());
+
+        recvRequest_ = UPstream::nRequests();
+        UIPstream::read
+        (
+            UPstream::commsTypes::nonBlocking,
+            procPatch_.neighbProcNo(),
+            recvBuf_.data_bytes(),
+            recvBuf_.size_bytes(),
+            procPatch_.tag(),
+            procPatch_.comm()
+        );
+
+        sendRequest_ = UPstream::nRequests();
+        UOPstream::write
+        (
+            UPstream::commsTypes::nonBlocking,
+            procPatch_.neighbProcNo(),
+            sendBuf_.cdata_bytes(),
+            sendBuf_.size_bytes(),
+            procPatch_.tag(),
+            procPatch_.comm()
+        );
+    }
+    else
+    {
+        procPatch_.send(commsType, sendBuf_);
+    }
 
     this->updatedMatrix(false);
 }
@@ -280,16 +469,27 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
 
     const labelUList& faceCells = this->patch().edgeFaces();
 
-    Field<Type> pnf
-    (
-        procPatch_.receive<Type>(commsType, this->size())
-    );
+    if (commsType == UPstream::commsTypes::nonBlocking)
+    {
+        // Fast path: consume straight from receive buffer
+
+        // Treat send as finished when recv is done
+        UPstream::waitRequest(recvRequest_);
+        recvRequest_ = -1;
+        sendRequest_ = -1;
+    }
+    else
+    {
+        recvBuf_.resize_nocopy(this->size());
+        procPatch_.receive(commsType, recvBuf_);
+    }
+
 
     // Transform according to the transformation tensor
-    transformCoupleField(pnf);
+    transformCoupleField(recvBuf_);
 
     // Multiply the field by coefficients and add into the result
-    this->addToInternalField(result, !add, faceCells, coeffs, pnf);
+    this->addToInternalField(result, !add, faceCells, coeffs, recvBuf_);
 
     this->updatedMatrix(true);
 }
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
index 50aee645fc..9d903ffb67 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
@@ -61,12 +61,33 @@ class processorFaPatchField
     public processorLduInterfaceField,
     public coupledFaPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the processor patch
         const processorFaPatch& procPatch_;
 
 
+        // Sending and receiving
+
+            //- Current (non-blocking) send request
+            mutable label sendRequest_;
+
+            //- Current (non-blocking) recv request
+            mutable label recvRequest_;
+
+            //- Send buffer.
+            mutable Field<Type> sendBuf_;
+
+            //- Receive buffer.
+            mutable Field<Type> recvBuf_;
+
+            //- Scalar send buffer
+            mutable solveScalarField scalarSendBuf_;
+
+            //- Scalar recv buffer
+            mutable solveScalarField scalarRecvBuf_;
+
+
 public:
 
     //- Runtime type information
@@ -168,6 +189,9 @@ public:
             //- Return patch-normal gradient
             virtual tmp<Field<Type>> snGrad() const;
 
+            //- Is all data available
+            virtual bool ready() const;
+
 
         // Coupled interface functionality
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 4175ed06c2..4657035d56 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -414,7 +414,7 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
     }
 
 
-    if (!std::is_arithmetic<Type>::value)
+    if (pTraits<Type>::rank)
     {
         // Transform non-scalar data according to the transformation tensor
         transformCoupleField(scalarRecvBuf_, cmpt);

From 0fa129e83ccdea233c96cdb4b17174c65787f9c3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 16 Jan 2023 09:51:34 +0100
Subject: [PATCH 015/348] COMP: add compressed send/recv placeholder
 (instantiation for integrals)

---
 .../processorLduInterfaceTemplates.C          | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index 2ccb499292..2a0c06c607 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -67,6 +67,12 @@ void Foam::processorLduInterface::send
 
         resizeBuf(byteRecvBuf_, nBytes);
 
+        if (!nBytes)
+        {
+            // Can skip empty messages
+            return;
+        }
+
         UIPstream::read
         (
             commsType,
@@ -164,11 +170,15 @@ void Foam::processorLduInterface::compressedSend
      && (!std::is_integral<Type>::value && sizeof(scalar) != sizeof(float))
     )
     {
-        static const label nCmpts = sizeof(Type)/sizeof(scalar);
-        label nm1 = (f.size() - 1)*nCmpts;
-        label nlast = sizeof(Type)/sizeof(float);
-        label nFloats = nm1 + nlast;
-        label nBytes = nFloats*sizeof(float);
+        static const label nCmpts =
+        (
+            // Placeholder value for unusable template instantiation
+            std::is_integral<Type>::value
+          ? 1
+          : sizeof(Type)/sizeof(scalar)
+        );
+        const label nm1 = (f.size() - 1)*nCmpts;
+        const label nBytes = f.size()*nCmpts*sizeof(float);
 
         const scalar *sArray = reinterpret_cast<const scalar*>(f.cdata());
         const scalar *slast = &sArray[nm1];
@@ -250,11 +260,15 @@ void Foam::processorLduInterface::compressedReceive
      && (!std::is_integral<Type>::value && sizeof(scalar) != sizeof(float))
     )
     {
-        static const label nCmpts = sizeof(Type)/sizeof(scalar);
-        label nm1 = (f.size() - 1)*nCmpts;
-        label nlast = sizeof(Type)/sizeof(float);
-        label nFloats = nm1 + nlast;
-        label nBytes = nFloats*sizeof(float);
+        static const label nCmpts =
+        (
+            // Placeholder value for unusable template instantiation
+            std::is_integral<Type>::value
+          ? 1
+          : sizeof(Type)/sizeof(scalar)
+        );
+        const label nm1 = (f.size() - 1)*nCmpts;
+        const label nBytes = f.size()*nCmpts*sizeof(float);
 
         if
         (

From a50d32b5877cb2d257c7bf85d7c9f0c50a59632d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 18:15:13 +0100
Subject: [PATCH 016/348] ENH: define transform(symmTensor, int/float) as no-op

- avoids implicit promotion of label to scalar for no-op,
  or alternatively promotion of symmTensor to tensor for no-op
  (ie, ambiguous).

- fix incorrect transform(.., symmTensor, ...) declarations.
---
 .../transformFieldField/transformFieldField.H |   4 +-
 .../symmTransformField/symmTransformField.C   | 137 +++++++++---------
 .../symmTransformField/symmTransformField.H   | 110 ++++++++------
 .../Fields/transformField/transformField.H    |   5 +-
 .../transformField/transformFieldTemplates.C  |   4 +-
 .../Fields/transformList/transformList.C      |  25 +++-
 .../Fields/transformList/transformList.H      |   8 +-
 .../transformGeometricField.H                 |   4 +-
 src/OpenFOAM/primitives/complex/complexI.H    |   1 +
 .../primitives/transform/symmTransform.H      |  63 +++++---
 src/OpenFOAM/primitives/transform/transform.H |  85 +++++++----
 11 files changed, 271 insertions(+), 175 deletions(-)

diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
index 13ab4b87d2..31064780ab 100644
--- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef transformFieldField_H
-#define transformFieldField_H
+#ifndef Foam_transformFieldField_H
+#define Foam_transformFieldField_H
 
 #include "transform.H"
 #include "tensorFieldField.H"
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
index 586ff080d0..2149eb8d18 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,132 +29,130 @@ License
 #include "symmTransformField.H"
 #include "FieldM.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void transform
+void Foam::transform
 (
-    Field<Type>& rtf,
-    const symmTensorField& trf,
-    const Field<Type>& tf
+    Field<Type>& result,
+    const symmTensor& rot,
+    const Field<Type>& fld
 )
 {
-    if (trf.size() == 1)
+    TFOR_ALL_F_OP_FUNC_S_F
+    (
+        Type, result, =, transform, symmTensor, rot, Type, fld
+    );
+}
+
+
+template<class Type>
+void Foam::transform
+(
+    Field<Type>& result,
+    const symmTensorField& rot,
+    const Field<Type>& fld
+)
+{
+    if (rot.size() == 1)
     {
-        return transform(rtf, trf[0], tf);
-    }
-    else
-    {
-        TFOR_ALL_F_OP_FUNC_F_F
-        (
-            Type, rtf, =, transform, symmTensor, trf, Type, tf
-        )
+        return transform(result, rot.front(), fld);
     }
+
+    TFOR_ALL_F_OP_FUNC_F_F
+    (
+        Type, result, =, transform, symmTensor, rot, Type, fld
+    );
 }
 
 
 template<class Type>
-tmp<Field<Type>> transform
+Foam::tmp<Foam::Field<Type>>
+Foam::transform
 (
-    const symmTensorField& trf,
-    const Field<Type>& tf
+    const symmTensorField& rot,
+    const Field<Type>& fld
 )
 {
-    auto tresult = tmp<Field<Type>>::New(tf.size());
-    transform(tresult.ref(), trf, tf);
+    auto tresult = tmp<Field<Type>>::New(fld.size());
+    transform(tresult.ref(), rot, fld);
     return tresult;
 }
 
 
 template<class Type>
-tmp<Field<Type>> transform
+Foam::tmp<Foam::Field<Type>>
+Foam::transform
 (
-    const symmTensorField& trf,
-    const tmp<Field<Type>>& ttf
+    const symmTensorField& rot,
+    const tmp<Field<Type>>& tfld
 )
 {
-    tmp<Field<Type>> tresult = New(ttf);
-    transform(tresult.ref(), trf, ttf());
-    ttf.clear();
+    tmp<Field<Type>> tresult = New(tfld);
+    transform(tresult.ref(), rot, tfld());
+    tfld.clear();
     return tresult;
 }
 
 
 template<class Type>
-tmp<Field<Type>> transform
+Foam::tmp<Foam::Field<Type>>
+Foam::transform
 (
-    const tmp<symmTensorField>& ttrf,
-    const Field<Type>& tf
+    const tmp<symmTensorField>& trot,
+    const Field<Type>& fld
 )
 {
-    auto tresult = tmp<Field<Type>>::New(tf.size());
-    transform(tresult.ref(), ttrf(), tf);
-    ttrf.clear();
+    auto tresult = tmp<Field<Type>>::New(fld.size());
+    transform(tresult.ref(), trot(), fld);
+    trot.clear();
     return tresult;
 }
 
 
 template<class Type>
-tmp<Field<Type>> transform
+Foam::tmp<Foam::Field<Type>>
+Foam::transform
 (
-    const tmp<symmTensorField>& ttrf,
-    const tmp<Field<Type>>& ttf
+    const tmp<symmTensorField>& trot,
+    const tmp<Field<Type>>& tfld
 )
 {
-    tmp<Field<Type>> tresult = New(ttf);
-    transform(tresult.ref(), ttrf(), ttf());
-    ttf.clear();
-    ttrf.clear();
+    tmp<Field<Type>> tresult = New(tfld);
+    transform(tresult.ref(), trot(), tfld());
+    trot.clear();
+    tfld.clear();
     return tresult;
 }
 
 
 template<class Type>
-void transform
+Foam::tmp<Foam::Field<Type>>
+Foam::transform
 (
-    Field<Type>& rtf,
-    const symmTensor& t,
-    const Field<Type>& tf
+    const symmTensor& rot,
+    const Field<Type>& fld
 )
 {
-    TFOR_ALL_F_OP_FUNC_S_F(Type, rtf, =, transform, tensor, t, Type, tf)
-}
-
-
-template<class Type>
-tmp<Field<Type>> transform
-(
-    const symmTensor& t,
-    const Field<Type>& tf
-)
-{
-    auto tresult = tmp<Field<Type>>::New(tf.size());
-    transform(tresult.ref(), t, tf);
+    auto tresult = tmp<Field<Type>>::New(fld.size());
+    transform(tresult.ref(), rot, fld);
     return tresult;
 }
 
 
 template<class Type>
-tmp<Field<Type>> transform
+Foam::tmp<Foam::Field<Type>>
+Foam::transform
 (
-    const symmTensor& t,
-    const tmp<Field<Type>>& ttf
+    const symmTensor& rot,
+    const tmp<Field<Type>>& tfld
 )
 {
-    tmp<Field<Type>> tresult = New(ttf);
-    transform(tresult.ref(), t, ttf());
-    ttf.clear();
+    tmp<Field<Type>> tresult = New(tfld);
+    transform(tresult.ref(), rot, tfld());
+    tfld.clear();
     return tresult;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
index 96e534900b..b44686fe1a 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmTransformField_H
-#define symmTransformField_H
+#ifndef Foam_symmTransformField_H
+#define Foam_symmTransformField_H
 
 #include "symmTransform.H"
 #include "symmTensorField.H"
@@ -48,73 +49,96 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
-void transform(Field<Type>&, const symmTensorField&, const Field<Type>&);
+// transform()
 
 template<class Type>
-tmp<Field<Type>> transform(const symmTensorField&, const Field<Type>&);
+void transform
+(
+    Field<Type>& result,
+    const symmTensor& rot,
+    const Field<Type>& fld
+);
 
 template<class Type>
-tmp<Field<Type>> transform(const symmTensorField&, const tmp<Field<Type>>&);
+void transform
+(
+    Field<Type>& result,
+    const symmTensorField& rot,
+    const Field<Type>& fld
+);
 
-template<class Type>
-tmp<Field<Type>> transform(const tmp<symmTensorField>&, const Field<Type>&);
 
 template<class Type>
 tmp<Field<Type>> transform
 (
-    const tmp<symmTensorField>&,
-    const tmp<Field<Type>>&
+    const symmTensorField& rot,
+    const Field<Type>& fld
+);
+
+template<class Type>
+tmp<Field<Type>> transform
+(
+    const symmTensorField& rot,
+    const tmp<Field<Type>>& tfld
+);
+
+template<class Type>
+tmp<Field<Type>> transform
+(
+    const tmp<symmTensorField>& trot,
+    const Field<Type>& tfld
+);
+
+template<class Type>
+tmp<Field<Type>> transform
+(
+    const tmp<symmTensorField>& trot,
+    const tmp<Field<Type>>& tfld
 );
 
 
 template<class Type>
-void transform(Field<Type>&, const tensor&, const Field<Type>&);
+tmp<Field<Type>> transform
+(
+    const symmTensor& rot,
+    const Field<Type>& fld
+);
 
 template<class Type>
-tmp<Field<Type>> transform(const tensor&, const Field<Type>&);
-
-template<class Type>
-tmp<Field<Type>> transform(const tensor&, const tmp<Field<Type>>&);
-
-
-template<>
-tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
+tmp<Field<Type>> transform
 (
-    const symmTensorField&
-);
-
-template<>
-tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
-(
-    const tmp<symmTensorField>&
+    const symmTensor& rot,
+    const tmp<Field<Type>>& tfld
 );
 
 
-template<>
-tmp<Field<symmTensor>> transformFieldMask<symmTensor>
-(
-    const symmTensorField&
-);
+// Specializations
 
 template<>
-tmp<Field<symmTensor>> transformFieldMask<symmTensor>
-(
-    const tmp<symmTensorField>&
-);
+tmp<Field<sphericalTensor>>
+transformFieldMask<sphericalTensor>(const symmTensorField&);
+
+template<>
+tmp<Field<sphericalTensor>>
+transformFieldMask<sphericalTensor>(const tmp<symmTensorField>&);
 
 
 template<>
-tmp<Field<tensor>> transformFieldMask<tensor>
-(
-    const symmTensorField&
-);
+tmp<Field<symmTensor>>
+transformFieldMask<symmTensor>(const symmTensorField&);
 
 template<>
-tmp<Field<tensor>> transformFieldMask<tensor>
-(
-    const tmp<symmTensorField>&
-);
+tmp<Field<symmTensor>>
+transformFieldMask<symmTensor>(const tmp<symmTensorField>&);
+
+
+template<>
+tmp<Field<tensor>>
+transformFieldMask<tensor>(const symmTensorField&);
+
+template<>
+tmp<Field<tensor>>
+transformFieldMask<tensor>(const tmp<symmTensorField>&);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.H b/src/OpenFOAM/fields/Fields/transformField/transformField.H
index 99ad5e7c24..eb8de48f9c 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.H
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef transformField_H
-#define transformField_H
+#ifndef Foam_transformField_H
+#define Foam_transformField_H
 
 #include "transform.H"
 #include "quaternion.H"
@@ -177,6 +177,7 @@ tmp<Field<Type>> invTransform
 );
 
 
+// transformFieldMask()
 
 template<class Type1, class Type2>
 tmp<Field<Type1>> transformFieldMask(const Field<Type2>& fld);
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
index 4078c0f3b5..f603625483 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
@@ -56,7 +56,7 @@ void Foam::transform
 {
     if (rot.size() == 1)
     {
-        return transform(result, rot.first(), fld);
+        return transform(result, rot.front(), fld);
     }
 
     TFOR_ALL_F_OP_FUNC_F_F
@@ -180,7 +180,7 @@ void Foam::invTransform
 {
     if (rot.size() == 1)
     {
-        return invTransform(result, rot.first(), fld);
+        return invTransform(result, rot.front(), fld);
     }
 
     TFOR_ALL_F_OP_FUNC_F_F
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.C b/src/OpenFOAM/fields/Fields/transformList/transformList.C
index 3de5a9b886..4ed8482718 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.C
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,9 +37,12 @@ Foam::List<T> Foam::transform
     const UList<T>& field
 )
 {
-    List<T> result(field.size());
+    const label loopLen = field.size();
 
-    forAll(field, i)
+    List<T> result(loopLen);
+
+    /* pragmas... */
+    for (label i = 0; i < loopLen; ++i)
     {
         result[i] = transform(rotTensor, field[i]);
     }
@@ -51,7 +54,10 @@ Foam::List<T> Foam::transform
 template<class T>
 void Foam::transformList(const tensor& rotTensor, UList<T>& field)
 {
-    forAll(field, i)
+    const label loopLen = field.size();
+
+    /* pragmas... */
+    for (label i = 0; i < loopLen; ++i)
     {
         field[i] = transform(rotTensor, field[i]);
     }
@@ -63,11 +69,14 @@ void Foam::transformList(const tensorField& rotTensor, UList<T>& field)
 {
     if (rotTensor.size() == 1)
     {
-        transformList(rotTensor[0], field);
+        transformList(rotTensor.front(), field);
     }
     else if (rotTensor.size() == field.size())
     {
-        forAll(field, i)
+        const label loopLen = field.size();
+
+        /* pragmas... */
+        for (label i = 0; i < loopLen; ++i)
         {
             field[i] = transform(rotTensor[i], field[i]);
         }
@@ -98,7 +107,7 @@ void Foam::transformList(const tensorField& rotTensor, Map<T>& field)
 {
     if (rotTensor.size() == 1)
     {
-        transformList(rotTensor[0], field);
+        transformList(rotTensor.front(), field);
     }
     else
     {
@@ -126,7 +135,7 @@ void Foam::transformList(const tensorField& rotTensor, EdgeMap<T>& field)
 {
     if (rotTensor.size() == 1)
     {
-        transformList(rotTensor[0], field);
+        transformList(rotTensor.front(), field);
     }
     else
     {
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.H b/src/OpenFOAM/fields/Fields/transformList/transformList.H
index 062b749e47..a963589dfd 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.H
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef transformList_H
-#define transformList_H
+#ifndef Foam_transformList_H
+#define Foam_transformList_H
 
 #include "transform.H"
 #include "List.H"
@@ -67,7 +67,7 @@ void transformList(const tensorField& rotTensor, UList<T>& field);
 template<class T>
 void transformList(const tensor& rotTensor, Map<T>& field);
 
-//- Inplace transform a Map of elements using one tensor per element.
+//- Inplace transform a Map of elements.
 //  Using multiple tensors is ill-defined (Fatal).
 template<class T>
 void transformList(const tensorField& rotTensor, Map<T>& field);
@@ -77,7 +77,7 @@ void transformList(const tensorField& rotTensor, Map<T>& field);
 template<class T>
 void transformList(const tensor& rotTensor, EdgeMap<T>& field);
 
-//- Inplace transform a Map of elements using one tensor per element.
+//- Inplace transform a Map of elements.
 //  Using multiple tensors is ill-defined (Fatal).
 template<class T>
 void transformList(const tensorField& rotTensor, EdgeMap<T>& field);
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
index 71982b137b..d7406bbfb6 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef transformGeometricField_H
-#define transformGeometricField_H
+#ifndef Foam_transformGeometricField_H
+#define Foam_transformGeometricField_H
 
 #include "transform.H"
 #include "GeometricField.H"
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index bba3e4a738..428849021d 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -274,6 +274,7 @@ inline const complex& sum(const complex& c)
 
 template<class Cmpt> class Tensor;
 
+//- No-op rotational transform for complex
 inline complex transform(const Tensor<scalar>&, const complex c)
 {
     return c;
diff --git a/src/OpenFOAM/primitives/transform/symmTransform.H b/src/OpenFOAM/primitives/transform/symmTransform.H
index ac4a86c6a7..f463e57632 100644
--- a/src/OpenFOAM/primitives/transform/symmTransform.H
+++ b/src/OpenFOAM/primitives/transform/symmTransform.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,8 +32,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmTransform_H
-#define symmTransform_H
+#ifndef Foam_symmTransform_H
+#define Foam_symmTransform_H
 
 #include "transform.H"
 
@@ -43,57 +44,84 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-inline scalar transform(const symmTensor&, const scalar s)
+//- No-op rotational transform for base types
+template<class T>
+constexpr typename std::enable_if<std::is_arithmetic<T>::value, T>::type
+transform(const symmTensor&, const T val)
 {
-    return s;
+    return val;
 }
 
 
+//- No-op rotational transform for spherical tensor
 template<class Cmpt>
-inline Vector<Cmpt> transform(const symmTensor& stt, const Vector<Cmpt>& v)
+inline SphericalTensor<Cmpt> transform
+(
+    const symmTensor&,
+    const SphericalTensor<Cmpt>& val
+)
 {
-    return stt & v;
+    return val;
 }
 
 
+//- Use rotational tensor to transform a vector
+//  Same as (rot & v)
+template<class Cmpt>
+inline Vector<Cmpt> transform(const symmTensor& tt, const Vector<Cmpt>& v)
+{
+    return tt & v;
+}
+
+
+//- Use rotational tensor to transform a tensor.
+//  Same as (rot & input & rot.T())
 template<class Cmpt>
 inline Tensor<Cmpt> transform(const symmTensor& stt, const Tensor<Cmpt>& t)
 {
-    //return stt & t & stt.T();
     return Tensor<Cmpt>
     (
+        // xx:
         (stt.xx()*t.xx() + stt.xy()*t.yx() + stt.xz()*t.zx())*stt.xx()
       + (stt.xx()*t.xy() + stt.xy()*t.yy() + stt.xz()*t.zy())*stt.xy()
       + (stt.xx()*t.xz() + stt.xy()*t.yz() + stt.xz()*t.zz())*stt.xz(),
 
+        // xy:
         (stt.xx()*t.xx() + stt.xy()*t.yx() + stt.xz()*t.zx())*stt.xy()
       + (stt.xx()*t.xy() + stt.xy()*t.yy() + stt.xz()*t.zy())*stt.yy()
       + (stt.xx()*t.xz() + stt.xy()*t.yz() + stt.xz()*t.zz())*stt.yz(),
 
+        // xz:
         (stt.xx()*t.xx() + stt.xy()*t.yx() + stt.xz()*t.zx())*stt.xz()
       + (stt.xx()*t.xy() + stt.xy()*t.yy() + stt.xz()*t.zy())*stt.yz()
       + (stt.xx()*t.xz() + stt.xy()*t.yz() + stt.xz()*t.zz())*stt.zz(),
 
+        // yx:
         (stt.xy()*t.xx() + stt.yy()*t.yx() + stt.yz()*t.zx())*stt.xx()
       + (stt.xy()*t.xy() + stt.yy()*t.yy() + stt.yz()*t.zy())*stt.xy()
       + (stt.xy()*t.xz() + stt.yy()*t.yz() + stt.yz()*t.zz())*stt.xz(),
 
+        // yy:
         (stt.xy()*t.xx() + stt.yy()*t.yx() + stt.yz()*t.zx())*stt.xy()
       + (stt.xy()*t.xy() + stt.yy()*t.yy() + stt.yz()*t.zy())*stt.yy()
       + (stt.xy()*t.xz() + stt.yy()*t.yz() + stt.yz()*t.zz())*stt.yz(),
 
+        // yz:
         (stt.xy()*t.xx() + stt.yy()*t.yx() + stt.yz()*t.zx())*stt.xz()
       + (stt.xy()*t.xy() + stt.yy()*t.yy() + stt.yz()*t.zy())*stt.yz()
       + (stt.xy()*t.xz() + stt.yy()*t.yz() + stt.yz()*t.zz())*stt.zz(),
 
+        // zx:
         (stt.xz()*t.xx() + stt.yz()*t.yx() + stt.zz()*t.zx())*stt.xx()
       + (stt.xz()*t.xy() + stt.yz()*t.yy() + stt.zz()*t.zy())*stt.xy()
       + (stt.xz()*t.xz() + stt.yz()*t.yz() + stt.zz()*t.zz())*stt.xz(),
 
+        // zy:
         (stt.xz()*t.xx() + stt.yz()*t.yx() + stt.zz()*t.zx())*stt.xy()
       + (stt.xz()*t.xy() + stt.yz()*t.yy() + stt.zz()*t.zy())*stt.yy()
       + (stt.xz()*t.xz() + stt.yz()*t.yz() + stt.zz()*t.zz())*stt.yz(),
 
+        // zz:
         (stt.xz()*t.xx() + stt.yz()*t.yx() + stt.zz()*t.zx())*stt.xz()
       + (stt.xz()*t.xy() + stt.yz()*t.yy() + stt.zz()*t.zy())*stt.yz()
       + (stt.xz()*t.xz() + stt.yz()*t.yz() + stt.zz()*t.zz())*stt.zz()
@@ -101,17 +129,8 @@ inline Tensor<Cmpt> transform(const symmTensor& stt, const Tensor<Cmpt>& t)
 }
 
 
-template<class Cmpt>
-inline SphericalTensor<Cmpt> transform
-(
-    const symmTensor& stt,
-    const SphericalTensor<Cmpt>& st
-)
-{
-    return st;
-}
-
-
+//- Use rotational tensor to transform a symmTensor
+//  Same as (rot & input & rot.T())
 template<class Cmpt>
 inline SymmTensor<Cmpt> transform
 (
@@ -121,26 +140,32 @@ inline SymmTensor<Cmpt> transform
 {
     return SymmTensor<Cmpt>
     (
+        // xx:
         (stt.xx()*st.xx() + stt.xy()*st.xy() + stt.xz()*st.xz())*stt.xx()
       + (stt.xx()*st.xy() + stt.xy()*st.yy() + stt.xz()*st.yz())*stt.xy()
       + (stt.xx()*st.xz() + stt.xy()*st.yz() + stt.xz()*st.zz())*stt.xz(),
 
+        // xy:
         (stt.xx()*st.xx() + stt.xy()*st.xy() + stt.xz()*st.xz())*stt.xy()
       + (stt.xx()*st.xy() + stt.xy()*st.yy() + stt.xz()*st.yz())*stt.yy()
       + (stt.xx()*st.xz() + stt.xy()*st.yz() + stt.xz()*st.zz())*stt.yz(),
 
+        // xz:
         (stt.xx()*st.xx() + stt.xy()*st.xy() + stt.xz()*st.xz())*stt.xz()
       + (stt.xx()*st.xy() + stt.xy()*st.yy() + stt.xz()*st.yz())*stt.yz()
       + (stt.xx()*st.xz() + stt.xy()*st.yz() + stt.xz()*st.zz())*stt.zz(),
 
+        // yy:
         (stt.xy()*st.xx() + stt.yy()*st.xy() + stt.yz()*st.xz())*stt.xy()
       + (stt.xy()*st.xy() + stt.yy()*st.yy() + stt.yz()*st.yz())*stt.yy()
       + (stt.xy()*st.xz() + stt.yy()*st.yz() + stt.yz()*st.zz())*stt.yz(),
 
+        // yz:
         (stt.xy()*st.xx() + stt.yy()*st.xy() + stt.yz()*st.xz())*stt.xz()
       + (stt.xy()*st.xy() + stt.yy()*st.yy() + stt.yz()*st.yz())*stt.yz()
       + (stt.xy()*st.xz() + stt.yy()*st.yz() + stt.yz()*st.zz())*stt.zz(),
 
+        // zz:
         (stt.xz()*st.xx() + stt.yz()*st.xy() + stt.zz()*st.xz())*stt.xz()
       + (stt.xz()*st.xy() + stt.yz()*st.yy() + stt.zz()*st.yz())*stt.yz()
       + (stt.xz()*st.xz() + stt.yz()*st.yz() + stt.zz()*st.zz())*stt.zz()
@@ -148,6 +173,8 @@ inline SymmTensor<Cmpt> transform
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<>
 inline sphericalTensor transformMask<sphericalTensor>(const symmTensor& st)
 {
diff --git a/src/OpenFOAM/primitives/transform/transform.H b/src/OpenFOAM/primitives/transform/transform.H
index fd52c65553..cc921ef038 100644
--- a/src/OpenFOAM/primitives/transform/transform.H
+++ b/src/OpenFOAM/primitives/transform/transform.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -146,6 +146,8 @@ inline tensor Ra(const vector& a, const scalar omega)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 //- No-op rotational transform for base types
 template<class T>
 constexpr typename std::enable_if<std::is_arithmetic<T>::value, T>::type
@@ -154,6 +156,19 @@ transform(const tensor&, const T val)
     return val;
 }
 
+
+//- No-op rotational transform for spherical tensor
+template<class Cmpt>
+inline SphericalTensor<Cmpt> transform
+(
+    const tensor&,
+    const SphericalTensor<Cmpt>& val
+)
+{
+    return val;
+}
+
+
 //- No-op inverse rotational transform for base types
 template<class T>
 constexpr typename std::enable_if<std::is_arithmetic<T>::value, T>::type
@@ -163,6 +178,18 @@ invTransform(const tensor&, const T val)
 }
 
 
+//- No-op inverse rotational transform for spherical tensor
+template<class Cmpt>
+inline SphericalTensor<Cmpt> invTransform
+(
+    const tensor&,
+    const SphericalTensor<Cmpt>& val
+)
+{
+    return val;
+}
+
+
 //- Use rotational tensor to transform a vector.
 //  Same as (rot & v)
 template<class Cmpt>
@@ -188,38 +215,47 @@ inline Tensor<Cmpt> transform(const tensor& tt, const Tensor<Cmpt>& t)
 {
     return Tensor<Cmpt>
     (
+        // xx:
         (tt.xx()*t.xx() + tt.xy()*t.yx() + tt.xz()*t.zx())*tt.xx()
       + (tt.xx()*t.xy() + tt.xy()*t.yy() + tt.xz()*t.zy())*tt.xy()
       + (tt.xx()*t.xz() + tt.xy()*t.yz() + tt.xz()*t.zz())*tt.xz(),
 
+        // xy:
         (tt.xx()*t.xx() + tt.xy()*t.yx() + tt.xz()*t.zx())*tt.yx()
       + (tt.xx()*t.xy() + tt.xy()*t.yy() + tt.xz()*t.zy())*tt.yy()
       + (tt.xx()*t.xz() + tt.xy()*t.yz() + tt.xz()*t.zz())*tt.yz(),
 
+        // xz:
         (tt.xx()*t.xx() + tt.xy()*t.yx() + tt.xz()*t.zx())*tt.zx()
       + (tt.xx()*t.xy() + tt.xy()*t.yy() + tt.xz()*t.zy())*tt.zy()
       + (tt.xx()*t.xz() + tt.xy()*t.yz() + tt.xz()*t.zz())*tt.zz(),
 
+        // yx:
         (tt.yx()*t.xx() + tt.yy()*t.yx() + tt.yz()*t.zx())*tt.xx()
       + (tt.yx()*t.xy() + tt.yy()*t.yy() + tt.yz()*t.zy())*tt.xy()
       + (tt.yx()*t.xz() + tt.yy()*t.yz() + tt.yz()*t.zz())*tt.xz(),
 
+        // yy:
         (tt.yx()*t.xx() + tt.yy()*t.yx() + tt.yz()*t.zx())*tt.yx()
       + (tt.yx()*t.xy() + tt.yy()*t.yy() + tt.yz()*t.zy())*tt.yy()
       + (tt.yx()*t.xz() + tt.yy()*t.yz() + tt.yz()*t.zz())*tt.yz(),
 
+        // yz:
         (tt.yx()*t.xx() + tt.yy()*t.yx() + tt.yz()*t.zx())*tt.zx()
       + (tt.yx()*t.xy() + tt.yy()*t.yy() + tt.yz()*t.zy())*tt.zy()
       + (tt.yx()*t.xz() + tt.yy()*t.yz() + tt.yz()*t.zz())*tt.zz(),
 
+        // zx:
         (tt.zx()*t.xx() + tt.zy()*t.yx() + tt.zz()*t.zx())*tt.xx()
       + (tt.zx()*t.xy() + tt.zy()*t.yy() + tt.zz()*t.zy())*tt.xy()
       + (tt.zx()*t.xz() + tt.zy()*t.yz() + tt.zz()*t.zz())*tt.xz(),
 
+        // zy:
         (tt.zx()*t.xx() + tt.zy()*t.yx() + tt.zz()*t.zx())*tt.yx()
       + (tt.zx()*t.xy() + tt.zy()*t.yy() + tt.zz()*t.zy())*tt.yy()
       + (tt.zx()*t.xz() + tt.zy()*t.yz() + tt.zz()*t.zz())*tt.yz(),
 
+        // zz:
         (tt.zx()*t.xx() + tt.zy()*t.yx() + tt.zz()*t.zx())*tt.zx()
       + (tt.zx()*t.xy() + tt.zy()*t.yy() + tt.zz()*t.zy())*tt.zy()
       + (tt.zx()*t.xz() + tt.zy()*t.yz() + tt.zz()*t.zz())*tt.zz()
@@ -234,38 +270,47 @@ inline Tensor<Cmpt> invTransform(const tensor& tt, const Tensor<Cmpt>& t)
 {
     return Tensor<Cmpt>
     (
+        // xx:
         (tt.xx()*t.xx() + tt.yx()*t.yx() + tt.zx()*t.zx())*tt.xx()
       + (tt.xx()*t.xy() + tt.yx()*t.yy() + tt.zx()*t.zy())*tt.yx()
       + (tt.xx()*t.xz() + tt.yx()*t.yz() + tt.zx()*t.zz())*tt.zx(),
 
+        // xy:
         (tt.xx()*t.xx() + tt.yx()*t.yx() + tt.zx()*t.zx())*tt.xy()
       + (tt.xx()*t.xy() + tt.yx()*t.yy() + tt.zx()*t.zy())*tt.yy()
       + (tt.xx()*t.xz() + tt.yx()*t.yz() + tt.zx()*t.zz())*tt.zy(),
 
+        // xz:
         (tt.xx()*t.xx() + tt.yx()*t.yx() + tt.zx()*t.zx())*tt.xz()
       + (tt.xx()*t.xy() + tt.yx()*t.yy() + tt.zx()*t.zy())*tt.yz()
       + (tt.xx()*t.xz() + tt.yx()*t.yz() + tt.zx()*t.zz())*tt.zz(),
 
+        // yx:
         (tt.xy()*t.xx() + tt.yy()*t.yx() + tt.zy()*t.zx())*tt.xx()
       + (tt.xy()*t.xy() + tt.yy()*t.yy() + tt.zy()*t.zy())*tt.yx()
       + (tt.xy()*t.xz() + tt.yy()*t.yz() + tt.zy()*t.zz())*tt.zx(),
 
+        // yy:
         (tt.xy()*t.xx() + tt.yy()*t.yx() + tt.zy()*t.zx())*tt.xy()
       + (tt.xy()*t.xy() + tt.yy()*t.yy() + tt.zy()*t.zy())*tt.yy()
       + (tt.xy()*t.xz() + tt.yy()*t.yz() + tt.zy()*t.zz())*tt.zy(),
 
+        // yz:
         (tt.xy()*t.xx() + tt.yy()*t.yx() + tt.zy()*t.zx())*tt.xz()
       + (tt.xy()*t.xy() + tt.yy()*t.yy() + tt.zy()*t.zy())*tt.yz()
       + (tt.xy()*t.xz() + tt.yy()*t.yz() + tt.zy()*t.zz())*tt.zz(),
 
+        // zx:
         (tt.xz()*t.xx() + tt.yz()*t.yx() + tt.zz()*t.zx())*tt.xx()
       + (tt.xz()*t.xy() + tt.yz()*t.yy() + tt.zz()*t.zy())*tt.yx()
       + (tt.xz()*t.xz() + tt.yz()*t.yz() + tt.zz()*t.zz())*tt.zx(),
 
+        // zy:
         (tt.xz()*t.xx() + tt.yz()*t.yx() + tt.zz()*t.zx())*tt.xy()
       + (tt.xz()*t.xy() + tt.yz()*t.yy() + tt.zz()*t.zy())*tt.yy()
       + (tt.xz()*t.xz() + tt.yz()*t.yz() + tt.zz()*t.zz())*tt.zy(),
 
+        // zz:
         (tt.xz()*t.xx() + tt.yz()*t.yx() + tt.zz()*t.zx())*tt.xz()
       + (tt.xz()*t.xy() + tt.yz()*t.yy() + tt.zz()*t.zy())*tt.yz()
       + (tt.xz()*t.xz() + tt.yz()*t.yz() + tt.zz()*t.zz())*tt.zz()
@@ -273,30 +318,6 @@ inline Tensor<Cmpt> invTransform(const tensor& tt, const Tensor<Cmpt>& t)
 }
 
 
-//- Use rotational tensor to transform a spherical tensor (no-op).
-template<class Cmpt>
-inline SphericalTensor<Cmpt> transform
-(
-    const tensor& tt,
-    const SphericalTensor<Cmpt>& st
-)
-{
-    return st;
-}
-
-
-//- Use rotational tensor to inverse transform a spherical tensor (no-op).
-template<class Cmpt>
-inline SphericalTensor<Cmpt> invTransform
-(
-    const tensor& tt,
-    const SphericalTensor<Cmpt>& st
-)
-{
-    return st;
-}
-
-
 //- Use rotational tensor to transform a symmetrical tensor.
 //  Same as (rot & input & rot.T())
 template<class Cmpt>
@@ -304,26 +325,32 @@ inline SymmTensor<Cmpt> transform(const tensor& tt, const SymmTensor<Cmpt>& st)
 {
     return SymmTensor<Cmpt>
     (
+        // xx:
         (tt.xx()*st.xx() + tt.xy()*st.xy() + tt.xz()*st.xz())*tt.xx()
       + (tt.xx()*st.xy() + tt.xy()*st.yy() + tt.xz()*st.yz())*tt.xy()
       + (tt.xx()*st.xz() + tt.xy()*st.yz() + tt.xz()*st.zz())*tt.xz(),
 
+        // xy:
         (tt.xx()*st.xx() + tt.xy()*st.xy() + tt.xz()*st.xz())*tt.yx()
       + (tt.xx()*st.xy() + tt.xy()*st.yy() + tt.xz()*st.yz())*tt.yy()
       + (tt.xx()*st.xz() + tt.xy()*st.yz() + tt.xz()*st.zz())*tt.yz(),
 
+        // xz:
         (tt.xx()*st.xx() + tt.xy()*st.xy() + tt.xz()*st.xz())*tt.zx()
       + (tt.xx()*st.xy() + tt.xy()*st.yy() + tt.xz()*st.yz())*tt.zy()
       + (tt.xx()*st.xz() + tt.xy()*st.yz() + tt.xz()*st.zz())*tt.zz(),
 
+        // yy:
         (tt.yx()*st.xx() + tt.yy()*st.xy() + tt.yz()*st.xz())*tt.yx()
       + (tt.yx()*st.xy() + tt.yy()*st.yy() + tt.yz()*st.yz())*tt.yy()
       + (tt.yx()*st.xz() + tt.yy()*st.yz() + tt.yz()*st.zz())*tt.yz(),
 
+        // yz:
         (tt.yx()*st.xx() + tt.yy()*st.xy() + tt.yz()*st.xz())*tt.zx()
       + (tt.yx()*st.xy() + tt.yy()*st.yy() + tt.yz()*st.yz())*tt.zy()
       + (tt.yx()*st.xz() + tt.yy()*st.yz() + tt.yz()*st.zz())*tt.zz(),
 
+        // zz:
         (tt.zx()*st.xx() + tt.zy()*st.xy() + tt.zz()*st.xz())*tt.zx()
       + (tt.zx()*st.xy() + tt.zy()*st.yy() + tt.zz()*st.yz())*tt.zy()
       + (tt.zx()*st.xz() + tt.zy()*st.yz() + tt.zz()*st.zz())*tt.zz()
@@ -339,26 +366,32 @@ invTransform(const tensor& tt, const SymmTensor<Cmpt>& st)
 {
     return SymmTensor<Cmpt>
     (
+        // xx:
         (tt.xx()*st.xx() + tt.yx()*st.xy() + tt.zx()*st.xz())*tt.xx()
       + (tt.xx()*st.xy() + tt.yx()*st.yy() + tt.zx()*st.yz())*tt.yx()
       + (tt.xx()*st.xz() + tt.yx()*st.yz() + tt.zx()*st.zz())*tt.zx(),
 
+        // xy:
         (tt.xx()*st.xx() + tt.yx()*st.xy() + tt.zx()*st.xz())*tt.xy()
       + (tt.xx()*st.xy() + tt.yx()*st.yy() + tt.zx()*st.yz())*tt.yy()
       + (tt.xx()*st.xz() + tt.yx()*st.yz() + tt.zx()*st.zz())*tt.zy(),
 
+        // xz:
         (tt.xx()*st.xx() + tt.yx()*st.xy() + tt.zx()*st.xz())*tt.xz()
       + (tt.xx()*st.xy() + tt.yx()*st.yy() + tt.zx()*st.yz())*tt.yz()
       + (tt.xx()*st.xz() + tt.yx()*st.yz() + tt.zx()*st.zz())*tt.zz(),
 
+        // yy:
         (tt.xy()*st.xx() + tt.yy()*st.xy() + tt.zy()*st.xz())*tt.xy()
       + (tt.xy()*st.xy() + tt.yy()*st.yy() + tt.zy()*st.yz())*tt.yy()
       + (tt.xy()*st.xz() + tt.yy()*st.yz() + tt.zy()*st.zz())*tt.zy(),
 
+        // yz:
         (tt.xy()*st.xx() + tt.yy()*st.xy() + tt.zy()*st.xz())*tt.xz()
       + (tt.xy()*st.xy() + tt.yy()*st.yy() + tt.zy()*st.yz())*tt.yz()
       + (tt.xy()*st.xz() + tt.yy()*st.yz() + tt.zy()*st.zz())*tt.zz(),
 
+        // zz:
         (tt.xz()*st.xx() + tt.yz()*st.xy() + tt.zz()*st.xz())*tt.xz()
       + (tt.xz()*st.xy() + tt.yz()*st.yy() + tt.zz()*st.yz())*tt.yz()
       + (tt.xz()*st.xz() + tt.yz()*st.yz() + tt.zz()*st.zz())*tt.zz()
@@ -366,6 +399,8 @@ invTransform(const tensor& tt, const SymmTensor<Cmpt>& st)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 template<class Type1, class Type2>
 inline Type1 transformMask(const Type2& t)
 {

From ecaa55295b9be1f81d0cf9657e56439ad44ca3a3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 20:45:53 +0100
Subject: [PATCH 017/348] ENH: add dimensionedLabel typedef

GIT: primitives/compat with compatibility includes
GIT: primitives/traits with pTraits, contiguous, zero, one etc.

COMP: relocate base equal(a,b) definition from scalar.H -> label.H
- make more universally available

STYLE: replace occasional use of notEqual(a,b) with !equal(a,b)
---
 .../test/fieldMapping/Test-fieldMapping.C     | 15 ++---
 .../dimensionedLabel/dimensionedLabel.H       | 59 +++++++++++++++++++
 .../dimensionedMinMax/dimensionedMinMax.H     |  4 +-
 .../dimensionedScalar/dimensionedScalar.H     |  4 +-
 .../dimensionedScalar/dimensionedScalarFwd.H  |  8 +--
 .../dimensionedSphericalTensor.H              |  6 +-
 .../dimensionedSymmTensor.H                   |  4 +-
 .../dimensionedTensor/dimensionedTensor.H     |  4 +-
 .../dimensionedTypes/dimensionedTypes.H       |  6 +-
 .../dimensionedVector/dimensionedVector.H     |  4 +-
 src/OpenFOAM/primitives/Scalar/Scalar.H       |  8 +--
 src/OpenFOAM/primitives/Scalar/doubleFloat.H  | 12 +---
 .../{hashes/Hash => compat}/HashFwd.H         |  0
 .../primitives/{Swap => compat}/Swap.H        |  0
 .../{Tensor/floats => compat}/doubleTensor.H  |  0
 .../{Vector/floats => compat}/doubleVector.H  |  0
 .../{Tensor/floats => compat}/floatTensor.H   |  0
 .../{Vector/floats => compat}/floatVector.H   |  0
 .../primitives/{zero => compat}/nil.H         |  0
 .../wordRes => compat}/wordReListMatcher.H    |  0
 src/OpenFOAM/primitives/endian/endian.H       | 10 ++--
 src/OpenFOAM/primitives/endian/endianI.H      |  4 +-
 src/OpenFOAM/primitives/ints/label/label.H    | 10 ++++
 .../primitives/nullObject/nullObject.H        | 18 +++---
 .../{contiguous => traits}/contiguous.H       |  0
 src/OpenFOAM/primitives/{one => traits}/one.H |  2 +-
 .../primitives/{one => traits}/oneI.H         |  0
 .../primitives/{zero => traits}/zero.C        |  0
 .../primitives/{zero => traits}/zero.H        | 21 ++++++-
 .../primitives/{zero => traits}/zeroI.H       |  0
 .../specie/thermo/janaf/janafThermoI.H        |  6 +-
 31 files changed, 140 insertions(+), 65 deletions(-)
 create mode 100644 src/OpenFOAM/dimensionedTypes/dimensionedLabel/dimensionedLabel.H
 rename src/OpenFOAM/primitives/{hashes/Hash => compat}/HashFwd.H (100%)
 rename src/OpenFOAM/primitives/{Swap => compat}/Swap.H (100%)
 rename src/OpenFOAM/primitives/{Tensor/floats => compat}/doubleTensor.H (100%)
 rename src/OpenFOAM/primitives/{Vector/floats => compat}/doubleVector.H (100%)
 rename src/OpenFOAM/primitives/{Tensor/floats => compat}/floatTensor.H (100%)
 rename src/OpenFOAM/primitives/{Vector/floats => compat}/floatVector.H (100%)
 rename src/OpenFOAM/primitives/{zero => compat}/nil.H (100%)
 rename src/OpenFOAM/primitives/{strings/wordRes => compat}/wordReListMatcher.H (100%)
 rename src/OpenFOAM/primitives/{contiguous => traits}/contiguous.H (100%)
 rename src/OpenFOAM/primitives/{one => traits}/one.H (99%)
 rename src/OpenFOAM/primitives/{one => traits}/oneI.H (100%)
 rename src/OpenFOAM/primitives/{zero => traits}/zero.C (100%)
 rename src/OpenFOAM/primitives/{zero => traits}/zero.H (88%)
 rename src/OpenFOAM/primitives/{zero => traits}/zeroI.H (100%)

diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index f65a2d3ae5..2c4b032e15 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -48,12 +48,6 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-bool notEqual(const scalar s1, const scalar s2, const scalar tol)
-{
-    return mag(s1-s2) > tol;
-}
-
-
 // Main program:
 
 int main(int argc, char *argv[])
@@ -154,6 +148,8 @@ int main(int argc, char *argv[])
     // Face removal engine. No checking for not merging boundary faces.
     removeFaces faceRemover(mesh, GREAT);
 
+    // Comparison for inequality
+    const auto isNotEqual = notEqualOp<scalar>(1e-10);
 
     while (runTime.loop())
     {
@@ -254,7 +250,6 @@ int main(int argc, char *argv[])
             }
         }
 
-
         // Check constant profile
         {
             const scalar max = gMax(one);
@@ -263,7 +258,7 @@ int main(int argc, char *argv[])
             Info<< "Uniform one field min = " << min
                 << "  max = " << max << endl;
 
-            if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
+            if (isNotEqual(max, 1) || isNotEqual(min, 1))
             {
                 FatalErrorInFunction
                     << "Uniform volVectorField not preserved."
@@ -287,7 +282,7 @@ int main(int argc, char *argv[])
             Info<< "Linear profile field min = " << min
                 << "  max = " << max << endl;
 
-            if (notEqual(max, 0.0, 1e-10) || notEqual(min, 0.0, 1e-10))
+            if (isNotEqual(max, 0) || isNotEqual(min, 0))
             {
                 FatalErrorInFunction
                     << "Linear profile not preserved."
@@ -310,7 +305,7 @@ int main(int argc, char *argv[])
             Info<< "Uniform surface field min = " << min
                 << "  max = " << max << endl;
 
-            if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
+            if (isNotEqual(max, 1) || isNotEqual(min, 1))
             {
                 FatalErrorInFunction
                     << "Uniform surfaceScalarField not preserved."
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedLabel/dimensionedLabel.H b/src/OpenFOAM/dimensionedTypes/dimensionedLabel/dimensionedLabel.H
new file mode 100644
index 0000000000..37e6fc4397
--- /dev/null
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedLabel/dimensionedLabel.H
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Typedef
+    Foam::dimensionedLabel
+
+Description
+    Dimensioned label obtained from generic dimensioned type.
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_dimensionedLabel_H
+#define Foam_dimensionedLabel_H
+
+#include "dimensionedType.H"
+#include "label.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef dimensioned<label> dimensionedLabel;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedMinMax/dimensionedMinMax.H b/src/OpenFOAM/dimensionedTypes/dimensionedMinMax/dimensionedMinMax.H
index 5a6446d534..1aff6aa2b8 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedMinMax/dimensionedMinMax.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedMinMax/dimensionedMinMax.H
@@ -40,8 +40,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedMinMax_H
-#define dimensionedMinMax_H
+#ifndef Foam_dimensionedMinMax_H
+#define Foam_dimensionedMinMax_H
 
 #include "dimensionedType.H"
 #include "MinMax.H"
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
index 820374df8e..0b83ee3815 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedScalar_H
-#define dimensionedScalar_H
+#ifndef Foam_dimensionedScalar_H
+#define Foam_dimensionedScalar_H
 
 #include "dimensionedType.H"
 #include "scalar.H"
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H
index ffa617fa92..946aa529e2 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalarFwd.H
@@ -23,14 +23,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedScalarFwd_H
-#define dimensionedScalarFwd_H
+#ifndef Foam_dimensionedScalarFwd_H
+#define Foam_dimensionedScalarFwd_H
 
-#include "scalar.H"
+#include "scalarFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedSphericalTensor/dimensionedSphericalTensor.H b/src/OpenFOAM/dimensionedTypes/dimensionedSphericalTensor/dimensionedSphericalTensor.H
index eb8c208bdd..58a2b0ba81 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedSphericalTensor/dimensionedSphericalTensor.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedSphericalTensor/dimensionedSphericalTensor.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedSphericalTensor_H
-#define dimensionedSphericalTensor_H
+#ifndef Foam_dimensionedSphericalTensor_H
+#define Foam_dimensionedSphericalTensor_H
 
 #include "dimensionedType.H"
 #include "sphericalTensor.H"
@@ -50,7 +50,7 @@ namespace Foam
 typedef dimensioned<sphericalTensor> dimensionedSphericalTensor;
 
 
-// global functions
+// Global Functions
 
 dimensionedScalar tr(const dimensionedSphericalTensor&);
 dimensionedScalar det(const dimensionedSphericalTensor&);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H b/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
index 5f6b1441a8..2d7cbf6016 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedSymmTensor_H
-#define dimensionedSymmTensor_H
+#ifndef Foam_dimensionedSymmTensor_H
+#define Foam_dimensionedSymmTensor_H
 
 #include "dimensionedVector.H"
 #include "symmTensor.H"
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H b/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H
index ad51af2fd0..8de0683efe 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedTensor_H
-#define dimensionedTensor_H
+#ifndef Foam_dimensionedTensor_H
+#define Foam_dimensionedTensor_H
 
 #include "dimensionedVector.H"
 #include "dimensionedSymmTensor.H"
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedTypes.H b/src/OpenFOAM/dimensionedTypes/dimensionedTypes.H
index 643ebc2faf..a20f2096ea 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedTypes.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedTypes.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,11 +26,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedTypes_H
-#define dimensionedTypes_H
+#ifndef Foam_dimensionedTypes_H
+#define Foam_dimensionedTypes_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "dimensionedLabel.H"
 #include "dimensionedScalar.H"
 #include "dimensionedVector.H"
 #include "dimensionedSphericalTensor.H"
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedVector/dimensionedVector.H b/src/OpenFOAM/dimensionedTypes/dimensionedVector/dimensionedVector.H
index 6011051786..bd499b335e 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedVector/dimensionedVector.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedVector/dimensionedVector.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionedVector_H
-#define dimensionedVector_H
+#ifndef Foam_dimensionedVector_H
+#define Foam_dimensionedVector_H
 
 #include "dimensionedScalar.H"
 #include "vector.H"
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 7e0d0784b9..e19a7e7d6f 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -282,15 +282,15 @@ inline Scalar negPart(const Scalar s) noexcept
 }
 
 
-inline bool equal(const Scalar& s1, const Scalar& s2)
+inline bool equal(const Scalar& a, const Scalar& b)
 {
-    return mag(s1 - s2) <= ScalarVSMALL;
+    return mag(a - b) <= ScalarVSMALL;
 }
 
 
-inline bool notEqual(const Scalar s1, const Scalar s2)
+inline bool notEqual(const Scalar a, const Scalar b)
 {
-    return mag(s1 - s2) > ScalarVSMALL;
+    return mag(a - b) > ScalarVSMALL;
 }
 
 
diff --git a/src/OpenFOAM/primitives/Scalar/doubleFloat.H b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
index 7767088e51..5117199c8c 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleFloat.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
@@ -26,8 +26,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef doubleFloat_H
-#define doubleFloat_H
+#ifndef Foam_doubleFloat_H
+#define Foam_doubleFloat_H
 
 #include "label.H"
 #include "products.H"
@@ -41,14 +41,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Compare two values for equality
-template<class T>
-inline bool equal(const T& s1, const T& s2)
-{
-    return s1 == s2;
-}
-
-
 #define MAXMINPOW(retType, type1, type2)                \
                                                         \
 MAXMIN(retType, type1, type2)                           \
diff --git a/src/OpenFOAM/primitives/hashes/Hash/HashFwd.H b/src/OpenFOAM/primitives/compat/HashFwd.H
similarity index 100%
rename from src/OpenFOAM/primitives/hashes/Hash/HashFwd.H
rename to src/OpenFOAM/primitives/compat/HashFwd.H
diff --git a/src/OpenFOAM/primitives/Swap/Swap.H b/src/OpenFOAM/primitives/compat/Swap.H
similarity index 100%
rename from src/OpenFOAM/primitives/Swap/Swap.H
rename to src/OpenFOAM/primitives/compat/Swap.H
diff --git a/src/OpenFOAM/primitives/Tensor/floats/doubleTensor.H b/src/OpenFOAM/primitives/compat/doubleTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/Tensor/floats/doubleTensor.H
rename to src/OpenFOAM/primitives/compat/doubleTensor.H
diff --git a/src/OpenFOAM/primitives/Vector/floats/doubleVector.H b/src/OpenFOAM/primitives/compat/doubleVector.H
similarity index 100%
rename from src/OpenFOAM/primitives/Vector/floats/doubleVector.H
rename to src/OpenFOAM/primitives/compat/doubleVector.H
diff --git a/src/OpenFOAM/primitives/Tensor/floats/floatTensor.H b/src/OpenFOAM/primitives/compat/floatTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/Tensor/floats/floatTensor.H
rename to src/OpenFOAM/primitives/compat/floatTensor.H
diff --git a/src/OpenFOAM/primitives/Vector/floats/floatVector.H b/src/OpenFOAM/primitives/compat/floatVector.H
similarity index 100%
rename from src/OpenFOAM/primitives/Vector/floats/floatVector.H
rename to src/OpenFOAM/primitives/compat/floatVector.H
diff --git a/src/OpenFOAM/primitives/zero/nil.H b/src/OpenFOAM/primitives/compat/nil.H
similarity index 100%
rename from src/OpenFOAM/primitives/zero/nil.H
rename to src/OpenFOAM/primitives/compat/nil.H
diff --git a/src/OpenFOAM/primitives/strings/wordRes/wordReListMatcher.H b/src/OpenFOAM/primitives/compat/wordReListMatcher.H
similarity index 100%
rename from src/OpenFOAM/primitives/strings/wordRes/wordReListMatcher.H
rename to src/OpenFOAM/primitives/compat/wordReListMatcher.H
diff --git a/src/OpenFOAM/primitives/endian/endian.H b/src/OpenFOAM/primitives/endian/endian.H
index 5dfdc4dd49..11da40d344 100644
--- a/src/OpenFOAM/primitives/endian/endian.H
+++ b/src/OpenFOAM/primitives/endian/endian.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef foamEndian_H  // Prefixed with 'foam' to avoid any name clashes
-#define foamEndian_H
+#ifndef Foam_endian_H
+#define Foam_endian_H
 
 #include <cstdint>
 
@@ -75,10 +75,10 @@ public:
     // Public Methods
 
         //- Runtime check for big endian.
-        inline static bool isBig();
+        inline static bool isBig() noexcept;
 
         //- Runtime check for little endian.
-        inline static bool isLittle();
+        inline static bool isLittle() noexcept;
 
         //- Byte endian swapping for 32-bits
         inline static uint32_t swap32(uint32_t);
diff --git a/src/OpenFOAM/primitives/endian/endianI.H b/src/OpenFOAM/primitives/endian/endianI.H
index c649890665..bf2179e566 100644
--- a/src/OpenFOAM/primitives/endian/endianI.H
+++ b/src/OpenFOAM/primitives/endian/endianI.H
@@ -40,7 +40,7 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-inline bool Foam::endian::isBig()
+inline bool Foam::endian::isBig() noexcept
 {
     const short testBig = 0x0100;
 
@@ -49,7 +49,7 @@ inline bool Foam::endian::isBig()
 }
 
 
-inline bool Foam::endian::isLittle()
+inline bool Foam::endian::isLittle() noexcept
 {
     const short testLittle = 0x0001;
 
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index a642c07953..5afa10789f 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -132,6 +132,16 @@ inline constexpr label component(const label val, const direction) noexcept
 }
 
 
+// * * * * * * * * * * * * * * * General Functions * * * * * * * * * * * * * //
+
+//- Compare two values for equality
+template<class T>
+inline bool equal(const T& a, const T& b)
+{
+    return (a == b);
+}
+
+
 /*---------------------------------------------------------------------------*\
                           Struct labelOp Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index 9d9c373869..70c96e1444 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nullObject_H
-#define nullObject_H
+#ifndef Foam_nullObject_H
+#define Foam_nullObject_H
 
 #include "labelFwd.H"
 
@@ -101,37 +101,37 @@ public:
     // Member Functions
 
         //- A nullptr pointer content
-        inline const void* pointer() const
+        const void* pointer() const noexcept
         {
             return data_[0].ptr;
         }
 
         //- Zero valued integer content
-        inline unsigned long value() const
+        unsigned long value() const noexcept
         {
             return 0;
         }
 
         //- No elements
-        inline bool empty() const
+        bool empty() const noexcept
         {
             return true;
         }
 
         //- Zero elements
-        inline label size() const
+        label size() const noexcept
         {
             return 0;
         }
 
         //- No-op method (for HashTable replacement)
-        inline const NullObject& toc() const
+        const NullObject& toc() const noexcept
         {
             return *this;
         }
 
         //- No-op method (for HashTable replacement)
-        inline const NullObject& sortedToc() const
+        const NullObject& sortedToc() const noexcept
         {
             return *this;
         }
@@ -141,7 +141,7 @@ public:
 
         //- Swallow assignment (cf, std::ignore)
         template<class T>
-        inline const NullObject& operator=(const T&) const
+        const NullObject& operator=(const T&) const
         {
             return *this;
         }
diff --git a/src/OpenFOAM/primitives/contiguous/contiguous.H b/src/OpenFOAM/primitives/traits/contiguous.H
similarity index 100%
rename from src/OpenFOAM/primitives/contiguous/contiguous.H
rename to src/OpenFOAM/primitives/traits/contiguous.H
diff --git a/src/OpenFOAM/primitives/one/one.H b/src/OpenFOAM/primitives/traits/one.H
similarity index 99%
rename from src/OpenFOAM/primitives/one/one.H
rename to src/OpenFOAM/primitives/traits/one.H
index 6d90aef37a..966f86ceb1 100644
--- a/src/OpenFOAM/primitives/one/one.H
+++ b/src/OpenFOAM/primitives/traits/one.H
@@ -43,7 +43,7 @@ SeeAlso
 #ifndef Foam_one_H
 #define Foam_one_H
 
-#include "label.H"
+#include "labelFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/one/oneI.H b/src/OpenFOAM/primitives/traits/oneI.H
similarity index 100%
rename from src/OpenFOAM/primitives/one/oneI.H
rename to src/OpenFOAM/primitives/traits/oneI.H
diff --git a/src/OpenFOAM/primitives/zero/zero.C b/src/OpenFOAM/primitives/traits/zero.C
similarity index 100%
rename from src/OpenFOAM/primitives/zero/zero.C
rename to src/OpenFOAM/primitives/traits/zero.C
diff --git a/src/OpenFOAM/primitives/zero/zero.H b/src/OpenFOAM/primitives/traits/zero.H
similarity index 88%
rename from src/OpenFOAM/primitives/zero/zero.H
rename to src/OpenFOAM/primitives/traits/zero.H
index 6c5bd6707e..56681d1fc3 100644
--- a/src/OpenFOAM/primitives/zero/zero.H
+++ b/src/OpenFOAM/primitives/traits/zero.H
@@ -53,6 +53,7 @@ namespace Foam
 
 // Forward Declarations
 class zero;
+class zero_one;
 class Istream;
 class Ostream;
 
@@ -124,7 +125,7 @@ public:
     //- A static zero::null for dereferencing as a dummy element
     static null dummy;
 
-    //- Null constructible
+    //- Default construct
     constexpr null() noexcept {}
 
     //- Construct from Istream consumes no content.
@@ -132,6 +133,24 @@ public:
 };
 
 
+/*---------------------------------------------------------------------------*\
+                          Class zero_one Declaration
+\*---------------------------------------------------------------------------*/
+
+//- Represents 0/1 concept, eg for tagged dispatch
+class zero_one
+{
+public:
+    typedef zero_one value_type;
+
+    //- Default construct
+    constexpr zero_one() noexcept {}
+
+    //- Construct from Istream consumes no content.
+    explicit constexpr zero_one(Istream&) noexcept {}
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Global zero (0)
diff --git a/src/OpenFOAM/primitives/zero/zeroI.H b/src/OpenFOAM/primitives/traits/zeroI.H
similarity index 100%
rename from src/OpenFOAM/primitives/zero/zeroI.H
rename to src/OpenFOAM/primitives/traits/zeroI.H
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index 218a227378..919b1454dc 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -294,7 +294,7 @@ inline void Foam::janafThermo<EquationOfState>::operator+=
         if
         (
             janafThermo<EquationOfState>::debug
-         && notEqual(Tcommon_, jt.Tcommon_)
+         && !equal(Tcommon_, jt.Tcommon_)
         )
         {
             FatalErrorInFunction
@@ -375,7 +375,7 @@ inline Foam::janafThermo<EquationOfState> Foam::operator+
         if
         (
             janafThermo<EquationOfState>::debug
-         && notEqual(jt1.Tcommon_, jt2.Tcommon_)
+         && !equal(jt1.Tcommon_, jt2.Tcommon_)
         )
         {
             FatalErrorInFunction
@@ -456,7 +456,7 @@ inline Foam::janafThermo<EquationOfState> Foam::operator==
     if
     (
         janafThermo<EquationOfState>::debug
-     && notEqual(jt2.Tcommon_, jt1.Tcommon_)
+     && !equal(jt2.Tcommon_, jt1.Tcommon_)
     )
     {
         FatalErrorInFunction

From 1f5a75c3c22059e222fba5a55a374eb8d6fc34c5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 18:15:13 +0100
Subject: [PATCH 018/348] ENH: internal checkTypes method for orientedType

- reuse dimensionSet checking for dimensionedType

STYLE: unfriend some functions for complex
---
 .../dimensionedType/dimensionedType.C         |  35 ++---
 src/OpenFOAM/orientedType/orientedType.C      | 139 ++++++++----------
 src/OpenFOAM/orientedType/orientedType.H      |  31 ++--
 src/OpenFOAM/primitives/complex/complex.H     |  66 +++------
 src/OpenFOAM/primitives/complex/complexI.H    |  86 ++++-------
 5 files changed, 145 insertions(+), 212 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index c8f2c06e1d..7483f51f6d 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -709,22 +709,15 @@ Foam::dimensioned<Type> Foam::cmptDivide
 template<class Type>
 Foam::dimensioned<Type> Foam::max
 (
-    const dimensioned<Type>& dt1,
-    const dimensioned<Type>& dt2
+    const dimensioned<Type>& a,
+    const dimensioned<Type>& b
 )
 {
-    if (dt1.dimensions() != dt2.dimensions())
-    {
-        FatalErrorInFunction
-            << "dimensions of arguments are not equal"
-            << abort(FatalError);
-    }
-
     return dimensioned<Type>
     (
-        "max(" + dt1.name() + ',' + dt2.name() + ')',
-        dt1.dimensions(),
-        max(dt1.value(), dt2.value())
+        "max(" + a.name() + ',' + b.name() + ')',
+        max(a.dimensions(), b.dimensions()),
+        max(a.value(), b.value())
     );
 }
 
@@ -732,16 +725,18 @@ Foam::dimensioned<Type> Foam::max
 template<class Type>
 Foam::dimensioned<Type> Foam::min
 (
-    const dimensioned<Type>& dt1,
-    const dimensioned<Type>& dt2
+    const dimensioned<Type>& a,
+    const dimensioned<Type>& b
 )
 {
-    if (dt1.dimensions() != dt2.dimensions())
-    {
-        FatalErrorInFunction
-            << "dimensions of arguments are not equal"
-            << abort(FatalError);
-    }
+    return dimensioned<Type>
+    (
+        "min(" + a.name() + ',' + b.name() + ')',
+        min(a.dimensions(), b.dimensions()),
+        min(a.value(), b.value())
+    );
+}
+
 
     return dimensioned<Type>
     (
diff --git a/src/OpenFOAM/orientedType/orientedType.C b/src/OpenFOAM/orientedType/orientedType.C
index 066f254d1b..9bc13d40f6 100644
--- a/src/OpenFOAM/orientedType/orientedType.C
+++ b/src/OpenFOAM/orientedType/orientedType.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,19 +48,54 @@ Foam::orientedType::orientedOptionNames
 
 bool Foam::orientedType::checkType
 (
-    const orientedType& ot1,
-    const orientedType& ot2
+    const orientedType& a,
+    const orientedType& b
 ) noexcept
 {
     return
     (
-        (ot1.oriented() == ot2.oriented())
-     || (ot1.oriented() == orientedType::UNKNOWN)
-     || (ot2.oriented() == orientedType::UNKNOWN)
+        (a.oriented() == b.oriented())
+     || (a.oriented() == orientedOption::UNKNOWN)
+     || (b.oriented() == orientedOption::UNKNOWN)
     );
 }
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+static inline bool checkTypes
+(
+    const char* what,
+    const orientedType& a,
+    const orientedType& b
+)
+{
+    // ie, checkType(a,b)
+    const bool ok
+    (
+        (a.oriented() == b.oriented())
+     || (a.oriented() == orientedType::orientedOption::UNKNOWN)
+     || (b.oriented() == orientedType::orientedOption::UNKNOWN)
+    );
+
+    if (!ok)
+    {
+        FatalErrorInFunction
+            << what << " : undefined for "
+            << orientedType::orientedOptionNames[a.oriented()] << " and "
+            << orientedType::orientedOptionNames[b.oriented()] << " types"
+            << abort(FatalError);
+    }
+
+    return ok;
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::orientedType::orientedType(Istream& is)
@@ -108,33 +143,19 @@ void Foam::orientedType::operator+=(const orientedType& ot)
         oriented_ = ot.oriented();
     }
 
-    if (!checkType(*this, ot))
-    {
-        FatalErrorInFunction
-            << "Operator += is undefined for "
-            << orientedOptionNames[oriented_] << " and "
-            << orientedOptionNames[ot.oriented()] << " types"
-            << abort(FatalError);
-    }
+    (void) checkTypes("Operator +=", *this, ot);
 }
 
 
 void Foam::orientedType::operator-=(const orientedType& ot)
 {
     // Set the oriented status if it was unknown
-    if (oriented_ == UNKNOWN)
+    if (oriented_ == orientedOption::UNKNOWN)
     {
         oriented_ = ot.oriented();
     }
 
-    if (!checkType(*this, ot))
-    {
-        FatalErrorInFunction
-            << "Operator -= is undefined for "
-            << orientedOptionNames[oriented_] << " and "
-            << orientedOptionNames[ot.oriented()] << " types"
-            << abort(FatalError);
-    }
+    (void) checkTypes("Operator -=", *this, ot);
 }
 
 
@@ -164,33 +185,17 @@ void Foam::orientedType::operator/=(const scalar s)
 
 // * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
 
-Foam::orientedType Foam::max(const orientedType& ot1, const orientedType& ot2)
+Foam::orientedType Foam::min(const orientedType& a, const orientedType& b)
 {
-    if (!orientedType::checkType(ot1, ot2))
-    {
-        FatalErrorInFunction
-            << "Operator max is undefined for "
-            << orientedType::orientedOptionNames[ot1.oriented()] << " and "
-            << orientedType::orientedOptionNames[ot2.oriented()] << " types"
-            << abort(FatalError);
-    }
-
-    return ot1;
+    (void) checkTypes("Function min", a, b);
+    return a;
 }
 
 
-Foam::orientedType Foam::min(const orientedType& ot1, const orientedType& ot2)
+Foam::orientedType Foam::max(const orientedType& a, const orientedType& b)
 {
-    if (!orientedType::checkType(ot1, ot2))
-    {
-        FatalErrorInFunction
-            << "Operator min is undefined for "
-            << orientedType::orientedOptionNames[ot1.oriented()] << " and "
-            << orientedType::orientedOptionNames[ot2.oriented()] << "types"
-            << abort(FatalError);
-    }
-
-    return ot1;
+    (void) checkTypes("Function max", a, b);
+    return a;
 }
 
 
@@ -220,7 +225,7 @@ Foam::orientedType Foam::cmptAv(const orientedType& ot)
 }
 
 
-Foam::orientedType Foam::pow(const orientedType& ot, const scalar r)
+Foam::orientedType Foam::pow(const orientedType& ot, const scalar p)
 {
     // Undefined???
     // - only defined for integers where:
@@ -236,6 +241,12 @@ Foam::orientedType Foam::sqr(const orientedType& ot)
 }
 
 
+Foam::orientedType Foam::pow2(const orientedType& ot)
+{
+    return orientedType(false);
+}
+
+
 Foam::orientedType Foam::pow3(const orientedType& ot)
 {
     return ot;
@@ -350,14 +361,7 @@ Foam::orientedType Foam::atan2
     const orientedType& ot2
 )
 {
-    if (!orientedType::checkType(ot1, ot2))
-    {
-        FatalErrorInFunction
-            << "Operator atan2 is undefined for "
-            << orientedType::orientedOptionNames[ot1.oriented()] << " and "
-            << orientedType::orientedOptionNames[ot2.oriented()] << "types"
-            << abort(FatalError);
-    }
+    (void) checkTypes("Function atan2", ot1, ot2);
 
     return ot1;
 }
@@ -369,14 +373,7 @@ Foam::orientedType Foam::hypot
     const orientedType& ot2
 )
 {
-    if (!orientedType::checkType(ot1, ot2))
-    {
-        FatalErrorInFunction
-            << "Operator hypot is undefined for "
-            << orientedType::orientedOptionNames[ot1.oriented()] << " and "
-            << orientedType::orientedOptionNames[ot2.oriented()] << "types"
-            << abort(FatalError);
-    }
+    (void) checkTypes("Function hypot", ot1, ot2);
 
     return ot1;
 }
@@ -418,14 +415,7 @@ Foam::orientedType Foam::operator+
     const orientedType& ot2
 )
 {
-    if (!orientedType::checkType(ot1, ot2))
-    {
-        FatalErrorInFunction
-            << "Operator + is undefined for "
-            << orientedType::orientedOptionNames[ot1.oriented()] << " and "
-            << orientedType::orientedOptionNames[ot2.oriented()] << " types"
-            << abort(FatalError);
-    }
+    (void) checkTypes("Operator +", ot1, ot2);
 
     return orientedType(ot1.is_oriented() || ot2.is_oriented());
 }
@@ -443,14 +433,7 @@ Foam::orientedType Foam::operator-
     const orientedType& ot2
 )
 {
-    if (!orientedType::checkType(ot1, ot2))
-    {
-        FatalErrorInFunction
-            << "Operator - is undefined for "
-            << orientedType::orientedOptionNames[ot1.oriented()] << " and "
-            << orientedType::orientedOptionNames[ot2.oriented()] << " types"
-            << abort(FatalError);
-    }
+    (void) checkTypes("Operator -", ot1, ot2);
 
     return orientedType(ot1.is_oriented() || ot2.is_oriented());
 }
diff --git a/src/OpenFOAM/orientedType/orientedType.H b/src/OpenFOAM/orientedType/orientedType.H
index e89d30bbce..764c501aac 100644
--- a/src/OpenFOAM/orientedType/orientedType.H
+++ b/src/OpenFOAM/orientedType/orientedType.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,11 +63,14 @@ public:
         //- Enumeration defining oriented flags
         enum orientedOption : unsigned char
         {
-            UNKNOWN = 0,
-            ORIENTED = 1,
-            UNORIENTED = 2
+            UNKNOWN = 0,        //!< Unknown/undefined orientation
+            ORIENTED = 1,       //!< Is oriented
+            UNORIENTED = 2      //!< Is unoriented
         };
 
+
+    // Static Data
+
         //- Named enumerations for oriented flags
         static const Enum<orientedOption> orientedOptionNames;
 
@@ -117,11 +120,11 @@ public:
 
     // Member Functions
 
-        //- Return true if can operate on this pair of oriented types
+        //- True if can operate on this combination of oriented types
         static bool checkType
         (
-            const orientedType& ot1,
-            const orientedType& ot2
+            const orientedType& a,
+            const orientedType& b
         ) noexcept;
 
         //- Return the oriented flag
@@ -167,17 +170,18 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+orientedType min(const orientedType& a, const orientedType& b);
+orientedType max(const orientedType& a, const orientedType& b);
 
-orientedType max(const orientedType& ot1, const orientedType& ot2);
-orientedType min(const orientedType& ot1, const orientedType& ot2);
 orientedType cmptMultiply(const orientedType& ot1, const orientedType& ot2);
 orientedType cmptDivide(const orientedType& ot1, const orientedType& ot);
 orientedType cmptAv(const orientedType& ot);
 
-
-orientedType pow(const orientedType& ot, const scalar r);
+orientedType pow(const orientedType& ot, const scalar p);
 orientedType sqr(const orientedType& ot);
+orientedType pow2(const orientedType& ot);
 orientedType pow3(const orientedType& ot);
 orientedType pow4(const orientedType& ot);
 orientedType pow5(const orientedType& ot);
@@ -204,6 +208,9 @@ orientedType atan2(const orientedType& ot1, const orientedType& ot2);
 orientedType hypot(const orientedType& ot1, const orientedType& ot2);
 orientedType transform(const orientedType& ot);
 
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
 orientedType operator-(const orientedType& ot);
 orientedType operator*(const scalar s, const orientedType& ot);
 orientedType operator/(const orientedType& ot, const scalar s);
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index 8219024e44..459a5710bf 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,13 +54,6 @@ namespace Foam
 // Forward Declarations
 class complex;
 
-inline scalar magSqr(const complex&);
-inline scalar mag(const complex&);
-inline complex sqr(const complex&);
-inline const complex& min(const complex&, const complex&);
-inline const complex& max(const complex&, const complex&);
-inline complex limit(const complex&, const complex&);
-inline const complex& sum(const complex&);
 inline complex operator-(const complex&);
 inline complex operator+(const complex&, const complex&);
 inline complex operator+(const complex&, const scalar);
@@ -93,16 +86,16 @@ public:
     // Generated Methods
 
         //- Copy construct
-        complex(const complex&) = default;
+        complex(const complex&) noexcept = default;
 
         //- Copy assignment
-        complex& operator=(const complex&) = default;
+        complex& operator=(const complex&) noexcept = default;
 
         //- Move construct
-        complex(complex&&) = default;
+        complex(complex&&) noexcept = default;
 
         //- Move assignment
-        complex& operator=(complex&&) = default;
+        complex& operator=(complex&&) noexcept = default;
 
 
     // Constructors
@@ -134,47 +127,48 @@ public:
     // STL getter/setter
 
         //- Real part of complex number - STL naming
-        constexpr scalar real() const
-        {
-            return re;
-        }
+        constexpr scalar real() const noexcept { return re; }
 
         //- Imaginary part of complex number - STL naming
-        constexpr scalar imag() const
-        {
-            return im;
-        }
+        constexpr scalar imag() const noexcept { return im; }
 
         //- Set real part of complex number - STL naming
-        inline void real(scalar val);
+        void real(scalar val) noexcept { re = val; }
 
         //- Set imaginary part of complex number - STL naming
-        inline void imag(scalar val);
+        void imag(scalar val) noexcept { im = val; }
 
 
     // Access
 
         //- Real part of complex number
-        inline scalar Re() const;
+        scalar Re() const noexcept { return re; }
 
         //- Imaginary part of complex number
-        inline scalar Im() const;
+        scalar Im() const noexcept { return im; }
 
 
     // Edit
 
         //- Real part of complex number
-        inline scalar& Re();
+        scalar& Re() noexcept { return re; }
 
         //- Imaginary part of complex number
-        inline scalar& Im();
+        scalar& Im() noexcept { return im; }
 
 
-    // Operations
+    // Methods
 
         //- Complex conjugate
         inline complex conjugate() const;
 
+        //- The magnitude (L2-norm) of complex.
+        //- Called magnitude() instead mag(), which looks too much like imag()
+        inline scalar magnitude() const;
+
+        //- The L2-norm squared of complex
+        inline scalar magSqr() const;
+
 
     // Member Operators
 
@@ -207,24 +201,6 @@ public:
         inline bool operator!=(const complex& c) const;
 
 
-    // Friend Functions
-
-        friend scalar magSqr(const complex& c);
-        friend scalar mag(const complex& c);
-        friend complex sqr(const complex& c);
-
-        //- sgn() https://en.wikipedia.org/wiki/Sign_function#Complex_signum
-        friend complex sign(const complex& c);
-
-        //- csgn() https://en.wikipedia.org/wiki/Sign_function#Complex_signum
-        friend scalar csign(const complex& c);
-
-        friend const complex& min(const complex& c1, const complex& c2);
-        friend const complex& max(const complex& c1, const complex& c2);
-        friend complex limit(const complex& c1, const complex& c2);
-        friend const complex& sum(const complex& c);
-
-
     // Friend Operators
 
         friend complex operator-(const complex& c);
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index 428849021d..d960d5835e 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,48 +72,24 @@ inline Foam::complex::complex(const std::complex<double>& c)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline void Foam::complex::real(scalar val)
-{
-    re = val;
-}
-
-
-inline void Foam::complex::imag(scalar val)
-{
-    im = val;
-}
-
-
-inline Foam::scalar Foam::complex::Re() const
-{
-    return re;
-}
-
-
-inline Foam::scalar Foam::complex::Im() const
-{
-    return im;
-}
-
-
-inline Foam::scalar& Foam::complex::Re()
-{
-    return re;
-}
-
-
-inline Foam::scalar& Foam::complex::Im()
-{
-    return im;
-}
-
-
 inline Foam::complex Foam::complex::conjugate() const
 {
     return complex(re, -im);
 }
 
 
+inline Foam::scalar Foam::complex::magnitude() const
+{
+    return std::hypot(re, im);
+}
+
+
+inline Foam::scalar Foam::complex::magSqr() const
+{
+    return (re*re + im*im);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 inline void Foam::complex::operator=(const Foam::zero)
@@ -202,20 +178,20 @@ inline Foam::complex Foam::operator~(const complex& c)
 }
 
 
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-inline scalar magSqr(const complex& c)
+inline scalar mag(const complex& c)
 {
-    return (c.re*c.re + c.im*c.im);
+    return c.magnitude();
 }
 
 
-inline scalar mag(const complex& c)
+inline scalar magSqr(const complex& c)
 {
-    return std::hypot(c.re, c.im);
+    return c.magSqr();
 }
 
 
@@ -225,6 +201,7 @@ inline complex sqr(const complex& c)
 }
 
 
+//- sgn() https://en.wikipedia.org/wiki/Sign_function#Complex_signum
 inline complex sign(const complex& c)
 {
     const scalar s(mag(c));
@@ -232,37 +209,32 @@ inline complex sign(const complex& c)
 }
 
 
+//- csgn() https://en.wikipedia.org/wiki/Sign_function#Complex_signum
 inline scalar csign(const complex& c)
 {
-    return equal(c.Re(), 0) ? sign(c.Im()) : sign(c.Re());
+    return equal(c.real(), 0) ? sign(c.imag()) : sign(c.real());
 }
 
 
 inline const complex& min(const complex& c1, const complex& c2)
 {
-    if (magSqr(c1) < magSqr(c2))
-    {
-        return c1;
-    }
-
-    return c2;
+    return (c1.magSqr() < c2.magSqr()) ? c1 : c2;
 }
 
 
 inline const complex& max(const complex& c1, const complex& c2)
 {
-    if (magSqr(c1) < magSqr(c2))
-    {
-        return c2;
-    }
-
-    return c1;
+    return (c1.magSqr() < c2.magSqr()) ? c2 : c1;
 }
 
 
 inline complex limit(const complex& c1, const complex& c2)
 {
-    return complex(limit(c1.re, c2.re), limit(c1.im, c2.im));
+    return complex
+    (
+        limit(c1.real(), c2.real()),
+        limit(c1.imag(), c2.imag())
+    );
 }
 
 
@@ -357,7 +329,7 @@ inline complex operator*(const scalar s, const complex& c)
 
 inline complex operator/(const complex& c1, const complex& c2)
 {
-    const scalar sqrC2 = magSqr(c2);
+    const scalar sqrC2 = c2.magSqr();
 
     return complex
     (

From 8a70c898ae4973f380be3101a3809326cf4febcd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 12:44:16 +0100
Subject: [PATCH 019/348] STYLE: make IOobject time() noexcept. Use explicit
 REGISTER/NO_REGISTER

---
 src/OpenFOAM/db/IOobject/IOobject.C           | 62 +++++++------------
 src/OpenFOAM/db/IOobject/IOobject.H           | 10 ++-
 src/OpenFOAM/db/Time/Time.C                   | 12 ++--
 src/OpenFOAM/db/Time/TimeIO.C                 |  2 +-
 .../db/dynamicLibrary/codedBase/codedBase.C   |  3 +-
 .../functionObjectList/functionObjectList.C   | 10 ++-
 .../db/objectRegistry/objectRegistry.C        | 13 ++--
 .../exprResult/exprResultGlobals.C            |  2 +-
 .../GeometricField/GeometricField.C           |  2 +-
 .../fields/ReadFields/ReadFieldsTemplates.C   | 14 +++--
 .../uniformInterpolationTable.C               |  3 +-
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     | 20 +++---
 .../preservePatchTypes/preservePatchTypes.C   |  2 +-
 .../ObukhovLength/ObukhovLength.C             |  4 +-
 .../extrudePatchMesh/extrudePatchMesh.C       |  2 +-
 src/finiteVolume/fvMesh/fvMeshGeometry.C      | 14 ++---
 .../field/derivedFields/derivedFields.C       |  4 +-
 .../movement/lumpedPointIOMovement.C          |  2 +-
 .../objectiveManager/objectiveManager.C       |  2 +-
 .../optimisationManager/optimisationManager.C |  2 +-
 .../adjointSolverManager.C                    |  2 +-
 .../regionModel/regionModel/regionModel.C     |  2 +-
 src/surfMesh/polySurface/polySurface.C        |  4 +-
 .../polySurface/polySurfaceTemplates.C        |  4 +-
 src/surfMesh/surfMesh/surfMeshTemplates.C     |  4 +-
 25 files changed, 101 insertions(+), 100 deletions(-)

diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index e3e2913929..191fa68e6c 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -285,7 +285,7 @@ Foam::word Foam::IOobject::group(const word& name)
 
     if (i == std::string::npos || i == 0)
     {
-        return word::null;
+        return word();
     }
 
     return name.substr(i+1);
@@ -307,6 +307,16 @@ Foam::word Foam::IOobject::member(const word& name)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::IOobject::IOobject(const objectRegistry& registry, IOobjectOption ioOpt)
+:
+    IOobjectOption(ioOpt),
+    objState_(objectState::GOOD),
+    sizeofLabel_(static_cast<unsigned char>(sizeof(label))),
+    sizeofScalar_(static_cast<unsigned char>(sizeof(scalar))),
+    db_(registry)
+{}
+
+
 Foam::IOobject::IOobject
 (
     const word& name,
@@ -315,19 +325,11 @@ Foam::IOobject::IOobject
     IOobjectOption ioOpt
 )
 :
-    IOobjectOption(ioOpt),
-    objState_(objectState::GOOD),
-    sizeofLabel_(static_cast<unsigned char>(sizeof(label))),
-    sizeofScalar_(static_cast<unsigned char>(sizeof(scalar))),
-
-    name_(name),
-    headerClassName_(),
-    note_(),
-    instance_(instance),
-    local_(),
-
-    db_(registry)
+    IOobject(registry, ioOpt)
 {
+    name_ = name;
+    instance_ = instance;
+
     if (objectRegistry::debug)
     {
         InfoInFunction
@@ -345,19 +347,12 @@ Foam::IOobject::IOobject
     IOobjectOption ioOpt
 )
 :
-    IOobjectOption(ioOpt),
-    objState_(objectState::GOOD),
-    sizeofLabel_(static_cast<unsigned char>(sizeof(label))),
-    sizeofScalar_(static_cast<unsigned char>(sizeof(scalar))),
-
-    name_(name),
-    headerClassName_(),
-    note_(),
-    instance_(instance),
-    local_(local),
-
-    db_(registry)
+    IOobject(registry, ioOpt)
 {
+    name_ = name;
+    instance_ = instance;
+    local_ = local;
+
     if (objectRegistry::debug)
     {
         InfoInFunction
@@ -373,18 +368,7 @@ Foam::IOobject::IOobject
     IOobjectOption ioOpt
 )
 :
-    IOobjectOption(ioOpt),
-    objState_(objectState::GOOD),
-    sizeofLabel_(static_cast<unsigned char>(sizeof(label))),
-    sizeofScalar_(static_cast<unsigned char>(sizeof(scalar))),
-
-    name_(),
-    headerClassName_(),
-    note_(),
-    instance_(),
-    local_(),
-
-    db_(registry)
+    IOobject(registry, ioOpt)
 {
     if (!fileNameComponents(path, instance_, local_, name_))
     {
@@ -451,7 +435,7 @@ const Foam::objectRegistry& Foam::IOobject::db() const noexcept
 }
 
 
-const Foam::Time& Foam::IOobject::time() const
+const Foam::Time& Foam::IOobject::time() const noexcept
 {
     return db_.time();
 }
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 7321543725..e8eb9a94ec 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -186,6 +186,12 @@ private:
         const objectRegistry& db_;
 
 
+    // Private Member Functions
+
+        //- Construct from registry, io options. Without name, instance, local
+        IOobject(const objectRegistry& registry, IOobjectOption ioOpt);
+
+
 protected:
 
     // Protected Member Functions
@@ -450,7 +456,7 @@ public:
         const objectRegistry& db() const noexcept;
 
         //- Return Time associated with the objectRegistry
-        const Time& time() const;
+        const Time& time() const noexcept;
 
         //- Return the object name
         inline const word& name() const noexcept;
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 42143444dc..878413360b 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -279,7 +279,7 @@ void Foam::Time::setControls()
             *this,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -440,7 +440,7 @@ Foam::Time::Time
             *this,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
 
@@ -506,7 +506,7 @@ Foam::Time::Time
             *this,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
 
@@ -589,7 +589,7 @@ Foam::Time::Time
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dict
     ),
@@ -666,7 +666,7 @@ Foam::Time::Time
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
 
@@ -1006,7 +1006,7 @@ void Foam::Time::setTime(const instant& inst, const label newIndex)
             *this,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index a111245528..d41f0485f5 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -526,7 +526,7 @@ bool Foam::Time::writeTimeDict() const
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index fe5a286f01..bdf64d0597 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -115,7 +115,8 @@ Foam::codedBase::codeDict
                 obr.time().system(),
                 obr,
                 IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             )
         );
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index e68f82d985..fb44d80e37 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -113,7 +113,8 @@ void Foam::functionObjectList::createPropertiesDict() const
                 "uniform"/word("functionObjects"),
                 time_,
                 IOobject::READ_IF_PRESENT,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             )
         )
     );
@@ -132,7 +133,8 @@ void Foam::functionObjectList::createOutputRegistry() const
                 time_.timeName(),
                 time_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             )
         )
     );
@@ -453,7 +455,9 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
                 (
                     args["dict"],
                     runTime,
-                    IOobject::MUST_READ_IF_MODIFIED
+                    IOobject::MUST_READ_IF_MODIFIED,
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 )
             )
         );
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 4aeab33f6f..044d6c92c7 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -88,9 +88,9 @@ Foam::objectRegistry::objectRegistry(const Time& t, const label nObjects)
             word::validate(t.caseName()),
             t.path(),
             t,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobjectOption::NO_READ,
+            IOobjectOption::AUTO_WRITE,
+            IOobjectOption::NO_REGISTER
         ),
         true    // to flag that this is the top-level regIOobject
     ),
@@ -207,8 +207,9 @@ const Foam::objectRegistry& Foam::objectRegistry::subRegistry
                 name,
                 time().constant(),
                 *this,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobjectOption::NO_READ,
+                IOobjectOption::NO_WRITE,
+                IOobjectOption::REGISTER
             )
         );
         subObr->store();
diff --git a/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C b/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
index 4e6560f13b..9e3087599b 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
@@ -59,7 +59,7 @@ Foam::expressions::exprResultGlobals::exprResultGlobals
             obr.time(),
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE,
-            true  // register
+            IOobject::REGISTER
         )
     ),
     variables_(),
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 718f1af38d..14ab696745 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -85,7 +85,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::readFields()
             this->db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         typeName
     );
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C b/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C
index 18697919d1..6dce0d360f 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C
+++ b/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C
@@ -236,7 +236,8 @@ void Foam::ReadFields
                     timeName,
                     fieldsCache,
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 )
             );
             timeCachePtr->store();
@@ -261,7 +262,7 @@ void Foam::ReadFields
                     mesh.thisDb(),
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false  // do not register
+                    IOobject::NO_REGISTER
                 ),
                 mesh
             );
@@ -275,7 +276,8 @@ void Foam::ReadFields
                     timeName,
                     timeCache,
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 loadedFld
             );
@@ -347,7 +349,8 @@ void Foam::readFields
                 io.local(),
                 io.db(),
                 IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh
         );
@@ -402,7 +405,8 @@ void Foam::readUniformFields
                 io.local(),
                 io.db(),
                 IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             )
         );
         fieldPtr->store();
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index bb2fad90a6..24cae2e413 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -94,7 +94,8 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
         db,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false // if used in BCs, could be used by multiple patches
+        IOobject::NO_REGISTER
+        // No register: could be used by multiple patches if used in BCs
     ),
     List<scalar>(2, Zero),
     x0_(dict.get<scalar>("x0")),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index fc6df40fc2..914d11d736 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -114,7 +114,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -128,7 +128,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -142,7 +142,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -156,7 +156,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -171,7 +171,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this
         );
@@ -256,7 +256,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                     *this,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 )
             );
 
@@ -291,7 +291,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this
         );
@@ -328,7 +328,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this
         );
@@ -369,7 +369,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this
         );
@@ -426,7 +426,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C b/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
index 67db89472c..7cd2b3a40a 100644
--- a/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
+++ b/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
@@ -56,7 +56,7 @@ void Foam::preservePatchTypes
             obr,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (patchEntriesHeader.typeHeaderOk<polyBoundaryMesh>(true))
diff --git a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
index 247e787620..4ce789050a 100644
--- a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
+++ b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
@@ -72,7 +72,7 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             mesh_,
             dimLength,
@@ -90,7 +90,7 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             mesh_,
             dimVelocity,
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index 58b5657bd1..6ce607ba98 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -61,7 +61,7 @@ Foam::extrudePatchMesh::extrudePatchMesh
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            true
+            IOobject::REGISTER
         ),
         Zero,
         false
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 853ce036e3..132d09f651 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -61,7 +61,7 @@ void Foam::fvMesh::makeSf() const
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         *this,
         dimArea,
@@ -98,7 +98,7 @@ void Foam::fvMesh::makeMagSf() const
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mag(Sf()) + dimensionedScalar("vs", dimArea, VSMALL)
     );
@@ -130,7 +130,7 @@ void Foam::fvMesh::makeC() const
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         *this,
         dimLength,
@@ -165,7 +165,7 @@ void Foam::fvMesh::makeCf() const
             *this,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         *this,
         dimLength,
@@ -192,7 +192,7 @@ const Foam::volScalarField::Internal& Foam::fvMesh::V() const
                 *this,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this,
             dimVolume,
@@ -245,7 +245,7 @@ const Foam::volScalarField::Internal& Foam::fvMesh::V00() const
                 *this,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             V0()
         );
@@ -364,7 +364,7 @@ Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::delta() const
                 *this,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this,
             dimLength
diff --git a/src/functionObjects/field/derivedFields/derivedFields.C b/src/functionObjects/field/derivedFields/derivedFields.C
index 9092b16e13..405442e8d8 100644
--- a/src/functionObjects/field/derivedFields/derivedFields.C
+++ b/src/functionObjects/field/derivedFields/derivedFields.C
@@ -88,7 +88,7 @@ static bool calc_rhoU
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             mesh,
             (dimDensity * dimVelocity)
@@ -142,7 +142,7 @@ static bool calc_pTotal
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             mesh,
             dimPressure
diff --git a/src/lumpedPointMotion/movement/lumpedPointIOMovement.C b/src/lumpedPointMotion/movement/lumpedPointIOMovement.C
index 4ab2ec39c6..9d2163cb56 100644
--- a/src/lumpedPointMotion/movement/lumpedPointIOMovement.C
+++ b/src/lumpedPointMotion/movement/lumpedPointIOMovement.C
@@ -64,7 +64,7 @@ Foam::lumpedPointIOMovement::New
             obr,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            true // register object
+            IOobject::REGISTER
         ),
         ownerId  // tag this patch as owner too
     );
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
index c84fa257b0..75354d66c0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
@@ -59,7 +59,7 @@ objectiveManager::objectiveManager
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            true  //register object
+            IOobject::REGISTER
         )
     ),
     mesh_(mesh),
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C
index bfcf84083e..a4b111fffd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C
@@ -51,7 +51,7 @@ Foam::optimisationManager::optimisationManager(fvMesh& mesh)
             mesh,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            true
+            IOobject::REGISTER
         )
     ),
     mesh_(mesh),
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolverManager/adjointSolverManager.C b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolverManager/adjointSolverManager.C
index 0323238094..cbe65c281a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolverManager/adjointSolverManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolverManager/adjointSolverManager.C
@@ -56,7 +56,7 @@ Foam::adjointSolverManager::adjointSolverManager
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            true //register object
+            IOobject::REGISTER
         )
     ),
     mesh_(mesh),
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index be3b36b03c..d0d6f58ab7 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -433,7 +433,7 @@ Foam::regionModels::regionModel::regionModel
             mesh.time(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            true
+            IOobject::REGISTER
         ),
         dict
     ),
diff --git a/src/surfMesh/polySurface/polySurface.C b/src/surfMesh/polySurface/polySurface.C
index 2adf49d0b3..1b12eb90a2 100644
--- a/src/surfMesh/polySurface/polySurface.C
+++ b/src/surfMesh/polySurface/polySurface.C
@@ -93,7 +93,7 @@ Foam::polySurface::polySurface(const IOobject& io, bool doCheckIn)
             io.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            true
+            IOobject::REGISTER
         )
     ),
     MeshReference(faceList(), pointField()),
@@ -124,7 +124,7 @@ Foam::polySurface::polySurface
             obr,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            true
+            IOobject::REGISTER
         ),
         doCheckIn
     )
diff --git a/src/surfMesh/polySurface/polySurfaceTemplates.C b/src/surfMesh/polySurface/polySurfaceTemplates.C
index ba57c6660f..e78f06f5e6 100644
--- a/src/surfMesh/polySurface/polySurfaceTemplates.C
+++ b/src/surfMesh/polySurface/polySurfaceTemplates.C
@@ -119,7 +119,7 @@ void Foam::polySurface::storeField
                 fieldDb,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             *this,
             dims,
@@ -160,7 +160,7 @@ void Foam::polySurface::storeField
                 fieldDb,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             *this,
             dims,
diff --git a/src/surfMesh/surfMesh/surfMeshTemplates.C b/src/surfMesh/surfMesh/surfMeshTemplates.C
index e777844f6d..3f746d17d5 100644
--- a/src/surfMesh/surfMesh/surfMeshTemplates.C
+++ b/src/surfMesh/surfMesh/surfMeshTemplates.C
@@ -58,7 +58,7 @@ void Foam::surfMesh::storeField
                 fieldDb,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             *this,
             dims,
@@ -98,7 +98,7 @@ void Foam::surfMesh::storeField
                 fieldDb,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                true
+                IOobject::REGISTER
             ),
             *this,
             dims,

From 3888bfa17fc8e08e4081dce975dc0bb57f749662 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 12:44:16 +0100
Subject: [PATCH 020/348] ENH: UList iterators at offset from begin

- simplifies addressing within sub-ranges.
  Clamps the access range directly
---
 applications/test/List/Test-List.C            | 24 +++++++++++++--
 src/OpenFOAM/containers/Lists/List/UList.C    | 30 ++++++++++++++-----
 src/OpenFOAM/containers/Lists/List/UList.H    | 14 ++++++++-
 src/OpenFOAM/containers/Lists/List/UListI.H   | 25 +++++++++++++++-
 .../containers/Lists/List/stdVectorIO.C       |  4 +--
 5 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index 63ef615003..e676a859a4 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -365,6 +365,12 @@ int main(int argc, char *argv[])
             Info<<"assigned identity in range:" << subset
                 << "=> " << flatOutput(longLabelList) << nl;
 
+            // Assign values in iterator range
+            std::iota(longLabelList.begin(15), longLabelList.begin(50), 115);
+
+            Info<<"assigned values in iterator range "
+                << "=> " << flatOutput(longLabelList) << nl;
+
             labelList someList(identity(24));
 
             longLabelList.slice(subset) =
@@ -410,8 +416,20 @@ int main(int argc, char *argv[])
         longLabelList.slice({5,-5}) = 42;
         longLabelList.slice({21,100}) = 42;
 
-        //Good: does not compile
-        longLabelList.slice(labelRange(20,50)) = constLabelList;
+        #if 0
+        // Compiles, but is runtime abort!
+        const bool oldThrowingError = FatalError.throwing(true);
+        try
+        {
+            longLabelList.slice(labelRange(20,50)) = constLabelList;
+        }
+        catch (const Foam::error& err)
+        {
+            Info<< "Caught FatalError "
+                << err << nl << endl;
+        }
+        FatalError.throwing(oldThrowingError);
+        #endif
 
         //Good: does not compile
         // longLabelList[labelRange(20,50)] = fixedLabelList;
diff --git a/src/OpenFOAM/containers/Lists/List/UList.C b/src/OpenFOAM/containers/Lists/List/UList.C
index b4b83b902c..4a16d82fd3 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.C
+++ b/src/OpenFOAM/containers/Lists/List/UList.C
@@ -261,24 +261,28 @@ Foam::label Foam::UList<T>::rfind(const T& val, label pos) const
 template<class T>
 bool Foam::UList<T>::operator==(const UList<T>& list) const
 {
+    /// OR:
+    /// return
+    /// (
+    ///     (this->size_ == list.size_)
+    //   && std::equal(cbegin(), cend(), list.cbegin())
+    /// );
+
     const label len = this->size_;
     if (len != list.size_)
     {
         return false;
     }
 
-    bool equal = true;
-
     List_CONST_ACCESS(T, (*this), lhs);
     List_CONST_ACCESS(T, (list), rhs);
 
     for (label i = 0; i < len; ++i)
     {
-        equal = (lhs[i] == rhs[i]);
-        if (!equal) break;
+        if (!(lhs[i] == rhs[i])) return false;
     }
 
-    return equal;
+    return true;
 }
 
 
@@ -292,11 +296,21 @@ bool Foam::UList<T>::operator!=(const UList<T>& list) const
 template<class T>
 bool Foam::UList<T>::operator<(const UList<T>& list) const
 {
+    /// OR:
+    /// return std::lexicographical_compare
+    /// (
+    ///     cbegin(), cend(),
+    ///     list.cbegin(), list.cend()
+    /// );
+
+    const const_iterator last1 = cend();
+    const const_iterator last2 = list.cend();
+
     for
     (
-        const_iterator lhs = begin(), rhs = list.begin();
-        lhs < end() && rhs < list.end();
-        ++lhs, ++rhs
+        const_iterator lhs = cbegin(), rhs = list.cbegin();
+        (lhs != last1) && (rhs != last2);
+        ++lhs, (void) ++rhs
     )
     {
         if (*lhs < *rhs)
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index eecbb82904..ac241aef9a 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -407,6 +407,10 @@ public:
         //- Return an iterator to end traversing the UList
         inline iterator end() noexcept;
 
+        //- Return iterator at offset i from begin,
+        //- clamped to [0,size] range
+        inline iterator begin(const label i) noexcept;
+
 
     // Random access iterator (const)
 
@@ -422,6 +426,14 @@ public:
         //- Return const_iterator to end traversing the constant UList
         inline const_iterator end() const noexcept;
 
+        //- Return const_iterator at offset i from begin,
+        //- clamped to [0,size] range
+        inline const_iterator cbegin(const label i) const noexcept;
+
+        //- Return const_iterator at offset i from begin,
+        //- clamped to [0,size] range
+        inline const_iterator begin(const label i) const noexcept;
+
 
     // Reverse iterators (non-const)
 
diff --git a/src/OpenFOAM/containers/Lists/List/UListI.H b/src/OpenFOAM/containers/Lists/List/UListI.H
index 053109c50e..6d9519fb8b 100644
--- a/src/OpenFOAM/containers/Lists/List/UListI.H
+++ b/src/OpenFOAM/containers/Lists/List/UListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -345,6 +345,29 @@ Foam::UList<T>::cbegin() const noexcept
     return v_;
 }
 
+
+template<class T>
+inline typename Foam::UList<T>::iterator
+Foam::UList<T>::begin(const label i) noexcept
+{
+    return (v_ + (i < 0 ? 0 : size_ < i ? size_ : i));
+}
+
+template<class T>
+inline typename Foam::UList<T>::const_iterator
+Foam::UList<T>::begin(const label i) const noexcept
+{
+    return (v_ + (i < 0 ? 0 : size_ < i ? size_ : i));
+}
+
+template<class T>
+inline typename Foam::UList<T>::const_iterator
+Foam::UList<T>::cbegin(const label i) const noexcept
+{
+    return (v_ + (i < 0 ? 0 : size_ < i ? size_ : i));
+}
+
+
 template<class T>
 inline typename Foam::UList<T>::iterator
 Foam::UList<T>::end() noexcept
diff --git a/src/OpenFOAM/containers/Lists/List/stdVectorIO.C b/src/OpenFOAM/containers/Lists/List/stdVectorIO.C
index ba8db32641..a11964a66a 100644
--- a/src/OpenFOAM/containers/Lists/List/stdVectorIO.C
+++ b/src/OpenFOAM/containers/Lists/List/stdVectorIO.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const std::vector<T>& list)
     {
         os << *iter;
 
-        for (++iter; iter != last; ++iter)
+        while (++iter != last)
         {
             os << token::SPACE << *iter;
         }

From ba153df8dbd251b1a6a4783cd69394b1bf5f6b41 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 20:45:53 +0100
Subject: [PATCH 021/348] ENH: improved handling for clamping

- proper component-wise clamping for MinMax clamp().

- construct clampOp from components

- propagate clamp() method from GeometricField to FieldField and Field

- clamp_min() and clamp_max() for one-sided clamping,
  as explicit alternative to min/max free functions which can
  be less intuitive and often involve additional field copies.

- top-level checks to skip applying invalid min/max ranges
  and bypass the internal checks of MinMax::clamp() etc.
---
 .../test/dimensionSet/Test-dimensionSet.C     |  3 +-
 applications/test/minMax1/Test-minMax1.C      | 41 ++++++++-
 applications/test/minMax2/Test-minMax2.C      | 33 ++++++-
 .../PDR/pdrFields/PDRarraysCalc.C             |  2 +-
 .../pdrFields/obstacles/PDRobstacleTypes.C    |  5 +-
 src/OpenFOAM/dimensionSet/dimensionSet.C      | 22 ++---
 src/OpenFOAM/dimensionSet/dimensionSet.H      |  8 +-
 .../DimensionedField/DimensionedField.H       |  2 +
 .../FieldFields/FieldField/FieldField.C       | 61 ++++++++++++-
 .../FieldFields/FieldField/FieldField.H       | 16 +++-
 .../FieldField/FieldFieldFunctions.C          |  2 +-
 .../FieldField/FieldFieldFunctions.H          |  4 +-
 src/OpenFOAM/fields/Fields/Field/Field.C      | 46 +++++++++-
 src/OpenFOAM/fields/Fields/Field/Field.H      | 16 +++-
 .../fields/Fields/Field/FieldFunctions.C      | 64 ++++++++++++-
 .../fields/Fields/Field/FieldFunctions.H      |  7 +-
 .../GeometricField/GeometricField.C           | 74 ++++++++++-----
 .../GeometricField/GeometricField.H           | 89 ++++++++++++++-----
 src/OpenFOAM/primitives/Scalar/Scalar.H       |  7 ++
 src/OpenFOAM/primitives/ints/label/label.H    |  9 ++
 .../primitives/ranges/MinMax/MinMax.H         | 46 +++++-----
 .../primitives/ranges/MinMax/MinMaxI.H        | 43 +++------
 .../primitives/ranges/MinMax/MinMaxOps.H      | 61 +++++++++----
 .../movement/lumpedPointMovement.C            |  2 +-
 .../searchableDisk/searchableDisk.C           |  2 +-
 25 files changed, 501 insertions(+), 164 deletions(-)

diff --git a/applications/test/dimensionSet/Test-dimensionSet.C b/applications/test/dimensionSet/Test-dimensionSet.C
index 52374f0e40..638ffe84f2 100644
--- a/applications/test/dimensionSet/Test-dimensionSet.C
+++ b/applications/test/dimensionSet/Test-dimensionSet.C
@@ -110,8 +110,7 @@ unsigned checkDimensions
 
         try
         {
-            // min(a, b);
-            clip(a, b);
+            min(a, b);
             dimsOk = true;
         }
         catch (const Foam::error& err)
diff --git a/applications/test/minMax1/Test-minMax1.C b/applications/test/minMax1/Test-minMax1.C
index f5b762a7fc..86ff65d720 100644
--- a/applications/test/minMax1/Test-minMax1.C
+++ b/applications/test/minMax1/Test-minMax1.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,6 +83,9 @@ int main(int argc, char *argv[])
     Info<<"Construct zero : ";
     printInfo(MinMax<scalar>(Zero)) << nl;
 
+    Info<<"Construct zero_one : ";
+    printInfo(MinMax<scalar>(zero_one{})) << nl;
+
     Info<<"Construct range : ";
     printInfo(MinMax<scalar>(1, 20)) << nl;
 
@@ -92,6 +95,26 @@ int main(int argc, char *argv[])
     Info<<"A 0-1 vector range : ";
     printInfo(MinMax<vector>::zero_one()) << nl;
 
+    {
+        vector a(0, 1, 20);
+        vector b(2, 1, 0);
+        vector c(4, 10, 12);
+
+        Info<< "vectors:"
+            << " a = " << a
+            << " b = " << b
+            << " c = " << c << nl;
+
+        Info<< "min max    = " << min(max(a, b), c) << nl;
+        Info<< "range clamp= " << MinMax<vector>(b, c).clamp(a) << nl;
+        Info<< "clamp      = " << clamp(a, b, c) << nl;
+
+        Info<< "clamp 0/1  = " << clamp(a, vector::zero, vector::one) << nl;
+    }
+
+    // Scalar promotion
+    Info<< "clamp (scalar) = " << clamp(15.0, -1, 1) << nl;
+
 
     {
         scalarMinMax range1(10, 20);
@@ -180,6 +203,9 @@ int main(int argc, char *argv[])
 
     {
         MinMax<scalar> limiter(10, 200);
+        clampOp<scalar> clipper(limiter);
+        // clampOp<scalar> clipper(zero_one{});
+        // clampOp<scalar> clipper(10, 200);
 
         Info<< nl
             << "Test clipping limiter: " << limiter << nl
@@ -196,7 +222,10 @@ int main(int argc, char *argv[])
         Info<< nl << "test clip() with limiter: " << limiter << nl;
         for (const scalar& val : values1)
         {
-            Info<< "clipped : " << val << " = " << clip(val, limiter) << nl;
+            Info<< "clipped : " << val << " = "
+                << clip(val, limiter)
+                << " or " << clip(val, limiter)
+                << " or " << clipper(val) << nl;
         }
 
         Info<< nl << "test clip(Field) with limiter: " << limiter << nl;
@@ -208,9 +237,15 @@ int main(int argc, char *argv[])
 
         Info<< "before " << flatOutput(values2) << nl;
 
+        // Too much clutter
+        // for (scalar& val : values2)
+        // {
+        //     clampEqOp<scalar>{limiter}(val);
+        // }
+
         for (scalar& val : values2)
         {
-            clipEqOp<scalar>()(val, limiter);
+            val = clipper(val);
         }
 
         Info<< "after: " << flatOutput(values2) << nl;
diff --git a/applications/test/minMax2/Test-minMax2.C b/applications/test/minMax2/Test-minMax2.C
index 95a3ced198..201b0548d6 100644
--- a/applications/test/minMax2/Test-minMax2.C
+++ b/applications/test/minMax2/Test-minMax2.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,7 +24,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Test minMax
+    Test-minMax2
 
 \*---------------------------------------------------------------------------*/
 
@@ -37,6 +37,7 @@ Description
 #include "MinMax.H"
 #include "dimensionedScalar.H"
 #include "dimensionedMinMax.H"
+#include "Random.H"
 
 using namespace Foam;
 
@@ -78,7 +79,6 @@ int main(int argc, char *argv[])
 
     Info<< "Test min/max " << nl;
 
-
     {
         scalarMinMax range1(10, 20);
         scalarMinMax range2(40, 50);
@@ -140,7 +140,34 @@ int main(int argc, char *argv[])
         }
     }
 
+    {
+        scalarField someField(25);
 
+        Random rnd(4567);
+        for (scalar& val : someField)
+        {
+            val = rnd.position(-0.2, 1.2);
+        }
+
+        Info<< nl
+            << "field: " << flatOutput(someField) << nl;
+        Info<< "clamp01: "
+            << flatOutput(clamp(someField, scalarMinMax(zero_one{}))()) << nl;
+
+        Info<< "clamp01: "
+            << clamp(tmp<scalarField>(someField), scalarMinMax(zero_one{}))<< nl;
+
+        scalarField result(10);
+        clamp(result, someField, scalarMinMax(zero_one{}));
+
+        Info<< "result: " << result << nl;
+
+        someField.clamp(zero_one{});
+
+        Info<< "inplace: " << someField << nl;
+    }
+
+    Info<< nl << "\nDone\n" << endl;
     return 0;
 }
 
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C b/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C
index 7db3730924..fa84546b41 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRarraysCalc.C
@@ -1279,7 +1279,7 @@ void write_scalarField
             continue;
         }
 
-        os << limits.clip(fld(cellIdx)) << nl;
+        os << limits.clamp(fld(cellIdx)) << nl;
     }
 
     os << token::END_LIST << token::END_STATEMENT << nl;
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C
index 078b5a7df0..31c559d86f 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C
@@ -58,12 +58,11 @@ namespace Foam
 {
 
 // Read porosity, change to blockage. Clamp values [0-1] silently
-static const scalarMinMax limits01(scalarMinMax::zero_one());
 
 // Volume porosity -> blockage
 inline scalar getPorosity(const dictionary& dict)
 {
-    return 1 - limits01.clip(dict.getOrDefault<scalar>("porosity", 0));
+    return 1 - clamp(dict.getOrDefault<scalar>("porosity", 0), 0, 1);
 }
 
 // Direction porosities -> blockage
@@ -75,7 +74,7 @@ inline vector getPorosities(const dictionary& dict)
     {
         for (scalar& val : blockage)
         {
-            val = 1 - limits01.clip(val);
+            val = 1 - clamp(val, 0, 1);
         }
     }
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index 4dddfb7a69..f7dc05d350 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.C
@@ -253,36 +253,38 @@ bool Foam::dimensionSet::operator/=(const dimensionSet& ds)
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
 
-Foam::dimensionSet Foam::min(const dimensionSet& ds1, const dimensionSet& ds2)
+Foam::dimensionSet Foam::min(const dimensionSet& a, const dimensionSet& b)
 {
     if (dimensionSet::checking())
     {
-        checkDims("min(a, b)", ds1, ds2);
+        checkDims("min(a, b)", a, b);
     }
 
-    return ds1;
+    return a;
 }
 
 
-Foam::dimensionSet Foam::max(const dimensionSet& ds1, const dimensionSet& ds2)
+Foam::dimensionSet Foam::max(const dimensionSet& a, const dimensionSet& b)
 {
     if (dimensionSet::checking())
     {
-        checkDims("max(a, b)", ds1, ds2);
+        checkDims("max(a, b)", a, b);
     }
 
-    return ds1;
+    return a;
 }
 
 
-Foam::dimensionSet Foam::clip(const dimensionSet& ds1, const dimensionSet& ds2)
+Foam::dimensionSet Foam::clamp(const dimensionSet& a, const dimensionSet& range)
 {
-    if (dimensionSet::checking())
+    // In may cases the min/max range will be created from raw values
+    // (no dimension) so accept those without error
+    if (dimensionSet::checking() && !range.dimensionless())
     {
-        checkDims("clip(a, b)", ds1, ds2);
+        checkDims("clamp(a, b)", a, range);
     }
 
-    return ds1;
+    return a;
 }
 
 
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index a579c7b5bc..8bc491d6f1 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -354,9 +354,9 @@ Ostream& operator<<(Ostream& os, const dimensionSet& ds);
 
 // Global Functions
 
-dimensionSet min(const dimensionSet& ds1, const dimensionSet& ds2);
-dimensionSet max(const dimensionSet& ds1, const dimensionSet& ds2);
-dimensionSet clip(const dimensionSet& ds1, const dimensionSet& ds2);
+dimensionSet min(const dimensionSet& a, const dimensionSet& b);
+dimensionSet max(const dimensionSet& a, const dimensionSet& b);
+dimensionSet clamp(const dimensionSet& a, const dimensionSet& range);
 
 dimensionSet cmptMultiply(const dimensionSet& ds1, const dimensionSet& ds2);
 dimensionSet cmptDivide(const dimensionSet& ds1, const dimensionSet& ds2);
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 1e609ea6e8..72ee48bb72 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -421,6 +421,8 @@ public:
             const tmp<DimensionedField<cmptType, GeoMesh>>& tdf
         );
 
+        // Inherits clamp, clamp_min, clamp_max (without dimensions) from Field
+
         //- Return the field transpose (only defined for second rank tensors)
         tmp<DimensionedField<Type, GeoMesh>> T() const;
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 16d16264e4..5566474746 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -282,6 +282,65 @@ void FieldField<Field, Type>::replace
 }
 
 
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::clamp
+(
+    const Type& lower,
+    const Type& upper
+)
+{
+    if (lower < upper)
+    {
+        for (auto& ff : *this)
+        {
+            ff.clamp(lower, upper);
+        }
+    }
+}
+
+
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::clamp
+(
+    const MinMax<Type>& range
+)
+{
+    if (range.min() < range.max())
+    {
+        for (auto& ff : *this)
+        {
+            ff.clamp(range.min(), range.max());
+        }
+    }
+}
+
+
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::clamp_min
+(
+    const Type& lower
+)
+{
+    for (auto& ff : *this)
+    {
+        ff.clamp_min(lower);
+    }
+}
+
+
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::clamp_max
+(
+    const Type& upper
+)
+{
+    for (auto& ff : *this)
+    {
+        ff.clamp_max(upper);
+    }
+}
+
+
 template<template<class> class Field, class Type>
 tmp<FieldField<Field, Type>> FieldField<Field, Type>::T() const
 {
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 2227f295fa..11504cbe79 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,6 +149,20 @@ public:
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range.
+        void clamp(const Type& lower, const Type& upper);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range.
+        void clamp(const MinMax<Type>& range);
+
+        //- Impose lower (floor) clamp on the field values (in-place)
+        void clamp_min(const Type& lower);
+
+        //- Impose upper (ceiling) clamp on the field values (in-place)
+        void clamp_max(const Type& upper);
+
         //- Return the field transpose (only defined for second rank tensors)
         tmp<FieldField<Field, Type>> T() const;
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 41c4cd93fe..9be878df3d 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -673,7 +673,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
-BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
 /* * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * */
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index b4c6fdf25f..a9a7084e97 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -287,7 +287,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
-BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
 /* * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * */
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index d303761a7f..fe237c8283 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -625,6 +625,50 @@ void Foam::Field<Type>::replace
 }
 
 
+template<class Type>
+void Foam::Field<Type>::clamp(const Type& lower, const Type& upper)
+{
+    // Use free functions min(), max() to impose component-wise clamping
+    if (lower < upper)
+    {
+        // std::for_each
+        for (auto& val : *this)
+        {
+            val = min(max(val, lower), upper);
+        }
+    }
+}
+
+template<class Type>
+void Foam::Field<Type>::clamp(const MinMax<Type>& range)
+{
+    clamp(range.min(), range.max());
+}
+
+
+template<class Type>
+void Foam::Field<Type>::clamp_min(const Type& lower)
+{
+    // Use free function max() [sic] to impose component-wise clamp_min
+    // std::for_each
+    for (auto& val : *this)
+    {
+        val = max(val, lower);
+    }
+}
+
+template<class Type>
+void Foam::Field<Type>::clamp_max(const Type& upper)
+{
+    // Use free function min() [sic] to impose component-wise clamp_max
+    // std::for_each
+    for (auto& val : *this)
+    {
+        val = min(val, upper);
+    }
+}
+
+
 template<class Type>
 template<class VSForm>
 VSForm Foam::Field<Type>::block(const label start) const
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 2cbdb712e1..aa91c3de16 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -415,6 +415,20 @@ public:
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range.
+        void clamp(const Type& lower, const Type& upper);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range.
+        void clamp(const MinMax<Type>& range);
+
+        //- Impose lower (floor) clamp on the field values (in-place)
+        void clamp_min(const Type& lower);
+
+        //- Impose upper (ceiling) clamp on the field values (in-place)
+        void clamp_max(const Type& upper);
+
         template<class VSForm>
         VSForm block(const label start) const;
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index 00bd0cc54e..bfcc7860d3 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -656,6 +656,64 @@ TMP_UNARY_FUNCTION(Type, gAverage)
 
 #undef TMP_UNARY_FUNCTION
 
+template<class Type>
+void clamp
+(
+    Field<Type>& result,
+    const UList<Type>& f1,
+    const MinMax<Type>& range
+)
+{
+    if (result.cdata() == f1.cdata())
+    {
+        // Apply in-place
+        result.clamp(range);
+    }
+    else
+    {
+        if (range.good())
+        {
+            std::transform
+            (
+                f1.cbegin(),
+                f1.cbegin(result.size()),
+                result.begin(),
+                clampOp<Type>(range)
+            );
+        }
+        else
+        {
+            // No clamping
+            std::copy(f1.cbegin(), f1.cbegin(result.size()), result.begin());
+        }
+    }
+}
+
+template<class Type>
+tmp<Field<Type>> clamp
+(
+    const UList<Type>& f1,
+    const MinMax<Type>& range
+)
+{
+    auto tres = tmp<Field<Type>>::New(f1.size());
+    clamp(tres.ref(), f1, range);
+    return tres;
+}
+
+template<class Type>
+tmp<Field<Type>> clamp
+(
+    const tmp<Field<Type>>& tf1,
+    const MinMax<Type>& range
+)
+{
+    auto tres = reuseTmp<Type, Type>::New(tf1);
+    clamp(tres.ref(), tf1(), range);
+    tf1.clear();
+    return tres;
+}
+
 
 BINARY_FUNCTION(Type, Type, Type, max)
 BINARY_FUNCTION(Type, Type, Type, min)
@@ -667,10 +725,10 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
-BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)  // Same as clamp
 
 
-/* * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * */
+/* * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * */
 
 UNARY_OPERATOR(Type, Type, -, negate)
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index e57e56b93e..57a0c5db18 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -313,10 +313,11 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
-BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)  // Same as clamp
 
 
-// * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate)
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 14ab696745..0f39b3f116 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1250,60 +1250,88 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::replace
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::min
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
 (
-    const dimensioned<Type>& dt
+    const Type& lower,
+    const Type& upper
 )
 {
-    Foam::min(primitiveFieldRef(), primitiveField(), dt.value());
-    Foam::min(boundaryFieldRef(), boundaryField(), dt.value());
+    primitiveFieldRef().clamp(lower, upper);
+    boundaryFieldRef().clamp(lower, upper);
 }
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::max
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
 (
-    const dimensioned<Type>& dt
+    const MinMax<Type>& range
 )
 {
-    Foam::max(primitiveFieldRef(), primitiveField(), dt.value());
-    Foam::max(boundaryFieldRef(), boundaryField(), dt.value());
+    primitiveFieldRef().clamp(range.min(), range.max());
+    boundaryFieldRef().clamp(range.min(), range.max());
 }
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::clip
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
+(
+    const dimensioned<Type>& lower,
+    const dimensioned<Type>& upper
+)
+{
+    this->clamp(lower.value(), upper.value());
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
 (
     const dimensioned<MinMax<Type>>& range
 )
 {
-    Foam::clip(primitiveFieldRef(), primitiveField(), range.value());
-    Foam::clip(boundaryFieldRef(), boundaryField(), range.value());
+    this->clamp(range.value());
 }
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::clip
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_min
 (
-    const dimensioned<Type>& minVal,
-    const dimensioned<Type>& maxVal
+    const Type& lower
 )
 {
-    MinMax<Type> range(minVal.value(), maxVal.value());
-
-    Foam::clip(primitiveFieldRef(), primitiveField(), range);
-    Foam::clip(boundaryFieldRef(), boundaryField(), range);
+    primitiveFieldRef().clamp_min(lower);
+    boundaryFieldRef().clamp_min(lower);
 }
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::maxMin
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_max
 (
-    const dimensioned<Type>& minVal,
-    const dimensioned<Type>& maxVal
+    const Type& upper
 )
 {
-    this->clip(minVal, maxVal);
+    primitiveFieldRef().clamp_max(upper);
+    boundaryFieldRef().clamp_max(upper);
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_min
+(
+    const dimensioned<Type>& lower
+)
+{
+    this->clamp_min(lower.value());
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_max
+(
+    const dimensioned<Type>& upper
+)
+{
+    this->clamp_max(upper.value());
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 7098d4b834..cf4a09c683 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -134,7 +134,6 @@ private:
         //- Read the field - create the field dictionary on-the-fly
         void readFields();
 
-
 public:
 
     //- Runtime type information
@@ -630,32 +629,39 @@ public:
             const dimensioned<cmptType>& ds
         );
 
-        //- Use the minimum of the field and specified value
-        //  This sets the \em ceiling on the field values
-        void min(const dimensioned<Type>& dt);
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range.
+        void clamp(const Type& lower, const Type& upper);
 
-        //- Use the maximum of the field and specified value
-        //  This sets the \em floor on the field values
-        void max(const dimensioned<Type>& dt);
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range.
+        void clamp(const MinMax<Type>& range);
 
-        //- Clip the field to be bounded within the specified range
-        void clip(const dimensioned<MinMax<Type>>& range);
-
-        //- Clip the field to be bounded within the specified range
-        void clip
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range. No dimension checking.
+        void clamp
         (
-            const dimensioned<Type>& minVal,
-            const dimensioned<Type>& maxVal
+            const dimensioned<Type>& lower,
+            const dimensioned<Type>& upper
         );
 
-        //- Deprecated(2019-01) identical to clip()
-        //  \deprecated(2019-01) identical to clip()
-        FOAM_DEPRECATED_FOR(2019-01, "clip() method")
-        void maxMin
-        (
-            const dimensioned<Type>& minVal,
-            const dimensioned<Type>& maxVal
-        );
+        //- Clamp field values (in-place) to the specified range.
+        //  A no-op for an invalid range. No dimension checking.
+        void clamp(const dimensioned<MinMax<Type>>& range);
+
+        //- Impose lower (floor) clamp on the field values (in-place)
+        void clamp_min(const Type& lower);
+
+        //- Impose upper (ceiling) clamp on the field values (in-place)
+        void clamp_max(const Type& upper);
+
+        //- Impose lower (floor) clamp on the field values (in-place)
+        //  No dimension checking
+        void clamp_min(const dimensioned<Type>& lower);
+
+        //- Impose upper (ceiling) clamp on the field values (in-place)
+        //  No dimension checking
+        void clamp_max(const dimensioned<Type>& upper);
 
 
     // Member Operators
@@ -691,7 +697,7 @@ public:
         void operator/=(const dimensioned<scalar>&);
 
 
-    // Ostream operators
+    // Ostream Operators
 
         friend Ostream& operator<< <Type, PatchField, GeoMesh>
         (
@@ -704,6 +710,41 @@ public:
             Ostream&,
             const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
+
+
+    // Housekeeping
+
+        //- Clamp field values (in-place) to the specified range.
+        //  \deprecated(2023-01) prefer clamp() naming
+        void clip(const dimensioned<MinMax<Type>>& range)
+        {
+            this->clamp(range);
+        }
+
+        //- Clamp field values (in-place) to the specified range.
+        //  \deprecated(2023-01) prefer clamp() naming
+        void clip(const dimensioned<Type>& lo, const dimensioned<Type>& hi)
+        {
+            this->clamp(lo.value(), hi.value());
+        }
+
+        //- Use minimum of the field and specified value. ie, clamp_max().
+        //  This sets the \em ceiling on the field values
+        //  \deprecated(2023-01) prefer clamp_max()
+        void min(const dimensioned<Type>& upper) { this->clamp_max(upper); }
+
+        //- Use maximum of the field and specified value. ie, clamp_min().
+        //  This sets the \em floor on the field values
+        //  \deprecated(2023-01) prefer clamp_min()
+        void max(const dimensioned<Type>& lower) { this->clamp_min(lower); }
+
+        //- Deprecated(2019-01) identical to clamp()
+        //  \deprecated(2019-01) identical to clamp()
+        FOAM_DEPRECATED_FOR(2019-01, "clamp() method")
+        void maxMin(const dimensioned<Type>& lo, const dimensioned<Type>& hi)
+        {
+            return this->clamp(lo.value(), hi.value());
+        }
 };
 
 
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index e19a7e7d6f..2a4159c4a0 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -294,6 +294,13 @@ inline bool notEqual(const Scalar a, const Scalar b)
 }
 
 
+// Fast implementation, and with scalar promotion of upper/lower limits
+inline Scalar clamp(const Scalar& val, const Scalar& lower, const Scalar& upper)
+{
+    return (val < lower) ? lower : (upper < val) ? upper : val;
+}
+
+
 inline Scalar limit(const Scalar s1, const Scalar s2)
 {
     return (mag(s1) < mag(s2)) ? s1: 0.0;
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index 5afa10789f..bf5e105eb0 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -141,6 +141,15 @@ inline bool equal(const T& a, const T& b)
     return (a == b);
 }
 
+//- Return value clamped between upper and lower limits.
+//  Unlike the std::clamp, which selects between references, this version
+//  wraps the min/max free functions for component-wise clamping
+template<class T>
+inline T clamp(const T& val, const T& lower, const T& upper)
+{
+    return min(max(val, lower), upper);
+}
+
 
 /*---------------------------------------------------------------------------*\
                           Struct labelOp Declaration
diff --git a/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H b/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H
index 403a5b22da..3738f8847a 100644
--- a/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H
+++ b/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,30 +67,16 @@ Description
     Info<< "values values in range " << mask << nl;
     \endverbatim
 
-    One particular advantage offered by MinMax is to clip or limit values
+    One advantage offered by MinMax is to clamp or limit values
     to a particular range. For example,
     \verbatim
     scalarMinMax range(lower, upper);
 
     scalar val;
-    val = range.clip(val)    .. return clip values
+    val = range.clamp(val)    .. return clamped values
 
     // vs.
-    val = min(max(value, lower, upper))
-    \endverbatim
-
-    Or when working on lists, the values can be limited in a single pass
-    of the data without intermediate memory allocation.
-    \verbatim
-    scalarField values = ...;
-
-    for (scalar& val : values)
-    {
-        range.inplaceClip(val);
-    }
-
-    // vs.
-    values = min(max(values, lower, upper))
+    val = min(max(value, lower), upper)
     \endverbatim
 
 \*---------------------------------------------------------------------------*/
@@ -112,6 +98,7 @@ namespace Foam
 // Forward Declarations
 template<class T> class MinMax;
 class zero;
+class zero_one;
 
 // Common min/max types
 typedef MinMax<label> labelMinMax;      //!< A label min/max range
@@ -155,6 +142,9 @@ public:
         //- Construct with a single zero value
         inline explicit MinMax(const Foam::zero);
 
+        //- Implicit construct from zero_one as 0-1 range (pTraits zero, one)
+        inline MinMax(const Foam::zero_one);
+
         //- Construct with a single initial value
         inline explicit MinMax(const T& val);
 
@@ -239,14 +229,9 @@ public:
         //- True if the value is within the range (inclusive check)
         inline bool contains(const T& val) const;
 
-        //- If out of range, return the respective min/max limits, otherwise
-        //- return the value itself.
-        //  If the range is invalid, always return the value.
-        inline const T& clip(const T& val) const;
-
-        //- Inplace clip value by the min/max limits
-        //  \return True if clipping was applied.
-        inline bool inplaceClip(T& val) const;
+        //- Return value clamped component-wise.
+        //  If the range is invalid, just returns the value.
+        inline T clamp(const T& val) const;
 
 
     // Manipulate
@@ -284,6 +269,15 @@ public:
 
         //- Divide range by scalar factor
         inline MinMax<T>& operator/=(const scalar& s);
+
+
+    // Housekeeping
+
+        //- Old method name. Same as clamp (2023-01)
+        T clip(const T& val) const { return this->clamp(val); }
+
+        //- Old method (2023-01)
+        void inplaceClip(T& val) const { val = this->clamp(val); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H b/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H
index 6f9e965a7c..444c685320 100644
--- a/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H
+++ b/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ inline Foam::MinMax<T> Foam::MinMax<T>::le(const T& maxVal)
 template<class T>
 inline Foam::MinMax<T> Foam::MinMax<T>::zero_one()
 {
-    return MinMax<T>(pTraits<T>::zero, pTraits<T>::one);
+    return MinMax<T>(Foam::zero_one{});
 }
 
 
@@ -85,6 +85,13 @@ inline Foam::MinMax<T>::MinMax(const Foam::zero)
 {}
 
 
+template<class T>
+inline Foam::MinMax<T>::MinMax(const Foam::zero_one)
+:
+    Tuple2<T,T>(pTraits<T>::zero, pTraits<T>::one)
+{}
+
+
 template<class T>
 inline Foam::MinMax<T>::MinMax(const T& val)
 :
@@ -235,45 +242,17 @@ inline bool Foam::MinMax<T>::contains(const T& val) const
 
 
 template<class T>
-inline const T& Foam::MinMax<T>::clip(const T& val) const
+inline T Foam::MinMax<T>::clamp(const T& val) const
 {
     if (good())
     {
-        if (val < min())
-        {
-            return min();
-        }
-        else if (max() < val)
-        {
-            return max();
-        }
+        return Foam::min(Foam::max(val, min()), max());
     }
 
     return val; // Pass-through
 }
 
 
-template<class T>
-inline bool Foam::MinMax<T>::inplaceClip(T& val) const
-{
-    if (good())
-    {
-        if (val < min())
-        {
-            val = min();
-            return true;
-        }
-        else if (max() < val)
-        {
-            val = max();
-            return true;
-        }
-    }
-
-    return false;  // No change
-}
-
-
 template<class T>
 inline Foam::MinMax<T>& Foam::MinMax<T>::add(const MinMax& other)
 {
diff --git a/src/OpenFOAM/primitives/ranges/MinMax/MinMaxOps.H b/src/OpenFOAM/primitives/ranges/MinMax/MinMaxOps.H
index f174787309..2d175e8215 100644
--- a/src/OpenFOAM/primitives/ranges/MinMax/MinMaxOps.H
+++ b/src/OpenFOAM/primitives/ranges/MinMax/MinMaxOps.H
@@ -54,35 +54,60 @@ inline scalar mag(const MinMax<T>& range)
 }
 
 
-//- Return the value after clipping by the min/max limiter
+//- Return the value after clamping by the min/max limiter
 template<class T>
 inline T clip(const T& val, const MinMax<T>& range)
 {
-    return range.clip(val);
+    return range.clamp(val);
 }
 
 
-
-//- Return the value after clipping by the min/max limiter
+//- Unary function for applying component-wise clamping
 template<class T>
-struct clipOp
+struct clampOp
 {
-    T operator()(T& val, const MinMax<T>& range) const
+    const T lower;
+    const T upper;
+
+    //- Construct from min/max limits. No validity checks
+    clampOp(const T& min, const T& max)
+    :
+        lower(min),
+        upper(max)
+    {}
+
+    //- Construct from min/max range. No validity checks
+    clampOp(const MinMax<T>& range)
+    :
+        lower(range.min()),
+        upper(range.max())
+    {}
+
+    //- Construct as 0-1 min/max range
+    clampOp(const Foam::zero_one)
+    :
+        clampOp(MinMax<T>(Foam::zero_one{}))
+    {}
+
+    T operator()(const T& val) const
     {
-        return range.clip(val);
+        return min(max(val, lower), upper);
     }
 };
 
 
-//- Clip value and assign inplace
-template<class T>
-struct clipEqOp
-{
-    bool operator()(T& val, const MinMax<T>& range) const
-    {
-        return range.inplaceClip(val);
-    }
-};
+/// Not really needed
+/// //- Unary function for applying component-wise clamping (inplace)
+/// template<class T>
+/// struct clampEqOp : public clampOp<T>
+/// {
+///     using clampOp<T>::clampOp;
+///
+///     void operator()(T& val) const
+///     {
+///         val = clampOp<T>::operator()(val);
+///     }
+/// };
 
 
 //- Extract the min/max range from a list of values.
@@ -156,14 +181,14 @@ struct minMaxEqOp
 };
 
 
-//- The magnitude of an initial single value.
+//- The magnitude of a single value.
 inline scalarMinMax minMaxMag(const scalar val)
 {
     return scalarMinMax(Foam::mag(val));
 }
 
 
-//- The magnitude of from an initial VectorSpace.
+//- The magnitude of a VectorSpace.
 template<class Form, class Cmpt, direction nCmpt>
 inline scalarMinMax minMaxMag(const VectorSpace<Form,Cmpt,nCmpt>& vs)
 {
diff --git a/src/lumpedPointMotion/movement/lumpedPointMovement.C b/src/lumpedPointMotion/movement/lumpedPointMovement.C
index 75679203d2..7f12b91abb 100644
--- a/src/lumpedPointMotion/movement/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/movement/lumpedPointMovement.C
@@ -257,7 +257,7 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
     }
 
     relax_ = dict.getOrDefault<scalar>("relax", 1);
-    scalarMinMax::zero_one().inplaceClip(relax_);
+    relax_ = clamp(relax_, 0, 1);
 
     forcesDict_.merge(dict.subOrEmptyDict("forces"));
 
diff --git a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C
index 2d40f34219..c02b8cb8d4 100644
--- a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C
+++ b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.C
@@ -73,7 +73,7 @@ Foam::pointIndexHit Foam::searchableDisk::findNearest
     v.normalise();
 
     // Clip to inner/outer radius
-    info.setPoint(origin() + radialLimits_.clip(magV)*v);
+    info.setPoint(origin() + radialLimits_.clamp(magV)*v);
 
     if (info.point().distSqr(sample) < nearestDistSqr)
     {

From 0c756cc676c141236cad6d10f0430612c9333521 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 18:15:13 +0100
Subject: [PATCH 022/348] ENH: define linear interpolations for scalar,
 complex, vector, tensor...

- vector, tensor versions are defined component-wise
  to avoid intermediates.

  The base version uses the form "(1-t)*a + t*b" without any bounds
  checking (ie, will also extrapolate).
---
 applications/test/complex/Test-complex.C      |  19 ++-
 .../dimensionedType/Test-dimensionedType.C    |  17 ++-
 .../test/primitives/Test-primitives.C         | 116 ++++++++++++++++++
 src/OpenFOAM/dimensionSet/dimensionSet.C      |  10 ++
 src/OpenFOAM/dimensionSet/dimensionSet.H      |   1 +
 .../dimensionedType/dimensionedType.C         |  14 ++-
 .../dimensionedType/dimensionedType.H         |   8 ++
 src/OpenFOAM/orientedType/orientedType.C      |   9 ++
 src/OpenFOAM/orientedType/orientedType.H      |   1 +
 .../primitives/DiagTensor/DiagTensorI.H       |  22 +++-
 src/OpenFOAM/primitives/Scalar/Scalar.H       |   9 ++
 .../SphericalTensor/SphericalTensorI.H        |  15 ++-
 .../primitives/SymmTensor/SymmTensorI.H       |  25 +++-
 src/OpenFOAM/primitives/Tensor/TensorI.H      |  28 ++++-
 src/OpenFOAM/primitives/Vector/VectorI.H      |  28 ++++-
 src/OpenFOAM/primitives/complex/complexI.H    |  13 ++
 src/OpenFOAM/primitives/ops/ops.H             |  30 ++++-
 17 files changed, 349 insertions(+), 16 deletions(-)

diff --git a/applications/test/complex/Test-complex.C b/applications/test/complex/Test-complex.C
index 971f311865..7e76b09324 100644
--- a/applications/test/complex/Test-complex.C
+++ b/applications/test/complex/Test-complex.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,9 +59,24 @@ int main(int argc, char *argv[])
         << "complexVector::one  : " << complexVector::one << nl
         << nl;
 
+    {
+        const complex a(0, 1);
+        const complex b(20, 100);
+
+        Info<< "lerp of " << a << " : " << b << nl;
+
+        for (const double t : { 0.0, 0.5, 1.0, -0.5, 1.5 })
+        {
+            Info<< "    " << t << " = " << lerp(a, b, t) << nl;
+        }
+    }
+
     for (complex c : { complex{1, 0}, complex{1, 2}} )
     {
-        Info<< nl << "complex : " << c << nl;
+        Info<< nl << "complex : " << c
+            << " mag = " << c.magnitude()
+            << " norm = " << c.magSqr()
+            << nl;
 
         Info<< "sin: " << sin(c) << nl
             << "pow(3.0f): " << pow(c, 3.0f) << nl
diff --git a/applications/test/dimensionedType/Test-dimensionedType.C b/applications/test/dimensionedType/Test-dimensionedType.C
index d3e428afa4..1d948709d2 100644
--- a/applications/test/dimensionedType/Test-dimensionedType.C
+++ b/applications/test/dimensionedType/Test-dimensionedType.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,7 @@ License
 
 #include "dictionary.H"
 #include "primitiveEntry.H"
-#include "dimensionedScalar.H"
-#include "dimensionedTensor.H"
+#include "dimensionedTypes.H"
 
 using namespace Foam;
 
@@ -102,6 +101,18 @@ int main(int argc, char *argv[])
         }
     }
 
+    {
+        dimensionedLabel a("min", dimTime, -10);
+        dimensionedLabel b("max", dimTime, 100);
+        scalar t = 0.5;
+
+        Info<< "lerp of" << nl
+            << "    " << a << nl
+            << "    " << b << nl
+            << "  = " << lerp(a, b, t) << nl
+            << " vs " << ((1-t)*a + t*b) << nl
+            << nl;
+    }
 
     Pout<< "zero scalar (time): " << dimensionedScalar(dimTime) << endl;
     Pout<< "zero vector: " << dimensionedVector(dimLength) << endl;
diff --git a/applications/test/primitives/Test-primitives.C b/applications/test/primitives/Test-primitives.C
index bfa5d38906..df381e3399 100644
--- a/applications/test/primitives/Test-primitives.C
+++ b/applications/test/primitives/Test-primitives.C
@@ -40,6 +40,8 @@ Description
 #include "Tuple2.H"
 #include "Switch.H"
 #include "dictionary.H"
+#include "primitiveFields.H"
+#include "labelVector.H"
 
 using namespace Foam;
 
@@ -93,6 +95,13 @@ void printValPair(const char* desc, const T1& val1, const T2& val2)
 }
 
 
+// The 'naive' implementation. Not exact at end points
+inline scalar naive_lerp(const scalar a, const scalar b, const scalar t)
+{
+    return a + t*(b - a);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class T>
@@ -180,6 +189,113 @@ int main(int argc, char *argv[])
 {
     unsigned nFail = 0;
 
+    {
+        const float a = 1e8f, b = 1.0f;
+
+        Info<< "lerp exact: "
+            << (a == lerp(a, b, 0.0f)) << " "
+            << (b == lerp(a, b, 1.0f)) << nl;
+
+        Info<< "naive lerp exact: "
+            << (a == naive_lerp(a, b, 0.0f)) << " "
+            << (b == naive_lerp(a, b, 1.0f)) << nl;
+    }
+
+    {
+        const scalar a = 1e24, b = 1.0;
+
+        Info<< "lerp exact: "
+            << (a == lerp(a, b, 0.0)) << " "
+            << (b == lerp(a, b, 1.0)) << nl;
+
+        Info<< "naive lerp exact: "
+            << (a == naive_lerp(a, b, 0.0)) << " "
+            << (b == naive_lerp(a, b, 1.0)) << nl;
+    }
+
+    {
+        const vector a(vector::uniform(1e24)), b(vector::uniform(1.0));
+
+        Info<<"lerp exact: "
+            << (a == lerp(a, b, 0.0f)) << " "
+            << (b == lerp(a, b, 1.0f)) << nl;
+
+        Info<< "lerp: "
+            << lerp(vector::uniform(0), vector::uniform(100), 0.5) << nl;
+    }
+
+    {
+        const lerpOp1<vector> half(0.5);
+
+        const vector a(vector::uniform(20));
+        const vector b(vector::uniform(100));
+
+        Info<< "lerp half: "
+            << a << " : " << b << " => " << half(a, b) << nl;
+    }
+
+    {
+        const labelVector a(labelVector::uniform(10000));
+        const labelVector b(labelVector::uniform(1));
+
+        Info<< "lerp (labelVector) = "
+            << lerp(a, b, 0.1) << nl;
+    }
+
+    {
+        const scalar a(0);
+        const scalar b(100);
+
+        Info<< "lerp of " << a << " : " << b << nl;
+
+        for (const double t : { 0.0, 0.5, 1.0, -0.5, 1.5 })
+        {
+            Info<< "    " << t << " = " << lerp(a, b, t) << nl;
+        }
+    }
+
+
+    // No yet
+    #if 0
+    {
+        const label a(10000);
+        const label b(1);
+
+        Info<<"lerp (label) = "
+            << label(lerp(a, b, 0.1)) << nl;
+    }
+
+    {
+        const bool a(true);
+        const bool b(false);
+
+        Info<<"lerp (bool) = "
+            << (lerp(a, b, 0.5)) << nl;
+    }
+    #endif
+
+    {
+        const sphericalTensor a(10), b(20);
+
+        Info<<"lerp exact: "
+            << (a == lerp(a, b, 0.0f)) << " "
+            << (b == lerp(a, b, 1.0f)) << nl;
+//        Info<< "lerp: "
+//            << lerp(vector::uniform(0), vector::uniform(100), 0.5) << nl;
+    }
+
+    {
+        const tensor a(tensor::uniform(1e24));
+        const tensor b(tensor::uniform(0));
+
+        Info<<"lerp exact: "
+            << (a == lerp(a, b, 0.0f)) << " "
+            << (b == lerp(a, b, 1.0f)) << nl;
+//        Info<< "lerp: "
+//            << lerp(vector::uniform(0), vector::uniform(100), 0.5) << nl;
+    }
+
+
     {
         Info<< nl << "Test Switch parsing:" << nl;
         nFail += testParsing
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index f7dc05d350..1751b6bd06 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.C
@@ -287,6 +287,16 @@ Foam::dimensionSet Foam::clamp(const dimensionSet& a, const dimensionSet& range)
     return a;
 }
 
+Foam::dimensionSet Foam::lerp(const dimensionSet& a, const dimensionSet& b)
+{
+    if (dimensionSet::checking())
+    {
+        checkDims("lerp(a, b)", a, b);
+    }
+
+    return a;
+}
+
 
 Foam::dimensionSet Foam::cmptMultiply
 (
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index 8bc491d6f1..b50571a767 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -357,6 +357,7 @@ Ostream& operator<<(Ostream& os, const dimensionSet& ds);
 dimensionSet min(const dimensionSet& a, const dimensionSet& b);
 dimensionSet max(const dimensionSet& a, const dimensionSet& b);
 dimensionSet clamp(const dimensionSet& a, const dimensionSet& range);
+dimensionSet lerp(const dimensionSet& a, const dimensionSet& b);
 
 dimensionSet cmptMultiply(const dimensionSet& ds1, const dimensionSet& ds2);
 dimensionSet cmptDivide(const dimensionSet& ds1, const dimensionSet& ds2);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 7483f51f6d..6071afae1e 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -738,11 +738,19 @@ Foam::dimensioned<Type> Foam::min
 }
 
 
+template<class Type>
+Foam::dimensioned<Type> Foam::lerp
+(
+    const dimensioned<Type>& a,
+    const dimensioned<Type>& b,
+    const scalar t
+)
+{
     return dimensioned<Type>
     (
-        "min(" + dt1.name() + ',' + dt2.name() + ')',
-        dt1.dimensions(),
-        min(dt1.value(), dt2.value())
+        "lerp(" + a.name() + ',' + b.name() + ',' + ::Foam::name(t) + ')',
+        lerp(a.dimensions(), b.dimensions()),
+        lerp(a.value(), b.value(), t)
     );
 }
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 0b6f7975c1..6815cee389 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -502,6 +502,14 @@ dimensioned<Type> max(const dimensioned<Type>&, const dimensioned<Type>&);
 template<class Type>
 dimensioned<Type> min(const dimensioned<Type>&, const dimensioned<Type>&);
 
+template<class Type>
+dimensioned<Type> lerp
+(
+    const dimensioned<Type>& a,
+    const dimensioned<Type>& b,
+    const scalar t
+);
+
 template<class Type>
 bool operator<(const dimensioned<Type>&, const dimensioned<Type>&);
 
diff --git a/src/OpenFOAM/orientedType/orientedType.C b/src/OpenFOAM/orientedType/orientedType.C
index 9bc13d40f6..1ed80f1359 100644
--- a/src/OpenFOAM/orientedType/orientedType.C
+++ b/src/OpenFOAM/orientedType/orientedType.C
@@ -199,6 +199,15 @@ Foam::orientedType Foam::max(const orientedType& a, const orientedType& b)
 }
 
 
+Foam::orientedType Foam::lerp(const orientedType& a, const orientedType& b)
+{
+    (void) checkTypes("Function lerp", a, b);
+
+    // Behaves like addition
+    return orientedType(a.is_oriented() || b.is_oriented());
+}
+
+
 Foam::orientedType Foam::cmptMultiply
 (
     const orientedType& ot1,
diff --git a/src/OpenFOAM/orientedType/orientedType.H b/src/OpenFOAM/orientedType/orientedType.H
index 764c501aac..c385d28f2b 100644
--- a/src/OpenFOAM/orientedType/orientedType.H
+++ b/src/OpenFOAM/orientedType/orientedType.H
@@ -174,6 +174,7 @@ public:
 
 orientedType min(const orientedType& a, const orientedType& b);
 orientedType max(const orientedType& a, const orientedType& b);
+orientedType lerp(const orientedType& a, const orientedType& b);
 
 orientedType cmptMultiply(const orientedType& ot1, const orientedType& ot2);
 orientedType cmptDivide(const orientedType& ot1, const orientedType& ot);
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 94f910247f..2432ac4d06 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -138,6 +138,26 @@ inline DiagTensor<Cmpt> diag(const SymmTensor<Cmpt>& st)
 }
 
 
+//- Linear interpolation of diagonal tensors a and b by factor t
+template<class Cmpt>
+inline DiagTensor<Cmpt> lerp
+(
+    const DiagTensor<Cmpt>& a,
+    const DiagTensor<Cmpt>& b,
+    const scalar t
+)
+{
+    const scalar onet = (1-t);
+
+    return DiagTensor<Cmpt>
+    (
+        onet*a.xx() + t*b.xx(),
+        onet*a.yy() + t*b.yy(),
+        onet*a.zz() + t*b.zz()
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Sum of a DiagTensor and a Tensor
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 2a4159c4a0..d8d41cae97 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -313,6 +313,15 @@ inline Scalar minMod(const Scalar s1, const Scalar s2)
 }
 
 
+//- Linear interpolation of scalars a and b by factor t
+//  Explicit form (not fused multiply add etc) for exact values at end points.
+//  Unlike std::lerp (C++20) there are no isfinite() checks etc.
+inline constexpr Scalar lerp(const Scalar a, const Scalar b, const Scalar t)
+{
+    return (Scalar{1}-t)*a + t*b;
+}
+
+
 inline Scalar magSqr(const Scalar s)
 {
     return s*s;
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index 3485263eaf..f7d2f5b387 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -161,6 +161,19 @@ inline Cmpt cmptAv(const SphericalTensor<Cmpt>& st)
 }
 
 
+//- Linear interpolation of spherical tensors a and b by factor t
+template<class Cmpt>
+inline SphericalTensor<Cmpt> lerp
+(
+    const SphericalTensor<Cmpt>& a,
+    const SphericalTensor<Cmpt>& b,
+    const scalar t
+)
+{
+    return SphericalTensor<Cmpt>((1-t)*a.ii() + t*b.ii());
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Division of a Cmpt by a SphericalTensor
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 4154cc8f7b..ed665450e7 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -418,6 +418,29 @@ inline SymmTensor<Cmpt> sqr(const Vector<Cmpt>& v)
 }
 
 
+//- Linear interpolation of symmetric tensors a and b by factor t
+template<class Cmpt>
+inline SymmTensor<Cmpt> lerp
+(
+    const SymmTensor<Cmpt>& a,
+    const SymmTensor<Cmpt>& b,
+    const scalar t
+)
+{
+    const scalar onet = (1-t);
+
+    return SymmTensor<Cmpt>
+    (
+        onet*a.xx() + t*b.xx(),
+        onet*a.xy() + t*b.xy(),
+        onet*a.xz() + t*b.xz(),
+        onet*a.yy() + t*b.yy(),
+        onet*a.yz() + t*b.yz(),
+        onet*a.zz() + t*b.zz()
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Sum of a SphericalTensor and a SymmTensor
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 80d363f39e..19173ee725 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -687,6 +687,32 @@ inline Cmpt invariantIII(const Tensor<Cmpt>& t)
 }
 
 
+//- Linear interpolation of tensors a and b by factor t
+template<class Cmpt>
+inline Tensor<Cmpt> lerp
+(
+    const Tensor<Cmpt>& a,
+    const Tensor<Cmpt>& b,
+    const scalar t
+)
+{
+    const scalar onet = (1-t);
+
+    return Tensor<Cmpt>
+    (
+        onet*a.xx() + t*b.xx(),
+        onet*a.xy() + t*b.xy(),
+        onet*a.xz() + t*b.xz(),
+        onet*a.yx() + t*b.yx(),
+        onet*a.yy() + t*b.yy(),
+        onet*a.yz() + t*b.yz(),
+        onet*a.zx() + t*b.zx(),
+        onet*a.zy() + t*b.zy(),
+        onet*a.zz() + t*b.zz()
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Sum of a SphericalTensor and a Tensor
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index 7ce8d60118..0b580b7451 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -244,12 +244,34 @@ Foam::Vector<Cmpt>::less_zxy(const Vector<Cmpt>& a, const Vector<Cmpt>& b)
 }
 
 
-// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+//- Linear interpolation of vectors a and b by factor t
+template<class Cmpt>
+inline Vector<Cmpt> lerp
+(
+    const Vector<Cmpt>& a,
+    const Vector<Cmpt>& b,
+    const scalar t
+)
+{
+    const scalar onet = (1-t);
+
+    return Vector<Cmpt>
+    (
+        onet*a.x() + t*b.x(),
+        onet*a.y() + t*b.y(),
+        onet*a.z() + t*b.z()
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Dummy innerProduct for scalar
 //  Allows the construction of vtables for virtual member functions
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index d960d5835e..cfb57ae2ff 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -238,6 +238,19 @@ inline complex limit(const complex& c1, const complex& c2)
 }
 
 
+//- Linear interpolation of complex a and b by factor t
+inline complex lerp(const complex& a, const complex& b, const scalar t)
+{
+    const scalar onet = (1-t);
+
+    return complex
+    (
+        onet*a.real() + t*b.real(),
+        onet*a.imag() + t*b.imag()
+    );
+}
+
+
 inline const complex& sum(const complex& c)
 {
     return c;
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index bf9d01f004..37de2bf97a 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -269,6 +269,34 @@ struct compareOp
 };
 
 
+//- Linear interpolation (cf. std::lerp)
+template<class T>
+struct lerpOp
+{
+    FOAM_NODISCARD T operator()(const T& a, const T& b, const scalar t) const
+    {
+        return lerp(a, b, t);
+    }
+};
+
+
+//- Linear interpolation (lerp) with interpolation value defined on construct
+template<class T>
+struct lerpOp1
+{
+    const scalar value;
+
+    lerpOp1(scalar v) : value(v) {}
+
+    FOAM_NODISCARD T operator()(const T& a, const T& b) const
+    {
+        return lerp(a, b, value);
+    }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 //- Deprecated(2020-11) use nameOp (word.H)
 //  \deprecated(2020-11) use nameOp
 template<class T> struct getNameOp : nameOp<T> {};

From 94a79ef24fb59cd0e34573d0f68f2258f52357f7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 09:33:00 +0100
Subject: [PATCH 023/348] STYLE: explicit reference to mesh db for schemes,
 interfaceTracking etc

---
 .../finiteArea/checkFaMesh/faMeshWriteVTK.H   |  6 +--
 .../finiteArea/makeFaMesh/faMeshWriteVTK.H    |  2 +-
 .../interfaceTrackingFvMesh.C                 | 53 ++++++++-----------
 .../constraint/processor/processorFaPatch.C   | 12 ++---
 .../EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C   | 16 +++---
 .../EulerFaDdtScheme/EulerFaDdtScheme.C       | 32 +++++------
 .../backwardFaDdtScheme/backwardFaDdtScheme.C | 32 +++++------
 .../boundedBackwardFaDdtScheme.C              | 32 +++++------
 .../steadyStateFaDdtScheme.C                  | 32 +++++------
 .../edgeInterpolation/edgeInterpolation.C     | 20 +++----
 .../cfdTools/general/MRF/MRFZoneList.C        |  2 +-
 .../EulerD2dt2Scheme/EulerD2dt2Scheme.C       |  4 +-
 .../steadyStateD2dt2Scheme.C                  |  4 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       | 24 ++++-----
 .../CrankNicolsonDdtScheme.C                  | 26 ++++-----
 .../EulerDdtScheme/EulerDdtScheme.C           | 24 ++++-----
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  | 24 ++++-----
 .../backwardDdtScheme/backwardDdtScheme.C     | 24 ++++-----
 .../ddtSchemes/ddtScheme/ddtScheme.C          |  4 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C | 26 ++++-----
 .../steadyStateDdtScheme.C                    | 20 +++----
 .../limitedSnGrad/limitedSnGrad.C             |  2 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |  5 +-
 .../fvMesh/wallDist/wallDist/wallDist.C       |  4 +-
 .../limitedSchemes/blended/blended.H          |  4 +-
 .../limitedSchemes/upwind/upwind.H            |  3 +-
 .../schemes/midPoint/midPoint.H               |  2 +-
 27 files changed, 214 insertions(+), 225 deletions(-)

diff --git a/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H b/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H
index c6edf85a3e..5a138055d1 100644
--- a/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H
+++ b/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H
@@ -23,7 +23,7 @@ Description
         // vtk::formatType::INLINE_ASCII,
         fileName
         (
-            aMesh.mesh().time().globalPath() / "finiteArea"
+            aMesh.time().globalPath() / "finiteArea"
         )
     );
 
@@ -66,7 +66,7 @@ Description
         // vtk::formatType::INLINE_ASCII,
         fileName
         (
-            aMesh.mesh().time().globalPath() / "finiteArea-edges"
+            aMesh.time().globalPath() / "finiteArea-edges"
         )
     );
 
@@ -102,7 +102,7 @@ Description
         // vtk::formatType::INLINE_ASCII,
         fileName
         (
-            aMesh.mesh().time().globalPath() / "finiteArea-edgesCentres"
+            aMesh.time().globalPath() / "finiteArea-edgesCentres"
         )
     );
 
diff --git a/applications/utilities/finiteArea/makeFaMesh/faMeshWriteVTK.H b/applications/utilities/finiteArea/makeFaMesh/faMeshWriteVTK.H
index 1df8b4d312..ed988e7413 100644
--- a/applications/utilities/finiteArea/makeFaMesh/faMeshWriteVTK.H
+++ b/applications/utilities/finiteArea/makeFaMesh/faMeshWriteVTK.H
@@ -23,7 +23,7 @@ Description
         // vtk::formatType::INLINE_ASCII,
         fileName
         (
-            aMesh.mesh().time().globalPath() / "finiteArea"
+            aMesh.time().globalPath() / "finiteArea"
         )
     );
 
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
index 8642f515db..ce798d638b 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
@@ -213,8 +213,8 @@ void Foam::interfaceTrackingFvMesh::makeUs() const
         IOobject
         (
             "Us",
-            mesh().time().timeName(),
-            mesh(),
+            aMesh().time().timeName(),
+            aMesh().thisDb(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -271,8 +271,8 @@ void Foam::interfaceTrackingFvMesh::makeFsNetPhi() const
         IOobject
         (
             "fsNetPhi",
-            mesh().time().timeName(),
-            mesh(),
+            aMesh().time().timeName(),
+            aMesh().thisDb(),
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -462,8 +462,8 @@ void Foam::interfaceTrackingFvMesh::makePhis()
         IOobject
         (
             "phis",
-            mesh().time().timeName(),
-            mesh(),
+            aMesh().time().timeName(),
+            aMesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -494,7 +494,7 @@ void Foam::interfaceTrackingFvMesh::makeSurfactConc() const
                 mesh().time().startTime().value()
             ),
             // mesh().time().timeName(),
-            mesh(),
+            aMesh().thisDb(),
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -525,7 +525,7 @@ void Foam::interfaceTrackingFvMesh::makeBulkSurfactConc() const
                 mesh().time().startTime().value()
             ),
             // mesh().time().timeName(),
-            mesh(),
+            aMesh().thisDb(),
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -559,8 +559,8 @@ void Foam::interfaceTrackingFvMesh::makeSurfaceTension() const
         IOobject
         (
             "surfaceTension",
-            mesh().time().timeName(),
-            mesh(),
+            aMesh().time().timeName(),
+            aMesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -604,28 +604,17 @@ void Foam::interfaceTrackingFvMesh::makeContactAngle()
     IOobject contactAngleHeader
     (
         "contactAngle",
-        mesh().time().timeName(),
-        mesh(),
-        IOobject::MUST_READ
+        aMesh().time().timeName(),
+        aMesh().thisDb(),
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
     );
 
     if (contactAngleHeader.typeHeaderOk<areaScalarField>())
     {
         Info<< "Reading contact angle field" << endl;
 
-        contactAnglePtr_ =
-            new areaScalarField
-            (
-                IOobject
-                (
-                    "contactAngle",
-                    mesh().time().timeName(),
-                    mesh(),
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                aMesh()
-            );
+        contactAnglePtr_ = new areaScalarField(contactAngleHeader, aMesh());
     }
 }
 
@@ -886,8 +875,8 @@ void Foam::interfaceTrackingFvMesh::updateSurfactantConcentration()
                 IOobject
                 (
                     "Cb",
-                    mesh().time().timeName(),
-                    mesh(),
+                    aMesh().time().timeName(),
+                    aMesh().thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE
                 ),
@@ -1303,8 +1292,8 @@ void Foam::interfaceTrackingFvMesh::correctContactLinePointNormals()
             IOobject
             (
                 "tangent",
-                mesh().time().timeName(),
-                mesh(),
+                aMesh().time().timeName(),
+                aMesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
@@ -2051,8 +2040,8 @@ Foam::interfaceTrackingFvMesh::surfaceTensionGrad()
         IOobject
         (
             "surfaceTensionGrad",
-            mesh().time().timeName(),
-            mesh(),
+            aMesh().time().timeName(),
+            aMesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index 3312cb8173..d19a16e143 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -135,12 +135,11 @@ void Foam::processorFaPatch::makeNonGlobalPatchPoints() const
     // create a 1->1 map
 
     // Can not use faGlobalMeshData at this point yet
+    // - use polyMesh globalData instead
 
-    if
-    (
-        !Pstream::parRun()
-     || !boundaryMesh().mesh()().globalData().nGlobalPoints()
-    )
+    const auto& pMeshGlobalData = boundaryMesh().mesh().mesh().globalData();
+
+    if (!Pstream::parRun() || !pMeshGlobalData.nGlobalPoints())
     {
         // 1 -> 1 mapping
         nonGlobalPatchPointsPtr_.reset(new labelList(identity(nPoints())));
@@ -151,8 +150,7 @@ void Foam::processorFaPatch::makeNonGlobalPatchPoints() const
         labelList& ngpp = *nonGlobalPatchPointsPtr_;
 
         // Get reference to shared points
-        const labelList& sharedPoints =
-            boundaryMesh().mesh()().globalData().sharedPointLabels();
+        const labelList& sharedPoints = pMeshGlobalData.sharedPointLabels();
 
         const labelList& faMeshPatchPoints = pointLabels();
 
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
index 41a085789f..9ab1276224 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
@@ -75,8 +75,8 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     IOobject d2dt2IOobject
     (
         "d2dt2("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -134,8 +134,8 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     IOobject d2dt2IOobject
     (
         "d2dt2("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -212,8 +212,8 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     IOobject d2dt2IOobject
     (
         "d2dt2("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -297,8 +297,8 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     IOobject d2dt2IOobject
     (
         "d2dt2("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
diff --git a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
index 254cbc7570..cd75c7d092 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
@@ -53,8 +53,8 @@ EulerFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -100,8 +100,8 @@ EulerFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -138,8 +138,8 @@ EulerFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -191,8 +191,8 @@ EulerFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -238,8 +238,8 @@ EulerFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -291,8 +291,8 @@ EulerFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -340,8 +340,8 @@ EulerFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -397,8 +397,8 @@ EulerFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
diff --git a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
index 6256f61088..da042c24e5 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
@@ -84,8 +84,8 @@ backwardFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -139,8 +139,8 @@ backwardFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -186,8 +186,8 @@ backwardFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -259,8 +259,8 @@ backwardFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -330,8 +330,8 @@ backwardFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -403,8 +403,8 @@ backwardFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -474,8 +474,8 @@ backwardFaDdtScheme<Type>::facDdt
     IOobject ddtIOobject
     (
         "ddt("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -551,8 +551,8 @@ backwardFaDdtScheme<Type>::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
diff --git a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
index 22c50c9c3c..140e452e3e 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
@@ -67,8 +67,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
     IOobject ddtIOobject
     (
         "ddt("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -122,8 +122,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt0
     IOobject ddtIOobject
     (
         "ddt("+dt.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -167,8 +167,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
     IOobject ddtIOobject
     (
         "ddt("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -264,8 +264,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -359,8 +359,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
     IOobject ddtIOobject
     (
         "ddt("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -456,8 +456,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -551,8 +551,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
     IOobject ddtIOobject
     (
         "ddt("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -652,8 +652,8 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt0
     IOobject ddtIOobject
     (
         "ddt0("+rho.name()+','+vf.name()+')',
-        mesh()().time().timeName(),
-        mesh()(),
+        mesh().time().timeName(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
diff --git a/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.C
index 1a44f226c1..d430680d88 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.C
@@ -53,8 +53,8 @@ steadyStateFaDdtScheme<Type>::facDdt
         IOobject
         (
             "ddt("+dt.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero)
@@ -74,8 +74,8 @@ steadyStateFaDdtScheme<Type>::facDdt0
         IOobject
         (
             "ddt("+dt.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero)
@@ -95,8 +95,8 @@ steadyStateFaDdtScheme<Type>::facDdt
         IOobject
         (
             "ddt("+vf.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(vf.dimensions()/dimTime, Zero)
@@ -116,8 +116,8 @@ steadyStateFaDdtScheme<Type>::facDdt0
         IOobject
         (
             "ddt0("+vf.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(vf.dimensions()/dimTime, Zero)
@@ -138,8 +138,8 @@ steadyStateFaDdtScheme<Type>::facDdt
         IOobject
         (
             "ddt("+rho.name()+','+vf.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
@@ -159,8 +159,8 @@ steadyStateFaDdtScheme<Type>::facDdt0
         IOobject
         (
             "ddt0("+rho.name()+','+vf.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
@@ -181,8 +181,8 @@ steadyStateFaDdtScheme<Type>::facDdt
         IOobject
         (
             "ddt("+rho.name()+','+vf.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
@@ -203,8 +203,8 @@ steadyStateFaDdtScheme<Type>::facDdt0
         IOobject
         (
             "ddt0("+rho.name()+','+vf.name()+')',
-            mesh()().time().timeName(),
-            mesh()()
+            mesh().time().timeName(),
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
index b57f0e75f2..a75f322260 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
+++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
@@ -205,8 +205,8 @@ void Foam::edgeInterpolation::makeLPN() const
         IOobject
         (
             "lPN",
-            faMesh_.time().constant(),
-            faMesh_(),
+            mesh().time().constant(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
@@ -286,8 +286,8 @@ void Foam::edgeInterpolation::makeWeights() const
         IOobject
         (
             "weightingFactors",
-            mesh()().pointsInstance(),
-            mesh()(),
+            mesh().pointsInstance(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
@@ -366,8 +366,8 @@ void Foam::edgeInterpolation::makeDeltaCoeffs() const
         IOobject
         (
             "differenceFactors_",
-            mesh()().pointsInstance(),
-            mesh()(),
+            mesh().pointsInstance(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
@@ -460,8 +460,8 @@ void Foam::edgeInterpolation::makeCorrectionVectors() const
         IOobject
         (
             "correctionVectors",
-            mesh()().pointsInstance(),
-            mesh()(),
+            mesh().pointsInstance(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
@@ -571,8 +571,8 @@ void Foam::edgeInterpolation::makeSkewCorrectionVectors() const
         IOobject
         (
             "skewCorrectionVectors",
-            mesh()().pointsInstance(),
-            mesh()(),
+            mesh().pointsInstance(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 54ec416cde..c3b4084131 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -195,7 +195,7 @@ Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::DDt
             (
                 "MRFZoneList:acceleration",
                 U.mesh().time().timeName(),
-                U.mesh()
+                U.mesh().thisDb()
             ),
             U.mesh(),
             dimensionedVector(U.dimensions()/dimTime, Zero)
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
index d27011b387..dfd383475c 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
@@ -55,7 +55,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
     (
         "d2dt2("+vf.name()+')',
         mesh().time().timeName(),
-        mesh(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
@@ -133,7 +133,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
     (
         "d2dt2("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh(),
+        mesh().thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE
     );
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
index 3313ba1519..0ff77f5722 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
@@ -56,7 +56,7 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
             (
                 "d2dt2("+vf.name()+')',
                 mesh().time().timeName(),
-                mesh(),
+                mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
@@ -81,7 +81,7 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
         (
             "d2dt2("+rho.name()+','+vf.name()+')',
             mesh().time().timeName(),
-            mesh(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 0644e8866d..eff7207c0a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -159,7 +159,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+dt.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -209,7 +209,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -261,7 +261,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -313,7 +313,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -369,7 +369,7 @@ CoEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -601,7 +601,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
@@ -633,7 +633,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime(), phiCorr)
            *rDeltaT*phiCorr
@@ -676,7 +676,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr, rho.oldTime())
                *rDeltaT*phiCorr
@@ -704,7 +704,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -763,7 +763,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -795,7 +795,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -832,7 +832,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::meshPhi
             (
                 "meshPhi",
                 mesh().time().timeName(),
-                mesh(),
+                mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 false
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 663a956f4f..207245e9d2 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -157,7 +157,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
                     (
                         name,
                         mesh().time().timeName(),
-                        mesh(),
+                        mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::AUTO_WRITE
                     ),
@@ -360,7 +360,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
     (
         "ddt(" + dt.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
@@ -417,7 +417,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
     (
         "ddt(" + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     dimensionedScalar rDtCoef = rDtCoef_(ddt0);
@@ -505,7 +505,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
     (
         "ddt(" + rho.name() + ',' + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     dimensionedScalar rDtCoef = rDtCoef_(ddt0);
@@ -595,7 +595,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
     (
         "ddt(" + rho.name() + ',' + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     dimensionedScalar rDtCoef = rDtCoef_(ddt0);
@@ -696,7 +696,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
     (
         "ddt(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     dimensionedScalar rDtCoef = rDtCoef_(ddt0);
@@ -1218,7 +1218,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), mesh().Sf() & Uf.oldTime())
            *(
@@ -1280,7 +1280,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
            *(
@@ -1357,7 +1357,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -1421,7 +1421,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
                 (
                     "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -1514,7 +1514,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(rhoU0, phi.oldTime(), rho.oldTime())
                *(
@@ -1574,7 +1574,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
                 (
                     "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime(), rho.oldTime())
                *(
@@ -1627,7 +1627,7 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
             (
                 mesh().phi().name(),
                 mesh().time().timeName(),
-                mesh(),
+                mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 false
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 7dcf820781..584b9b8426 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -55,7 +55,7 @@ EulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+dt.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -99,7 +99,7 @@ EulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -149,7 +149,7 @@ EulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -199,7 +199,7 @@ EulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -253,7 +253,7 @@ EulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -317,7 +317,7 @@ EulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+sf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
@@ -509,7 +509,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
@@ -541,7 +541,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime(), phiCorr)
            *rDeltaT*phiCorr
@@ -584,7 +584,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr, rho.oldTime())
                *rDeltaT*phiCorr
@@ -612,7 +612,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -671,7 +671,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -703,7 +703,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 5d441d8814..38ac5d0412 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -165,7 +165,7 @@ SLTSDdtScheme<Type>::fvcDdt
     (
         "ddt("+dt.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -214,7 +214,7 @@ SLTSDdtScheme<Type>::fvcDdt
     (
         "ddt("+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -266,7 +266,7 @@ SLTSDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -318,7 +318,7 @@ SLTSDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -374,7 +374,7 @@ SLTSDdtScheme<Type>::fvcDdt
     (
         "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     if (mesh().moving())
@@ -606,7 +606,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
@@ -638,7 +638,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime(), phiCorr)
            *rDeltaT*phiCorr
@@ -681,7 +681,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr, rho.oldTime())
                *rDeltaT*phiCorr
@@ -709,7 +709,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -768,7 +768,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -800,7 +800,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -837,7 +837,7 @@ tmp<surfaceScalarField> SLTSDdtScheme<Type>::meshPhi
             (
                 "meshPhi",
                 mesh().time().timeName(),
-                mesh(),
+                mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 false
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index b81c180ca2..e470ec87c8 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -87,7 +87,7 @@ backwardDdtScheme<Type>::fvcDdt
     (
         "ddt("+dt.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     scalar deltaT = deltaT_();
@@ -140,7 +140,7 @@ backwardDdtScheme<Type>::fvcDdt
     (
         "ddt("+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     scalar deltaT = deltaT_();
@@ -212,7 +212,7 @@ backwardDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     scalar deltaT = deltaT_();
@@ -284,7 +284,7 @@ backwardDdtScheme<Type>::fvcDdt
     (
         "ddt("+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     scalar deltaT = deltaT_();
@@ -360,7 +360,7 @@ backwardDdtScheme<Type>::fvcDdt
     (
         "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     scalar deltaT = deltaT_();
@@ -686,7 +686,7 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), (mesh().Sf() & Uf.oldTime()))
            *rDeltaT
@@ -730,7 +730,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
            *rDeltaT
@@ -790,7 +790,7 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -824,7 +824,7 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -901,7 +901,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(rhoU0, phi.oldTime(), rho.oldTime())
                *rDeltaT
@@ -931,7 +931,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime(), rho.oldTime())
                *rDeltaT
@@ -980,7 +980,7 @@ tmp<surfaceScalarField> backwardDdtScheme<Type>::meshPhi
             (
                 mesh().phi().name(),
                 mesh().time().timeName(),
-                mesh(),
+                mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 false
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index aeb6a14587..94a00c2a68 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -160,7 +160,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
             (
                 "ddtCouplingCoeff",
                 U.mesh().time().timeName(),
-                U.mesh()
+                U.mesh().thisDb()
             ),
             U.mesh(),
             dimensionedScalar("one", dimless, 1.0)
@@ -234,7 +234,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeffExperimental
             (
                 "ddtCouplingCoeff",
                 U.mesh().time().timeName(),
-                U.mesh()
+                U.mesh().thisDb()
             ),
             U.mesh(),
             dimensionedScalar("one", dimless, 1.0)
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index 539c59818b..bf3979fc21 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -66,7 +66,7 @@ localEulerDdtScheme<Type>::fvcDdt
     (
         "ddt(" + dt.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvPatchField, volMesh>>::New
@@ -92,7 +92,7 @@ localEulerDdtScheme<Type>::fvcDdt
     (
         "ddt(" + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvPatchField, volMesh>>
@@ -120,7 +120,7 @@ localEulerDdtScheme<Type>::fvcDdt
     (
         "ddt(" + rho.name() + ',' + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvPatchField, volMesh>>
@@ -148,7 +148,7 @@ localEulerDdtScheme<Type>::fvcDdt
     (
         "ddt(" + rho.name() + ',' + vf.name() + ')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvPatchField, volMesh>>
@@ -177,7 +177,7 @@ localEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvPatchField, volMesh>>
@@ -208,7 +208,7 @@ localEulerDdtScheme<Type>::fvcDdt
     (
         "ddt("+sf.name()+')',
         mesh().time().timeName(),
-        mesh()
+        mesh().thisDb()
     );
 
     return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
@@ -365,7 +365,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phiUf0, phiCorr)
            *rDeltaT*phiCorr
@@ -397,7 +397,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime(), phiCorr)
            *rDeltaT*phiCorr
@@ -440,7 +440,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff(rhoU0, phiUf0, phiCorr, rho.oldTime())
                *rDeltaT*phiCorr
@@ -468,7 +468,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + Uf.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -527,7 +527,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -559,7 +559,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
                     "ddtCorr("
                   + rho.name() + ',' + U.name() + ',' + phi.name() + ')',
                     mesh().time().timeName(),
-                    mesh()
+                    mesh().thisDb()
                 ),
                 this->fvcDdtPhiCoeff
                 (
@@ -596,7 +596,7 @@ tmp<surfaceScalarField> localEulerDdtScheme<Type>::meshPhi
             (
                 "meshPhi",
                 mesh().time().timeName(),
-                mesh(),
+                mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 false
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 9c44f21d1a..33fb99b030 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -54,7 +54,7 @@ steadyStateDdtScheme<Type>::fvcDdt
         (
             "ddt("+dt.name()+')',
             mesh().time().timeName(),
-            mesh()
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero)
@@ -75,7 +75,7 @@ steadyStateDdtScheme<Type>::fvcDdt
         (
             "ddt("+vf.name()+')',
             mesh().time().timeName(),
-            mesh()
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(vf.dimensions()/dimTime, Zero)
@@ -97,7 +97,7 @@ steadyStateDdtScheme<Type>::fvcDdt
         (
             "ddt("+rho.name()+','+vf.name()+')',
             mesh().time().timeName(),
-            mesh()
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
@@ -119,7 +119,7 @@ steadyStateDdtScheme<Type>::fvcDdt
         (
             "ddt("+rho.name()+','+vf.name()+')',
             mesh().time().timeName(),
-            mesh()
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
@@ -142,7 +142,7 @@ steadyStateDdtScheme<Type>::fvcDdt
         (
             "ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
             mesh().time().timeName(),
-            mesh()
+            mesh().thisDb()
         ),
         mesh(),
         dimensioned<Type>(rho.dimensions()*vf.dimensions()/dimTime, Zero)
@@ -250,7 +250,7 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
             (
                 "ddtCorr(" + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             mesh(),
             dimensioned<typename flux<Type>::type>
@@ -282,7 +282,7 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
             (
                 "ddtCorr(" + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             mesh(),
             dimensioned<typename flux<Type>::type>
@@ -317,7 +317,7 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
               + rho.name()
               + ',' + U.name() + ',' + Uf.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             mesh(),
             dimensioned<typename flux<Type>::type>
@@ -352,7 +352,7 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
               + rho.name()
               + ',' + U.name() + ',' + phi.name() + ')',
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             mesh(),
             dimensioned<typename flux<Type>::type>
@@ -380,7 +380,7 @@ tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
         (
             "meshPhi",
             mesh().time().timeName(),
-            mesh(),
+            mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index 6f0f95ee35..addf8e45e6 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -100,7 +100,7 @@ limitedSnGrad<Type>::correction
                 (
                     fieldName,
                     vf.mesh().time().timeName(),
-                    vf.mesh(),
+                    vf.mesh().thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
                     false
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index a82341e6ce..38dd6520a8 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -926,9 +926,10 @@ void Foam::fvMatrix<Type>::createOrUpdateLduPrimitiveAssembly()
     (
         lduAssemblyName_,
         psi_.mesh().time().timeName(),
-        psi_.mesh(),
+        psi_.mesh().thisDb(),
         IOobject::NO_READ,
-        IOobject::NO_WRITE
+        IOobject::NO_WRITE,
+        IOobject::REGISTER
     );
 
     UPtrList<lduMesh> uMeshPtr(nMatrices());
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index 6e417d37a4..be8b859bb7 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -49,7 +49,7 @@ void Foam::wallDist::constructn() const
             (
                 "n" & patchTypeName_,
                 mesh().time().timeName(),
-                mesh()
+                mesh().thisDb()
             ),
             mesh(),
             dimensionedVector(dimless, Zero),
@@ -115,7 +115,7 @@ Foam::wallDist::wallDist
         (
             "y" & patchTypeName_,
             mesh.time().timeName(),
-            mesh
+            mesh.thisDb()
         ),
         mesh,
         dimensionedScalar("y" & patchTypeName_, dimLength, SMALL),
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
index 239d040f96..e99bf4889c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
@@ -139,7 +139,7 @@ public:
                     (
                         vf.name() + "BlendingFactor",
                         this->mesh().time().timeName(),
-                        this->mesh(),
+                        this->mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
                         false
@@ -169,7 +169,7 @@ public:
                     (
                         "blendedLimiter",
                         this->mesh().time().timeName(),
-                        this->mesh(),
+                        this->mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
                         false
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
index 2ba3bfb3f4..3831b19ccd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
@@ -120,7 +120,8 @@ public:
                 (
                     "upwindLimiter",
                     this->mesh().time().timeName(),
-                    this->mesh(),
+                    this->mesh().time().timeName(),
+                    this->mesh().thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
                     false
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
index 73e0350d9f..18d413df10 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
@@ -111,7 +111,7 @@ public:
                     (
                         "midPointWeights",
                         this->mesh().time().timeName(),
-                        this->mesh(),
+                        this->mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
                         false

From c1cdacc0b450ca85d9a46e31519b39ff2c810b81 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 26 Jan 2023 10:53:42 +0100
Subject: [PATCH 024/348] COMP: missing default parameters for UIPstream::read

ENH: support UIPstream::read, UOPstream::write with UList, SubList
---
 applications/test/FixedList/Test-FixedList.C  |  43 +++---
 .../db/IOstreams/Pstreams/UIPstream.H         | 126 ++++++++++++++++--
 .../db/IOstreams/Pstreams/UOPstream.H         |  61 ++++++++-
 3 files changed, 203 insertions(+), 27 deletions(-)

diff --git a/applications/test/FixedList/Test-FixedList.C b/applications/test/FixedList/Test-FixedList.C
index 7e510d8c78..b1976a2bfd 100644
--- a/applications/test/FixedList/Test-FixedList.C
+++ b/applications/test/FixedList/Test-FixedList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -309,32 +309,45 @@ int main(int argc, char *argv[])
 
     if (Pstream::parRun())
     {
+        // Fixed buffer would also work, but want to test using UList
+        List<labelPair> buffer;
+
+        const label startOfRequests = UPstream::nRequests();
+
         if (Pstream::master())
         {
+            buffer.resize(UPstream::nProcs());
+            buffer[0] = labelPair(0, UPstream::myProcNo());
+
             for (const int proci : Pstream::subProcs())
             {
-                IPstream fromSlave(Pstream::commsTypes::blocking, proci);
-                FixedList<label, 2> list3(fromSlave);
-
-                Serr<< "Receiving from " << proci
-                    << " : " << list3 << endl;
+                UIPstream::read
+                (
+                    UPstream::commsTypes::nonBlocking,
+                    proci,
+                    buffer.slice(proci, 1)
+                );
             }
         }
         else
         {
-            Perr<< "Sending to master" << endl;
+            buffer.resize(1);
+            buffer[0] = labelPair(0, UPstream::myProcNo());
 
-            OPstream toMaster
+            Perr<< "Sending to master: " << buffer << endl;
+
+            UOPstream::write
             (
-                Pstream::commsTypes::blocking,
-                Pstream::masterNo()
+                UPstream::commsTypes::nonBlocking,
+                UPstream::masterNo(),
+                buffer.slice(0, 1)  // OK
+                /// buffer  // Also OK
             );
-
-            FixedList<label, 2> list3;
-            list3[0] = 0;
-            list3[1] = Pstream::myProcNo();
-            toMaster << list3;
         }
+
+        UPstream::waitRequests(startOfRequests);
+
+        Info<< "Gathered: " << buffer << endl;
     }
 
     return 0;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index b29042280f..bcb989cf3a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -251,8 +251,8 @@ public:
 
     // Static Functions
 
-        //- Read buffer contents from given processor
-        //  \return the message size
+        //- Read buffer contents from given processor.
+        //  \return the message size (bytes read)
         static label read
         (
             const UPstream::commsTypes commsType,
@@ -265,8 +265,8 @@ public:
             UPstream::Request* req = nullptr
         );
 
-        //- Read buffer contents (non-blocking) from given processor
-        //  \return the message size
+        //- Read buffer contents (non-blocking) from given processor.
+        //  \return the message size (bytes read)
         inline static label read
         (
             //! [out] request information
@@ -274,8 +274,8 @@ public:
             const int fromProcNo,
             char* buf,
             const std::streamsize bufSize,
-            const int tag,
-            const label communicator
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
         )
         {
             return UIPstream::read
@@ -285,7 +285,113 @@ public:
                 buf,
                 bufSize,
                 tag,
-                communicator,
+                comm,
+               &req
+            );
+        }
+
+        //- Read into UList storage from given processor.
+        //  Only valid for contiguous data types.
+        //  \return the message size (bytes read). May change in the future
+        template<class Type>
+        inline static label read
+        (
+            const UPstream::commsTypes commsType,
+            const int fromProcNo,
+            UList<Type>& buffer,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            //! [out] request information (for non-blocking)
+            UPstream::Request* req = nullptr
+        )
+        {
+            return UIPstream::read
+            (
+                commsType,
+                fromProcNo,
+                buffer.data_bytes(),
+                buffer.size_bytes(),
+                tag,
+                comm,
+                req
+            );
+        }
+
+        //- Read into SubList storage from given processor.
+        //  Only valid for contiguous data types.
+        //  \return the message size (bytes read). May change in the future
+        template<class Type>
+        inline static label read
+        (
+            const UPstream::commsTypes commsType,
+            const int fromProcNo,
+            SubList<Type> buffer,  // passed by shallow copy
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            //! [out] request information (for non-blocking)
+            UPstream::Request* req = nullptr
+        )
+        {
+            return UIPstream::read
+            (
+                commsType,
+                fromProcNo,
+                buffer.data_bytes(),
+                buffer.size_bytes(),
+                tag,
+                comm,
+                req
+            );
+        }
+
+        //- Read into UList storage (non-blocking) from given processor.
+        //  Only valid for contiguous data types.
+        //  \return the message size (bytes read). May change in the future
+        template<class Type>
+        inline static label read
+        (
+            //! [out] request information
+            UPstream::Request& req,
+            const int fromProcNo,
+            UList<Type>& buffer,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
+        )
+        {
+            return UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                fromProcNo,
+                buffer.data_bytes(),
+                buffer.size_bytes(),
+                tag,
+                comm,
+               &req
+            );
+        }
+
+        //- Read into SubList storage (non-blocking) from given processor.
+        //  Only valid for contiguous data types.
+        //  \return the message size (bytes read). May change in the future
+        template<class Type>
+        inline static label read
+        (
+            //! [out] request information
+            UPstream::Request& req,
+            const int fromProcNo,
+            SubList<Type> buffer,  // passed by shallow copy
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
+        )
+        {
+            return UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                fromProcNo,
+                buffer.data_bytes(),
+                buffer.size_bytes(),
+                tag,
+                comm,
                &req
             );
         }
@@ -317,11 +423,11 @@ public:
         //- and IO format
         UIPBstream
         (
-            const UPstream::commsTypes,     //!< ignored
+            const UPstream::commsTypes,     //!< irrelevant
             const int rootProcNo,           //!< normally UPstream::masterNo()
             DynamicList<char>& receiveBuf,
             label& receiveBufPosition,
-            const int tag = UPstream::msgType(),  //!< ignored
+            const int tag = UPstream::msgType(),  //!< irrelevant
             const label comm = UPstream::worldComm,
             const bool clearAtEnd = false,  //!< destroy receiveBuf if at end
             IOstreamOption::streamFormat fmt = IOstreamOption::BINARY
@@ -341,7 +447,7 @@ public:
     // Static Functions
 
         //- Wrapped version of UPstream::broadcast
-        //  \return the message size
+        //  \return the message size (bytes read)
         static label read
         (
             const int rootProcNo,  //!< normally UPstream::masterNo()
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index d2c344da43..a3f86d3281 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -364,6 +364,63 @@ public:
                 sendMode
             );
         }
+
+        //- Write UList contents to given processor.
+        //  Only valid for contiguous data types.
+        //  \return True on success
+        template<class Type>
+        inline static bool write
+        (
+            const UPstream::commsTypes commsType,
+            const int toProcNo,
+            const UList<Type>& buffer,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            //! [out] request information (for non-blocking)
+            UPstream::Request* req = nullptr,
+            const UPstream::sendModes sendMode = UPstream::sendModes::normal
+        )
+        {
+            return UOPstream::write
+            (
+                commsType,
+                toProcNo,
+                buffer.cdata_bytes(),
+                buffer.size_bytes(),
+                tag,
+                comm,
+                req,
+                sendMode
+            );
+        }
+
+        //- Write UList contents (non-blocking) to given processor.
+        //  Only valid for contiguous data types.
+        //  \return True on success
+        template<class Type>
+        inline static bool write
+        (
+            //! [out] request information
+            UPstream::Request& req,
+            const int toProcNo,
+            const UList<Type>& buffer,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            const UPstream::sendModes sendMode = UPstream::sendModes::normal
+        )
+        {
+            return UOPstream::write
+            (
+                UPstream::commsTypes::nonBlocking,
+                toProcNo,
+                buffer.cdata_bytes(),
+                buffer.size_bytes(),
+                tag,
+                comm,
+               &req,
+                sendMode
+            );
+        }
 };
 
 
@@ -394,10 +451,10 @@ public:
         //- and IO format
         UOPBstream
         (
-            const UPstream::commsTypes,     //!< ignored
+            const UPstream::commsTypes,     //!< irrelevant
             const int toProcNo,             //!< normally UPstream::masterNo()
             DynamicList<char>& sendBuf,
-            const int tag = UPstream::msgType(),  //!< ignored
+            const int tag = UPstream::msgType(),  //!< irrelevant
             const label comm = UPstream::worldComm,
             const bool sendAtDestruct = true,
             IOstreamOption::streamFormat fmt = IOstreamOption::BINARY

From 7c60c80edd09409c8ce9d7d2313f75e8f9a7c874 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 26 Jan 2023 11:24:25 +0100
Subject: [PATCH 025/348] ENH: new/revised emplace_back() [for
 DynamicList/List/PtrDynList/PtrList]

- returns reference as per C++17 std::vector

STYLE: drop unused, redundant DynamicField remove() method
---
 .../test/DynamicField/Test-DynamicField.C     | 16 ++++----
 .../test/DynamicList/Test-DynamicList.C       | 27 +++++++------
 applications/test/Function1/Test-Function1.C  |  6 +--
 applications/test/ListOps/Test-ListOps.C      |  2 +-
 .../Test-PatchEdgeFaceWave.C                  | 12 ++----
 applications/test/PtrList/Test-PtrList.C      | 38 +++++++++----------
 .../test/UIndirectList/Test-UIndirectList.C   |  5 ++-
 applications/test/cstring/Test-cstring.C      | 10 ++---
 .../Test-dynamicIndexedOctree.C               | 13 ++++---
 .../test/dynamicLibrary/Test-dynamicLibrary.C |  4 +-
 .../test/globalIndex/Test-globalIndex.C       |  4 +-
 applications/test/instant/Test-instant.C      | 32 ++++++++--------
 .../test/labelRanges/Test-labelRanges.C       | 10 ++---
 .../test/patchRegion/Test-patchRegion.C       |  7 +---
 .../Test-reconstructedDistanceFunction.C      |  4 +-
 applications/test/router/router.C             |  4 +-
 applications/test/tokenize/Test-tokenize.C    |  2 +-
 applications/test/wordRe/Test-wordRe.C        |  2 +-
 .../Lists/DynamicList/DynamicList.H           |  5 +++
 .../Lists/DynamicList/DynamicListI.H          | 17 +++++++++
 src/OpenFOAM/containers/Lists/List/List.H     |  6 +++
 src/OpenFOAM/containers/Lists/List/ListI.H    | 19 +++++++++-
 .../PtrLists/PtrDynList/PtrDynList.H          |  5 ++-
 .../PtrLists/PtrDynList/PtrDynListI.H         |  3 +-
 .../containers/PtrLists/PtrList/PtrList.H     |  7 ++--
 .../containers/PtrLists/PtrList/PtrListI.H    |  5 ++-
 .../fields/Fields/DynamicField/DynamicField.H | 12 +++---
 .../Fields/DynamicField/DynamicFieldI.H       | 37 +++++++++---------
 28 files changed, 179 insertions(+), 135 deletions(-)

diff --git a/applications/test/DynamicField/Test-DynamicField.C b/applications/test/DynamicField/Test-DynamicField.C
index 41cc07eede..ba5825314f 100644
--- a/applications/test/DynamicField/Test-DynamicField.C
+++ b/applications/test/DynamicField/Test-DynamicField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,28 +53,29 @@ int main(int argc, char *argv[])
 
     Info << "testField:" << testField << endl;
 
-    testField.append(vector(0.5, 4.8, 6.2));
+    testField.emplace_back(0.5, 4.8, 6.2);
 
     Info << "testField after appending:" << testField << endl;
 
-    testField.append(vector(2.7, 2.3, 6.1));
+    testField.emplace_back(2.7, 2.3, 6.1);
 
     Info << "testField after appending:" << testField << endl;
 
-    vector elem = testField.remove();
+    vector elem = testField.back();
+    testField.pop_back();
 
     Info << "removed element:" << elem << endl;
     Info << "testField:" << testField << endl;
 
-    testField.append(vector(3.0, 1.3, 9.2));
+    testField.emplace_back(3.0, 1.3, 9.2);
 
     Info << "testField:" << testField << endl;
 
-    testField.setSize(10, vector(1.5, 0.6, -1.0));
+    testField.resize(10, vector(1.5, 0.6, -1.0));
 
     Info << "testField after setSize:" << testField << endl;
 
-    testField.append(testField2);
+    testField.push_back(testField2);
 
     Info << "testField after appending testField2:" << testField << endl;
 
@@ -87,7 +89,7 @@ int main(int argc, char *argv[])
 
     testField.clear();
 
-    testField.append(vector(3.0, 1.3, 9.2));
+    testField.emplace_back(3.0, 1.3, 9.2);
 
     Info << "testField after clear and append:" << testField << endl;
 
diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C
index 7765269cae..ce6fb4b210 100644
--- a/applications/test/DynamicList/Test-DynamicList.C
+++ b/applications/test/DynamicList/Test-DynamicList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
     {
         0, 1, 2, 3, 4
     };
-    dlA.append({ 5, 6 });
+    dlA.push_back({ 5, 6 });
     dlA = { 1, 2, 4 };
 
     DynamicList<label> dlB;
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
     // Copy back and append a few time
     for (label i=0; i < 3; i++)
     {
-        dlB.append(lstA);
+        dlB.push_back(lstA);
     }
 
     Info<< "appended list a few times" << endl;
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
     // Copy back and append a few time
     for (label i=0; i < 3; i++)
     {
-        dlB.append(lstA);
+        dlB.push_back(lstA);
     }
 
 
@@ -220,8 +220,8 @@ int main(int argc, char *argv[])
 
     for (label elemI=0; elemI < 5; ++elemI)
     {
-        dlE1.append(4 - elemI);
-        dlE2.append(elemI);
+        dlE1.push_back(4 - elemI);
+        dlE2.push_back(elemI);
     }
 
     printInfo("dlE2", dlE2, true);
@@ -243,9 +243,12 @@ int main(int argc, char *argv[])
 
     {
         DynamicList<label> addr(10);
-        addr.append(3);
-        addr.append(1);
-        addr.append(2);
+        addr.emplace_back(3);
+        addr.emplace_back(1);
+        addr.emplace_back(2);
+
+        // Can also use the return value
+        Info<< "adding " << addr.emplace_back(4) << endl;
 
         forAll(dlE2, i)
         {
@@ -297,9 +300,9 @@ int main(int argc, char *argv[])
         Info<< "test move-append with "
             << flatOutput(input1) << " and " << flatOutput(input2) << endl;
 
-        list2.append(std::move(list1));
-        list2.append(std::move(input1));
-        list2.append(std::move(input2));
+        list2.push_back(std::move(list1));
+        list2.push_back(std::move(input1));
+        list2.push_back(std::move(input2));
 
         Info<< "result: " << flatOutput(list2) << nl
             << "inputs: " << flatOutput(list1) << " / "
diff --git a/applications/test/Function1/Test-Function1.C b/applications/test/Function1/Test-Function1.C
index be8b1de67d..3d27af7649 100644
--- a/applications/test/Function1/Test-Function1.C
+++ b/applications/test/Function1/Test-Function1.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
             {
                 if (nameFilter(f))
                 {
-                    functionNames.append(f);
+                    functionNames.push_back(f);
                 }
             }
         }
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
         {
             for (label argi=1; argi < args.size(); ++argi)
             {
-                functionNames.append(args[argi]);
+                functionNames.push_back(args[argi]);
             }
         }
 
diff --git a/applications/test/ListOps/Test-ListOps.C b/applications/test/ListOps/Test-ListOps.C
index e3db28c7ff..8fdfaf9db5 100644
--- a/applications/test/ListOps/Test-ListOps.C
+++ b/applications/test/ListOps/Test-ListOps.C
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
         << IndirectList<label>::subset_if(test6, evenNonZero) << nl
         << endl;
 
-    test6.append(identity(13, 12));
+    test6.push_back(identity(13, 12));
 
     Info<< "Randomized: " << flatOutput(test6) << endl;
     inplaceUniqueSort(test6);
diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
index 94af4cf1df..97e91dfcfb 100644
--- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
+++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,16 +72,9 @@ int main(int argc, char *argv[])
             label edgeI = 0;
             Info<< "Starting walk on edge " << edgeI << endl;
 
-            initialEdges.append(edgeI);
+            initialEdges.push_back(edgeI);
             const edge& e = patch.edges()[edgeI];
-            initialEdgesInfo.append
-            (
-                patchEdgeFaceInfo
-                (
-                    e.centre(patch.localPoints()),
-                    0.0
-                )
-            );
+            initialEdgesInfo.emplace_back(e.centre(patch.localPoints()), 0);
         }
 
 
diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index a8f91df9f9..f3826d8a29 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -332,10 +332,8 @@ int main(int argc, char *argv[])
 
     for (label i = 0; i < 5; ++i)
     {
-        listApp.append(new Scalar(1.3*i));
+        listApp.emplace_back(1.3*i);
     }
-    listApp.emplace_back(100);
-
 
     Info<< nl
         << "list1: " << list1 << nl
@@ -353,7 +351,7 @@ int main(int argc, char *argv[])
 
             if (old)
             {
-                ptrs.append(old.release());
+                ptrs.push_back(old.release());
             }
         }
 
@@ -459,8 +457,8 @@ int main(int argc, char *argv[])
         printAddr(Info, dynlist1b);
         printAddr(Info, dynlist1c);
 
-        dynlist1d.append(std::move(dynlist1b));
-        dynlist1d.append(std::move(dynlist1c));
+        dynlist1d.push_back(std::move(dynlist1b));
+        dynlist1d.push_back(std::move(dynlist1c));
 
         Info<< "result:" << nl;
         print(Info, dynlist1d);
@@ -477,8 +475,8 @@ int main(int argc, char *argv[])
         printAddr(Info, list1b);
         printAddr(Info, list1c);
 
-        list1d.append(std::move(list1b));
-        list1d.append(std::move(list1c));
+        list1d.push_back(std::move(list1b));
+        list1d.push_back(std::move(list1c));
 
         Info<< "result:" << nl;
         print(Info, list1d);
@@ -523,7 +521,7 @@ int main(int argc, char *argv[])
     printAddr(Info, ulist1);
     Info<< nl;
 
-    ulist1c.append(std::move(ulist1b));
+    ulist1c.push_back(std::move(ulist1b));
 
     Info<< "UPtrList append/append:";
     printAddr(Info, ulist1c);
@@ -596,7 +594,7 @@ int main(int argc, char *argv[])
     {
         dynPlanes.emplace_back(vector::one, vector::one);
         dynPlanes.emplace_back(vector(1,2,3), vector::one);
-        dynPlanes.append(nullptr);
+        dynPlanes.push_back(nullptr);
 
         dynPlanes.set(6, new plane(vector(2,2,1), vector::one));
         dynPlanes.set(10, new plane(vector(4,5,6), vector::one));
@@ -619,10 +617,10 @@ int main(int argc, char *argv[])
 
     Info<< "now append again" << endl;
     {
-        dynPlanes.append(new plane(vector::one, vector::one));
-        dynPlanes.append(new plane(vector(1,2,3), vector::one));
+        dynPlanes.emplace_back(vector::one, vector::one);
+        dynPlanes.emplace_back(vector(1,2,3), vector::one);
 
-        dynPlanes.set(5, new plane(vector(2,2,1), vector::one));
+        dynPlanes.emplace(5, vector(2,2,1), vector::one);
     }
 
     report(Info, dynPlanes, true);
@@ -658,12 +656,12 @@ int main(int argc, char *argv[])
     {
         PtrDynList<plane> dynPlanes2;
 
-        dynPlanes2.append(new plane(vector::one, vector::one));
-        dynPlanes2.append(new plane(vector(1,2,3), vector::one));
-        dynPlanes2.append(nullptr);
+        dynPlanes2.emplace_back(vector::one, vector::one);
+        dynPlanes2.emplace_back(vector(1,2,3), vector::one);
+        dynPlanes2.push_back(nullptr);
 
-        dynPlanes2.set(6, new plane(vector(2,2,1), vector::one));
-        dynPlanes2.set(10, new plane(Zero, vector::one));
+        dynPlanes2.emplace(6, vector(2,2,1), vector::one);
+        dynPlanes2.emplace(10, Zero, vector::one);
 
         labelList order;
         sortedOrder(dynPlanes2, order);
@@ -701,7 +699,7 @@ int main(int argc, char *argv[])
         Info<< "Append" << endl;
         report(Info, dynPlanes2, false);
 
-        dynPlanes.append(std::move(dynPlanes2));
+        dynPlanes.push_back(std::move(dynPlanes2));
 
         Info<< "Result" << endl;
         report(Info, dynPlanes, false);
diff --git a/applications/test/UIndirectList/Test-UIndirectList.C b/applications/test/UIndirectList/Test-UIndirectList.C
index 7d6714591a..3fc1f66c0d 100644
--- a/applications/test/UIndirectList/Test-UIndirectList.C
+++ b/applications/test/UIndirectList/Test-UIndirectList.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -130,7 +131,7 @@ int main(int argc, char *argv[])
     flatList = labelUIndList(completeList, addresses);
     Info<< "List assign from UIndirectList: " << flatOutput(flatList) << nl;
 
-    flatList.append(labelUIndList(completeList, addresses));
+    flatList.push_back(labelUIndList(completeList, addresses));
     Info<< "List::append(UIndirectList): " << flatOutput(flatList) << nl;
 
 
@@ -138,7 +139,7 @@ int main(int argc, char *argv[])
     Info<< "DynamicList construct from UIndirectList: " << flatOutput(dynList)
         << nl;
 
-    dynList.append(labelUIndList(completeList, addresses));
+    flatList.push_back(labelUIndList(completeList, addresses));
     Info<< "DynamicList::append(UIndirectList): " << flatOutput(dynList) << nl;
 
     Info<< "\nEnd\n" << endl;
diff --git a/applications/test/cstring/Test-cstring.C b/applications/test/cstring/Test-cstring.C
index 1fad064001..095a2253a1 100644
--- a/applications/test/cstring/Test-cstring.C
+++ b/applications/test/cstring/Test-cstring.C
@@ -84,10 +84,10 @@ int main(int argc, char *argv[])
     DynamicList<string> dynlst;
     dynlst.reserve(16);
 
-    dynlst.append("string1 with content");
-    dynlst.append("string2 other content");
-    dynlst.append("string3 more");
-    dynlst.append("string4 done");
+    dynlst.push_back("string1 with content");
+    dynlst.push_back("string2 other content");
+    dynlst.push_back("string3 more");
+    dynlst.push_back("string4 done");
 
     {
         CStringList inC(dynlst);
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
         dynlst.clear();
         for (int i=0; i<argc; ++i)
         {
-            dynlst.append(argv[i]);
+            dynlst.push_back(argv[i]);
         }
 
         Info<< "input: " << dynlst << endl;
diff --git a/applications/test/dynamicIndexedOctree/Test-dynamicIndexedOctree.C b/applications/test/dynamicIndexedOctree/Test-dynamicIndexedOctree.C
index d297dc8561..ed6593953b 100644
--- a/applications/test/dynamicIndexedOctree/Test-dynamicIndexedOctree.C
+++ b/applications/test/dynamicIndexedOctree/Test-dynamicIndexedOctree.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,14 +68,14 @@ int main(int argc, char *argv[])
     {
         scalar factor = pI/scalar(size);
 
-        pointList.append(0.99*point(factor, factor, factor));
-        pointFieldList[pI] = 0.99*point(factor, factor, factor);
+        pointList.push_back(0.99*point::uniform(factor));
+        pointFieldList[pI] = 0.99*point::uniform(factor);
     }
 
     for (label i=0; i<5; ++i)
     {
-        pointList.append(point(0.95, 0.95,0.95));
-        pointFieldList.append(point(0.95, 0.95,0.95));
+        pointList.emplace_back(0.95, 0.95, 0.95);
+        pointFieldList.emplace_back(0.95, 0.95, 0.95);
     }
 
     Info<< "Time to construct lists of points: "
@@ -148,7 +149,7 @@ int main(int argc, char *argv[])
 // Test point insertion
 
     label index = pointList.size();
-    pointList.append(p);
+    pointList.push_back(p);
 
     Info<< nl << "Inserting point " << p << " with index " << index << endl;
 
@@ -159,7 +160,7 @@ int main(int argc, char *argv[])
         << tree.findNearest(p, 0.4) << endl;
 
     index = pointList.size();
-    pointList.append(p);
+    pointList.push_back(p);
 
     Info<< "Inserting same point " << p << " with index " << index << endl;
 
diff --git a/applications/test/dynamicLibrary/Test-dynamicLibrary.C b/applications/test/dynamicLibrary/Test-dynamicLibrary.C
index c30c84a0c1..1b4048421b 100644
--- a/applications/test/dynamicLibrary/Test-dynamicLibrary.C
+++ b/applications/test/dynamicLibrary/Test-dynamicLibrary.C
@@ -85,8 +85,8 @@ int main(int argc, char *argv[])
         }
         else
         {
-            libPtrs_.append(ptr);
-            libNames_.append(libName);
+            libPtrs_.push_back(ptr);
+            libNames_.push_back(libName);
 
             if (verbose)
             {
diff --git a/applications/test/globalIndex/Test-globalIndex.C b/applications/test/globalIndex/Test-globalIndex.C
index d1f1c851dd..fb92fae5b4 100644
--- a/applications/test/globalIndex/Test-globalIndex.C
+++ b/applications/test/globalIndex/Test-globalIndex.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
     DynamicList<label> globalIDs;
     for (label i = 0; i < 100; i++)
     {
-        globalIDs.append(rndGen.position(label(0), nTotalCells-1));
+        globalIDs.push_back(rndGen.position(label(0), nTotalCells-1));
     }
 
     // Get the cell centres at those cell indices
diff --git a/applications/test/instant/Test-instant.C b/applications/test/instant/Test-instant.C
index 4b6af1e121..4befeb82bd 100644
--- a/applications/test/instant/Test-instant.C
+++ b/applications/test/instant/Test-instant.C
@@ -62,20 +62,20 @@ int main(int argc, char *argv[])
 {
     DynamicList<instant> times;
 
-    times.append(instant{});
-    times.append({12, "abc"});
-    times.append(instant{3.14159});
-    times.append({300.456, "def"});
-    times.append({454.456, "xyz"});
-    times.append({10, "ten"});
-    times.append({15, "fifteen"});
+    times.emplace_back();
+    times.emplace_back(12, "abc");
+    times.emplace_back(3.14159);
+    times.emplace_back(300.456, "def");
+    times.emplace_back(454.456, "xyz");
+    times.emplace_back(10, "ten");
+    times.push_back({15, "fifteen"});
 
     {
         word timeName("twenty");
 
-        Info<<"move append: " << timeName << nl;
-        times.append({20, std::move(timeName)});
-        Info<<"after append: " << timeName << nl;
+        Info<<"move append: <" << timeName << '>' << nl;
+        times.emplace_back(20, std::move(timeName));
+        Info<<"after append: <" << timeName << '>' << nl;
     }
 
     Info<< nl << "times:" << times << nl;
@@ -97,12 +97,12 @@ int main(int argc, char *argv[])
     }
 
     DynamicList<fileNameInstant> files;
-    files.append(fileNameInstant{});
-    files.append({12, "twelve"});
-    files.append({3.14, "/path/almost-pi"});
-    files.append({300, "/dev/value"});
-    files.append({454, "/tmp/xyz"});
-    files.append({10, "ten"});
+    files.emplace_back();
+    files.emplace_back(12, "twelve");
+    files.emplace_back(3.14, "/path/almost-pi");
+    files.emplace_back(300, "/dev/value");
+    files.emplace_back(454, "/tmp/xyz");
+    files.emplace_back(10, "ten");
 
     Info<< nl << "files:" << files << nl;
     sort(files);
diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index 9745184562..fc3b7050c6 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,10 +78,10 @@ int main(int argc, char *argv[])
     {
         Info<<"test sorting" << endl;
         DynamicList<labelRange> list1(10);
-        list1.append(labelRange(25, 8));
-        list1.append(labelRange(8));
-        list1.append(labelRange(15, 5));
-        list1.append(labelRange(50, -10, true));
+        list1.emplace_back(25, 8);
+        list1.emplace_back(8);
+        list1.emplace_back(15, 5);
+        list1.emplace_back(50, -10, true);
 
         sort(list1);
         Info<<"sorted" << list1 << endl;
diff --git a/applications/test/patchRegion/Test-patchRegion.C b/applications/test/patchRegion/Test-patchRegion.C
index 70e6259cac..2d6a42683d 100644
--- a/applications/test/patchRegion/Test-patchRegion.C
+++ b/applications/test/patchRegion/Test-patchRegion.C
@@ -86,11 +86,8 @@ int main(int argc, char *argv[])
 
         forAll(fEdges, i)
         {
-            changedEdges.append(fEdges[i]);
-            changedInfo.append
-            (
-                patchEdgeFaceRegions(labelPair(globalFacei, globalFacei))
-            );
+            changedEdges.push_back(fEdges[i]);
+            changedInfo.emplace_back(labelPair(globalFacei, globalFacei));
         }
     }
 
diff --git a/applications/test/reconstructedDistanceFunction/Test-reconstructedDistanceFunction.C b/applications/test/reconstructedDistanceFunction/Test-reconstructedDistanceFunction.C
index efa5a33b45..55d421d0ce 100644
--- a/applications/test/reconstructedDistanceFunction/Test-reconstructedDistanceFunction.C
+++ b/applications/test/reconstructedDistanceFunction/Test-reconstructedDistanceFunction.C
@@ -108,8 +108,8 @@ int main(int argc, char *argv[])
     {
         if (surf->interfaceCell()[celli])
         {
-            centres.append(surf->centre()[celli]);
-            normals.append(surf->normal()[celli]);
+            centres.push_back(surf->centre()[celli]);
+            normals.push_back(surf->normal()[celli]);
         }
     }
 
diff --git a/applications/test/router/router.C b/applications/test/router/router.C
index b02daebb2e..4af620b480 100644
--- a/applications/test/router/router.C
+++ b/applications/test/router/router.C
@@ -249,7 +249,7 @@ void Foam::router::storeRoute
         {
             if (weights_[nodeI] == pathValue)
             {
-                route.append(nodeI);
+                route.push_back(nodeI);
 
                 storeRoute
                 (
@@ -386,7 +386,7 @@ Foam::labelList Foam::router::getRoute(const label pathValue) const
 
     DynamicList<label> route(weights_.size());
 
-    route.append(startNodeI);
+    route.push_back(startNodeI);
 
     storeRoute(startNodeI, -1, pathValue, route);
 
diff --git a/applications/test/tokenize/Test-tokenize.C b/applications/test/tokenize/Test-tokenize.C
index 38f07d6822..44a743f0d6 100644
--- a/applications/test/tokenize/Test-tokenize.C
+++ b/applications/test/tokenize/Test-tokenize.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 
                 if (tok.good())
                 {
-                    tokens.append(std::move(tok));
+                    tokens.push_back(std::move(tok));
                     if (verbose)
                     {
                         Info<< "after append: " << tok.info() << endl;
diff --git a/applications/test/wordRe/Test-wordRe.C b/applications/test/wordRe/Test-wordRe.C
index bf6551e3a1..ec175154d5 100644
--- a/applications/test/wordRe/Test-wordRe.C
+++ b/applications/test/wordRe/Test-wordRe.C
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
             wordRe wre(wres1[rnd.position<label>(0,last)]);
 
             // Append
-            wres1.append(wre);
+            wres1.push_back(wre);
         }
 
         // Add some entropy
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index ab0a35039e..c074820f4c 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -259,6 +259,11 @@ public:
         template<int AnySizeMin>
         inline void transfer(DynamicList<T, AnySizeMin>& list);
 
+        //- Construct an element at the end of the list,
+        //- return reference to the new list element
+        template<class... Args>
+        inline T& emplace_back(Args&&... args);
+
         //- Copy append an element to the end of this list.
         inline void push_back(const T& val);
 
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 822bbc803a..12ea3ac670 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -503,6 +503,23 @@ Foam::DynamicList<T, SizeMin>::transfer
 }
 
 
+template<class T, int SizeMin>
+template<class... Args>
+inline T& Foam::DynamicList<T, SizeMin>::emplace_back(Args&&... args)
+{
+    // This could/should be better with inplace construction
+    // (as per std::vector), but currently lacking the methods for that
+    // so resize and move assign
+
+    const label idx = List<T>::size();
+    resize(idx + 1);
+
+    // move assign element
+    this->operator[](idx) = T(std::forward<Args>(args)...);
+    return this->back();
+}
+
+
 template<class T, int SizeMin>
 inline void Foam::DynamicList<T, SizeMin>::push_back
 (
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 4539f2e815..0a6cce2a94 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -240,6 +240,12 @@ public:
 
     // Edit
 
+        //- Construct an element at the end of the list,
+        //- return reference to the new list element.
+        //  If this is frequently required, consider a DynamicList instead.
+        template<class... Args>
+        inline T& emplace_back(Args&&... args);
+
         //- Append an element at the end of the list
         //  If this is frequently required, consider a DynamicList
         inline void push_back(const T& val);
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index c585e0b3e0..e50b8fc18f 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -171,6 +171,23 @@ inline T& Foam::List<T>::newElmt(const label i)
 }
 
 
+template<class T>
+template<class... Args>
+inline T& Foam::List<T>::emplace_back(Args&&... args)
+{
+    // This could/should be better with inplace construction
+    // (as per std::vector), but currently lacking the methods for that
+    // so resize and move assign
+
+    const label idx = this->size();
+    resize(idx + 1);
+
+    // move assign element
+    this->operator[](idx) = T(std::forward<Args>(args)...);
+    return this->back();
+}
+
+
 template<class T>
 inline void Foam::List<T>::push_back(const T& val)
 {
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index 587bb9163b..552184af39 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -141,9 +141,10 @@ public:
         template<int AnySizeMin>
         inline void swap(PtrDynList<T, AnySizeMin>& other);
 
-        //- Construct an element at the end of the list
+        //- Construct an element at the end of the list,
+        //- return reference to the new list element
         template<class... Args>
-        inline void emplace_back(Args&&... args);
+        inline T& emplace_back(Args&&... args);
 
         //- Append an element to the end of the list
         inline void push_back(T* ptr);
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index 746b9c2b86..47ac482d83 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -218,9 +218,10 @@ inline void Foam::PtrDynList<T, SizeMin>::swap
 
 template<class T, int SizeMin>
 template<class... Args>
-inline void Foam::PtrDynList<T, SizeMin>::emplace_back(Args&&... args)
+inline T& Foam::PtrDynList<T, SizeMin>::emplace_back(Args&&... args)
 {
     this->push_back(new T(std::forward<Args>(args)...));
+    return this->back();
 }
 
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index a7deaa6423..8a5c89cb61 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,9 +149,10 @@ public:
         //- Same as resize()
         void setSize(const label newLen) { this->resize(newLen); }
 
-        //- Construct and append an element to the end of the list
+        //- Construct and append an element to the end of the list,
+        //- return reference to the new list element
         template<class... Args>
-        inline void emplace_back(Args&&... args);
+        inline T& emplace_back(Args&&... args);
 
         //- Append an element to the end of the list
         inline void push_back(T* ptr);
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
index 3985ccbc08..d08be8d531 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,9 +103,10 @@ inline void Foam::PtrList<T>::clear()
 
 template<class T>
 template<class... Args>
-inline void Foam::PtrList<T>::emplace_back(Args&&... args)
+inline T& Foam::PtrList<T>::emplace_back(Args&&... args)
 {
     UPtrList<T>::push_back(new T(std::forward<Args>(args)...));
+    return this->back();
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 3c62700783..57cffa452b 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -279,21 +279,23 @@ public:
         template<int AnySizeMin>
         inline void transfer(DynamicField<T, AnySizeMin>& list);
 
-        //- Append an element at the end of the list
+        //- Construct an element at the end of the list,
+        //- return reference to the new list element
+        template<class... Args>
+        inline T& emplace_back(Args&&... args);
+
+        //- Copy append an element at the end of the list
         inline void push_back(const T& val);
 
         //- Move append an element
         inline void push_back(T&& val);
 
-        //- Append a List at the end of this list
+        //- Copy append another list to the end of this list
         inline void push_back(const UList<T>& list);
 
         //- Reduce size by 1 or more elements. Can be called on an empty list.
         inline void pop_back(label n = 1);
 
-        //- Remove and return the last element. Fatal on an empty list.
-        inline T remove();
-
 
     // Reading/writing
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index d7b81fcd9e..b96d88d268 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -583,6 +583,23 @@ inline void Foam::DynamicField<T, SizeMin>::transfer
 }
 
 
+template<class T, int SizeMin>
+template<class... Args>
+inline T& Foam::DynamicField<T, SizeMin>::emplace_back(Args&&... args)
+{
+    // This could/should be better with inplace construction
+    // (as per std::vector), but currently lacking the methods for that
+    // so resize and move assign
+
+    const label idx = List<T>::size();
+    resize(idx + 1);
+
+    // move assign element
+    this->operator[](idx) = T(std::forward<Args>(args)...);
+    return this->back();
+}
+
+
 template<class T, int SizeMin>
 inline void Foam::DynamicField<T, SizeMin>::push_back
 (
@@ -646,26 +663,6 @@ inline void Foam::DynamicField<T, SizeMin>::pop_back(label n)
 }
 
 
-template<class T, int SizeMin>
-inline T Foam::DynamicField<T, SizeMin>::remove()
-{
-    // Location of last element and simultaneously the new size
-    const label idx = List<T>::size() - 1;
-
-    if (idx < 0)
-    {
-        FatalErrorInFunction
-            << "List is empty" << abort(FatalError);
-    }
-
-    const T& val = List<T>::operator[](idx);
-
-    List<T>::setAddressableSize(idx);
-
-    return val;
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T, int SizeMin>

From eb8b51b4759456c83ef3fd52bb8128d0a79a4485 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 26 Jan 2023 12:36:53 +0100
Subject: [PATCH 026/348] ENH: use back(), pop_back() instead remove()

- adjust looping to resemble LIFO pattern

STYLE: adjust some string includes
---
 .../pimpleFoam/overPimpleDyMFoam/correctPhi.H |  2 +-
 .../interFoam/overInterDyMFoam/correctPhi.H   |  2 +-
 applications/test/ListOps2/Test-ListOps2.C    |  2 +-
 .../featurePointConformerSpecialisations.C    | 14 ++-----
 .../MSwindows/fileMonitor/fileMonitor.C       | 11 ++---
 .../POSIX/fileMonitor/fileMonitor.C           | 11 ++---
 .../exprResult/exprResultStackTemplates.C     | 10 ++---
 src/OpenFOAM/global/clock/clock.C             |  2 +-
 src/OpenFOAM/global/profiling/profiling.C     | 24 ++++++-----
 .../global/profiling/profilingInformation.H   |  4 +-
 .../global/profiling/profilingTrigger.H       |  4 +-
 .../hexRef8/refinementHistory.C               |  6 +--
 src/fileFormats/fire/FIRECore.H               |  1 -
 src/fileFormats/nastran/NASCore.H             |  1 -
 src/fileFormats/vtk/file/foamVtmWriter.C      | 11 +++--
 src/fileFormats/vtk/format/foamVtkFormatter.C |  7 ++--
 .../faceAreaWeightAMI/faceAreaWeightAMI.C     | 13 +++---
 src/randomProcesses/noise/noiseFFT/noiseFFT.C |  2 +-
 .../noise/noiseModels/noiseModel/noiseModel.C |  2 +-
 .../regionModel/regionModel1D/regionModel1D.C |  2 +-
 .../cellVolumeWeight/cellVolumeWeightMethod.C | 31 +++++++-------
 .../correctedCellVolumeWeightMethod.C         | 33 +++++++--------
 .../calcMethod/direct/directMethod.C          | 15 +++----
 .../calcMethod/mapNearest/mapNearestMethod.C  | 41 +++++++++++--------
 .../reaction/Reactions/Reaction/Reaction.C    |  6 +--
 25 files changed, 125 insertions(+), 132 deletions(-)

diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
index e3dd30ecf7..ed9c1cf119 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
@@ -94,7 +94,7 @@ if (mesh.changing())
             {
                 if (refCells[zoneId] != -1)
                 {
-                    validCells.append(refCells[zoneId]);
+                    validCells.push_back(refCells[zoneId]);
                 }
             }
 
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
index 1174979f41..658a8bcaf7 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
@@ -103,7 +103,7 @@
             {
                 if (refCells[zoneId] != -1)
                 {
-                    validCells.append(refCells[zoneId]);
+                    validCells.push_back(refCells[zoneId]);
                 }
             }
 
diff --git a/applications/test/ListOps2/Test-ListOps2.C b/applications/test/ListOps2/Test-ListOps2.C
index 09afd7946d..7b15ccf1ee 100644
--- a/applications/test/ListOps2/Test-ListOps2.C
+++ b/applications/test/ListOps2/Test-ListOps2.C
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
 
         Info<< nl << "list: " << flatOutput(list) << nl << endl;
 
-        list.remove();
+        list.pop_back();
         Info<<"remove = " << flatOutput(list) << nl;
 
         {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index 5c15a39c3f..bd274824f3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -266,11 +266,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
                     << endl;
 
                 // Remove points that have just been added before returning
-                for (label i = 0; i < 2; ++i)
-                {
-                    pts.remove();
-                    nVert--;
-                }
+                pts.pop_back(2);
+                nVert -= 2;
 
                 return false;
             }
@@ -702,11 +699,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
                     << endl;
 
                 // Remove points that have just been added before returning
-                for (label i = 0; i < 2; ++i)
-                {
-                    pts.remove();
-                    nVert--;
-                }
+                pts.pop_back(2);
+                nVert -= 2;
 
                 return false;
             }
diff --git a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
index d6b9f0295c..224adaf476 100644
--- a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
+++ b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
@@ -456,15 +456,12 @@ Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
         Pout<< "fileMonitor : adding watch on file " << fName << endl;
     }
 
-    label watchFd;
+    label watchFd = state_.size();
 
-    if (freeWatchFds_.size())
+    if (!freeWatchFds_.empty())
     {
-        watchFd = freeWatchFds_.remove();
-    }
-    else
-    {
-        watchFd = state_.size();
+        watchFd = freeWatchFds_.back();
+        freeWatchFds_.pop_back();
     }
 
     watcher_->addWatch(watchFd, fName);
diff --git a/src/OSspecific/POSIX/fileMonitor/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
index 5241a5b4ba..d3c687fb67 100644
--- a/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
@@ -452,15 +452,12 @@ Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
         Pout<< "fileMonitor : adding watch on file " << fName << endl;
     }
 
-    label watchFd;
+    label watchFd = state_.size();
 
-    if (freeWatchFds_.size())
+    if (!freeWatchFds_.empty())
     {
-        watchFd = freeWatchFds_.remove();
-    }
-    else
-    {
-        watchFd = state_.size();
+        watchFd = freeWatchFds_.back();
+        freeWatchFds_.pop_back();
     }
 
     watcher_->addWatch(watchFd, fName);
diff --git a/src/OpenFOAM/expressions/exprResult/exprResultStackTemplates.C b/src/OpenFOAM/expressions/exprResult/exprResultStackTemplates.C
index e85d66c9fe..60093caf3f 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultStackTemplates.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResultStackTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2012-2018 Bernhard Gschaider <bgschaid@hfd-research.com>
+    Copyright (C) 2012-2018 Bernhard Gschaider
     Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,10 @@ bool Foam::expressions::exprResultStack::pushChecked
 
     if (!resultField.empty())
     {
-        val = resultField.first();
+        val = resultField.front();
     }
 
-    this->ref<T>().append(val);
+    this->ref<T>().push_back(val);
 
     return true;
 }
@@ -71,8 +71,8 @@ bool Foam::expressions::exprResultStack::popChecked
 
     if (!oldField.empty())
     {
-        val = oldField.last();
-        oldField.resize(oldField.size()-1);
+        val = oldField.back();
+        oldField.pop_back();
     }
 
     result.setSingleValue(val);
diff --git a/src/OpenFOAM/global/clock/clock.C b/src/OpenFOAM/global/clock/clock.C
index 3c10d4e642..26f204cd08 100644
--- a/src/OpenFOAM/global/clock/clock.C
+++ b/src/OpenFOAM/global/clock/clock.C
@@ -27,8 +27,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "clock.H"
-#include "string.H"
 
+#include <string>
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/OpenFOAM/global/profiling/profiling.C b/src/OpenFOAM/global/profiling/profiling.C
index b5e23c8251..74fb946cb9 100644
--- a/src/OpenFOAM/global/profiling/profiling.C
+++ b/src/OpenFOAM/global/profiling/profiling.C
@@ -51,9 +51,9 @@ Foam::profilingInformation* Foam::profiling::create()
 
     Information* info = new Information;
 
-    pool_.append(info);
+    pool_.push_back(info);
     children_.resize(pool_.size());
-    children_.last().clear();  // safety
+    children_.back().clear();  // safety
 
     return info;
 }
@@ -77,10 +77,10 @@ Foam::profilingInformation* Foam::profiling::create
 
     Information* info = new Information(parent, descr, pool_.size());
 
-    pool_.append(info);
+    pool_.push_back(info);
     children_.resize(pool_.size());
-    children_.last().clear();  // safety
-    children_[parentId].append(info);
+    children_.back().clear();  // safety
+    children_[parentId].push_back(info);
 
     return info;
 }
@@ -88,16 +88,18 @@ Foam::profilingInformation* Foam::profiling::create
 
 void Foam::profiling::beginTimer(profilingInformation *info)
 {
-    stack_.append(info);
-    times_.append(clockValue::now());
+    stack_.push_back(info);
+    times_.push_back(clockValue::now());
     info->setActive(true);              // Mark as on stack
 }
 
 
 Foam::profilingInformation* Foam::profiling::endTimer()
 {
-    Information *info = stack_.remove();
-    clockValue clockval = times_.remove();
+    Information *info = stack_.back();
+    clockValue clockval = times_.back();
+    stack_.pop_back();
+    times_.pop_back();
 
     info->update(clockval.elapsed());   // Update elapsed time
     info->setActive(false);             // Mark as off stack
@@ -184,7 +186,7 @@ Foam::profilingInformation* Foam::profiling::New(const string& descr)
 
     if (active())
     {
-        Information *parent = singleton_->stack_.last();
+        Information *parent = singleton_->stack_.back();
 
         info = singleton_->create(parent, descr);
         singleton_->beginTimer(info);
@@ -320,7 +322,7 @@ bool Foam::profiling::writeData(Ostream& os) const
     {
         elapsed[stacki] = (now - times_[stacki]);
     }
-    elapsed.last() = 0;
+    elapsed.back() = 0;
 
     os.beginBlock("profiling");
 
diff --git a/src/OpenFOAM/global/profiling/profilingInformation.H b/src/OpenFOAM/global/profiling/profilingInformation.H
index 367726da68..578e5fb1d0 100644
--- a/src/OpenFOAM/global/profiling/profilingInformation.H
+++ b/src/OpenFOAM/global/profiling/profilingInformation.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef profilingInformation_H
-#define profilingInformation_H
+#ifndef Foam_profilingInformation_H
+#define Foam_profilingInformation_H
 
 #include "label.H"
 #include "scalar.H"
diff --git a/src/OpenFOAM/global/profiling/profilingTrigger.H b/src/OpenFOAM/global/profiling/profilingTrigger.H
index 6082bf2576..236122d29b 100644
--- a/src/OpenFOAM/global/profiling/profilingTrigger.H
+++ b/src/OpenFOAM/global/profiling/profilingTrigger.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef profilingTrigger_H
-#define profilingTrigger_H
+#ifndef Foam_profilingTrigger_H
+#define Foam_profilingTrigger_H
 
 #include "string.H"
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index e2b1e23818..d23d23737d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@@ -271,15 +271,15 @@ Foam::label Foam::refinementHistory::allocateSplitCell
 
     if (freeSplitCells_.size())
     {
-        index = freeSplitCells_.remove();
+        index = freeSplitCells_.back();
+        freeSplitCells_.pop_back();
 
         splitCells_[index] = splitCell8(parent);
     }
     else
     {
         index = splitCells_.size();
-
-        splitCells_.append(splitCell8(parent));
+        splitCells_.push_back(splitCell8(parent));
     }
 
 
diff --git a/src/fileFormats/fire/FIRECore.H b/src/fileFormats/fire/FIRECore.H
index 0db246f32a..ce7bed379d 100644
--- a/src/fileFormats/fire/FIRECore.H
+++ b/src/fileFormats/fire/FIRECore.H
@@ -38,7 +38,6 @@ SourceFiles
 #define FIRECore_H
 
 #include "point.H"
-#include "string.H"
 #include "labelList.H"
 #include "pointField.H"
 #include "IOstreams.H"
diff --git a/src/fileFormats/nastran/NASCore.H b/src/fileFormats/nastran/NASCore.H
index 0fd8e9b160..f41c3b23b9 100644
--- a/src/fileFormats/nastran/NASCore.H
+++ b/src/fileFormats/nastran/NASCore.H
@@ -38,7 +38,6 @@ SourceFiles
 #define Foam_fileFormats_NASCore_H
 
 #include "scalar.H"
-#include "string.H"
 #include "Enum.H"
 #include "face.H"
 #include "point.H"
diff --git a/src/fileFormats/vtk/file/foamVtmWriter.C b/src/fileFormats/vtk/file/foamVtmWriter.C
index cf5b75160f..35f051b0e7 100644
--- a/src/fileFormats/vtk/file/foamVtmWriter.C
+++ b/src/fileFormats/vtk/file/foamVtmWriter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -399,18 +399,17 @@ Foam::label Foam::vtk::vtmWriter::endBlock(const word& blockName)
 {
     if (!blocks_.empty())
     {
-        const word curr(blocks_.remove());
-
         // Verify expected end tag
-        if (!blockName.empty() && blockName != curr)
+        if (!blockName.empty() && blockName != blocks_.back())
         {
             WarningInFunction
                 << "expecting to end block '" << blockName
-                << "' but found '" << curr << "' instead"
+                << "' but found '" << blocks_.back() << "' instead"
                 << endl;
         }
 
-        entries_.append(vtmEntry::endblock());
+        blocks_.pop_back();
+        entries_.push_back(vtmEntry::endblock());
     }
 
     return blocks_.size();
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index f5e11ce1cb..a9c62304ed 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -112,7 +112,7 @@ Foam::vtk::formatter& Foam::vtk::formatter::closeTag(const bool isEmpty)
         if (isEmpty)
         {
             // Eg, <tag ... />
-            xmlTags_.remove();
+            xmlTags_.pop_back();
             os_ << " /";
         }
         os_ << '>' << nl;
@@ -124,7 +124,8 @@ Foam::vtk::formatter& Foam::vtk::formatter::closeTag(const bool isEmpty)
 
 Foam::vtk::formatter& Foam::vtk::formatter::endTag(const word& tagName)
 {
-    const word curr(xmlTags_.remove());
+    const word curr(std::move(xmlTags_.back()));
+    xmlTags_.pop_back();
     indent();
 
     if (inTag_)
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
index ccf7556809..1a7c197aee 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
@@ -131,6 +131,7 @@ void Foam::faceAreaWeightAMI::calcAddressing
 
     bool continueWalk = true;
     DynamicList<label> nonOverlapFaces;
+
     do
     {
         nbrFaces.clear();
@@ -212,11 +213,12 @@ bool Foam::faceAreaWeightAMI::processSourceFace
 
     label maxNeighbourFaces = nbrFaces.size();
 
-    do
+    while (!nbrFaces.empty())
     {
-        // process new target face
-        label tgtFacei = nbrFaces.remove();
-        visitedFaces.append(tgtFacei);
+        // Process new target face as LIFO
+        label tgtFacei = nbrFaces.back();
+        nbrFaces.pop_back();
+        visitedFaces.push_back(tgtFacei);
 
         scalar interArea = 0;
         vector interCentroid(Zero);
@@ -238,8 +240,7 @@ bool Foam::faceAreaWeightAMI::processSourceFace
 
             maxNeighbourFaces = max(maxNeighbourFaces, nbrFaces.size());
         }
-
-    } while (nbrFaces.size() > 0);
+    }
 
     if (debug > 1)
     {
diff --git a/src/randomProcesses/noise/noiseFFT/noiseFFT.C b/src/randomProcesses/noise/noiseFFT/noiseFFT.C
index 946a54e79e..ac3fbe8cad 100644
--- a/src/randomProcesses/noise/noiseFFT/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT/noiseFFT.C
@@ -132,7 +132,7 @@ void Foam::noiseFFT::octaveBandInfo
     if (fc.size())
     {
         // Remove the last centre frequency (beyond upper frequency limit)
-        fc.remove();
+        fc.pop_back();
 
         fCentre.transfer(fc);
     }
diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
index e2f1246b01..f72297c6e5 100644
--- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
+++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
@@ -130,7 +130,7 @@ void Foam::noiseModel::setOctaveBands
     if (fc.size())
     {
         // Remove the last centre frequency (beyond upper frequency limit)
-        fc.remove();
+        fc.pop_back();
 
         fCentre.transfer(fc);
     }
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index efcd412133..4b3e66278f 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -121,7 +121,7 @@ void Foam::regionModels::regionModel1D::initialise()
             } while (regionMesh().isInternalFace(facei));
 
             boundaryFaceOppositeFace_[localPyrolysisFacei] = facei;
-            //faceIDs.remove(); //remove boundary face.
+            //faceIDs.pop_back(); //remove boundary face.
 
             boundaryFaceFaces_[localPyrolysisFacei].transfer(faceIDs);
             boundaryFaceCells_[localPyrolysisFacei].transfer(cellIDs);
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index cf27c942d4..4e4a426491 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
@@ -113,11 +113,11 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
     List<DynamicList<label>> tgtToSrcAddr(tgt_.nCells());
     List<DynamicList<scalar>> tgtToSrcWght(tgt_.nCells());
 
-    // list of tgt cell neighbour cells
-    DynamicList<label> nbrTgtCells(10);
+    // List of tgt cell neighbour cells
+    DynamicList<label> queuedCells(10);
 
-    // list of tgt cells currently visited for srcCelli to avoid multiple hits
-    DynamicList<label> visitedTgtCells(10);
+    // List of tgt cells currently visited for srcCellI to avoid multiple hits
+    DynamicList<label> visitedCells(10);
 
     // list to keep track of tgt cells used to seed src cells
     labelList seedCells(src_.nCells(), -1);
@@ -127,17 +127,19 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
 
     do
     {
-        nbrTgtCells.clear();
-        visitedTgtCells.clear();
+        queuedCells.clear();
+        visitedCells.clear();
 
-        // append initial target cell and neighbours
-        nbrTgtCells.append(tgtCelli);
-        appendNbrCells(tgtCelli, tgt_, visitedTgtCells, nbrTgtCells);
+        // Initial target cell and neighbours
+        queuedCells.push_back(tgtCelli);
+        appendNbrCells(tgtCelli, tgt_, visitedCells, queuedCells);
 
-        do
+        while (!queuedCells.empty())
         {
-            tgtCelli = nbrTgtCells.remove();
-            visitedTgtCells.append(tgtCelli);
+            // Process new target cell as LIFO
+            tgtCelli = queuedCells.back();
+            queuedCells.pop_back();
+            visitedCells.push_back(tgtCelli);
 
             scalar vol = interVol(srcCelli, tgtCelli);
 
@@ -151,13 +153,12 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
                 tgtToSrcAddr[tgtCelli].append(srcCelli);
                 tgtToSrcWght[tgtCelli].append(vol);
 
-                appendNbrCells(tgtCelli, tgt_, visitedTgtCells, nbrTgtCells);
+                appendNbrCells(tgtCelli, tgt_, visitedCells, queuedCells);
 
                 // accumulate intersection volume
                 V_ += vol;
             }
         }
-        while (!nbrTgtCells.empty());
 
         mapFlag[srcCelli] = false;
 
@@ -169,7 +170,7 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
             tgtCelli,
             srcCellIDs,
             mapFlag,
-            visitedTgtCells,
+            visitedCells,
             seedCells
         );
     }
diff --git a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
index 0613ea5db0..373064c7ea 100644
--- a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
@@ -70,13 +70,13 @@ void Foam::correctedCellVolumeWeightMethod::calculateAddressing
     List<DynamicList<scalar>> tgtToSrcWght(tgt_.nCells());
     List<DynamicList<point>> tgtToSrcVec(tgt_.nCells());
 
-    // list of tgt cell neighbour cells
-    DynamicList<label> nbrTgtCells(10);
+    // List of tgt cell neighbour cells
+    DynamicList<label> queuedCells(10);
 
-    // list of tgt cells currently visited for srcCellI to avoid multiple hits
-    DynamicList<label> visitedTgtCells(10);
+    // List of tgt cells currently visited for srcCellI to avoid multiple hits
+    DynamicList<label> visitedCells(10);
 
-    // list to keep track of tgt cells used to seed src cells
+    // List to keep track of tgt cells used to seed src cells
     labelList seedCells(src_.nCells(), -1);
     seedCells[srcCellI] = tgtCellI;
 
@@ -86,17 +86,19 @@ void Foam::correctedCellVolumeWeightMethod::calculateAddressing
 
     do
     {
-        nbrTgtCells.clear();
-        visitedTgtCells.clear();
+        queuedCells.clear();
+        visitedCells.clear();
 
-        // append initial target cell and neighbours
-        nbrTgtCells.append(tgtCellI);
-        appendNbrCells(tgtCellI, tgt_, visitedTgtCells, nbrTgtCells);
+        // Initial target cell and neighbours
+        queuedCells.push_back(tgtCellI);
+        appendNbrCells(tgtCellI, tgt_, visitedCells, queuedCells);
 
-        do
+        while (!queuedCells.empty())
         {
-            tgtCellI = nbrTgtCells.remove();
-            visitedTgtCells.append(tgtCellI);
+            // Process new target cell as LIFO
+            tgtCellI = queuedCells.back();
+            queuedCells.pop_back();
+            visitedCells.push_back(tgtCellI);
 
             Tuple2<scalar, point> vol = interVolAndCentroid
             (
@@ -116,13 +118,12 @@ void Foam::correctedCellVolumeWeightMethod::calculateAddressing
                 tgtToSrcWght[tgtCellI].append(vol.first());
                 tgtToSrcVec[tgtCellI].append(vol.second()-srcCc[srcCellI]);
 
-                appendNbrCells(tgtCellI, tgt_, visitedTgtCells, nbrTgtCells);
+                appendNbrCells(tgtCellI, tgt_, visitedCells, queuedCells);
 
                 // accumulate intersection volume
                 V_ += vol.first();
             }
         }
-        while (!nbrTgtCells.empty());
 
         mapFlag[srcCellI] = false;
 
@@ -134,7 +135,7 @@ void Foam::correctedCellVolumeWeightMethod::calculateAddressing
             tgtCellI,
             srcCellIDs,
             mapFlag,
-            visitedTgtCells,
+            visitedCells,
             seedCells
         );
     }
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
index 79632868d2..14c360d0e3 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
@@ -174,27 +174,23 @@ void Foam::directMethod::appendToDirectSeeds
     const labelList& srcNbr = src_.cellCells()[srcSeedI];
     const labelList& tgtNbr = tgt_.cellCells()[tgtSeedI];
 
-    forAll(srcNbr, i)
+    for (const label srcI : srcNbr)
     {
-        label srcI = srcNbr[i];
-
         if (mapFlag[srcI] && (srcTgtSeed[srcI] == -1))
         {
             // source cell srcI not yet mapped
 
             // identify if target cell exists for source cell srcI
             bool found = false;
-            forAll(tgtNbr, j)
+            for (const label tgtI : tgtNbr)
             {
-                label tgtI = tgtNbr[j];
-
                 if (intersect(srcI, tgtI))
                 {
                     // new match - append to lists
                     found = true;
 
                     srcTgtSeed[srcI] = tgtI;
-                    srcSeeds.append(srcI);
+                    srcSeeds.push_back(srcI);
 
                     break;
                 }
@@ -208,10 +204,11 @@ void Foam::directMethod::appendToDirectSeeds
         }
     }
 
-    if (srcSeeds.size())
+    if (!srcSeeds.empty())
     {
-        srcSeedI = srcSeeds.remove();
+        srcSeedI = srcSeeds.back();
         tgtSeedI = srcTgtSeed[srcSeedI];
+        srcSeeds.pop_back();
     }
     else
     {
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
index 679c8c022f..051bea9d35 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
@@ -217,27 +217,29 @@ void Foam::mapNearestMethod::findNearestCell
 
     const vector& p1 = Cc1[cell1];
 
-    DynamicList<label> cells2(10);
-    cells2.append(cell2);
-
+    DynamicList<label> queuedCells(10);
     DynamicList<label> visitedCells(10);
 
+    queuedCells.push_back(cell2);
+
     scalar d = GREAT;
 
-    do
+    while (!queuedCells.empty())
     {
-        label c2 = cells2.remove();
-        visitedCells.append(c2);
+        // Process as LIFO
+        const label currCelli = queuedCells.back();
+        queuedCells.pop_back();
+        visitedCells.push_back(currCelli);
+
+        scalar dTest = p1.distSqr(Cc2[currCelli]);
 
-        scalar dTest = magSqr(Cc2[c2] - p1);
         if (dTest < d)
         {
-            cell2 = c2;
+            cell2 = currCelli;
             d = dTest;
-            appendNbrCells(cell2, mesh2, visitedCells, cells2);
+            appendNbrCells(cell2, mesh2, visitedCells, queuedCells);
         }
-
-    } while (cells2.size() > 0);
+    }
 }
 
 
@@ -290,19 +292,22 @@ Foam::label Foam::mapNearestMethod::findMappedSrcCell
     const List<DynamicList<label>>& tgtToSrc
 ) const
 {
-    DynamicList<label> testCells(16);
+    DynamicList<label> queuedCells(16);
     DynamicList<label> visitedCells(16);
 
-    testCells.append(tgtCelli);
+    queuedCells.push_back(tgtCelli);
 
-    do
+    while (!queuedCells.empty())
     {
+        // Process as LIFO
+        const label tgtI = queuedCells.back();
+        queuedCells.pop_back();
+
         // search target tgtCelli neighbours for match with source cell
-        label tgtI = testCells.remove();
 
         if (!visitedCells.found(tgtI))
         {
-            visitedCells.append(tgtI);
+            visitedCells.push_back(tgtI);
 
             if (tgtToSrc[tgtI].size())
             {
@@ -316,12 +321,12 @@ Foam::label Foam::mapNearestMethod::findMappedSrcCell
                 {
                     if (!visitedCells.found(nbrCelli))
                     {
-                        testCells.append(nbrCelli);
+                        queuedCells.push_back(nbrCelli);
                     }
                 }
             }
         }
-    } while (testCells.size());
+    }
 
     // did not find any match - should not be possible to get here!
     return -1;
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index c75b8202bb..89b9fa51e2 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -259,11 +259,11 @@ void Foam::Reaction<ReactionThermo>::setLRhs
 
     while (is.good())
     {
-        dlrhs.append(specieCoeffs(species, is, failUnknownSpecie));
+        dlrhs.push_back(specieCoeffs(species, is, failUnknownSpecie));
 
-        if (dlrhs.last().index < 0)
+        if (dlrhs.back().index < 0)
         {
-            dlrhs.remove();
+            dlrhs.pop_back();
         }
 
         if (is.good())

From ea2bedf073fd3c7fd575a02eed438f7530469abb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 26 Jan 2023 17:12:45 +0100
Subject: [PATCH 027/348] ENH: add coupledFaPatch::delta()

- symmetrical evaluation for processor patches, eliminates
  scalar/vector multiply followed by projection.

STYLE: use evaluateCoupled instead of local versions
---
 .../applyBoundaryLayer/applyBoundaryLayer.C   | 49 +++++--------------
 .../setTurbulenceFields/setTurbulenceFields.C | 46 +++++------------
 .../faPatches/basic/coupled/coupledFaPatch.C  | 46 ++++++++++-------
 .../faPatches/basic/coupled/coupledFaPatch.H  |  2 +-
 .../constraint/cyclic/cyclicFaPatch.C         | 10 ++--
 .../constraint/processor/processorFaPatch.C   | 24 ++++-----
 .../faMesh/faPatches/faPatch/faPatch.C        |  6 +--
 .../fvPatches/basic/coupled/coupledFvPatch.C  |  8 +--
 .../fvPatches/basic/coupled/coupledFvPatch.H  | 10 ++--
 9 files changed, 80 insertions(+), 121 deletions(-)

diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index bd44fb7672..63f0e514ff 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -50,8 +50,7 @@ Description
 #include "turbulentTransportModel.H"
 #include "turbulentFluidThermoModel.H"
 #include "wallDist.H"
-#include "processorFvPatchField.H"
-#include "zeroGradientFvPatchField.H"
+#include "processorFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,35 +60,11 @@ static const scalar kappa(0.41);
 
 
 template<class Type>
-void correctProcessorPatches
-(
-    GeometricField<Type, fvPatchField, volMesh>& vf
-)
+void correctProcessorPatches(GeometricField<Type, fvPatchField, volMesh>& fld)
 {
-    if (!Pstream::parRun())
+    if (UPstream::parRun())
     {
-        return;
-    }
-
-    // Not possible to use correctBoundaryConditions on fields as they may
-    // use local info as opposed to the constraint values employed here,
-    // but still need to update processor patches
-    auto& bf = vf.boundaryFieldRef();
-
-    forAll(bf, patchi)
-    {
-        if (isA<processorFvPatchField<Type>>(bf[patchi]))
-        {
-            bf[patchi].initEvaluate();
-        }
-    }
-
-    forAll(bf, patchi)
-    {
-        if (isA<processorFvPatchField<Type>>(bf[patchi]))
-        {
-            bf[patchi].evaluate();
-        }
+        fld.boundaryFieldRef().template evaluateCoupled<processorFvPatch>();
     }
 }
 
@@ -119,11 +94,11 @@ void blendField
         pf = (1 - mask)*pf + mask*boundaryLayerField;
         fld.max(SMALL);
 
+        // Correct the processor patches only.
         // Do not correct BC
         // - operation may use inconsistent fields wrt these local
         //   manipulations
-        //fld.correctBoundaryConditions();
-        correctProcessorPatches<scalar>(fld);
+        correctProcessorPatches(fld);
 
         Info<< "Writing " << fieldName << nl << endl;
         fld.write();
@@ -158,11 +133,11 @@ void calcOmegaField
         pf = (1 - mask)*pf + mask*epsilonBL/(Cmu*kBL + SMALL);
         omega.max(SMALL);
 
+        // Correct the processor patches only.
         // Do not correct BC
         // - operation may use inconsistent fields wrt these local
         //   manipulations
-        // omega.correctBoundaryConditions();
-        correctProcessorPatches<scalar>(omega);
+        correctProcessorPatches(omega);
 
         Info<< "Writing omega\n" << endl;
         omega.write();
@@ -192,11 +167,11 @@ void setField
         volScalarField fld(fldHeader, mesh);
         fld = value;
 
+        // Correct the processor patches only.
         // Do not correct BC
         // - operation may use inconsistent fields wrt these local
         //   manipulations
-        // fld.correctBoundaryConditions();
-        correctProcessorPatches<scalar>(fld);
+        correctProcessorPatches(fld);
 
         Info<< "Writing " << fieldName << nl << endl;
         fld.write();
@@ -343,7 +318,7 @@ int main(int argc, char *argv[])
         }
     }
     mask.correctBoundaryConditions();
-    correctProcessorPatches<vector>(U);
+    correctProcessorPatches(U);
 
     if (writeTurbulenceFields)
     {
@@ -356,7 +331,7 @@ int main(int argc, char *argv[])
 
         // Do not correct BC - wall functions will 'undo' manipulation above
         // by using nut from turbulence model
-        correctProcessorPatches<scalar>(nut);
+        correctProcessorPatches(nut);
 
         Info<< "Writing nut\n" << endl;
         nut.write();
diff --git a/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C b/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
index c5351daf5d..06481f514a 100644
--- a/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
+++ b/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
@@ -109,8 +109,8 @@ Note
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "turbulentFluidThermoModel.H"
-#include "processorFvPatchField.H"
 #include "wallFvPatch.H"
+#include "processorFvPatch.H"
 #include "fixedValueFvPatchFields.H"
 
 using namespace Foam;
@@ -124,35 +124,11 @@ void InfoField(const word& fldName)
 
 
 template<class Type>
-void correctProcessorPatches
-(
-    GeometricField<Type, fvPatchField, volMesh>& vf
-)
+void correctProcessorPatches(GeometricField<Type, fvPatchField, volMesh>& fld)
 {
-    if (!Pstream::parRun())
+    if (UPstream::parRun())
     {
-        return;
-    }
-
-    // Not possible to use correctBoundaryConditions on fields as they may
-    // use local info as opposed to the constraint values employed here,
-    // but still need to update processor patches
-    auto& bf = vf.boundaryFieldRef();
-
-    forAll(bf, patchi)
-    {
-        if (isA<processorFvPatchField<Type>>(bf[patchi]))
-        {
-            bf[patchi].initEvaluate();
-        }
-    }
-
-    forAll(bf, patchi)
-    {
-        if (isA<processorFvPatchField<Type>>(bf[patchi]))
-        {
-            bf[patchi].evaluate();
-        }
+        fld.boundaryFieldRef().template evaluateCoupled<processorFvPatch>();
     }
 }
 
@@ -411,7 +387,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensionedScalar(dimless, scalar(1)),
-        fixedValueFvPatchField<scalar>::typeName
+        fixedValueFvPatchScalarField::typeName
     );
 
     for (fvPatchScalarField& pfld : f.boundaryFieldRef())
@@ -482,31 +458,31 @@ int main(int argc, char *argv[])
         // (M:Eq. 9)
         const dimensionedScalar maxU(dimVelocity, SMALL);
         U *= min(scalar(1), fRei*uTau/max(mag(U), maxU));
-        correctProcessorPatches<vector>(U);
+        correctProcessorPatches(U);
     }
 
     if (tepsilon.valid())
     {
         tepsilon.ref() = epsilon;
-        correctProcessorPatches<scalar>(tepsilon.ref());
+        correctProcessorPatches(tepsilon.ref());
     }
 
     if (tk.valid())
     {
         tk.ref() = k;
-        correctProcessorPatches<scalar>(tk.ref());
+        correctProcessorPatches(tk.ref());
     }
 
     if (tomega.valid())
     {
         const dimensionedScalar k0(sqr(dimLength/dimTime), SMALL);
         tomega.ref() = Cmu*epsilon/(k + k0);
-        correctProcessorPatches<scalar>(tomega.ref());
+        correctProcessorPatches(tomega.ref());
     }
 
     if (tR.valid())
     {
-        volSymmTensorField& R = tR.ref();
+        auto& R = tR.ref();
 
         // (M:Eq. 3)
         const volSphericalTensorField Rdiag(k*twoThirdsI);
@@ -514,7 +490,7 @@ int main(int argc, char *argv[])
         {
             R[celli] = Rdiag[celli];
         }
-        correctProcessorPatches<symmTensor>(R);
+        correctProcessorPatches(R);
     }
 
 
diff --git a/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.C b/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.C
index 8ca96bbdaa..4b005fe272 100644
--- a/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +33,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(coupledFaPatch, 0);
+    defineTypeName(coupledFaPatch);
 }
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -47,25 +48,28 @@ void Foam::coupledFaPatch::calcTransformTensors
 {
     if (mag(nf & nr) < 1 - SMALL)
     {
-        separation_.setSize(0);
+        separation_.clear();
+        forwardT_.resize(1);
+        reverseT_.resize(1);
 
-        forwardT_ = tensorField(1, rotationTensor(-nr, nf));
-        reverseT_ = tensorField(1, rotationTensor(nf, -nr));
+        forwardT_[0] = rotationTensor(-nr, nf);
+        reverseT_[0] = rotationTensor(nf, -nr);
     }
     else
     {
-        forwardT_.setSize(0);
-        reverseT_.setSize(0);
+        forwardT_.clear();
+        reverseT_.clear();
 
         vector separation = (nf & (Cr - Cf))*nf;
 
         if (mag(separation) > SMALL)
         {
-            separation_ = vectorField(1, separation);
+            separation_.resize(1);
+            separation_[0] = separation;
         }
         else
         {
-            separation_.setSize(0);
+            separation_.clear();
         }
     }
 }
@@ -81,10 +85,10 @@ void Foam::coupledFaPatch::calcTransformTensors
 {
     if (sum(mag(nf & nr)) < Cf.size() - SMALL)
     {
-        separation_.setSize(0);
+        separation_.clear();
 
-        forwardT_.setSize(size());
-        reverseT_.setSize(size());
+        forwardT_.resize_nocopy(size());
+        reverseT_.resize_nocopy(size());
 
         forAll(forwardT_, facei)
         {
@@ -94,27 +98,35 @@ void Foam::coupledFaPatch::calcTransformTensors
 
         if (sum(mag(forwardT_ - forwardT_[0])) < SMALL)
         {
-            forwardT_.setSize(1);
-            reverseT_.setSize(1);
+            forwardT_.resize(1);
+            reverseT_.resize(1);
         }
     }
     else
     {
-        forwardT_.setSize(0);
-        reverseT_.setSize(0);
+        forwardT_.clear();
+        reverseT_.clear();
 
         separation_ = (nf&(Cr - Cf))*nf;
 
         if (sum(mag(separation_)) < SMALL)
         {
-            separation_.setSize(0);
+            separation_.clear();
         }
         else if (sum(mag(separation_ - separation_[0])) < SMALL)
         {
-            separation_.setSize(1);
+            separation_.resize(1);
         }
     }
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::vectorField> Foam::coupledFaPatch::delta() const
+{
+    return (edgeCentres() - edgeFaceCentres());
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H b/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H
index 47e59cbe5f..0b3b9f12e4 100644
--- a/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H
+++ b/src/finiteArea/faMesh/faPatches/basic/coupled/coupledFaPatch.H
@@ -104,7 +104,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("coupled");
+    TypeNameNoDebug("coupled");
 
 
     // Constructors
diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
index d1ebed1da7..f513163190 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C
@@ -169,7 +169,7 @@ void Foam::cyclicFaPatch::makeWeights(scalarField& w) const
 {
     const scalarField& magL = magEdgeLengths();
 
-    const scalarField deltas(edgeNormals() & faPatch::delta());
+    const scalarField deltas(edgeNormals() & coupledFaPatch::delta());
     const label sizeby2 = deltas.size()/2;
 
     scalar maxMatchError = 0;
@@ -222,7 +222,7 @@ void Foam::cyclicFaPatch::makeWeights(scalarField& w) const
 
 void Foam::cyclicFaPatch::makeDeltaCoeffs(scalarField& dc) const
 {
-    const scalarField deltas(edgeNormals() & faPatch::delta());
+    const scalarField deltas(edgeNormals() & coupledFaPatch::delta());
     const label sizeby2 = deltas.size()/2;
 
     for (label edgei = 0; edgei < sizeby2; ++edgei)
@@ -272,7 +272,7 @@ void Foam::cyclicFaPatch::movePoints
 
 Foam::tmp<Foam::vectorField> Foam::cyclicFaPatch::delta() const
 {
-    const vectorField patchD(faPatch::delta());
+    const vectorField patchD(coupledFaPatch::delta());
     const label sizeby2 = patchD.size()/2;
 
     auto tpdv = tmp<vectorField>::New(patchD.size());
@@ -284,7 +284,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicFaPatch::delta() const
         for (label edgei = 0; edgei < sizeby2; ++edgei)
         {
             const vector& ddi = patchD[edgei];
-            vector dni = patchD[edgei + sizeby2];
+            const vector& dni = patchD[edgei + sizeby2];
 
             pdv[edgei] = ddi - dni;
             pdv[edgei + sizeby2] = -pdv[edgei];
@@ -295,7 +295,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicFaPatch::delta() const
         for (label edgei = 0; edgei < sizeby2; ++edgei)
         {
             const vector& ddi = patchD[edgei];
-            vector dni = patchD[edgei + sizeby2];
+            const vector& dni = patchD[edgei + sizeby2];
 
             pdv[edgei] = ddi - transform(forwardT()[0], dni);
             pdv[edgei + sizeby2] = -transform(reverseT()[0], pdv[edgei]);
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index d19a16e143..df278c6005 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -395,7 +395,7 @@ void Foam::processorFaPatch::makeWeights(scalarField& w) const
         (
             (
                 neighbEdgeLengths()
-               /mag(neighbEdgeLengths())
+               /(mag(neighbEdgeLengths()) + VSMALL)
             )
           & (
               neighbEdgeCentres()
@@ -405,13 +405,13 @@ void Foam::processorFaPatch::makeWeights(scalarField& w) const
 
         w = neighbEdgeCentresCn/
             (
-                (edgeNormals() & faPatch::delta())
-              + neighbEdgeCentresCn
+                (edgeNormals() & coupledFaPatch::delta())
+              + neighbEdgeCentresCn + VSMALL
             );
     }
     else
     {
-        w = 1.0;
+        w = scalar(1);
     }
 }
 
@@ -420,11 +420,13 @@ void Foam::processorFaPatch::makeDeltaCoeffs(scalarField& dc) const
 {
     if (Pstream::parRun())
     {
-        dc = (1.0 - weights())/(edgeNormals() & faPatch::delta());
+        dc = (1.0 - weights())
+            /((edgeNormals() & coupledFaPatch::delta()) + VSMALL);
     }
     else
     {
-        dc = 1.0/(edgeNormals() & faPatch::delta());
+        dc = scalar(1)
+            /((edgeNormals() & coupledFaPatch::delta()) + VSMALL);
     }
 }
 
@@ -433,11 +435,11 @@ Foam::tmp<Foam::vectorField> Foam::processorFaPatch::delta() const
 {
     if (Pstream::parRun())
     {
-        // To the transformation if necessary
+        // Do the transformation if necessary
         if (parallel())
         {
             return
-                faPatch::delta()
+                coupledFaPatch::delta()
               - (
                     neighbEdgeCentres()
                   - neighbEdgeFaceCentres()
@@ -446,7 +448,7 @@ Foam::tmp<Foam::vectorField> Foam::processorFaPatch::delta() const
         else
         {
             return
-                faPatch::delta()
+                coupledFaPatch::delta()
               - transform
                 (
                     forwardT(),
@@ -459,7 +461,7 @@ Foam::tmp<Foam::vectorField> Foam::processorFaPatch::delta() const
     }
     else
     {
-        return faPatch::delta();
+        return coupledFaPatch::delta();
     }
 }
 
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
index 595ffb0702..8aeca30837 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
@@ -482,11 +482,11 @@ Foam::tmp<Foam::vectorField> Foam::faPatch::delta() const
     vectorField edgePN(edgeCentres() - edgeFaceCentres());
 
     // Do not allow any mag(val) < SMALL
-    for (vector& edgei : edgePN)
+    for (vector& e : edgePN)
     {
-        if (mag(edgei) < SMALL)
+        if (e.magSqr() < ROOTSMALL)
         {
-            edgei = vector::uniform(SMALL);
+            e = vector::uniform(SMALL);
         }
     }
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.C
index 17d5c69cbb..d0148d7fca 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.C
@@ -31,16 +31,10 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(coupledFvPatch, 0);
+    defineTypeName(coupledFvPatch);
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::coupledFvPatch::~coupledFvPatch()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::vectorField> Foam::coupledFvPatch::delta() const
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index f334ab2f2a..07640c1fd2 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef coupledFvPatch_H
-#define coupledFvPatch_H
+#ifndef Foam_coupledFvPatch_H
+#define Foam_coupledFvPatch_H
 
 #include "fvPatch.H"
 #include "lduInterface.H"
@@ -56,7 +56,7 @@ class coupledFvPatch
     public lduInterface,
     public fvPatch
 {
-    // Private data
+    // Private Data
 
         const coupledPolyPatch& coupledPolyPatch_;
 
@@ -75,7 +75,7 @@ public:
 
 
     //- Runtime type information
-    TypeName(coupledPolyPatch::typeName_());
+    TypeNameNoDebug(coupledPolyPatch::typeName_());
 
 
     // Constructors
@@ -89,7 +89,7 @@ public:
 
 
     //- Destructor
-    virtual ~coupledFvPatch();
+    virtual ~coupledFvPatch() = default;
 
 
     // Member Functions

From 5672bb296fd23ee17d3a65cc7b92919c02a0015f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 27 Jan 2023 15:21:19 +0100
Subject: [PATCH 028/348] ENH: use cmptMag, cmptMultiply instead of replacing
 field components

---
 applications/test/vector/Test-vector.C        | 21 ++++++++++++++++---
 .../transformPoints/transformPoints.C         | 11 +++-------
 .../surfaceTransformPoints.C                  | 11 +++-------
 .../basicSymmetry/basicSymmetryFaPatchField.C |  7 +------
 .../basicSymmetry/basicSymmetryFvPatchField.C |  8 +------
 .../fixedNormalSlipFvPatchField.C             |  7 +------
 .../partialSlip/partialSlipFvPatchField.C     |  7 +------
 .../shallowWaterAbsorption.C                  |  8 +++++--
 8 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/applications/test/vector/Test-vector.C b/applications/test/vector/Test-vector.C
index 020944dddd..582f8bf504 100644
--- a/applications/test/vector/Test-vector.C
+++ b/applications/test/vector/Test-vector.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
         Info<< "shuffled: " << vec2 << nl;
 
         // Vectors with some identical components
-        List<vector> vectors
+        vectorField vectors
         ({
             {1.1, 2.2, 3.3 },
             {2.2, 3.3, 4.4 },
@@ -191,8 +191,23 @@ int main(int argc, char *argv[])
         std::sort(vectors.begin(), vectors.end(), vector::less_zxy);
         Info<< "sorted zxy:";
         vectors.writeList(Info, 1) << nl;
-    }
 
+        vectorField vecCmptMag1(cmptMag(vectors));
+        Info<< "cmptMag:";
+        vecCmptMag1.writeList(Info, 1) << nl;
+
+        vectorField vecCmptMag2(vectors.size());
+        vecCmptMag2.replace(vector::X, mag(vectors.component(vector::X)));
+        vecCmptMag2.replace(vector::Y, mag(vectors.component(vector::Y)));
+        vecCmptMag2.replace(vector::Z, mag(vectors.component(vector::Z)));
+
+        Info<< "cmptMag:";
+        vecCmptMag2.writeList(Info, 1) << nl;
+
+        Info<< "mult:";
+        cmptMultiply(vecCmptMag2, vecCmptMag2, vector(2,3,4));
+        vecCmptMag2.writeList(Info, 1) << nl;
+    }
     // Basic tests for fields
     {
         scalarField sfld1
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index e27e9b0015..0e96f21c30 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -227,14 +227,9 @@ void applyScaling(pointField& points, const List<scalar>& scaling)
     }
     else if (scaling.size() == 3)
     {
-        Info<< "Scaling points by ("
-            << scaling[0] << ' '
-            << scaling[1] << ' '
-            << scaling[2] << ')' << nl;
-
-        points.replace(vector::X, scaling[0]*points.component(vector::X));
-        points.replace(vector::Y, scaling[1]*points.component(vector::Y));
-        points.replace(vector::Z, scaling[2]*points.component(vector::Z));
+        const vector factor(scaling[0], scaling[1], scaling[2]);
+        Info<< "Scaling points by " << factor << nl;
+        cmptMultiply(points, points, factor);
     }
 }
 
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index fa0412d62f..c8b1fa0ec2 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -149,14 +149,9 @@ void applyScaling(pointField& points, const List<scalar>& scaling)
     }
     else if (scaling.size() == 3)
     {
-        Info<< "Scaling points by ("
-            << scaling[0] << ' '
-            << scaling[1] << ' '
-            << scaling[2] << ')' << nl;
-
-        points.replace(vector::X, scaling[0]*points.component(vector::X));
-        points.replace(vector::Y, scaling[1]*points.component(vector::Y));
-        points.replace(vector::Z, scaling[2]*points.component(vector::Z));
+        const vector factor(scaling[0], scaling[1], scaling[2]);
+        Info<< "Scaling points by " << factor << nl;
+        cmptMultiply(points, points, factor);
     }
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C
index 02dffa26c5..d828c81eb8 100644
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C
@@ -130,12 +130,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::basicSymmetryFaPatchField<Type>::snGradTransformDiag() const
 {
-    const vectorField nHat(this->patch().edgeNormals());
-    vectorField diag(nHat.size());
-
-    diag.replace(vector::X, mag(nHat.component(vector::X)));
-    diag.replace(vector::Y, mag(nHat.component(vector::Y)));
-    diag.replace(vector::Z, mag(nHat.component(vector::Z)));
+    tmp<vectorField> diag(cmptMag(this->patch().edgeNormals()));
 
     return transformFieldMask<Type>(pow<vector, pTraits<Type>::rank>(diag));
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
index d570de2a57..34b93a99f4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
@@ -131,13 +131,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::basicSymmetryFvPatchField<Type>::snGradTransformDiag() const
 {
-    const vectorField nHat(this->patch().nf());
-
-    vectorField diag(nHat.size());
-
-    diag.replace(vector::X, mag(nHat.component(vector::X)));
-    diag.replace(vector::Y, mag(nHat.component(vector::Y)));
-    diag.replace(vector::Z, mag(nHat.component(vector::Z)));
+    tmp<vectorField> diag(cmptMag(this->patch().nf()));
 
     return transformFieldMask<Type>(pow<vector, pTraits<Type>::rank>(diag));
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index 97863afc1b..06a994141f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -171,12 +171,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::fixedNormalSlipFvPatchField<Type>::snGradTransformDiag() const
 {
-    const vectorField nHat(this->patch().nf());
-    vectorField diag(nHat.size());
-
-    diag.replace(vector::X, mag(nHat.component(vector::X)));
-    diag.replace(vector::Y, mag(nHat.component(vector::Y)));
-    diag.replace(vector::Z, mag(nHat.component(vector::Z)));
+    tmp<vectorField> diag(cmptMag(this->patch().nf()));
 
     return transformFieldMask<Type>(pow<vector, pTraits<Type>::rank>(diag));
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index f8d43846f5..d938724860 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -188,12 +188,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::partialSlipFvPatchField<Type>::snGradTransformDiag() const
 {
-    const vectorField nHat(this->patch().nf());
-    vectorField diag(nHat.size());
-
-    diag.replace(vector::X, mag(nHat.component(vector::X)));
-    diag.replace(vector::Y, mag(nHat.component(vector::Y)));
-    diag.replace(vector::Z, mag(nHat.component(vector::Z)));
+    tmp<vectorField> diag(cmptMag(this->patch().nf()));
 
     return
         valueFraction_*pTraits<Type>::one
diff --git a/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
index 22652a7caa..2f33172fb6 100644
--- a/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
+++ b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
@@ -67,8 +67,12 @@ void Foam::waveModels::shallowWaterAbsorption::setVelocity
     // Apply zero-gradient condition to z-component of velocity only
     const volVectorField& U = mesh_.lookupObject<volVectorField>(UName_);
     U_ = U.boundaryField()[patch_.index()].patchInternalField();
-    U_.replace(0, 0);
-    U_.replace(1, 0);
+
+    for (vector& vel : U_)
+    {
+        vel.x() = 0;
+        vel.y() = 0;
+    }
 }
 
 

From 312037d4eac2bacab490fdafe622275c91a29d78 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 24 Jan 2023 14:40:06 +0100
Subject: [PATCH 029/348] ENH: simplify coding logic for calculating Le()
 vectors.

- handle lower geometryOrder values directly within edgeAreaNormals()
  and reuse the results within Le().

- direct nonBlocking recv/send of edge normals instead using the
  intermediate processorLduInterface buffers
---
 .../interfaceTrackingFvMesh.C                 |   1 +
 src/finiteArea/faMesh/faMesh.C                |  23 +-
 src/finiteArea/faMesh/faMesh.H                |  15 +-
 .../faMesh/faMeshDemandDrivenData.C           | 213 +++++++++---------
 src/finiteArea/faMesh/faMeshTopology.C        |  11 +-
 5 files changed, 150 insertions(+), 113 deletions(-)

diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
index ce798d638b..fc3e6cee87 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
@@ -92,6 +92,7 @@ void Foam::interfaceTrackingFvMesh::initializeData()
     }
 
     // Set point normal correction for finite area mesh
+    if (!pointNormalsCorrectionPatches_.empty())
     {
         boolList& correction = aMesh().correctPatchPointNormals();
 
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index 7d33d34050..eaf224fbf0 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -277,6 +277,27 @@ void Foam::faMesh::clearOut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+void Foam::faMesh::syncGeom()
+{
+    if (UPstream::parRun())
+    {
+        // areaCentres()
+        if (faceCentresPtr_)
+        {
+            faceCentresPtr_->boundaryFieldRef()
+                .evaluateCoupled<processorFaPatch>();
+        }
+
+        // faceAreaNormals()
+        if (faceAreaNormalsPtr_)
+        {
+            faceAreaNormalsPtr_->boundaryFieldRef()
+                .evaluateCoupled<processorFaPatch>();
+        }
+    }
+}
+
+
 bool Foam::faMesh::init(const bool doInit)
 {
     if (doInit)
diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H
index bd391977ac..7ccfa6c268 100644
--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -425,6 +425,9 @@ class faMesh
             //- Clear geometry but not the face areas
             void clearGeomNotAreas() const;
 
+            //- Has halo face centers/normals
+            bool hasHaloFaceGeometry() const noexcept;
+
             //- Clear boundary halo information
             void clearHalo() const;
 
@@ -617,6 +620,10 @@ public:
         //- Initialise non-demand-driven data etc
         bool init(const bool doInit);
 
+        //- Processor/processor synchronisation for geometry fields.
+        //  Largely internal use only (slightly hacky).
+        void syncGeom();
+
 
     // Database
 
@@ -842,6 +849,12 @@ public:
             return bool(faceCurvaturesPtr_);
         }
 
+        //- Has patch point normals corrections
+        bool hasPatchPointNormalsCorrection() const noexcept
+        {
+            return bool(correctPatchPointNormalsPtr_);
+        }
+
 
     // Mesh motion and morphing
 
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 9cfd9eda45..6bd45e7298 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -382,7 +382,7 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
             );
         }
 
-        // Boundary (edge normals) - like about but only has owner
+        // Boundary (edge normals). Like above, but only has owner
         for (label edgei = nInternalEdges_; edgei < nEdges_; ++edgei)
         {
             const linePointRef edgeLine(edges_[edgei].line(localPoints));
@@ -455,23 +455,51 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
     // Processor-processor first (for convenience)
     if (order >= 1)
     {
-        const label startOfRequests = UPstream::nRequests();
+        DynamicList<UPstream::Request> requests
+        (
+            2*(boundary().size() - boundary().nNonProcessor())
+        );
+
+        PtrList<vectorField> nbrEdgeNormals(boundary().size());
+
+        // Prefer our own slicing into the raw list (instead of patchSlice).
+        // Although patchSlice does properly handle the start() offset in
+        // the presence of emptyPaPatch, we are slightly paranoia,
+        // and want to avoid kicking off the patchStarts() data...
+
+        label patchOffset = nInternalEdges_;
 
         forAll(boundary(), patchi)
         {
             const faPatch& fap = boundary()[patchi];
 
+            auto edgeNorms = edgeNormals.slice(patchOffset, fap.nEdges());
+            patchOffset += edgeNorms.size();
+
             const auto* fapp = isA<processorFaPatch>(fap);
 
             if (fapp)
             {
-                if (UPstream::parRun())
+                const label nbrProci = fapp->neighbProcNo();
+
+                if (UPstream::parRun() && !edgeNorms.empty())
                 {
-                    // Send accumulated weighted edge normals
-                    fapp->send<vector>
+                    nbrEdgeNormals.emplace(patchi, edgeNorms.size());
+
+                    // Recv accumulated weighted edge normals
+                    UIPstream::read
                     (
-                        UPstream::commsTypes::nonBlocking,
-                        fap.patchSlice(edgeNormals)
+                        requests.emplace_back(),
+                        nbrProci,
+                        nbrEdgeNormals[patchi]
+                    );
+
+                    // Send accumulated weighted edge normals
+                    UOPstream::write
+                    (
+                        requests.emplace_back(),
+                        nbrProci,
+                        edgeNorms
                     );
                 }
             }
@@ -489,9 +517,9 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
                     ).normalise()
                 );
 
-                for (vector& edgeNorm : fap.patchSlice(edgeNormals))
+                for (vector& e : edgeNorms)
                 {
-                    edgeNorm.removeCollinear(wedgeNorm);
+                    e.removeCollinear(wedgeNorm);
                 }
             }
             // TBD:
@@ -507,29 +535,24 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
         }
 
         // Wait for outstanding requests
-        // (commsType == UPstream::commsTypes::nonBlocking)
-        UPstream::waitRequests(startOfRequests);
+        UPstream::waitRequests(requests);
 
-        // Receive values
-        if (UPstream::parRun())
+        if (!requests.empty())
         {
-            for (const faPatch& fap : boundary())
+            // Add in received values
+
+            patchOffset = nInternalEdges_;
+
+            forAll(boundary(), patchi)
             {
-                const auto* fapp = isA<processorFaPatch>(fap);
+                const faPatch& fap = boundary()[patchi];
 
-                if (fapp)
+                auto edgeNorms = edgeNormals.slice(patchOffset, fap.nEdges());
+                patchOffset += edgeNorms.size();
+
+                if (nbrEdgeNormals.set(patchi))
                 {
-                    // Receive weighted edge normals
-                    vectorField::subList edgeNorms
-                        = fap.patchSlice(edgeNormals);
-
-                    vectorField nbrNorms(edgeNorms.size());
-
-                    fapp->receive<vector>
-                    (
-                        UPstream::commsTypes::nonBlocking,
-                        nbrNorms
-                    );
+                    const vectorField& nbrNorms = nbrEdgeNormals[patchi];
 
                     forAll(edgeNorms, patchEdgei)
                     {
@@ -542,8 +565,12 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
 
 
     // Apply boundary edge corrections
-
-    if (order >= 1 && returnReduceOr(nbrBoundaryAdjust.any()))
+    if
+    (
+        order >= 1
+     && hasPatchPointNormalsCorrection()
+     && returnReduceOr(nbrBoundaryAdjust.any())
+    )
     {
         DebugInFunction
             << "Apply " << nbrBoundaryAdjust.count()
@@ -553,10 +580,16 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
 
         (void)this->haloFaceNormals();
 
+        // Using our own slicing (instead of patchSlice) - see above
+        label patchOffset = nInternalEdges_;
+
         for (const label patchi : nbrBoundaryAdjust)
         {
             const faPatch& fap = boundary()[patchi];
 
+            auto edgeNorms = edgeNormals.slice(patchOffset, fap.nEdges());
+            patchOffset += edgeNorms.size();
+
             if (fap.ngbPolyPatchIndex() < 0)
             {
                 FatalErrorInFunction
@@ -575,10 +608,11 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
             // important for curvature calculation to have correct normal
             // at contact line points.
 
-            vectorField::subList edgeNorms = fap.patchSlice(edgeNormals);
             vectorField nbrNorms(this->haloFaceNormals(patchi));
 
-            forAll(edgeNorms, patchEdgei)
+            const label nPatchEdges = min(edgeNorms.size(), nbrNorms.size());
+
+            for (label patchEdgei = 0; patchEdgei < nPatchEdges; ++patchEdgei)
             {
                 edgeNorms[patchEdgei].removeCollinear(nbrNorms[patchEdgei]);
             }
@@ -596,7 +630,7 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
         edgeNormals[edgei].normalise();
 
         // Do not allow any mag(val) < SMALL
-        if (mag(edgeNormals[edgei]) < SMALL)
+        if (edgeNormals[edgei].magSqr() < ROOTSMALL)
         {
             edgeNormals[edgei] = vector::uniform(SMALL);
         }
@@ -632,7 +666,6 @@ void Foam::faMesh::calcLe() const
             dimLength
             // -> calculatedType()
         );
-
     edgeVectorField& Le = *LePtr_;
 
     // Need face centres
@@ -642,64 +675,9 @@ void Foam::faMesh::calcLe() const
     const pointField& localPoints = points();
 
 
-    if (faMesh::geometryOrder() < 2)
+    // The edgeAreaNormals _may_ use communication (depends on geometryOrder)
+
     {
-        // The edge normals with flat boundary addressing
-        // (which _may_ use communication)
-        vectorField edgeNormals
-        (
-            calcRawEdgeNormals(faMesh::geometryOrder())
-        );
-
-
-        // Calculate the Le vectors.
-        // Can do inplace (overwrite with the edgeNormals)
-
-        vectorField& leVectors = edgeNormals;
-        forAll(leVectors, edgei)
-        {
-            leVectors[edgei] = calcLeVector
-            (
-                fCentres[edgeOwner()[edgei]],
-                edges_[edgei].line(localPoints),
-                edgeNormals[edgei]
-            );
-
-            // Do not allow any mag(val) < SMALL
-            if (mag(leVectors[edgei]) < SMALL)
-            {
-                leVectors[edgei] = vector::uniform(SMALL);
-            }
-        }
-
-        // Copy internal field
-        Le.primitiveFieldRef() =
-            vectorField::subList(leVectors, nInternalEdges_);
-
-
-        // Transcribe boundary field
-        auto& bfld = Le.boundaryFieldRef();
-
-        forAll(boundary(), patchi)
-        {
-            const faPatch& fap = boundary()[patchi];
-            bfld[patchi] = fap.patchRawSlice(leVectors);
-
-            for (auto& patchEdge : bfld[patchi])
-            {
-                // Do not allow any mag(val) < SMALL
-                if (mag(patchEdge) < SMALL)
-                {
-                    patchEdge = vector::uniform(SMALL);
-                }
-            }
-        }
-    }
-    else
-    {
-        // Using edgeAreaNormals,
-        // which _may_ use pointAreaNormals (communication!)
-
         const edgeVectorField& edgeNormals = edgeAreaNormals();
 
         // Internal (edge vector)
@@ -715,7 +693,7 @@ void Foam::faMesh::calcLe() const
                 );
 
                 // Do not allow any mag(val) < SMALL
-                if (mag(fld[edgei]) < SMALL)
+                if (fld[edgei].magSqr() < ROOTSMALL)
                 {
                     fld[edgei] = vector::uniform(SMALL);
                 }
@@ -743,7 +721,7 @@ void Foam::faMesh::calcLe() const
                 );
 
                 // Do not allow any mag(val) < SMALL
-                if (mag(pfld[patchEdgei]) < SMALL)
+                if (pfld[patchEdgei].magSqr() < ROOTSMALL)
                 {
                     pfld[patchEdgei] = vector::uniform(SMALL);
                 }
@@ -883,7 +861,7 @@ void Foam::faMesh::calcFaceCentres() const
         }
     }
 
-    // Boundary (edge centres)
+    // Boundary (edge centres or neighbour face centres)
     {
         auto& bfld = centres.boundaryFieldRef();
 
@@ -1092,7 +1070,7 @@ void Foam::faMesh::calcFaceAreaNormals() const
         for (auto& f : fld)
         {
             // Do not allow any mag(val) < SMALL
-            if (mag(f) < SMALL)
+            if (f.magSqr() < ROOTSMALL)
             {
                 f = vector::uniform(SMALL);
             }
@@ -1137,37 +1115,50 @@ void Foam::faMesh::calcEdgeAreaNormals() const
             ),
             *this,
             dimless
+            // -> calculatedType()
         );
     edgeVectorField& edgeAreaNormals = *edgeAreaNormalsPtr_;
 
 
-    if (faMesh::geometryOrder() == 1)
+    if (faMesh::geometryOrder() < 2)
     {
         // The edge normals with flat boundary addressing
-        // (uses communication)
-
+        // (which _may_ use communication)
         vectorField edgeNormals
         (
             calcRawEdgeNormals(faMesh::geometryOrder())
         );
 
-        // Copy internal internal field
+        // Copy internal field
         edgeAreaNormals.primitiveFieldRef()
             = vectorField::subList(edgeNormals, nInternalEdges_);
 
-        // Transcribe boundary field
+        // Using our own slicing (instead of patchSlice) - see above
+
         auto& bfld = edgeAreaNormals.boundaryFieldRef();
 
+        label patchOffset = nInternalEdges_;
+
         forAll(boundary(), patchi)
         {
             const faPatch& fap = boundary()[patchi];
-            bfld[patchi] = fap.patchSlice(edgeNormals);
+
+            bfld[patchi] = vectorField::subList
+            (
+                edgeNormals,
+                bfld[patchi].size(),
+                patchOffset
+            );
+
+            patchOffset += fap.nEdges();
         }
 
         return;
     }
 
 
+    // ------------------------------------------------------------------------
+
     // This is the original approach using an average of the
     // point normals.  May be removed in the future (2022-09)
 
@@ -1193,7 +1184,7 @@ void Foam::faMesh::calcEdgeAreaNormals() const
             fld[edgei].normalise();
 
             // Do not allow any mag(val) < SMALL
-            if (mag(fld[edgei]) < SMALL)
+            if (fld[edgei].magSqr() < ROOTSMALL)
             {
                 fld[edgei] = vector::uniform(SMALL);
             }
@@ -1225,7 +1216,7 @@ void Foam::faMesh::calcEdgeAreaNormals() const
                 pfld[patchEdgei].normalise();
 
                 // Do not allow any mag(val) < SMALL
-                if (mag(pfld[patchEdgei]) < SMALL)
+                if (pfld[patchEdgei].magSqr() < ROOTSMALL)
                 {
                     pfld[patchEdgei] = vector::uniform(SMALL);
                 }
@@ -1582,10 +1573,9 @@ void Foam::faMesh::calcPointAreaNormals(vectorField& result) const
             {
                 UOPstream::write
                 (
-                    Pstream::commsTypes::blocking,
+                    UPstream::commsTypes::blocking,
                     procPatch.neighbProcNo(),
-                    patchPointNormals.cdata_bytes(),
-                    patchPointNormals.size_bytes()
+                    patchPointNormals
                 );
             }
 
@@ -1595,10 +1585,9 @@ void Foam::faMesh::calcPointAreaNormals(vectorField& result) const
             {
                 UIPstream::read
                 (
-                    Pstream::commsTypes::blocking,
+                    UPstream::commsTypes::blocking,
                     procPatch.neighbProcNo(),
-                    patchPointNormals.data_bytes(),
-                    patchPointNormals.size_bytes()
+                    patchPointNormals
                 );
             }
 
@@ -1658,7 +1647,11 @@ void Foam::faMesh::calcPointAreaNormals(vectorField& result) const
     }
 
 
-    if (returnReduceOr(nbrBoundaryAdjust.any()))
+    if
+    (
+        hasPatchPointNormalsCorrection()
+     && returnReduceOr(nbrBoundaryAdjust.any())
+    )
     {
         DebugInFunction
             << "Apply " << nbrBoundaryAdjust.count()
diff --git a/src/finiteArea/faMesh/faMeshTopology.C b/src/finiteArea/faMesh/faMeshTopology.C
index 3a8417a57d..4ab30bbfa6 100644
--- a/src/finiteArea/faMesh/faMeshTopology.C
+++ b/src/finiteArea/faMesh/faMeshTopology.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -811,6 +811,13 @@ const Foam::faMeshBoundaryHalo& Foam::faMesh::boundaryHaloMap() const
 }
 
 
+bool Foam::faMesh::hasHaloFaceGeometry() const noexcept
+{
+    // Always create/destroy in tandem
+    return (haloFaceCentresPtr_ && haloFaceNormalsPtr_);
+}
+
+
 void Foam::faMesh::calcHaloFaceGeometry() const
 {
     if (haloFaceCentresPtr_ || haloFaceNormalsPtr_)
@@ -856,6 +863,7 @@ void Foam::faMesh::calcHaloFaceGeometry() const
 
 const Foam::pointField& Foam::faMesh::haloFaceCentres() const
 {
+    // Always create/destroy in tandem
     if (!haloFaceCentresPtr_ || !haloFaceNormalsPtr_)
     {
         calcHaloFaceGeometry();
@@ -867,6 +875,7 @@ const Foam::pointField& Foam::faMesh::haloFaceCentres() const
 
 const Foam::vectorField& Foam::faMesh::haloFaceNormals() const
 {
+    // Always create/destroy in tandem
     if (!haloFaceCentresPtr_ || !haloFaceNormalsPtr_)
     {
         calcHaloFaceGeometry();

From 2faf3613545fda91367ea46b7d3f04666ab1a45b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 24 Jan 2023 14:40:06 +0100
Subject: [PATCH 030/348] BUG: faMesh geometryOrder=1 blocks in parallel

- with geometryOrder=1, edge normal calculation is done directly from
  the faces, whereas geometryOrder=2 they are calculated based on the
  point normals of each end.

  In both cases, the geometry calculation uses processor communication
  (with corresponding waitRequests etc).

  Since the final correction and the halo face normals also need
  collective communication, these routines must be triggered on all
  processors or they will block. Thus also include edgeAreaNormals()
  triggering in addition to pointAreaNormals() triggering.
---
 .../faMesh/faBoundaryMesh/faBoundaryMesh.C    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index dee21f5617..82b497a3ad 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -180,10 +180,20 @@ Foam::faBoundaryMesh::faBoundaryMesh
 
 void Foam::faBoundaryMesh::calcGeometry()
 {
-    // processorFaPatch geometry triggers calculation of pointNormals.
+    // processor initGeometry send/recv the following:
+    //   - edgeCentres() : faMesh::edgeCentres()
+    //   - edgeLengths() : faMesh::Le()
+    //   - edgeFaceCentres() : faMesh::areaCentres()
+    //
+    // faMesh::Le() has its own point-to-point communication (OK) but
+    // triggers either/or edgeAreaNormals(), pointAreaNormals()
+    // with their own communication that can block.
+
     // This uses parallel comms and hence will not be trigggered
     // on processors that do not have a processorFaPatch so instead
     // force construction.
+
+    (void)mesh_.edgeAreaNormals();
     (void)mesh_.pointAreaNormals();
 
     PstreamBuffers pBufs(Pstream::defaultCommsType);
@@ -773,10 +783,9 @@ bool Foam::faBoundaryMesh::checkDefinition(const bool report) const
 
 void Foam::faBoundaryMesh::movePoints(const pointField& p)
 {
-    // processorFaPatch geometry triggers calculation of pointNormals.
-    // This uses parallel comms and hence will not be trigggered
-    // on processors that do not have a processorFaPatch so instead
-    // force construction.
+    // See comments in calcGeometry()
+
+    (void)mesh_.edgeAreaNormals();
     (void)mesh_.pointAreaNormals();
 
     PstreamBuffers pBufs(Pstream::defaultCommsType);

From 911c28f17d36306f9a1bf37455e7fb5c4542b729 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 24 Jan 2023 14:40:06 +0100
Subject: [PATCH 031/348] STYLE: use vector::magSqr when checking size

---
 .../leastSquaresFaGrad/leastSquaresFaVectors.C            | 8 ++++----
 .../edgeInterpolation/schemes/NVDscheme/faNVDscheme.C     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
index 88e35b3d51..a6bd3a99f6 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
@@ -117,12 +117,12 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
         vector d = C[nei] - C[own];
 
         // Do not allow any mag(val) < SMALL
-        if (mag(d) < SMALL)
+        if (d.magSqr() < ROOTSMALL)
         {
             d = vector::uniform(SMALL);
         }
 
-        symmTensor wdd = (1.0/magSqr(d))*sqr(d);
+        symmTensor wdd = (1.0/d.magSqr())*sqr(d);
 
         dd[own] += wdd;
         dd[nei] += wdd;
@@ -178,12 +178,12 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
         vector d = C[nei] - C[own];
 
         // Do not allow any mag(val) < SMALL
-        if (mag(d) < SMALL)
+        if (d.magSqr() < ROOTSMALL)
         {
             d = vector::uniform(SMALL);
         }
 
-        scalar magSfByMagSqrd = 1.0/magSqr(d);
+        scalar magSfByMagSqrd = 1.0/d.magSqr();
 
         lsP[facei] = magSfByMagSqrd*(invDd[own] & d);
         lsN[facei] = -magSfByMagSqrd*(invDd[nei] & d);
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
index 8b7c685010..fe444ea02b 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
@@ -109,7 +109,7 @@ Foam::tmp<Foam::edgeScalarField> Foam::faNVDscheme<Type,NVDweight>::weights
         d *= mesh.edgeInterpolation::lPN().internalField()[edge];
 
         // Do not allow any mag(val) < SMALL
-        if (mag(d) < SMALL)
+        if (d.magSqr() < ROOTSMALL)
         {
             d = vector::uniform(SMALL);
         }
@@ -196,7 +196,7 @@ Foam::tmp<Foam::edgeScalarField> Foam::faNVDscheme<Type,NVDweight>::weights
                 d *= pLPN[edgeI];
 
                 // Do not allow any mag(val) < SMALL
-                if (mag(d) < SMALL)
+                if (d.magSqr() < ROOTSMALL)
                 {
                     d = vector::uniform(SMALL);
                 }

From c206b12c807ec2670ebcf78e6960c102eef56b6c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 26 Jan 2023 22:04:48 +0100
Subject: [PATCH 032/348] ENH: patch boundarySlice() for extraction from a flat
 boundary list

- remove redundant raw patch slice and non-const patchSlice, which
  were only used internally by finiteArea.

STYLE: noexcept on more patch methods
---
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       |   6 +-
 .../polyPatches/polyPatch/polyPatch.C         |   7 +-
 .../polyPatches/polyPatch/polyPatch.H         |  32 +++--
 .../faMesh/faPatches/faPatch/faPatch.C        |  13 +-
 .../faMesh/faPatches/faPatch/faPatch.H        |  24 +++-
 .../basic/sliced/slicedFvPatchField.C         |  26 +++-
 .../basic/sliced/slicedFvPatchField.H         |  17 ++-
 .../basic/sliced/slicedFvsPatchField.C        |  25 +++-
 .../basic/sliced/slicedFvsPatchField.H        |  16 ++-
 src/finiteVolume/fvMesh/fvMesh.C              |  15 +--
 src/finiteVolume/fvMesh/fvMesh.H              |   8 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.H        | 121 +++++++++---------
 12 files changed, 192 insertions(+), 118 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 46210bb085..b9968d7b4f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017, 2020 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -454,13 +454,13 @@ public:
             virtual const pointField& oldCellCentres() const;
 
             //- Return boundary mesh
-            const polyBoundaryMesh& boundaryMesh() const
+            const polyBoundaryMesh& boundaryMesh() const noexcept
             {
                 return boundary_;
             }
 
             //- Return mesh bounding box
-            const boundBox& bounds() const
+            const boundBox& bounds() const noexcept
             {
                 return bounds_;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index 081c7d0f83..4cb3d72089 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -307,13 +307,14 @@ Foam::wordList Foam::polyPatch::constraintTypes()
 }
 
 
-Foam::label Foam::polyPatch::offset() const
+Foam::label Foam::polyPatch::offset() const noexcept
 {
-    return start_ - boundaryMesh().start();
+    // Same as start_ - polyMesh::nInternalFaces()
+    return start_ - boundaryMesh_.start();
 }
 
 
-const Foam::polyBoundaryMesh& Foam::polyPatch::boundaryMesh() const
+const Foam::polyBoundaryMesh& Foam::polyPatch::boundaryMesh() const noexcept
 {
     return boundaryMesh_;
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 5d2d148128..42104698df 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -359,10 +359,10 @@ public:
 
         //- The offset where this patch starts in the boundary face list
         //  The value is the same as  patch.start() - mesh.nInternalFaces()
-        label offset() const;
+        label offset() const noexcept;
 
         //- Return start label of this patch in the polyMesh face list
-        label start() const
+        label start() const noexcept
         {
             return start_;
         }
@@ -374,7 +374,7 @@ public:
         }
 
         //- Return boundaryMesh reference
-        const polyBoundaryMesh& boundaryMesh() const;
+        const polyBoundaryMesh& boundaryMesh() const noexcept;
 
         //- Return true if this patch is geometrically coupled (i.e. faces and
         //  points correspondence)
@@ -399,18 +399,30 @@ public:
             return UIndirectList<T>(internalValues, faceCells());
         }
 
-        //- Slice List to patch, using the number of patch faces
+        //- This patch slice from the complete list, which has size
+        //- mesh::nFaces(), using the number of patch faces.
         template<class T>
-        const typename List<T>::subList patchSlice(const UList<T>& l) const
+        const typename List<T>::subList
+        patchSlice(const UList<T>& values) const
         {
-            return typename List<T>::subList(l, this->size(), start_);
+            return typename List<T>::subList(values, this->size(), start_);
         }
 
-        //- Slice Field to patch, using the number of patch faces
+        //- This patch slice from the list of boundary values, which has size
+        //- mesh::nBoundaryFaces(), using the number of patch faces.
         template<class T>
-        const typename Field<T>::subField patchSlice(const Field<T>& l) const
+        const typename List<T>::subList
+        boundarySlice(const List<T>& values) const
         {
-            return typename Field<T>::subField(l, this->size(), start_);
+            return typename List<T>::subList(values, this->size(), offset());
+        }
+
+        //- Slice Field to patch, using the number of patch faces.
+        template<class T>
+        const typename Field<T>::subField
+        patchSlice(const Field<T>& values) const
+        {
+            return typename Field<T>::subField(values, this->size(), start_);
         }
 
 
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
index 8aeca30837..578c943b59 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -194,6 +194,17 @@ const Foam::faBoundaryMesh& Foam::faPatch::boundaryMesh() const noexcept
 }
 
 
+Foam::label Foam::faPatch::offset() const
+{
+    return max
+    (
+        0,
+        boundaryMesh().mesh().patchStarts()[index()]
+      - boundaryMesh().mesh().nInternalEdges()
+    );
+}
+
+
 Foam::label Foam::faPatch::start() const
 {
     return boundaryMesh().mesh().patchStarts()[index()];
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
index 625b940cce..ae8670da53 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
@@ -305,6 +305,10 @@ public:
             return false;
         }
 
+        //- The offset where this patch starts in the boundary edge list.
+        //  The value is the same as patch.start() - mesh.nInternalEdges()
+        label offset() const;
+
         //- Patch start in edge list
         label start() const;
 
@@ -320,18 +324,26 @@ public:
             return edgei - start();
         }
 
-        //- Slice List to patch, using the virtual patch size
+        //- This patch slice from the complete list of values, which has
+        //- size mesh::nEdges(), using the virtual patch size.
         template<class T>
-        typename List<T>::subList patchSlice(const List<T>& l) const
+        const typename List<T>::subList patchSlice(const List<T>& values) const
         {
-            return typename List<T>::subList(l, size(), start());
+            return typename List<T>::subList(values, size(), start());
         }
 
-        //- Slice List to patch, using the number of patch edges
+        //- This patch slice from the list of boundary values, which has
+        //- size mesh::nBoundaryEdges(), using the virtual patch size.
         template<class T>
-        typename List<T>::subList patchRawSlice(const List<T>& l) const
+        const typename List<T>::subList
+        boundarySlice(const List<T>& values) const
         {
-            return typename List<T>::subList(l, nEdges(), start());
+            return typename List<T>::subList
+            (
+                values,
+                size(),
+                offset()
+            );
         }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index 5a2d5ba0d1..f444464af0 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,13 +35,22 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const Field<Type>& completeField
+    const Field<Type>& completeOrBoundaryField,
+    const bool isBoundaryOnly
 )
 :
     fvPatchField<Type>(p, iF, Field<Type>())
 {
-    // Set fvPatchField to a slice of the given complete field
-    UList<Type>::shallowCopy(p.patchSlice(completeField));
+    if (isBoundaryOnly)
+    {
+        // Set to a slice of the boundary field
+        UList<Type>::shallowCopy(p.boundarySlice(completeOrBoundaryField));
+    }
+    else
+    {
+        // Set to a slice of the complete field
+        UList<Type>::shallowCopy(p.patchSlice(completeOrBoundaryField));
+    }
 }
 
 
@@ -64,8 +73,11 @@ Foam::slicedFvPatchField<Type>::slicedFvPatchField
     const dictionary& dict
 )
 :
-    fvPatchField<Type>(p, iF, dict, false)
+    fvPatchField<Type>(p, iF)  // bypass dictionary constructor
 {
+    fvPatchFieldBase::readDict(dict);
+    // Read "value" if present...
+
     NotImplemented;
 }
 
@@ -142,10 +154,12 @@ Foam::slicedFvPatchField<Type>::clone
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
 template<class Type>
 Foam::slicedFvPatchField<Type>::~slicedFvPatchField()
 {
-    // Set fvPatchField to nullptr to avoid deletion of underlying field
+    // Set to nullptr to avoid deletion of underlying field
     UList<Type>::shallowCopy(UList<Type>());
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 32c8fe3811..8d1d515251 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,10 +47,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef slicedFvPatchField_H
-#define slicedFvPatchField_H
+#ifndef Foam_slicedFvPatchField_H
+#define Foam_slicedFvPatchField_H
 
 #include "fvPatchField.H"
+#include "processorFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,7 +59,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class slicedFvPatch Declaration
+                     Class slicedFvPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -66,9 +67,12 @@ class slicedFvPatchField
 :
     public fvPatchField<Type>
 {
-
 public:
 
+    //- The mesh processor patch type
+    typedef processorFvPatch processorPatchType;
+
+
     //- Runtime type information
     TypeName("sliced");
 
@@ -80,7 +84,8 @@ public:
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
-            const Field<Type>&
+            const Field<Type>& completeOrBoundaryField,
+            const bool isBoundaryOnly = false
         );
 
         //- Construct from patch and internal field. Assign value later.
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index 86d682c5a5..239814c185 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,13 +35,22 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
-    const Field<Type>& completeField
+    const Field<Type>& completeOrBoundaryField,
+    const bool isBoundaryOnly
 )
 :
     fvsPatchField<Type>(p, iF, Field<Type>())
 {
-    // Set fvsPatchField to a slice of the given complete field
-    UList<Type>::shallowCopy(p.patchSlice(completeField));
+    if (isBoundaryOnly)
+    {
+        // Set to a slice of the boundary field
+        UList<Type>::shallowCopy(p.boundarySlice(completeOrBoundaryField));
+    }
+    else
+    {
+        // Set to a slice of the complete field
+        UList<Type>::shallowCopy(p.patchSlice(completeOrBoundaryField));
+    }
 }
 
 
@@ -63,8 +73,11 @@ Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>(p, iF)  // bypass dictionary constructor
 {
+    fvsPatchFieldBase::readDict(dict);
+    // Read "value" if present...
+
     NotImplemented;
 }
 
@@ -141,10 +154,12 @@ Foam::slicedFvsPatchField<Type>::clone
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
 template<class Type>
 Foam::slicedFvsPatchField<Type>::~slicedFvsPatchField()
 {
-    // Set fvsPatchField to nullptr to avoid deletion of underlying field
+    // Set to nullptr to avoid deletion of underlying field
     UList<Type>::shallowCopy(UList<Type>());
 }
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index 28a7f95313..1f185b83f4 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,10 +41,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef slicedFvsPatchField_H
-#define slicedFvsPatchField_H
+#ifndef Foam_slicedFvsPatchField_H
+#define Foam_slicedFvsPatchField_H
 
 #include "fvsPatchField.H"
+#include "processorFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,7 +53,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class slicedFvsPatch Declaration
+                     Class slicedFvsPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -59,9 +61,12 @@ class slicedFvsPatchField
 :
     public fvsPatchField<Type>
 {
-
 public:
 
+    //- The mesh processor patch type
+    typedef processorFvPatch processorPatchType;
+
+
     //- Runtime type information
     TypeName("sliced");
 
@@ -73,7 +78,8 @@ public:
         (
             const fvPatch&,
             const DimensionedField<Type, surfaceMesh>&,
-            const Field<Type>&
+            const Field<Type>& completeOrBoundaryField,
+            const bool isBoundaryOnly = false
         );
 
         //- Construct from patch and internal field
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index b5a79252a4..655b870a50 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017,2022 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,7 +201,7 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
             scalarField& V0 = *V0Ptr_;
             // Note: V0 now sized with current mesh, not with (potentially
             //       different size) V.
-            V0.setSize(V.size());
+            V0.resize_nocopy(V.size());
             V0 = V;
         }
 
@@ -665,7 +665,6 @@ void Foam::fvMesh::removeFvBoundary()
 
     // Remove fvBoundaryMesh data first.
     boundary_.clear();
-    boundary_.setSize(0);
     polyMesh::removeBoundary();
 
     clearOut();
@@ -709,12 +708,6 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
 }
 
 
-const Foam::fvBoundaryMesh& Foam::fvMesh::boundary() const
-{
-    return boundary_;
-}
-
-
 const Foam::lduAddressing& Foam::fvMesh::lduAddr() const
 {
     if (!lduPtr_)
@@ -814,7 +807,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
         scalarField& V0 = *V0Ptr_;
 
         scalarField savedV0(V0);
-        V0.setSize(nCells());
+        V0.resize_nocopy(nCells());
 
         forAll(V0, i)
         {
@@ -856,7 +849,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
         scalarField& V00 = *V00Ptr_;
 
         scalarField savedV00(V00);
-        V00.setSize(nCells());
+        V00.resize_nocopy(nCells());
 
         forAll(V00, i)
         {
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index aa8d6f494c..4b76ea8515 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017,2022 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -97,6 +97,7 @@ protected:
         //- Boundary mesh
         fvBoundaryMesh boundary_;
 
+
     // Demand-driven data
 
         mutable fvMeshLduAddressing* lduPtr_;
@@ -314,7 +315,10 @@ public:
             }
 
             //- Return reference to boundary mesh
-            const fvBoundaryMesh& boundary() const;
+            const fvBoundaryMesh& boundary() const noexcept
+            {
+                return boundary_;
+            }
 
             //- Return ldu addressing
             virtual const lduAddressing& lduAddr() const;
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index b787c0e920..537eec7c9c 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -166,78 +166,79 @@ public:
 
     // Access
 
-            //- Return the polyPatch
-            const polyPatch& patch() const noexcept
-            {
-                return polyPatch_;
-            }
+        //- Return the polyPatch
+        const polyPatch& patch() const noexcept
+        {
+            return polyPatch_;
+        }
 
-            //- Return name
-            virtual const word& name() const
-            {
-                return polyPatch_.name();
-            }
+        //- Return name
+        virtual const word& name() const
+        {
+            return polyPatch_.name();
+        }
 
-            //- Return start label of this patch in the polyMesh face list
-            virtual label start() const
-            {
-                return polyPatch_.start();
-            }
+        //- The index of this patch in the boundary mesh
+        label index() const noexcept
+        {
+            return polyPatch_.index();
+        }
 
-            //- Return size
-            virtual label size() const
-            {
-                return polyPatch_.size();
-            }
+        //- The patch start within the polyMesh face list
+        label start() const noexcept
+        {
+            return polyPatch_.start();
+        }
 
-            //- Return true if this patch is coupled
-            virtual bool coupled() const
-            {
-                return polyPatch_.coupled();
-            }
+        //- Patch size is the number of faces, but can be overloaded
+        virtual label size() const
+        {
+            return polyPatch_.size();
+        }
 
-            //- Return true if the given type is a constraint type
-            static bool constraintType(const word& patchType);
+        //- Return true if this patch is coupled
+        virtual bool coupled() const
+        {
+            return polyPatch_.coupled();
+        }
 
-            //- Return a list of all the constraint patch types
-            static wordList constraintTypes();
+        //- Return true if the given type is a constraint type
+        static bool constraintType(const word& patchType);
 
-            //- Return the index of this patch in the fvBoundaryMesh
-            label index() const noexcept
-            {
-                return polyPatch_.index();
-            }
+        //- Return a list of all the constraint patch types
+        static wordList constraintTypes();
 
-            //- Return boundaryMesh reference
-            const fvBoundaryMesh& boundaryMesh() const noexcept
-            {
-                return boundaryMesh_;
-            }
+        //- Return boundaryMesh reference
+        const fvBoundaryMesh& boundaryMesh() const noexcept
+        {
+            return boundaryMesh_;
+        }
 
-            //- Slice List to patch, using the virtual patch size
-            template<class T>
-            const typename List<T>::subList patchSlice(const List<T>& l) const
-            {
-                return typename List<T>::subList(l, size(), start());
-            }
+        //- This patch slice from the complete list, which has size
+        //- mesh::nFaces(), using the virtual patch size.
+        template<class T>
+        const typename List<T>::subList
+        patchSlice(const List<T>& values) const
+        {
+            return typename List<T>::subList(values, size(), start());
+        }
 
-            //- Slice List to patch, using the underlying polyPatch information
-            template<class T>
-            const typename List<T>::subList patchRawSlice
+        //- This patch slice from the list of boundary values, which has size
+        //- mesh::nBoundaryFaces(), using the virtual patch size.
+        template<class T>
+        const typename List<T>::subList
+        boundarySlice(const List<T>& values) const
+        {
+            return typename List<T>::subList
             (
-                const List<T>& l
-            ) const
-            {
-                return typename List<T>::subList
-                (
-                    l,
-                    polyPatch_.size(),
-                    polyPatch_.start()
-                );
-            }
+                values,
+                size(),
+                polyPatch_.offset()
+            );
+        }
 
-            //- Return faceCells
-            virtual const labelUList& faceCells() const;
+        //- Return faceCells
+        virtual const labelUList& faceCells() const;
 
 
         // Access functions for geometrical data

From 0190fed56b3a1975fe92e7909afd5c3971a13529 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 26 Jan 2023 23:59:25 +0100
Subject: [PATCH 033/348] ENH: support slicing for finiteArea fields

---
 applications/test/slicedField/Make/options    |   2 +
 .../test/slicedField/Test-slicedField.C       | 101 +++++--
 .../SlicedGeometricField.C                    | 104 ++++---
 .../SlicedGeometricField.H                    |  37 ++-
 src/finiteArea/Make/files                     |   2 +
 .../fields/areaFields/slicedAreaFields.H      |  41 +++
 .../fields/areaFields/slicedAreaFieldsFwd.H   |  99 +++++++
 .../fields/edgeFields/slicedEdgeFields.H      |  98 +++++++
 .../fields/edgeFields/slicedEdgeFieldsFwd.H   | 101 +++++++
 .../basic/sliced/slicedFaPatchField.C         | 272 ++++++++++++++++++
 .../basic/sliced/slicedFaPatchField.H         | 253 ++++++++++++++++
 .../basic/sliced/slicedFaPatchFields.C        |  39 +++
 .../basic/sliced/slicedFaPatchFields.H        |  50 ++++
 .../basic/sliced/slicedFaePatchField.C        | 167 +++++++++++
 .../basic/sliced/slicedFaePatchField.H        | 180 ++++++++++++
 .../basic/sliced/slicedFaePatchFields.C       |  39 +++
 .../basic/sliced/slicedFaePatchFields.H       |  58 ++++
 17 files changed, 1563 insertions(+), 80 deletions(-)
 create mode 100644 src/finiteArea/fields/areaFields/slicedAreaFields.H
 create mode 100644 src/finiteArea/fields/areaFields/slicedAreaFieldsFwd.H
 create mode 100644 src/finiteArea/fields/edgeFields/slicedEdgeFields.H
 create mode 100644 src/finiteArea/fields/edgeFields/slicedEdgeFieldsFwd.H
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.H
 create mode 100644 src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C
 create mode 100644 src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
 create mode 100644 src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C
 create mode 100644 src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.H

diff --git a/applications/test/slicedField/Make/options b/applications/test/slicedField/Make/options
index d27c95d033..bbfa2b552d 100644
--- a/applications/test/slicedField/Make/options
+++ b/applications/test/slicedField/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/finiteArea/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lfiniteArea \
     -lmeshTools
diff --git a/applications/test/slicedField/Test-slicedField.C b/applications/test/slicedField/Test-slicedField.C
index 23a18bc491..a7e85d1c0f 100644
--- a/applications/test/slicedField/Test-slicedField.C
+++ b/applications/test/slicedField/Test-slicedField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,31 +35,86 @@ Description
 #include "SlicedGeometricField.H"
 #include "slicedFvPatchFields.H"
 #include "slicedSurfaceFields.H"
+#include "slicedVolFields.H"
+
+#include "areaFaMesh.H"
+#include "areaFields.H"
+#include "edgeFields.H"
+#include "slicedAreaFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
+    argList::addBoolOption
+    (
+        "finite-area",
+        "Test finite-area mesh/fields"
+    );
     #include "setRootCase.H"
 
     #include "createTime.H"
     #include "createMesh.H"
 
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
+    if (args.found("finite-area"))
+    {
+        autoPtr<faMesh> faMeshPtr(faMesh::TryNew(mesh));
 
-    //Info<< min(p, p);
+        if (!faMeshPtr)
+        {
+            Info<< "Stop: no finiteArea" << nl;
+            return 0;
+        }
+
+        auto& aMesh = faMeshPtr();
+
+        Info<< "Test with finiteArea" << nl;
+
+        (void)aMesh.areaCentres(),
+        (void)aMesh.faceAreaNormals();
+
+        vectorField flatBoundary(aMesh.nBoundaryEdges(), Zero);
+
+        {
+            const auto& bfld = aMesh.faceAreaNormals().boundaryField();
+
+            forAll(aMesh.boundary(), patchi)
+            {
+                const auto& src = bfld[patchi];
+                const auto& p = aMesh.boundary()[patchi];
+
+                vectorList::subList out = p.boundarySlice(flatBoundary);
+
+                if (out.size() == src.size())
+                {
+                    out = src;
+                }
+            }
+        }
+        flatBoundary *= 100;
+
+
+        slicedAreaVectorField foo
+        (
+            IOobject
+            (
+                "centres",
+                runTime.timeName(),
+                aMesh.thisDb(),
+                IOobject::NO_REGISTER
+            ),
+            aMesh,
+            dimLength,
+            aMesh.areaCentres(),
+            flatBoundary
+        );
+
+        Info<< "Weird combination of centres and normals!" << nl << nl;
+        foo.writeData(Info.stream());
+
+        Info<< "Done" << nl;
+        return 0;
+    }
 
     Info<< "Reading field U\n" << endl;
     volVectorField U
@@ -67,15 +123,13 @@ int main(int argc, char *argv[])
         (
             "U",
             runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
+            mesh.thisDb(),
+            IOobject::MUST_READ
         ),
         mesh
     );
 
-    SlicedGeometricField<vector, fvPatchField, slicedFvPatchField, volMesh>
-    C
+    slicedVolVectorField C
     (
         IOobject
         (
@@ -92,14 +146,7 @@ int main(int argc, char *argv[])
     Info<< C << endl;
     Info<< (C & U) << endl;
 
-    SlicedGeometricField
-    <
-         vector,
-         fvsPatchField,
-         slicedFvsPatchField,
-         surfaceMesh
-    >
-    Sf
+    slicedSurfaceVectorField Sf
     (
         IOobject
         (
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 5b552e009b..efa92277d2 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SlicedGeometricField.H"
-#include "processorFvPatch.H"
 
 // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * * //
 
@@ -38,41 +37,67 @@ template
     template<class> class SlicedPatchField,
     class GeoMesh
 >
-Foam::tmp<Foam::FieldField<PatchField, Type>>
+bool
 Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
-slicedBoundaryField
+isBoundaryAddressing
 (
     const Mesh& mesh,
-    const Field<Type>& completeField,
-    const bool preserveCouples,
-    const bool preserveProcessorOnly
+    const label fieldSize
 )
 {
+    label maxAddress(0);
+
+    if (!mesh.boundary().empty())
+    {
+        const auto& p = mesh.boundary().back();
+        maxAddress = (p.start() + p.size());
+    }
+
+    // If field size appear to not include internal field
+    return (fieldSize < maxAddress);
+}
+
+
+template
+<
+    class Type,
+    template<class> class PatchField,
+    template<class> class SlicedPatchField,
+    class GeoMesh
+>
+Foam::tmp<Foam::FieldField<PatchField, Type>>
+Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
+makeBoundary
+(
+    const Mesh& mesh,
+    const Field<Type>& completeOrBoundaryField,
+    const bool preserveCouples,
+    const bool preserveProcessorOnly,
+    const bool isBoundaryOnly
+) const
+{
+    typedef typename
+        SlicedPatchField<Type>::processorPatchType
+        processorPatchType;
+
     auto tbf = tmp<FieldField<PatchField, Type>>::New(mesh.boundary().size());
     auto& bf = tbf.ref();
 
     forAll(mesh.boundary(), patchi)
     {
+        const auto& p = mesh.boundary()[patchi];
+
         if
         (
-            preserveCouples
-         && mesh.boundary()[patchi].coupled()
-         && (
-               !preserveProcessorOnly
-            || isA<processorFvPatch>(mesh.boundary()[patchi])
-            )
+            preserveCouples && p.coupled()
+         && (!preserveProcessorOnly || isA<processorPatchType>(p))
         )
         {
             // For coupled patched construct the correct patch field type
             bf.set
             (
                 patchi,
-                PatchField<Type>::New
-                (
-                    mesh.boundary()[patchi].type(),
-                    mesh.boundary()[patchi],
-                    *this
-                )
+                PatchField<Type>::New(p.type(), p, *this)
             );
 
             // Initialize the values on the coupled patch to those of the slice
@@ -81,9 +106,10 @@ slicedBoundaryField
             // evaluation e.g. in the case of processor and cyclic patches.
             bf[patchi] = SlicedPatchField<Type>
             (
-                mesh.boundary()[patchi],
+                p,
                 DimensionedField<Type, GeoMesh>::null(),
-                completeField
+                completeOrBoundaryField,
+                isBoundaryOnly
             );
         }
         else
@@ -93,9 +119,10 @@ slicedBoundaryField
                 patchi,
                 new SlicedPatchField<Type>
                 (
-                    mesh.boundary()[patchi],
+                    p,
                     DimensionedField<Type, GeoMesh>::null(),
-                    completeField
+                    completeOrBoundaryField,
+                    isBoundaryOnly
                 )
             );
         }
@@ -114,30 +141,27 @@ template
 >
 Foam::tmp<Foam::FieldField<PatchField, Type>>
 Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
-slicedBoundaryField
+makeBoundary
 (
     const Mesh& mesh,
     const FieldField<PatchField, Type>& bField,
     const bool preserveCouples
-)
+) const
 {
     auto tbf = tmp<FieldField<PatchField, Type>>::New(mesh.boundary().size());
     auto& bf = tbf.ref();
 
     forAll(mesh.boundary(), patchi)
     {
-        if (preserveCouples && mesh.boundary()[patchi].coupled())
+        const auto& p = mesh.boundary()[patchi];
+
+        if (preserveCouples && p.coupled())
         {
             // For coupled patched construct the correct patch field type
             bf.set
             (
                 patchi,
-                PatchField<Type>::New
-                (
-                    mesh.boundary()[patchi].type(),
-                    mesh.boundary()[patchi],
-                    *this
-                )
+                PatchField<Type>::New(p.type(), p, *this)
             );
 
             // Assign field
@@ -151,7 +175,7 @@ slicedBoundaryField
                 patchi,
                 new SlicedPatchField<Type>
                 (
-                    mesh.boundary()[patchi],
+                    p,
                     DimensionedField<Type, GeoMesh>::null(),
                     bField[patchi]
                 )
@@ -188,7 +212,9 @@ SlicedGeometricField
         mesh,
         ds,
         Field<Type>(),
-        slicedBoundaryField(mesh, completeField, preserveCouples)
+        // preserveProcessorOnly = false
+        // isBoundaryOnly = false
+        makeBoundary(mesh, completeField, preserveCouples)
     )
 {
     // Set internalField to the slice of the complete field
@@ -226,12 +252,13 @@ SlicedGeometricField
         mesh,
         ds,
         Field<Type>(),
-        slicedBoundaryField
+        makeBoundary
         (
             mesh,
             completeBField,
             preserveCouples,
-            preserveProcessorOnly
+            preserveProcessorOnly,
+            isBoundaryAddressing(mesh, completeBField.size())
         )
     )
 {
@@ -266,7 +293,7 @@ SlicedGeometricField
         gf.mesh(),
         gf.dimensions(),
         Field<Type>(),
-        slicedBoundaryField(gf.mesh(), gf.boundaryField(), preserveCouples)
+        makeBoundary(gf.mesh(), gf.boundaryField(), preserveCouples)
     )
 {
     // Set internalField to the internal field
@@ -295,7 +322,8 @@ SlicedGeometricField
         gf.mesh(),
         gf.dimensions(),
         Field<Type>(),
-        slicedBoundaryField(gf.mesh(), gf.boundaryField(), true)
+        // preserveCouples = true
+        makeBoundary(gf.mesh(), gf.boundaryField(), true)
     )
 {
     // Set internalField to the internal field
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index 85448c2c7b..1ae1df29a8 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017,2022 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,26 +84,32 @@ private:
 
     // Private Member Functions
 
-        //- Slice the given field and a create a PtrList of SlicedPatchField
-        //  from which the boundary field is built
-        tmp<FieldField<PatchField, Type>>
-        slicedBoundaryField
-        (
-            const Mesh& mesh,
-            const Field<Type>& completeField,
-            const bool preserveCouples,
-            const bool preserveProcessorOnly = false
-        );
+        //- Return true if field size is too small to be the complete field
+        //- (ie, it must be boundary field addressing)
+        static bool
+        isBoundaryAddressing(const Mesh& mesh, const label fieldSize);
 
         //- Slice the given field and a create a PtrList of SlicedPatchField
         //  from which the boundary field is built
         tmp<FieldField<PatchField, Type>>
-        slicedBoundaryField
+        makeBoundary
+        (
+            const Mesh& mesh,
+            const Field<Type>& completeOrBoundaryField,
+            const bool preserveCouples,
+            const bool preserveProcessorOnly = false,
+            const bool isBoundaryOnly = false
+        ) const;
+
+        //- Slice the given field and a create a PtrList of SlicedPatchField
+        //  from which the boundary field is built
+        tmp<FieldField<PatchField, Type>>
+        makeBoundary
         (
             const Mesh& mesh,
             const FieldField<PatchField, Type>& bField,
             const bool preserveCouples
-        );
+        ) const;
 
         // Note - copy construct allowed
 
@@ -135,7 +142,7 @@ public:
             const Mesh&,
             const dimensionSet&,
             const Field<Type>& completeField,
-            const bool preserveCouples=true
+            const bool preserveCouples = true
         );
 
         //- Construct from components and separate fields to slice for the
@@ -147,7 +154,7 @@ public:
             const dimensionSet&,
             const Field<Type>& completeIField,
             const Field<Type>& completeBField,
-            const bool preserveCouples=true,
+            const bool preserveCouples = true,
             const bool preserveProcessorOnly = false
         );
 
@@ -157,7 +164,7 @@ public:
         (
             const IOobject&,
             const GeometricField<Type, PatchField, GeoMesh>&,
-            const bool preserveCouples=true
+            const bool preserveCouples = true
         );
 
         //- Copy construct
diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index 8bcad5e551..3743ff8522 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -49,6 +49,7 @@ $(basicFaPatchFields)/zeroGradient/zeroGradientFaPatchFields.C
 $(basicFaPatchFields)/fixedValue/fixedValueFaPatchFields.C
 $(basicFaPatchFields)/fixedGradient/fixedGradientFaPatchFields.C
 $(basicFaPatchFields)/mixed/mixedFaPatchFields.C
+$(basicFaPatchFields)/sliced/slicedFaPatchFields.C
 $(basicFaPatchFields)/transform/transformFaPatchFields.C
 
 constraintFaPatchFields = $(faPatchFields)/constraint
@@ -74,6 +75,7 @@ basicFaePatchFields = $(faePatchFields)/basic
 $(basicFaePatchFields)/calculated/calculatedFaePatchFields.C
 $(basicFaePatchFields)/coupled/coupledFaePatchFields.C
 $(basicFaePatchFields)/fixedValue/fixedValueFaePatchFields.C
+$(basicFaePatchFields)/sliced/slicedFaePatchFields.C
 
 constraintFaePatchFields = $(faePatchFields)/constraint
 $(constraintFaePatchFields)/empty/emptyFaePatchFields.C
diff --git a/src/finiteArea/fields/areaFields/slicedAreaFields.H b/src/finiteArea/fields/areaFields/slicedAreaFields.H
new file mode 100644
index 0000000000..f5cec36421
--- /dev/null
+++ b/src/finiteArea/fields/areaFields/slicedAreaFields.H
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+InClass
+    Foam::slicedAreaFields
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedAreaFields_H
+#define Foam_slicedAreaFields_H
+
+#include "SlicedGeometricField.H"
+#include "slicedFaPatchField.H"
+#include "areaFaMesh.H"
+#include "slicedAreaFieldsFwd.H"
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/areaFields/slicedAreaFieldsFwd.H b/src/finiteArea/fields/areaFields/slicedAreaFieldsFwd.H
new file mode 100644
index 0000000000..1858c28472
--- /dev/null
+++ b/src/finiteArea/fields/areaFields/slicedAreaFieldsFwd.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Description
+    Forwards and collection of common sliced area field types
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedAreaFieldsFwd_H
+#define Foam_slicedAreaFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template
+<
+    class Type,
+    template<class> class PatchField,
+    template<class> class SlicedPatchField,
+    class GeoMesh
+>
+class SlicedGeometricField;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Forward Declarations
+class areaMesh;
+template<class Type> class faPatchField;
+template<class Type> class slicedFaPatchField;
+
+//- An aree field slice for a given type
+template<class Type>
+using AreaSliceField =
+SlicedGeometricField<Type, faPatchField, slicedFaPatchField, areaMesh>;
+
+
+// Typedefs
+
+typedef
+    SlicedGeometricField
+    <scalar, faPatchField, slicedFaPatchField, areaMesh>
+    slicedAreaScalarField;
+
+typedef
+    SlicedGeometricField
+    <vector, faPatchField, slicedFaPatchField, areaMesh>
+    slicedAreaVectorField;
+
+typedef
+    SlicedGeometricField
+    <sphericalTensor, faPatchField, slicedFaPatchField, areaMesh>
+    slicedAreaSphericalTensorField;
+
+typedef
+    SlicedGeometricField
+    <symmTensor, faPatchField, slicedFaPatchField, areaMesh>
+    slicedAreaSymmTensorField;
+
+typedef
+    SlicedGeometricField
+    <tensor, faPatchField, slicedFaPatchField, areaMesh>
+    slicedAreaTensorField;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/edgeFields/slicedEdgeFields.H b/src/finiteArea/fields/edgeFields/slicedEdgeFields.H
new file mode 100644
index 0000000000..57c0e696c9
--- /dev/null
+++ b/src/finiteArea/fields/edgeFields/slicedEdgeFields.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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/>.
+
+InClass
+    Foam::slicedEdgeFields
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedEdgeFields_H
+#define Foam_slicedEdgeFields_H
+
+#include "SlicedGeometricField.H"
+#include "slicedFaePatchField.H"
+#include "edgeFaMesh.H"
+#include "slicedEdgeFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<>
+inline void
+SlicedGeometricField<scalar, faePatchField, slicedFaePatchField, edgeMesh>::
+correctBoundaryConditions()
+{}
+
+template<>
+inline void
+SlicedGeometricField<vector, faePatchField, slicedFaePatchField, edgeMesh>::
+correctBoundaryConditions()
+{}
+
+template<>
+inline void
+SlicedGeometricField
+<
+    sphericalTensor,
+    faePatchField,
+    slicedFaePatchField,
+    edgeMesh
+>::
+correctBoundaryConditions()
+{}
+
+template<>
+inline void
+SlicedGeometricField
+<
+    symmTensor,
+    faePatchField,
+    slicedFaePatchField,
+    edgeMesh
+>::
+correctBoundaryConditions()
+{}
+
+template<>
+inline void
+SlicedGeometricField<tensor, faePatchField, slicedFaePatchField, edgeMesh>::
+correctBoundaryConditions()
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/edgeFields/slicedEdgeFieldsFwd.H b/src/finiteArea/fields/edgeFields/slicedEdgeFieldsFwd.H
new file mode 100644
index 0000000000..7716749d68
--- /dev/null
+++ b/src/finiteArea/fields/edgeFields/slicedEdgeFieldsFwd.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Description
+    Forwards and collection of common sliced edge field types
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedEdgeFieldsFwd_H
+#define Foam_slicedEdgeFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template
+<
+    class Type,
+    template<class> class PatchField,
+    template<class> class SlicedPatchField,
+    class GeoMesh
+>
+class SlicedGeometricField;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Forward Declarations
+class edgeMesh;
+template<class Type> class faePatchField;
+template<class Type> class slicedFaePatchField;
+
+
+//- A (volume) surface field slice for a given type
+template<class Type>
+using EdgeSliceField =
+SlicedGeometricField<Type, faePatchField, slicedFaePatchField, edgeMesh>;
+
+
+// Typedefs
+
+typedef
+    SlicedGeometricField
+    <scalar, faePatchField, slicedFaePatchField, edgeMesh>
+    slicedEdgeScalarField;
+
+typedef
+    SlicedGeometricField
+    <vector, faePatchField, slicedFaePatchField, edgeMesh>
+    slicedEdgeVectorField;
+
+typedef
+    SlicedGeometricField
+    <sphericalTensor, faePatchField, slicedFaePatchField, edgeMesh>
+    slicedEdgeSphericalTensorField;
+
+typedef
+    SlicedGeometricField
+    <symmTensor, faePatchField, slicedFaePatchField, edgeMesh>
+    slicedEdgeSymmTensorField;
+
+typedef
+    SlicedGeometricField
+    <tensor, faePatchField, slicedFaePatchField, edgeMesh>
+    slicedEdgeTensorField;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
new file mode 100644
index 0000000000..06bc08d8e9
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
@@ -0,0 +1,272 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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 "slicedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::slicedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Field<Type>& completeOrBoundaryField,
+    const bool isBoundaryOnly
+)
+:
+    faPatchField<Type>(p, iF, Field<Type>())
+{
+    if (isBoundaryOnly)
+    {
+        // Set to a slice of the boundary field
+        UList<Type>::shallowCopy(p.boundarySlice(completeOrBoundaryField));
+    }
+    else
+    {
+        // Set to a slice of the complete field
+        UList<Type>::shallowCopy(p.patchSlice(completeOrBoundaryField));
+    }
+}
+
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::slicedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    faPatchField<Type>(p, iF, Field<Type>())
+{}
+
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::slicedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    faPatchField<Type>(p, iF)  // bypass dictionary constructor
+{
+    faPatchFieldBase::readDict(dict);
+    // Read "value" if present...
+
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::slicedFaPatchField
+(
+    const slicedFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    faPatchField<Type>(ptf, p, iF, mapper)
+{
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::slicedFaPatchField
+(
+    const slicedFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    faPatchField<Type>(ptf.patch(), iF, Field<Type>())
+{
+    // Transfer the slice from the argument
+    UList<Type>::shallowCopy(ptf);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::faPatchField<Type>>
+Foam::slicedFaPatchField<Type>::clone() const
+{
+    return tmp<faPatchField<Type>>
+    (
+        new slicedFaPatchField<Type>(*this)
+    );
+}
+
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::slicedFaPatchField
+(
+    const slicedFaPatchField<Type>& ptf
+)
+:
+    faPatchField<Type>
+    (
+        ptf.patch(),
+        ptf.internalField(),
+        Field<Type>()
+    )
+{
+    // Transfer the slice from the argument
+    UList<Type>::shallowCopy(ptf);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::faPatchField<Type>>
+Foam::slicedFaPatchField<Type>::clone
+(
+    const DimensionedField<Type, areaMesh>& iF
+) const
+{
+    return tmp<faPatchField<Type>>
+    (
+        new slicedFaPatchField<Type>(*this, iF)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::slicedFaPatchField<Type>::~slicedFaPatchField()
+{
+    // Set to nullptr to avoid deletion of underlying field
+    UList<Type>::shallowCopy(UList<Type>());
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::slicedFaPatchField<Type>::snGrad() const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::patchInternalField() const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+void Foam::slicedFaPatchField<Type>::patchInternalField(Field<Type>&) const
+{
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::patchNeighbourField
+(
+    const Field<Type>& iField
+) const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::patchNeighbourField() const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::valueInternalCoeffs
+(
+    const tmp<scalarField>&
+) const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::valueBoundaryCoeffs
+(
+    const tmp<scalarField>&
+) const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::gradientInternalCoeffs() const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::slicedFaPatchField<Type>::gradientBoundaryCoeffs() const
+{
+    NotImplemented;
+
+    return Field<Type>::null();
+}
+
+
+template<class Type>
+void Foam::slicedFaPatchField<Type>::write(Ostream& os) const
+{
+    faPatchField<Type>::write(os);
+    this->writeEntry("value", os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
new file mode 100644
index 0000000000..32f1b350a1
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
@@ -0,0 +1,253 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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::slicedFaPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    Specialization of faPatchField which creates the underlying
+    faPatchField as a slice of the given complete field.
+
+    The destructor is wrapped to avoid deallocation of the storage of the
+    complete fields when this is destroyed.
+
+    Should only used as a template argument for SlicedGeometricField.
+
+See also
+    Foam::faPatchField
+
+SourceFiles
+    slicedFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedFaPatchField_H
+#define Foam_slicedFaPatchField_H
+
+#include "faPatchField.H"
+#include "processorFaPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class slicedFaPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class slicedFaPatchField
+:
+    public faPatchField<Type>
+{
+public:
+
+    //- Type for the mesh processor patch
+    typedef processorFaPatch processorPatchType;
+
+
+    //- Runtime type information
+    TypeName("sliced");
+
+
+    // Constructors
+
+        //- Construct from patch, internal field and field to slice
+        slicedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Field<Type>& completeOrBoundaryField,
+            const bool isBoundaryOnly = false
+        );
+
+        //- Construct from patch and internal field. Assign value later.
+        slicedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        slicedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping the given slicedFaPatchField<Type>
+        //  onto a new patch
+        slicedFaPatchField
+        (
+            const slicedFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        slicedFaPatchField(const slicedFaPatchField<Type>&);
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const;
+
+        //- Construct as copy setting internal field reference
+        slicedFaPatchField
+        (
+            const slicedFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const;
+
+
+    //- Destructor
+    virtual ~slicedFaPatchField<Type>();
+
+
+    // Member Functions
+
+    // Attributes
+
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
+
+        //- False: this patch field is not altered by assignment
+        virtual bool assignable() const { return false; }
+
+
+        // Evaluation functions
+
+            //- Return patch-normal gradient
+            virtual tmp<Field<Type>> snGrad() const;
+
+            //- Return internal field next to patch as patch field
+            virtual tmp<Field<Type>> patchInternalField() const;
+
+            //- Return internal field next to patch as patch field
+            virtual void patchInternalField(Field<Type>&) const;
+
+            //- Return neighbour coupled given internal cell data
+            virtual tmp<Field<Type>> patchNeighbourField
+            (
+                const Field<Type>& iField
+            ) const;
+
+            //- Return patchField of the values on the patch or on the
+            //  opposite patch
+            virtual tmp<Field<Type>> patchNeighbourField() const;
+
+            //- Initialise the evaluation of the patch field
+            virtual void initEvaluate
+            (
+                const Pstream::commsTypes commsType =
+                    Pstream::commsTypes::blocking
+            )
+            {}
+
+            //- Evaluate the patch field, sets Updated to false
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType =
+                    Pstream::commsTypes::blocking
+            )
+            {}
+
+            //- Return the matrix diagonal coefficients corresponding to the
+            //  evaluation of the value of this patchField with given weights
+            virtual tmp<Field<Type>> valueInternalCoeffs
+            (
+                const tmp<scalarField>&
+            ) const;
+
+            //- Return the matrix source coefficients corresponding to the
+            //  evaluation of the value of this patchField with given weights
+            virtual tmp<Field<Type>> valueBoundaryCoeffs
+            (
+                const tmp<scalarField>&
+            ) const;
+
+            //- Return the matrix diagonal coefficients corresponding to the
+            //  evaluation of the gradient of this patchField
+            virtual tmp<Field<Type>> gradientInternalCoeffs() const;
+
+            //- Return the matrix source coefficients corresponding to the
+            //  evaluation of the gradient of this patchField
+            virtual tmp<Field<Type>> gradientBoundaryCoeffs() const;
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+
+    // Member Operators
+
+        virtual void operator=(const UList<Type>&) {}
+
+        virtual void operator=(const faPatchField<Type>&) {}
+        virtual void operator+=(const faPatchField<Type>&) {}
+        virtual void operator-=(const faPatchField<Type>&) {}
+        virtual void operator*=(const faPatchField<scalar>&) {}
+        virtual void operator/=(const faPatchField<scalar>&) {}
+
+        virtual void operator+=(const Field<Type>&) {}
+        virtual void operator-=(const Field<Type>&) {}
+
+        virtual void operator*=(const Field<scalar>&) {}
+        virtual void operator/=(const Field<scalar>&) {}
+
+        virtual void operator=(const Type&) {}
+        virtual void operator+=(const Type&) {}
+        virtual void operator-=(const Type&) {}
+        virtual void operator*=(const scalar) {}
+        virtual void operator/=(const scalar) {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "slicedFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.C b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.C
new file mode 100644
index 0000000000..895d2c39f2
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "slicedFaPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "areaFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaPatchFieldsTypeName(sliced);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.H
new file mode 100644
index 0000000000..187c7c10bf
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedFaPatchFields_H
+#define Foam_slicedFaPatchFields_H
+
+#include "slicedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(sliced);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C
new file mode 100644
index 0000000000..6ddf22fb42
--- /dev/null
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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 "slicedFaePatchField.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::slicedFaePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const Field<Type>& completeOrBoundaryField,
+    const bool isBoundaryOnly
+)
+:
+    faePatchField<Type>(p, iF, Field<Type>())
+{
+    if (isBoundaryOnly)
+    {
+        // Set to a slice of the boundary field
+        UList<Type>::shallowCopy(p.boundarySlice(completeOrBoundaryField));
+    }
+    else
+    {
+        // Set to a slice of the complete field
+        UList<Type>::shallowCopy(p.patchSlice(completeOrBoundaryField));
+    }
+}
+
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::slicedFaePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF
+)
+:
+    faePatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::slicedFaePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const dictionary& dict
+)
+:
+    faePatchField<Type>(p, iF)  // bypass dictionary constructor
+{
+    faePatchFieldBase::readDict(dict);
+    // Read "value" if present...
+
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::slicedFaePatchField
+(
+    const slicedFaePatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    faePatchField<Type>(ptf, p, iF, mapper)
+{
+    NotImplemented;
+}
+
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::slicedFaePatchField
+(
+    const slicedFaePatchField<Type>& ptf,
+    const DimensionedField<Type, edgeMesh>& iF
+)
+:
+    faePatchField<Type>(ptf.patch(), iF, Field<Type>())
+{
+    // Transfer the slice from the argument
+    UList<Type>::shallowCopy(ptf);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::faePatchField<Type>>
+Foam::slicedFaePatchField<Type>::clone() const
+{
+    return tmp<faePatchField<Type>>
+    (
+        new slicedFaePatchField<Type>(*this)
+    );
+}
+
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::slicedFaePatchField
+(
+    const slicedFaePatchField<Type>& ptf
+)
+:
+    faePatchField<Type>
+    (
+        ptf.patch(),
+        ptf.internalField(),
+        Field<Type>()
+    )
+{
+    // Transfer the slice from the argument
+    UList<Type>::shallowCopy(ptf);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::faePatchField<Type>>
+Foam::slicedFaePatchField<Type>::clone
+(
+    const DimensionedField<Type, edgeMesh>& iF
+) const
+{
+    return tmp<faePatchField<Type>>
+    (
+        new slicedFaePatchField<Type>(*this, iF)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::slicedFaePatchField<Type>::~slicedFaePatchField()
+{
+    // Set to nullptr to avoid deletion of underlying field
+    UList<Type>::shallowCopy(UList<Type>());
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
new file mode 100644
index 0000000000..134d1cda39
--- /dev/null
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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::slicedFaePatchField
+
+Description
+    Specialization of faePatchField which creates the underlying
+    faePatchField as a slice of the given complete field.
+
+    The destructor is wrapped to avoid deallocation of the storage of the
+    complete fields when this is destroyed.
+
+    Should only used as a template argument for SlicedGeometricField.
+
+SourceFiles
+    slicedFaePatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedFaePatchField_H
+#define Foam_slicedFaePatchField_H
+
+#include "faePatchField.H"
+#include "processorFaPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class slicedFaePatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class slicedFaePatchField
+:
+    public faePatchField<Type>
+{
+public:
+
+    //- Type for the mesh processor patch
+    typedef processorFaPatch processorPatchType;
+
+
+    //- Runtime type information
+    TypeName("sliced");
+
+
+    // Constructors
+
+        //- Construct from patch, internal field and field to slice
+        slicedFaePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const Field<Type>& completeOrBoundaryField,
+            const bool isBoundaryOnly = false
+        );
+
+        //- Construct from patch and internal field
+        slicedFaePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        slicedFaePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping the given slicedFaePatchField<Type>
+        //  onto a new patch
+        slicedFaePatchField
+        (
+            const slicedFaePatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        slicedFaePatchField(const slicedFaePatchField<Type>&);
+
+        //- Construct and return a clone
+        virtual tmp<faePatchField<Type>> clone() const;
+
+        //- Construct as copy setting internal field reference
+        slicedFaePatchField
+        (
+            const slicedFaePatchField<Type>&,
+            const DimensionedField<Type, edgeMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faePatchField<Type>> clone
+        (
+            const DimensionedField<Type, edgeMesh>& iF
+        ) const;
+
+
+    //- Destructor
+    virtual ~slicedFaePatchField<Type>();
+
+
+    // Member Functions
+
+    // Attributes
+
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
+
+
+    // Member Operators
+
+        virtual void operator=(const UList<Type>&) {}
+
+        virtual void operator=(const faePatchField<Type>&) {}
+        virtual void operator+=(const faePatchField<Type>&) {}
+        virtual void operator-=(const faePatchField<Type>&) {}
+        virtual void operator*=(const faePatchField<scalar>&) {}
+        virtual void operator/=(const faePatchField<scalar>&) {}
+
+        virtual void operator+=(const Field<Type>&) {}
+        virtual void operator-=(const Field<Type>&) {}
+
+        virtual void operator*=(const Field<scalar>&) {}
+        virtual void operator/=(const Field<scalar>&) {}
+
+        virtual void operator=(const Type&) {}
+        virtual void operator+=(const Type&) {}
+        virtual void operator-=(const Type&) {}
+        virtual void operator*=(const scalar) {}
+        virtual void operator/=(const scalar) {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "slicedFaePatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C
new file mode 100644
index 0000000000..d576a082d3
--- /dev/null
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "slicedFaePatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "faePatchFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaePatchFields(sliced);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.H
new file mode 100644
index 0000000000..47f19aead4
--- /dev/null
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.H
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+InClass
+    Foam::slicedFaePatchFields
+
+Description
+
+SourceFiles
+    slicedFaePatchFields.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_slicedFaePatchFields_H
+#define Foam_slicedFaePatchFields_H
+
+#include "slicedFaePatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaePatchTypeFieldTypedefs(sliced);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 39cabfca9c9fc42c9bce5851763568b413341b9d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 23 Jan 2023 19:29:13 +0100
Subject: [PATCH 034/348] ENH: use fvPatchFieldBase::readDict

- replaces getOrDefault/readIfPresent for "patchType"
---
 .../freeSurfaceVelocityFvPatchVectorField.C                  | 2 +-
 .../fields/fvPatchFields/exprFixedValueFvPatchField.C        | 5 ++---
 .../expressions/fields/fvPatchFields/exprMixedFvPatchField.C | 5 ++---
 .../fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C  | 3 ++-
 .../fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C  | 4 +---
 .../fixedNormalInletOutletVelocityFvPatchVectorField.C       | 2 +-
 .../derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C    | 2 +-
 .../fluxCorrectedVelocityFvPatchVectorField.C                | 2 +-
 .../derived/freestream/freestreamFvPatchField.C              | 2 +-
 .../derived/inletOutlet/inletOutletFvPatchField.C            | 2 +-
 .../inletOutletTotalTemperatureFvPatchScalarField.C          | 2 +-
 .../fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C  | 2 +-
 .../derived/outletInlet/outletInletFvPatchField.C            | 2 +-
 .../outletPhaseMeanVelocityFvPatchVectorField.C              | 2 +-
 .../derived/partialSlip/partialSlipFvPatchField.C            | 2 +-
 .../phaseHydrostaticPressureFvPatchScalarField.C             | 2 +-
 .../pressureDirectedInletOutletVelocityFvPatchVectorField.C  | 2 +-
 .../pressureInletOutletParSlipVelocityFvPatchVectorField.C   | 2 +-
 .../pressureInletOutletVelocityFvPatchVectorField.C          | 2 +-
 .../pressureNormalInletOutletVelocityFvPatchVectorField.C    | 2 +-
 ...surePermeableAlphaInletOutletVelocityFvPatchVectorField.C | 2 +-
 .../rotatingPressureInletOutletVelocityFvPatchVectorField.C  | 1 -
 .../supersonicFreestreamFvPatchVectorField.C                 | 2 +-
 .../turbulentIntensityKineticEnergyInletFvPatchScalarField.C | 2 +-
 .../uniformFixedGradient/uniformFixedGradientFvPatchField.C  | 2 +-
 .../uniformInletOutlet/uniformInletOutletFvPatchField.C      | 3 ++-
 .../variableHeightFlowRateFvPatchField.C                     | 2 +-
 27 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
index c7bb86dd29..29c9b16a0f 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
@@ -69,7 +69,7 @@ freeSurfaceVelocityFvPatchVectorField
 :
     fixedGradientFvPatchVectorField(p, iF)
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(patchInternalField());
 }
 
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
index 97320176f1..eabf883256 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
@@ -121,9 +121,8 @@ Foam::exprFixedValueFvPatchField<Type>::exprFixedValueFvPatchField
 
     driver_.readDict(dict_);
 
-    // Similar to fvPatchField constructor, which we have bypassed
-    dict.readIfPresent("patchType", this->patchType(), keyType::LITERAL);
-
+    // Since we bypassed dictionary constructor
+    fvPatchFieldBase::readDict(dict);
 
     const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
 
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
index 45837a762a..10394092a8 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
@@ -162,9 +162,8 @@ Foam::exprMixedFvPatchField<Type>::exprMixedFvPatchField
 
     driver_.readDict(dict_);
 
-    // Similar to fvPatchField constructor, which we have bypassed
-    dict.readIfPresent("patchType", this->patchType(), keyType::LITERAL);
-
+    // Since we bypassed dictionary constructor
+    fvPatchFieldBase::readDict(dict);
 
     const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
     const auto* hasRefValue = dict.findEntry("refValue", keyType::LITERAL);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index 3c5d62ab71..de5afa2c80 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -55,7 +55,8 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     fixedGradientFvPatchScalarField(p, iF),
     curTimeIndex_(-1)
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
+
     if (dict.found("value") && dict.found("gradient"))
     {
         fvPatchField<scalar>::operator=
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index f8a4c70fc6..283d7cfb9e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -53,9 +53,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 :
     fixedValueFvPatchField<Type>(p, iF, dict),
     meanValue_(Function1<Type>::New("meanValue", dict, &this->db()))
-{
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
-}
+{}
 
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index 39f2262707..56cf2631cb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -71,7 +71,7 @@ fixedNormalInletOutletVelocityFvPatchVectorField
         fvPatchVectorField::New(p, iF, dict.subDict("normalVelocity"))
     )
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = normalVelocity();
     refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index 06a994141f..f4abae24a6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -71,7 +71,7 @@ Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
     fixedValue_("fixedValue", dict, p.size()),
     writeValue_(dict.getOrDefault("writeValue", false))
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index 333b0da384..f600895920 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -74,7 +74,7 @@ fluxCorrectedVelocityFvPatchVectorField
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(patchInternalField());
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index eed403c590..d90bd730a6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -53,7 +53,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
     inletOutletFvPatchField<Type>(p, iF),
     freestreamBCPtr_()
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index db493dd1ce..bd8f9a323b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -71,7 +71,7 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
     mixedFvPatchField<Type>(p, iF),
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     this->refValue() = Field<Type>("inletValue", dict, p.size());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index e3191f8c43..20f3fa227d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -84,7 +84,7 @@ inletOutletTotalTemperatureFvPatchScalarField
     gamma_(dict.get<scalar>("gamma")),
     T0_("T0", dict, p.size())
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
index 2802f3256c..5c236bdfef 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
@@ -50,7 +50,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
 :
     fixedValueFvPatchVectorField(p, iF, Zero)
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 9c79092891..c5e5e15f9c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -71,7 +71,7 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
     mixedFvPatchField<Type>(p, iF),
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     this->refValue() = Field<Type>("outletValue", dict, p.size());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 9bf92ef777..d90b61c7bc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -78,7 +78,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
     Umean_(dict.get<scalar>("Umean")),
     alphaName_(dict.lookup("alpha"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     refValue() = Zero;
     refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index d938724860..0c7141fc13 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -74,7 +74,7 @@ Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
     valueFraction_("valueFraction", dict, p.size()),
     writeValue_(dict.getOrDefault("writeValue", false))
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     // Backwards compatibility - leave refValue as zero unless specified
     if (dict.found("refValue"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index c33756cbc9..e4b4028791 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -68,7 +68,7 @@ phaseHydrostaticPressureFvPatchScalarField
     pRefValue_(dict.get<scalar>("pRefValue")),
     pRefPoint_(dict.lookup("pRefPoint"))
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     this->refValue() = pRefValue_;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index 7f8c6b8698..fddcc8a57d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -81,7 +81,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
     inletDir_("inletDirection", dict, p.size())
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = *this;
     refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 616bde73d7..4c89daf49b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -79,7 +79,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = *this;
     refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 84e7f55de3..52c9d9e829 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -80,7 +80,7 @@ pressureInletOutletVelocityFvPatchVectorField
     directionMixedFvPatchVectorField(p, iF),
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
 
     if (dict.found("tangentialVelocity"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 3b36934e7a..6340b222d1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -79,7 +79,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = *this;
     refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index d3914c1e9f..660ae711bb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -83,7 +83,7 @@ pressurePermeableAlphaInletOutletVelocityFvPatchVectorField
     alphaName_(dict.getOrDefault<word>("alpha", "none")),
     alphaMin_(dict.getOrDefault<scalar>("alphaMin", 1))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
     refValue() = Zero;
     refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index b5578dd091..512d5dbd64 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -91,7 +91,6 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
     pressureInletOutletVelocityFvPatchVectorField(p, iF, dict),
     omega_(Function1<vector>::New("omega", dict, &db()))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
     calcTangentialVelocity();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index b74d4045d1..99b43776c7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -72,7 +72,7 @@ supersonicFreestreamFvPatchVectorField
     TInf_(dict.get<scalar>("TInf")),
     gamma_(dict.get<scalar>("gamma"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
 
     if (dict.found("value"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 86c7bcba8f..73716f4426 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -76,7 +76,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
     intensity_(dict.get<scalar>("intensity")),
     UName_(dict.getOrDefault<word>("U", "U"))
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
     if (intensity_ < 0 || intensity_ > 1)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index 221a553d3e..d9d53982c3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -69,7 +69,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
         PatchFunction1<Type>::New(p.patch(), "uniformGradient", dict)
     )
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     this->evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 66ac85ac11..257dfc8151 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -61,7 +61,8 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
         Function1<Type>::New("uniformInletValue", dict, &this->db())
     )
 {
-    this->patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
+
     this->refValue() =
         uniformInletValue_->value(this->db().time().timeOutputValue());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index bd97ac1c68..ce850c96c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -81,7 +81,7 @@ Foam::variableHeightFlowRateFvPatchScalarField
     lowerBound_(dict.get<scalar>("lowerBound")),
     upperBound_(dict.get<scalar>("upperBound"))
 {
-    patchType() = dict.getOrDefault<word>("patchType", word::null);
+    fvPatchFieldBase::readDict(dict);
     this->refValue() = 0.0;
 
     if (dict.found("value"))

From c8a2d820940a09acca1fdd5941d1dec7cfaf1d0a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 24 Jan 2023 14:40:06 +0100
Subject: [PATCH 035/348] BUG: inconsistent faceArea on processor boundaries
 (fixes #2683)

- was missing evaluateCoupled on the initial faceAreaNormals field
  (related to #2507)
---
 .../faMesh/faBoundaryMesh/faBoundaryMesh.C       |  8 ++++++++
 src/finiteArea/faMesh/faMesh.C                   | 16 +++-------------
 src/finiteArea/faMesh/faMeshDemandDrivenData.C   | 12 ++++++++++++
 src/finiteArea/faMesh/faMeshTools/faMeshTools.C  |  4 +++-
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index 82b497a3ad..7bd8ad7ca9 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -196,6 +196,10 @@ void Foam::faBoundaryMesh::calcGeometry()
     (void)mesh_.edgeAreaNormals();
     (void)mesh_.pointAreaNormals();
 
+    (void)mesh_.areaCentres();
+    (void)mesh_.faceAreaNormals();
+
+
     PstreamBuffers pBufs(Pstream::defaultCommsType);
 
     if
@@ -788,6 +792,10 @@ void Foam::faBoundaryMesh::movePoints(const pointField& p)
     (void)mesh_.edgeAreaNormals();
     (void)mesh_.pointAreaNormals();
 
+    (void)mesh_.areaCentres();
+    (void)mesh_.faceAreaNormals();
+
+
     PstreamBuffers pBufs(Pstream::defaultCommsType);
 
     if
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index eaf224fbf0..12d34152be 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -317,18 +317,7 @@ bool Foam::faMesh::init(const bool doInit)
     // Calculate the geometry for the patches (transformation tensors etc.)
     boundary_.calcGeometry();
 
-    // Ensure processor/processor information is properly synchronised
-    if (Pstream::parRun())
-    {
-        const_cast<areaVectorField&>(areaCentres()).boundaryFieldRef()
-            .evaluateCoupled<processorFaPatch>();
-
-        // This roughly corresponds to what OpenFOAM-v2112 (and earlier) had,
-        // but should nominally be unnecessary.
-        //
-        /// const_cast<areaVectorField&>(faceAreaNormals()).boundaryFieldRef()
-        ///     .evaluateCoupled<processorFaPatch>();
-    }
+    syncGeom();
 
     return false;
 }
@@ -1010,7 +999,6 @@ bool Foam::faMesh::movePoints()
 
     clearGeomNotAreas();
 
-    // To satisfy the motion interface for MeshObject, const cast is needed
     if (patchPtr_)
     {
         patchPtr_->movePoints(newPoints);
@@ -1024,6 +1012,8 @@ bool Foam::faMesh::movePoints()
 
     // Note: Fluxes were dummy?
 
+    syncGeom();
+
     return true;
 }
 
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 6bd45e7298..3775a314ad 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -876,6 +876,12 @@ void Foam::faMesh::calcFaceCentres() const
             }
         }
     }
+
+    // Parallel consistency, exchange on processor patches
+    if (UPstream::parRun())
+    {
+        centres.boundaryFieldRef().evaluateCoupled<processorFaPatch>();
+    }
 }
 
 
@@ -1088,6 +1094,12 @@ void Foam::faMesh::calcFaceAreaNormals() const
                 = edgeNormalsBoundary[patchi];
         }
     }
+
+    // Parallel consistency, exchange on processor patches
+    if (UPstream::parRun())
+    {
+        faceNormals.boundaryFieldRef().evaluateCoupled<processorFaPatch>();
+    }
 }
 
 
diff --git a/src/finiteArea/faMesh/faMeshTools/faMeshTools.C b/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
index e12c43c7b4..cce1e3c6d7 100644
--- a/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
+++ b/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,6 +61,8 @@ void Foam::faMeshTools::forceDemandDriven(faMesh& mesh)
     (void)mesh.pointAreaNormals();
     (void)mesh.faceCurvatures();
     (void)mesh.edgeTransformTensors();
+
+    mesh.syncGeom();
 }
 
 

From bebc6195a8a6386f4926f3a70df408ef9e82d087 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 13 Jan 2023 18:15:13 +0100
Subject: [PATCH 036/348] ENH: IOobjectOption isAnyRead() for checking against
 NO_READ

- encompasses isReadOptional or isReadRequired check

STYLE: allow LAZY_READ as a shorter synonym for READ_IF_PRESENT

- add helper for downgrading MUST_READ... to LAZY_READ
---
 src/OpenFOAM/Make/files                       |  3 +-
 src/OpenFOAM/db/IOobject/IOobject.H           |  2 +-
 .../db/IOobjects/IOPtrList/IOPtrList.C        |  2 +-
 .../db/{IOobject => options}/IOobjectOption.H | 40 ++++++++++++++-----
 .../IOstreams => options}/IOstreamOption.C    |  0
 .../IOstreams => options}/IOstreamOption.H    |  0
 .../coordinate/systems/coordinateSystem.C     |  8 ++--
 .../coordinate/systems/coordinateSystemNew.C  |  5 +--
 .../hexRef8/refinementHistory.C               |  2 +-
 .../polyTopoChanger/polyTopoChanger.C         |  4 +-
 .../regionProperties/regionProperties.C       |  2 +-
 .../triSurfaceMesh/triSurfaceMesh.C           |  4 +-
 .../distributedTriSurfaceMesh.C               | 12 +-----
 .../faReconstruct/faMeshReconstructor.C       |  2 +-
 src/surfMesh/writers/common/surfaceWriter.C   |  4 +-
 15 files changed, 50 insertions(+), 40 deletions(-)
 rename src/OpenFOAM/db/{IOobject => options}/IOobjectOption.H (88%)
 rename src/OpenFOAM/db/{IOstreams/IOstreams => options}/IOstreamOption.C (100%)
 rename src/OpenFOAM/db/{IOstreams/IOstreams => options}/IOstreamOption.H (100%)

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 881ca47c7a..1cef3ee916 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -240,11 +240,12 @@ containers/Lists/ListOps/ListOps.C
 containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
 containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
 
+db/options/IOstreamOption.C
+
 Streams = db/IOstreams
 $(Streams)/token/tokenIO.C
 
 IOstreams = $(Streams)/IOstreams
-$(IOstreams)/IOstreamOption.C
 $(IOstreams)/IOstream.C
 $(IOstreams)/Istream.C
 $(IOstreams)/Ostream.C
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index e8eb9a94ec..5f088ae206 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -50,7 +50,7 @@ Description
         Error if Istream does not exist or cannot be read. If object is
         registered its timestamp will be checked every timestep and possibly
         re-read.
-      - \par READ_IF_PRESENT
+      - \par LAZY_READ (READ_IF_PRESENT)
         Read object from Istream, but only if Istream exists. \n
         Error only if Istream exists but cannot be read.
         Does not check timestamp or re-read.
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index e1e2a9dc3a..cc46681dbf 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -69,7 +69,7 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const label len)
     regIOobject(io),
     PtrList<T>(len)
 {
-    if (io.readOpt() != IOobject::NO_READ)
+    if (io.isAnyRead())
     {
         FatalErrorInFunction
             << "NO_READ must be set if specifying size" << nl
diff --git a/src/OpenFOAM/db/IOobject/IOobjectOption.H b/src/OpenFOAM/db/options/IOobjectOption.H
similarity index 88%
rename from src/OpenFOAM/db/IOobject/IOobjectOption.H
rename to src/OpenFOAM/db/options/IOobjectOption.H
index 6887143b7d..fba77e3bc6 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectOption.H
+++ b/src/OpenFOAM/db/options/IOobjectOption.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,8 @@ public:
     // Public Data Types
 
         //- Enumeration defining read preferences
-        //  Lowest bit encodes must read
+        //  Lowest bit encodes 'must read'.
+        //  Possible (future) named variants (none | normal | modified | lazy)
         enum readOption : unsigned char
         {
             //! Nothing to be read
@@ -72,7 +73,10 @@ public:
             //! Reading required, file watched for runTime modification
             MUST_READ_IF_MODIFIED = 0x3,
 
-            //! Reading is optional
+            //! Reading is optional [identical to READ_IF_PRESENT]
+            LAZY_READ = 0x4,
+
+            //! Reading is optional [identical to LAZY_READ]
             READ_IF_PRESENT = 0x4
         };
 
@@ -256,28 +260,46 @@ public:
 
     // Checks
 
+        //- True if not (NO_READ)
+        static bool isAnyRead(readOption opt) noexcept
+        {
+            return (opt != readOption::NO_READ);
+        }
+
+        //- True if not (NO_READ)
+        bool isAnyRead() const noexcept
+        {
+            return (readOpt_ != readOption::NO_READ);
+        }
+
         //- True if (MUST_READ | MUST_READ_IF_MODIFIED) bits are set
         static bool isReadRequired(readOption opt) noexcept
         {
-            return static_cast<bool>(opt & readOption::MUST_READ);
+            return (opt & readOption::MUST_READ);
         }
 
         //- True if (MUST_READ | MUST_READ_IF_MODIFIED) bits are set
         bool isReadRequired() const noexcept
         {
-            return static_cast<bool>(readOpt_ & readOption::MUST_READ);
+            return (readOpt_ & readOption::MUST_READ);
         }
 
-        //- True if (READ_IF_PRESENT) bits are set
+        //- True if (LAZY_READ) bits are set [same as READ_IF_PRESENT]
         static bool isReadOptional(readOption opt) noexcept
         {
-            return (opt == readOption::READ_IF_PRESENT);
+            return (opt == readOption::LAZY_READ);
         }
 
-        //- True if (READ_IF_PRESENT) bits are set
+        //- True if (LAZY_READ) bits are set [same as READ_IF_PRESENT]
         bool isReadOptional() const noexcept
         {
-            return (readOpt_ == readOption::READ_IF_PRESENT);
+            return (readOpt_ == readOption::LAZY_READ);
+        }
+
+        //- Downgrade readOption optional (LAZY_READ), leaves NO_READ intact.
+        static readOption lazierRead(readOption opt) noexcept
+        {
+            return (opt == readOption::NO_READ ? opt : readOption::LAZY_READ);
         }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C b/src/OpenFOAM/db/options/IOstreamOption.C
similarity index 100%
rename from src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C
rename to src/OpenFOAM/db/options/IOstreamOption.C
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.H b/src/OpenFOAM/db/options/IOstreamOption.H
similarity index 100%
rename from src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.H
rename to src/OpenFOAM/db/options/IOstreamOption.H
diff --git a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.C
index c02f1d787a..1aac7a93e1 100644
--- a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.C
+++ b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.C
@@ -84,7 +84,7 @@ void Foam::coordinateSystem::assign
      && (dict.dictName() == coordinateSystem::typeName)
     )
     {
-        readOrigin = IOobjectOption::READ_IF_PRESENT;
+        readOrigin = IOobjectOption::lazierRead(readOrigin);
     }
 
     dict.readEntry("origin", origin_, keyType::LITERAL, readOrigin);
@@ -286,10 +286,8 @@ Foam::coordinateSystem::coordinateSystem
     if (dictName.size())
     {
         // Allow 'origin' to be optional if reading from a sub-dict
-        if (IOobjectOption::isReadRequired(readOrigin))
-        {
-            readOrigin = IOobjectOption::READ_IF_PRESENT;
-        }
+        readOrigin = IOobjectOption::lazierRead(readOrigin);
+
         assign(dict.subDict(dictName), readOrigin);
     }
     else
diff --git a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemNew.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemNew.C
index 806fade521..3fc948b219 100644
--- a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemNew.C
+++ b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemNew.C
@@ -157,10 +157,7 @@ Foam::coordinateSystem::New
     {
         // Using a sub-dictionary
         // - the 'origin' can be optional
-        if (IOobjectOption::isReadRequired(readOrigin))
-        {
-            readOrigin = IOobjectOption::READ_IF_PRESENT;
-        }
+        readOrigin = IOobjectOption::lazierRead(readOrigin);
     }
     else
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index d23d23737d..bd85c5a369 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@@ -734,7 +734,7 @@ Foam::refinementHistory::refinementHistory
     regIOobject(io),
     active_(false)
 {
-    if (io.readOpt() != IOobject::NO_READ)
+    if (io.isAnyRead())
     {
         WarningInFunction
             << "read option IOobject::MUST_READ or READ_IF_PRESENT "
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index a7e671f55f..4f13ccc223 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -114,9 +114,9 @@ Foam::polyTopoChanger::polyTopoChanger
                 mesh.meshDir(),
                 "meshModifiers",
                 (
-                    // Safety? promote NO_READ to READ_IF_PRESENT
+                    // Safety? promote NO_READ to LAZY_READ
                     rOpt == IOobject::NO_READ
-                  ? IOobject::READ_IF_PRESENT
+                  ? IOobject::LAZY_READ
                   : rOpt
                 )
             ),
diff --git a/src/meshTools/regionModel/regionProperties/regionProperties.C b/src/meshTools/regionModel/regionProperties/regionProperties.C
index 1f49743ef4..0e82006feb 100644
--- a/src/meshTools/regionModel/regionProperties/regionProperties.C
+++ b/src/meshTools/regionModel/regionProperties/regionProperties.C
@@ -58,7 +58,7 @@ Foam::regionProperties::regionProperties
         )
     );
 
-    if (IOobject::isReadRequired(rOpt) || iodict.size())
+    if (IOobjectOption::isReadRequired(rOpt) || iodict.size())
     {
         iodict.readEntry("regions", props);
     }
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 324f882ecc..b4eb59a16b 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -420,7 +420,7 @@ Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io, const readAction r)
     outsideVolType_(volumeType::UNKNOWN)
 {
     // Check IO flags
-    if (io.readOpt() != IOobject::NO_READ)
+    if (io.isAnyRead())
     {
         const bool searchGlobal(r == localOrGlobal || r == masterOnly);
 
@@ -520,7 +520,7 @@ Foam::triSurfaceMesh::triSurfaceMesh
     surfaceClosed_(-1),
     outsideVolType_(volumeType::UNKNOWN)
 {
-    if (io.readOpt() != IOobject::NO_READ)
+    if (io.isAnyRead())
     {
         // Surface type (optional)
         const word surfType(dict.getOrDefault<word>("fileType", word::null));
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 5d53b49ead..a3f6db6029 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -2606,11 +2606,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
             searchableSurface::instance(),
             searchableSurface::local(),
             searchableSurface::db(),
-            (
-                searchableSurface::isReadRequired()
-              ? IOobject::READ_IF_PRESENT
-              : searchableSurface::readOpt()
-            ),
+            IOobjectOption::lazierRead(searchableSurface::readOpt()),
             searchableSurface::writeOpt(),
             searchableSurface::registerObject()
         ),
@@ -2719,11 +2715,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
             searchableSurface::instance(),
             searchableSurface::local(),
             searchableSurface::db(),
-            (
-                searchableSurface::isReadRequired()
-              ? IOobject::READ_IF_PRESENT
-              : searchableSurface::readOpt()
-            ),
+            IOobjectOption::lazierRead(searchableSurface::readOpt()),
             searchableSurface::writeOpt(),
             searchableSurface::registerObject()
         ),
diff --git a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
index 4a51a54725..2ea4e4df1d 100644
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@@ -568,7 +568,7 @@ Foam::faMeshReconstructor::faMeshReconstructor
     // Use 'headerClassName' for checking
     bool fileOk
     (
-        (fvFaceProcAddr.readOpt() != IOobjectOption::NO_READ)
+        fvFaceProcAddr.isAnyRead()
      && fvFaceProcAddr.isHeaderClass<labelIOList>()
     );
 
diff --git a/src/surfMesh/writers/common/surfaceWriter.C b/src/surfMesh/writers/common/surfaceWriter.C
index eaf0ad1f4b..74dea7f2c9 100644
--- a/src/surfMesh/writers/common/surfaceWriter.C
+++ b/src/surfMesh/writers/common/surfaceWriter.C
@@ -207,9 +207,9 @@ Foam::surfaceWriter::surfaceWriter(const dictionary& options)
     {
         dictptr->readIfPresent("rotationCentre", geometryCentre_);
 
-        // 'origin' (READ_IF_PRESENT)
+        // 'origin' is optional within sub-dictionary
         geometryTransform_ =
-            coordSystem::cartesian(*dictptr, IOobjectOption::READ_IF_PRESENT);
+            coordSystem::cartesian(*dictptr, IOobjectOption::LAZY_READ);
     }
 
     fieldLevel_ = options.subOrEmptyDict("fieldLevel");

From 72bfaa2be9939921b0a6485df6c3ff5a0dae342a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 30 Jan 2023 10:30:41 +0100
Subject: [PATCH 037/348] ENH: Field assign and construct from dictionary with
 readOption

- This simplifies definition of 'lazier' (READ_IF_PRESENT)
  construction or assignment.

  For construction:
    - For MUST_READ and key not found: FatalIOError.
    - For LAZY_READ and key not found: initialise field with Zero.
    - For NO_READ and key not found: simply size the field.

  For assignment:
    - If len == 0 : a no-op and return True.
    - For NO_READ : a no-op and return False.
    - For MUST_READ and key not found : FatalIOError
---
 src/OpenFOAM/fields/Fields/Field/Field.C     | 55 ++++++++++++++++----
 src/OpenFOAM/fields/Fields/Field/Field.H     | 51 ++++++++++++------
 src/OpenFOAM/fields/Fields/Field/FieldBase.H |  1 -
 3 files changed, 79 insertions(+), 28 deletions(-)
 delete mode 100644 src/OpenFOAM/fields/Fields/Field/FieldBase.H

diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index fe237c8283..fad7a81541 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -179,20 +179,32 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field(const entry& e, const label len)
 {
-    assign(e, len);
+    Field<Type>::assign(e, len);
 }
 
 
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const word& keyword,
+    const word& key,
     const dictionary& dict,
     const label len,
-    enum keyType::option matchOpt
+    IOobjectOption::readOption readOpt
 )
 {
-    assign(keyword, dict, len, matchOpt);
+    if (!Field<Type>::assign(key, dict, len, readOpt))
+    {
+        if (IOobjectOption::isReadOptional(readOpt))
+        {
+            // Lazy read: init with zero value
+            if (len > 0) this->resize(len, Zero);
+        }
+        else
+        {
+            // No read: set length only
+            if (len > 0) this->resize(len);
+        }
+    }
 }
 
 
@@ -213,7 +225,7 @@ void Foam::Field<Type>::assign(const entry& e, const label len)
             // Resize to expected length (or -1 : retain current length)
             if (len >= 0)
             {
-                this->resize(len);
+                this->resize_nocopy(len);
             }
             operator=(pTraits<Type>(is));
         }
@@ -239,7 +251,7 @@ void Foam::Field<Type>::assign(const entry& e, const label len)
                 else
                 {
                     FatalIOErrorInFunction(is)
-                        << "size " << lenRead
+                        << "Size " << lenRead
                         << " is not equal to the expected length " << len
                         << exit(FatalIOError);
                 }
@@ -257,18 +269,39 @@ void Foam::Field<Type>::assign(const entry& e, const label len)
 
 
 template<class Type>
-void Foam::Field<Type>::assign
+bool Foam::Field<Type>::assign
 (
-    const word& keyword,
+    const word& key,
     const dictionary& dict,
     const label len,
-    enum keyType::option matchOpt
+    IOobjectOption::readOption readOpt
 )
 {
-    if (len)
+    if (!len)
     {
-        assign(dict.lookupEntry(keyword, matchOpt), len);
+        return true;
     }
+    else if (readOpt != IOobjectOption::NO_READ)
+    {
+        const entry* eptr = dict.findEntry(key, keyType::LITERAL);
+
+        if (eptr)
+        {
+            Field<Type>::assign(*eptr, len);
+            return true;
+        }
+
+        // Missing (mandatory or optional)
+        if (IOobjectOption::isReadRequired(readOpt))
+        {
+            FatalIOErrorInFunction(dict)
+                << "Required entry '" << key << "' missing in dictionary "
+                << dict.relativeName() << nl
+                << exit(FatalIOError);
+        }
+    }
+
+    return false;
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index aa91c3de16..f398928d1a 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -52,6 +52,7 @@ SourceFiles
 #include "keyType.H"
 #include "scalarList.H"
 #include "VectorSpace.H"
+#include "IOobjectOption.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,7 +70,6 @@ template<class Type> class SubField;
 template<class Type> Ostream& operator<<(Ostream&, const Field<Type>&);
 template<class Type> Ostream& operator<<(Ostream&, const tmp<Field<Type>>&);
 
-
 /*---------------------------------------------------------------------------*\
                           Class FieldBase Declaration
 \*---------------------------------------------------------------------------*/
@@ -264,17 +264,22 @@ public:
         //- Construct from Istream
         inline Field(Istream& is);
 
-        //- Construct from a dictionary (primitive) entry
+        //- Construct from a dictionary (primitive) entry.
         Field(const entry& e, const label len);
 
-        //- Construct from lookup of a dictionary (primitive) entry.
-        //  Uses REGEX lookup for legacy compatibility.
+        //- Lookup of a primitive dictionary entry by (literal) name
+        //- and assign its contents to this. The behaviour largely as
+        //- described in assign():
+        //  - For MUST_READ and key not found: FatalIOError.
+        //  - For LAZY_READ and key not found: initialise field with Zero.
+        //  - For NO_READ and key not found: simply size the field.
+        //  .
         Field
         (
-            const word& keyword,
-            const dictionary& dict,
-            const label len,
-            enum keyType::option matchOpt = keyType::REGEX
+            const word& key,        //!< Lookup key. Uses LITERAL (not REGEX)
+            const dictionary& dict, //!< dictionary
+            const label len,        //!< length
+            IOobjectOption::readOption readOpt = IOobjectOption::MUST_READ
         );
 
         //- Clone
@@ -297,17 +302,31 @@ public:
 
     // Member Functions
 
-        //- Assign from a dictionary (primitive) entry
+        //- Assign from a primitive dictionary entry with the following
+        //- behaviour:
+        //  - If len == 0 : a no-op
+        //  - If len < 0  : no size checking
+        //  - If len > 0  : resize \em uniform entries to this size
+        //    before assigning. Use as length check for \em nonuniform
+        //    entries. A mismatch is possibly Fatal, except when
+        //    allowConstructFromLargerSize is true (eg, for column mesh).
+        //  .
         void assign(const entry& e, const label len);
 
-        //- Assign from lookup of a dictionary (primitive) entry
-        //  Uses REGEX lookup for legacy compatibility.
-        void assign
+        //- Lookup a primitive dictionary entry by (literal) name
+        //- and assign its contents to this (behaviour as described above).
+        //  - If len == 0 : a no-op and return True.
+        //  - For NO_READ : a no-op and return False.
+        //  - For LAZY_READ and key not found : a no-op and return False.
+        //  - For MUST_READ and key not found : FatalIOError
+        //  .
+        //  \returns True if an assignment occurred or for zero-length.
+        bool assign
         (
-            const word& keyword,
-            const dictionary& dict,
-            const label len,
-            enum keyType::option matchOpt = keyType::REGEX
+            const word& key,        //!< Lookup key. Uses LITERAL (not REGEX)
+            const dictionary& dict, //!< dictionary
+            const label len,        //!< expected length
+            IOobjectOption::readOption readOpt = IOobjectOption::MUST_READ
         );
 
         //- 1 to 1 map from the given field
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldBase.H b/src/OpenFOAM/fields/Fields/Field/FieldBase.H
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/fields/Fields/Field/FieldBase.H
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only

From 8ee7595a771b77985c96b8dec7c4dbb45c77efcb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 30 Jan 2023 22:43:55 +0100
Subject: [PATCH 038/348] ENH: foamToVTK improvements for (-no-internal,
 -no-boundary)

- skip loading of fields with -no-internal, -no-boundary

- suppress reporting fields with -no-internal, -no-boundary

- cache loaded volume field for reuse with point interpolation.
  Trade off some memory overhead against reading twice.

  NOTE: this issue will not be evident with foamToEnsight since there
  it only handles cell data *or* point data (not both), so a field is
  only ever loaded/processed once.
---
 .../foamToVTK/convertAreaFields.H             |  15 +-
 .../foamToVTK/convertLagrangian.H             |  15 +-
 .../foamToVTK/convertProcessorPatches.H       |  20 +-
 .../foamToVTK/convertSurfaceFields.H          |  15 +-
 .../dataConversion/foamToVTK/convertTopoSet.H |  15 +-
 .../foamToVTK/convertVolumeFields.H           |  59 ++++--
 .../dataConversion/foamToVTK/readFields.C     |  59 +++++-
 .../dataConversion/foamToVTK/readFields.H     |  17 +-
 .../foamToVTK/writeAreaFields.H               |  63 ++----
 .../dataConversion/foamToVTK/writeDimFields.H | 138 ++++---------
 .../foamToVTK/writePointFields.H              |  38 ++--
 .../foamToVTK/writeSurfaceFields.H            |  21 +-
 .../dataConversion/foamToVTK/writeVolFields.H | 193 +++++++-----------
 13 files changed, 251 insertions(+), 417 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
index bdeba32c5c..d72c251c27 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
@@ -8,20 +8,7 @@
     Copyright (C) 2018-2022 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/>.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Code chunk for converting finite-area - included by foamToVTK.
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
index de8c9c5d7c..7233b0cacf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
@@ -8,20 +8,7 @@
     Copyright (C) 2018-2022 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/>.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Code chunk for post-processing conversion of cloud(s) to VTK PolyData
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
index 0b00f38122..a220bfecdc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
@@ -5,23 +5,10 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 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/>.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Code chunk for converting volume fields on processor boundaries,
@@ -145,7 +132,8 @@ Description
             patchWriters,
             meshProxy,
             objects,
-            true  // syncPar
+            true,   // syncPar
+            nullptr // no field cache (object registry)
         );
 
         // End CellData is implicit
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H
index 6005ffa4a6..e44966991e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H
@@ -8,20 +8,7 @@
     Copyright (C) 2018-2022 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/>.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Code chunk for post-processing surface fields to VTK PolyData
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H
index d939edbd22..547f5b0e8e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H
@@ -8,20 +8,7 @@
     Copyright (C) 2018-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/>.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Code chunk for converting face and point sets - included by foamToVTK.
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
index d224b5d01c..90e5be85cb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
@@ -5,23 +5,10 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 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/>.
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Code chunk for converting volume and dimensioned fields
@@ -56,8 +43,14 @@ Description
     );
 
 
-    reportFields::volume(Info, objects);
-    reportFields::internal(Info, objects);
+    if (doInternal || doBoundary)
+    {
+        reportFields::volume(Info, objects);
+    }
+    if (doInternal)
+    {
+        reportFields::internal(Info, objects);
+    }
 
 
     // Setup for the vtm writer.
@@ -269,6 +262,26 @@ Description
         patchInterps.resize(nPatchInterps);
     }
 
+    // With point-interpolation, cache fields to avoid multiple re-reading
+    std::unique_ptr<objectRegistry> cacheFieldsPtr;
+
+    if (doPointValues && (nVolFields || nDimFields))
+    {
+        cacheFieldsPtr.reset
+        (
+            new objectRegistry
+            (
+                IOobject
+                (
+                    "foamToVTK::volume",
+                    runTime.timeName(),
+                    runTime,
+                    IOobject::NO_REGISTER
+                )
+            )
+        );
+    }
+
 
     // CellData
     {
@@ -314,7 +327,8 @@ Description
             patchWriters,
             meshProxy,
             objects,
-            true  // syncPar
+            true, // syncPar
+            cacheFieldsPtr.get()
         );
 
         writeAllDimFields
@@ -322,7 +336,8 @@ Description
             internalWriter,
             meshProxy,
             objects,
-            true  // syncPar
+            true, // syncPar
+            cacheFieldsPtr.get()
         );
 
         // End CellData is implicit
@@ -373,7 +388,8 @@ Description
             patchWriters,   patchInterps,
             meshProxy,
             objects,
-            true  // syncPar
+            true, // syncPar
+            cacheFieldsPtr.get()
         );
 
         writeAllDimFields
@@ -381,7 +397,8 @@ Description
             internalWriter, pInterp,
             meshProxy,
             objects,
-            true  // syncPar
+            true, // syncPar
+            cacheFieldsPtr.get()
         );
 
         writeAllPointFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 3f8311b1c4..f160eeb027 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,14 +49,47 @@ Foam::tmp<GeoField> Foam::getField
 (
     const IOobject* io,
     const fvMeshSubsetProxy& proxy,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
-    return
-        proxy.interpolate
+    tmp<GeoField> tfield;
+
+    if (io)
+    {
+        const word& fieldName = io->name();
+
+        if (cache)
+        {
+            // Get reference from cache if possible
+            tfield.cref(cache->cfindObject<GeoField>(fieldName));
+
+            if (tfield)
+            {
+                return tfield;
+            }
+        }
+
+        tfield = proxy.interpolate
         (
             getField<GeoField>(io, proxy.baseMesh(), syncPar)
         );
+
+        if (tfield && cache)
+        {
+            // Move field to the cache
+            IOobject newIO(tfield(), *cache);
+            newIO.readOpt(IOobject::NO_READ);
+            newIO.writeOpt(IOobject::NO_WRITE);
+
+            tfield.ref().checkOut();  // Paranoid
+            cache->store(new GeoField(newIO, tfield));
+
+            tfield.cref(cache->cfindObject<GeoField>(fieldName));
+        }
+    }
+
+    return tfield;
 }
 
 
@@ -71,7 +104,12 @@ Foam::tmp<GeoField> Foam::getField
 {
     // Can do something with syncPar on failure ...
 
-    return getField<GeoField>(objects.findObject(fieldName), mesh, syncPar);
+    return getField<GeoField>
+    (
+        objects.findObject(fieldName),
+        mesh,
+        syncPar
+    );
 }
 
 
@@ -81,12 +119,19 @@ Foam::tmp<GeoField> Foam::getField
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
     const word& fieldName,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
     // Can do something with syncPar on failure ...
 
-    return getField<GeoField>(objects.findObject(fieldName), proxy, syncPar);
+    return getField<GeoField>
+    (
+        objects.findObject(fieldName),
+        proxy,
+        syncPar,
+        cache
+    );
 }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
index f5f15321c5..2b308d8621 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,10 +35,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_readFields_H
-#define Foam_readFields_H
+#ifndef FoamToVTK_readFields_H
+#define FoamToVTK_readFields_H
 
 #include "fvMeshSubsetProxy.H"
+#include "objectRegistry.H"
 #include "IOobjectList.H"
 #include "PtrList.H"
 
@@ -63,7 +64,8 @@ tmp<GeoField> getField
 (
     const IOobject* io,
     const fvMeshSubsetProxy& proxy,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache = nullptr
 );
 
 
@@ -78,14 +80,17 @@ tmp<GeoField> getField
 );
 
 
-//- Get the named field from the objects and subset it, or return nullptr
+//- Return the named field from the optional cache (if found),
+//- or get it from the objects and subset it (add to cache).
+//- Return nullptr if nothing worked.
 template<class GeoField>
 tmp<GeoField> getField
 (
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
     const word& fieldName,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache = nullptr
 );
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeAreaFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeAreaFields.H
index d8111f5f7a..2c216e7a0a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeAreaFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeAreaFields.H
@@ -5,38 +5,19 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 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/>.
-
-InNamespace
-    Foam
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
-    Read finite-area fields from disk
+    Code chunk for reading finite-area fields from disk
     and write with vtk::uindirectPatchGeoFieldsWriter
 
-SourceFiles
-    writeAreaFields.H
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeAreaFields_H
-#define writeAreaFields_H
+#ifndef FoamToVTK_writeAreaFields_H
+#define FoamToVTK_writeAreaFields_H
 
 #include "readFields.H"
 #include "foamVtkIndPatchGeoFieldsWriter.H"
@@ -49,25 +30,6 @@ namespace Foam
 // Writer type for finite-area mesh + fields
 typedef vtk::uindirectPatchGeoFieldsWriter vtkWriterType_areaMesh;
 
-template<class GeoField>
-bool writeAreaField
-(
-    vtkWriterType_areaMesh& writer,
-    const tmp<GeoField>& tfield
-)
-{
-    if (tfield)
-    {
-        writer.write(tfield());
-        tfield.clear();
-
-        return true;
-    }
-
-    return false;
-}
-
-
 template<class GeoField>
 label writeAreaFields
 (
@@ -81,15 +43,14 @@ label writeAreaFields
 
     for (const word& fieldName : objects.sortedNames<GeoField>())
     {
-        if
-        (
-            writeAreaField<GeoField>
-            (
-                writer,
-                getField<GeoField>(mesh, objects, fieldName, syncPar)
-            )
-        )
+        tmp<GeoField> tfield =
+            getField<GeoField>(mesh, objects, fieldName, syncPar);
+
+        if (tfield)
         {
+            writer.write(tfield());
+
+            tfield.clear();
             ++count;
         }
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H
index 45e8d79476..eb8766f362 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeDimFields.H
@@ -5,38 +5,19 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 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/>.
-
-InNamespace
-    Foam
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
-    Read dimensioned fields from disk
+    Code chunk for reading dimensioned fields from disk
     and write with vtk::internalWriter
 
-SourceFiles
-    writeDimFields.H
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeDimFields_H
-#define writeDimFields_H
+#ifndef FoamToVTK_writeDimFields_H
+#define FoamToVTK_writeDimFields_H
 
 #include "readFields.H"
 #include "foamVtkInternalWriter.H"
@@ -46,77 +27,31 @@ SourceFiles
 namespace Foam
 {
 
-template<class GeoField>
-bool writeDimField
-(
-    autoPtr<vtk::internalWriter>& internalWriter,
-    const tmp<GeoField>& tfield
-)
-{
-    if (!tfield)
-    {
-        return false;
-    }
-
-    const auto& field = tfield();
-
-    if (internalWriter)
-    {
-        internalWriter->write(field);
-    }
-
-    tfield.clear();
-    return true;
-}
-
-
-template<class GeoField>
-bool writeDimField
-(
-    autoPtr<vtk::internalWriter>& internalWriter,
-    const autoPtr<volPointInterpolation>& pInterp,
-    const tmp<GeoField>& tfield
-)
-{
-    if (!tfield)
-    {
-        return false;
-    }
-
-    const auto& field = tfield();
-
-    if (internalWriter && pInterp)
-    {
-        internalWriter->write(field, *pInterp);
-    }
-
-    tfield.clear();
-    return true;
-}
-
-
 template<class GeoField>
 label writeDimFields
 (
     autoPtr<vtk::internalWriter>& internalWriter,
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if (!internalWriter) return 0;
+
     label count = 0;
 
     for (const word& fieldName : objects.sortedNames<GeoField>())
     {
-        if
-        (
-            writeDimField<GeoField>
-            (
-                internalWriter,
-                getField<GeoField>(proxy, objects, fieldName, syncPar)
-            )
-        )
+        tmp<GeoField> tfield =
+            getField<GeoField>(proxy, objects, fieldName, syncPar, cache);
+
+        if (tfield)
         {
+            internalWriter->write(tfield());
+
+            tfield.clear();
             ++count;
         }
     }
@@ -133,22 +68,25 @@ label writeDimFields
 
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if (!internalWriter || !pInterp) return 0;
+
     label count = 0;
 
     for (const word& fieldName : objects.sortedNames<GeoField>())
     {
-        if
-        (
-            writeDimField<GeoField>
-            (
-                internalWriter, pInterp,
-                getField<GeoField>(proxy, objects, fieldName, syncPar)
-            )
-        )
+        tmp<GeoField> tfield =
+            getField<GeoField>(proxy, objects, fieldName, syncPar, cache);
+
+        if (tfield)
         {
+            internalWriter->write(tfield(), *pInterp);
+
+            tfield.clear();
             ++count;
         }
     }
@@ -163,9 +101,13 @@ label writeAllDimFields
 
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if (!internalWriter) return 0;
+
     #undef  foamToVtk_WRITE_FIELD
     #define foamToVtk_WRITE_FIELD(FieldType)    \
         writeDimFields<FieldType>               \
@@ -173,7 +115,8 @@ label writeAllDimFields
             internalWriter,                     \
             proxy,                              \
             objects,                            \
-            syncPar                             \
+            syncPar,                            \
+            cache                               \
         )
 
     label count = 0;
@@ -195,9 +138,13 @@ label writeAllDimFields
 
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if (!internalWriter || !pInterp) return 0;
+
     #undef  foamToVtk_WRITE_FIELD
     #define foamToVtk_WRITE_FIELD(FieldType)    \
         writeDimFields<FieldType>               \
@@ -205,7 +152,8 @@ label writeAllDimFields
             internalWriter, pInterp,            \
             proxy,                              \
             objects,                            \
-            syncPar                             \
+            syncPar,                            \
+            cache                               \
         )
 
     label count = 0;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H
index cb1e311f4f..7b84181d75 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writePointFields.H
@@ -5,38 +5,19 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 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/>.
-
-InNamespace
-    Foam
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
-    Read point fields from disk
+    Code chunk for reading point fields from disk
     and write with vtk::internalWriter and vtk::patchWriter
 
-SourceFiles
-    writePointFields.H
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef writePointFields_H
-#define writePointFields_H
+#ifndef FoamToVTK_writePointFields_H
+#define FoamToVTK_writePointFields_H
 
 #include "readFields.H"
 #include "foamVtkInternalWriter.H"
@@ -57,6 +38,9 @@ bool writePointField
     const fvMeshSubsetProxy& proxy
 )
 {
+    // Sanity test
+    if (!internalWriter && patchWriters.empty()) return false;
+
     if (!tfield)
     {
         return false;
@@ -113,6 +97,9 @@ label writePointFields
     const bool syncPar
 )
 {
+    // Sanity test
+    if (!internalWriter && patchWriters.empty()) return 0;
+
     label count = 0;
 
     for (const word& fieldName : objects.sortedNames<GeoField>())
@@ -146,6 +133,9 @@ label writeAllPointFields
     const bool syncPar
 )
 {
+    // Sanity test
+    if (!internalWriter && patchWriters.empty()) return 0;
+
     const pointMesh& ptMesh = pointMesh::New(proxy.baseMesh());
 
     #undef  foamToVtk_WRITE_FIELD
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfaceFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfaceFields.H
index 530ffd2d28..ce6f59c8e8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfaceFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeSurfaceFields.H
@@ -8,30 +8,11 @@
     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/>.
-
-InNamespace
-    Foam
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
     Write surface fields from volume mesh
 
-SourceFiles
-    writeSurfaceFields.H
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef writeSurfaceFields_H
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H
index 6df3d101a3..8a04c3ddf4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeVolFields.H
@@ -5,38 +5,19 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 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/>.
-
-InNamespace
-    Foam
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 
 Description
-    Read volume fields from disk
+    Code chunk for reading volume fields from disk
     and write with vtk::internalWriter and vtk::patchWriter
 
-SourceFiles
-    writeVolFields.H
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeVolFields_H
-#define writeVolFields_H
+#ifndef FoamToVTK_writeVolFields_H
+#define FoamToVTK_writeVolFields_H
 
 #include "readFields.H"
 #include "foamVtkInternalWriter.H"
@@ -47,79 +28,6 @@ SourceFiles
 namespace Foam
 {
 
-template<class GeoField>
-bool writeVolField
-(
-    autoPtr<vtk::internalWriter>& internalWriter,
-    UPtrList<vtk::patchWriter>& patchWriters,
-    const tmp<GeoField>& tfield
-)
-{
-    if (!tfield)
-    {
-        return false;
-    }
-
-    const auto& field = tfield();
-
-    // Internal
-    if (internalWriter)
-    {
-        internalWriter->write(field);
-    }
-
-    // Boundary
-    for (vtk::patchWriter& writer : patchWriters)
-    {
-        writer.write(field);
-    }
-
-    tfield.clear();
-    return true;
-}
-
-
-template<class GeoField>
-bool writeVolField
-(
-    autoPtr<vtk::internalWriter>& internalWriter,
-    const autoPtr<volPointInterpolation>& pInterp,
-
-    UPtrList<vtk::patchWriter>& patchWriters,
-    const UPtrList<PrimitivePatchInterpolation<primitivePatch>>& patchInterps,
-
-    const tmp<GeoField>& tfield
-)
-{
-    if (!tfield)
-    {
-        return false;
-    }
-
-    const auto& field = tfield();
-
-    // Internal
-    if (internalWriter && pInterp)
-    {
-        internalWriter->write(field, *pInterp);
-    }
-
-    // Boundary
-    label writeri = 0;
-    for (vtk::patchWriter& writer : patchWriters)
-    {
-        if (writeri < patchInterps.size() && patchInterps.set(writeri))
-        {
-            writer.write(field, patchInterps[writeri]);
-        }
-        ++writeri;
-    }
-
-    tfield.clear();
-    return true;
-}
-
-
 template<class GeoField>
 label writeVolFields
 (
@@ -127,23 +35,35 @@ label writeVolFields
     UPtrList<vtk::patchWriter>& patchWriters,
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if (!internalWriter && patchWriters.empty()) return 0;
+
     label count = 0;
 
     for (const word& fieldName : objects.sortedNames<GeoField>())
     {
-        if
-        (
-            writeVolField<GeoField>
-            (
-                internalWriter,
-                patchWriters,
-                getField<GeoField>(proxy, objects, fieldName, syncPar)
-            )
-        )
+        tmp<GeoField> tfield =
+            getField<GeoField>(proxy, objects, fieldName, syncPar, cache);
+
+        if (tfield)
         {
+            // Internal
+            if (internalWriter)
+            {
+                internalWriter->write(tfield());
+            }
+
+            // Boundary
+            for (vtk::patchWriter& writer : patchWriters)
+            {
+                writer.write(tfield());
+            }
+
+            tfield.clear();
             ++count;
         }
     }
@@ -163,23 +83,47 @@ label writeVolFields
 
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if
+    (
+        (!internalWriter || !pInterp)
+     && (patchWriters.empty() || patchInterps.empty())
+    )
+    {
+        return 0;
+    }
+
     label count = 0;
 
     for (const word& fieldName : objects.sortedNames<GeoField>())
     {
-        if
-        (
-            writeVolField<GeoField>
-            (
-                internalWriter, pInterp,
-                patchWriters,   patchInterps,
-                getField<GeoField>(proxy, objects, fieldName, syncPar)
-            )
-        )
+        tmp<GeoField> tfield =
+            getField<GeoField>(proxy, objects, fieldName, syncPar, cache);
+
+        if (tfield)
         {
+            // Internal
+            if (internalWriter && pInterp)
+            {
+                internalWriter->write(tfield(), *pInterp);
+            }
+
+            // Boundary
+            label writeri = 0;
+            for (vtk::patchWriter& writer : patchWriters)
+            {
+                if (writeri < patchInterps.size() && patchInterps.set(writeri))
+                {
+                    writer.write(tfield(), patchInterps[writeri]);
+                }
+                ++writeri;
+            }
+
+            tfield.clear();
             ++count;
         }
     }
@@ -195,9 +139,13 @@ label writeAllVolFields
 
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
+    // Sanity test
+    if (!internalWriter && patchWriters.empty()) return 0;
+
     #undef  foamToVtk_WRITE_FIELD
     #define foamToVtk_WRITE_FIELD(FieldType)    \
         writeVolFields<FieldType>               \
@@ -206,7 +154,8 @@ label writeAllVolFields
             patchWriters,                       \
             proxy,                              \
             objects,                            \
-            syncPar                             \
+            syncPar,                            \
+            cache                               \
         )
 
     label count = 0;
@@ -231,7 +180,8 @@ label writeAllVolFields
 
     const fvMeshSubsetProxy& proxy,
     const IOobjectList& objects,
-    const bool syncPar
+    const bool syncPar,
+    objectRegistry* cache
 )
 {
     #undef  foamToVtk_WRITE_FIELD
@@ -242,7 +192,8 @@ label writeAllVolFields
             patchWriters,   patchInterps,       \
             proxy,                              \
             objects,                            \
-            syncPar                             \
+            syncPar,                            \
+            cache                               \
         )
 
 

From a6b3a31b28cadd235ebd53926eb0529b32ac5e17 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 31 Jan 2023 13:13:14 +0100
Subject: [PATCH 039/348] ENH: add patch expression support for face unit
 normal (#2691)

- make available as normal()
---
 .../expressions/patch/patchExprDriver.H       |  8 ++-
 .../expressions/patch/patchExprDriverFields.C |  9 ++-
 .../expressions/patch/patchExprLemonParser.h  | 67 ++++++++++---------
 .../patch/patchExprLemonParserMacros.m4       |  3 +-
 .../expressions/patch/patchExprScanner.cc     |  4 +-
 .../expressions/patch/patchExprScanner.rl     |  4 +-
 6 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/src/finiteVolume/expressions/patch/patchExprDriver.H b/src/finiteVolume/expressions/patch/patchExprDriver.H
index 51a2c5fb23..39c263ad78 100644
--- a/src/finiteVolume/expressions/patch/patchExprDriver.H
+++ b/src/finiteVolume/expressions/patch/patchExprDriver.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,8 @@ Description
         area        | The face area magnitudes              | 0 |
         weightAverage| Area weighted average                | 1 |
         weightSum   | Area weighted sum                     | 1 |
-        face        | The face areaNormal vectors           | 0 |
+        face        | The face area normal vectors          | 0 |
+        normal      | The face unit normal vectors          | 0 |
         point       | A point-field point value             | 1 |
         faceToPoint | Interpolate face values onto points   | 1 |
         pointToFace | Interpolate point values onto faces   | 1 |
@@ -293,6 +294,9 @@ public:
         //- The face areas with their vector direction [Sf] - (swak = face)
         tmp<vectorField> field_areaNormal() const;
 
+        //- The face unit normal direction [nf] - (expression: normal)
+        tmp<vectorField> field_unitNormal() const;
+
         //- The patch point locations - (swak = pts)
         tmp<vectorField> field_pointField() const;
 
diff --git a/src/finiteVolume/expressions/patch/patchExprDriverFields.C b/src/finiteVolume/expressions/patch/patchExprDriverFields.C
index be14a62288..2b1326b9fc 100644
--- a/src/finiteVolume/expressions/patch/patchExprDriverFields.C
+++ b/src/finiteVolume/expressions/patch/patchExprDriverFields.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -167,6 +167,13 @@ Foam::expressions::patchExpr::parseDriver::field_areaNormal() const
 }
 
 
+Foam::tmp<Foam::vectorField>
+Foam::expressions::patchExpr::parseDriver::field_unitNormal() const
+{
+    return patch_.nf();
+}
+
+
 Foam::tmp<Foam::vectorField>
 Foam::expressions::patchExpr::parseDriver::field_pointField() const
 {
diff --git a/src/finiteVolume/expressions/patch/patchExprLemonParser.h b/src/finiteVolume/expressions/patch/patchExprLemonParser.h
index 72b8c2ba49..5a8fb9497e 100644
--- a/src/finiteVolume/expressions/patch/patchExprLemonParser.h
+++ b/src/finiteVolume/expressions/patch/patchExprLemonParser.h
@@ -90,36 +90,37 @@
 #define TOK_FACE_ZONE                       90
 #define TOK_FACE_AREA                       91
 #define TOK_FACE_EXPR                       92
-#define TOK_WEIGHT_AVERAGE                  93
-#define TOK_WEIGHT_SUM                      94
-#define TOK_POINT_EXPR                      95
-#define TOK_PSCALAR_ID                      96
-#define TOK_PVECTOR_ID                      97
-#define TOK_PSPH_TENSOR_ID                  98
-#define TOK_PSYM_TENSOR_ID                  99
-#define TOK_PTENSOR_ID                     100
-#define TOK_PBOOL_ID                       101
-#define TOK_POINTS                         102
-#define TOK_MAG                            103
-#define TOK_MAGSQR                         104
-#define TOK_VECTOR                         105
-#define TOK_TENSOR                         106
-#define TOK_SYM_TENSOR                     107
-#define TOK_SPH_TENSOR                     108
-#define TOK_CMPT_X                         109
-#define TOK_CMPT_Y                         110
-#define TOK_CMPT_Z                         111
-#define TOK_CMPT_XX                        112
-#define TOK_CMPT_XY                        113
-#define TOK_CMPT_XZ                        114
-#define TOK_CMPT_YX                        115
-#define TOK_CMPT_YY                        116
-#define TOK_CMPT_YZ                        117
-#define TOK_CMPT_ZX                        118
-#define TOK_CMPT_ZY                        119
-#define TOK_CMPT_ZZ                        120
-#define TOK_CMPT_II                        121
-#define TOK_TRANSPOSE                      122
-#define TOK_DIAG                           123
-#define TOK_POINT_TO_FACE                  124
-#define TOK_FACE_TO_POINT                  125
+#define TOK_FACE_NORMAL                     93
+#define TOK_WEIGHT_AVERAGE                  94
+#define TOK_WEIGHT_SUM                      95
+#define TOK_POINT_EXPR                      96
+#define TOK_PSCALAR_ID                      97
+#define TOK_PVECTOR_ID                      98
+#define TOK_PSPH_TENSOR_ID                  99
+#define TOK_PSYM_TENSOR_ID                 100
+#define TOK_PTENSOR_ID                     101
+#define TOK_PBOOL_ID                       102
+#define TOK_POINTS                         103
+#define TOK_MAG                            104
+#define TOK_MAGSQR                         105
+#define TOK_VECTOR                         106
+#define TOK_TENSOR                         107
+#define TOK_SYM_TENSOR                     108
+#define TOK_SPH_TENSOR                     109
+#define TOK_CMPT_X                         110
+#define TOK_CMPT_Y                         111
+#define TOK_CMPT_Z                         112
+#define TOK_CMPT_XX                        113
+#define TOK_CMPT_XY                        114
+#define TOK_CMPT_XZ                        115
+#define TOK_CMPT_YX                        116
+#define TOK_CMPT_YY                        117
+#define TOK_CMPT_YZ                        118
+#define TOK_CMPT_ZX                        119
+#define TOK_CMPT_ZY                        120
+#define TOK_CMPT_ZZ                        121
+#define TOK_CMPT_II                        122
+#define TOK_TRANSPOSE                      123
+#define TOK_DIAG                           124
+#define TOK_POINT_TO_FACE                  125
+#define TOK_FACE_TO_POINT                  126
diff --git a/src/finiteVolume/expressions/patch/patchExprLemonParserMacros.m4 b/src/finiteVolume/expressions/patch/patchExprLemonParserMacros.m4
index afbd594b45..050dfe56ab 100644
--- a/src/finiteVolume/expressions/patch/patchExprLemonParserMacros.m4
+++ b/src/finiteVolume/expressions/patch/patchExprLemonParserMacros.m4
@@ -6,7 +6,7 @@ divert(-1)dnl
 #     \\  /    A nd           | www.openfoam.com
 #      \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2019-2021 OpenCFD Ltd.
+#     Copyright (C) 2019-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -79,6 +79,7 @@ dnl
 rule_driver_nullary(_scalar_, FACE_AREA, field_faceArea)dnl
 rule_driver_nullary(_vector_, POS, field_faceCentre)dnl  FACE_CENTRE
 rule_driver_nullary(_vector_, FACE_EXPR, field_areaNormal)dnl
+rule_driver_nullary(_vector_, FACE_NORMAL, field_unitNormal)dnl
 dnl
 rule_driver_inplace_unary(_scalar_, WEIGHT_AVERAGE, areaAverage)dnl
 rule_driver_inplace_unary(_vector_, WEIGHT_AVERAGE, areaAverage)dnl
diff --git a/src/finiteVolume/expressions/patch/patchExprScanner.cc b/src/finiteVolume/expressions/patch/patchExprScanner.cc
index 3a6ffe9f1b..dba217e972 100644
--- a/src/finiteVolume/expressions/patch/patchExprScanner.cc
+++ b/src/finiteVolume/expressions/patch/patchExprScanner.cc
@@ -7,7 +7,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,7 +36,6 @@ Description
 #include "patchExprLemonParser.h"
 #include "patchExprParser.H"
 #include "Enum.H"
-//#include "macros.H"
 
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wunused-const-variable"
@@ -159,6 +158,7 @@ static const Enum<int> funcTokenEnums
     TOKEN_PAIR("faceToPoint", FACE_TO_POINT),
     TOKEN_PAIR("pointToFace", POINT_TO_FACE),
 
+    TOKEN_PAIR("normal", FACE_NORMAL),  // Face unitNormal
     TOKEN_PAIR("area", FACE_AREA),
     TOKEN_PAIR("pts", POINTS),
 });
diff --git a/src/finiteVolume/expressions/patch/patchExprScanner.rl b/src/finiteVolume/expressions/patch/patchExprScanner.rl
index 6e9fa3ea4d..0ad865709c 100644
--- a/src/finiteVolume/expressions/patch/patchExprScanner.rl
+++ b/src/finiteVolume/expressions/patch/patchExprScanner.rl
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,7 +34,6 @@ Description
 #include "patchExprLemonParser.h"
 #include "patchExprParser.H"
 #include "Enum.H"
-//#include "macros.H"
 
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wunused-const-variable"
@@ -157,6 +156,7 @@ static const Enum<int> funcTokenEnums
     TOKEN_PAIR("faceToPoint", FACE_TO_POINT),
     TOKEN_PAIR("pointToFace", POINT_TO_FACE),
 
+    TOKEN_PAIR("normal", FACE_NORMAL),  // Face unitNormal
     TOKEN_PAIR("area", FACE_AREA),
     TOKEN_PAIR("pts", POINTS),
 });

From b93f038ea3b434afae295dc4d9dc7c480c280d43 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 31 Jan 2023 13:45:19 +0100
Subject: [PATCH 040/348] TUT: replace exprFixedValue with uniformFixedValue

- wish to deprecate and remove exprFixedValue in the future since the
  same functionality is possible using patch expressions with a
  uniformFixedValue condition.
---
 .../rhoPimpleFoam/RAS/TJunctionAverage/0/p    | 27 +++++++-----
 .../rhoSimpleFoam/squareBendLiq/0.orig/T      | 43 +++++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p
index c846dc84e9..b613e521f3 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -40,19 +40,24 @@ boundaryField
 
     outlet1
     {
-        type            exprFixedValue;
+        type            uniformFixedValue;
         value           $internalField;
-        // debug           true;
-        // debug.scanner   true;
-        // debug.parser    true;
 
-        variables
-        (
-            "pInlet{inlet} = weightAverage(p)"
-            "pOutlet2{outlet2} = p"
-        );
+        uniformValue
+        {
+            type               expression;
+            // debug           true;
+            // debug.scanner   true;
+            // debug.parser    true;
 
-        valueExpr      "0.5*(pInlet + pOutlet2)";
+            variables
+            (
+                "pInlet{inlet} = weightAverage(p)"
+                "pOutlet2{outlet2} = p"
+            );
+
+            expression  "0.5*(pInlet + pOutlet2)";
+        }
     }
 
     outlet2
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/T b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/T
index 92668052dd..b886a9d90a 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -38,29 +38,34 @@ boundaryField
         value           uniform 350;
 
         // For general testing purposes:
-        type            exprFixedValue;
+        type            uniformFixedValue;
 
-        functions<scalar>
+        uniformValue
         {
-            trigger
+            type        expression;
+
+            functions<scalar>
             {
-                type     functionObjectTrigger;
-                triggers (2 4);
-                defaultValue true;
+                trigger
+                {
+                    type     functionObjectTrigger;
+                    triggers (2 4);
+                    defaultValue true;
+                }
             }
+
+            variables
+            (
+                "Tcrit = 500"
+                "par1 = mag(internalField(U))/snGrad(T)"
+            );
+
+            expression
+            #{
+                Tcrit
+              + par1*internalField(T) * max((Tcrit-T)/(Tcrit)*deltaT()/time(),0)
+            #};
         }
-
-        variables
-        (
-            "Tcrit = 500"
-            "par1 = mag(internalField(U))/snGrad(T)"
-        );
-
-        valueExpr
-        #{
-            Tcrit
-          + par1*internalField(T) * max((Tcrit-T)/(Tcrit)*deltaT()/time(),0)
-        #};
     }
 }
 

From 1471d292bf2bfdbc6d9de5f87e7862fbd499b1b4 Mon Sep 17 00:00:00 2001
From: Jiri Polansky <>
Date: Tue, 31 Jan 2023 14:04:52 +0100
Subject: [PATCH 041/348] TUT: add dripping chair test

---
 .../kinematicParcelFoam/drippingChair/0/T     |  33 ++++++
 .../kinematicParcelFoam/drippingChair/0/U     | 100 ++++++++++++++++++
 .../drippingChair/0/Uf_film                   |  44 ++++++++
 .../drippingChair/0/hf_film                   |  43 ++++++++
 .../kinematicParcelFoam/drippingChair/0/p     |  43 ++++++++
 .../drippingChair/Allclean                    |  11 ++
 .../kinematicParcelFoam/drippingChair/Allrun  |  21 ++++
 .../drippingChair/Allrun-serial               |  19 ++++
 .../drippingChair/constant/g                  |  21 ++++
 .../constant/kinematicCloudProperties         |  88 +++++++++++++++
 .../constant/transportProperties              |  24 +++++
 .../constant/turbulenceProperties             |  25 +++++
 .../drippingChair/system/blockMeshDict        |  97 +++++++++++++++++
 .../drippingChair/system/controlDict          |  56 ++++++++++
 .../drippingChair/system/decomposeParDict     |  21 ++++
 .../system/decomposeParDict-2x3x2             |  27 +++++
 .../system/decomposeParDict-3x2x2             |  27 +++++
 .../drippingChair/system/faMeshDefinition     |  44 ++++++++
 .../drippingChair/system/faOptions            |  40 +++++++
 .../drippingChair/system/faSchemes            |  57 ++++++++++
 .../drippingChair/system/faSolution           |  51 +++++++++
 .../drippingChair/system/fvSchemes            |  60 +++++++++++
 .../drippingChair/system/fvSolution           |  85 +++++++++++++++
 23 files changed, 1037 insertions(+)
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/T
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/U
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/hf_film
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/p
 create mode 100755 tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allclean
 create mode 100755 tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun
 create mode 100755 tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/g
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/kinematicCloudProperties
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/transportProperties
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/turbulenceProperties
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/blockMeshDict
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-2x3x2
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-3x2x2
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faMeshDefinition
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSchemes
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSchemes
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSolution

diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/T b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/T
new file mode 100644
index 0000000000..9ac89131c2
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/T
@@ -0,0 +1,33 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    ".*"
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/U b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/U
new file mode 100644
index 0000000000..0477bcfe75
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/U
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    top
+    {
+        type            fixedValue;
+        value           uniform (0 -0.1 0);
+    }
+
+    bottom
+    {
+        type            inletOutlet;
+        value           $internalField;
+        inletValue      uniform (0 0 0);
+    }
+
+    sides
+    {
+        type            noSlip;
+    }
+
+    frontAndBack
+    {
+        type            noSlip;
+    }
+
+    filmWalls
+    {
+        type            velocityFilmShell;
+        value           $internalField;
+
+        active          true;
+        infoOutput      true;
+        U               U;
+        pRef            1e5; // Reference pressure for thermo
+        T0              300; // Reference temperature for thermo
+
+        thermo
+        {
+            H2O;
+        }
+
+        turbulence          laminar;
+
+        laminarCoeffs
+        {
+            shearStress     simple;
+            friction        ManningStrickler; // Wall friction model
+            n               0.005;  // Manning number
+            Cf              0;      // Gas friction
+        }
+
+        injectionModels
+        (
+            // curvatureSeparation
+            // BrunDrippingInjection
+        );
+
+        forces ();
+
+        curvatureSeparationCoeffs
+        {
+            definedPatchRadii  0;
+            minInvR1           0;
+            deltaByR1Min       0; // h*invRi = 0.004*10
+        }
+
+        BrunDrippingInjectionCoeffs
+        {
+            deltaStable     1e-3;
+        }
+
+        region              film;
+        liquidFilmModel     kinematicThinFilm;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film
new file mode 100644
index 0000000000..188fdf3d86
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       areaVectorField;
+    object      Uf_film;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    top
+    {
+        type            fixedValue;
+        value           uniform (0 -0.1 0);
+    }
+
+    bottom
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    frontAndBack
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/hf_film b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/hf_film
new file mode 100644
index 0000000000..24d5ada503
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/hf_film
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       areaScalarField;
+    object      hf_film;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [0 1 0 0 0 0 0];
+
+internalField       uniform 0.0001;
+
+boundaryField
+{
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    top
+    {
+        type        fixedValue;
+        value       uniform 0.002;
+    }
+
+    bottom
+    {
+        type        zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type        zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/p b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/p
new file mode 100644
index 0000000000..0aab3d2cbd
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/p
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            totalPressure;
+        p0              uniform 0;
+    }
+
+    "(filmWalls|sides|frontAndBack)"
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allclean b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allclean
new file mode 100755
index 0000000000..82f3da9526
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase
+
+# Remove outputs
+rm -rf VTK-*
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun
new file mode 100755
index 0000000000..d5c14d149d
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun
@@ -0,0 +1,21 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
+
+runApplication blockMesh
+
+runApplication makeFaMesh
+
+runApplication decomposePar
+
+# For the processor partitioning
+runParallel -s finiteVolume foamToVTK -name VTK-parallel -time 0 \
+    -no-finite-area -no-internal -no-lagrangian -no-fields -with-ids
+
+runParallel $(getApplication)
+
+runParallel -s finiteArea foamToVTK -name VTK-parallel \
+    -no-boundary -no-internal -no-lagrangian
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial
new file mode 100755
index 0000000000..7e8c9929a1
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial
@@ -0,0 +1,19 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
+
+runApplication blockMesh
+
+runApplication makeFaMesh
+
+# For the cell ids etc
+runApplication -s finiteVolume.serial foamToVTK -name VTK-serial -time 0 \
+    -no-finite-area -no-internal -no-lagrangian -no-fields -with-ids
+
+runApplication $(getApplication)
+
+runApplication -s finiteArea.serial foamToVTK -name VTK-serial \
+    -no-boundary -no-internal -no-lagrangian
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/g b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/g
new file mode 100644
index 0000000000..62a43995cc
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.8 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/kinematicCloudProperties b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/kinematicCloudProperties
new file mode 100644
index 0000000000..7a34ed7bf9
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/kinematicCloudProperties
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      kinematicCloudProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solution
+{
+    active          true;
+    coupled         yes;
+    transient       yes;
+    cellValueSourceCorrection no;
+    maxCo           0.3;
+
+    sourceTerms
+    {
+        schemes
+        {
+            U               semiImplicit 1;
+        }
+    }
+
+    interpolationSchemes
+    {
+        rho             cell;
+        U               cellPoint;
+        muc             cell;
+        p               cell;
+    }
+
+    integrationSchemes
+    {
+        U               Euler;
+    }
+}
+
+constantProperties
+{
+    rho0            1000;
+}
+
+subModels
+{
+    particleForces
+    {
+        sphereDrag;
+        gravity;
+    }
+
+    injectionModels
+    {
+    }
+
+    dispersionModel none;
+
+    patchInteractionModel standardWallInteraction;
+
+    stochasticCollisionModel none;
+
+    surfaceFilmModel kinematicSurfaceFilm;
+
+    standardWallInteractionCoeffs
+    {
+        type            rebound;
+    }
+
+    kinematicSurfaceFilmCoeffs
+    {
+        interactionType absorb;
+    }
+}
+
+
+cloudFunctions
+{}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/transportProperties b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/transportProperties
new file mode 100644
index 0000000000..5d3e4b2d41
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/transportProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              1e-05;
+
+rhoInf          1.2;
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/turbulenceProperties b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/turbulenceProperties
new file mode 100644
index 0000000000..8a3ed7ac34
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/constant/turbulenceProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType      laminar; // RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/blockMeshDict b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/blockMeshDict
new file mode 100644
index 0000000000..ff6164c32e
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/blockMeshDict
@@ -0,0 +1,97 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale   1;
+
+ncells  100;
+
+vertices
+(
+    (0 0 0) // 0
+    (1 0 0) // 1
+    (2 0 0) // 2
+    (2 1 0) // 3
+    (2 2 0) // 4
+    (1 2 0) // 5
+    (1 1 0) // 6
+    (0 1 0) // 7
+
+    (0 0 1) // 8
+    (1 0 1) // 9
+    (2 0 1) // 10
+    (2 1 1) // 11
+    (2 2 1) // 12
+    (1 2 1) // 13
+    (1 1 1) // 14
+    (0 1 1) // 15
+);
+
+blocks
+(
+    hex ( 0  1  6  7  8  9 14 15) ( $ncells $ncells $ncells ) grading (1 1 1)
+    hex ( 1  2  3  6  9 10 11 14) ( $ncells $ncells $ncells ) grading (1 1 1)
+    hex ( 6  3  4  5 14 11 12 13) ( $ncells $ncells $ncells ) grading (1 1 1)
+);
+
+
+boundary
+(
+    filmWalls
+    {
+        type wall;
+        faces
+        (
+            ( 0  8 15  7)
+            ( 6 14 15  7)
+            ( 6 14 13  5)
+        );
+    }
+    top
+    {
+        type patch;
+        faces
+        (
+            ( 4 12 13  5)
+        );
+    }
+    bottom
+    {
+        type patch;
+        faces
+        (
+            ( 1  9  8  0)
+            ( 2 10  9  1)
+        );
+    }
+    sides
+    {
+        type wall;
+        faces
+        (
+            ( 2  3 11 10)
+            ( 3  4 12 11)
+        );
+    }
+);
+
+defaultPatch
+{
+    type    wall;
+    name    frontAndBack;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict
new file mode 100644
index 0000000000..90570e4629
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     kinematicParcelFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         10;
+
+deltaT          0.005;
+
+writeControl    adjustable;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.9;
+
+regionFaMaxCo   1;
+
+maxDeltaT       0.1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict
new file mode 100644
index 0000000000..50cee01809
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 12;
+
+method          scotch;
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-2x3x2 b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-2x3x2
new file mode 100644
index 0000000000..3e8fe38d55
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-2x3x2
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 12;
+
+method          hierarchical;
+
+coeffs
+{
+    n           (2 3 2);
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-3x2x2 b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-3x2x2
new file mode 100644
index 0000000000..51c2e2f175
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-3x2x2
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 12;
+
+method          hierarchical;
+
+coeffs
+{
+    n           (3 2 2);
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faMeshDefinition b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faMeshDefinition
new file mode 100644
index 0000000000..45fa009054
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faMeshDefinition
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faMeshDefinition;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+polyMeshPatches   (filmWalls);
+
+boundary
+{
+    top
+    {
+        type                patch;
+        ownerPolyPatch      filmWalls;
+        neighbourPolyPatch  top;
+    }
+
+    bottom
+    {
+        type                patch;
+        ownerPolyPatch      filmWalls;
+        neighbourPolyPatch  bottom;
+    }
+
+    frontAndBack
+    {
+        type                patch;
+        ownerPolyPatch      filmWalls;
+        neighbourPolyPatch  frontAndBack;
+    }
+}
+
+
+// ************************************************************************** //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions
new file mode 100644
index 0000000000..1b5496e093
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faOPtions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+/*
+dampHeight1
+{
+    active      yes;
+    type        dampHeight;
+    region      velocityFilmShell;
+    h           hf_film;
+    selectionMode all;
+    max         0.001;
+    c           1;
+}
+*/
+
+limitHeight1
+{
+    active      yes;
+    type        limitHeight;
+    region      velocityFilmShell;
+    h           hf_film;
+    selectionMode all;
+    max         0.001;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSchemes b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSchemes
new file mode 100644
index 0000000000..591064f947
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSchemes
@@ -0,0 +1,57 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default                 Euler;
+}
+
+gradSchemes
+{
+    default                 Gauss linear;
+}
+
+divSchemes
+{
+    default                  none;
+    div(phif_film,hf_film)   Gauss upwind;
+    div(phi2s_film,Uf_film)  Gauss upwind;
+    div(faceAreaNormals)     Gauss linear;
+}
+
+laplacianSchemes
+{
+    default                 none;
+    laplacian(hf_film)      Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default                 linear;
+}
+
+lnGradSchemes
+{
+    default                 corrected;
+}
+
+fluxRequired
+{
+    hf_film                 true;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution
new file mode 100644
index 0000000000..7c7a368e42
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    Uf_film
+    {
+        solver          PBiCGStab;
+        preconditioner  DILU;
+        tolerance       1e-08;
+        relTol          0.0;
+    }
+
+    hf_film
+    {
+        solver          PBiCGStab;
+        preconditioner  DILU;
+        tolerance       1e-08;
+        relTol          0.0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor true;
+    nOuterCorr        1; //2;
+    nCorr             1; //2;
+    nFilmCorr         1;
+}
+
+relaxationFactors
+{
+    hf_Film    1;
+    Uf_Film    1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSchemes b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSchemes
new file mode 100644
index 0000000000..41bc096572
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSchemes
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+    grad(U)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+
+    div(phi,U)      Gauss upwind;
+    div(U)          Gauss linear;
+
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,K)      Gauss upwind;
+
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+    interpolate(HbyA) linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSolution b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSolution
new file mode 100644
index 0000000000..cb5ac24f14
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/fvSolution
@@ -0,0 +1,85 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          PBiCGStab;
+        tolerance       0;
+        relTol          0.1;
+        smoother        GaussSeidel;
+        preconditioner  DIC;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(k|epsilon)"
+    {
+        solver          PBiCGStab;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    "(k|epsilon)Final"
+    {
+        solver          PBiCGStab;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-05;
+        relTol          0.01;
+    }
+
+    UFinal
+    {
+        $U;
+        tolerance       1e-06;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   yes;
+    correctPhi          no;
+    nOuterCorrectors    1;
+    nCorrectors         3;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+         ".*"       1;
+    }
+}
+
+
+// ************************************************************************* //

From 8b63f64503d1f78ced004bac02736108a32ad2f1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 31 Jan 2023 15:55:21 +0100
Subject: [PATCH 042/348] STYLE: use std::ostringstream instead of
 std::to_string for complex

- std::to_string(double) is locale sensitive.
---
 src/OpenFOAM/fields/Fields/fieldTypes.H   | 2 ++
 src/OpenFOAM/primitives/Scalar/Scalar.C   | 1 +
 src/OpenFOAM/primitives/complex/complex.C | 9 +++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/fieldTypes.H b/src/OpenFOAM/fields/Fields/fieldTypes.H
index 108812e818..2c2a87a59a 100644
--- a/src/OpenFOAM/fields/Fields/fieldTypes.H
+++ b/src/OpenFOAM/fields/Fields/fieldTypes.H
@@ -44,8 +44,10 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define CAPITALIZE_bool Bool
 #define CAPITALIZE_label Label
 #define CAPITALIZE_scalar Scalar
+#define CAPITALIZE_complex Complex
 #define CAPITALIZE_vector Vector
 #define CAPITALIZE_sphericalTensor SphericalTensor
 #define CAPITALIZE_symmTensor SymmTensor
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 588d88c3e8..bba2f8fd12 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -57,6 +57,7 @@ pTraits<Scalar>::pTraits(Istream& is)
 
 word name(const Scalar val)
 {
+    // Caution std::to_string(double) is locale sensitive!
     std::ostringstream buf;
     buf << val;
 
diff --git a/src/OpenFOAM/primitives/complex/complex.C b/src/OpenFOAM/primitives/complex/complex.C
index 2192ab2c0e..9aab1bdc2d 100644
--- a/src/OpenFOAM/primitives/complex/complex.C
+++ b/src/OpenFOAM/primitives/complex/complex.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,7 @@ License
 
 #include "complex.H"
 #include "IOstreams.H"
+#include <sstream>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -69,7 +70,11 @@ Foam::complex::complex(Istream& is)
 
 Foam::word Foam::name(const complex& c)
 {
-    return '(' + std::to_string(c.Re()) + ',' + std::to_string(c.Im()) + ')';
+    // Caution std::to_string(double) is locale sensitive!
+    std::ostringstream buf;
+    buf << '(' << c.real() << ',' << c.imag() << ')';
+
+    return word(buf.str(), false);  // Needs no stripping
 }
 
 

From c0e63a8de79c96c539f38893b1bb4b1d547863d8 Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Wed, 1 Feb 2023 15:32:14 +0000
Subject: [PATCH 043/348] ENH: MeshObject: specify name (instead of typeName)

---
 .../test/gravityMeshObject/Make/files         |  3 +
 .../test/gravityMeshObject/Make/options       |  5 ++
 .../Test-gravityMeshObject.C                  | 88 +++++++++++++++++++
 .../gravityMeshObject/case1/constant/banana   | 21 +++++
 .../test/gravityMeshObject/case1/constant/g   | 21 +++++
 .../gravityMeshObject/case1/constant/saturn   | 21 +++++
 .../case1/system/controlDict                  | 34 +++++++
 src/OpenFOAM/meshes/MeshObject/MeshObject.C   | 79 +++++++++++++----
 src/OpenFOAM/meshes/MeshObject/MeshObject.H   | 70 ++++++++++-----
 src/OpenFOAM/meshes/MeshObject/meshObject.C   | 11 ++-
 .../meshObjects/gravity/gravityMeshObject.C   |  8 +-
 .../meshObjects/gravity/gravityMeshObject.H   | 40 +++++++--
 12 files changed, 346 insertions(+), 55 deletions(-)
 create mode 100644 applications/test/gravityMeshObject/Make/files
 create mode 100644 applications/test/gravityMeshObject/Make/options
 create mode 100644 applications/test/gravityMeshObject/Test-gravityMeshObject.C
 create mode 100644 applications/test/gravityMeshObject/case1/constant/banana
 create mode 100644 applications/test/gravityMeshObject/case1/constant/g
 create mode 100644 applications/test/gravityMeshObject/case1/constant/saturn
 create mode 100644 applications/test/gravityMeshObject/case1/system/controlDict

diff --git a/applications/test/gravityMeshObject/Make/files b/applications/test/gravityMeshObject/Make/files
new file mode 100644
index 0000000000..a002388ea1
--- /dev/null
+++ b/applications/test/gravityMeshObject/Make/files
@@ -0,0 +1,3 @@
+Test-gravityMeshObject.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-gravityMeshObject
diff --git a/applications/test/gravityMeshObject/Make/options b/applications/test/gravityMeshObject/Make/options
new file mode 100644
index 0000000000..fa15f12452
--- /dev/null
+++ b/applications/test/gravityMeshObject/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume
diff --git a/applications/test/gravityMeshObject/Test-gravityMeshObject.C b/applications/test/gravityMeshObject/Test-gravityMeshObject.C
new file mode 100644
index 0000000000..bee9e70120
--- /dev/null
+++ b/applications/test/gravityMeshObject/Test-gravityMeshObject.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Description
+    Test loading of different gravity items
+
+\*---------------------------------------------------------------------------*/
+
+#include "MeshObject.H"
+#include "gravityMeshObject.H"
+#include "IOobjectList.H"
+#include "IOstreams.H"
+#include "argList.H"
+#include "Time.H"
+
+using namespace Foam;
+
+void printInfo(const meshObjects::gravity& g)
+{
+    Pout<< "name:" << g.uniformDimensionedVectorField::name()
+        << " type:" << g.type()
+        << " value:" << g.value() << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    IOobjectList objects(runTime, runTime.constant());
+
+    Info<< "Found: " << objects << nl << endl;
+
+    for (const IOobject& io : objects.sorted<uniformDimensionedVectorField>())
+    {
+        if (io.name() == meshObjects::gravity::typeName)
+        {
+            const auto& g = meshObjects::gravity::New(runTime);
+            printInfo(g);
+        }
+        else
+        {
+            const auto& g = meshObjects::gravity::New(io.name(), runTime);
+            printInfo(g);
+        }
+
+        Pout<< "registered:" << flatOutput(runTime.sortedToc()) << nl << endl;
+    }
+
+    meshObjects::gravity::Delete("g", runTime);
+    meshObjects::gravity::Delete("something-not-in-registry", runTime);
+
+    Info<< "after Delete" << nl;
+    Pout<< "registered:" << flatOutput(runTime.sortedToc()) << endl;
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/gravityMeshObject/case1/constant/banana b/applications/test/gravityMeshObject/case1/constant/banana
new file mode 100644
index 0000000000..d0fdecff6d
--- /dev/null
+++ b/applications/test/gravityMeshObject/case1/constant/banana
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      banana;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -10);
+
+// ************************************************************************* //
diff --git a/applications/test/gravityMeshObject/case1/constant/g b/applications/test/gravityMeshObject/case1/constant/g
new file mode 100644
index 0000000000..eabbfe9bf2
--- /dev/null
+++ b/applications/test/gravityMeshObject/case1/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/applications/test/gravityMeshObject/case1/constant/saturn b/applications/test/gravityMeshObject/case1/constant/saturn
new file mode 100644
index 0000000000..ab70026f42
--- /dev/null
+++ b/applications/test/gravityMeshObject/case1/constant/saturn
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      saturn;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (-100 0 0);
+
+// ************************************************************************* //
diff --git a/applications/test/gravityMeshObject/case1/system/controlDict b/applications/test/gravityMeshObject/case1/system/controlDict
new file mode 100644
index 0000000000..b8d3cc1611
--- /dev/null
+++ b/applications/test/gravityMeshObject/case1/system/controlDict
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     blockMesh;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         10;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   1;
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index 6ca39b7b3a..6423b898c2 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,6 +40,18 @@ Foam::MeshObject<Mesh, MeshObjectType, Type>::MeshObject(const Mesh& mesh)
 {}
 
 
+template<class Mesh, template<class> class MeshObjectType, class Type>
+Foam::MeshObject<Mesh, MeshObjectType, Type>::MeshObject
+(
+    const word& objName,
+    const Mesh& mesh
+)
+:
+    MeshObjectType<Mesh>(objName, mesh.thisDb()),
+    mesh_(mesh)
+{}
+
+
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<class Mesh, template<class> class MeshObjectType, class Type>
@@ -50,11 +62,9 @@ const Type& Foam::MeshObject<Mesh, MeshObjectType, Type>::New
     Args&&... args
 )
 {
-    const Type* ptr =
-        mesh.thisDb().objectRegistry::template cfindObject<Type>
-        (
-            Type::typeName
-        );
+    Type* ptr =
+        mesh.thisDb().objectRegistry::template
+        getObjectPtr<Type>(Type::typeName);
 
     if (ptr)
     {
@@ -68,34 +78,71 @@ const Type& Foam::MeshObject<Mesh, MeshObjectType, Type>::New
             << " for region " << mesh.name() << endl;
     }
 
-    Type* objectPtr = new Type(mesh, std::forward<Args>(args)...);
+    ptr = new Type(mesh, std::forward<Args>(args)...);
 
-    regIOobject::store(static_cast<MeshObjectType<Mesh>*>(objectPtr));
+    regIOobject::store(static_cast<MeshObjectType<Mesh>*>(ptr));
 
-    return *objectPtr;
+    return *ptr;
+}
+
+
+template<class Mesh, template<class> class MeshObjectType, class Type>
+template<class... Args>
+const Type& Foam::MeshObject<Mesh, MeshObjectType, Type>::New
+(
+    const word& objName,
+    const Mesh& mesh,
+    Args&&... args
+)
+{
+    Type* ptr =
+        mesh.thisDb().objectRegistry::template
+        getObjectPtr<Type>(objName);
+
+    if (ptr)
+    {
+        return *ptr;
+    }
+
+    if (meshObject::debug)
+    {
+        Pout<< "MeshObject::New('" << objName
+            << "', const " << Mesh::typeName
+            << "&, ...) : constructing " << objName
+            << " of type " << Type::typeName
+            << " for region " << mesh.name() << endl;
+    }
+
+    ptr = new Type(objName, mesh, std::forward<Args>(args)...);
+
+    regIOobject::store(static_cast<MeshObjectType<Mesh>*>(ptr));
+
+    return *ptr;
 }
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
 
 template<class Mesh, template<class> class MeshObjectType, class Type>
-bool Foam::MeshObject<Mesh, MeshObjectType, Type>::Delete(const Mesh& mesh)
+bool Foam::MeshObject<Mesh, MeshObjectType, Type>::Delete
+(
+    const word& objName,
+    const Mesh& mesh
+)
 {
     Type* ptr =
-        mesh.thisDb().objectRegistry::template getObjectPtr<Type>
-        (
-            Type::typeName
-        );
+        mesh.thisDb().objectRegistry::template
+        getObjectPtr<Type>(objName);
 
     if (ptr)
     {
         if (meshObject::debug)
         {
             Pout<< "MeshObject::Delete(const Mesh&) : deleting "
-                << Type::typeName << endl;
+                << objName << endl;
         }
 
-        return mesh.thisDb().checkOut(ptr);
+        return mesh.thisDb().checkOut(static_cast<MeshObjectType<Mesh>*>(ptr));
     }
 
     return false;
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
index 4500261f94..11554ee3da 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,12 +63,13 @@ Note
     MeshObjects of type UpdateableMeshObject.
 
 SourceFiles
+    meshObject.C
     MeshObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef MeshObject_H
-#define MeshObject_H
+#ifndef Foam_MeshObject_H
+#define Foam_MeshObject_H
 
 #include "regIOobject.H"
 #include "objectRegistry.H"
@@ -78,7 +79,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -90,10 +91,9 @@ class MeshObject
 :
     public MeshObjectType<Mesh>
 {
-
 protected:
 
-        // Reference to Mesh
+        //- Reference to the mesh
         const Mesh& mesh_;
 
 
@@ -101,30 +101,52 @@ public:
 
     // Constructors
 
-        //- Construct on Mesh type
+        //- Construct with Type::typeName on Mesh
         explicit MeshObject(const Mesh& mesh);
 
-    // Selectors
+        //- Construct with given object name on Mesh
+        MeshObject(const word& objName, const Mesh& mesh);
 
-        //- Get existing or create a new MeshObject
+
+    // Factory Methods
+
+        //- Get existing or create a new MeshObject. Registered with typeName
         template<class... Args>
         static const Type& New(const Mesh& mesh, Args&&... args);
 
+        //- Get existing or create a new MeshObject using supplied
+        //- registration name
+        template<class... Args>
+        static const Type& New
+        (
+            const word& objName,
+            const Mesh& mesh,
+            Args&&... args
+        );
+
 
     //- Destructor
     virtual ~MeshObject() = default;
 
-        //- Static destructor
-        static bool Delete(const Mesh& mesh);
+        //- Static destructor using supplied registration name
+        static bool Delete(const word& objName, const Mesh& mesh);
+
+        //- Static destructor using Type::typeName
+        static bool Delete(const Mesh& mesh)
+        {
+            return Delete(Type::typeName, mesh);
+        }
 
 
     // Member Functions
 
-        const Mesh& mesh() const
+        //- Reference to the mesh
+        const Mesh& mesh() const noexcept
         {
             return mesh_;
         }
 
+        //- Dummy write
         virtual bool writeData(Ostream& os) const
         {
             return true;
@@ -136,19 +158,21 @@ public:
                            Class meshObject Declaration
 \*---------------------------------------------------------------------------*/
 
+//- The meshObject is a concrete regIOobject
 class meshObject
 :
     public regIOobject
 {
 public:
 
-    // Declare name of the class and its debug switch
+    //- Runtime declaration and debug switch
     ClassName("meshObject");
 
+
     // Constructors
 
-        //- Construct from name and instance on registry
-        meshObject(const word& typeName, const objectRegistry& obr);
+        //- Construct with given object name on a registry
+        meshObject(const word& objName, const objectRegistry& obr);
 
 
     // Static Member Functions
@@ -187,9 +211,9 @@ class TopologicalMeshObject
 public:
 
     //- Construct from name and instance on registry
-    TopologicalMeshObject(const word& typeName, const objectRegistry& obr)
+    TopologicalMeshObject(const word& objName, const objectRegistry& obr)
     :
-        meshObject(typeName, obr)
+        meshObject(objName, obr)
     {}
 };
 
@@ -206,9 +230,9 @@ class GeometricMeshObject
 public:
 
     //- Construct from name and instance on registry
-    GeometricMeshObject(const word& typeName, const objectRegistry& obr)
+    GeometricMeshObject(const word& objName, const objectRegistry& obr)
     :
-        TopologicalMeshObject<Mesh>(typeName, obr)
+        TopologicalMeshObject<Mesh>(objName, obr)
     {}
 };
 
@@ -225,9 +249,9 @@ class MoveableMeshObject
 public:
 
     //- Construct from name and instance on registry
-    MoveableMeshObject(const word& typeName, const objectRegistry& obr)
+    MoveableMeshObject(const word& objName, const objectRegistry& obr)
     :
-        GeometricMeshObject<Mesh>(typeName, obr)
+        GeometricMeshObject<Mesh>(objName, obr)
     {}
 
     virtual bool movePoints() = 0;
@@ -246,9 +270,9 @@ class UpdateableMeshObject
 public:
 
     //- Construct from name and instance on registry
-    UpdateableMeshObject(const word& typeName, const objectRegistry& obr)
+    UpdateableMeshObject(const word& objName, const objectRegistry& obr)
     :
-        MoveableMeshObject<Mesh>(typeName, obr)
+        MoveableMeshObject<Mesh>(objName, obr)
     {}
 
     virtual void updateMesh(const mapPolyMesh& mpm) = 0;
diff --git a/src/OpenFOAM/meshes/MeshObject/meshObject.C b/src/OpenFOAM/meshes/MeshObject/meshObject.C
index dae46d2f7b..7f7b352d8c 100644
--- a/src/OpenFOAM/meshes/MeshObject/meshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/meshObject.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,15 +38,18 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::meshObject::meshObject(const word& typeName, const objectRegistry& obr)
+Foam::meshObject::meshObject(const word& objName, const objectRegistry& obr)
 :
     regIOobject
     (
         IOobject
         (
-            typeName,
+            objName,
             obr.instance(),
-            obr
+            obr,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         )
     )
 {}
diff --git a/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C b/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C
index 0da1a5a3d9..d0de1e97ec 100644
--- a/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C
+++ b/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,14 +40,14 @@ namespace meshObjects
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::meshObjects::gravity::gravity(const Time& runTime)
+Foam::meshObjects::gravity::gravity(const word& name, const Time& runTime)
 :
-    MeshObject<Time, TopologicalMeshObject, gravity>(runTime),
+    MeshObject<Time, TopologicalMeshObject, gravity>(name, runTime),
     uniformDimensionedVectorField
     (
         IOobject
         (
-            "g",   // Must be identical to gravity::typeName!
+            name,
             runTime.constant(),
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
diff --git a/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.H b/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.H
index 85fe3b9c3f..fc84e49a62 100644
--- a/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.H
+++ b/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,14 +70,38 @@ public:
     TypeNameNoDebug("g");
 
 
-    //- Construct on Time with MUST_READ_IF_MODIFIED from "constant"
-    explicit gravity(const Time& runTime);
+    // Constructors
+
+        //- Construct with given name on Time from \c constant
+        //- (MUST_READ_IF_MODIFIED)
+        gravity(const word& name, const Time& runTime);
+
+        //- Construct "g" field on Time from \c constant
+        //- (MUST_READ_IF_MODIFIED)
+        explicit gravity(const Time& runTime)
+        :
+            gravity("g", runTime)
+        {}
+
+        //- Return named gravity field cached or construct on Time
+        static const gravity& New(const word& name, const Time& runTime)
+        {
+            return MeshObject<Time, TopologicalMeshObject, gravity>::New
+            (
+                name,
+                runTime
+            );
+        }
+
+        //- Return gravity "g" field cached or construct on Time
+        static const gravity& New(const Time& runTime)
+        {
+            return MeshObject<Time, TopologicalMeshObject, gravity>::New
+            (
+                runTime
+            );
+        }
 
-    //- Return cached object or construct on Time
-    static const gravity& New(const Time& runTime)
-    {
-        return MeshObject<Time, TopologicalMeshObject, gravity>::New(runTime);
-    }
 
     //- Destructor
     virtual ~gravity() = default;

From 7c6232b8b359a313702fea72605d0af931c35750 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 1 Feb 2023 16:31:00 +0000
Subject: [PATCH 044/348] BUG: FaceCellWave: support data with transformations.
 Fixes #2693

transformation support in-place modifies the data (e.g. to
add a transform). This might cause the neighbour side patch
to pick up owner side information.
---
 .../algorithms/MeshWave/FaceCellWave.C        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index 92ad54e4d0..aeb8930324 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -725,6 +725,12 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
     {
         const cyclicAMIPolyPatch* cpp = isA<cyclicAMIPolyPatch>(patch);
 
+        // Note:
+        // - can either do owner and neighbour separately or have owner
+        //   do both
+        // - separately means that neighbour will receive updated owner
+        //   properties which might be beneficial or involve extra work?
+
         if (cpp)
         {
             const auto& cycPatch = *cpp;
@@ -733,14 +739,9 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
             List<Type> receiveInfo;
 
             {
-                // Get nbrPatch data (so not just changed faces)
-                typename List<Type>::subList sendInfo
-                (
-                    nbrPatch.patchSlice
-                    (
-                        allFaceInfo_
-                    )
-                );
+                // Get nbrPatch data (so not just changed faces). Do not use
+                // a slice here since the leaveDomain might change the values
+                List<Type> sendInfo(nbrPatch.patchSlice(allFaceInfo_));
 
                 if (!nbrPatch.parallel() || nbrPatch.separated())
                 {

From f713f748552fa79c6e516311e06bd443e55c0d25 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 25 Jan 2023 16:34:48 +0000
Subject: [PATCH 045/348] ENH: overPotentialFoam: Make consistent. see #1749.

- createFields extends potentialFoam
- (so registers 'p' field, same as potentialFoam)
- writephi is optional as in potentialFoam
---
 .../overPotentialFoam/createFields.H          | 123 +-----------------
 .../overPotentialFoam/overPotentialFoam.C     |  20 ++-
 2 files changed, 18 insertions(+), 125 deletions(-)

diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
index c793af226d..e227bd9fdc 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
@@ -1,125 +1,4 @@
-Info<< "Reading velocity field U\n" << endl;
-volVectorField U
-(
-    IOobject
-    (
-        "U",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-// Initialise the velocity internal field to zero
-U = dimensionedVector(U.dimensions(), Zero);
-
-surfaceScalarField phi
-(
-    IOobject
-    (
-        "phi",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    fvc::flux(U)
-);
-
-if (args.found("initialiseUBCs"))
-{
-    U.correctBoundaryConditions();
-    phi = fvc::flux(U);
-}
-
-
-// Construct a pressure field
-// If it is available read it otherwise construct from the velocity BCs
-// converting fixed-value BCs to zero-gradient and vice versa.
-
-// Allow override from command-line -pName option
-const word pName = args.getOrDefault<word>("pName", "p");
-
-// Infer the pressure BCs from the velocity
-wordList pBCTypes
-(
-    U.boundaryField().size(),
-    fixedValueFvPatchScalarField::typeName
-);
-
-forAll(U.boundaryField(), patchi)
-{
-    if (U.boundaryField()[patchi].fixesValue())
-    {
-        pBCTypes[patchi] = zeroGradientFvPatchScalarField::typeName;
-    }
-}
-
-// Note that registerObject is false for the pressure field. The pressure
-// field in this solver doesn't have a physical value during the solution.
-// It shouldn't be looked up and used by sub models or boundary conditions.
-Info<< "Constructing pressure field " << pName << nl << endl;
-volScalarField p
-(
-    IOobject
-    (
-        pName,
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::NO_WRITE,
-        false
-    ),
-    mesh,
-    dimensionedScalar(sqr(dimVelocity), Zero),
-    pBCTypes
-);
-
-// Infer the velocity potential BCs from the pressure
-wordList PhiBCTypes
-(
-    p.boundaryField().size(),
-    zeroGradientFvPatchScalarField::typeName
-);
-
-forAll(p.boundaryField(), patchi)
-{
-    if (p.boundaryField()[patchi].fixesValue())
-    {
-        PhiBCTypes[patchi] = fixedValueFvPatchScalarField::typeName;
-    }
-}
-
-Info<< "Constructing velocity potential field Phi\n" << endl;
-volScalarField Phi
-(
-    IOobject
-    (
-        "Phi",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::NO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimLength*dimVelocity, Zero),
-    PhiBCTypes
-);
-
-label PhiRefCell = 0;
-scalar PhiRefValue = 0;
-setRefCell
-(
-    Phi,
-    potentialFlow.dict(),
-    PhiRefCell,
-    PhiRefValue
-);
-mesh.setFluxRequired(Phi.name());
-
-#include "createMRF.H"
+#include "../createFields.H"
 
 // Add solver-specific interpolations
 {
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C b/applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C
index 6e3072a73c..18e7e9b85b 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/overPotentialFoam.C
@@ -83,6 +83,7 @@ Description
     \heading Options
     \plaintable
         -writep   | write the Euler pressure
+        -writephi | Write the final volumetric flux
         -writePhi | Write the final velocity potential
         -initialiseUBCs | Update the velocity boundaries before solving for Phi
     \endplaintable
@@ -117,6 +118,12 @@ int main(int argc, char *argv[])
         "Initialise U boundary conditions"
     );
 
+    argList::addBoolOption
+    (
+        "writephi",
+        "Write the final volumetric flux field"
+    );
+
     argList::addBoolOption
     (
         "writePhi",
@@ -135,6 +142,8 @@ int main(int argc, char *argv[])
         "Execute functionObjects"
     );
 
+    #include "addRegionOption.H"
+    #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"
     #include "createNamedDynamicFvMesh.H"
@@ -194,11 +203,16 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    // Write U and phi
+    // Write U
     U.write();
-    phi.write();
 
-    // Optionally write Phi
+    // Optionally write the volumetric flux, phi
+    if (args.found("writephi"))
+    {
+        phi.write();
+    }
+
+    // Optionally write velocity potential, Phi
     if (args.found("writePhi"))
     {
         Phi.write();

From e790e1c4ba037c3aa03fe23fbc7de0341ff864a4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 1 Feb 2023 18:23:10 +0000
Subject: [PATCH 046/348] ENH: wallDistAddressing: wall distance which stores
 addressing.

---
 .../LESdeltas/vanDriestDelta/vanDriestDelta.C |  75 ++-
 src/finiteVolume/Make/files                   |   4 +-
 .../meshWaveAddressingPatchDistMethod.C       | 119 +++++
 .../meshWaveAddressingPatchDistMethod.H       | 139 +++++
 .../fvMesh/wallDist/wallDist/wallDist.C       |   8 +-
 .../fvMesh/wallDist/wallDist/wallDist.H       |   8 +-
 .../wallDistAddressing/wallDistAddressing.C   | 493 ++++++++++++++++++
 .../wallDistAddressing/wallDistAddressing.H   | 291 +++++++++++
 .../wallDistAddressingTemplates.C             | 163 ++++++
 .../wallPointAddressing.C}                    |  29 +-
 .../wallPointAddressing.H}                    | 123 +++--
 .../wallPointAddressingI.H}                   | 133 +++--
 12 files changed, 1484 insertions(+), 101 deletions(-)
 create mode 100644 src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
 create mode 100644 src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.H
 create mode 100644 src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C
 create mode 100644 src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.H
 create mode 100644 src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressingTemplates.C
 rename src/finiteVolume/fvMesh/wallDist/{wallPointYPlus/wallPointYPlus.C => wallDistAddressing/wallPointAddressing.C} (73%)
 rename src/finiteVolume/fvMesh/wallDist/{wallPointYPlus/wallPointYPlus.H => wallDistAddressing/wallPointAddressing.H} (57%)
 rename src/finiteVolume/fvMesh/wallDist/{wallPointYPlus/wallPointYPlusI.H => wallDistAddressing/wallPointAddressingI.H} (56%)

diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
index c129b06d9b..cd19a796e3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020,2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,9 +28,8 @@ License
 
 #include "vanDriestDelta.H"
 #include "wallFvPatch.H"
-#include "wallDistData.H"
-#include "wallPointYPlus.H"
 #include "addToRunTimeSelectionTable.H"
+#include "wallDistAddressing.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -60,7 +59,8 @@ void Foam::LESModels::vanDriestDelta::calcDelta()
         (
             "ystar",
             mesh.time().constant(),
-            mesh
+            mesh.thisDb(),
+            IOobjectOption::NO_REGISTER
         ),
         mesh,
         dimensionedScalar("ystar", dimLength, GREAT)
@@ -82,15 +82,62 @@ void Foam::LESModels::vanDriestDelta::calcDelta()
         }
     }
 
-    scalar cutOff = wallPointYPlus::yPlusCutOff;
-    wallPointYPlus::yPlusCutOff = 500;
-    wallDistData<wallPointYPlus> y(mesh, ystar);
-    wallPointYPlus::yPlusCutOff = cutOff;
+    // Construct wall transporter
+    const auto& wDist = wallDistAddressing::New(mesh);
 
+    // Get distance to nearest wall
+    const auto& y = wDist.y();
+
+    // Get ystar from nearest wall
+    wDist.map(ystar, mapDistribute::transform());
+
+    // Calculate y/ystar (stored in ystar!) and do the clipping
+    constexpr scalar yPlusCutOff = 500;
+    // Allow for some precision loss from transformation/interpolation of GREAT
+    // (= unvisited value)(though ystar is scalar so should not be transformed)
+    constexpr scalar fuzzyGREAT = 0.5*GREAT;
+
+    ystar.dimensions().reset(y.dimensions()/ystar.dimensions());
+    forAll(y, celli)
+    {
+        const scalar yPlus = y[celli]/ystar[celli];
+        if (y[celli] > fuzzyGREAT || (yPlus > yPlusCutOff))
+        {
+            // unvisited : y is GREAT, ystar is 1.0
+            ystar[celli] = GREAT;
+        }
+        else
+        {
+            ystar[celli] = yPlus;
+        }
+    }
+
+    forAll(y.boundaryField(), patchi)
+    {
+        const auto& yp = y.boundaryField()[patchi];
+        auto& ystarp = ystar.boundaryFieldRef()[patchi];
+
+        forAll(yp, i)
+        {
+            const scalar yPlus = yp[i]/ystarp[i];
+            if (yp[i] > fuzzyGREAT || (yPlus > yPlusCutOff))
+            {
+                ystarp[i] = GREAT;
+            }
+            else
+            {
+                ystarp[i] = yPlus;
+            }
+        }
+    }
+    ystar.correctBoundaryConditions();
+
+    // Note: y/ystar stored in ystar
     delta_ = min
     (
         static_cast<const volScalarField&>(geometricDelta_()),
-        (kappa_/Cdelta_)*((scalar(1) + SMALL) - exp(-y/ystar/Aplus_))*y
+        //(kappa_/Cdelta_)*((scalar(1) + SMALL) - exp(-y/ystar/Aplus_))*y
+        (kappa_/Cdelta_)*((scalar(1) + SMALL) - exp(-ystar/Aplus_))*y
     );
 }
 
@@ -136,7 +183,7 @@ Foam::LESModels::vanDriestDelta::vanDriestDelta
     )
 {
     calcInterval_ = 1;
-    const dictionary& coeffsDict(dict.optionalSubDict(type() + "Coeffs"));
+    const dictionary& coeffsDict = dict.optionalSubDict(type() + "Coeffs");
     if (!coeffsDict.readIfPresent("calcInterval", calcInterval_))
     {
         coeffsDict.readIfPresent("updateInterval", calcInterval_);
@@ -150,7 +197,7 @@ Foam::LESModels::vanDriestDelta::vanDriestDelta
 
 void Foam::LESModels::vanDriestDelta::read(const dictionary& dict)
 {
-    const dictionary& coeffsDict(dict.optionalSubDict(type() + "Coeffs"));
+    const dictionary& coeffsDict = dict.optionalSubDict(type() + "Coeffs");
 
     geometricDelta_().read(coeffsDict);
     dict.readIfPresent<scalar>("kappa", kappa_);
@@ -168,7 +215,11 @@ void Foam::LESModels::vanDriestDelta::read(const dictionary& dict)
 
 void Foam::LESModels::vanDriestDelta::correct()
 {
-    if ((turbulenceModel_.mesh().time().timeIndex() % calcInterval_) == 0)
+    if
+    (
+        (calcInterval_ > 0)
+     && (turbulenceModel_.mesh().time().timeIndex() % calcInterval_) == 0
+    )
     {
         geometricDelta_().correct();
         calcDelta();
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 5c74143d8f..aa58f5991c 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -56,12 +56,14 @@ $(derivedFvPatches)/mapped/mappedWallFvPatch.C
 
 
 wallDist = fvMesh/wallDist
-$(wallDist)/wallPointYPlus/wallPointYPlus.C
+$(wallDist)/wallDistAddressing/wallDistAddressing.C
+$(wallDist)/wallDistAddressing/wallPointAddressing.C
 $(wallDist)/nearWallDist/nearWallDistNoSearch.C
 $(wallDist)/nearWallDist/nearWallDist.C
 $(wallDist)/wallDist/wallDist.C
 $(wallDist)/patchDistMethods/patchDistMethod/patchDistMethod.C
 $(wallDist)/patchDistMethods/meshWave/meshWavePatchDistMethod.C
+$(wallDist)/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
 $(wallDist)/patchDistMethods/Poisson/PoissonPatchDistMethod.C
 $(wallDist)/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
 $(wallDist)/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
new file mode 100644
index 0000000000..bf9fb619b6
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "meshWaveAddressingPatchDistMethod.H"
+#include "wallDistAddressing.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace patchDistMethods
+{
+    defineTypeNameAndDebug(meshWaveAddressing, 0);
+    addToRunTimeSelectionTable(patchDistMethod, meshWaveAddressing, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::patchDistMethods::meshWaveAddressing::meshWaveAddressing
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs
+)
+:
+    patchDistMethod(mesh, patchIDs),
+    correctWalls_(dict.getOrDefault("correctWalls", true))
+{}
+
+
+Foam::patchDistMethods::meshWaveAddressing::meshWaveAddressing
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    const bool correctWalls
+)
+:
+    patchDistMethod(mesh, patchIDs),
+    correctWalls_(correctWalls)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::patchDistMethods::meshWaveAddressing::correct(volScalarField& y)
+{
+    return correct(y, const_cast<volVectorField&>(volVectorField::null()));
+}
+
+
+bool Foam::patchDistMethods::meshWaveAddressing::correct
+(
+    volScalarField& y,
+    volVectorField& n
+)
+{
+    // If not yet constructed, construct with our options.
+    // Note that registration name is still 'wallDistAddressing'
+    // since the supplied options (wall patchIDs and correctWalls)
+    // are not assumed to be different from the defaults of other usage.
+
+    // Calculate distance and addressing
+    const auto& wDist = wallDistAddressing::New
+    (
+        "wall",
+        mesh_,
+        patchIDs_.sortedToc(),
+        correctWalls_
+    );
+
+    y = wDist.y();
+
+
+    // Only calculate n if the field is defined
+    if (notNull(n))
+    {
+        for (const label patchi : patchIDs_)
+        {
+            auto& pnf = n.boundaryFieldRef()[patchi];
+            pnf == pnf.patch().nf();
+        }
+
+        wDist.map(n, mapDistribute::transform());
+    }
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.H
new file mode 100644
index 0000000000..837cb32f50
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::patchDistMethods::meshWaveAddressing
+
+Description
+    Variant of patchDistMethods::meshWave that stores nearest-wall addressing
+    instead of directly transporting wall information.
+
+    Example of the wallDist specification in fvSchemes:
+    \verbatim
+        wallDist
+        {
+            method meshWaveAddressing;
+
+            // Optional entry enabling the calculation
+            // of the normal-to-wall field
+            nRequired true;
+        }
+    \endverbatim
+
+See also
+    Foam::patchDistMethod::meshWave
+    Foam::wallDist
+
+SourceFiles
+    meshWaveAddressingPatchDistMethod.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_meshWaveAddressingPatchDistMethod_H
+#define Foam_meshWaveAddressingPatchDistMethod_H
+
+#include "patchDistMethod.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace patchDistMethods
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class meshWaveAddressing Declaration
+\*---------------------------------------------------------------------------*/
+
+class meshWaveAddressing
+:
+    public patchDistMethod
+{
+protected:
+
+    // Protected Member Data
+
+        //- Do accurate distance calculation for near-wall cells.
+        const bool correctWalls_;
+
+
+    // Protected Member Functions
+
+        //- No copy construct
+        meshWaveAddressing(const meshWaveAddressing&) = delete;
+
+        //- No copy assignment
+        void operator=(const meshWaveAddressing&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("meshWaveAddressing");
+
+
+    // Constructors
+
+        //- Construct from coefficients dictionary, mesh
+        //- and fixed-value patch set
+        meshWaveAddressing
+        (
+            const dictionary& dict,
+            const fvMesh& mesh,
+            const labelHashSet& patchIDs
+        );
+
+        //- Construct from mesh, fixed-value patch set and flag specifying
+        //- whether or not to correct wall.
+        //  Calculate for all cells. correctWalls : correct wall (face&point)
+        //  cells for correct distance, searching neighbours.
+        meshWaveAddressing
+        (
+            const fvMesh& mesh,
+            const labelHashSet& patchIDs,
+            const bool correctWalls = true
+        );
+
+
+    // Member Functions
+
+        //- Correct the given distance-to-patch field
+        virtual bool correct(volScalarField& y);
+
+        //- Correct the given distance-to-patch and normal-to-patch fields
+        virtual bool correct(volScalarField& y, volVectorField& n);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace patchDistMethods
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index be8b859bb7..458efc2e2d 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -49,7 +49,8 @@ void Foam::wallDist::constructn() const
             (
                 "n" & patchTypeName_,
                 mesh().time().timeName(),
-                mesh().thisDb()
+                mesh().thisDb(),
+                IOobjectOption::NO_REGISTER
             ),
             mesh(),
             dimensionedVector(dimless, Zero),
@@ -115,7 +116,8 @@ Foam::wallDist::wallDist
         (
             "y" & patchTypeName_,
             mesh.time().timeName(),
-            mesh.thisDb()
+            mesh.thisDb(),
+            IOobjectOption::NO_REGISTER
         ),
         mesh,
         dimensionedScalar("y" & patchTypeName_, dimLength, SMALL),
@@ -176,7 +178,7 @@ bool Foam::wallDist::movePoints()
 {
     if
     (
-        (updateInterval_ != 0)
+        (updateInterval_ > 0)
      && ((mesh_.time().timeIndex() % updateInterval_) == 0)
     )
     {
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
index 2166777d9b..d2dfa391b6 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
@@ -57,8 +57,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallDist_H
-#define wallDist_H
+#ifndef Foam_wallDist_H
+#define Foam_wallDist_H
 
 #include "MeshObject.H"
 #include "patchDistMethod.H"
@@ -160,13 +160,13 @@ public:
     // Member Functions
 
         //- Return the patchIDs
-        const labelHashSet& patchIDs() const
+        const labelHashSet& patchIDs() const noexcept
         {
             return patchIDs_;
         }
 
         //- Return reference to cached distance-to-wall field
-        const volScalarField& y() const
+        const volScalarField& y() const noexcept
         {
             return y_;
         }
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C
new file mode 100644
index 0000000000..80c97e1541
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C
@@ -0,0 +1,493 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "FaceCellWave.H"
+#include "wallDistAddressing.H"
+#include "wallPointAddressing.H"
+#include "addToRunTimeSelectionTable.H"
+#include "surfaceFields.H"
+#include "wallPolyPatch.H"
+#include "patchDistMethod.H"
+#include "OBJstream.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(wallDistAddressing, 0);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::wallDistAddressing::getValues
+(
+    const FaceCellWave<wallPointAddressing>& wave,
+    const List<wallPointAddressing>& allCellInfo,
+    const List<wallPointAddressing>& allFaceInfo,
+    volScalarField& y
+) const
+{
+    // Extract volField. See patchWave::getValues
+
+    label nIllegal = 0;
+    forAll(allCellInfo, celli)
+    {
+        const scalar dist = allCellInfo[celli].distSqr();
+
+        if (allCellInfo[celli].valid(wave.data()))
+        {
+            y[celli] = Foam::sqrt(dist);
+        }
+        else
+        {
+            y[celli] = dist;
+            ++nIllegal;
+        }
+    }
+
+    // Copy boundary values
+    auto& bfld = y.boundaryFieldRef();
+
+    for (auto& pfld : bfld)
+    {
+        scalarField patchField(pfld.size(), Zero);
+
+        forAll(pfld, patchFacei)
+        {
+            const label meshFacei = pfld.patch().start() + patchFacei;
+            const scalar dist = allFaceInfo[meshFacei].distSqr();
+
+            if (allFaceInfo[meshFacei].valid(wave.data()))
+            {
+                // Adding SMALL to avoid problems with /0 in the turbulence
+                // models
+                patchField[patchFacei] = Foam::sqrt(dist) + SMALL;
+            }
+            else
+            {
+                patchField[patchFacei] = dist;
+                ++nIllegal;
+            }
+        }
+        pfld = patchField;
+    }
+
+    return nIllegal;
+}
+
+
+void Foam::wallDistAddressing::addItem
+(
+    const label item,
+    const labelPair& data,
+    label& untransformi,
+    label& transformi,
+    labelPairList& transformedWallInfo
+)
+{
+    const auto& gt = mesh_.globalData().globalTransforms();
+
+    if (gt.transformIndex(data) == gt.nullTransformIndex())
+    {
+        // Store item and global index of untransformed data
+        const label proci = gt.processor(data);
+        const label index = gt.index(data);
+        untransformedItems_[untransformi] = item;
+        untransformedSlots_[untransformi++] =
+            globalWallsPtr_().toGlobal(proci, index);
+    }
+    else
+    {
+        // Store item and transformed data
+        transformedItems_[transformi] = item;
+        transformedWallInfo[transformi++] = data;
+    }
+}
+
+
+void Foam::wallDistAddressing::correct(volScalarField& y)
+{
+    y = dimensionedScalar("yWall", dimLength, GREAT);
+
+    const auto& C = mesh_.C();
+    const auto& gt = mesh_.globalData().globalTransforms();
+
+    label nWalls = 0;
+    for (const label patchi : patchIDs_)
+    {
+        nWalls += C.boundaryField()[patchi].size();
+    }
+
+    globalWallsPtr_.reset(new globalIndex(nWalls));
+    const globalIndex& globalWalls = globalWallsPtr_();
+
+    labelList seedFaces(nWalls);
+    List<wallPointAddressing> seedInfo(nWalls);
+
+
+    nWalls = 0;
+    for (const label patchi : patchIDs_)
+    {
+        const auto& fc = C.boundaryField()[patchi];
+
+        forAll(fc, patchFacei)
+        {
+            seedFaces[nWalls] = fc.patch().start()+patchFacei;
+            seedInfo[nWalls] = wallPointAddressing
+            (
+                fc[patchFacei],
+                gt.encode
+                (
+                    Pstream::myProcNo(),
+                    nWalls,
+                    gt.nullTransformIndex()
+                ),
+                scalar(0.0)
+            );
+            nWalls++;
+        }
+    }
+
+    List<wallPointAddressing> allCellInfo(mesh_.nCells());
+    // Initialise the passive data (since no mesh reference in the constructor
+    // of wallPointAddressing)
+    forAll(allCellInfo, celli)
+    {
+        allCellInfo[celli].data() = gt.encode
+        (
+            Pstream::myProcNo(),
+            celli,
+            gt.nullTransformIndex()
+        );
+    }
+    List<wallPointAddressing> allFaceInfo(mesh_.nFaces());
+    forAll(allFaceInfo, facei)
+    {
+        allFaceInfo[facei].data() = gt.encode
+        (
+            Pstream::myProcNo(),
+            facei,
+            gt.nullTransformIndex()
+        );
+    }
+
+    // Propagate information inwards
+    FaceCellWave<wallPointAddressing> wave
+    (
+        mesh_,
+        seedFaces,
+        seedInfo,
+        allFaceInfo,
+        allCellInfo,
+        mesh_.globalData().nTotalCells()+1
+    );
+
+
+    // Extract wall distance
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    getValues(wave, allCellInfo, allFaceInfo, y);
+
+
+    const labelHashSet patchSet(patchIDs_);
+
+    // Correct wall cells for true distance
+    // - store for corrected cells the nearest wall face
+    // - update distance field (y) for these cells
+    Map<label> cellToWallFace;
+    if (correctWalls_)
+    {
+        cellToWallFace.resize(2*nWalls);
+        correctBoundaryFaceCells
+        (
+            patchSet,
+            y,
+            cellToWallFace
+        );
+
+        correctBoundaryPointCells
+        (
+            patchSet,
+            y,
+            cellToWallFace
+        );
+    }
+
+
+    // Extract all addressing
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    //  - untransformed : -local cell/boundary, -nearest (global) wall
+    //  - transformed : -local cell/boundary, -nearest (global) wall
+
+    label untransformi = 0;
+    untransformedItems_.resize(mesh_.nCells()+mesh_.nBoundaryFaces());
+    untransformedSlots_.resize(untransformedItems_.size());
+
+    label transformi = 0;
+    transformedItems_.resize(mesh_.nCells()+mesh_.nBoundaryFaces());
+    labelPairList transformedWallInfo(transformedItems_.size());
+
+    for (label celli = 0; celli < mesh_.nCells(); celli++)
+    {
+        const auto cellFnd = cellToWallFace.find(celli);
+        if (cellFnd)
+        {
+            const label wallFacei = cellFnd();
+            const auto& data = allFaceInfo[wallFacei].data();
+            addItem(celli, data, untransformi, transformi, transformedWallInfo);
+        }
+        else if (allCellInfo[celli].valid(wave.data()))
+        {
+            const auto& data = allCellInfo[celli].data();
+            addItem(celli, data, untransformi, transformi, transformedWallInfo);
+        }
+    }
+    untransformedPatchStarts_.resize(mesh_.boundary().size()+1);
+    transformedPatchStarts_.resize(mesh_.boundary().size()+1);
+    for (const auto& pp : mesh_.boundary())
+    {
+        untransformedPatchStarts_[pp.index()] = untransformi;
+        transformedPatchStarts_[pp.index()] = transformi;
+
+        forAll(pp, patchFacei)
+        {
+            const label facei = pp.start()+patchFacei;
+            if (allFaceInfo[facei].valid(wave.data()))
+            {
+                const auto& data = allFaceInfo[facei].data();
+                addItem
+                (
+                    facei,
+                    data,
+                    untransformi,
+                    transformi,
+                    transformedWallInfo
+                );
+            }
+        }
+    }
+
+    untransformedItems_.resize(untransformi);
+    untransformedSlots_.resize(untransformi);
+    untransformedPatchStarts_.back() = untransformi;
+    transformedItems_.resize(transformi);
+    transformedWallInfo.resize(transformi);
+    transformedPatchStarts_.back() = transformi;
+
+    if (debug)
+    {
+        Pout<< typeName
+            << " : untransformed:" << untransformi
+            << " transformed:" << transformi
+            << " out of nWalls:" << nWalls
+            << " untransformStart:" << flatOutput(untransformedPatchStarts_)
+            << " transformStart:" << flatOutput(transformedPatchStarts_)
+            << endl;
+    }
+
+    List<Map<label>> compactMap;
+    mapPtr_.reset
+    (
+        new mapDistribute
+        (
+            globalWalls,            // globalIndex
+            untransformedSlots_,    // untransformedElements
+
+            gt,                     // globalIndexAndTransform
+            transformedWallInfo,    // transformedElements
+            transformedSlots_,      // transformedIndices
+            compactMap
+        )
+    );
+
+    if (debug & 2)
+    {
+        // Use the obtained map to write nearest
+        {
+            OBJstream os(mesh_.polyMesh::path()/"nearest.obj");
+            Pout<< typeName
+                << " : writing line from cell/face to nearest wall face to "
+                << os.name() << endl;
+
+            // Seed all wall faces with centroid and override all other
+            // cells/faces with that of nearest wall
+            volVectorField wallCentre(mesh_.C());
+            this->map(wallCentre, mapDistribute::transformPosition());
+
+            // Seed all wall faces with normal and override all other
+            // cells/faces with that of nearest wall
+            volVectorField wallNormal
+            (
+                IOobject
+                (
+                    "n" & patchTypeName_,
+                    mesh_.time().timeName(),
+                    mesh_,
+                    IOobjectOption::NO_REGISTER
+                ),
+                mesh_,
+                dimensionedVector(dimless, Zero),
+                patchDistMethod::patchTypes<vector>(mesh_, patchSet)
+            );
+            // Calculate normal
+            for (const label patchi : patchIDs_)
+            {
+                auto& pnf = wallNormal.boundaryFieldRef()[patchi];
+                pnf == pnf.patch().nf();
+            }
+            this->map(wallNormal, mapDistribute::transform());
+
+            forAll(wallCentre, celli)
+            {
+                const point& cc = mesh_.C()[celli];
+                const point& wallC = wallCentre[celli];
+                const vector& wallN = wallNormal[celli];
+                os.write(linePointRef(cc, wallC), wallN, wallN);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDistAddressing::wallDistAddressing
+(
+    const fvMesh& mesh,
+    const bool correctWalls,
+    const label updateInterval
+)
+:
+    // Register as "wallDistAddressing"
+    MeshObject<fvMesh, Foam::UpdateableMeshObject, wallDistAddressing>(mesh),
+    cellDistFuncs(mesh),
+    patchIDs_(mesh.boundaryMesh().findPatchIDs<wallPolyPatch>().sortedToc()),
+    patchTypeName_("wall"),
+    updateInterval_(updateInterval),
+    correctWalls_(correctWalls),
+    requireUpdate_(true),
+    y_
+    (
+        IOobject
+        (
+            "y" & patchTypeName_,
+            mesh.time().timeName(),
+            mesh.thisDb(),
+            IOobjectOption::NO_REGISTER
+        ),
+        mesh,
+        dimensionedScalar("y", dimLength, GREAT)    // Same as wallDistData
+    )
+{
+    movePoints();
+}
+
+
+Foam::wallDistAddressing::wallDistAddressing
+(
+    const word& patchTypeName,
+    const fvMesh& mesh,
+    const labelList& patchIDs,
+    const bool correctWalls,
+    const label updateInterval
+)
+:
+    MeshObject<fvMesh, Foam::UpdateableMeshObject, wallDistAddressing>
+    (
+        patchTypeName,
+        mesh
+    ),
+    cellDistFuncs(mesh),
+    patchIDs_(patchIDs),
+    patchTypeName_(patchTypeName),
+    updateInterval_(updateInterval),
+    correctWalls_(correctWalls),
+    requireUpdate_(true),
+    y_
+    (
+        IOobject
+        (
+            "y" & patchTypeName_,
+            mesh.time().timeName(),
+            mesh.thisDb(),
+            IOobjectOption::NO_REGISTER
+        ),
+        mesh,
+        dimensionedScalar("y", dimLength, GREAT)    // Same as wallDistData
+    )
+{
+    movePoints();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDistAddressing::~wallDistAddressing()
+{}  // mapDistribute was forward declared
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::wallDistAddressing::movePoints()
+{
+    if
+    (
+        (updateInterval_ > 0)
+     && ((mesh_.time().timeIndex() % updateInterval_) == 0)
+    )
+    {
+        requireUpdate_ = true;
+    }
+
+    if (requireUpdate_)
+    {
+        DebugInfo<< "Updating wall distance" << endl;
+
+        requireUpdate_ = false;
+
+        correct(y_);
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void Foam::wallDistAddressing::updateMesh(const mapPolyMesh& mpm)
+{
+    // Force update if performing topology change
+    // Note: needed?
+    // - field would have been mapped, so if using updateInterval option (!= 1)
+    //   live with error associated of not updating and use mapped values?
+    requireUpdate_ = true;
+    movePoints();
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.H b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.H
new file mode 100644
index 0000000000..4bc5855b19
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.H
@@ -0,0 +1,291 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::wallDistAddressing
+
+Description
+    Variant of wallDist that uses meshWave and stores the addressing.
+
+    Can be used to transport other wall properties.
+    For example getting the nearest-wall normal into a volVectorField
+    \verbatim
+        // If not yet constructed construct from all wall patches
+        const auto& wDist = wallDistAddressing::New(mesh);
+
+        // Fill boundaryField with normal
+        for (const label patchi : wDist.patchIDs())
+        {
+            auto& pnf = n.boundaryFieldRef()[patchi];
+            pnf == pnf.patch().nf();
+        }
+
+        // Map data from nearest wall (using transformation if nearest is
+        // reached through a coupled patch with transformation)
+        wDist.map(n, mapDistribute::transform());
+    \endverbatim
+
+
+    Another use is e.g. to get the distance to cyclic patches. This enforces
+    registration under the supplied name.
+
+    \verbatim
+        // If not yet constructed construct from selected patches
+        const labelList& patchIDs = ..
+
+        const auto& wDist = wallDistAddressing::New
+        (
+            "myPatches",    // registration name
+            mesh,
+            patchIDs
+        );
+
+        // Fill boundaryField with normal
+        for (const label patchi : wDist.patchIDs())
+        {
+            auto& pnf = n.boundaryFieldRef()[patchi];
+            pnf == pnf.patch().nf();
+        }
+
+        // Map data from nearest patch face (using transformation if nearest is
+        // reached through a coupled patch with transformation)
+        wDist.map(n, mapDistribute::transform());
+    \endverbatim
+
+Note
+    By default (correctWalls = true) all
+    cells point-connected to a wall explicitly search for the nearest
+    location on the point-surrouding wall faces (so override the wave
+    behaviour). This gets only done for processor-local wall faces.
+
+See also
+    Foam::wallDist
+
+SourceFiles
+    wallDistAddressing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_wallDistAddressing_H
+#define Foam_wallDistAddressing_H
+
+#include "MeshObject.H"
+#include "FaceCellWave.H"
+#include "cellDistFuncs.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward Declarations
+class mapDistribute;
+class wallPointAddressing;
+
+/*---------------------------------------------------------------------------*\
+                     Class wallDistAddressing Declaration
+\*---------------------------------------------------------------------------*/
+
+class wallDistAddressing
+:
+    public MeshObject<fvMesh, UpdateableMeshObject, wallDistAddressing>,
+    public cellDistFuncs
+{
+    //- Use fvMesh& instead of cellDistFuncs polyMesh&
+    using MeshObject<fvMesh, UpdateableMeshObject, wallDistAddressing>::mesh_;
+
+protected:
+
+    // Private Data
+
+        //- Set of patch IDs
+        const labelList patchIDs_;
+
+        //- Name for the patch set, e.g. "wall"
+        const word patchTypeName_;
+
+        //- Update wall distance every updateInterval_ steps
+        const label updateInterval_;
+
+        //- Do accurate distance calculation for near-wall cells.
+        const bool correctWalls_;
+
+        //- Flag to indicate whether the wall distance requires updating
+        bool requireUpdate_;
+
+        //- Distance-to-wall field
+        mutable volScalarField y_;
+
+        //- Number of wall faces
+        autoPtr<globalIndex> globalWallsPtr_;
+
+        //- Map to pull wall face info to cell or boundary face
+        autoPtr<mapDistribute> mapPtr_;
+
+        //- Indices of cells followed by boundary faces
+        labelList untransformedItems_;
+
+        //- Corresponding slot in mapPtr distribution result
+        labelList untransformedSlots_;
+
+        //- Start of patches. Start of untransformedPatchStarts_[0] is end
+        //  of cell information
+        labelList untransformedPatchStarts_;
+
+        // Corresponding data for transformed items
+        labelList transformedItems_;
+        labelList transformedSlots_;
+        labelList transformedPatchStarts_;
+
+
+    // Protected Member Functions
+
+        //- Extract FaceCellWave data
+        label getValues
+        (
+            const FaceCellWave<wallPointAddressing>& wave,
+            const List<wallPointAddressing>& allCellInfo,
+            const List<wallPointAddressing>& allFaceInfo,
+            volScalarField& y
+        ) const;
+
+        //- Store nearest-data to cell or boundary face
+        void addItem
+        (
+            const label item,
+            const labelPair& data,
+            label& untransformi,
+            label& transformi,
+            labelPairList& transformedWallInfo
+        );
+
+        //- Extract nearest-patch distance data
+        void correct(volScalarField& y);
+
+
+        //- No copy construct
+        wallDistAddressing(const wallDistAddressing&) = delete;
+
+        //- No copy assignment
+        void operator=(const wallDistAddressing&) = delete;
+
+
+public:
+
+    // Declare name of the class and its debug switch
+    ClassName("wallDistAddressing");
+
+
+    // Constructors
+
+        //- Construct from mesh and near-wall behaviour
+        explicit wallDistAddressing
+        (
+            const fvMesh& mesh,
+            const bool correctWalls = true,
+            const label updateInterval = 1
+        );
+
+        //- Construct from patch type name (= registration name),
+        //- mesh and patch IDs.
+        wallDistAddressing
+        (
+            const word& patchTypeName,
+            const fvMesh& mesh,
+            const labelList& patchIDs,
+            const bool correctWalls = true,
+            const label updateInterval = 1
+        );
+
+
+    //- Destructor
+    virtual ~wallDistAddressing();
+
+
+    // Member Functions
+
+        //- Return the patchIDs
+        const labelUList& patchIDs() const noexcept
+        {
+            return patchIDs_;
+        }
+
+        //- Return reference to cached distance-to-wall field. Unvisited
+        //  elements set to GREAT
+        const volScalarField& y() const noexcept
+        {
+            return y_;
+        }
+
+        //- Update the y-field when the mesh moves
+        virtual bool movePoints();
+
+        //- Update the y-field when the mesh changes
+        virtual void updateMesh(const mapPolyMesh&);
+
+
+        // Get values from nearest patches
+
+            //- Collect patchFields from patchIDs into straight list
+            template<class Container, class Type>
+            tmp<Field<Type>> collectPatchFields(const Container& bfld) const;
+
+            //- Take collected/distributed patch field and fill volField
+            template<class VolField>
+            void extract
+            (
+                const Field<typename VolField::value_type>& patchFld,
+                VolField& fld
+            ) const;
+
+            //- Map nearest-patch information. Take wall patch values
+            //  and transports these to the internal field and other patches.
+            //  Use mapDistribute::transformPosition if transporting absolute
+            //  coordinates.
+            template<class VolField, class TransformOp>
+            const VolField& map
+            (
+                VolField& fld,
+                const TransformOp& top = mapDistribute::transform()
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "wallDistAddressingTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressingTemplates.C b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressingTemplates.C
new file mode 100644
index 0000000000..c4188de782
--- /dev/null
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressingTemplates.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Container, class Type>
+Foam::tmp<Foam::Field<Type>>
+Foam::wallDistAddressing::collectPatchFields
+(
+    const Container& bfld
+) const
+{
+    label n = 0;
+    for (const auto& patchi : patchIDs_)
+    {
+        n += bfld[patchi].size();
+    }
+
+    auto tresult(tmp<Field<Type>>::New(n));
+    auto& result = tresult.ref();
+
+    n = 0;
+    for (const auto& patchi : patchIDs_)
+    {
+        const auto& pfld = bfld[patchi];
+
+        SubList<Type>(result, pfld.size(), n) = pfld;
+        n += pfld.size();
+    }
+    return tresult;
+}
+
+
+template<class VolField>
+void Foam::wallDistAddressing::extract
+(
+    const Field<typename VolField::value_type>& wallFld,
+    VolField& fld
+) const
+{
+    {
+        const label nUntrafoCells =
+        (
+            untransformedPatchStarts_.size()
+          ? untransformedPatchStarts_[0]
+          : untransformedItems_.size()
+        );
+        for (label i = 0; i < nUntrafoCells; i++)
+        {
+            const label celli = untransformedItems_[i];
+            const label sloti = untransformedSlots_[i];
+            fld[celli] = wallFld[sloti];
+        }
+    }
+    {
+        const label nTrafoCells =
+        (
+            transformedPatchStarts_.size()
+          ? transformedPatchStarts_[0]
+          : transformedItems_.size()
+        );
+        for (label i = 0; i < nTrafoCells; i++)
+        {
+            const label celli = transformedItems_[i];
+            const label sloti = transformedSlots_[i];
+            fld[celli] = wallFld[sloti];
+        }
+    }
+
+    forAll(fld.boundaryField(), patchi)
+    {
+        const auto& pfld = fld.boundaryField()[patchi];
+        Field<typename VolField::value_type> patchField(pfld.size());
+
+        {
+            const label start = untransformedPatchStarts_[patchi];
+            const label end = untransformedPatchStarts_[patchi+1];
+
+            for (label i = start; i < end; i++)
+            {
+                const label facei = untransformedItems_[i];
+                const label sloti = untransformedSlots_[i];
+                patchField[facei-pfld.patch().start()] = wallFld[sloti];
+            }
+        }
+
+        {
+            const label start = transformedPatchStarts_[patchi];
+            const label end = transformedPatchStarts_[patchi+1];
+
+            for (label i = start; i < end; i++)
+            {
+                const label facei = transformedItems_[i];
+                const label sloti = transformedSlots_[i];
+                patchField[facei-pfld.patch().start()] = wallFld[sloti];
+            }
+        }
+
+        fld.boundaryFieldRef()[patchi] = patchField;
+    }
+    fld.correctBoundaryConditions();
+}
+
+
+template<class VolField, class TransformOp>
+const VolField& Foam::wallDistAddressing::map
+(
+    VolField& fld,
+    const TransformOp& top
+) const
+{
+    const auto patchFld
+    (
+        collectPatchFields
+        <
+            typename VolField::Boundary,
+            typename VolField::value_type
+        >
+        (
+            fld.boundaryField()
+        )
+    );
+
+    // Distribute and transform
+    mapPtr_().distribute
+    (
+        mesh_.globalData().globalTransforms(),
+        patchFld.ref(),
+        top
+    );
+
+    // Extract into volField
+    extract(patchFld(), fld);
+
+    return fld;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.C b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressing.C
similarity index 73%
rename from src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.C
rename to src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressing.C
index ab311e0161..de0e3efdb0 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressing.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,10 +25,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "wallPointYPlus.H"
+#include "wallPointAddressing.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const wallPointAddressing& rhs
+)
+{
+    return os
+        << static_cast<const wallPoint&>(rhs)
+        << token::SPACE
+        << rhs.data();
+}
+
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    wallPointAddressing& rhs
+)
+{
+    return is >> static_cast<wallPoint&>(rhs) >> rhs.data_;
+}
 
-Foam::scalar Foam::wallPointYPlus::yPlusCutOff = 200;
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressing.H
similarity index 57%
rename from src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
rename to src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressing.H
index 51d583fe8a..dc33054d41 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlus.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressing.H
@@ -5,8 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,53 +24,65 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::wallPointYPlus
+    Foam::wallPointAddressing
 
 Description
-    Holds information (coordinate and yStar) regarding nearest wall point.
+    Holds information (coordinate and origin) regarding nearest wall point.
 
-    Used in VanDriest wall damping where the interest is in y+ but only
-    needs to be calculated up to e.g. y+ < 200. In all other cells/faces
-    the damping function becomes 1, since y gets initialized to GREAT and
-    yStar to 1.
-
-    Note: should feed the additional argument (yPlusCutoff) through as a
-    template argument into FaceCellWave
+    Is like wallPoint but transfer extra (passive) data.
+    Used e.g. in wall distance calculation with wall reflection vectors.
 
 SourceFiles
-    wallPointYPlusI.H
-    wallPointYPlus.C
+    wallPointAddressingI.H
+    wallPointAddressing.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallPointYPlus_H
-#define wallPointYPlus_H
+#ifndef wallPointAddressing_H
+#define wallPointAddressing_H
 
-#include "wallPointData.H"
+#include "wallPoint.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward Declarations
+class globalIndexAndTransform;
+class wallPointAddressing;
+
+Ostream& operator<<(Ostream&, const wallPointAddressing&);
+Istream& operator>>(Istream&, wallPointAddressing&);
+
+
 /*---------------------------------------------------------------------------*\
-                           Class wallPointYPlus Declaration
+                     Class wallPointAddressing Declaration
 \*---------------------------------------------------------------------------*/
 
-class wallPointYPlus
+class wallPointAddressing
 :
-    public wallPointData<scalar>
+    public wallPoint
 {
+    // Private Data
+
+        //- Data at nearest wall center
+        labelPair data_;
+
+
     // Private Member Functions
 
-        //- Evaluate distance to point. Update distSqr, origin from whomever
-        //  is nearer pt. Return true if w2 is closer to point,
-        //  false otherwise.
+        //- Initialise data so it uses the nulltransformindex
+        inline void setNull(const globalIndexAndTransform& gt);
+
+        //- Evaluate distance to point.
+        //  Update distSqr, origin from whomever is nearer pt.
+        //  \return true if w2 is closer to point, false otherwise.
         template<class TrackingData>
         inline bool update
         (
             const point&,
-            const wallPointYPlus& w2,
+            const wallPointAddressing& w2,
             const scalar tol,
             TrackingData& td
         );
@@ -79,29 +90,47 @@ class wallPointYPlus
 
 public:
 
-    // Static data members
-
-        //- The cut-off value for y+
-        static scalar yPlusCutOff;
-
-
     // Constructors
 
-        //- Construct null
-        inline wallPointYPlus();
+        //- Default construct
+        inline wallPointAddressing();
 
-        //- Construct from origin, yStar, distance
-        inline wallPointYPlus
+        //- Construct from origin, transforms, distance
+        inline wallPointAddressing
         (
             const point& origin,
-            const scalar yStar,
+            const labelPair& data,
             const scalar distSqr
         );
 
 
     // Member Functions
 
-        // Needed by FaceCellWave
+        // Access
+
+            const labelPair& data() const
+            {
+                return data_;
+            }
+            labelPair& data()
+            {
+                return data_;
+            }
+
+
+        // Needed by MeshWave
+
+            //- Convert any absolute coordinates into relative to (patch)face
+            //- centre
+            template<class TrackingData>
+            inline void leaveDomain
+            (
+                const polyMesh&,
+                const polyPatch&,
+                const label patchFacei,
+                const point& faceCentre,
+                TrackingData& td
+            );
 
             //- Influence of neighbouring face.
             //  Calls update(...) with cellCentre of celli
@@ -111,7 +140,7 @@ public:
                 const polyMesh& mesh,
                 const label thisCelli,
                 const label neighbourFacei,
-                const wallPointYPlus& neighbourWallInfo,
+                const wallPointAddressing& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -124,7 +153,7 @@ public:
                 const polyMesh& mesh,
                 const label thisFacei,
                 const label neighbourCelli,
-                const wallPointYPlus& neighbourWallInfo,
+                const wallPointAddressing& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
@@ -137,19 +166,31 @@ public:
             (
                 const polyMesh& mesh,
                 const label thisFacei,
-                const wallPointYPlus& neighbourWallInfo,
+                const wallPointAddressing& neighbourWallInfo,
                 const scalar tol,
                 TrackingData& td
             );
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<(Ostream&, const wallPointAddressing&);
+        friend Istream& operator>>(Istream&, wallPointAddressing&);
 };
 
 
 // * * * * * * * * * * * * * * * * * Traits  * * * * * * * * * * * * * * * * //
 
-//- Contiguous data for wallPointYPlus
+//- Data are contiguous if data type is contiguous
 template<>
-struct is_contiguous<wallPointYPlus> : is_contiguous<wallPointData<scalar>> {};
+struct is_contiguous<wallPointAddressing>
+: is_contiguous<wallPoint>
+{};
 
+template<>
+struct is_contiguous_scalar<wallPointAddressing>
+: is_contiguous_scalar<wallPoint>
+{};
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -157,7 +198,7 @@ struct is_contiguous<wallPointYPlus> : is_contiguous<wallPointData<scalar>> {};
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "wallPointYPlusI.H"
+#include "wallPointAddressingI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlusI.H b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressingI.H
similarity index 56%
rename from src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlusI.H
rename to src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressingI.H
index 18ff15e8a0..8979068558 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallPointYPlus/wallPointYPlusI.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallPointAddressingI.H
@@ -5,8 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,14 +25,33 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "globalIndexAndTransform.H"
+#include "globalMeshData.H"
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+inline void Foam::wallPointAddressing::setNull
+(
+    const globalIndexAndTransform& gt
+)
+{
+    if (data_ == labelPair(-1, -1))
+    {
+        const label proci = 0;
+        const label index = -1;
+
+        // Add sending side transform
+        data_ = gt.encode(proci, index, gt.nullTransformIndex());
+    }
+}
+
+
 // Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool Foam::wallPointYPlus::update
+inline bool Foam::wallPointAddressing::update
 (
     const point& pt,
-    const wallPointYPlus& w2,
+    const wallPointAddressing& w2,
     const scalar tol,
     TrackingData& td
 )
@@ -57,65 +75,104 @@ inline bool Foam::wallPointYPlus::update
         }
     }
 
-
     // Either *this is not yet valid or w2 is closer
     {
-        // only propagate if interesting (i.e. y+ < 100)
-        const scalar yPlus = Foam::sqrt(dist2)/w2.data();
+        // current not yet set so use any value
+        distSqr() = dist2;
+        origin() = w2.origin();
+        data_ = w2.data();
 
-        if (yPlus < yPlusCutOff)
-        {
-            // update with new values
-            distSqr() = dist2;
-            origin() = w2.origin();
-            data() = w2.data();
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+        return true;
     }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::wallPointYPlus::wallPointYPlus()
+inline Foam::wallPointAddressing::wallPointAddressing()
 :
-    wallPointData<scalar>()
-{
-    // Important: value of yStar where meshWave does not come.
-    data() = 1.0;
-}
+    wallPoint(),
+    data_(labelPair(-1, -1))
+{}
 
 
-inline Foam::wallPointYPlus::wallPointYPlus
+inline Foam::wallPointAddressing::wallPointAddressing
 (
     const point& origin,
-    const scalar yStar,
+    const labelPair& data,
     const scalar distSqr
 )
 :
-    wallPointData<scalar>(origin, yStar, distSqr)
+    wallPoint(origin, distSqr),
+    data_(data)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class TrackingData>
+inline void Foam::wallPointAddressing::leaveDomain
+(
+    const polyMesh& mesh,
+    const polyPatch& pp,
+    const label patchFacei,
+    const point& faceCentre,
+    TrackingData& td
+)
+{
+    const auto& gt = mesh.globalData().globalTransforms();
+
+    setNull(gt);
+
+    // Convert to relative form
+    wallPoint::leaveDomain(mesh, pp, patchFacei, faceCentre, td);
+
+    // Add to transformation
+    const label transformi = gt.transformIndex(data_);
+    const label proci = gt.processor(data_);
+    const label index = gt.index(data_);
+
+    // Add sending side transform
+    const label newTransformi = gt.addToTransformIndex
+    (
+        transformi,
+        pp.index()
+    );
+    data_ = gt.encode(proci, index, newTransformi);
+}
+
+
+//// Update absolute geometric quantities. Note that distance (distSqr_)
+//// is not affected by leaving/entering domain.
+//template<class TrackingData>
+//inline void Foam::wallPointAddressing::enterDomain
+//(
+//    const polyMesh& mesh,
+//    const polyPatch& pp,
+//    const label patchFacei,
+//    const point& faceCentre,
+//    TrackingData& td
+//)
+//{
+//    // back to absolute form
+//    wallPoint::enterDomain(mesh, pp, patchFacei, faceCentre, td);
+//}
+
+
 // Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool Foam::wallPointYPlus::updateCell
+inline bool Foam::wallPointAddressing::updateCell
 (
     const polyMesh& mesh,
     const label thisCelli,
     const label neighbourFacei,
-    const wallPointYPlus& neighbourWallInfo,
+    const wallPointAddressing& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
+    setNull(mesh.globalData().globalTransforms());
+
     const vectorField& cellCentres = mesh.primitiveMesh::cellCentres();
 
     return update
@@ -130,16 +187,18 @@ inline bool Foam::wallPointYPlus::updateCell
 
 // Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool Foam::wallPointYPlus::updateFace
+inline bool Foam::wallPointAddressing::updateFace
 (
     const polyMesh& mesh,
     const label thisFacei,
-    const label neighbourCelli,
-    const wallPointYPlus& neighbourWallInfo,
+    const label,
+    const wallPointAddressing& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
+    setNull(mesh.globalData().globalTransforms());
+
     const vectorField& faceCentres = mesh.faceCentres();
 
     return update
@@ -154,15 +213,17 @@ inline bool Foam::wallPointYPlus::updateFace
 
 // Update this with w2 if w2 nearer to pt.
 template<class TrackingData>
-inline bool Foam::wallPointYPlus::updateFace
+inline bool Foam::wallPointAddressing::updateFace
 (
     const polyMesh& mesh,
     const label thisFacei,
-    const wallPointYPlus& neighbourWallInfo,
+    const wallPointAddressing& neighbourWallInfo,
     const scalar tol,
     TrackingData& td
 )
 {
+    setNull(mesh.globalData().globalTransforms());
+
     const vectorField& faceCentres = mesh.faceCentres();
 
     return update

From 3e024d622ba1ca4d7a8c18a04496cca26fd45d09 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Feb 2023 11:45:18 +0100
Subject: [PATCH 047/348] STYLE: relocate hashing and IO for std::pair to
 Pair.H (from Tuple2.H)

- makes it more universally available
---
 src/OpenFOAM/primitives/tuples/Pair.H   | 41 +++++++++++++++++++++++--
 src/OpenFOAM/primitives/tuples/Tuple2.H | 37 +---------------------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/OpenFOAM/primitives/tuples/Pair.H b/src/OpenFOAM/primitives/tuples/Pair.H
index 9548289ac7..48a8538205 100644
--- a/src/OpenFOAM/primitives/tuples/Pair.H
+++ b/src/OpenFOAM/primitives/tuples/Pair.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,8 @@ See also
 
 #include "FixedList.H"
 #include "Istream.H"
-#include <utility>  // For std::move
+#include "Ostream.H"
+#include <utility>  // For std::move, std::pair
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -194,6 +195,16 @@ struct is_contiguous_scalar<Pair<T>> : is_contiguous_scalar<T> {};
 template<class T>
 struct Hash<Pair<T>> : Pair<T>::hasher {};
 
+//- Hashing for std::pair data
+template<class T1, class T2>
+struct Hash<std::pair<T1, T2>>
+{
+    unsigned operator()(const std::pair<T1, T2>& obj, unsigned seed=0) const
+    {
+        return Hash<T2>()(obj.second, Hash<T1>()(obj.first, seed));
+    }
+};
+
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
 
@@ -253,6 +264,32 @@ bool operator>=(const Pair<T>& a, const Pair<T>& b)
 }
 
 
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+//- Read std::pair from Istream
+template<class T1, class T2>
+inline Istream& operator>>(Istream& is, std::pair<T1,T2>& t)
+{
+    is.readBegin("pair");
+    is >> t.first >> t.second;
+    is.readEnd("pair");
+
+    is.check(FUNCTION_NAME);
+    return is;
+}
+
+
+//- Write std::pair to Ostream
+template<class T1, class T2>
+inline Ostream& operator<<(Ostream& os, const std::pair<T1,T2>& t)
+{
+    os  << token::BEGIN_LIST
+        << t.first << token::SPACE << t.second
+        << token::END_LIST;
+    return os;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/tuples/Tuple2.H b/src/OpenFOAM/primitives/tuples/Tuple2.H
index 6c6fe3d1ee..ab895b3985 100644
--- a/src/OpenFOAM/primitives/tuples/Tuple2.H
+++ b/src/OpenFOAM/primitives/tuples/Tuple2.H
@@ -133,17 +133,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * Traits  * * * * * * * * * * * * * * * * //
 
-//- Hashing for std::pair data
-template<class T1, class T2>
-struct Hash<std::pair<T1, T2>>
-{
-    unsigned operator()(const std::pair<T1, T2>& obj, unsigned seed=0) const
-    {
-        return Hash<T2>()(obj.second, Hash<T1>()(obj.first, seed));
-    }
-};
-
-
 //- Hashing for Tuple2 data
 template<class T1, class T2>
 struct Hash<Tuple2<T1, T2>>
@@ -291,19 +280,6 @@ struct maxFirstEqOp
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-//- Read std::pair from Istream
-template<class T1, class T2>
-inline Istream& operator>>(Istream& is, std::pair<T1,T2>& t)
-{
-    is.readBegin("pair");
-    is >> t.first >> t.second;
-    is.readEnd("pair");
-
-    is.check(FUNCTION_NAME);
-    return is;
-}
-
-
 //- Read Tuple2 from Istream
 template<class T1, class T2>
 inline Istream& operator>>(Istream& is, Tuple2<T1,T2>& t)
@@ -317,18 +293,7 @@ inline Istream& operator>>(Istream& is, Tuple2<T1,T2>& t)
 }
 
 
-//- Write std::pair to Ostream.
-template<class T1, class T2>
-inline Ostream& operator<<(Ostream& os, const std::pair<T1,T2>& t)
-{
-    os  << token::BEGIN_LIST
-        << t.first << token::SPACE << t.second
-        << token::END_LIST;
-    return os;
-}
-
-
-//- Write Tuple2 to Ostream.
+//- Write Tuple2 to Ostream
 template<class T1, class T2>
 inline Ostream& operator<<(Ostream& os, const Tuple2<T1,T2>& t)
 {

From 173c9ac163beddc028ada6353d2d47333806f490 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Feb 2023 09:20:04 +0100
Subject: [PATCH 048/348] ENH: reduce storage and startup communication for
 processorTopology

- previously built the entire adjacency table (full communication!)
  but this is only strictly needed when using 'scheduled' as the
  default communication mode. For blocking/nonBlocking modes this
  information is not necessary at that point.

  The processorTopology::New now generally creates a smaller amount of
  data at startup: the processor->patch mapping and the patchSchedule.

  If the default communication mode is 'scheduled', the behaviour is
  almost identical to previously.

- Use Map<label> for the processor->patch mapping for a smaller memory
  footprint on large (ie, sparsely connected) cases. It also
  simplifies coding and allows recovery of the list of procNeighbours
  on demand.

- Setup the processor initEvaluate/evaluate states with fewer loops
  over the patches.

========
BREAKING: procNeighbours() method changed definition

- this was previously the entire adjacency table, but is now only the
  processor-local neighbours. Now use procAdjacency() to create or
  recover the entire adjacency table.

  The only known use is within Cloud<ParticleType>::move and there it
  was only used to obtain processor-local information.

  Old:
      const labelList& neighbourProcs =
          mesh.globalData().topology().procNeighbours()[Pstream::myProcNo()];

  New:
      const labelList& neighbourProcs =
          mesh.globalData().topology().procNeighbours();

      // If needed, the old definition (with communication!)
      const labelListList& connectivity =
          mesh.globalData().topology().procAdjacency();
---
 .../Test-processorTopology.C                  |   4 +-
 src/OpenFOAM/Make/files                       |   2 +
 .../lduMesh/lduPrimitiveMeshTemplates.C       |  51 +++---
 .../parallel/commSchedule/commSchedule.C      | 106 +++++++------
 .../processorTopology/processorTopology.C     | 120 ++++++++++++++
 .../processorTopology/processorTopology.H     |  94 +++++------
 .../processorTopology/processorTopologyNew.H  | 150 ++++++++----------
 src/lagrangian/basic/Cloud/Cloud.C            |   5 +-
 8 files changed, 322 insertions(+), 210 deletions(-)
 create mode 100644 src/OpenFOAM/parallel/processorTopology/processorTopology.C

diff --git a/applications/test/processorTopology/Test-processorTopology.C b/applications/test/processorTopology/Test-processorTopology.C
index c4e87c8868..a457a83365 100644
--- a/applications/test/processorTopology/Test-processorTopology.C
+++ b/applications/test/processorTopology/Test-processorTopology.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
     // Adjacency table
     const labelListList& connectivity =
-        mesh.globalData().topology().procNeighbours();
+        mesh.globalData().topology().procAdjacency();
 
     if (Pstream::master())
     {
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 1cef3ee916..b0404996bc 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -26,6 +26,8 @@ $(fileOps)/collatedFileOperation/hostCollatedFileOperation.C
 $(fileOps)/collatedFileOperation/threadedCollatedOFstream.C
 $(fileOps)/collatedFileOperation/OFstreamCollator.C
 
+parallel/processorTopology/processorTopology.C
+
 bools = primitives/bools
 $(bools)/bool/bool.C
 $(bools)/Switch/Switch.C
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMeshTemplates.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMeshTemplates.C
index 6b774f304f..e636eef547 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMeshTemplates.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMeshTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,38 +38,51 @@ Foam::lduSchedule Foam::lduPrimitiveMesh::nonBlockingSchedule
 {
     lduSchedule schedule(2*interfaces.size());
 
-    // 1. All non-processor patches
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
     label patchEvali = 0;
+    label numProcPatches = 0;
+
+    //
+    // 1. Schedule non-processor patches
+    //
 
     forAll(interfaces, patchi)
     {
-        if (interfaces.set(patchi) && !isA<ProcPatch>(interfaces[patchi]))
+        if (interfaces.set(patchi))
         {
-            schedule[patchEvali++].setInitEvaluate(patchi);
-            schedule[patchEvali++].setEvaluate(patchi);
+            if (isA<ProcPatch>(interfaces[patchi]))
+            {
+                ++numProcPatches;
+            }
+            else
+            {
+                schedule[patchEvali++].setInitEvaluate(patchi);
+                schedule[patchEvali++].setEvaluate(patchi);
+            }
         }
     }
 
-    // 2. All processor patches
-    // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    forAll(interfaces, patchi)
+    //
+    // 2. Schedule processor patches
+    //
+
+    if (numProcPatches)
     {
-        if (interfaces.set(patchi) && isA<ProcPatch>(interfaces[patchi]))
+        forAll(interfaces, patchi)
         {
-            schedule[patchEvali++].setInitEvaluate(patchi);
+            if (interfaces.set(patchi) && isA<ProcPatch>(interfaces[patchi]))
+            {
+                schedule[patchEvali].setInitEvaluate(patchi);
+                schedule[patchEvali + numProcPatches].setEvaluate(patchi);
+                ++patchEvali;
+            }
         }
     }
 
-    forAll(interfaces, patchi)
-    {
-        if (interfaces.set(patchi) && isA<ProcPatch>(interfaces[patchi]))
-        {
-            schedule[patchEvali++].setEvaluate(patchi);
-        }
-    }
+    // Caution:
+    // The schedule is only valid for a subset of its range
+    // (where interfaces are defined) but must retain the full list length
+    // for later (external) bookkeeping
 
     return schedule;
 }
diff --git a/src/OpenFOAM/parallel/commSchedule/commSchedule.C b/src/OpenFOAM/parallel/commSchedule/commSchedule.C
index 32302b39fb..ae5817627c 100644
--- a/src/OpenFOAM/parallel/commSchedule/commSchedule.C
+++ b/src/OpenFOAM/parallel/commSchedule/commSchedule.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "commSchedule.H"
-#include "ListOps.H"
 #include "IOstreams.H"
 #include "IOmanip.H"
 #include "StringStream.H"
@@ -49,15 +48,15 @@ namespace Foam
 // Count the number of outstanding communications for a single processor
 static label outstandingComms
 (
-    const labelList& commToSchedule,
-    DynamicList<label>& procComms
+    const labelUList& commToSchedule,
+    const DynamicList<label>& procComms
 )
 {
     label nOutstanding = 0;
 
-    for (const label commi : procComms)
+    for (const label commPairi : procComms)
     {
-        if (commToSchedule[commi] == -1)
+        if (commToSchedule[commPairi] == -1)
         {
             ++nOutstanding;
         }
@@ -82,20 +81,20 @@ Foam::commSchedule::commSchedule
     // Determine comms per processor.
     List<DynamicList<label>> procToComms(nProcs);
 
-    forAll(comms, commI)
+    forAll(comms, commPairi)
     {
-        label proc0 = comms[commI][0];
-        label proc1 = comms[commI][1];
+        const label proc0 = comms[commPairi].first();
+        const label proc1 = comms[commPairi].second();
 
         if (proc0 < 0 || proc0 >= nProcs || proc1 < 0 || proc1 >= nProcs)
         {
             FatalErrorInFunction
                 << "Illegal processor(s): "
-                << comms[commI] << abort(FatalError);
+                << comms[commPairi] << abort(FatalError);
         }
 
-        procToComms[proc0].append(commI);
-        procToComms[proc1].append(commI);
+        procToComms[proc0].push_back(commPairi);
+        procToComms[proc1].push_back(commPairi);
     }
     // Note: no need to shrink procToComms. Are small.
 
@@ -108,7 +107,7 @@ Foam::commSchedule::commSchedule
             const labelPair& twoProcs = comms[i];
 
             Pout<< i << ": "
-                << twoProcs[0] << " with " << twoProcs[1] << endl;
+                << twoProcs.first() << " <-> " << twoProcs.second() << endl;
         }
         Pout<< endl;
 
@@ -158,44 +157,46 @@ Foam::commSchedule::commSchedule
 
         while (true)
         {
-            label maxCommI = -1;
+            label maxComm = -1;
             label maxNeed = labelMin;
 
-            forAll(comms, commI)
+            forAll(comms, commPairi)
             {
-                label proc0 = comms[commI][0];
-                label proc1 = comms[commI][1];
+                const label proc0 = comms[commPairi].first();
+                const label proc1 = comms[commPairi].second();
 
                 if
                 (
-                    commToSchedule[commI] == -1             // unscheduled
-                && !busy[proc0]
-                && !busy[proc1]
+                    commToSchedule[commPairi] == -1  // unscheduled
+                 && !busy[proc0]
+                 && !busy[proc1]
                 )
                 {
                     label need =
+                    (
                         outstandingComms(commToSchedule, procToComms[proc0])
-                      + outstandingComms(commToSchedule, procToComms[proc1]);
+                      + outstandingComms(commToSchedule, procToComms[proc1])
+                    );
 
-                    if (need > maxNeed)
+                    if (maxNeed < need)
                     {
                         maxNeed = need;
-                        maxCommI = commI;
+                        maxComm = commPairi;
                     }
                 }
             }
 
 
-            if (maxCommI == -1)
+            if (maxComm == -1)
             {
                 // Found no unscheduled procs.
                 break;
             }
 
-            // Schedule commI in this iteration
-            commToSchedule[maxCommI] = nScheduled++;
-            busy[comms[maxCommI][0]] = true;
-            busy[comms[maxCommI][1]] = true;
+            // Schedule commPairi in this iteration
+            commToSchedule[maxComm] = nScheduled++;
+            busy[comms[maxComm].first()] = true;
+            busy[comms[maxComm].second()] = true;
         }
 
         if (debug && UPstream::master())
@@ -206,16 +207,16 @@ Foam::commSchedule::commSchedule
             {
                 labelList procToComm(nProcs, -1);
 
-                forAll(commToSchedule, commI)
+                forAll(commToSchedule, commPairi)
                 {
-                    label sched = commToSchedule[commI];
+                    const label sched = commToSchedule[commPairi];
 
                     if (sched >= oldNScheduled && sched < nScheduled)
                     {
-                        label proc0 = comms[commI][0];
-                        procToComm[proc0] = commI;
-                        label proc1 = comms[commI][1];
-                        procToComm[proc1] = commI;
+                        const label proc0 = comms[commPairi].first();
+                        const label proc1 = comms[commPairi].second();
+                        procToComm[proc0] = commPairi;
+                        procToComm[proc1] = commPairi;
                     }
                 }
 
@@ -255,31 +256,32 @@ Foam::commSchedule::commSchedule
     labelList nProcScheduled(nProcs, Zero);
 
     // Count
-    forAll(schedule_, i)
+    for (const label commPairi : schedule_)
     {
-        label commI = schedule_[i];
-        const labelPair& twoProcs = comms[commI];
+        const labelPair& twoProcs = comms[commPairi];
 
-        nProcScheduled[twoProcs[0]]++;
-        nProcScheduled[twoProcs[1]]++;
+        nProcScheduled[twoProcs.first()]++;
+        nProcScheduled[twoProcs.second()]++;
     }
+
     // Allocate
     forAll(procSchedule_, proci)
     {
-        procSchedule_[proci].setSize(nProcScheduled[proci]);
+        procSchedule_[proci].resize_nocopy(nProcScheduled[proci]);
     }
+
     nProcScheduled = 0;
+
     // Fill
-    forAll(schedule_, i)
+    for (const label commPairi : schedule_)
     {
-        label commI = schedule_[i];
-        const labelPair& twoProcs = comms[commI];
+        const labelPair& twoProcs = comms[commPairi];
 
-        label proc0 = twoProcs[0];
-        procSchedule_[proc0][nProcScheduled[proc0]++] = commI;
+        const label proc0 = twoProcs.first();
+        const label proc1 = twoProcs.second();
 
-        label proc1 = twoProcs[1];
-        procSchedule_[proc1][nProcScheduled[proc1]++] = commI;
+        procSchedule_[proc0][nProcScheduled[proc0]++] = commPairi;
+        procSchedule_[proc1][nProcScheduled[proc1]++] = commPairi;
     }
 
     if (debug && UPstream::master())
@@ -292,13 +294,13 @@ Foam::commSchedule::commSchedule
 
             Pout<< "Processor " << proci << " talks to processors:" << endl;
 
-            forAll(procComms, i)
+            for (const label commPairi : procComms)
             {
-                const labelPair& twoProcs = comms[procComms[i]];
+                const labelPair& twoProcs = comms[commPairi];
 
-                label nbr = (twoProcs[1] == proci ? twoProcs[0] : twoProcs[1]);
-
-                Pout<< "    " << nbr << endl;
+                Pout<< "    "
+                    << (proci == twoProcs[1] ? twoProcs[0] : twoProcs[1])
+                    << endl;
             }
         }
         Pout<< endl;
diff --git a/src/OpenFOAM/parallel/processorTopology/processorTopology.C b/src/OpenFOAM/parallel/processorTopology/processorTopology.C
new file mode 100644
index 0000000000..4689d7b38e
--- /dev/null
+++ b/src/OpenFOAM/parallel/processorTopology/processorTopology.C
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "processorTopology.H"
+#include "Pstream.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::processorTopology::processorTopology()
+:
+    procPatchMap_(0),
+    comm_(UPstream::worldComm)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::labelList& Foam::processorTopology::procNeighbours() const
+{
+    if (procNeighbours_.empty() && !procPatchMap_.empty())
+    {
+        // My neighbouring procs in ascending sorted order
+        procNeighbours_ = procPatchMap_.sortedToc();
+    }
+
+    return procNeighbours_;
+}
+
+
+// May be useful in the future...
+// ------------------------------
+//
+// const Foam::labelUList Foam::processorTopology::below() const
+// {
+//     const auto& all = procNeighbours();
+//
+//     const auto* pivot = std::upper_bound
+//     (
+//         all.begin(),
+//         all.end(),
+//         UPstream::myProcNo(comm_)
+//     );
+//
+//     if (pivot != all.end())
+//     {
+//         return UList<label>
+//         (
+//             const_cast<label*>(all.begin()),
+//             (pivot - all.begin())
+//         );
+//     }
+//     return UList<label>();
+// }
+//
+//
+// const Foam::labelUList Foam::processorTopology::above() const
+// {
+//     const auto& all = procNeighbours();
+//
+//     const auto* pivot = std::upper_bound
+//     (
+//         all.begin(),
+//         all.end(),
+//         UPstream::myProcNo(comm_)
+//     );
+//     if (pivot != all.end())
+//     {
+//         return UList<label>
+//         (
+//             const_cast<label*>(pivot),
+//             (all.end() - pivot)
+//         );
+//     }
+//     return UList<label>();
+// }
+
+
+const Foam::labelListList& Foam::processorTopology::procAdjacency() const
+{
+    if (UPstream::parRun() && procAdjacencyTable_.empty())
+    {
+        procAdjacencyTable_.resize(UPstream::nProcs(comm_));
+
+        // My neighbouring procs in ascending sorted order
+        procAdjacencyTable_[UPstream::myProcNo(comm_)]
+            = procPatchMap_.sortedToc();
+
+        // Synchronize on all processors
+        Pstream::allGatherList(procAdjacencyTable_, UPstream::msgType(), comm_);
+    }
+
+    return procAdjacencyTable_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/parallel/processorTopology/processorTopology.H b/src/OpenFOAM/parallel/processorTopology/processorTopology.H
index 3cce0ec109..8a15d6ebed 100644
--- a/src/OpenFOAM/parallel/processorTopology/processorTopology.H
+++ b/src/OpenFOAM/parallel/processorTopology/processorTopology.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,6 +51,8 @@ SourceFiles
 
 #include "labelList.H"
 #include "lduSchedule.H"
+#include "Map.H"
+#include "UPstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,48 +67,41 @@ class processorTopology
 {
     // Private Data
 
-        //- The processor to processor connection (adjacency) table
-        labelListList procNeighbours_;
+        //- Map from neighbour proc to patch index
+        //- (processor-local information!)
+        Map<label> procPatchMap_;
+
+        //- The neighbour processor connections (ascending order) associated
+        //- with the local rank.
+        //  Possibly demand-driven data.
+        mutable labelList procNeighbours_;
+
+        //- The complete processor to processor connection adjacency table.
+        //- Globally synchronized information.
+        //  Likely demand-driven data.
+        mutable labelListList procAdjacencyTable_;
 
         //- Order in which the patches should be initialised/evaluated
         //- corresponding to the schedule
         lduSchedule patchSchedule_;
 
-        //- Local map from neighbour proc to patchi. Different per processor!
-        //  -1 or patchi for connection to procID
-        labelList procPatchMap_;
+        //- The communicator used during creation of the topology
+        label comm_;
 
 
-    // Private Member Functions
-
-        //- From neighbour processor to index in our local boundary.
-        //  Local information (so not same over all processors)
-        ///const labelList& procPatchMap() const noexcept
-        ///{
-        ///    return procPatchMap_;
-        ///}
-
-        //- Which \em local boundary is attached to specified processor
-        //  Local information (so not same over all processors)
-        //  \return -1 if not currently connected to specified processor.
-        label procToLocalPatch(const label proci) const
-        {
-            return
-            (
-                proci >= 0 && proci < procPatchMap_.size()
-              ? procPatchMap_[proci]
-              : static_cast<label>(-1)
-            );
-        }
+    // Private Methods Functions
 
+        // Could expose as public...
+        // //- Map of neighbour processor to \em local boundary patch index.
+        // const Map<label>& procPatchMap() const noexcept
+        // {
+        //     return procPatchMap_;
+        // }
 
 public:
 
     // Generated Methods
 
-        //- Default construct (empty)
-        processorTopology() = default;
-
         //- Copy construct
         processorTopology(const processorTopology&) = default;
 
@@ -120,6 +115,12 @@ public:
         processorTopology& operator=(processorTopology&&) = default;
 
 
+    // Constructors
+
+        //- Default construct (empty)
+        processorTopology();
+
+
     // Static Functions
 
         //- Factory method to create topology, schedule and proc/patch maps.
@@ -135,17 +136,24 @@ public:
 
     // Member Functions
 
-        //- The number of processors used by the topology
-        label nProcs() const noexcept
-        {
-            return procNeighbours_.size();
-        }
+        //- The communicator used during creation of the topology
+        label comm() const noexcept { return comm_; }
 
-        //- The processor to processor connection topology
-        //- (like an adjacency list). Globally synchronized information
-        const labelListList& procNeighbours() const noexcept
+        //- The neighbour processor connections (ascending order) associated
+        //- with the \em local rank.
+        const labelList& procNeighbours() const;
+
+        //- The complete processor to processor connection adjacency table.
+        //- Globally synchronized information.
+        //  Likely demand-driven data.
+        const labelListList& procAdjacency() const;
+
+        //- Which \em local boundary is attached to specified neighbour
+        //- processor.
+        //  \return -1 if not currently connected to specified processor.
+        label procPatchLookup(const label proci) const
         {
-            return procNeighbours_;
+            return procPatchMap_.lookup(proci, -1);
         }
 
         //- Order in which the patches should be initialised/evaluated
@@ -154,14 +162,6 @@ public:
         {
             return patchSchedule_;
         }
-
-        //- Which \em local boundary is attached to specified processor
-        //  Local information (so not same over all processors)
-        //  \return -1 if not currently connected to specified processor.
-        label procPatchLookup(const label proci) const
-        {
-            return procToLocalPatch(proci);
-        }
 };
 
 
diff --git a/src/OpenFOAM/parallel/processorTopology/processorTopologyNew.H b/src/OpenFOAM/parallel/processorTopology/processorTopologyNew.H
index e7f966143a..17384f3532 100644
--- a/src/OpenFOAM/parallel/processorTopology/processorTopologyNew.H
+++ b/src/OpenFOAM/parallel/processorTopology/processorTopologyNew.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,10 +44,8 @@ Warning
 #define Foam_processorTopologyNew_H
 
 #include "processorTopology.H"
-#include "bitSet.H"
 #include "commSchedule.H"
 #include "DynamicList.H"
-#include "Pstream.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
@@ -58,73 +56,31 @@ Foam::processorTopology Foam::processorTopology::New
     const label comm
 )
 {
-    const label myProci = Pstream::myProcNo(comm);
-    const label nProcs = Pstream::nProcs(comm);
+    processorTopology topo;
 
-    processorTopology procTopo;
+    topo.comm_ = comm;  // The communicator
+    auto& schedule = topo.patchSchedule_;
 
-    auto& procToProcs = procTopo.procNeighbours_;
-    auto& procToPatch = procTopo.procPatchMap_;
-    auto& schedule = procTopo.patchSchedule_;
-
-    procToProcs.resize(nProcs);
     schedule.resize(2*patches.size());
 
 
-    if (Pstream::parRun())
-    {
-        // Fill my 'slot' with my neighbours
-        auto& procSlot = procToProcs[myProci];
-
-        bitSet isNeighbour(procToProcs.size());
-
-        forAll(patches, patchi)
-        {
-            const auto* cpp = isA<ProcPatch>(patches[patchi]);
-            if (cpp)
-            {
-                const label nbrProci = cpp->neighbProcNo();
-
-                isNeighbour.set(nbrProci);
-            }
-        }
-
-        // The neighbouring procs in sorted (ascending) order
-        procSlot = isNeighbour.sortedToc();
-
-        const label maxNbrProci = procSlot.empty() ? -1 : procSlot.last();
-
-        // Note could also use Map<label> if desired
-        procToPatch.resize_nocopy(maxNbrProci + 1);
-        procToPatch = -1;
-
-        forAll(patches, patchi)
-        {
-            const auto* cpp = isA<ProcPatch>(patches[patchi]);
-            if (cpp)
-            {
-                const label nbrProci = cpp->neighbProcNo();
-
-                // Reverse map
-                procToPatch[nbrProci] = patchi;
-            }
-        }
-
-        // Synchronize on all processors
-        Pstream::allGatherList(procToProcs, UPstream::msgType(), comm);
-    }
-
-
-    // Define the schedule
-
+    // The evaluation number within the schedule
     label patchEvali = 0;
 
-    // 1. All non-processor patches
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Number of processor patches
+    label numProcPatches = 0;
+
+    //
+    // 1. Schedule all non-processor patches
+    //
 
     forAll(patches, patchi)
     {
-        if (!isA<ProcPatch>(patches[patchi]))
+        if (isA<ProcPatch>(patches[patchi]))
+        {
+            ++numProcPatches;
+        }
+        else
         {
             schedule[patchEvali++].setInitEvaluate(patchi);
             schedule[patchEvali++].setEvaluate(patchi);
@@ -132,15 +88,42 @@ Foam::processorTopology Foam::processorTopology::New
     }
 
 
-    // 2. All processor patches
-    // ~~~~~~~~~~~~~~~~~~~~~~~~
+    // Assemble processor patch information
+    if (UPstream::parRun() && numProcPatches)
+    {
+        // Create reverse map (from proc to patch)
+        // - assumes single connections between processors
+
+        auto& patchMap = topo.procPatchMap_;
+        patchMap.resize(2*numProcPatches);
+
+        forAll(patches, patchi)
+        {
+            const auto* cpp = isA<ProcPatch>(patches[patchi]);
+            if (cpp)
+            {
+                patchMap.set(cpp->neighbProcNo(), patchi);
+            }
+        }
+    }
+
+
+    //
+    // 2. Handle processor patches
+    //
 
     if
     (
-        Pstream::parRun()
-     && Pstream::defaultCommsType == Pstream::commsTypes::scheduled
+        UPstream::parRun()
+     && UPstream::defaultCommsType == UPstream::commsTypes::scheduled
     )
     {
+        const label myProci = UPstream::myProcNo(comm);
+        const label nProcs = UPstream::nProcs(comm);
+
+        // Synchronized on all processors
+        const auto& procToProcs = topo.procAdjacency();
+
         // Determine the schedule for all processor patches.
         // Insert processor pair once to determine the schedule.
         // Each processor pair stands for both send and receive.
@@ -158,30 +141,28 @@ Foam::processorTopology Foam::processorTopology::New
             {
                 if (proci < nbrProci)
                 {
-                    comms.append(labelPair(proci, nbrProci));
+                    // Owner to neighbour connection
+                    comms.push_back(labelPair(proci, nbrProci));
                 }
             }
         }
 
         // Determine a schedule.
+
         labelList mySchedule
         (
-            commSchedule
-            (
-                nProcs,
-                comms
-            ).procSchedule()[myProci]
+            commSchedule(nProcs, comms).procSchedule()[myProci]
         );
 
         for (const label scheduleIndex : mySchedule)
         {
             // Get the other processor
-            label nbrProci = comms[scheduleIndex][0];
+            label nbrProci = comms[scheduleIndex].first();
             if (nbrProci == myProci)
             {
-                nbrProci = comms[scheduleIndex][1];
+                nbrProci = comms[scheduleIndex].second();
             }
-            const label patchi = procToPatch[nbrProci];
+            const label patchi = topo.procPatchLookup(nbrProci);
 
             if (myProci > nbrProci)
             {
@@ -199,26 +180,21 @@ Foam::processorTopology Foam::processorTopology::New
     {
         // Non-blocking schedule for processor patches
 
-        // initEvaluate
-        forAll(patches, patchi)
+        if (numProcPatches)
         {
-            if (isA<ProcPatch>(patches[patchi]))
+            forAll(patches, patchi)
             {
-                schedule[patchEvali++].setInitEvaluate(patchi);
-            }
-        }
-
-        // evaluate
-        forAll(patches, patchi)
-        {
-            if (isA<ProcPatch>(patches[patchi]))
-            {
-                schedule[patchEvali++].setEvaluate(patchi);
+                if (isA<ProcPatch>(patches[patchi]))
+                {
+                    schedule[patchEvali].setInitEvaluate(patchi);
+                    schedule[patchEvali + numProcPatches].setEvaluate(patchi);
+                    ++patchEvali;
+                }
             }
         }
     }
 
-    return procTopo;
+    return topo;
 }
 
 
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 28a8a56338..3cbc131223 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017, 2020 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -161,8 +161,7 @@ void Foam::Cloud<ParticleType>::move
     const labelList& procPatchNeighbours = pData.processorPatchNeighbours();
 
     // Which processors this processor is connected to
-    const labelList& neighbourProcs =
-        pData.topology().procNeighbours()[Pstream::myProcNo()];
+    const labelList& neighbourProcs = pData.topology().procNeighbours();
 
     // Initialise the stepFraction moved for the particles
     for (ParticleType& p : *this)

From ab4c5f25aca6ce98193618eccfba8ac2537ed22c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Feb 2023 09:35:44 +0100
Subject: [PATCH 049/348] ENH: add PstreamBuffers access routines for friend
 classes

- allows the possibility of using demand-driven internal buffers
  and/or different storage mechanisms.

  Changes:

    * old: sendBuf_[proci]    -> accessSendBuffer(proci)
    * old: recvBuf_[proci]    -> accessRecvBuffer(proci)
    * old: recvBufPos_[proci] -> accessRecvPosition(proci)

  only affects internals of UIPstreamBase and UOPstreamBase

BUG: reduceOr in PstreamBuffers uses world communicator

- should respect the value of the communicator defined within
  PstreamBuffers
---
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 138 +++++++++++-------
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |  55 ++++---
 .../db/IOstreams/Pstreams/UIPstreamBase.C     |   4 +-
 .../db/IOstreams/Pstreams/UOPstreamBase.C     |   2 +-
 4 files changed, 123 insertions(+), 76 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index cb8e6642c4..1e4dfe4bee 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,13 +44,13 @@ void Foam::PstreamBuffers::finalExchange
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
         // all-to-all
-        Pstream::exchangeSizes(sendBuf_, recvSizes, comm_);
+        Pstream::exchangeSizes(sendBuffers_, recvSizes, comm_);
 
         Pstream::exchange<DynamicList<char>, char>
         (
-            sendBuf_,
+            sendBuffers_,
             recvSizes,
-            recvBuf_,
+            recvBuffers_,
             tag_,
             comm_,
             wait
@@ -77,7 +77,7 @@ void Foam::PstreamBuffers::finalExchange
         (
             sendProcs,
             recvProcs,
-            sendBuf_,
+            sendBuffers_,
             recvSizes,
             tag_,
             comm_
@@ -85,9 +85,9 @@ void Foam::PstreamBuffers::finalExchange
 
         Pstream::exchange<DynamicList<char>, char>
         (
-            sendBuf_,
+            sendBuffers_,
             recvSizes,
-            recvBuf_,
+            recvBuffers_,
             tag_,
             comm_,
             wait
@@ -114,11 +114,12 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
         {
             // gather mode (all-to-one): master [0] <- everyone
 
-            recvSizes = UPstream::listGatherValues(sendBuf_[0].size(), comm_);
+            recvSizes =
+                UPstream::listGatherValues(sendBuffers_[0].size(), comm_);
 
             if (!UPstream::master(comm_))
             {
-                recvSizes.resize_nocopy(recvBuf_.size());
+                recvSizes.resize_nocopy(recvBuffers_.size());
                 recvSizes = Zero;
             }
         }
@@ -126,13 +127,13 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
         {
             // scatter mode (one-to-all): master [0] -> everyone
 
-            recvSizes.resize_nocopy(sendBuf_.size());
+            recvSizes.resize_nocopy(sendBuffers_.size());
 
             if (UPstream::master(comm_))
             {
-                forAll(sendBuf_, proci)
+                forAll(sendBuffers_, proci)
                 {
-                    recvSizes[proci] = sendBuf_[proci].size();
+                    recvSizes[proci] = sendBuffers_[proci].size();
                 }
             }
 
@@ -145,9 +146,9 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
 
         Pstream::exchange<DynamicList<char>, char>
         (
-            sendBuf_,
+            sendBuffers_,
             recvSizes,
-            recvBuf_,
+            recvBuffers_,
             tag_,
             comm_,
             wait
@@ -172,9 +173,9 @@ Foam::PstreamBuffers::PstreamBuffers
     commsType_(commsType),
     tag_(tag),
     comm_(comm),
-    sendBuf_(UPstream::nProcs(comm_)),
-    recvBuf_(UPstream::nProcs(comm_)),
-    recvBufPos_(UPstream::nProcs(comm_), Zero)
+    sendBuffers_(UPstream::nProcs(comm)),
+    recvBuffers_(UPstream::nProcs(comm)),
+    recvPositions_(UPstream::nProcs(comm), Zero)
 {}
 
 
@@ -192,9 +193,9 @@ Foam::PstreamBuffers::PstreamBuffers
     commsType_(commsType),
     tag_(tag),
     comm_(comm),
-    sendBuf_(UPstream::nProcs(comm_)),
-    recvBuf_(UPstream::nProcs(comm_)),
-    recvBufPos_(UPstream::nProcs(comm_), Zero)
+    sendBuffers_(UPstream::nProcs(comm)),
+    recvBuffers_(UPstream::nProcs(comm)),
+    recvPositions_(UPstream::nProcs(comm), Zero)
 {}
 
 
@@ -203,33 +204,61 @@ Foam::PstreamBuffers::PstreamBuffers
 Foam::PstreamBuffers::~PstreamBuffers()
 {
     // Check that all data has been consumed.
-    forAll(recvBufPos_, proci)
+    forAll(recvPositions_, proci)
     {
-        if (recvBufPos_[proci] < recvBuf_[proci].size())
+        const label pos = recvPositions_[proci];
+        const label len = recvBuffers_[proci].size();
+
+        if (pos < len)
         {
             FatalErrorInFunction
                 << "Message from processor " << proci
-                << " Only consumed " << recvBufPos_[proci] << " of "
-                << recvBuf_[proci].size() << " bytes" << nl
+                << " Only consumed " << pos << " of " << len << " bytes" << nl
                 << Foam::abort(FatalError);
         }
     }
 }
 
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::DynamicList<char>& Foam::PstreamBuffers::accessSendBuffer
+(
+    const label proci
+)
+{
+    return sendBuffers_[proci];
+}
+
+
+Foam::DynamicList<char>& Foam::PstreamBuffers::accessRecvBuffer
+(
+    const label proci
+)
+{
+    return recvBuffers_[proci];
+}
+
+
+Foam::label& Foam::PstreamBuffers::accessRecvPosition(const label proci)
+{
+    return recvPositions_[proci];
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::PstreamBuffers::clear()
 {
-    for (DynamicList<char>& buf : sendBuf_)
+    for (DynamicList<char>& buf : sendBuffers_)
     {
         buf.clear();
     }
-    for (DynamicList<char>& buf : recvBuf_)
+    for (DynamicList<char>& buf : recvBuffers_)
     {
         buf.clear();
     }
-    recvBufPos_ = 0;
+    recvPositions_ = 0;
 
     finishedSendsCalled_ = false;
 }
@@ -237,24 +266,24 @@ void Foam::PstreamBuffers::clear()
 
 void Foam::PstreamBuffers::clearRecv(const label proci)
 {
-    recvBuf_[proci].clear();
-    recvBufPos_[proci] = 0;
+    recvBuffers_[proci].clear();
+    recvPositions_[proci] = 0;
 }
 
 
 void Foam::PstreamBuffers::clearStorage()
 {
-    // Could also clear out entire sendBuf_, recvBuf_ and reallocate.
+    // Could also clear out entire sendBuffers_, recvBuffers_ and reallocate.
     // Not sure if it makes much difference
-    for (DynamicList<char>& buf : sendBuf_)
+    for (DynamicList<char>& buf : sendBuffers_)
     {
         buf.clearStorage();
     }
-    for (DynamicList<char>& buf : recvBuf_)
+    for (DynamicList<char>& buf : recvBuffers_)
     {
         buf.clearStorage();
     }
-    recvBufPos_ = 0;
+    recvPositions_ = 0;
 
     finishedSendsCalled_ = false;
 }
@@ -262,7 +291,7 @@ void Foam::PstreamBuffers::clearStorage()
 
 bool Foam::PstreamBuffers::hasSendData() const
 {
-    for (const DynamicList<char>& buf : sendBuf_)
+    for (const DynamicList<char>& buf : sendBuffers_)
     {
         if (!buf.empty())
         {
@@ -277,9 +306,9 @@ bool Foam::PstreamBuffers::hasRecvData() const
 {
     if (finishedSendsCalled_)
     {
-        forAll(recvBufPos_, proci)
+        forAll(recvPositions_, proci)
         {
-            if (recvBuf_[proci].size() > recvBufPos_[proci])
+            if (recvPositions_[proci] < recvBuffers_[proci].size())
             {
                 return true;
             }
@@ -299,7 +328,7 @@ bool Foam::PstreamBuffers::hasRecvData() const
 
 Foam::label Foam::PstreamBuffers::sendDataCount(const label proci) const
 {
-    return sendBuf_[proci].size();
+    return sendBuffers_[proci].size();
 }
 
 
@@ -307,7 +336,7 @@ Foam::label Foam::PstreamBuffers::recvDataCount(const label proci) const
 {
     if (finishedSendsCalled_)
     {
-        const label len(recvBuf_[proci].size() > recvBufPos_[proci]);
+        const label len(recvBuffers_[proci].size() - recvPositions_[proci]);
 
         if (len > 0)
         {
@@ -328,13 +357,13 @@ Foam::label Foam::PstreamBuffers::recvDataCount(const label proci) const
 
 Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 {
-    labelList counts(recvBuf_.size(), Zero);
+    labelList counts(recvPositions_.size(), Zero);
 
     if (finishedSendsCalled_)
     {
-        forAll(recvBufPos_, proci)
+        forAll(recvPositions_, proci)
         {
-            const label len(recvBuf_[proci].size() - recvBufPos_[proci]);
+            const label len(recvBuffers_[proci].size() - recvPositions_[proci]);
 
             if (len > 0)
             {
@@ -359,14 +388,15 @@ Foam::PstreamBuffers::peekRecvData(const label proci) const
 {
     if (finishedSendsCalled_)
     {
-        const label len(recvBuf_[proci].size() - recvBufPos_[proci]);
+        const label pos = recvPositions_[proci];
+        const label len = recvBuffers_[proci].size();
 
-        if (len > 0)
+        if (pos < len)
         {
             return UList<char>
             (
-                const_cast<char*>(&recvBuf_[proci][recvBufPos_[proci]]),
-                len
+                const_cast<char*>(recvBuffers_[proci].cdata()) + pos,
+                (len - pos)
             );
         }
     }
@@ -472,17 +502,17 @@ bool Foam::PstreamBuffers::finishedSends
 
     // Update send connections
     // - reasonable to assume there are no self-sends on UPstream::myProcNo
-    forAll(sendBuf_, proci)
+    forAll(sendBuffers_, proci)
     {
         // ie, sendDataCount(proci) != 0
-        if (sendConnections.set(proci, !sendBuf_[proci].empty()))
+        if (sendConnections.set(proci, !sendBuffers_[proci].empty()))
         {
             // The state changed
             changed = true;
         }
     }
 
-    UPstream::reduceOr(changed);
+    UPstream::reduceOr(changed, comm_);
 
     if (changed)
     {
@@ -490,12 +520,12 @@ bool Foam::PstreamBuffers::finishedSends
 
         // The send ranks
         sendProcs.clear();
-        forAll(sendBuf_, proci)
+        forAll(sendBuffers_, proci)
         {
             // ie, sendDataCount(proci) != 0
-            if (!sendBuf_[proci].empty())
+            if (!sendBuffers_[proci].empty())
             {
-                sendProcs.append(proci);
+                sendProcs.push_back(proci);
             }
         }
 
@@ -503,12 +533,12 @@ bool Foam::PstreamBuffers::finishedSends
 
         // The recv ranks
         recvProcs.clear();
-        forAll(recvBuf_, proci)
+        forAll(recvBuffers_, proci)
         {
             // ie, recvDataCount(proci)
-            if (!recvBuf_[proci].empty())
+            if (!recvBuffers_[proci].empty())
             {
-                recvProcs.append(proci);
+                recvProcs.push_back(proci);
             }
         }
     }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 44bfea19c6..b9f5b04b1b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -117,11 +117,6 @@ class bitSet;
 
 class PstreamBuffers
 {
-    // Friendship
-    friend class UOPstreamBase;  // Access to sendBuf_
-    friend class UIPstreamBase;  // Access to recvBuf_, recvBufPos_
-
-
     // Private Data
 
         //- Track if sends are complete
@@ -142,14 +137,20 @@ class PstreamBuffers
         //- Communicator
         const label comm_;
 
-        //- Send buffer. Size is nProcs()
-        List<DynamicList<char>> sendBuf_;
+        //  Number of ranks associated with PstreamBuffers
+        //  currently obtained from recvPositions_
 
-        //- Receive buffer. Size is nProcs()
-        List<DynamicList<char>> recvBuf_;
 
-        //- Current read positions within recvBuf_. Size is nProcs()
-        labelList recvBufPos_;
+    // Buffer storage
+
+        //- Send buffers. Size is nProcs()
+        List<DynamicList<char>> sendBuffers_;
+
+        //- Receive buffers. Size is nProcs()
+        List<DynamicList<char>> recvBuffers_;
+
+        //- Current read positions within recvBuffers_. Size is nProcs()
+        labelList recvPositions_;
 
 
     // Private Member Functions
@@ -173,6 +174,22 @@ class PstreamBuffers
         void finalExchangeGatherScatter(const bool isGather, const bool wait);
 
 
+    // Friendship Access
+
+        //- Access a send buffer for given proc (in range 0-nProcs)
+        DynamicList<char>& accessSendBuffer(const label proci);
+
+        //- Access a recv buffer for given proc (in range 0-nProcs).
+        DynamicList<char>& accessRecvBuffer(const label proci);
+
+        //- Access the recv position within recv buffer for given proc
+        //- (in range 0-nProcs).
+        label& accessRecvPosition(const label proci);
+
+        friend class UOPstreamBase;  // accessSendBuffer()
+        friend class UIPstreamBase;  // accessRecvBuffer(), accessRecvPosition()
+
+
 public:
 
     // Constructors
@@ -202,7 +219,7 @@ public:
 
     // Member Functions
 
-    // Access
+    // Attributes
 
         //- The associated buffer format (ascii | binary)
         IOstreamOption::streamFormat format() const noexcept
@@ -216,27 +233,27 @@ public:
             return commsType_;
         }
 
-        //- The transfer message type
+        //- The transfer message tag
         int tag() const noexcept
         {
             return tag_;
         }
 
-        //- Communicator
+        //- The communicator index
         label comm() const noexcept
         {
             return comm_;
         }
 
-
-    // Sizing
-
         //- Number of ranks associated with PstreamBuffers
         label nProcs() const noexcept
         {
-            return recvBufPos_.size();
+            return recvPositions_.size();
         }
 
+
+    // Sizing
+
         //- Range of ranks indices associated with PstreamBuffers
         UPstream::rangeType allProcs() const noexcept
         {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
index 21adb26831..228332528f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
@@ -180,8 +180,8 @@ Foam::UIPstreamBase::UIPstreamBase
     UPstream(buffers.commsType()),
     Istream(buffers.format()),
     fromProcNo_(fromProcNo),
-    recvBuf_(buffers.recvBuf_[fromProcNo]),
-    recvBufPos_(buffers.recvBufPos_[fromProcNo]),
+    recvBuf_(buffers.accessRecvBuffer(fromProcNo)),
+    recvBufPos_(buffers.accessRecvPosition(fromProcNo)),
     tag_(buffers.tag()),
     comm_(buffers.comm()),
     clearAtEnd_(buffers.allowClearRecv()),
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
index 631818b772..73d4c83939 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
@@ -160,7 +160,7 @@ Foam::UOPstreamBase::UOPstreamBase(const int toProcNo, PstreamBuffers& buffers)
     UPstream(buffers.commsType()),
     Ostream(buffers.format()),
     toProcNo_(toProcNo),
-    sendBuf_(buffers.sendBuf_[toProcNo]),
+    sendBuf_(buffers.accessSendBuffer(toProcNo)),
     tag_(buffers.tag()),
     comm_(buffers.comm()),
     sendAtDestruct_(buffers.commsType() != UPstream::commsTypes::nonBlocking)

From 068ab8ccc79772db3c63b2935c31913a3a726c2d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Feb 2023 10:06:39 +0100
Subject: [PATCH 050/348] ENH: add separate tracking of MPI_Comm_free,
 MPI_Group_free pending

- permits distinction between communicators/groups that were
  user-created (eg, MPI_Comm_create) versus those queried from MPI.
  Previously simply relied on non-null values, but that is too fragile

ENH: support List<Request> version of UPstream::finishedRequests

- allows more independent algorithms

ENH: added UPstream::probeMessage(...). Blocking or non-blocking
---
 applications/test/parallel-comm2/Make/options |   6 +-
 .../test/parallel-comm2/Test-parallel-comm2.C |  90 +++++++++-
 .../test/processorTopology/Make/options       |   6 +-
 .../Test-processorTopology.C                  | 136 +++++++++++++++
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  22 +--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  21 +++
 src/Pstream/dummy/UPstream.C                  |  13 ++
 src/Pstream/dummy/UPstreamRequest.C           |   4 +
 src/Pstream/mpi/PstreamGlobals.C              |   3 +
 src/Pstream/mpi/PstreamGlobals.H              |  15 +-
 src/Pstream/mpi/UPstream.C                    | 163 +++++++++++++++---
 src/Pstream/mpi/UPstreamRequest.C             |  90 ++++++++--
 12 files changed, 516 insertions(+), 53 deletions(-)

diff --git a/applications/test/parallel-comm2/Make/options b/applications/test/parallel-comm2/Make/options
index 18e6fe47af..b3a33caee1 100644
--- a/applications/test/parallel-comm2/Make/options
+++ b/applications/test/parallel-comm2/Make/options
@@ -1,2 +1,4 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+include $(GENERAL_RULES)/mpi-rules
+
+EXE_INC  = $(PFLAGS) $(PINC) $(c++LESSWARN)
+EXE_LIBS = $(PLIBS)
diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 934a480c20..a397c9908e 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,7 @@ Description
 #include "Tuple2.H"
 #include "IOstreams.H"
 #include "PstreamReduceOps.H"
+#include <mpi.h>
 
 using namespace Foam;
 
@@ -62,6 +63,8 @@ int main(int argc, char *argv[])
     argList::noBanner();
     argList::noCheckProcessorDirectories();
     argList::addBoolOption("verbose", "Set debug level");
+    argList::addBoolOption("comm-split", "Test simple comm split");
+    argList::addBoolOption("host-comm", "Test DIY host-comm split");
 
     // Capture manually. We need values before proper startup
     int nVerbose = 0;
@@ -139,6 +142,91 @@ int main(int argc, char *argv[])
     Pout<< endl;
     #endif
 
+    if (Pstream::parRun() && args.found("comm-split"))
+    {
+        MPI_Comm hostComm;
+        MPI_Comm_split_type
+        (
+            MPI_COMM_WORLD,
+            MPI_COMM_TYPE_SHARED,  // OMPI_COMM_TYPE_NODE
+            0, MPI_INFO_NULL, &hostComm
+        );
+
+        int host_nprocs = 0;
+        int host_rank = 0;
+        MPI_Comm_size(hostComm, &host_nprocs);
+        MPI_Comm_rank(hostComm, &host_rank);
+
+        Pout<< nl << "Host comm with "
+            << host_rank << " / " << host_nprocs
+            << " (using MPI_Comm_split_type)" << endl;
+
+        MPI_Comm_free(&hostComm);
+    }
+    if (Pstream::parRun() && args.found("host-comm"))
+    {
+        // Host communicator, based on the current worldComm
+        // Use hostname
+        // Lowest rank per hostname is the IO rank
+
+        label numprocs = UPstream::nProcs(UPstream::globalComm);
+
+        stringList hosts(numprocs);
+        hosts[Pstream::myProcNo(UPstream::globalComm)] = hostName();
+
+        labelList hostIDs_;
+
+        // Compact
+        if (Pstream::master(UPstream::globalComm))
+        {
+            DynamicList<word> hostNames(numprocs);
+            hostIDs_.resize_nocopy(numprocs);
+
+            forAll(hosts, proci)
+            {
+                const word& host = hosts[proci];
+
+                hostIDs_[proci] = hostNames.find(host);
+
+                if (hostIDs_[proci] == -1)
+                {
+                    hostIDs_[proci] = hostNames.size();
+                    hostNames.push_back(host);
+                }
+            }
+        }
+
+        Pstream::broadcasts(UPstream::globalComm, hostIDs_);
+
+        const label myHostId =
+            hostIDs_[Pstream::myProcNo(UPstream::globalComm)];
+
+        DynamicList<label> subRanks;
+        forAll(hostIDs_, proci)
+        {
+            if (hostIDs_[proci] == myHostId)
+            {
+                subRanks.push_back(proci);
+            }
+        }
+
+        // Allocate new communicator with globalComm as its parent
+        const label hostComm =
+            UPstream::allocateCommunicator
+            (
+                UPstream::globalComm,  // parent
+                subRanks,
+                true
+            );
+
+        Pout<< nl << "Host comm with "
+            << UPstream::myProcNo(hostComm)
+            << " / " << UPstream::nProcs(hostComm)
+            << nl;
+
+        UPstream::freeCommunicator(hostComm, true);
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/test/processorTopology/Make/options b/applications/test/processorTopology/Make/options
index 18e6fe47af..b3a33caee1 100644
--- a/applications/test/processorTopology/Make/options
+++ b/applications/test/processorTopology/Make/options
@@ -1,2 +1,4 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+include $(GENERAL_RULES)/mpi-rules
+
+EXE_INC  = $(PFLAGS) $(PINC) $(c++LESSWARN)
+EXE_LIBS = $(PLIBS)
diff --git a/applications/test/processorTopology/Test-processorTopology.C b/applications/test/processorTopology/Test-processorTopology.C
index a457a83365..0150221d86 100644
--- a/applications/test/processorTopology/Test-processorTopology.C
+++ b/applications/test/processorTopology/Test-processorTopology.C
@@ -33,6 +33,7 @@ Description
 #include "polyMesh.H"
 #include "globalMeshData.H"
 #include "OFstream.H"
+#include <mpi.h>
 
 using namespace Foam;
 
@@ -42,11 +43,25 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noFunctionObjects();
+    argList::addBoolOption("verbose", "Set debug level");
+    argList::addBoolOption("comm-graph", "Test simple graph communicator");
     argList::addNote
     (
         "Create graph of OpenFOAM mesh connections"
     );
 
+    // Capture manually. We need values before proper startup
+    int nVerbose = 0;
+    for (int argi = 1; argi < argc; ++argi)
+    {
+        if (strcmp(argv[argi], "-verbose") == 0)
+        {
+            ++nVerbose;
+        }
+    }
+
+    UPstream::debug = nVerbose;
+
     #include "setRootCase.H"
 
     if (!Pstream::parRun())
@@ -105,6 +120,127 @@ int main(int argc, char *argv[])
             << "Use neato, circo or fdp graphviz tools" << nl;
     }
 
+    if (Pstream::parRun() && args.found("comm-graph"))
+    {
+        Info<< nl;
+
+        // Local neighbours
+        const labelList& neighbours =
+            mesh.globalData().topology().procNeighbours();
+
+        Pout<< "Neigbours: " << flatOutput(neighbours) << endl;
+
+        // As integers values
+        List<int> connected(neighbours.size());
+        List<int> weights(neighbours.size());
+        forAll(neighbours, i)
+        {
+            connected[i] = neighbours[i];
+            weights[i] = 1;
+        }
+
+        MPI_Comm topoComm;
+
+        int mpiErrorCode =
+        MPI_Dist_graph_create_adjacent
+        (
+            MPI_COMM_WORLD,
+            // Connections into this rank
+            connected.size(), connected.cdata(), MPI_UNWEIGHTED,
+            // Connections out of this rank
+            connected.size(), connected.cdata(), MPI_UNWEIGHTED,
+            MPI_INFO_NULL,
+            0,   // no reordering (apparently broken anyhow)
+            &topoComm
+        );
+
+        if (mpiErrorCode)
+        {
+            FatalError
+                << "Failed to create topo communicator. Error:"
+                << mpiErrorCode << exit(FatalError);
+        }
+
+        int topo_rank = 0;
+        int topo_nprocs = 0;
+        int topo_inCount = 0;
+        int topo_outCount = 0;
+        int topo_isWeighted = 0;
+        MPI_Comm_rank(topoComm, &topo_rank);
+        MPI_Comm_size(topoComm, &topo_nprocs);
+
+        {
+            int topo_type = 0;
+            MPI_Topo_test(topoComm, &topo_type);
+
+            if (MPI_CART == topo_type)
+            {
+                Info<< "MPI topology : Cartesian" << endl;
+            }
+            else if (MPI_GRAPH == topo_type)
+            {
+                Info<< "MPI topology : Graph" << endl;
+            }
+            else if (MPI_DIST_GRAPH == topo_type)
+            {
+                Info<< "MPI topology : Distributed graph" << endl;
+            }
+            else
+            {
+                Info<< "MPI topology : None" << endl;
+            }
+        }
+
+        MPI_Dist_graph_neighbors_count
+        (
+            topoComm,
+            &topo_inCount,
+            &topo_outCount,
+            &topo_isWeighted
+        );
+
+        Pout<< "Topo comm with "
+            << topo_rank << " / " << topo_nprocs
+            << " from " << connected.size() << flatOutput(connected)
+            << " numNbr:" << topo_inCount
+            << nl;
+
+
+        List<int> myPatchIds(neighbours.size());
+        forAll(myPatchIds, i)
+        {
+            // Patches to neighbours
+            myPatchIds[i] =
+                mesh.globalData().topology().procPatchLookup(neighbours[i]);
+        }
+
+        List<int> nbrPatchIds(neighbours.size(), Zero);
+
+        mpiErrorCode = MPI_Neighbor_alltoall
+        (
+            myPatchIds.data(),
+            1,   // one element per neighbour
+            MPI_INT,
+            nbrPatchIds.data(),
+            1,   // one element per neighbour
+            MPI_INT,
+            topoComm
+        );
+
+        if (mpiErrorCode)
+        {
+            FatalError
+                << "MPI Error: " << mpiErrorCode << exit(FatalError);
+        }
+
+        Pout<< "proc neighbours:" << flatOutput(neighbours)
+            << " my patches:" << flatOutput(myPatchIds)
+            << " their patches:" << flatOutput(nbrPatchIds)
+            << endl;
+
+        MPI_Comm_free(&topoComm);
+    }
+
     Info<< nl << "End\n" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index d1be6447e6..0a177ce61b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -161,11 +161,11 @@ Foam::label Foam::UPstream::allocateCommunicator
         // Extend storage
         index = parentComm_.size();
 
-        myProcNo_.append(-1);
-        procIDs_.append(List<int>());
-        parentComm_.append(-1);
-        linearCommunication_.append(List<commsStruct>());
-        treeCommunication_.append(List<commsStruct>());
+        myProcNo_.push_back(-1);
+        procIDs_.emplace_back();
+        parentComm_.push_back(-1);
+        linearCommunication_.emplace_back();
+        treeCommunication_.emplace_back();
     }
 
     if (debug)
@@ -292,7 +292,7 @@ void Foam::UPstream::freeCommunicators(const bool doPstream)
 
 int Foam::UPstream::baseProcNo(label comm, int procID)
 {
-    while (parent(comm) >= 0 && procID >= 0)
+    while (UPstream::parent(comm) >= 0 && procID >= 0)
     {
         const auto& parentRanks = UPstream::procID(comm);
         procID = parentRanks[procID];
@@ -305,14 +305,14 @@ int Foam::UPstream::baseProcNo(label comm, int procID)
 
 Foam::label Foam::UPstream::procNo(const label comm, const int baseProcID)
 {
-    const auto& parentRanks = procID(comm);
-    label parentComm = parent(comm);
+    const auto& parentRanks = UPstream::procID(comm);
+    label parentComm = UPstream::parent(comm);
 
     int procID = baseProcID;
 
     if (parentComm >= 0)
     {
-        procID = procNo(parentComm, baseProcID);
+        procID = UPstream::procNo(parentComm, baseProcID);
     }
 
     return parentRanks.find(procID);
@@ -327,7 +327,7 @@ Foam::label Foam::UPstream::procNo
 )
 {
     label physProcID = UPstream::baseProcNo(currentComm, currentProcID);
-    return procNo(comm, physProcID);
+    return UPstream::procNo(comm, physProcID);
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index ed16d3a770..f509cde5bf 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -463,6 +463,23 @@ public:
             UPstream::Request* req = nullptr
         );
 
+        //- Probe for an incoming message.
+        //
+        //  \param commsType    Blocking or not
+        //  \param fromProcNo   The source rank (negative == ANY_SOURCE)
+        //  \param tag          The source message tag
+        //  \param communicator The communicator index
+        //
+        //  \returns source rank and message size (bytes)
+        //      and (-1, 0) on failure
+        static std::pair<int,int> probeMessage
+        (
+            const UPstream::commsTypes commsType,
+            const int fromProcNo,
+            const int tag = UPstream::msgType(),
+            const label communicator = worldComm
+        );
+
 
         // Non-blocking comms
 
@@ -504,6 +521,10 @@ public:
             //  or for a null-request
             static bool finishedRequest(UPstream::Request& req);
 
+            //- Non-blocking comms: have all requests finished?
+            //  A no-op and returns true if parRun() == false or list is empty
+            static bool finishedRequests(UList<UPstream::Request>& requests);
+
             static int allocateTag(const char* const msg = nullptr);
             static void freeTag(const int tag, const char* const msg = nullptr);
 
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 381d7d3c22..6eddc72490 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -98,4 +98,17 @@ void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
 {}
 
 
+std::pair<int,int>
+Foam::UPstream::probeMessage
+(
+    const UPstream::commsTypes commsType,
+    const int fromProcNo,
+    const int tag,
+    const label comm
+)
+{
+    return std::pair<int,int>(-1, 0);
+}
+
+
 // ************************************************************************* //
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index efd2427c14..89e719592c 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -61,6 +61,10 @@ void Foam::UPstream::waitRequest(UPstream::Request&) {}
 
 bool Foam::UPstream::finishedRequest(const label i) { return true; }
 bool Foam::UPstream::finishedRequest(UPstream::Request&) { return true; }
+bool Foam::UPstream::finishedRequests(UList<UPstream::Request>&)
+{
+    return true;
+}
 
 
 // ************************************************************************* //
diff --git a/src/Pstream/mpi/PstreamGlobals.C b/src/Pstream/mpi/PstreamGlobals.C
index 2d6e65aa10..de5634b906 100644
--- a/src/Pstream/mpi/PstreamGlobals.C
+++ b/src/Pstream/mpi/PstreamGlobals.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +30,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+Foam::DynamicList<unsigned> Foam::PstreamGlobals::pendingMPIFree_;
+
 Foam::DynamicList<MPI_Comm> Foam::PstreamGlobals::MPICommunicators_;
 Foam::DynamicList<MPI_Group> Foam::PstreamGlobals::MPIGroups_;
 
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index 859d0aa64b..a45bd1b858 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -49,11 +49,24 @@ namespace Foam
 namespace PstreamGlobals
 {
 
+//- Internal enumeration to track the state of MPI_Comm, MPI_Group allocation
+//  Handled as bitmasks
+enum allocationTypes : unsigned
+{
+    NonePending = 0u,   // No MPI free is pending
+    CommPending = 1u,   // MPI_Comm_free() is needed
+    GroupPending = 2u   // MPI_Group_free() is needed
+};
+
+// Track if MPI_Comm_free and/or MPI_Group_free are pending for
+// each communicator index (indexes into MPICommunicators_, MPIGroups_)
+extern DynamicList<unsigned> pendingMPIFree_;
+
 // Current communicators, which may be allocated or predefined
 // (eg, MPI_COMM_SELF, MPI_COMM_WORLD)
 extern DynamicList<MPI_Comm> MPICommunicators_;
 
-// Groups associated with the currrent communicators.
+// Groups used to create communicators
 extern DynamicList<MPI_Group> MPIGroups_;
 
 //- Outstanding non-blocking operations.
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index cfb0c2ebdc..005707be61 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -37,6 +37,7 @@ License
 #include <cstring>
 #include <cstdlib>
 #include <csignal>
+#include <numeric>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -502,15 +503,17 @@ void Foam::UPstream::allocatePstreamCommunicator
     const label index
 )
 {
-    if (index == PstreamGlobals::MPIGroups_.size())
+    if (index == PstreamGlobals::MPICommunicators_.size())
     {
-        // Extend storage with dummy values
-        MPI_Comm newComm = MPI_COMM_NULL;
-        MPI_Group newGroup = MPI_GROUP_NULL;
-        PstreamGlobals::MPIGroups_.push_back(newGroup);
-        PstreamGlobals::MPICommunicators_.push_back(newComm);
+        // Extend storage with null values
+
+        PstreamGlobals::
+            pendingMPIFree_.emplace_back(PstreamGlobals::NonePending);
+
+        PstreamGlobals::MPICommunicators_.emplace_back(MPI_COMM_NULL);
+        PstreamGlobals::MPIGroups_.emplace_back(MPI_GROUP_NULL);
     }
-    else if (index > PstreamGlobals::MPIGroups_.size())
+    else if (index > PstreamGlobals::MPICommunicators_.size())
     {
         FatalErrorInFunction
             << "PstreamGlobals out of sync with UPstream data. Problem."
@@ -530,27 +533,40 @@ void Foam::UPstream::allocatePstreamCommunicator
                 << Foam::exit(FatalError);
         }
 
+        PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_WORLD;
-        MPI_Comm_group(MPI_COMM_WORLD, &PstreamGlobals::MPIGroups_[index]);
-        MPI_Comm_rank(MPI_COMM_WORLD, &myProcNo_[index]);
+        PstreamGlobals::MPIGroups_[index] = MPI_GROUP_NULL;
+
+        // TBD: MPI_Comm_dup(MPI_COMM_WORLD, ...);
+        // with pendingMPIFree_[index] = CommPending ...
+        // Note: freePstreamCommunicator may need an update
+
+        MPI_Comm_rank
+        (
+            PstreamGlobals::MPICommunicators_[index],
+           &myProcNo_[index]
+        );
 
         // Set the number of ranks to the actual number
         int numProcs;
-        MPI_Comm_size(MPI_COMM_WORLD, &numProcs);
+        MPI_Comm_size
+        (
+            PstreamGlobals::MPICommunicators_[index],
+           &numProcs
+        );
 
-        //procIDs_[index] = identity(numProcs);
+        // identity [0-numProcs], as 'int'
         procIDs_[index].resize_nocopy(numProcs);
-        forAll(procIDs_[index], i)
-        {
-            procIDs_[index][i] = i;
-        }
+        std::iota(procIDs_[index].begin(), procIDs_[index].end(), 0);
     }
     else if (parentIndex == -2)
     {
         // Self communicator
 
+        PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_SELF;
-        MPI_Comm_group(MPI_COMM_SELF, &PstreamGlobals::MPIGroups_[index]);
+        PstreamGlobals::MPIGroups_[index] = MPI_GROUP_NULL;
+
         MPI_Comm_rank(MPI_COMM_SELF, &myProcNo_[index]);
 
         // Number of ranks is always 1 (self communicator)
@@ -573,6 +589,11 @@ void Foam::UPstream::allocatePstreamCommunicator
     }
     else
     {
+        // General sub-communicator
+
+        PstreamGlobals::pendingMPIFree_[index]
+            = (PstreamGlobals::CommPending | PstreamGlobals::GroupPending);
+
         // Create new group
         MPI_Group_incl
         (
@@ -603,7 +624,10 @@ void Foam::UPstream::allocatePstreamCommunicator
 
         if (PstreamGlobals::MPICommunicators_[index] == MPI_COMM_NULL)
         {
+            // No communicator created, group only
             myProcNo_[index] = -1;
+            PstreamGlobals::
+                pendingMPIFree_[index] = PstreamGlobals::GroupPending;
         }
         else
         {
@@ -629,30 +653,48 @@ void Foam::UPstream::allocatePstreamCommunicator
 }
 
 
-void Foam::UPstream::freePstreamCommunicator(const label communicator)
+void Foam::UPstream::freePstreamCommunicator(const label index)
 {
     // Skip placeholders and pre-defined (not allocated) communicators
 
     if (UPstream::debug)
     {
-        Pout<< "freePstreamCommunicator: " << communicator
+        Pout<< "freePstreamCommunicator: " << index
             << " from " << PstreamGlobals::MPICommunicators_.size() << endl;
     }
 
     // Not touching the first two communicators (SELF, WORLD)
-    if (communicator > 1)
+    if (index > 1)
     {
-        if (MPI_COMM_NULL != PstreamGlobals::MPICommunicators_[communicator])
+        if
+        (
+            (MPI_COMM_NULL != PstreamGlobals::MPICommunicators_[index])
+         &&
+            (
+                PstreamGlobals::pendingMPIFree_[index]
+              & PstreamGlobals::CommPending
+            )
+        )
         {
             // Free communicator. Sets communicator to MPI_COMM_NULL
-            MPI_Comm_free(&PstreamGlobals::MPICommunicators_[communicator]);
+            MPI_Comm_free(&PstreamGlobals::MPICommunicators_[index]);
         }
 
-        if (MPI_GROUP_NULL != PstreamGlobals::MPIGroups_[communicator])
+        if
+        (
+            (MPI_GROUP_NULL != PstreamGlobals::MPIGroups_[index])
+         &&
+            (
+                PstreamGlobals::pendingMPIFree_[index]
+              & PstreamGlobals::GroupPending
+            )
+        )
         {
             // Free group. Sets group to MPI_GROUP_NULL
-            MPI_Group_free(&PstreamGlobals::MPIGroups_[communicator]);
+            MPI_Group_free(&PstreamGlobals::MPIGroups_[index]);
         }
+
+        PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
     }
 }
 
@@ -705,6 +747,7 @@ void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
     {
         MPI_Request request;
 
+        // Non-blocking
         if
         (
             MPI_Ibarrier
@@ -723,6 +766,7 @@ void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
     }
     else
     {
+        // Blocking
         if
         (
             MPI_Barrier
@@ -739,4 +783,77 @@ void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
 }
 
 
+std::pair<int,int>
+Foam::UPstream::probeMessage
+(
+    const UPstream::commsTypes commsType,
+    const int fromProcNo,
+    const int tag,
+    const label comm
+)
+{
+    std::pair<int,int> result(-1, 0);
+
+    if (!UPstream::parRun())
+    {
+        return result;
+    }
+
+    const int source = (fromProcNo < 0) ? MPI_ANY_SOURCE : fromProcNo;
+    // Supporting MPI_ANY_TAG is not particularly useful...
+
+    int flag = 0;
+    MPI_Status status;
+
+    if (UPstream::commsTypes::blocking == commsType)
+    {
+        // Blocking
+        if
+        (
+            MPI_Probe
+            (
+                source,
+                tag,
+                PstreamGlobals::MPICommunicators_[comm],
+                &status
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Probe returned with error"
+                << Foam::abort(FatalError);
+        }
+        flag = 1;
+    }
+    else
+    {
+        // Non-blocking
+        if
+        (
+            MPI_Iprobe
+            (
+                source,
+                tag,
+                PstreamGlobals::MPICommunicators_[comm],
+                &flag,
+                &status
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Iprobe returned with error"
+                << Foam::abort(FatalError);
+        }
+    }
+
+    if (flag)
+    {
+        result.first = status.MPI_SOURCE;
+        MPI_Get_count(&status, MPI_BYTE, &result.second);
+    }
+
+    return result;
+}
+
+
 // ************************************************************************* //
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index d3f6884f96..ae978a057a 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -138,21 +138,24 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 
     for (auto& req : requests)
     {
-        if (req.good())
+        MPI_Request request = PstreamDetail::Request::get(req);
+
+        if (MPI_REQUEST_NULL != request)
         {
-            waitRequests[count] = PstreamDetail::Request::get(req);
+            waitRequests[count] = request;
             ++count;
         }
     }
 
     if (!count)
     {
+        // Early exit: non-NULL requests found
         return;
     }
 
     profilingPstream::beginTiming();
 
-    // On success: sets request to MPI_REQUEST_NULL
+    // On success: sets each request to MPI_REQUEST_NULL
     if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
     {
         FatalErrorInFunction
@@ -163,10 +166,7 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
     profilingPstream::addWaitTime();
 
     // Everything handled, reset all to MPI_REQUEST_NULL
-    for (auto& req : requests)
-    {
-        req.reset();
-    }
+    requests = UPstream::Request(MPI_REQUEST_NULL);
 }
 
 
@@ -190,14 +190,16 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 ///     waitRequests[count] = PstreamDetail::Request::get(req1);
 ///     if (MPI_REQUEST_NULL != waitRequests[count])
 ///     {
-///         req1.reset();
+///         // Flag in advance as being handled
+///         req1 = UPstream::Request(MPI_REQUEST_NULL);
 ///         ++count;
 ///     }
 ///
 ///     waitRequests[count] = PstreamDetail::Request::get(req2);
 ///     if (MPI_REQUEST_NULL != waitRequests[count])
 ///     {
-///         req2.reset();
+///         // Flag in advance as being handled
+///         req2 = UPstream::Request(MPI_REQUEST_NULL);
 ///         ++count;
 ///     }
 ///
@@ -208,7 +210,7 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 ///
 ///     profilingPstream::beginTiming();
 ///
-///     // On success: sets request to MPI_REQUEST_NULL
+///     // On success: sets each request to MPI_REQUEST_NULL
 ///     if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
 ///     {
 ///         FatalErrorInFunction
@@ -297,7 +299,8 @@ void Foam::UPstream::waitRequest(UPstream::Request& req)
 
     profilingPstream::addWaitTime();
 
-    req.reset();  // Handled, reset to MPI_REQUEST_NULL
+    // Handled, reset to MPI_REQUEST_NULL
+    req = UPstream::Request(MPI_REQUEST_NULL);
 }
 
 
@@ -363,8 +366,69 @@ bool Foam::UPstream::finishedRequest(UPstream::Request& req)
 
     if (flag)
     {
-        // Done - reset to MPI_REQUEST_NULL
-        req.reset();
+        // Success: reset request to MPI_REQUEST_NULL
+        req = UPstream::Request(MPI_REQUEST_NULL);
+    }
+
+    return flag != 0;
+}
+
+
+bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
+{
+    // No-op for non-parallel or no pending requests
+    if (!UPstream::parRun() || requests.empty())
+    {
+        return true;
+    }
+
+    // Looks ugly but is legitimate since UPstream::Request is an intptr_t,
+    // which is always large enough to hold an MPI_Request (int or pointer)
+
+    label count = 0;
+    auto* waitRequests = reinterpret_cast<MPI_Request*>(requests.data());
+
+    for (auto& req : requests)
+    {
+        MPI_Request request = PstreamDetail::Request::get(req);
+
+        if (MPI_REQUEST_NULL != request)
+        {
+            waitRequests[count] = request;
+            ++count;
+        }
+    }
+
+    if (!count)
+    {
+        // Early exit: non-NULL requests found
+        return true;
+    }
+
+    // On success: sets each request to MPI_REQUEST_NULL
+    // On failure: no request is modified
+    int flag = 0;
+    MPI_Testall(count, waitRequests, &flag, MPI_STATUSES_IGNORE);
+
+    if (flag)
+    {
+        // Success: reset all requests to MPI_REQUEST_NULL
+        requests = UPstream::Request(MPI_REQUEST_NULL);
+    }
+    else
+    {
+        // Not all done. Recover wrapped representation but in reverse order
+        // since sizeof(MPI_Request) can be smaller than
+        // sizeof(UPstream::Request::value_type)
+        // eg, mpich has MPI_Request as 'int'
+        //
+        // This is uglier that we'd like, but much better than allocating
+        // and freeing a scratch buffer each time we query things.
+
+        while (--count >= 0)
+        {
+            requests[count] = UPstream::Request(waitRequests[count]);
+        }
     }
 
     return flag != 0;

From df61104ef5afa4c1ad457782e0c4c9bf123904eb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Feb 2023 09:31:23 +0100
Subject: [PATCH 051/348] ENH: add Pstream non-blocking consensus exchange
 infrastructure

- can be beneficial with increasing number of ranks
---
 etc/controlDict                               |   3 +
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |  78 +++-
 .../db/IOstreams/Pstreams/PstreamBuffers.C    |  26 ++
 .../IOstreams/Pstreams/PstreamCombineGather.C |   2 +-
 .../db/IOstreams/Pstreams/PstreamExchange.C   | 154 +++++--
 .../Pstreams/PstreamExchangeConsensus.C       | 338 +++++++++++++++
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  36 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  94 +++-
 src/OpenFOAM/global/argList/argList.C         |   5 +-
 src/Pstream/dummy/UPstreamAllToAll.C          |  35 +-
 src/Pstream/mpi/UPstreamAllToAll.C            |  42 +-
 src/Pstream/mpi/UPstreamWrapping.H            |  24 ++
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 402 +++++++++++++++++-
 13 files changed, 1167 insertions(+), 72 deletions(-)
 create mode 100644 src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C

diff --git a/etc/controlDict b/etc/controlDict
index cd6746fc9e..ea88edf7d7 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -127,7 +127,10 @@ OptimisationSwitches
     // Default communication type (nonBlocking | scheduled | blocking);
     commsType       nonBlocking;
     floatTransfer   0;
+    // Number processors to change to tree communication
     nProcsSimpleSum 0;
+    // Min numProc to use non-blocking exchange algorithm (Hoeffler: NBX)
+    nonBlockingExchange 0;
 
     // MPI buffer size (bytes)
     // Can override with the MPI_BUFFER_SIZE env variable.
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index d4fd86c480..5440849e71 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,6 +36,7 @@ SourceFiles
     PstreamGather.C
     PstreamCombineGather.C
     PstreamGatherList.C
+    PstreamExchangeConsensus.C
     PstreamExchange.C
 
 \*---------------------------------------------------------------------------*/
@@ -64,8 +65,11 @@ class Pstream
 {
    // Private Static Functions
 
-        //- Exchange contiguous data. Sends sendBufs, receives into recvBufs.
+        //- Exchange \em contiguous data.
+        //- Sends sendBufs, receives into recvBufs.
         //  Data provided and received as container.
+        //
+        // No internal guards or resizing.
         template<class Container, class T>
         static void exchangeContainer
         (
@@ -77,8 +81,11 @@ class Pstream
             const bool wait               //!< Wait for requests to complete
         );
 
-        //- Exchange contiguous data. Sends sendBufs, receives into recvBufs.
+        //- Exchange \em contiguous data.
+        //- Sends sendBufs, receives into recvBufs.
         //  Data provided and received as pointers.
+        //
+        // No internal guards or resizing.
         template<class T>
         static void exchangeBuf
         (
@@ -133,6 +140,7 @@ public:
 
         //- Broadcast content (contiguous or non-contiguous)
         //- to all processes in communicator.
+        //  For \b non-parallel : do nothing.
         template<class Type>
         static void broadcast
         (
@@ -141,6 +149,7 @@ public:
         );
 
         //- Broadcast multiple items to all processes in communicator.
+        //  For \b non-parallel : do nothing.
         template<class Type, class... Args>
         static void broadcasts(const label comm, Type& arg1, Args&&... args);
 
@@ -513,6 +522,8 @@ public:
             //- Helper: exchange sizes of sendData.
             //- The sendData is the data per processor (in the communicator).
             //  Returns sizes of sendData on the sending processor.
+            //  \n
+            //  For \b non-parallel : copy sizes from sendData directly.
             template<class Container>
             static void exchangeSizes
             (
@@ -522,10 +533,10 @@ public:
             );
 
 
-            //- Helper: exchange contiguous data.
+            //- Helper: exchange \em contiguous data.
             //- Sends sendData, receives into recvData.
             //  If wait=true will wait for all transfers to finish.
-            template<class Container, class T>
+            template<class Container, class Type>
             static void exchange
             (
                 const UList<Container>& sendData,
@@ -536,11 +547,11 @@ public:
                 const bool wait = true  //!< Wait for requests to complete
             );
 
-            //- Exchange contiguous data.
+            //- Exchange \em contiguous data.
             //- Sends sendData, receives into recvData.
             //- Determines sizes to receive.
             //  If wait=true will wait for all transfers to finish.
-            template<class Container, class T>
+            template<class Container, class Type>
             static void exchange
             (
                 const UList<Container>& sendData,
@@ -549,6 +560,58 @@ public:
                 const label comm = UPstream::worldComm,
                 const bool wait = true  //!< Wait for requests to complete
             );
+
+
+    // Non-blocking exchange
+
+        //- Determine the exchange sizes of sendBufs (sparse map).
+        //- Only populates sizes for sendBufs with non-zero sizes.
+        //
+        //  For \b non-parallel : copy size of rank (if it exists and non-empty)
+        //  from sendBufs to recvSizes.
+        //
+        //  \note The message tag is adjusted internally to improve uniqueness
+        template<class Container>
+        static void exchangeSizes
+        (
+            const Map<Container>& sendBufs,
+            Map<label>& recvSizes,
+            const label tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
+        );
+
+        //- Exchange \em contiguous data using non-blocking consensus
+        //- Sends sendData, receives into recvData.
+        //
+        //  For \b non-parallel : copy own rank from sendBufs to recvBufs.
+        //
+        //  \note The message tag should be chosen to be a unique value
+        //  since the implementation uses probing with ANY_SOURCE !!
+        template<class Container, class Type>
+        static void exchangeConsensus
+        (
+            const UList<Container>& sendBufs,
+            List<Container>& recvBufs,
+            const int tag,
+            const label comm
+        );
+
+        //- Exchange \em contiguous data using non-blocking consensus
+        //- Sends sendData, receives into recvData.
+        //
+        //  For \b non-parallel : copy own rank (if it exists and non-empty)
+        //  from sendBufs to recvBufs.
+        //
+        //  \note The message tag should be chosen to be a unique value
+        //  since the implementation uses probing with ANY_SOURCE !!
+        template<class Container, class Type>
+        static void exchangeConsensus
+        (
+            const Map<Container>& sendBufs,
+            Map<Container>& recvBufs,
+            const int tag,
+            const label comm
+        );
 };
 
 
@@ -563,6 +626,7 @@ public:
     #include "PstreamGather.C"
     #include "PstreamCombineGather.C"
     #include "PstreamGatherList.C"
+    #include "PstreamExchangeConsensus.C"
     #include "PstreamExchange.C"
 #endif
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index 1e4dfe4bee..880ec1cd6e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -43,6 +43,32 @@ void Foam::PstreamBuffers::finalExchange
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
+        if
+        (
+            wait
+         && UPstream::parRun()
+         && UPstream::nProcsNonblockingExchange > 1
+         && UPstream::nProcsNonblockingExchange <= nProcs()
+        )
+        {
+            Pstream::exchangeConsensus<DynamicList<char>, char>
+            (
+                sendBuffers_,
+                recvBuffers_,
+                (tag_ + 314159),  // some unique tag?
+                comm_
+            );
+
+            // Copy back out
+            recvSizes.resize_nocopy(recvBuffers_.size());
+            forAll(recvBuffers_, proci)
+            {
+                recvSizes[proci] = recvBuffers_[proci].size();
+            }
+
+            return;
+        }
+
         // all-to-all
         Pstream::exchangeSizes(sendBuffers_, recvSizes, comm_);
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C
index 8449a67f2b..8460e33a73 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C
@@ -597,7 +597,7 @@ void Foam::Pstream::mapCombineGather
             {
                 auto masterIter = values.find(recvIter.key());
 
-                if (masterIter != values.end())  // == found()
+                if (masterIter.good())
                 {
                     // Combine with existing
                     cop(masterIter.val(), recvIter.val());
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index 26c592c6f5..0dcf8f3811 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -35,7 +35,7 @@ Description
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Container, class T>
+template<class Container, class Type>
 void Foam::Pstream::exchangeContainer
 (
     const UList<Container>& sendBufs,
@@ -60,7 +60,7 @@ void Foam::Pstream::exchangeContainer
                 UPstream::commsTypes::nonBlocking,
                 proci,
                 recvBufs[proci].data_bytes(),
-                recvSizes[proci]*sizeof(T),
+                recvSizes[proci]*sizeof(Type),
                 tag,
                 comm
             );
@@ -108,7 +108,7 @@ void Foam::Pstream::exchangeContainer
 }
 
 
-template<class T>
+template<class Type>
 void Foam::Pstream::exchangeBuf
 (
     const labelUList& sendSizes,
@@ -134,7 +134,7 @@ void Foam::Pstream::exchangeBuf
                 UPstream::commsTypes::nonBlocking,
                 proci,
                 recvBufs[proci],
-                recvSizes[proci]*sizeof(T),
+                recvSizes[proci]*sizeof(Type),
                 tag,
                 comm
             );
@@ -156,7 +156,7 @@ void Foam::Pstream::exchangeBuf
                     UPstream::commsTypes::nonBlocking,
                     proci,
                     sendBufs[proci],
-                    sendSizes[proci]*sizeof(T),
+                    sendSizes[proci]*sizeof(Type),
                     tag,
                     comm
                 )
@@ -165,7 +165,7 @@ void Foam::Pstream::exchangeBuf
                 FatalErrorInFunction
                     << "Cannot send outgoing message. "
                     << "to:" << proci << " nBytes:"
-                    << label(sendSizes[proci]*sizeof(T))
+                    << label(sendSizes[proci]*sizeof(Type))
                     << Foam::abort(FatalError);
             }
         }
@@ -182,7 +182,7 @@ void Foam::Pstream::exchangeBuf
 }
 
 
-template<class Container, class T>
+template<class Container, class Type>
 void Foam::Pstream::exchange
 (
     const UList<Container>& sendBufs,
@@ -193,12 +193,13 @@ void Foam::Pstream::exchange
     const bool wait
 )
 {
-    // OR  static_assert(is_contiguous<T>::value, "Contiguous data only!")
-    if (!is_contiguous<T>::value)
-    {
-        FatalErrorInFunction
-            << "Contiguous data only." << sizeof(T) << Foam::abort(FatalError);
-    }
+    static_assert(is_contiguous<Type>::value, "Contiguous data only!");
+    // if (!is_contiguous<Type>::value)
+    // {
+    //     FatalErrorInFunction
+    //         << "Contiguous data only: "
+    //         << sizeof(Type) << Foam::abort(FatalError);
+    // }
 
     if (sendBufs.size() != UPstream::nProcs(comm))
     {
@@ -227,7 +228,7 @@ void Foam::Pstream::exchange
         if (UPstream::maxCommsSize <= 0)
         {
             // Do the exchanging in one go
-            exchangeContainer<Container, T>
+            exchangeContainer<Container, Type>
             (
                 sendBufs,
                 recvSizes,
@@ -257,7 +258,7 @@ void Foam::Pstream::exchange
                 max
                 (
                     static_cast<label>(1),
-                    static_cast<label>(UPstream::maxCommsSize/sizeof(T))
+                    static_cast<label>(UPstream::maxCommsSize/sizeof(Type))
                 )
             );
 
@@ -324,11 +325,11 @@ void Foam::Pstream::exchange
                     );
                 }
 
-                /// Info<< "iter " << iter
-                ///     << ": beg=" << flatOutput(startSend)
-                ///     << " len=" << flatOutput(nSend) << endl;
+                // Info<< "iter " << iter
+                //     << ": beg=" << flatOutput(startSend)
+                //     << " len=" << flatOutput(nSend) << endl;
 
-                exchangeBuf<T>
+                exchangeBuf<Type>
                 (
                     nSend,
                     charPtrSend,
@@ -414,20 +415,49 @@ void Foam::Pstream::exchangeSizes
 }
 
 
-/// FUTURE?
-///
-/// template<class Container>
-/// void Foam::Pstream::exchangeSizes
-/// (
-///     const labelUList& neighProcs,
-///     const Container& sendBufs,
-///     labelList& recvSizes,
-///     const label tag,
-///     const label comm
-/// )
-/// {
-///     exchangeSizes<Container>(neighProcs, neighProcs, sendBufs, tag, comm);
-/// }
+// FUTURE?
+// template<class Container>
+// void Foam::Pstream::exchangeSizes
+// (
+//     const labelUList& neighProcs,
+//     const Container& sendBufs,
+//     labelList& recvSizes,
+//     const label tag,
+//     const label comm
+// );
+
+
+// Sparse sending
+template<class Container>
+void Foam::Pstream::exchangeSizes
+(
+    const Map<Container>& sendBufs,
+    Map<label>& recvSizes,
+    const label tag,
+    const label comm
+)
+{
+    Map<label> sendSizes(2*sendBufs.size());
+
+    forAllConstIters(sendBufs, iter)
+    {
+        const label proci = iter.key();
+        const label count = iter.val().size();
+
+        if (count)
+        {
+            sendSizes.emplace(proci, count);
+        }
+    }
+
+    UPstream::allToAllConsensus
+    (
+        sendSizes,
+        recvSizes,
+        (tag + 314159),  // some unique tag?
+        comm
+    );
+}
 
 
 template<class Container>
@@ -438,26 +468,46 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
-    if (sendBufs.size() != UPstream::nProcs(comm))
+    const label numProcs = UPstream::nProcs(comm);
+
+    if (sendBufs.size() != numProcs)
     {
         FatalErrorInFunction
             << "Size of container " << sendBufs.size()
-            << " does not equal the number of processors "
-            << UPstream::nProcs(comm)
+            << " does not equal the number of processors " << numProcs
             << Foam::abort(FatalError);
     }
 
-    labelList sendSizes(sendBufs.size());
+    labelList sendSizes(numProcs);
     forAll(sendBufs, proci)
     {
         sendSizes[proci] = sendBufs[proci].size();
     }
     recvSizes.resize_nocopy(sendSizes.size());
+
+    if
+    (
+        UPstream::nProcsNonblockingExchange > 1
+     && UPstream::nProcsNonblockingExchange <= numProcs
+    )
+    {
+        // Use algorithm NBX: Nonblocking Consensus Exchange
+
+        UPstream::allToAllConsensus
+        (
+            sendSizes,
+            recvSizes,
+            (UPstream::msgType() + 314159),  // some unique tag?
+            comm
+        );
+        return;
+    }
+
     UPstream::allToAll(sendSizes, recvSizes, comm);
 }
 
 
-template<class Container, class T>
+template<class Container, class Type>
 void Foam::Pstream::exchange
 (
     const UList<Container>& sendBufs,
@@ -467,10 +517,36 @@ void Foam::Pstream::exchange
     const bool wait
 )
 {
+    if
+    (
+        wait
+     && UPstream::parRun()
+     && UPstream::nProcsNonblockingExchange > 1
+     && UPstream::nProcsNonblockingExchange <= UPstream::nProcs(comm)
+    )
+    {
+        // Use algorithm NBX: Nonblocking Consensus Exchange
+
+        Pstream::exchangeConsensus<Container, Type>
+        (
+            sendBufs,
+            recvBufs,
+            (tag + 314159),  // some unique tag?
+            comm
+        );
+        return;
+    }
+
+    // Algorithm PEX: Personalized Exchange
+    // - Step 1: each process writes the data sizes to each peer and
+    //   redistributes the vector (eg, MPI_Alltoall)
+    // - Step 2: size receive buffers and setup receives for all
+    //   non-zero sendcounts. Post all sends and wait.
+
     labelList recvSizes;
     exchangeSizes(sendBufs, recvSizes, comm);
 
-    exchange<Container, T>(sendBufs, recvSizes, recvBufs, tag, comm, wait);
+    exchange<Container, Type>(sendBufs, recvSizes, recvBufs, tag, comm, wait);
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
new file mode 100644
index 0000000000..dae6043e8e
--- /dev/null
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
@@ -0,0 +1,338 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Note
+    The algorithm NBX (Nonblocking consensus exchange) is described by
+
+    "Scalable Communication Protocols for Dynamic Sparse Data Exchange",
+    Hoeffler, Siebert, Lumsdaine
+    May 2010 ACM SIGPLAN Notices 45(5):159-168
+    https://doi.org/10.1145/1837853.1693476
+
+    http://unixer.de/publications/img/hoefler-dsde-protocols.pdf
+
+\*---------------------------------------------------------------------------*/
+
+#include "Pstream.H"
+#include "contiguous.H"
+#include "PstreamReduceOps.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Container, class Type>
+void Foam::Pstream::exchangeConsensus
+(
+    const UList<Container>& sendBufs,
+    List<Container>& recvBufs,
+    const int tag,
+    const label comm
+)
+{
+    static_assert(is_contiguous<Type>::value, "Contiguous data only!");
+    // if (!is_contiguous<Type>::value)
+    // {
+    //     FatalErrorInFunction
+    //         << "Contiguous data only." << sizeof(Type)
+    //         << Foam::abort(FatalError);
+    // }
+
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProc = UPstream::nProcs(comm);
+
+    if (sendBufs.size() != numProc)
+    {
+        FatalErrorInFunction
+            << "Size of list " << sendBufs.size()
+            << " does not equal the number of processors " << numProc
+            << Foam::abort(FatalError);
+    }
+
+    recvBufs.resize_nocopy(sendBufs.size());
+
+    if (!UPstream::parRun() || numProc < 2)
+    {
+        // Do myself
+        recvBufs[myProci] = sendBufs[myProci];
+        return;
+    }
+
+    for (auto& buf : recvBufs)
+    {
+        buf.clear();
+    }
+
+    // This largely follows PstreamDetail::allToAllConsensus
+    // but more MPI wrapping used here.
+
+    DynamicList<UPstream::Request> requests(sendBufs.size());
+
+    //// profilingPstream::beginTiming();
+
+    // If there are synchronisation problems,
+    // a beginning barrier can help, but should not be necessary
+    // if the unique message tags are being used.
+
+    //// UPstream::barrier(comm);
+
+
+    // Start nonblocking synchronous send to process dest
+    for (label proci = 0; proci < numProc; ++proci)
+    {
+        const auto& sendData = sendBufs[proci];
+
+        if (sendData.empty())
+        {
+            // Do not send/recv empty data
+        }
+        else if (proci == myProci)
+        {
+            // Do myself
+            recvBufs[proci] = sendBufs[proci];
+        }
+        else
+        {
+            // Has data to send
+
+            UOPstream::write
+            (
+                requests.emplace_back(),
+                proci,
+                sendData.cdata_bytes(),
+                sendData.size_bytes(),
+                tag,
+                comm,
+                UPstream::sendModes::sync
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    UPstream::Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        std::pair<int, int> probed =
+            UPstream::probeMessage
+            (
+                UPstream::commsTypes::nonBlocking,
+                -1,  // ANY_SOURCE
+                tag,
+                comm
+            );
+
+        if (probed.second > 0)
+        {
+            // Message found and had size.
+            // - receive into dest buffer location
+
+            const label proci = probed.first;
+            const label nRecv = (probed.second / sizeof(Type));
+
+            auto& recvData = recvBufs[proci];
+            recvData.resize_nocopy(nRecv);
+
+            UIPstream::read
+            (
+                UPstream::commsTypes::scheduled,
+                proci,
+                recvData.data_bytes(),
+                recvData.size_bytes(),
+                tag,
+                comm
+            );
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            // - all received, or nothing to receive
+            if (UPstream::finishedRequest(barrierReq))
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            if (UPstream::finishedRequests(requests))
+            {
+                UPstream::barrier(comm, &barrierReq);
+                barrier_active = true;
+            }
+        }
+    }
+
+    //// profilingPstream::addAllToAllTime();
+}
+
+
+template<class Container, class Type>
+void Foam::Pstream::exchangeConsensus
+(
+    const Map<Container>& sendBufs,
+    Map<Container>& recvBufs,
+    const int tag,
+    const label comm
+)
+{
+    static_assert(is_contiguous<Type>::value, "Contiguous data only!");
+    // if (!is_contiguous<Type>::value)
+    // {
+    //     FatalErrorInFunction
+    //         << "Contiguous data only." << sizeof(Type)
+    //         << Foam::abort(FatalError);
+    // }
+
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProc = UPstream::nProcs(comm);
+
+    recvBufs.clear();
+
+    if (!UPstream::parRun() || numProc < 2)
+    {
+        // Do myself
+        const auto iter = sendBufs.find(myProci);
+        if (iter.found())
+        {
+            const auto& sendData = iter.val();
+
+            if (!sendData.empty())
+            {
+                // Do myself
+                recvBufs.emplace(iter.key(), sendData);
+            }
+        }
+        return;
+    }
+
+
+    // The NBX algorithm but packed into Map (HashTable) containers
+
+    DynamicList<UPstream::Request> requests(sendBufs.size());
+
+    //// profilingPstream::beginTiming();
+
+    // Beginning barrier (optional)
+    UPstream::barrier(comm);
+
+    // Start nonblocking synchronous send to process dest
+
+    // Same as forAllConstIters()
+    const auto endIter = sendBufs.cend();
+    for (auto iter = sendBufs.cbegin(); iter != endIter; ++iter)
+    {
+        const label proci = iter.key();
+        const auto& sendData = iter.val();
+
+        if (sendData.empty())
+        {
+            // Do not send/recv empty data
+        }
+        else if (proci == myProci)
+        {
+            // Do myself
+            recvBufs.emplace(proci, sendData);
+        }
+        else
+        {
+            // Has data to send
+
+            UOPstream::write
+            (
+                requests.emplace_back(),
+                proci,
+                sendData.cdata_bytes(),
+                sendData.size_bytes(),
+                tag,
+                comm,
+                UPstream::sendModes::sync
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    UPstream::Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        std::pair<int, int> probed =
+            UPstream::probeMessage
+            (
+                UPstream::commsTypes::nonBlocking,
+                -1,  // ANY_SOURCE
+                tag,
+                comm
+            );
+
+        if (probed.second > 0)
+        {
+            // Message found and had size.
+            // - receive into dest buffer location
+
+            const label proci = probed.first;
+            const label nRecv = (probed.second / sizeof(Type));
+
+            auto& recvData = recvBufs(proci);
+            recvData.resize_nocopy(nRecv);
+
+            UIPstream::read
+            (
+                UPstream::commsTypes::scheduled,
+                proci,
+                recvData.data_bytes(),
+                recvData.size_bytes(),
+                tag,
+                comm
+            );
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            if (UPstream::finishedRequest(barrierReq))
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            if (UPstream::finishedRequests(requests))
+            {
+                UPstream::barrier(comm, &barrierReq);
+                barrier_active = true;
+            }
+        }
+    }
+
+    //// profilingPstream::addAllToAllTime();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 0a177ce61b..e3cf730d71 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -510,6 +510,30 @@ registerOptSwitch
     Foam::UPstream::nProcsSimpleSum
 );
 
+int Foam::UPstream::nProcsNonblockingExchange
+(
+    Foam::debug::optimisationSwitch("nonBlockingExchange", 0)
+);
+registerOptSwitch
+(
+    "nonBlockingExchange",
+    int,
+    Foam::UPstream::nProcsNonblockingExchange
+);
+
+
+int Foam::UPstream::nPollProcInterfaces
+(
+    Foam::debug::optimisationSwitch("nPollProcInterfaces", 0)
+);
+registerOptSwitch
+(
+    "nPollProcInterfaces",
+    int,
+    Foam::UPstream::nPollProcInterfaces
+);
+
+
 Foam::UPstream::commsTypes Foam::UPstream::defaultCommsType
 (
     commsTypeNames.get
@@ -553,18 +577,6 @@ namespace Foam
 }
 //! \endcond
 
-int Foam::UPstream::nPollProcInterfaces
-(
-    Foam::debug::optimisationSwitch("nPollProcInterfaces", 0)
-);
-registerOptSwitch
-(
-    "nPollProcInterfaces",
-    int,
-    Foam::UPstream::nPollProcInterfaces
-);
-
-
 int Foam::UPstream::maxCommsSize
 (
     Foam::debug::optimisationSwitch("maxCommsSize", 0)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index f509cde5bf..dbc8b6ebfd 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -55,6 +55,8 @@ namespace Foam
 //- Implementation details for UPstream/Pstream/MPI etc.
 namespace PstreamDetail {}
 
+// Forward Declarations
+template<class T> class Map;
 
 /*---------------------------------------------------------------------------*\
                           Class UPstream Declaration
@@ -279,12 +281,16 @@ public:
         //- Number of processors to change from linear to tree communication
         static int nProcsSimpleSum;
 
-        //- Default commsType
-        static commsTypes defaultCommsType;
+        //- Number of processors to change to nonBlocking consensual
+        //- exchange (NBX). Ignored for zero or negative values.
+        static int nProcsNonblockingExchange;
 
         //- Number of polling cycles in processor updates
         static int nPollProcInterfaces;
 
+        //- Default commsType
+        static commsTypes defaultCommsType;
+
         //- Optional maximum message size (bytes)
         static int maxCommsSize;
 
@@ -705,6 +711,8 @@ public:
         //- Exchange integer data with all processors (in the communicator).
         //  \c sendData[proci] is the value to send to proci.
         //  After return recvData contains the data from the other processors.
+        //  \n
+        //  For \b non-parallel : does a simple copy of sendData to recvData
         static void allToAll
         (
             const UList<int32_t>& sendData,
@@ -715,6 +723,8 @@ public:
         //- Exchange integer data with all processors (in the communicator).
         //  \c sendData[proci] is the value to send to proci.
         //  After return recvData contains the data from the other processors.
+        //  \n
+        //  For \b non-parallel : does a simple copy of sendData to recvData
         static void allToAll
         (
             const UList<int64_t>& sendData,
@@ -722,6 +732,76 @@ public:
             const label communicator = worldComm
         );
 
+        //- Exchange integer data with all processors (in the communicator)
+        //- using non-blocking consensus exchange
+        //  \c sendData[proci] is the value to send to proci.
+        //  After return recvData contains the data from the other processors.
+        //  \n
+        //  For \b non-parallel : does a simple copy of sendData to recvData
+        //
+        //  \note The message tag should be chosen to be a unique value
+        //  since the implementation uses probing with ANY_SOURCE !!
+        static void allToAllConsensus
+        (
+            const UList<int32_t>& sendData,
+            UList<int32_t>& recvData,
+            const int tag,
+            const label communicator = worldComm
+        );
+
+        //- Exchange integer data with all processors (in the communicator)
+        //- using non-blocking consensus exchange
+        //  \c sendData[proci] is the value to send to proci.
+        //  After return recvData contains the data from the other processors.
+        //  \n
+        //  For \b non-parallel : does a simple copy of sendData to recvData
+        //
+        //  \note The message tag should be chosen to be a unique value
+        //  since the implementation uses probing with ANY_SOURCE !!
+        static void allToAllConsensus
+        (
+            const UList<int64_t>& sendData,
+            UList<int64_t>& recvData,
+            const int tag,
+            const label communicator = worldComm
+        );
+
+        //- Exchange integer data with all processors (in the communicator)
+        //- using non-blocking consensus exchange
+        //  \c sendData[proci] is the value to send to proci.
+        //  After return recvData contains the data from the other processors.
+        //  \n
+        //  For \b non-parallel : copy own rank (if it exists and non-zero)
+        //  from sendData to recvData.
+        //
+        //  \note The message tag should be chosen to be a unique value
+        //  since the implementation uses probing with ANY_SOURCE !!
+        static void allToAllConsensus
+        (
+            const Map<int32_t>& sendData,
+            Map<int32_t>& recvData,
+            const int tag,
+            const label communicator = worldComm
+        );
+
+        //- Exchange integer data with all processors (in the communicator)
+        //- using non-blocking consensus exchange
+        //  \c sendData[proci] is the value to send to proci.
+        //  After return recvData contains the data from the other processors.
+        //  \n
+        //  For \b non-parallel : copy own rank (if it exists and non-zero)
+        //  from sendData to recvData.
+        //
+        //  \note The message tag should be chosen to be a unique value
+        //  since the implementation uses probing with ANY_SOURCE !!
+        static void allToAllConsensus
+        (
+            const Map<int64_t>& sendData,
+            Map<int64_t>& recvData,
+            const int tag,
+            const label communicator = worldComm
+        );
+
 
     // Low-level gather/scatter routines
 
@@ -791,7 +871,8 @@ public:
 
         //- Gather individual values into list locations.
         //  On master list length == nProcs, otherwise zero length.
-        //  If called in non-parallel mode,
+        //  \n
+        //  For \b non-parallel :
         //  the returned list length is 1 with localValue.
         template<class T>
         static List<T> listGatherValues
@@ -802,7 +883,8 @@ public:
 
         //- Scatter individual values from list locations.
         //  On master input list length == nProcs, ignored on other procs.
-        //  If called in non-parallel mode,
+        //  \n
+        //  For \b non-parallel :
         //  returns the first list element (or zero).
         template<class T>
         static T listScatterValues
@@ -816,6 +898,7 @@ public:
 
         //- Broadcast buffer contents to all processes in communicator.
         //- The sizes must match on all processes.
+        //  For \b non-parallel : do nothing.
         //  \return True on success
         static bool broadcast
         (
@@ -829,6 +912,7 @@ public:
     // Logical reductions
 
         //- Logical (and) reduction (cf. MPI AllReduce)
+        //  For \b non-parallel : do nothing
         static void reduceAnd
         (
             bool& value,
@@ -836,6 +920,7 @@ public:
         );
 
         //- Logical (or) reduction (cf. MPI AllReduce)
+        //  For \b non-parallel : do nothing
         static void reduceOr
         (
             bool& value,
@@ -873,7 +958,6 @@ public:
 
 //- An opaque wrapper for MPI_Request with a vendor-independent
 //- representation independent of any \c <mpi.h> header
-//
 //  The MPI standard states that MPI_Request is always an opaque object.
 //  Generally it is either an integer (eg, mpich) or a pointer (eg, openmpi).
 class UPstream::Request
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index c5a52d07ee..a0f2576ed1 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1715,8 +1715,11 @@ void Foam::argList::parse
                 }
             }
             Info<< "Pstream initialized with:" << nl
-                << "    floatTransfer      : " << Pstream::floatTransfer << nl
+                << "    floatTransfer      : "
+                << Switch::name(Pstream::floatTransfer) << nl
                 << "    nProcsSimpleSum    : " << Pstream::nProcsSimpleSum << nl
+                << "    nonBlockingExchange: "
+                << Pstream::nProcsNonblockingExchange << nl
                 << "    commsType          : "
                 << Pstream::commsTypeNames[Pstream::defaultCommsType] << nl
                 << "    polling iterations : " << Pstream::nPollProcInterfaces
diff --git a/src/Pstream/dummy/UPstreamAllToAll.C b/src/Pstream/dummy/UPstreamAllToAll.C
index 6983ae418d..134808104f 100644
--- a/src/Pstream/dummy/UPstreamAllToAll.C
+++ b/src/Pstream/dummy/UPstreamAllToAll.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "UPstream.H"
+#include "Map.H"
 
 #include <cinttypes>
 #include <cstring>  // memmove
@@ -40,9 +41,41 @@ void Foam::UPstream::allToAll                                                 \
     UList<Native>& recvData,                                                  \
     const label comm                                                          \
 )                                                                             \
+{                                                                             \
+    recvData.deepCopy(sendData);                                              \
+}
+
+
+Pstream_CommonRoutines(int32_t);
+Pstream_CommonRoutines(int64_t);
+
+#undef Pstream_CommonRoutines
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#undef  Pstream_CommonRoutines
+#define Pstream_CommonRoutines(Native)                                        \
+void Foam::UPstream::allToAllConsensus                                        \
+(                                                                             \
+    const UList<Native>& sendData,                                            \
+    UList<Native>& recvData,                                                  \
+    const int tag,                                                            \
+    const label comm                                                          \
+)                                                                             \
 {                                                                             \
     recvData.deepCopy(sendData);                                              \
 }                                                                             \
+void Foam::UPstream::allToAllConsensus                                        \
+(                                                                             \
+    const Map<Native>& sendData,                                              \
+    Map<Native>& recvData,                                                    \
+    const int tag,                                                            \
+    const label comm                                                          \
+)                                                                             \
+{                                                                             \
+    recvData = sendData;                                                      \
+}
 
 
 Pstream_CommonRoutines(int32_t);
diff --git a/src/Pstream/mpi/UPstreamAllToAll.C b/src/Pstream/mpi/UPstreamAllToAll.C
index 8bc5b5ebac..e9c4414781 100644
--- a/src/Pstream/mpi/UPstreamAllToAll.C
+++ b/src/Pstream/mpi/UPstreamAllToAll.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "Pstream.H"
+#include "Map.H"
 #include "UPstreamWrapping.H"
 
 #include <cinttypes>
@@ -45,7 +46,46 @@ void Foam::UPstream::allToAll                                                 \
     (                                                                         \
         sendData, recvData, TaggedType, comm                                  \
     );                                                                        \
+}
+
+
+Pstream_CommonRoutines(int32_t, MPI_INT32_T);
+Pstream_CommonRoutines(int64_t, MPI_INT64_T);
+
+#undef Pstream_CommonRoutines
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#undef  Pstream_CommonRoutines
+#define Pstream_CommonRoutines(Native, TaggedType)                            \
+void Foam::UPstream::allToAllConsensus                                        \
+(                                                                             \
+    const UList<Native>& sendData,                                            \
+    UList<Native>& recvData,                                                  \
+    const int tag,                                                            \
+    const label comm                                                          \
+)                                                                             \
+{                                                                             \
+    PstreamDetail::allToAllConsensus                                          \
+    (                                                                         \
+        sendData, recvData, TaggedType, tag, comm                             \
+    );                                                                        \
 }                                                                             \
+                                                                              \
+void Foam::UPstream::allToAllConsensus                                        \
+(                                                                             \
+    const Map<Native>& sendData,                                              \
+    Map<Native>& recvData,                                                    \
+    const int tag,                                                            \
+    const label comm                                                          \
+)                                                                             \
+{                                                                             \
+    PstreamDetail::allToAllConsensus                                          \
+    (                                                                         \
+        sendData, recvData, TaggedType, tag, comm                             \
+    );                                                                        \
+}
 
 
 Pstream_CommonRoutines(int32_t, MPI_INT32_T);
diff --git a/src/Pstream/mpi/UPstreamWrapping.H b/src/Pstream/mpi/UPstreamWrapping.H
index 355bf3bf86..125da4defd 100644
--- a/src/Pstream/mpi/UPstreamWrapping.H
+++ b/src/Pstream/mpi/UPstreamWrapping.H
@@ -136,6 +136,30 @@ void allToAllv
 );
 
 
+// Non-blocking consensual integer (size) exchange
+template<class Type>
+void allToAllConsensus
+(
+    const UList<Type>& sendData,
+    UList<Type>& recvData,
+    MPI_Datatype datatype,
+    const int tag,                      // Message tag
+    const label comm                    // Communicator
+);
+
+
+// Non-blocking consensual integer (size) exchange
+template<class Type>
+void allToAllConsensus
+(
+    const Map<Type>& sendData,
+    Map<Type>& recvData,
+    MPI_Datatype datatype,
+    const int tag,                      // Message tag
+    const label comm                    // Communicator
+);
+
+
 // MPI_Gather or MPI_Igather
 template<class Type>
 void gather
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 109e6b7f45..765f8b7048 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -29,6 +29,7 @@ License
 #include "UPstreamWrapping.H"
 #include "profilingPstream.H"
 #include "PstreamGlobals.H"
+#include "Map.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
@@ -126,6 +127,9 @@ void Foam::PstreamDetail::allReduce
 {
     if (!UPstream::parRun())
     {
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -159,6 +163,7 @@ void Foam::PstreamDetail::allReduce
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;
@@ -239,7 +244,7 @@ void Foam::PstreamDetail::allToAll
 {
     const bool immediate = (req || requestID);
 
-    const label np = UPstream::nProcs(comm);
+    const label numProc = UPstream::nProcs(comm);
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
@@ -251,7 +256,7 @@ void Foam::PstreamDetail::allToAll
         {
             Pout<< "** MPI_Alltoall (blocking):";
         }
-        Pout<< " np:" << np
+        Pout<< " numProc:" << numProc
             << " sendData:" << sendData.size()
             << " with comm:" << comm
             << " warnComm:" << UPstream::warnComm
@@ -259,18 +264,22 @@ void Foam::PstreamDetail::allToAll
         error::printStack(Pout);
     }
 
-    if (sendData.size() != np || recvData.size() != np)
+    if (sendData.size() != numProc || recvData.size() != numProc)
     {
         FatalErrorInFunction
-            << "Have " << np << " ranks, but size of sendData:"
+            << "Have " << numProc << " ranks, but size of sendData:"
             << sendData.size() << " or recvData:" << recvData.size()
             << " is different!"
             << Foam::abort(FatalError);
     }
 
-    if (!UPstream::parRun())
+    if (!UPstream::parRun() || numProc < 2)
     {
         recvData.deepCopy(sendData);
+
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -279,6 +288,7 @@ void Foam::PstreamDetail::allToAll
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;
@@ -421,6 +431,10 @@ void Foam::PstreamDetail::allToAllv
             (sendData + sendOffsets[0]),
             recvCounts[0]*sizeof(Type)
         );
+
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -429,6 +443,7 @@ void Foam::PstreamDetail::allToAllv
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;
@@ -503,6 +518,363 @@ void Foam::PstreamDetail::allToAllv
 }
 
 
+template<class Type>
+void Foam::PstreamDetail::allToAllConsensus
+(
+    const UList<Type>& sendData,
+    UList<Type>& recvData,
+    MPI_Datatype datatype,
+    const int tag,
+    const label comm
+)
+{
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProc = UPstream::nProcs(comm);
+
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    {
+        Pout<< "** non-blocking consensus Alltoall:";
+        Pout<< " numProc:" << numProc
+            << " sendData:" << sendData.size()
+            << " with comm:" << comm
+            << " warnComm:" << UPstream::warnComm
+            << endl;
+        error::printStack(Pout);
+    }
+
+    if (sendData.size() != numProc || recvData.size() != numProc)
+    {
+        FatalErrorInFunction
+            << "Have " << numProc << " ranks, but size of sendData:"
+            << sendData.size() << " or recvData:" << recvData.size()
+            << " is different!"
+            << Foam::abort(FatalError);
+    }
+
+    const Type zeroValue = pTraits<Type>::zero;
+
+    if (!UPstream::parRun() || numProc < 2)
+    {
+        // deep copy
+        recvData.deepCopy(sendData);
+        return;
+    }
+
+    // Implementation description
+    // --------------------------
+    // "Scalable Communication Protocols for Dynamic Sparse Data Exchange",
+    // Hoeffler, Siebert, Lumsdaine
+    // May 2010 ACM SIGPLAN Notices 45(5):159-168
+    // https://doi.org/10.1145/1837853.1693476
+    //
+    // - http://unixer.de/publications/img/hoefler-dsde-protocols.pdf
+    //
+    // Algorithm NBX: Nonblocking consensus
+
+    // This specific specialization is largely just for integer data
+    // so we initialise the receiving data with zero and then
+    // do not send/recv them.
+    // This is because we are dealing with a flat list of entries to
+    // send and not a sparse Map etc.
+
+    recvData = zeroValue;
+
+    DynamicList<MPI_Request> requests(sendData.size());
+
+    profilingPstream::beginTiming();
+
+    // If there are synchronisation problems,
+    // a beginning barrier can help, but should not be necessary
+    // if the unique message tags are being used.
+
+    //// MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
+
+    // Start nonblocking synchronous send to process dest
+    for (label proci = 0; proci < numProc; ++proci)
+    {
+        if (sendData[proci] == zeroValue)
+        {
+            // Do not send/recv empty data
+        }
+        else if (proci == myProci)
+        {
+            // Do myself
+            recvData[proci] = sendData[proci];
+        }
+        else
+        {
+            // Has data to send
+
+            MPI_Issend
+            (
+               &sendData[proci],
+                1,              // one element per rank
+                datatype,
+                proci,
+                tag,
+                PstreamGlobals::MPICommunicators_[comm],
+               &requests.emplace_back()
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    MPI_Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        int flag = 0;
+        MPI_Status status;
+
+        MPI_Iprobe
+        (
+            MPI_ANY_SOURCE,
+            tag,
+            PstreamGlobals::MPICommunicators_[comm],
+           &flag,
+           &status
+        );
+
+        if (flag)
+        {
+            // Message found, receive into dest buffer location
+            const label proci = status.MPI_SOURCE;
+
+            int count = 0;
+            MPI_Get_count(&status, datatype, &count);
+
+            if (count != 1)
+            {
+                FatalErrorInFunction
+                    << "Incorrect message size. Expected 1 but had "
+                    << count << nl
+                    << exit(FatalError);
+            }
+
+            MPI_Recv
+            (
+               &recvData[proci],
+                count,          // count=1 (see above)
+                datatype,
+                proci,
+                tag,
+                PstreamGlobals::MPICommunicators_[comm],
+                MPI_STATUS_IGNORE
+            );
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            // - all received, or nothing to receive
+            MPI_Test(&barrierReq, &flag, MPI_STATUS_IGNORE);
+
+            if (flag)
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            MPI_Testall
+            (
+                requests.size(), requests.data(),
+                &flag, MPI_STATUSES_IGNORE
+            );
+
+            if (flag)
+            {
+                MPI_Ibarrier
+                (
+                    PstreamGlobals::MPICommunicators_[comm],
+                   &barrierReq
+                );
+                barrier_active = true;
+            }
+        }
+    }
+
+    profilingPstream::addAllToAllTime();
+}
+
+
+template<class Type>
+void Foam::PstreamDetail::allToAllConsensus
+(
+    const Map<Type>& sendBufs,
+    Map<Type>& recvBufs,
+    MPI_Datatype datatype,
+    const int tag,
+    const label comm
+)
+{
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProc = UPstream::nProcs(comm);
+
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    {
+        Pout<< "** non-blocking consensus Alltoall:";
+        Pout<< " numProc:" << numProc
+            << " sendData:" << sendBufs.size()
+            << " with comm:" << comm
+            << " warnComm:" << UPstream::warnComm
+            << endl;
+        error::printStack(Pout);
+    }
+
+    recvBufs.clear();
+
+    const Type zeroValue = pTraits<Type>::zero;
+
+    if (!UPstream::parRun() || numProc < 2)
+    {
+        // Do myself
+        const auto iter = sendBufs.find(myProci);
+        if (iter.found() && (iter.val() != zeroValue))
+        {
+            recvBufs.emplace(iter.key(), iter.val());
+        }
+        return;
+    }
+
+
+    // Algorithm NBX: Nonblocking consensus
+    // Implementation like above, but sending map data.
+
+    DynamicList<MPI_Request> requests(sendBufs.size());
+
+    profilingPstream::beginTiming();
+
+    // If there are synchronisation problems,
+    // a beginning barrier can help, but should not be necessary
+    // if the unique message tags are being used.
+
+    //// MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
+
+    // Start nonblocking synchronous send to process dest
+
+    // Same as forAllConstIters()
+    const auto endIter = sendBufs.cend();
+    for (auto iter = sendBufs.cbegin(); iter != endIter; ++iter)
+    {
+        const label proci = iter.key();
+        const auto& sendData = iter.val();
+
+        if (sendData == zeroValue)
+        {
+            // Do not send/recv empty/zero data
+        }
+        else if (proci == myProci)
+        {
+            // Do myself
+            recvBufs.emplace(proci, sendData);
+        }
+        else
+        {
+            // Has data to send
+
+            MPI_Issend
+            (
+               &sendData,
+                1,              // one element per rank
+                datatype,
+                proci,
+                tag,
+                PstreamGlobals::MPICommunicators_[comm],
+               &requests.emplace_back()
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    MPI_Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        int flag = 0;
+        MPI_Status status;
+
+        MPI_Iprobe
+        (
+            MPI_ANY_SOURCE,
+            tag,
+            PstreamGlobals::MPICommunicators_[comm],
+           &flag,
+           &status
+        );
+
+        if (flag)
+        {
+            // Message found, receive into dest buffer location
+
+            const label proci = status.MPI_SOURCE;
+            int count = 0;
+
+            MPI_Get_count(&status, datatype, &count);
+
+            if (count != 1)
+            {
+                FatalErrorInFunction
+                    << "Incorrect message size. Expected 1 but had "
+                    << count << nl
+                    << exit(FatalError);
+            }
+
+            auto& recvData = recvBufs(proci);
+
+            MPI_Recv
+            (
+                &recvData,
+                count,          // count=1 (see above)
+                datatype,
+                proci,
+                tag,
+                PstreamGlobals::MPICommunicators_[comm],
+                MPI_STATUS_IGNORE
+            );
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            // - all received, or nothing to receive
+            MPI_Test(&barrierReq, &flag, MPI_STATUS_IGNORE);
+
+            if (flag)
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            MPI_Testall
+            (
+                requests.size(), requests.data(),
+                &flag, MPI_STATUSES_IGNORE
+            );
+
+            if (flag)
+            {
+                MPI_Ibarrier
+                (
+                    PstreamGlobals::MPICommunicators_[comm],
+                   &barrierReq
+                );
+                barrier_active = true;
+            }
+        }
+    }
+
+    profilingPstream::addAllToAllTime();
+}
+
+
 template<class Type>
 void Foam::PstreamDetail::gather
 (
@@ -522,6 +894,10 @@ void Foam::PstreamDetail::gather
     if (!UPstream::parRun())
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
+
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -552,6 +928,7 @@ void Foam::PstreamDetail::gather
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;
@@ -643,6 +1020,10 @@ void Foam::PstreamDetail::scatter
     if (!UPstream::parRun())
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
+
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -673,6 +1054,7 @@ void Foam::PstreamDetail::scatter
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;
@@ -766,6 +1148,10 @@ void Foam::PstreamDetail::gatherv
     {
         // recvCounts[0] may be invalid - use sendCount instead
         std::memmove(recvData, sendData, sendCount*sizeof(Type));
+
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -819,6 +1205,7 @@ void Foam::PstreamDetail::gatherv
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;
@@ -913,6 +1300,10 @@ void Foam::PstreamDetail::scatterv
     if (!UPstream::parRun())
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
+
+        // No requests generated
+        if (req) req->reset();
+        if (requestID) *requestID = -1;
         return;
     }
 
@@ -960,6 +1351,7 @@ void Foam::PstreamDetail::scatterv
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
         handled = true;

From 4ec75d538f1dfc1d478837cc4ec9237aaf2f9ad7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 8 Feb 2023 09:44:49 +0100
Subject: [PATCH 052/348] ENH: clear Map entries, but not Map itself for NBX
 exchange

- clearing the receive 'slots' is preferrable to clearing out the map
  itself since this can potentially preserve allocated space (eg
  DynamicList entries) between calls.

BUG: remove stray MPI barrier in exchange code
---
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  | 14 +++++-
 .../db/IOstreams/Pstreams/PstreamExchange.C   |  1 +
 .../Pstreams/PstreamExchangeConsensus.C       | 48 +++++++++++--------
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 40 ++++++++++------
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 24 +++++-----
 5 files changed, 81 insertions(+), 46 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 5440849e71..4a293d80bf 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -564,8 +564,13 @@ public:
 
     // Non-blocking exchange
 
-        //- Determine the exchange sizes of sendBufs (sparse map).
-        //- Only populates sizes for sendBufs with non-zero sizes.
+        //- Exchange the \b non-zero sizes of sendBufs entries (sparse map)
+        //- with all ranks in the communicator
+        //- using non-blocking consensus exchange.
+        //
+        //  Since the recvData map always cleared before receipt and sizes
+        //  of zero are never transmitted, a simple check
+        //  of its keys is sufficient to determine connectivity.
         //
         //  For \b non-parallel : copy size of rank (if it exists and non-empty)
         //  from sendBufs to recvSizes.
@@ -583,6 +588,7 @@ public:
         //- Exchange \em contiguous data using non-blocking consensus
         //- Sends sendData, receives into recvData.
         //
+        //  Each entry of the recvBufs list is cleared before receipt.
         //  For \b non-parallel : copy own rank from sendBufs to recvBufs.
         //
         //  \note The message tag should be chosen to be a unique value
@@ -599,6 +605,10 @@ public:
         //- Exchange \em contiguous data using non-blocking consensus
         //- Sends sendData, receives into recvData.
         //
+        //  Each \em entry of the recvBufs map is cleared before receipt,
+        //  but the map itself if not cleared. This allows the map to preserve
+        //  allocated space (eg DynamicList entries) between calls.
+        //
         //  For \b non-parallel : copy own rank (if it exists and non-empty)
         //  from sendBufs to recvBufs.
         //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index 0dcf8f3811..5e4aa2130f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -438,6 +438,7 @@ void Foam::Pstream::exchangeSizes
 )
 {
     Map<label> sendSizes(2*sendBufs.size());
+    recvSizes.clear();  // Done in allToAllConsensus too, but be explicit here
 
     forAllConstIters(sendBufs, iter)
     {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
index dae6043e8e..0cf30fd437 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
@@ -69,8 +69,14 @@ void Foam::Pstream::exchangeConsensus
             << Foam::abort(FatalError);
     }
 
+    // Initial: resize and clear everything
     recvBufs.resize_nocopy(sendBufs.size());
 
+    for (auto& buf : recvBufs)
+    {
+        buf.clear();
+    }
+
     if (!UPstream::parRun() || numProc < 2)
     {
         // Do myself
@@ -78,11 +84,6 @@ void Foam::Pstream::exchangeConsensus
         return;
     }
 
-    for (auto& buf : recvBufs)
-    {
-        buf.clear();
-    }
-
     // This largely follows PstreamDetail::allToAllConsensus
     // but more MPI wrapping used here.
 
@@ -92,7 +93,7 @@ void Foam::Pstream::exchangeConsensus
 
     // If there are synchronisation problems,
     // a beginning barrier can help, but should not be necessary
-    // if the unique message tags are being used.
+    // when unique message tags are being used.
 
     //// UPstream::barrier(comm);
 
@@ -210,40 +211,49 @@ void Foam::Pstream::exchangeConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
-    recvBufs.clear();
+    // Initial: clear out receive 'slots'
+    // Preferrable to clear out the map entries instead of the map itself
+    // since this can potentially preserve allocated space
+    // (eg DynamicList entries) between calls
+
+    forAllIters(recvBufs, iter)
+    {
+        iter.val().clear();
+    }
 
     if (!UPstream::parRun() || numProc < 2)
     {
         // Do myself
         const auto iter = sendBufs.find(myProci);
-        if (iter.found())
+        if (iter.good())
         {
             const auto& sendData = iter.val();
 
             if (!sendData.empty())
             {
-                // Do myself
-                recvBufs.emplace(iter.key(), sendData);
+                // Do myself: insert_or_assign
+                recvBufs(iter.key()) = sendData;
             }
         }
         return;
     }
 
 
-    // The NBX algorithm but packed into Map (HashTable) containers
+    // Algorithm NBX: Nonblocking consensus with Map (HashTable) containers
 
     DynamicList<UPstream::Request> requests(sendBufs.size());
 
     //// profilingPstream::beginTiming();
 
-    // Beginning barrier (optional)
-    UPstream::barrier(comm);
+    // If there are synchronisation problems,
+    // a beginning barrier can help, but should not be necessary
+    // when unique message tags are being used.
+
+    //// UPstream::barrier(comm);
+
 
     // Start nonblocking synchronous send to process dest
-
-    // Same as forAllConstIters()
-    const auto endIter = sendBufs.cend();
-    for (auto iter = sendBufs.cbegin(); iter != endIter; ++iter)
+    forAllConstIters(sendBufs, iter)
     {
         const label proci = iter.key();
         const auto& sendData = iter.val();
@@ -254,8 +264,8 @@ void Foam::Pstream::exchangeConsensus
         }
         else if (proci == myProci)
         {
-            // Do myself
-            recvBufs.emplace(proci, sendData);
+            // Do myself: insert_or_assign
+            recvBufs(proci) = sendData;
         }
         else
         {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index dbc8b6ebfd..6a39ea574b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -732,9 +732,12 @@ public:
             const label communicator = worldComm
         );
 
-        //- Exchange integer data with all processors (in the communicator)
-        //- using non-blocking consensus exchange
-        //  \c sendData[proci] is the value to send to proci.
+        //- Exchange \b non-zero integer data with all ranks in the communicator
+        //- using non-blocking consensus exchange.
+        //  The \c sendData[proci] is the (non-zero) value to send to proci.
+        //  After return recvData contains the non-zero values sent from the
+        //  other processors. The recvData list is always assigned zero before
+        //  receipt and values of zero are never transmitted.
         //  After return recvData contains the data from the other processors.
         //  \n
         //  For \b non-parallel : does a simple copy of sendData to recvData
@@ -749,9 +752,12 @@ public:
             const label communicator = worldComm
         );
 
-        //- Exchange integer data with all processors (in the communicator)
-        //- using non-blocking consensus exchange
-        //  \c sendData[proci] is the value to send to proci.
+        //- Exchange \b non-zero integer data with all ranks in the communicator
+        //- using non-blocking consensus exchange.
+        //  The \c sendData[proci] is the (non-zero) value to send to proci.
+        //  After return recvData contains the non-zero values sent from the
+        //  other processors. The recvData list is always assigned zero before
+        //  receipt and values of zero are never transmitted.
         //  After return recvData contains the data from the other processors.
         //  \n
         //  For \b non-parallel : does a simple copy of sendData to recvData
@@ -766,10 +772,13 @@ public:
             const label communicator = worldComm
         );
 
-        //- Exchange integer data with all processors (in the communicator)
-        //- using non-blocking consensus exchange
-        //  \c sendData[proci] is the value to send to proci.
-        //  After return recvData contains the data from the other processors.
+        //- Exchange \b non-zero integer data with all ranks in the communicator
+        //- using non-blocking consensus exchange.
+        //  The \c sendData[proci] is the (non-zero) value to send to proci.
+        //  After return recvData contains the non-zero values sent from the
+        //  other processors. Since the recvData map always cleared before
+        //  receipt and values of zero are never transmitted, a simple check
+        //  of its keys is sufficient to determine connectivity.
         //  \n
         //  For \b non-parallel : copy own rank (if it exists and non-zero)
         //  from sendData to recvData.
@@ -784,10 +793,13 @@ public:
             const label communicator = worldComm
         );
 
-        //- Exchange integer data with all processors (in the communicator)
-        //- using non-blocking consensus exchange
-        //  \c sendData[proci] is the value to send to proci.
-        //  After return recvData contains the data from the other processors.
+        //- Exchange \b non-zero integer data with all ranks in the communicator
+        //- using non-blocking consensus exchange.
+        //  The \c sendData[proci] is the (non-zero) value to send to proci.
+        //  After return recvData contains the non-zero values sent from the
+        //  other processors. Since the recvData map always cleared before
+        //  receipt and values of zero are never transmitted, a simple check
+        //  of its keys is sufficient to determine connectivity.
         //  \n
         //  For \b non-parallel : copy own rank (if it exists and non-zero)
         //  from sendData to recvData.
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 765f8b7048..076c03a1c0 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -533,7 +533,7 @@ void Foam::PstreamDetail::allToAllConsensus
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        Pout<< "** non-blocking consensus Alltoall:";
+        Pout<< "** non-blocking consensus Alltoall (list):";
         Pout<< " numProc:" << numProc
             << " sendData:" << sendData.size()
             << " with comm:" << comm
@@ -551,7 +551,9 @@ void Foam::PstreamDetail::allToAllConsensus
             << Foam::abort(FatalError);
     }
 
+    // Initial: assign zero everywhere. Values of zero are never transmitted
     const Type zeroValue = pTraits<Type>::zero;
+    recvData = zeroValue;
 
     if (!UPstream::parRun() || numProc < 2)
     {
@@ -560,6 +562,7 @@ void Foam::PstreamDetail::allToAllConsensus
         return;
     }
 
+
     // Implementation description
     // --------------------------
     // "Scalable Communication Protocols for Dynamic Sparse Data Exchange",
@@ -577,15 +580,13 @@ void Foam::PstreamDetail::allToAllConsensus
     // This is because we are dealing with a flat list of entries to
     // send and not a sparse Map etc.
 
-    recvData = zeroValue;
-
     DynamicList<MPI_Request> requests(sendData.size());
 
     profilingPstream::beginTiming();
 
     // If there are synchronisation problems,
     // a beginning barrier can help, but should not be necessary
-    // if the unique message tags are being used.
+    // when unique message tags are being used.
 
     //// MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
 
@@ -716,7 +717,7 @@ void Foam::PstreamDetail::allToAllConsensus
 
     if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
-        Pout<< "** non-blocking consensus Alltoall:";
+        Pout<< "** non-blocking consensus Alltoall (map):";
         Pout<< " numProc:" << numProc
             << " sendData:" << sendBufs.size()
             << " with comm:" << comm
@@ -725,9 +726,9 @@ void Foam::PstreamDetail::allToAllConsensus
         error::printStack(Pout);
     }
 
-    recvBufs.clear();
-
+    // Initial: clear out everything
     const Type zeroValue = pTraits<Type>::zero;
+    recvBufs.clear();
 
     if (!UPstream::parRun() || numProc < 2)
     {
@@ -735,7 +736,8 @@ void Foam::PstreamDetail::allToAllConsensus
         const auto iter = sendBufs.find(myProci);
         if (iter.found() && (iter.val() != zeroValue))
         {
-            recvBufs.emplace(iter.key(), iter.val());
+            // Do myself: insert_or_assign
+            recvBufs(iter.key()) = iter.val();
         }
         return;
     }
@@ -750,7 +752,7 @@ void Foam::PstreamDetail::allToAllConsensus
 
     // If there are synchronisation problems,
     // a beginning barrier can help, but should not be necessary
-    // if the unique message tags are being used.
+    // when unique message tags are being used.
 
     //// MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
 
@@ -769,8 +771,8 @@ void Foam::PstreamDetail::allToAllConsensus
         }
         else if (proci == myProci)
         {
-            // Do myself
-            recvBufs.emplace(proci, sendData);
+            // Do myself: insert_or_assign
+            recvBufs(proci) = sendData;
         }
         else
         {

From 70d310329c19b4fefa64d6b7ec24bcb5b7f1c1ea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 8 Feb 2023 09:44:49 +0100
Subject: [PATCH 053/348] ENH: PstreamBuffers consistency improvements

- make nProcs() independent of internal storage mechanism.
- reset receive positions with finished sends

- use size of received buffers to manage validity instead of
  an separate additional gather operation.
---
 .../db/IOstreams/Fstreams/masterOFstream.C    |  43 +++--
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 147 ++++++++++--------
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |  82 +++++++---
 .../masterUncollatedFileOperation.C           |  22 +--
 .../fvMeshDistribute/fvMeshDistribute.C       |  31 ++--
 5 files changed, 189 insertions(+), 136 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
index 91a4f68534..58f1caddf3 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ License
 #include "OSspecific.H"
 #include "PstreamBuffers.H"
 #include "masterUncollatedFileOperation.H"
-#include <algorithm>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -111,49 +110,45 @@ void Foam::masterOFstream::commit()
             return;
         }
 
-        boolList procValid(UPstream::listGatherValues<bool>(valid_));
-
         // Different files
         PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
 
-        // Send my buffer to master
+        // Send my (valid) buffer to master
         if (!Pstream::master())
         {
-            UOPstream os(Pstream::masterNo(), pBufs);
-            string s(this->str());
-            this->reset();
+            if (valid_)
+            {
+                string s(this->str());
 
-            os.write(s.data(), s.length());
+                UOPstream os(Pstream::masterNo(), pBufs);
+                os.write(s.data(), s.length());
+            }
+            this->reset();
         }
 
-        labelList recvSizes;
-        pBufs.finishedGathers(recvSizes);
+        pBufs.finishedGathers();
 
         if (Pstream::master())
         {
-            // Write master data
-            if (procValid[Pstream::masterNo()])
+            // Write (valid) master data
+            if (valid_)
             {
                 checkWrite(filePaths[Pstream::masterNo()], this->str());
             }
             this->reset();
 
-            // Find the max receive size
-            recvSizes[Pstream::masterNo()] = 0;
-            List<char> buf
-            (
-                *std::max_element(recvSizes.cbegin(), recvSizes.cend())
-            );
+            // Allocate large enough to read without resizing
+            List<char> buf(pBufs.maxRecvCount());
 
             for (const int proci : Pstream::subProcs())
             {
-                UIPstream is(proci, pBufs);
+                const std::streamsize count(pBufs.recvDataCount(proci));
 
-                const std::streamsize count(recvSizes[proci]);
-                is.read(buf.data(), count);
-
-                if (procValid[proci])
+                if (count)
                 {
+                    UIPstream is(proci, pBufs);
+
+                    is.read(buf.data(), count);
                     checkWrite(filePaths[proci], buf.cdata(), count);
                 }
             }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index 880ec1cd6e..ff37820401 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -33,13 +33,15 @@ License
 
 void Foam::PstreamBuffers::finalExchange
 (
-    labelList& recvSizes,
-    const bool wait
+    const bool wait,
+    const bool needSizes,
+    labelList& recvSizes
 )
 {
     // Could also check that it is not called twice
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
+    recvPositions_ = Zero;
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
@@ -60,10 +62,13 @@ void Foam::PstreamBuffers::finalExchange
             );
 
             // Copy back out
-            recvSizes.resize_nocopy(recvBuffers_.size());
-            forAll(recvBuffers_, proci)
+            if (needSizes)
             {
-                recvSizes[proci] = recvBuffers_[proci].size();
+                recvSizes.resize_nocopy(recvBuffers_.size());
+                forAll(recvBuffers_, proci)
+                {
+                    recvSizes[proci] = recvBuffers_[proci].size();
+                }
             }
 
             return;
@@ -89,13 +94,15 @@ void Foam::PstreamBuffers::finalExchange
 (
     const labelUList& sendProcs,
     const labelUList& recvProcs,
-    labelList& recvSizes,
-    const bool wait
+    const bool wait,
+    const bool needSizes, // unused
+    labelList& recvSizes
 )
 {
     // Could also check that it is not called twice
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
+    recvPositions_ = Zero;
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
@@ -125,17 +132,18 @@ void Foam::PstreamBuffers::finalExchange
 void Foam::PstreamBuffers::finalExchangeGatherScatter
 (
     const bool isGather,
-    const bool wait
+    const bool wait,
+    const bool needSizes,
+    labelList& recvSizes
 )
 {
     // Could also check that it is not called twice
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
+    recvPositions_ = Zero;
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
-        labelList recvSizes;
-
         if (isGather)
         {
             // gather mode (all-to-one): master [0] <- everyone
@@ -145,7 +153,7 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
 
             if (!UPstream::master(comm_))
             {
-                recvSizes.resize_nocopy(recvBuffers_.size());
+                recvSizes.resize_nocopy(nProcs_);
                 recvSizes = Zero;
             }
         }
@@ -153,7 +161,7 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
         {
             // scatter mode (one-to-all): master [0] -> everyone
 
-            recvSizes.resize_nocopy(sendBuffers_.size());
+            recvSizes.resize_nocopy(nProcs_);
 
             if (UPstream::master(comm_))
             {
@@ -187,9 +195,9 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
 
 Foam::PstreamBuffers::PstreamBuffers
 (
-    const UPstream::commsTypes commsType,
-    const int tag,
-    const label comm,
+    UPstream::commsTypes commsType,
+    int tag,
+    label communicator,
     IOstreamOption::streamFormat fmt
 )
 :
@@ -198,30 +206,11 @@ Foam::PstreamBuffers::PstreamBuffers
     format_(fmt),
     commsType_(commsType),
     tag_(tag),
-    comm_(comm),
-    sendBuffers_(UPstream::nProcs(comm)),
-    recvBuffers_(UPstream::nProcs(comm)),
-    recvPositions_(UPstream::nProcs(comm), Zero)
-{}
-
-
-Foam::PstreamBuffers::PstreamBuffers
-(
-    const label comm,
-    const UPstream::commsTypes commsType,
-    const int tag,
-    IOstreamOption::streamFormat fmt
-)
-:
-    finishedSendsCalled_(false),
-    allowClearRecv_(true),
-    format_(fmt),
-    commsType_(commsType),
-    tag_(tag),
-    comm_(comm),
-    sendBuffers_(UPstream::nProcs(comm)),
-    recvBuffers_(UPstream::nProcs(comm)),
-    recvPositions_(UPstream::nProcs(comm), Zero)
+    comm_(communicator),
+    nProcs_(UPstream::nProcs(comm_)),
+    sendBuffers_(nProcs_),
+    recvBuffers_(nProcs_),
+    recvPositions_(nProcs_, Zero)
 {}
 
 
@@ -284,7 +273,7 @@ void Foam::PstreamBuffers::clear()
     {
         buf.clear();
     }
-    recvPositions_ = 0;
+    recvPositions_ = Zero;
 
     finishedSendsCalled_ = false;
 }
@@ -309,7 +298,7 @@ void Foam::PstreamBuffers::clearStorage()
     {
         buf.clearStorage();
     }
-    recvPositions_ = 0;
+    recvPositions_ = Zero;
 
     finishedSendsCalled_ = false;
 }
@@ -409,6 +398,46 @@ Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 }
 
 
+Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount(const label proci) const
+{
+    label maxLen = 0;
+
+    if (finishedSendsCalled_)
+    {
+        forAll(recvPositions_, i)
+        {
+            if (i != proci)
+            {
+                const label len(recvBuffers_[i].size() - recvPositions_[i]);
+                maxLen = max(maxLen, len);
+            }
+        }
+    }
+    #ifdef FULLDEBUG
+    else
+    {
+        FatalErrorInFunction
+            << "Call finishedSends first" << exit(FatalError);
+    }
+    #endif
+
+    return maxLen;
+}
+
+
+Foam::label Foam::PstreamBuffers::maxRecvCount() const
+{
+    // Use out-of-range proci to avoid excluding any processor
+    return maxNonLocalRecvCount(-1);
+}
+
+
+Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount() const
+{
+    return maxNonLocalRecvCount(UPstream::myProcNo(comm_));
+}
+
+
 const Foam::UList<char>
 Foam::PstreamBuffers::peekRecvData(const label proci) const
 {
@@ -449,7 +478,7 @@ bool Foam::PstreamBuffers::allowClearRecv(bool on) noexcept
 void Foam::PstreamBuffers::finishedSends(const bool wait)
 {
     labelList recvSizes;
-    finalExchange(recvSizes, wait);
+    finalExchange(wait, false, recvSizes);
 }
 
 
@@ -459,7 +488,7 @@ void Foam::PstreamBuffers::finishedSends
     const bool wait
 )
 {
-    finalExchange(recvSizes, wait);
+    finalExchange(wait, true, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -483,7 +512,7 @@ void Foam::PstreamBuffers::finishedSends
 )
 {
     labelList recvSizes;
-    finalExchange(sendProcs, recvProcs, recvSizes, wait);
+    finalExchange(sendProcs, recvProcs, wait, false, recvSizes);
 }
 
 
@@ -495,7 +524,7 @@ void Foam::PstreamBuffers::finishedSends
     const bool wait
 )
 {
-    finalExchange(sendProcs, recvProcs, recvSizes, wait);
+    finalExchange(sendProcs, recvProcs, wait, true, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -555,14 +584,14 @@ bool Foam::PstreamBuffers::finishedSends
             }
         }
 
-        finishedSends(wait);  // All-to-all
+        labelList recvSizes;
+        finishedSends(recvSizes, wait);  // All-to-all
 
         // The recv ranks
         recvProcs.clear();
-        forAll(recvBuffers_, proci)
+        forAll(recvSizes, proci)
         {
-            // ie, recvDataCount(proci)
-            if (!recvBuffers_[proci].empty())
+            if (recvSizes[proci] > 0)
             {
                 recvProcs.push_back(proci);
             }
@@ -581,13 +610,15 @@ bool Foam::PstreamBuffers::finishedSends
 
 void Foam::PstreamBuffers::finishedGathers(const bool wait)
 {
-    finalExchangeGatherScatter(true, wait);
+    labelList recvSizes;
+    finalExchangeGatherScatter(true, wait, false, recvSizes);
 }
 
 
 void Foam::PstreamBuffers::finishedScatters(const bool wait)
 {
-    finalExchangeGatherScatter(false, wait);
+    labelList recvSizes;
+    finalExchangeGatherScatter(false, wait, false, recvSizes);
 }
 
 
@@ -597,7 +628,7 @@ void Foam::PstreamBuffers::finishedGathers
     const bool wait
 )
 {
-    finalExchangeGatherScatter(true, wait);
+    finalExchangeGatherScatter(true, wait, true, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -610,11 +641,6 @@ void Foam::PstreamBuffers::finishedGathers
         // Note: maybe possible only if using different tag from write started
         // by ~UOPstream. Needs some work.
     }
-
-    // For nonBlocking mode, simply recover received sizes
-    // from the buffers themselves.
-
-    recvSizes = recvDataCounts();
 }
 
 
@@ -624,7 +650,7 @@ void Foam::PstreamBuffers::finishedScatters
     const bool wait
 )
 {
-    finalExchangeGatherScatter(false, wait);
+    finalExchangeGatherScatter(false, wait, true, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -637,11 +663,6 @@ void Foam::PstreamBuffers::finishedScatters
         // Note: maybe possible only if using different tag from write started
         // by ~UOPstream. Needs some work.
     }
-
-    // For nonBlocking mode, simply recover received sizes
-    // from the buffers themselves.
-
-    recvSizes = recvDataCounts();
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index b9f5b04b1b..c3912569c9 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -137,8 +137,8 @@ class PstreamBuffers
         //- Communicator
         const label comm_;
 
-        //  Number of ranks associated with PstreamBuffers
-        //  currently obtained from recvPositions_
+        //- Number of ranks associated with PstreamBuffers (at construction)
+        const label nProcs_;
 
 
     // Buffer storage
@@ -157,7 +157,12 @@ class PstreamBuffers
 
         //- Mark all sends as having been done.
         //  This will start receives (nonBlocking comms).
-        void finalExchange(labelList& recvSizes, const bool wait);
+        void finalExchange
+        (
+            const bool wait,
+            const bool needSizes,   // If recvSizes needed or scratch
+            labelList& recvSizes
+        );
 
         //- Mark sends as done.
         //  Only exchange sizes using the sendProcs/recvProcs subset
@@ -166,12 +171,19 @@ class PstreamBuffers
         (
             const labelUList& sendProcs,
             const labelUList& recvProcs,
-            labelList& recvSizes,
-            const bool wait
+            const bool wait,
+            const bool needSizes,   // If recvSizes needed or scratch
+            labelList& recvSizes
         );
 
         //- For all-to-one or one-to-all
-        void finalExchangeGatherScatter(const bool isGather, const bool wait);
+        void finalExchangeGatherScatter
+        (
+            const bool isGather,
+            const bool wait,
+            const bool needSizes,   // If recvSizes needed or scratch
+            labelList& recvSizes
+        );
 
 
     // Friendship Access
@@ -194,23 +206,41 @@ public:
 
     // Constructors
 
-        //- Construct given comms type, message tag, communicator, IO format
+        //- Construct given communication type (default: nonBlocking), message
+        //- tag, communicator (default: worldComm), IO format (default: binary)
         explicit PstreamBuffers
         (
-            const UPstream::commsTypes commsType,
-            const int tag = UPstream::msgType(),
-            const label comm = UPstream::worldComm,
+            UPstream::commsTypes commsType = UPstream::commsTypes::nonBlocking,
+            int tag = UPstream::msgType(),
+            label communicator = UPstream::worldComm,
             IOstreamOption::streamFormat fmt = IOstreamOption::BINARY
         );
 
-        //- Construct given communicator, comms type, message tag, IO format
+        //- Construct given communicator, communication type
+        //- (default: nonBlocking), message tag, IO format (default: binary)
         explicit PstreamBuffers
         (
-            const label comm,
-            const UPstream::commsTypes commsType,
-            const int tag = UPstream::msgType(),
+            label communicator,
+            UPstream::commsTypes commsType = UPstream::commsTypes::nonBlocking,
+            int tag = UPstream::msgType(),
             IOstreamOption::streamFormat fmt = IOstreamOption::BINARY
-        );
+        )
+        :
+            PstreamBuffers(commsType, tag, communicator, fmt)
+        {}
+
+        //- Construct given communicator, message tag, communication type
+        //- (default: nonBlocking), IO format (default: binary)
+        PstreamBuffers
+        (
+            label communicator,
+            int tag,
+            UPstream::commsTypes commsType = UPstream::commsTypes::nonBlocking,
+            IOstreamOption::streamFormat fmt = IOstreamOption::BINARY
+        )
+        :
+            PstreamBuffers(commsType, tag, communicator, fmt)
+        {}
 
 
     //- Destructor - checks that all data have been consumed
@@ -248,7 +278,7 @@ public:
         //- Number of ranks associated with PstreamBuffers
         label nProcs() const noexcept
         {
-            return recvPositions_.size();
+            return nProcs_;
         }
 
 
@@ -258,14 +288,14 @@ public:
         UPstream::rangeType allProcs() const noexcept
         {
             // Proc 0 -> nProcs (int value)
-            return UPstream::rangeType(static_cast<int>(nProcs()));
+            return UPstream::rangeType(static_cast<int>(nProcs_));
         }
 
         //- Range of sub-processes indices associated with PstreamBuffers
         UPstream::rangeType subProcs() const noexcept
         {
             // Proc 1 -> nProcs (int value)
-            return UPstream::rangeType(1, static_cast<int>(nProcs()-1));
+            return UPstream::rangeType(1, static_cast<int>(nProcs_-1));
         }
 
 
@@ -302,6 +332,18 @@ public:
         //- Must call finishedSends() or other finished.. method first!
         labelList recvDataCounts() const;
 
+        //- Maximum receive size from any rocessor rank.
+        //- Must call finishedSends() or other finished.. method first!
+        label maxRecvCount() const;
+
+        //- Maximum receive size, excluding current processor rank
+        //- Must call finishedSends() or other finished.. method first!
+        label maxNonLocalRecvCount() const;
+
+        //- Maximum receive size, excluding the specified processor rank
+        //- Must call finishedSends() or other finished.. method first!
+        label maxNonLocalRecvCount(const label proci) const;
+
         //- Number of unconsumed receive bytes for the specified processor.
         //- Must call finishedSends() or other finished.. method first!
         //  The method is only useful in limited situations, such as when
@@ -447,7 +489,7 @@ public:
         //- Mark all sends to master as done.
         //
         //  Non-blocking mode: populates receive buffers.
-        //  Can use recvDataCounts() method to recover sizes received.
+        //  Can use recvDataCount, maxRecvCount etc to recover sizes received.
         //
         //  \param wait wait for requests to complete (in nonBlocking mode)
         //
@@ -467,7 +509,7 @@ public:
         //- Mark all sends to sub-procs as done.
         //
         //  Non-blocking mode: populates receive buffers.
-        //  Can use recvDataCounts() method to recover sizes received.
+        //  Can use recvDataCount, maxRecvCount etc to recover sizes received.
         //
         //  \param wait wait for requests to complete (in nonBlocking mode)
         //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index a6030560f0..7f3563edb5 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -641,8 +641,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
         }
     }
 
-    labelList recvSizes;
-    pBufs.finishedSends(recvSizes);
+    pBufs.finishedSends();
 
     // isPtr will be valid on master and will be the unbuffered
     // IFstream. Else the information is in the PstreamBuffers (and
@@ -653,12 +652,11 @@ Foam::fileOperations::masterUncollatedFileOperation::read
         if (procValid[Pstream::myProcNo(comm)])
         {
             // This processor needs to return something
+            List<char> buf(pBufs.recvDataCount(Pstream::masterNo()));
 
-            UIPstream is(Pstream::masterNo(), pBufs);
-
-            List<char> buf(recvSizes[Pstream::masterNo()]);
             if (!buf.empty())
             {
+                UIPstream is(Pstream::masterNo(), pBufs);
                 is.read(buf.data(), buf.size());
             }
 
@@ -2353,8 +2351,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
         }
 
 
-        labelList recvSizes;
-        pBufs.finishedSends(recvSizes);
+        pBufs.finishedSends();
 
         if (Pstream::master(Pstream::worldComm))
         {
@@ -2370,10 +2367,13 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
                     << " from processor " << Pstream::masterNo() << endl;
             }
 
-            UIPstream is(Pstream::masterNo(), pBufs);
+            List<char> buf(pBufs.recvDataCount(Pstream::masterNo()));
 
-            List<char> buf(recvSizes[Pstream::masterNo()]);
-            is.read(buf.data(), buf.size());
+            if (!buf.empty())
+            {
+                UIPstream is(Pstream::masterNo(), pBufs);
+                is.read(buf.data(), buf.size());
+            }
 
             if (debug)
             {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 5751e519c3..41462314aa 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -2159,8 +2159,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     // ~~~~~~~~~~~~~~~~~
 
     labelList nSendCells(countCells(distribution));
-    labelList nRevcCells(Pstream::nProcs());
-    Pstream::allToAll(nSendCells, nRevcCells);
+    labelList nRecvCells(Pstream::nProcs());
+    UPstream::allToAll(nSendCells, nRecvCells);
 
     // Allocate buffers
     PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
@@ -2382,22 +2382,17 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
 
     UPstream::parRun(oldParRun);  // Restore parallel state
 
-
-    // Start sending&receiving from buffers
+    if (debug)
     {
-        if (debug)
-        {
-            Pout<< "Starting sending" << endl;
-        }
+        Pout<< "Starting sending" << endl;
+    }
 
-        labelList recvSizes;
-        pBufs.finishedSends(recvSizes);
+    pBufs.finishedSends();
 
-        if (debug)
-        {
-            Pout<< "Finished sending and receiving : " << flatOutput(recvSizes)
-                << endl;
-        }
+    if (debug)
+    {
+        Pout<< "Finished sending and receiving : "
+            << flatOutput(pBufs.recvDataCounts()) << endl;
     }
 
 
@@ -2547,17 +2542,17 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     );
     PtrList<PtrList<volTensorField::Internal>> dtfs(Pstream::nProcs());
 
-    forAll(nRevcCells, sendProc)
+    forAll(nRecvCells, sendProc)
     {
         // Did processor sendProc send anything to me?
-        if (sendProc != Pstream::myProcNo() && nRevcCells[sendProc] > 0)
+        if (sendProc != Pstream::myProcNo() && nRecvCells[sendProc] > 0)
         {
             if (debug)
             {
                 Pout<< nl
                     << "RECEIVING FROM DOMAIN " << sendProc
                     << " cells to receive:"
-                    << nRevcCells[sendProc]
+                    << nRecvCells[sendProc]
                     << nl << endl;
             }
 

From add61ca2733f652ffaac358e130d8de7e56b2aea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 8 Feb 2023 17:13:44 +0100
Subject: [PATCH 054/348] ENH: support UOPstream and UIPstream as formatters
 with an external buffer

- can split serialise/de-serialise and send/recv actions
---
 applications/test/parallel-nbx2/Make/files    |   3 +
 applications/test/parallel-nbx2/Make/options  |   2 +
 .../test/parallel-nbx2/Test-parallel-nbx2.C   | 227 ++++++++++++++++++
 .../db/IOstreams/Pstreams/IPBstreams.C        |   7 +-
 src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H |  10 -
 .../db/IOstreams/Pstreams/IPstreams.C         |  17 +-
 .../db/IOstreams/Pstreams/OPstreams.C         |  10 +
 .../db/IOstreams/Pstreams/UIPstream.H         |  44 +++-
 .../db/IOstreams/Pstreams/UIPstreamBase.C     |  43 +++-
 .../db/IOstreams/Pstreams/UOPstream.H         |  27 ++-
 .../db/IOstreams/Pstreams/UOPstreamBase.C     |  32 ++-
 11 files changed, 378 insertions(+), 44 deletions(-)
 create mode 100644 applications/test/parallel-nbx2/Make/files
 create mode 100644 applications/test/parallel-nbx2/Make/options
 create mode 100644 applications/test/parallel-nbx2/Test-parallel-nbx2.C

diff --git a/applications/test/parallel-nbx2/Make/files b/applications/test/parallel-nbx2/Make/files
new file mode 100644
index 0000000000..262936c21f
--- /dev/null
+++ b/applications/test/parallel-nbx2/Make/files
@@ -0,0 +1,3 @@
+Test-parallel-nbx2.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-parallel-nbx2
diff --git a/applications/test/parallel-nbx2/Make/options b/applications/test/parallel-nbx2/Make/options
new file mode 100644
index 0000000000..18e6fe47af
--- /dev/null
+++ b/applications/test/parallel-nbx2/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/parallel-nbx2/Test-parallel-nbx2.C b/applications/test/parallel-nbx2/Test-parallel-nbx2.C
new file mode 100644
index 0000000000..27bb661e0d
--- /dev/null
+++ b/applications/test/parallel-nbx2/Test-parallel-nbx2.C
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-parallel-nbx2
+
+Description
+    Test for send/receive data
+
+\*---------------------------------------------------------------------------*/
+
+#include "List.H"
+#include "argList.H"
+#include "Time.H"
+#include "IPstream.H"
+#include "OPstream.H"
+#include "IOstreams.H"
+#include "Random.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::noCheckProcessorDirectories();
+    argList::addBoolOption("non-blocking", "Test with non-blocking receives");
+
+    #include "setRootCase.H"
+
+    const bool optNonBlocking = args.found("non-blocking");
+
+    if (!Pstream::parRun())
+    {
+        Info<< "\nWarning: not parallel - skipping further tests\n" << endl;
+        return 0;
+    }
+
+    Info<< "\nTesting with non-blocking receives: " << optNonBlocking << nl;
+
+
+    const int tag = (UPstream::msgType() + 314159);
+    const label comm = UPstream::worldComm;
+
+    Random rnd(20*UPstream::myProcNo());
+
+    // Looks a bit like a DIY PstreamBuffers...
+    Map<DynamicList<char>> sendBufs;
+    Map<DynamicList<char>> recvBufs;
+
+    DynamicList<UPstream::Request> sendRequests(10);
+    DynamicList<UPstream::Request> recvRequests(10);
+
+    if (!Pstream::master())
+    {
+        // Send some random length to master
+
+        const int toProci = UPstream::masterNo();
+
+        label len = rnd.position<label>(10, 20);
+        if (UPstream::myProcNo() && (UPstream::myProcNo() % 3) == 0) len = 0;
+
+        scalarField fld(len, scalar(UPstream::myProcNo()));
+
+        // Format for sending
+        if (!fld.empty())
+        {
+            auto& buf = sendBufs(toProci);
+            UOPstream os(buf);
+            os << fld;
+        }
+
+        // Start nonblocking synchronous send to process dest
+
+        if (sendBufs.found(toProci) && !sendBufs[toProci].empty())
+        {
+            Pout<< "send: [" << sendBufs[toProci].size() << " bytes] "
+                << flatOutput(fld) << endl;
+
+            // Has data to send
+            UOPstream::write
+            (
+                sendRequests.emplace_back(),
+                UPstream::masterNo(),
+                sendBufs[toProci],
+                tag,
+                comm,
+                UPstream::sendModes::sync
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    UPstream::Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        std::pair<int, int> probed =
+            UPstream::probeMessage
+            (
+                UPstream::commsTypes::nonBlocking,
+                -1,  // ANY_SOURCE
+                tag,
+                comm
+            );
+
+        if (probed.second > 0)
+        {
+            // Message found and had size: receive it
+
+            const label proci = probed.first;
+            const label count = probed.second;
+
+            if (optNonBlocking)
+            {
+                recvBufs(proci).resize_nocopy(count);
+
+                // Non-blocking read
+                UIPstream::read
+                (
+                    recvRequests.emplace_back(),
+                    proci,
+                    recvBufs[proci],
+                    tag,
+                    comm
+                );
+                // Pout<< "Done: "
+                //     << UPstream::finishedRequests(recvRequests) << endl;
+            }
+            else
+            {
+                IPstream is
+                (
+                    UPstream::commsTypes::scheduled,
+                    probed.first,
+                    probed.second,
+                    tag,
+                    comm
+                );
+
+                scalarField fld(is);
+
+                Info<< "from [" << probed.first
+                    << "] : " << flatOutput(fld) << endl;
+            }
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            if (UPstream::finishedRequest(barrierReq))
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            if (UPstream::finishedRequests(sendRequests))
+            {
+                UPstream::barrier(comm, &barrierReq);
+                barrier_active = true;
+            }
+        }
+    }
+
+    Pout<< "pending receives: " << recvRequests.size() << endl;
+
+    // Wait for receives to complete
+    UPstream::waitRequests(recvRequests);
+
+    // It could be we need this type of synchronization point
+    // if the receives are non-blocking
+    if (optNonBlocking)
+    {
+        UPstream::barrier(comm);
+    }
+
+    if (!recvBufs.empty())
+    {
+        Pout<< "Receives from: " << flatOutput(recvBufs.sortedToc()) << endl;
+
+        forAllConstIters(recvBufs, iter)
+        {
+            Pout<< "proc:" << iter.key() << " len:" << iter.val().size() << nl;
+
+            if (!iter.val().empty())
+            {
+                UIPstream is(iter.val());
+                scalarField fld(is);
+
+                Pout<< "recv:" << iter.key()
+                    << " : " << flatOutput(fld) << nl;
+            }
+        }
+    }
+
+    Info<< "\nEnd\n" << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C
index 5540777f09..a43f73116e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPBstreams.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,13 +75,12 @@ Foam::IPBstream::IPBstream
         commsType,
         fromProcNo,
         Pstream::transferBuf_,
-        transferBufPosition_,
+        UIPstreamBase::storedRecvBufPos_,   // Internal only
         tag,
         comm,
         false,  // Do not clear Pstream::transferBuf_ if at end
         fmt
-    ),
-    transferBufPosition_(0)
+    )
 {}
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
index 43152570b1..5dda9b6e6e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H
@@ -56,11 +56,6 @@ class IPstream
     public Pstream,
     public UIPstream
 {
-    // Private Data
-
-        //- Receive index into Pstream::transferBuf_
-        label transferBufPosition_;
-
 public:
 
     // Constructors
@@ -90,11 +85,6 @@ class IPBstream
     public Pstream,
     public UIPBstream
 {
-    // Private Data
-
-        //- Receive index into Pstream::transferBuf_
-        label transferBufPosition_;
-
 public:
 
     // Constructors
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C
index caabf931d7..d82a270238 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstreams.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,6 +91,16 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
 }
 
 
+Foam::UIPstream::UIPstream
+(
+    const DynamicList<char>& recvBuf,
+    IOstreamOption::streamFormat fmt
+)
+:
+    UIPstreamBase(recvBuf, fmt)
+{}
+
+
 Foam::IPstream::IPstream
 (
     const UPstream::commsTypes commsType,
@@ -107,13 +117,12 @@ Foam::IPstream::IPstream
         commsType,
         fromProcNo,
         Pstream::transferBuf_,
-        transferBufPosition_,
+        UIPstreamBase::storedRecvBufPos_,   // Internal only
         tag,
         comm,
         false,  // Do not clear Pstream::transferBuf_ if at end
         fmt
-    ),
-    transferBufPosition_(0)
+    )
 {}
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
index 9f1d70f42f..fa913a868c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
@@ -52,6 +52,16 @@ Foam::UOPstream::UOPstream(const int toProcNo, PstreamBuffers& buffers)
 {}
 
 
+Foam::UOPstream::UOPstream
+(
+    DynamicList<char>& sendBuf,
+    IOstreamOption::streamFormat fmt
+)
+:
+    UOPstreamBase(sendBuf, fmt)
+{}
+
+
 Foam::OPstream::OPstream
 (
     const UPstream::commsTypes commsType,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index bcb989cf3a..68e3f26bdc 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -85,19 +85,30 @@ protected:
 
     // Protected Data
 
-        int fromProcNo_;
-
-        DynamicList<char>& recvBuf_;
-
-        label& recvBufPos_;
+        //- Source rank for the data
+        const int fromProcNo_;
 
+        //- Message tag for communication
         const int tag_;
 
-        const label comm_;
+        //- The communicator index
+        const int comm_;
 
+        //- The message size, read on bufferIPCrecv or set directly
+        int messageSize_;
+
+        //- Receive position in buffer data, if ony
+        //- If there is no external location for recvBufPos_
+        label storedRecvBufPos_;
+
+        //- Clear the receive buffer on termination (in the destructor)
         const bool clearAtEnd_;
 
-        int messageSize_;
+        //- Reference to the receive buffer data
+        DynamicList<char>& recvBuf_;
+
+        //- Reference to the receive position in buffer data
+        label& recvBufPos_;
 
 
     // Protected Constructors
@@ -120,10 +131,17 @@ protected:
         //- Construct given buffers
         UIPstreamBase(const int fromProcNo, PstreamBuffers& buffers);
 
+        //- Construct for an externally obtained buffer.
+        //  The parameter is allowed to be const (since reading will not
+        //  affect it), but must reference a concrete variable.
+        UIPstreamBase
+        (
+            const DynamicList<char>& receiveBuf,
+            IOstreamOption::streamFormat fmt
+        );
 
 public:
 
-
     //- Destructor. Optionally clears external receive buffer.
     virtual ~UIPstreamBase();
 
@@ -238,6 +256,16 @@ public:
         //- Construct given buffers
         UIPstream(const int fromProcNo, PstreamBuffers& buffers);
 
+        //- Construct for reading from a standalone buffer that has
+        //- been obtained externally by the caller.
+        //  The parameter is allowed to be const (since reading will not
+        //  affect it), but must reference a concrete variable.
+        explicit UIPstream
+        (
+            const DynamicList<char>& recvBuf,
+            IOstreamOption::streamFormat fmt = IOstreamOption::BINARY
+        );
+
 
     //- Destructor
     virtual ~UIPstream() = default;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
index 228332528f..97685b3022 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
@@ -159,12 +159,13 @@ Foam::UIPstreamBase::UIPstreamBase
     UPstream(commsType),
     Istream(fmt),
     fromProcNo_(fromProcNo),
-    recvBuf_(receiveBuf),
-    recvBufPos_(receiveBufPosition),
     tag_(tag),
     comm_(comm),
+    messageSize_(0),
+    storedRecvBufPos_(0),
     clearAtEnd_(clearAtEnd),
-    messageSize_(0)
+    recvBuf_(receiveBuf),
+    recvBufPos_(receiveBufPosition)
 {
     setOpened();
     setGood();
@@ -180,12 +181,13 @@ Foam::UIPstreamBase::UIPstreamBase
     UPstream(buffers.commsType()),
     Istream(buffers.format()),
     fromProcNo_(fromProcNo),
-    recvBuf_(buffers.accessRecvBuffer(fromProcNo)),
-    recvBufPos_(buffers.accessRecvPosition(fromProcNo)),
     tag_(buffers.tag()),
     comm_(buffers.comm()),
+    messageSize_(0),
+    storedRecvBufPos_(0),
     clearAtEnd_(buffers.allowClearRecv()),
-    messageSize_(0)
+    recvBuf_(buffers.accessRecvBuffer(fromProcNo)),
+    recvBufPos_(buffers.accessRecvPosition(fromProcNo))
 {
     if
     (
@@ -205,6 +207,32 @@ Foam::UIPstreamBase::UIPstreamBase
 }
 
 
+Foam::UIPstreamBase::UIPstreamBase
+(
+    const DynamicList<char>& receiveBuf,
+    IOstreamOption::streamFormat fmt
+)
+:
+    UPstream(UPstream::commsTypes::nonBlocking), // placeholder
+    Istream(fmt),
+    fromProcNo_(UPstream::masterNo()),      // placeholder
+    tag_(UPstream::msgType()),              // placeholder
+    comm_(UPstream::selfComm),              // placeholder
+    messageSize_(receiveBuf.size()),        // Message == buffer
+    storedRecvBufPos_(0),
+    clearAtEnd_(false),   // Do not clear recvBuf if at end!!
+    recvBuf_
+    (
+        // The receive buffer is never modified with this code path
+        const_cast<DynamicList<char>&>(receiveBuf)
+    ),
+    recvBufPos_(storedRecvBufPos_)          // Internal reference
+{
+    setOpened();
+    setGood();
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::UIPstreamBase::~UIPstreamBase()
@@ -517,8 +545,7 @@ void Foam::UIPstreamBase::print(Ostream& os) const
 {
     os  << "Reading from processor " << fromProcNo_
         << " using communicator " << comm_
-        <<  " and tag " << tag_
-        << Foam::endl;
+        <<  " and tag " << tag_ << Foam::endl;
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index a3f86d3281..02f6f85037 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -92,16 +92,21 @@ protected:
 
     // Protected Data
 
-        int toProcNo_;
-
-        DynamicList<char>& sendBuf_;
+        //- Destination rank for the data
+        const int toProcNo_;
 
+        //- Message tag for communication
         const int tag_;
 
-        const label comm_;
+        //- The communicator index
+        const int comm_;
 
+        //- Call bufferIPCsend on termination (in the destructor)
         const bool sendAtDestruct_;
 
+        //- Reference to the send buffer data
+        DynamicList<char>& sendBuf_;
+
 
     // Protected Constructors
 
@@ -122,6 +127,12 @@ protected:
         //- Construct given buffers
         UOPstreamBase(const int toProcNo, PstreamBuffers& buffers);
 
+        //- Construct for externally obtained buffers
+        UOPstreamBase
+        (
+            DynamicList<char>& sendBuf,
+            IOstreamOption::streamFormat fmt
+        );
 
 public:
 
@@ -310,6 +321,14 @@ public:
         //- Construct given buffers
         UOPstream(const int toProcNo, PstreamBuffers& buffers);
 
+        //- Construct for writing into a standalone buffer.
+        //- Data transfer is handled externally by the caller.
+        explicit UOPstream
+        (
+            DynamicList<char>& sendBuf,
+            IOstreamOption::streamFormat fmt = IOstreamOption::BINARY
+        );
+
 
     //- Destructor, usually sends buffer on destruct.
     virtual ~UOPstream();
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
index 73d4c83939..b865858bad 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
@@ -145,10 +145,10 @@ Foam::UOPstreamBase::UOPstreamBase
     UPstream(commsType),
     Ostream(fmt),
     toProcNo_(toProcNo),
-    sendBuf_(sendBuf),
     tag_(tag),
     comm_(comm),
-    sendAtDestruct_(sendAtDestruct)
+    sendAtDestruct_(sendAtDestruct),
+    sendBuf_(sendBuf)
 {
     setOpened();
     setGood();
@@ -160,16 +160,36 @@ Foam::UOPstreamBase::UOPstreamBase(const int toProcNo, PstreamBuffers& buffers)
     UPstream(buffers.commsType()),
     Ostream(buffers.format()),
     toProcNo_(toProcNo),
-    sendBuf_(buffers.accessSendBuffer(toProcNo)),
     tag_(buffers.tag()),
     comm_(buffers.comm()),
-    sendAtDestruct_(buffers.commsType() != UPstream::commsTypes::nonBlocking)
+    sendAtDestruct_(buffers.commsType() != UPstream::commsTypes::nonBlocking),
+    sendBuf_(buffers.accessSendBuffer(toProcNo))
 {
     setOpened();
     setGood();
 }
 
 
+Foam::UOPstreamBase::UOPstreamBase
+(
+    DynamicList<char>& sendBuf,
+    IOstreamOption::streamFormat fmt
+)
+:
+    UPstream(UPstream::commsTypes::nonBlocking), // placeholder
+    Ostream(fmt),
+    toProcNo_(UPstream::masterNo()),        // placeholder
+    tag_(UPstream::msgType()),              // placeholder
+    comm_(UPstream::selfComm),              // placeholder
+    sendAtDestruct_(false),   // Never sendAtDestruct!!
+    sendBuf_(sendBuf)
+{
+    sendBuf_.clear();  // Overwrite into buffer
+    setOpened();
+    setGood();
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::UOPstreamBase::~UOPstreamBase()
@@ -394,8 +414,8 @@ void Foam::UOPstreamBase::rewind()
 
 void Foam::UOPstreamBase::print(Ostream& os) const
 {
-    os  << "Writing from processor " << toProcNo_
-        << " to processor " << myProcNo() << " in communicator " << comm_
+    os  << "Writing to processor " << toProcNo_
+        << " from processor " << myProcNo() << " in communicator " << comm_
         << " and tag " << tag_ << Foam::endl;
 }
 

From 422654a9ea561714300e51cde950b9e63634e691 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 9 Feb 2023 10:58:59 +0100
Subject: [PATCH 055/348] ENH: added
 UPstream::waitAnyRequest(UList<UPstream::Request>&)

- waits for completion of any of the listed requests and returns the
  corresponding index into the list.
  This allows, for example, dispatching of data when the receive is
  completed.
---
 applications/test/parallel-comm3a/Make/files  |   3 +
 .../test/parallel-comm3a/Make/options         |   4 +
 .../parallel-comm3a/Test-parallel-comm3a.C    | 249 ++++++++++++++++++
 applications/test/parallel-comm3b/Make/files  |   3 +
 .../test/parallel-comm3b/Make/options         |   2 +
 .../parallel-comm3b/Test-parallel-comm3b.C    | 228 ++++++++++++++++
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |   5 +
 src/Pstream/dummy/UPstreamRequest.C           |   5 +
 src/Pstream/mpi/UPstreamRequest.C             |  51 ++++
 9 files changed, 550 insertions(+)
 create mode 100644 applications/test/parallel-comm3a/Make/files
 create mode 100644 applications/test/parallel-comm3a/Make/options
 create mode 100644 applications/test/parallel-comm3a/Test-parallel-comm3a.C
 create mode 100644 applications/test/parallel-comm3b/Make/files
 create mode 100644 applications/test/parallel-comm3b/Make/options
 create mode 100644 applications/test/parallel-comm3b/Test-parallel-comm3b.C

diff --git a/applications/test/parallel-comm3a/Make/files b/applications/test/parallel-comm3a/Make/files
new file mode 100644
index 0000000000..31e265a30c
--- /dev/null
+++ b/applications/test/parallel-comm3a/Make/files
@@ -0,0 +1,3 @@
+Test-parallel-comm3a.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-parallel-comm3a
diff --git a/applications/test/parallel-comm3a/Make/options b/applications/test/parallel-comm3a/Make/options
new file mode 100644
index 0000000000..b3a33caee1
--- /dev/null
+++ b/applications/test/parallel-comm3a/Make/options
@@ -0,0 +1,4 @@
+include $(GENERAL_RULES)/mpi-rules
+
+EXE_INC  = $(PFLAGS) $(PINC) $(c++LESSWARN)
+EXE_LIBS = $(PLIBS)
diff --git a/applications/test/parallel-comm3a/Test-parallel-comm3a.C b/applications/test/parallel-comm3a/Test-parallel-comm3a.C
new file mode 100644
index 0000000000..98e1577c73
--- /dev/null
+++ b/applications/test/parallel-comm3a/Test-parallel-comm3a.C
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-parallel-comm3a
+
+Description
+    Basic communicator tests
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "IPstream.H"
+#include "OPstream.H"
+#include "Pair.H"
+#include "Tuple2.H"
+#include "IOstreams.H"
+#include "StringStream.H"
+#include "Random.H"
+#include <mpi.h>
+
+using namespace Foam;
+
+
+void printRequests(const UList<MPI_Request>& requests)
+{
+    OStringStream buf;
+
+    buf << "request: " << requests.size() << '(';
+
+    for (const auto& req : requests)
+    {
+        if (req == MPI_REQUEST_NULL)
+        {
+            buf << " null";
+        }
+        else
+        {
+            buf << " " << Foam::name(req);
+        }
+    }
+
+    buf << " )";
+    Pout << buf.str().c_str() << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noCheckProcessorDirectories();
+
+    #include "setRootCase.H"
+
+    if (!Pstream::parRun())
+    {
+        Info<< "\nWarning: not parallel - skipping further tests\n" << endl;
+        return 0;
+    }
+
+    const int tag = (UPstream::msgType() + 314159);
+    // const label comm = UPstream::worldComm;
+
+    Random rnd(20*UPstream::myProcNo());
+
+    Map<DynamicList<char>> sendBufs;
+    Map<DynamicList<char>> recvBufs;
+
+    DynamicList<MPI_Request> sendRequests(10);
+    DynamicList<MPI_Request> recvRequests(10);
+
+
+    if (!Pstream::master())
+    {
+        // Send some random length to master
+
+        const int toProci = UPstream::masterNo();
+
+        label len = rnd.position<label>(10, 20);
+        if (UPstream::myProcNo() && (UPstream::myProcNo() % 3) == 0) len = 0;
+
+        // Has data to send
+        if (len)
+        {
+            auto& buf = sendBufs(toProci);
+            buf.resize(len, 'x');
+
+            MPI_Issend
+            (
+                buf.cdata_bytes(),
+                buf.size_bytes(),
+                MPI_BYTE,
+                toProci,
+                tag,
+                MPI_COMM_WORLD,
+               &sendRequests.emplace_back()
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    MPI_Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        int flag = 0;
+        MPI_Status status;
+
+        MPI_Iprobe
+        (
+            MPI_ANY_SOURCE,
+            tag,
+            MPI_COMM_WORLD,
+           &flag,
+           &status
+        );
+
+        if (flag)
+        {
+            // Message found, receive into dest buffer location
+            const label fromProci = status.MPI_SOURCE;
+
+            int count = 0;
+            MPI_Get_count(&status, MPI_BYTE, &count);
+
+            auto& buf = recvBufs(fromProci);
+            buf.resize_nocopy(count);
+
+            MPI_Irecv
+            (
+                buf.data_bytes(),
+                buf.size_bytes(),
+                MPI_BYTE,
+                fromProci,
+                tag,
+                MPI_COMM_WORLD,
+               &recvRequests.emplace_back()
+            );
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            // - all received, or nothing to receive
+            MPI_Test(&barrierReq, &flag, MPI_STATUS_IGNORE);
+
+            if (flag)
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            MPI_Testall
+            (
+                sendRequests.size(), sendRequests.data(),
+                &flag, MPI_STATUSES_IGNORE
+            );
+
+            if (flag)
+            {
+                MPI_Ibarrier(MPI_COMM_WORLD, &barrierReq);
+                barrier_active = true;
+            }
+        }
+    }
+
+    if (recvRequests.empty())
+    {
+        Pout << "No receive requests" << endl;
+    }
+    else
+    {
+        printRequests(recvRequests);
+    }
+
+
+    // Either MPI_Waitall, or MPI_Waitany...
+
+    label loop = 0;
+    for (bool dispatched = recvRequests.empty(); !dispatched; /*nil*/)
+    {
+        int index = 0;
+        MPI_Waitany
+        (
+            recvRequests.size(),
+            recvRequests.data(),
+            &index,
+            MPI_STATUS_IGNORE
+        );
+
+        if (index == MPI_UNDEFINED)
+        {
+            //Pout<< "Testany is " << (flag ? "done" : "waiting") << endl;
+            Pout<< "Waitany (loop:" << loop << ") : done" << endl;
+            dispatched = true;
+        }
+        else
+        {
+            Pout<< "Waitany (loop:"
+                << loop << ") "
+                << index << " of " << recvRequests.size() << endl;
+
+            printRequests(recvRequests);
+        }
+
+        ++loop;
+    }
+
+    // Not needed: all tested...
+    // MPI_Waitall(recvRequests.size(), recvRequests.data(), MPI_STATUSES_IGNORE);
+
+    MPI_Barrier(MPI_COMM_WORLD);
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/parallel-comm3b/Make/files b/applications/test/parallel-comm3b/Make/files
new file mode 100644
index 0000000000..22f4d813db
--- /dev/null
+++ b/applications/test/parallel-comm3b/Make/files
@@ -0,0 +1,3 @@
+Test-parallel-comm3b.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-parallel-comm3b
diff --git a/applications/test/parallel-comm3b/Make/options b/applications/test/parallel-comm3b/Make/options
new file mode 100644
index 0000000000..e0747ecc63
--- /dev/null
+++ b/applications/test/parallel-comm3b/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC */
+/* EXE_LIBS = */
diff --git a/applications/test/parallel-comm3b/Test-parallel-comm3b.C b/applications/test/parallel-comm3b/Test-parallel-comm3b.C
new file mode 100644
index 0000000000..0bbcc5da5e
--- /dev/null
+++ b/applications/test/parallel-comm3b/Test-parallel-comm3b.C
@@ -0,0 +1,228 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-parallel-comm3b
+
+Description
+    Basic communicator tests
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "IPstream.H"
+#include "OPstream.H"
+#include "Pair.H"
+#include "Tuple2.H"
+#include "IOstreams.H"
+#include "StringStream.H"
+#include "Random.H"
+
+using namespace Foam;
+
+
+void printRequests(const UList<UPstream::Request>& requests)
+{
+    OStringStream buf;
+
+    buf << "request: " << requests.size() << '(';
+
+    for (const auto& req : requests)
+    {
+        if (req.good())
+        {
+            buf << " " << Foam::name(req.pointer());
+        }
+        else
+        {
+            buf << " null";
+        }
+    }
+
+    buf << " )";
+    Pout << buf.str().c_str() << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noCheckProcessorDirectories();
+
+    #include "setRootCase.H"
+
+    if (!Pstream::parRun())
+    {
+        Info<< "\nWarning: not parallel - skipping further tests\n" << endl;
+        return 0;
+    }
+
+    const int tag = (UPstream::msgType() + 314159);
+    const label comm = UPstream::worldComm;
+
+    Random rnd(20*UPstream::myProcNo());
+
+    Map<DynamicList<char>> sendBufs;
+    Map<DynamicList<char>> recvBufs;
+
+    DynamicList<UPstream::Request> sendRequests(10);
+    DynamicList<UPstream::Request> recvRequests(10);
+
+    // Map request indices to procs
+    Map<label> recvFromProc(20);
+
+    if (!Pstream::master())
+    {
+        // Send some random length to master
+
+        const int toProci = UPstream::masterNo();
+
+        label len = rnd.position<label>(10, 20);
+        if (UPstream::myProcNo() && (UPstream::myProcNo() % 3) == 0) len = 0;
+
+        // Has data to send
+        if (len)
+        {
+            auto& buf = sendBufs(toProci);
+            buf.resize(len, 'x');
+
+            UOPstream::write
+            (
+                sendRequests.emplace_back(),
+                UPstream::masterNo(),
+                sendBufs[toProci],
+                tag,
+                comm,
+                UPstream::sendModes::sync
+            );
+        }
+    }
+
+
+    // Probe and receive
+
+    UPstream::Request barrierReq;
+
+    for (bool barrier_active = false, done = false; !done; /*nil*/)
+    {
+        std::pair<int, int> probed =
+            UPstream::probeMessage
+            (
+                UPstream::commsTypes::nonBlocking,
+                -1,  // ANY_SOURCE
+                tag,
+                comm
+            );
+
+        if (probed.second > 0)
+        {
+            // Message found and had size: receive it
+
+            const label proci = probed.first;
+            const label count = probed.second;
+
+            recvBufs(proci).resize_nocopy(count);
+            recvFromProc(recvRequests.size()) = proci;
+
+            // Non-blocking read
+            UIPstream::read
+            (
+                recvRequests.emplace_back(),
+                proci,
+                recvBufs[proci],
+                tag,
+                comm
+            );
+        }
+
+        if (barrier_active)
+        {
+            // Test barrier for completion
+            if (UPstream::finishedRequest(barrierReq))
+            {
+                done = true;
+            }
+        }
+        else
+        {
+            // Check if all sends have arrived
+            if (UPstream::finishedRequests(sendRequests))
+            {
+                UPstream::barrier(comm, &barrierReq);
+                barrier_active = true;
+            }
+        }
+    }
+
+    if (recvRequests.empty())
+    {
+        Pout << "No receive requests" << endl;
+    }
+    else
+    {
+        printRequests(recvRequests);
+    }
+
+
+    // Either MPI_Waitall, or MPI_Waitany...
+
+    label loop = 0;
+    for (bool dispatched = recvRequests.empty(); !dispatched; /*nil*/)
+    {
+        label index = UPstream::waitAnyRequest(recvRequests);
+
+        if (index < 0)
+        {
+            Pout<< "Waitany (loop:" << loop << ") : done" << endl;
+            dispatched = true;
+        }
+        else
+        {
+            Pout<< "Waitany (loop:"
+                << loop << ") "
+                << index << " of " << recvRequests.size()
+                << " from proc:" << recvFromProc.lookup(index, -1)
+                << endl;
+
+            printRequests(recvRequests);
+        }
+        ++loop;
+    }
+
+    // Not needed: all tested...
+    // UPstream::waitRequest(recvRequests);
+
+    UPstream::barrier(UPstream::worldComm);
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 6a39ea574b..678747ec26 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -506,6 +506,11 @@ public:
             //  A no-op if parRun() == false or the list is empty
             static void waitRequests(UList<UPstream::Request>& requests);
 
+            //- Wait until any request has finished and return its index.
+            //  Returns -1 if parRun() == false, or the list is empty,
+            //  or if all the requests have already been handled
+            static label waitAnyRequest(UList<UPstream::Request>& requests);
+
             //- Wait until request i has finished.
             //  A no-op if parRun() == false,
             //  there are no pending requests,
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index 89e719592c..b158f9e8b7 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -56,6 +56,11 @@ void Foam::UPstream::resetRequests(const label n) {}
 void Foam::UPstream::waitRequests(const label pos) {}
 void Foam::UPstream::waitRequests(UList<UPstream::Request>&) {}
 
+Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>&)
+{
+    return -1;
+}
+
 void Foam::UPstream::waitRequest(const label i) {}
 void Foam::UPstream::waitRequest(UPstream::Request&) {}
 
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index ae978a057a..603b638a85 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -170,6 +170,57 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 }
 
 
+Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>& requests)
+{
+    // No-op for non-parallel or no pending requests
+    if (!UPstream::parRun() || requests.empty())
+    {
+        return -1;
+    }
+
+    // Looks ugly but is legitimate since UPstream::Request is an intptr_t,
+    // which is always large enough to hold an MPI_Request (int or pointer)
+
+    label count = 0;
+    auto* waitRequests = reinterpret_cast<MPI_Request*>(requests.data());
+
+    // Transcribe UPstream::Request into MPI_Request
+    // - do not change locations within the list since these are relevant
+    //   for the return index.
+    for (auto& req : requests)
+    {
+        waitRequests[count] = PstreamDetail::Request::get(req);
+        ++count;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets request to MPI_REQUEST_NULL
+    int index = -1;
+    if (MPI_Waitany(count, waitRequests, &index, MPI_STATUS_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Waitany returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    if (index == MPI_UNDEFINED)
+    {
+        index = -1;  // No outstanding requests
+    }
+
+    // Transcribe MPI_Request back into UPstream::Request
+    while (--count >= 0)
+    {
+        requests[count] = UPstream::Request(waitRequests[count]);
+    }
+
+    return index;
+}
+
+
 // FUTURE?
 //
 /// void Foam::UPstream::waitRequests

From 750381bd993fdb758b35166650ac99edb757b47d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Feb 2023 11:21:15 +0100
Subject: [PATCH 056/348] ENH: HashTable/HashSet contains(key) method

- functionality provided as 'found(key)' in OpenFOAM naming, since
  there was no stl equivalent at the time. Now support contains(),
  which is the equivalent for C++20 maps/sets.

STYLE: general contains() method for containers

STYLE: treat Enum and Switch similarly as hash-like objects
---
 src/OpenFOAM/containers/Bits/bitSet/bitSet.H  | 15 ++++---
 src/OpenFOAM/containers/Bits/bitSet/bitSetI.H | 12 ------
 .../containers/Buffers/CircularBuffer.H       | 14 +++++--
 .../containers/Buffers/CircularBufferI.H      |  6 +--
 .../DictionaryBase/DictionaryBase.C           |  8 ++--
 .../DictionaryBase/DictionaryBase.H           |  7 +++-
 .../HashTables/HashPtrTable/HashPtrTableI.H   |  2 +-
 .../containers/HashTables/HashSet/HashSet.C   | 12 +++---
 .../containers/HashTables/HashSet/HashSet.H   | 10 ++---
 .../HashTables/HashTable/HashTable.C          |  4 +-
 .../HashTables/HashTable/HashTable.H          | 41 +++++++++++--------
 .../HashTables/HashTable/HashTableI.H         |  4 +-
 .../IndirectListBase/IndirectListBase.H       | 15 +++++--
 .../IndirectListBase/IndirectListBaseI.H      |  4 +-
 .../Lists/DynamicList/DynamicListI.H          |  2 +-
 .../containers/Lists/FixedList/FixedList.H    | 15 +++++--
 .../containers/Lists/FixedList/FixedListI.H   |  8 +---
 src/OpenFOAM/containers/Lists/List/ListI.H    |  2 +-
 src/OpenFOAM/containers/Lists/List/UList.H    | 12 ++++--
 src/OpenFOAM/containers/Lists/List/UListI.H   |  2 +-
 .../Lists/ListOps/ListOpsTemplates.C          |  5 ++-
 .../db/objectRegistry/objectRegistry.C        |  2 +-
 .../db/objectRegistry/objectRegistry.H        | 12 ++++--
 .../interpolationLookUpTable.C                |  4 +-
 .../interpolationLookUpTable.H                | 14 +++++--
 src/OpenFOAM/meshes/meshShapes/edge/edge.H    | 12 ++++--
 src/OpenFOAM/meshes/meshShapes/edge/edgeI.H   |  8 ++--
 src/OpenFOAM/meshes/meshShapes/face/faceI.H   |  4 +-
 src/OpenFOAM/primitives/bools/Switch/Switch.C |  4 +-
 src/OpenFOAM/primitives/bools/Switch/Switch.H | 22 +++++-----
 src/OpenFOAM/primitives/enums/Enum.H          | 21 ++++++----
 src/OpenFOAM/primitives/enums/EnumI.H         | 10 ++---
 .../predicates/scalar/scalarPredicates.H      | 27 ++++++++----
 .../predicates/scalar/scalarPredicatesI.H     |  4 +-
 .../primitives/strings/lists/hashedWordList.H | 16 ++++----
 .../strings/lists/hashedWordListI.H           |  8 ++--
 36 files changed, 212 insertions(+), 156 deletions(-)

diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
index 1ed379e172..b6f11d469c 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -260,15 +260,17 @@ public:
         //  \note Method name compatibility with boost::dynamic_bitset
         bool intersects(const bitSet& other) const;
 
-        //- Test value at specified position, never auto-vivify entries.
+        //- Test for \em True value at specified position,
+        //- never auto-vivify entries.
         //
         //  \note Method name compatibility with std::bitset
-        inline bool test(const label pos) const;
+        bool test(const label pos) const { return this->get(pos); }
 
-        //- Test value at specified position, never auto-vivify entries.
+        //- Test for \em True value at specified position,
+        //- never auto-vivify entries.
         //
         //  \note Method name compatibility with HashSet
-        inline bool found(const label pos) const;
+        bool contains(const label pos) const { return this->get(pos); }
 
         //- Locate the first bit that is set.
         //  \return the location or -1 if there are no bits set.
@@ -611,6 +613,9 @@ public:
 
     // Housekeeping
 
+        //- Same as contains()
+        bool found(const label pos) const { return this->contains(pos); }
+
         //- Deprecated(2020-11) use fill()
         //  \deprecated(2020-11) use fill()
         void assign(const unsigned int val) { this->fill(val); }
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H b/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
index a32f68db8b..11c03310f9 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetI.H
@@ -518,18 +518,6 @@ inline unsigned int Foam::bitSet::count(const bool on) const
 }
 
 
-inline bool Foam::bitSet::test(const label pos) const
-{
-    return get(pos);
-}
-
-
-inline bool Foam::bitSet::found(const label pos) const
-{
-    return get(pos);
-}
-
-
 inline Foam::labelList Foam::bitSet::sortedToc() const
 {
     return toc();
diff --git a/src/OpenFOAM/containers/Buffers/CircularBuffer.H b/src/OpenFOAM/containers/Buffers/CircularBuffer.H
index dcee40e2cd..a9605714b9 100644
--- a/src/OpenFOAM/containers/Buffers/CircularBuffer.H
+++ b/src/OpenFOAM/containers/Buffers/CircularBuffer.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -288,11 +288,11 @@ public:
         //  \return position in list or -1 if not found.
         label find(const T& val, label pos = 0) const;
 
-        //- True if the value if found in the list.
+        //- Is the value contained in the list?
+        //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  Linear search.
         //  \return true if found.
-        inline bool found(const T& val, label pos = 0) const;
+        inline bool contains(const T& val, label pos = 0) const;
 
 
     // Stack-like Operations
@@ -480,6 +480,12 @@ public:
 
     // Housekeeping
 
+        //- Same as contains()
+        bool found(const T& val, label pos = 0) const
+        {
+            return contains(val, pos);
+        }
+
         //- Access the first element (front). Requires !empty().
         //FOAM_DEPRECATED_FOR(2022-10, "front()")
         T& first() { return front(); }
diff --git a/src/OpenFOAM/containers/Buffers/CircularBufferI.H b/src/OpenFOAM/containers/Buffers/CircularBufferI.H
index af2c29d794..d6ffa2ec81 100644
--- a/src/OpenFOAM/containers/Buffers/CircularBufferI.H
+++ b/src/OpenFOAM/containers/Buffers/CircularBufferI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -256,7 +256,7 @@ inline void Foam::CircularBuffer<T>::reserve_nocopy(const label len)
 
 
 template<class T>
-inline bool Foam::CircularBuffer<T>::found(const T& val, label pos) const
+inline bool Foam::CircularBuffer<T>::contains(const T& val, label pos) const
 {
     return (this->find(val, pos) >= 0);
 }
@@ -395,7 +395,7 @@ inline void Foam::CircularBuffer<T>::pop_back(label n)
 template<class T>
 inline Foam::label Foam::CircularBuffer<T>::push_uniq(const T& val)
 {
-    if (this->found(val))
+    if (this->contains(val))
     {
         return 0;
     }
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index d49a3c82cb..79c4b8f43c 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,9 +87,9 @@ Foam::DictionaryBase<IDLListType, T>::DictionaryBase(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class IDLListType, class T>
-bool Foam::DictionaryBase<IDLListType, T>::found(const word& keyword) const
+bool Foam::DictionaryBase<IDLListType, T>::contains(const word& keyword) const
 {
-    return hashedTs_.found(keyword);
+    return hashedTs_.contains(keyword);
 }
 
 
@@ -217,7 +217,7 @@ T* Foam::DictionaryBase<IDLListType, T>::remove(const word& keyword)
 
     if (iter.found())
     {
-        T* ptr = IDLListType::remove(iter());
+        T* ptr = IDLListType::remove(iter.val());
         hashedTs_.erase(iter);
         return ptr;
     }
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
index e94927e374..6d14d85d04 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,7 +114,7 @@ public:
         // Search and lookup
 
             //- Search for given keyword
-            bool found(const word& keyword) const;
+            bool contains(const word& keyword) const;
 
             //- Find and return an entry, nullptr on failure.
             const T* cfind(const word& keyword) const;
@@ -188,6 +188,9 @@ public:
 
     // Housekeeping
 
+        //- Same as contains()
+        bool found(const word& key) const { return this->contains(key); }
+
         //- Deprecated(2020-03) use cfind()
         //  \deprecated(2020-03) - use cfind() method
         FOAM_DEPRECATED_FOR(2020-03, "cfind() method")
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
index 50f29c4415..682d24c8f6 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
@@ -87,7 +87,7 @@ inline bool Foam::HashPtrTable<T, Key, Hash>::emplace
     // Use insertion semantics
     return
     (
-        !parent_type::found(key)
+        !parent_type::contains(key)
      && this->parent_type::set(key, new T(std::forward<Args>(args)...))
     );
 }
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 1315f1ee9f..02d2390f66 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -237,14 +237,14 @@ inline Foam::label Foam::HashSet<Key, Hash>::unset
 template<class Key, class Hash>
 inline bool Foam::HashSet<Key, Hash>::operator()(const Key& key) const noexcept
 {
-    return this->found(key);
+    return this->contains(key);
 }
 
 
 template<class Key, class Hash>
 inline bool Foam::HashSet<Key, Hash>::operator[](const Key& key) const noexcept
 {
-    return this->found(key);
+    return this->contains(key);
 }
 
 
@@ -281,7 +281,7 @@ bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
 
     for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
-        if (!this->found(iter.key()))
+        if (!this->contains(iter.key()))
         {
             return false;
         }
@@ -328,7 +328,7 @@ Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
     // Add missed rhs elements, remove duplicate elements
     for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
-        if (this->found(iter.key()))
+        if (this->contains(iter.key()))
         {
             this->erase(iter.key());
         }
@@ -395,7 +395,7 @@ Foam::HashSet<Key, Hash> Foam::operator&
 
     for (const Key& k : a)
     {
-        if (b.found(k))
+        if (b.contains(k))
         {
             result.insert(k);
         }
@@ -429,7 +429,7 @@ Foam::HashSet<Key, Hash> Foam::operator-
 
     for (const Key& k : a)
     {
-        if (!b.found(k))
+        if (!b.contains(k))
         {
             result.insert(k);
         }
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 042211fc19..141fad2696 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -176,11 +176,11 @@ public:
 
     // Member Functions
 
-        //- Same as found() - return true if key exists in the set.
+        //- Same as contains() - return true if key exists in the set.
         //  Method name compatibility with bitSet and boolList.
         bool test(const Key& key) const
         {
-            return this->found(key);
+            return this->contains(key);
         }
 
 
@@ -322,11 +322,11 @@ public:
 
     // Member Operators
 
-        //- Return true if the entry exists, same as found()
+        //- Return true if the entry exists, same as contains()
         //  \note this allows use of HashSet as a predicate test
         inline bool operator()(const Key& key) const noexcept;
 
-        //- Return true if the entry exists, same as found().
+        //- Return true if the entry exists, same as contains().
         inline bool operator[](const Key& key) const noexcept;
 
         //- Copy assign
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index ef58ea00ca..94d91e5d80 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -553,7 +553,7 @@ Foam::label Foam::HashTable<T, Key, Hash>::erase
             ++iter
         )
         {
-            if (other.found(iter.key()) && erase(iter))
+            if (other.contains(iter.key()) && erase(iter))
             {
                 ++changed;
             }
@@ -586,7 +586,7 @@ Foam::label Foam::HashTable<T, Key, Hash>::retain
 
         for (iterator iter = begin(); iter != end(); ++iter)
         {
-            if (!other.found(iter.key()) && erase(iter))
+            if (!other.contains(iter.key()) && erase(iter))
             {
                 ++changed;
             }
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index d46dd8eae6..dcec3f00fa 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +57,7 @@ Note
         forAllConstIters(table, iter)
         {
             Info<< "val:" << *iter << nl
-                << "key:" << iter.key() << nl;
+                << "key:" << iter.key() << nl
                 << "val:" << iter.val() << nl;
         }
     \endcode
@@ -213,18 +213,6 @@ private:
         Ostream& writeTable(Ostream& os) const;
 
 
-protected:
-
-        //- Internally used base for iterator and const_iterator
-        template<bool Const> class Iterator;
-
-        //- An iterator with const access to HashTable internals.
-        friend class Iterator<true>;
-
-        //- An iterator with non-const access to HashTable internals.
-        friend class Iterator<false>;
-
-
 public:
 
     // Constructors
@@ -272,8 +260,8 @@ public:
         //- Find and return a hashed entry. FatalError if it does not exist.
         inline const T& at(const Key& key) const;
 
-        //- True if hashed key is found in table
-        inline bool found(const Key& key) const;
+        //- True if hashed key is contained (found) in table
+        inline bool contains(const Key& key) const;
 
         //- Find and return an iterator set at the hashed entry
         //  If not found iterator = end()
@@ -548,9 +536,11 @@ public:
     // Member Operators
 
         //- Find and return a hashed entry. FatalError if it does not exist.
+        //  Same as at().
         inline T& operator[](const Key& key);
 
         //- Find and return a hashed entry. FatalError if it does not exist.
+        //  Same as at().
         inline const T& operator[](const Key& key) const;
 
         //- Return existing entry or create a new entry.
@@ -586,6 +576,15 @@ protected:
 
     // Iterators and helpers
 
+        //- Internally used base for iterator and const_iterator
+        template<bool Const> class Iterator;
+
+        //- Allow iterator access to HashTable internals.
+        friend class Iterator<true>;
+
+        //- Allow iterator access to HashTable internals.
+        friend class Iterator<false>;
+
         //- The iterator base for HashTable (internal use only).
         //  Note: data and functions are protected, to allow reuse by iterator
         //  and prevent most external usage.
@@ -908,13 +907,13 @@ public:
             reference operator*() const  { return this->key(); }
             reference operator()() const { return this->key(); }
 
-            inline key_iterator_base& operator++()
+            key_iterator_base& operator++()
             {
                 this->increment();
                 return *this;
             }
 
-            inline key_iterator_base operator++(int)
+            key_iterator_base operator++(int)
             {
                 key_iterator_base iter(*this);
                 this->increment();
@@ -981,6 +980,12 @@ public:
             Ostream&,
             const HashTable<T, Key, Hash>& tbl
         );
+
+
+    // Housekeeping
+
+        //- Same as contains()
+        bool found(const Key& key) const { return this->contains(key); }
 };
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 86fd95a488..4fa30d87f0 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,7 +76,7 @@ inline const T& Foam::HashTable<T, Key, Hash>::at(const Key& key) const
 
 
 template<class T, class Key, class Hash>
-inline bool Foam::HashTable<T, Key, Hash>::found(const Key& key) const
+inline bool Foam::HashTable<T, Key, Hash>::contains(const Key& key) const
 {
     if (size_)
     {
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H
index 16b4d2c81a..873c43051a 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -191,10 +191,11 @@ public:
         //  \return -1 if not found.
         label rfind(const T& val, label pos = -1) const;
 
-        //- True if the value if found in the list.
+        //- Is the value contained in the list?
+        //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  Linear search.
-        inline bool found(const T& val, label pos=0) const;
+        //  \return true if found.
+        inline bool contains(const T& val, label pos = 0) const;
 
 
     // Member Operators
@@ -382,6 +383,12 @@ public:
         //- Access last element of the list, position [size()-1]
         //FOAM_DEPRECATED_FOR(2022-10, "back()")
         const T& last() const { return back(); };
+
+        //- Same as contains()
+        bool found(const T& val, label pos = 0) const
+        {
+            return this->contains(val, pos);
+        }
 };
 
 
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H
index 45afc104ce..f682f0c8bc 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -99,7 +99,7 @@ inline bool Foam::IndirectListBase<T, Addr>::uniform() const
 
 
 template<class T, class Addr>
-inline bool Foam::IndirectListBase<T, Addr>::found
+inline bool Foam::IndirectListBase<T, Addr>::contains
 (
     const T& val,
     label pos
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 12ea3ac670..27d3209987 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -661,7 +661,7 @@ inline void Foam::DynamicList<T, SizeMin>::push_back
 template<class T, int SizeMin>
 inline Foam::label Foam::DynamicList<T, SizeMin>::push_uniq(const T& val)
 {
-    if (this->found(val))
+    if (this->contains(val))
     {
         return 0;
     }
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 6d172d0df4..28ed899ba4 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -293,10 +293,11 @@ public:
         //  \return position in list or -1 if not found.
         label rfind(const T& val, label pos = -1) const;
 
-        //- True if the value if found in the list.
+        //- Is the value contained in the list?
+        //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  Linear search.
-        inline bool found(const T& val, label pos = 0) const;
+        //  \return true if found.
+        inline bool contains(const T& val, label pos = 0) const;
 
 
     // Edit
@@ -522,6 +523,12 @@ public:
 
         //- Access last element of the list, position [N-1] - back()
         const T& last() const noexcept { return back(); }
+
+        //- Same as contains()
+        bool found(const T& val, label pos = 0) const
+        {
+            return this->contains(val, pos);
+        }
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index c2718e2aba..25874664b5 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -345,11 +345,7 @@ inline bool Foam::FixedList<T, N>::uniform() const
 
 
 template<class T, unsigned N>
-inline bool Foam::FixedList<T, N>::found
-(
-    const T& val,
-    label pos
-) const
+inline bool Foam::FixedList<T, N>::contains(const T& val, label pos) const
 {
     return (this->find(val, pos) >= 0);
 }
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index e50b8fc18f..0ae68fbf20 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -248,7 +248,7 @@ inline void Foam::List<T>::push_back(const IndirectListBase<T, Addr>& list)
 template<class T>
 inline Foam::label Foam::List<T>::push_uniq(const T& val)
 {
-    if (this->found(val))
+    if (this->contains(val))
     {
         return 0;
     }
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index ac241aef9a..2c6339e1c9 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -325,11 +325,11 @@ public:
         //  \return position in list or -1 if not found.
         label rfind(const T& val, label pos = -1) const;
 
-        //- True if the value if found in the list.
+        //- Is the value contained in the list?
+        //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  Linear search.
         //  \return true if found.
-        inline bool found(const T& val, label pos = 0) const;
+        inline bool contains(const T& val, label pos = 0) const;
 
 
     // Edit
@@ -611,6 +611,12 @@ public:
         //- Access last element of the list, position [size()-1]
         //FOAM_DEPRECATED_FOR(2022-10, "back()")
         const T& last() const { return back(); };
+
+        //- Same as contains()
+        bool found(const T& val, label pos = 0) const
+        {
+            return this->contains(val, pos);
+        }
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/UListI.H b/src/OpenFOAM/containers/Lists/List/UListI.H
index 6d9519fb8b..93f6a1788c 100644
--- a/src/OpenFOAM/containers/Lists/List/UListI.H
+++ b/src/OpenFOAM/containers/Lists/List/UListI.H
@@ -262,7 +262,7 @@ inline std::streamsize Foam::UList<T>::size_bytes() const noexcept
 
 
 template<class T>
-inline bool Foam::UList<T>::found(const T& val, label pos) const
+inline bool Foam::UList<T>::contains(const T& val, label pos) const
 {
     return (this->find(val, pos) >= 0);
 }
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index cb0c0db8ce..7cb9e521ae 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1095,7 +1095,8 @@ void Foam::ListOps::uniqueEqOp<T>::operator()
         {
             for (const T& val : y)
             {
-                if (!x.found(val))
+                // --> x.push_uniq(val)
+                if (!x.contains(val))
                 {
                     x.push_back(val);
                 }
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 044d6c92c7..af4e2b6f12 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -450,7 +450,7 @@ const Foam::regIOobject* Foam::objectRegistry::cfindIOobject
 }
 
 
-bool Foam::objectRegistry::found
+bool Foam::objectRegistry::contains
 (
     const word& name,
     const bool recursive
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 00145b1ee1..d8a56712bb 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -413,11 +413,11 @@ public:
             const bool recursive = false
         ) const;
 
-        //- Can the regIOobject object be found (by name).
+        //- Does the registry contain the regIOobject object (by name).
         //
+        //  \param name the object name
         //  \param recursive search parent registries
-        bool found(const word& name, const bool recursive = false) const;
-
+        bool contains(const word& name, const bool recursive = false) const;
 
         //- Is the named Type found?
         //
@@ -591,6 +591,12 @@ public:
 
     // Housekeeping
 
+        //- Same as contains()
+        bool found(const word& name, bool recursive = false) const
+        {
+            return this->contains(name, recursive);
+        }
+
         //- Deprecated(2018-10) find object
         //  \deprecated(2018-10) - use findObject() method
         template<class Type>
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index afb4f37542..d1fb03cc0f 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -424,9 +424,9 @@ Foam::interpolationLookUpTable<Type>::operator[](const label i) const
 
 
 template<class Type>
-bool Foam::interpolationLookUpTable<Type>::found(const word& fieldName) const
+bool Foam::interpolationLookUpTable<Type>::contains(const word& fieldName) const
 {
-    return fieldIndices_.found(fieldName);
+    return fieldIndices_.contains(fieldName);
 }
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H
index fd9f0c3cf4..e3f142daf8 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef interpolationLookUpTable_H
-#define interpolationLookUpTable_H
+#ifndef Foam_interpolationLookUpTable_H
+#define Foam_interpolationLookUpTable_H
 
 #include "List.H"
 #include "ListOps.H"
@@ -162,7 +162,7 @@ public:
     // Member Functions
 
         //- Return true if the field exists in the table
-        bool found(const word& fieldName) const;
+        bool contains(const word& fieldName) const;
 
         //- Return the output list given a single input scalar
         const List<scalar>& lookUp(const scalar);
@@ -212,6 +212,14 @@ public:
         //- Return an element of List<scalar, Type>
         scalarField& operator[](const label);
 
+
+    // Housekeeping
+
+        //- Same as contains()
+        bool found(const word& fieldName) const
+        {
+            return this->contains(fieldName);
+        }
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index bc653b49c9..5557ce4045 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -153,9 +153,9 @@ public:
         //- True if the vertices are unique and non-negative.
         bool valid() const noexcept { return good(); }
 
-        //- Return true if point label is found in edge.
+        //- Return true if the point label is contained in the edge.
         //  Always false for a negative label.
-        inline bool found(const label pointLabel) const;
+        inline bool contains(const label pointLabel) const;
 
         //- Return local index (0,1) of point label in edge -1 on failure
         //  Always return -1 for a negative label.
@@ -321,6 +321,12 @@ public:
             }
         };
 
+
+    // Housekeeping
+
+        //- Same as contains()
+        bool found(label vertex) const { return contains(vertex); }
+
         //- Deprecated(2021-04) hashing functor. Use hasher()
         // \deprecated(2021-04) - use hasher() functor
         template<class Unused=bool>
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
index 761948e2d0..879a413de1 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
@@ -110,7 +110,7 @@ inline bool Foam::edge::good() const noexcept
 }
 
 
-inline bool Foam::edge::found(const label pointLabel) const
+inline bool Foam::edge::contains(const label pointLabel) const
 {
     // -1: always false
     return
@@ -142,17 +142,17 @@ inline Foam::label Foam::edge::which(const label pointLabel) const
 
 inline bool Foam::edge::connected(const edge& other) const
 {
-    return (other.found(first()) || other.found(second()));
+    return (other.contains(first()) || other.contains(second()));
 }
 
 
 inline Foam::label Foam::edge::commonVertex(const edge& other) const
 {
-    if (other.found(first()))
+    if (other.contains(first()))
     {
         return first();
     }
-    if (other.found(second()))
+    if (other.contains(second()))
     {
         return second();
     }
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index f54203a27e..fee4a2049c 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -209,7 +209,7 @@ inline bool Foam::face::connected(const labelUList& other) const
 {
     for (const label pointi : *this)
     {
-        if (other.found(pointi))
+        if (other.contains(pointi))
         {
             return true;
         }
@@ -223,7 +223,7 @@ inline bool Foam::face::connected(const FixedList<label, N>& other) const
 {
     for (const label pointi : *this)
     {
-        if (other.found(pointi))
+        if (other.contains(pointi))
         {
             return true;
         }
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C
index 36a4647b3d..8e3528e048 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -154,7 +154,7 @@ Foam::Switch Foam::Switch::find(const std::string& str)
 }
 
 
-bool Foam::Switch::found(const std::string& str)
+bool Foam::Switch::contains(const std::string& str)
 {
     return (switchType::INVALID != parse(str, false));  // failOnError=false
 }
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.H b/src/OpenFOAM/primitives/bools/Switch/Switch.H
index b6e44fe89b..a420eaddd8 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -209,13 +209,13 @@ public:
         //- A string representation of bool as "false" / "true"
         static const char* name(const bool b) noexcept;
 
+        //- True if there is a switch type corresponding to the given string.
+        static bool contains(const std::string& str);
+
         //- Find switchType for the given string, returning as a Switch that
         //- can be tested for good() or bad().
         static Switch find(const std::string& str);
 
-        //- Test if there is a switch type corresponding to the given string.
-        static bool found(const std::string& str);
-
 
     // Member Functions
 
@@ -271,6 +271,9 @@ public:
 
     // Housekeeping
 
+        //- Same as contains()
+        static bool found(const std::string& str) { return contains(str); }
+
         //- Deprecated(2020-01) From string with/without bad input test
         //  \deprecated(2020-01) - confusing syntax, use static find() method
         FOAM_DEPRECATED_FOR(2019-02, "static find() method")
@@ -281,13 +284,10 @@ public:
         FOAM_DEPRECATED_FOR(2019-02, "static find() method")
         Switch(const char* str, bool allowBad);
 
-        //- Deprecated(2020-01) Use good() method, or static found() method
-        //  \deprecated(2020-01) Use good() method, or static found() method
-        FOAM_DEPRECATED_FOR(2019-02, "good() or static found() method")
-        bool valid() const noexcept
-        {
-            return good();
-        }
+        //- Deprecated(2020-01) Use good() method, or static contains() method
+        //  \deprecated(2020-01) Use good() method, or static contains() method
+        FOAM_DEPRECATED_FOR(2019-02, "good() or static contains() method")
+        bool valid() const noexcept { return good(); }
 
         //- Same as getOrAddToDict()
         static Switch lookupOrAddToDict
diff --git a/src/OpenFOAM/primitives/enums/Enum.H b/src/OpenFOAM/primitives/enums/Enum.H
index 7427062310..321e2ec4a1 100644
--- a/src/OpenFOAM/primitives/enums/Enum.H
+++ b/src/OpenFOAM/primitives/enums/Enum.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -139,6 +139,12 @@ public:
 
     // Query
 
+        //- True if there is an enumeration corresponding to the given name.
+        inline bool contains(const word& enumName) const;
+
+        //- True if there is a name corresponding to the given enumeration.
+        inline bool contains(const EnumType e) const;
+
         //- Find the index of the given name.
         //  \return position in list or -1 if not found.
         inline label find(const word& enumName) const;
@@ -147,12 +153,6 @@ public:
         //  \return position in list or -1 if not found.
         inline label find(const EnumType e) const;
 
-        //- True if there is an enumeration corresponding to the given name.
-        inline bool found(const word& enumName) const;
-
-        //- True if there is a name corresponding to the given enumeration.
-        inline bool found(const EnumType e) const;
-
         //- The enumeration corresponding to the given name.
         //  FatalError if not found.
         EnumType get(const word& enumName) const;
@@ -319,7 +319,6 @@ public:
             return getOrDefault(key, dict, deflt, failsafe);
         }
 
-
         //- Deprecated(2020-11) use get() method
         //  \deprecated(2020-11) - use get() method
         FOAM_DEPRECATED_FOR(2020-11, "get() method")
@@ -361,6 +360,12 @@ public:
         {
             push_back(list);
         }
+
+        //- Same as contains()
+        bool found(const word& enumName) const { return contains(enumName); }
+
+        //- Same as contains()
+        bool found(const EnumType e) const { return contains(e); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/enums/EnumI.H b/src/OpenFOAM/primitives/enums/EnumI.H
index c011692dd2..4a8a3d0086 100644
--- a/src/OpenFOAM/primitives/enums/EnumI.H
+++ b/src/OpenFOAM/primitives/enums/EnumI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -100,16 +100,16 @@ inline Foam::label Foam::Enum<EnumType>::find(const EnumType e) const
 
 
 template<class EnumType>
-inline bool Foam::Enum<EnumType>::found(const word& enumName) const
+inline bool Foam::Enum<EnumType>::contains(const word& enumName) const
 {
-    return keys_.found(enumName);
+    return keys_.contains(enumName);
 }
 
 
 template<class EnumType>
-inline bool Foam::Enum<EnumType>::found(const EnumType e) const
+inline bool Foam::Enum<EnumType>::contains(const EnumType e) const
 {
-    return vals_.found(int(e));
+    return vals_.contains(int(e));
 }
 
 
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
index 0f8d1315cf..3107efe1c4 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -270,7 +270,7 @@ public:
 
     // Search
 
-        //- Index of the first match for the value.
+        //- Index of the first matching test for the value.
         //  Any occurrences before the start pos are ignored.
         //  Linear search.
         //  \return position in list or -1 if not found.
@@ -282,23 +282,23 @@ public:
         //  \return position in list or -1 if not found.
         label rfind(const scalar value, label pos = -1) const;
 
-        //- True if the value matches any in the list.
+        //- True if the value matches in the list.
+        //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  Linear search.
         //  \return true if found.
-        inline bool found(const scalar value, label pos=0) const;
+        inline bool contains(const scalar value, label pos = 0) const;
 
-        //- Match any condition in the list.
+        //- Match \em any condition in the list.
         //
         //  \return True if the value matches any condition in the list.
         inline bool match(const scalar value) const;
 
-        //- Match any condition in the list.
+        //- Match \em any condition in the list.
         //
         //  \return True if the value matches any condition in the list.
         inline bool matchAny(const scalar value) const;
 
-        //- Match all conditions in the list.
+        //- Match \em all conditions in the list.
         //
         //  \return True if the value matches all conditions in the list.
         inline bool matchAll(const scalar value) const;
@@ -324,8 +324,17 @@ public:
 
     // Member Operators
 
-        //- Identical to found(), match(), for use as a predicate.
+        //- Identical to contains(), match(), for use as a predicate.
         inline bool operator()(const scalar value) const;
+
+
+    // Housekeeping
+
+        //- Same as contains()
+        bool found(const scalar value, label pos = 0) const
+        {
+            return this->contains(value, pos);
+        }
 };
 
 
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
index 2275d29cdc..3f6fcf4b9e 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ inline Foam::predicates::scalars::unary Foam::predicates::scalars::operation
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::predicates::scalars::found
+inline bool Foam::predicates::scalars::contains
 (
     const scalar value,
     label pos
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
index 1e2cc0c27a..7be6f41e0b 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -142,8 +142,8 @@ public:
         //  \return position in list or -1 if not found.
         inline label find(const word& val) const;
 
-        //- True if the value if found in the list (searches the hash).
-        inline bool found(const word& val) const;
+        //- Is the value contained in the list (searches the hash).
+        inline bool contains(const word& val) const;
 
 
     // Member Operators
@@ -156,7 +156,7 @@ public:
         //  \return position in list or -1 if not found.
         inline label operator[](const word& val) const;
 
-        //- Check hashed values for the specified name - same as found().
+        //- Check hashed values for the specified name - same as contains().
         //  Can be used as a unary predicate.
         inline bool operator()(const word& val) const;
 
@@ -181,6 +181,9 @@ public:
 
     // Housekeeping
 
+        //- Same as contains(), searches the hash.
+        bool found(const word& val) const { return this->contains(val); }
+
         //- Append an element if not already in the list.
         FOAM_DEPRECATED_FOR(2022-05, "push_uniq method")
         void append(const word& val) { this->push_uniq(val); }
@@ -192,11 +195,6 @@ public:
         //- Append an element if not already in the list.
         //FOAM_DEPRECATED_FOR(2022-10, "push_uniq method")
         label appendUniq(const word& val) { return this->push_uniq(val); }
-
-        //- Deprecated(2019-01) Is the specified name found in the list?
-        //  \deprecated(2019-01) - use found() method
-        FOAM_DEPRECATED_FOR(2019-01, "found() method")
-        bool contains(const word& val) const { return this->found(val); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
index efb69f77dd..0c2b520cd7 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -130,9 +130,9 @@ inline Foam::label Foam::hashedWordList::find(const word& val) const
 }
 
 
-inline bool Foam::hashedWordList::found(const word& val) const
+inline bool Foam::hashedWordList::contains(const word& val) const
 {
-    return lookup().found(val);
+    return lookup().contains(val);
 }
 
 
@@ -201,7 +201,7 @@ inline Foam::label Foam::hashedWordList::operator[](const word& val) const
 
 inline bool Foam::hashedWordList::operator()(const word& val) const
 {
-    return lookup_.found(val);
+    return lookup_.contains(val);
 }
 
 

From d597b3f959de444a5fdb8eef28ba7ec2492bd1e0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Feb 2023 15:52:55 +0100
Subject: [PATCH 057/348] STYLE: check iterator validity with good() instead of
 found()

- aligns better with other container checks
---
 .../multiphaseMixtureThermo.C                 |  4 +-
 .../multiphaseMixture/multiphaseMixture.C     |  4 +-
 applications/test/Map/Test-Map.C              |  4 +-
 applications/test/syncTools/Test-syncTools.C  |  4 +-
 .../mesh/advanced/modifyMesh/cellSplitter.C   |  4 +-
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L   |  2 +-
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   | 10 ++--
 .../netgenNeutralToFoam/netgenNeutralToFoam.C |  2 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |  2 +-
 .../conversion/writeMeshObj/writeMeshObj.C    |  4 +-
 .../DelaunayMesh/DistributedDelaunayMesh.C    |  2 +-
 .../conformalVoronoiMeshConformToSurface.C    |  2 +-
 .../featurePointConformer.C                   |  2 +-
 .../pointPairs/pointPairs.C                   |  4 +-
 .../splitMeshRegions/splitMeshRegions.C       |  8 ++--
 .../foamDictionary/foamDictionary.C           |  6 +--
 .../decomposePar/domainDecompositionMesh.C    |  2 +-
 .../redistributePar/redistributePar.C         |  2 +-
 .../particleTracks/particleTracks.C           |  2 +-
 .../steadyParticleTracks.C                    |  4 +-
 .../changeDictionary/changeDictionary.C       |  2 +-
 src/OSspecific/MSwindows/MSwindows.C          |  4 +-
 src/OSspecific/MSwindows/fileStat/fileStat.H  | 10 +++-
 src/OSspecific/MSwindows/memInfo/memInfo.C    |  6 +--
 src/OSspecific/MSwindows/memInfo/memInfo.H    | 41 +++++++----------
 src/OSspecific/POSIX/POSIX.C                  |  4 +-
 src/OSspecific/POSIX/fileStat/fileStat.H      | 10 +++-
 src/OSspecific/POSIX/memInfo/memInfo.C        |  4 +-
 src/OSspecific/POSIX/memInfo/memInfo.H        | 40 +++++++---------
 .../DictionaryBase/DictionaryBase.C           | 18 ++++----
 .../Lists/ListOps/ListOpsTemplates.C          |  4 +-
 .../dynamicLibrary/dynamicCode/dynamicCode.C  |  2 +-
 .../functionObject/functionObject.C           |  2 +-
 .../functionObjectList/functionObjectList.C   |  2 +-
 .../db/objectRegistry/objectRegistry.C        |  6 +--
 .../objectRegistry/objectRegistryTemplates.C  |  4 +-
 .../construction/runTimeSelectionTables.H     |  6 +--
 .../exprDriver/exprDriverFunctions.C          |  2 +-
 .../exprDriver/exprDriverTemplates.C          |  2 +-
 .../exprResult/exprResultGlobals.C            |  8 ++--
 src/OpenFOAM/global/argList/argList.C         | 10 ++--
 .../fileOperation/fileOperation.C             |  2 +-
 .../masterUncollatedFileOperation.C           |  6 +--
 .../GAMGAgglomerateLduAddressing.C            |  2 +-
 .../cyclicGAMGInterface/cyclicGAMGInterface.C |  2 +-
 .../processorGAMGInterface.C                  |  2 +-
 .../Identifiers/patch/coupleGroupIdentifier.C |  2 +-
 .../meshes/lduMesh/lduPrimitiveMesh.C         |  2 +-
 .../meshShapes/cellMatcher/cellMatcher.C      |  2 +-
 .../meshes/meshShapes/face/oppositeFace.H     |  5 +-
 .../polyMesh/globalMeshData/globalMeshData.C  | 18 ++++----
 .../polyMesh/globalMeshData/globalPoints.C    |  8 ++--
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  6 +--
 .../constraint/cyclic/cyclicPolyPatch.C       |  6 +--
 .../polyMesh/syncTools/syncToolsTemplates.C   | 46 +++++++++----------
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C |  2 +-
 .../PatchTools/PatchToolsMatch.C              |  4 +-
 .../PatchTools/PatchToolsNormals.C            |  4 +-
 src/OpenFOAM/primitives/enums/NamedEnum.C     |  6 +--
 .../primitives/strings/stringOps/stringOps.C  |  4 +-
 src/Pstream/mpi/UPstreamWrappingTemplates.C   |  2 +-
 .../LES/LESdeltas/LESdelta/LESdelta.C         |  2 +-
 .../combustionModelTemplates.C                |  4 +-
 src/conversion/ccm/reader/ccmReaderAux.C      |  2 +-
 src/conversion/ccm/reader/ccmReaderMesh.C     |  6 +--
 src/conversion/common/reader/meshReaderAux.C  |  2 +-
 src/conversion/common/tables/cellTable.C      |  8 ++--
 src/conversion/starcd/STARCDMeshReader.C      |  2 +-
 .../attachDetach/attachInterface.C            |  2 +-
 .../createShellMesh/createShellMesh.C         |  2 +-
 .../fvMeshDistribute/fvMeshDistribute.C       |  6 +--
 .../layerAdditionRemoval/removeCellLayer.C    |  2 +-
 .../layerAdditionRemoval/setLayerPairing.C    |  2 +-
 src/dynamicMesh/meshCut/cellCuts/cellCuts.C   |  4 +-
 .../boundaryCutter/boundaryCutter.C           |  6 +--
 .../meshCutAndRemove/meshCutAndRemove.C       |  4 +-
 .../meshModifiers/meshCutter/meshCutter.C     |  4 +-
 .../multiDirRefinement/multiDirRefinement.C   |  4 +-
 .../undoableMeshCutter/undoableMeshCutter.C   |  4 +-
 .../displacementLayeredMotionMotionSolver.C   |  2 +-
 .../polyMeshAdder/faceCoupleInfo.C            |  2 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 14 +++---
 .../polyTopoChange/addPatchCellLayer.C        |  2 +-
 .../polyTopoChange/combineFaces.C             |  6 +--
 .../polyTopoChange/hexRef8/hexRef8.C          | 10 ++--
 .../enrichedPatch/enrichedPatchCutFaces.C     |  6 +--
 .../slidingInterface/slidingInterface.C       |  4 +-
 src/fileFormats/abaqus/ABAQUSCore.C           |  2 +-
 src/fileFormats/stl/STLAsciiParseI.H          |  2 +-
 src/fileFormats/stl/STLReader.C               |  2 +-
 .../vtk/file/foamVtkSeriesWriter.C            |  4 +-
 .../faMesh/faBoundaryMesh/faBoundaryMesh.C    |  2 +-
 .../fvMeshSubset/fvMeshSubsetTemplates.C      |  2 +-
 .../singleCellFvMesh/singleCellFvMesh.C       |  2 +-
 .../volPointInterpolation/pointConstraints.C  |  6 +--
 .../binField/binModels/binModel/binModelNew.C |  2 +-
 .../field/externalCoupled/externalCoupled.C   |  2 +-
 .../utilities/runTimeControl/runTimeControl.C |  2 +-
 .../semiImplicitSource/SemiImplicitSource.C   |  8 ++--
 .../genericPatchFieldBase.C                   | 10 ++--
 .../blockMesh/blockMesh/blockMeshCreate.C     |  2 +-
 .../meshRefinement/meshRefinement.C           |  2 +-
 .../meshRefinement/meshRefinementBlock.C      |  8 ++--
 .../snappyHexMeshDriver/snappyLayerDriver.C   | 12 ++---
 .../snappyHexMeshDriver/snappySnapDriver.C    |  4 +-
 .../snappySnapDriverTemplates.C               |  2 +-
 .../cyclicACMIGAMGInterface.C                 |  4 +-
 .../cyclicAMIGAMGInterface.C                  |  4 +-
 src/meshTools/meshStructure/meshStructure.C   |  2 +-
 .../multiWorld/multiWorldConnectionsObject.C  |  6 +--
 src/meshTools/regionSplit/localPointRegion.C  |  4 +-
 src/meshTools/regionSplit/regionSplit.C       |  2 +-
 .../cellSources/surfaceToCell/surfaceToCell.C |  2 +-
 .../faceSources/holeToFace/holeToFace.C       |  2 +-
 src/meshTools/topoSet/topoSets/faceZoneSet.C  |  6 +--
 .../surfaceFeatures/surfaceFeatures.C         |  2 +-
 .../adjoint/global/createZeroField.H          |  2 +-
 .../GAMG/calculatedProcessorGAMGInterface.C   |  2 +-
 .../oversetGAMGInterface.C                    |  2 +-
 .../distributedTriSurfaceMesh.C               |  2 +-
 .../faReconstruct/faMeshReconstructor.C       |  4 +-
 .../multiphaseSystem/multiphaseSystem.C       | 14 +++---
 .../nucleateFluxModel/nucleateFluxModel.C     |  2 +-
 .../meshToMesh/meshToMeshParallelOps.C        |  4 +-
 src/sampling/probes/probes.C                  |  2 +-
 .../sampledSet/sampledSets/sampledSets.C      |  2 +-
 .../surfaceFormats/nas/NASsurfaceFormat.C     |  6 +--
 .../surfaceFormats/obj/OBJsurfaceFormat.C     |  2 +-
 .../starcd/STARCDsurfaceFormat.C              |  4 +-
 src/surfMesh/surfaceFormats/tri/TRIReader.C   |  2 +-
 .../basic/basicThermo/basicThermoTemplates.C  |  4 +-
 .../chemkinReader/chemkinLexer.L              | 14 +++---
 132 files changed, 342 insertions(+), 340 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index eb41aa2bbf..4f3d9c75fc 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -779,7 +779,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
 
             auto sigma = sigmas_.cfind(interfacePair(alpha1, alpha2));
 
-            if (!sigma.found())
+            if (!sigma.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
@@ -907,7 +907,7 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
             const auto tp =
                 acap.thetaProps().cfind(interfacePair(alpha1, alpha2));
 
-            if (!tp.found())
+            if (!tp.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index da3547d18a..7fefaa1642 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -287,7 +287,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
 
             auto sigma = sigmas_.cfind(interfacePair(alpha1, alpha2));
 
-            if (!sigma.found())
+            if (!sigma.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
@@ -463,7 +463,7 @@ void Foam::multiphaseMixture::correctBoundaryContactAngle
 
     const auto tp = acap.thetaProps().cfind(interfacePair(alpha1, alpha2));
 
-    if (!tp.found())
+    if (!tp.good())
     {
         FatalErrorInFunction
             << "Cannot find interface " << interfacePair(alpha1, alpha2)
diff --git a/applications/test/Map/Test-Map.C b/applications/test/Map/Test-Map.C
index d4cb2933ac..9df5bc1a25 100644
--- a/applications/test/Map/Test-Map.C
+++ b/applications/test/Map/Test-Map.C
@@ -52,13 +52,13 @@ int main(int argc, char *argv[])
     // Same, but with non-const access
     // Map<bool>::iterator map1Iter = map1.find(5);
 
-    if (!map1Iter.found()) // same as  (map1Iter == map1.end())
+    if (!map1Iter.good())
     {
         Info<< "not found" << endl;
     }
     else
     {
-        Info<< "5 is " << *map1Iter << endl;
+        Info<< "5 is " << map1Iter.val() << endl;
     }
 
     // Repeat with std::map
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 509ad1d34e..70c288274d 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -353,9 +353,9 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
             const auto iter = sparseData.cfind(e);
 
-            if (iter.found())
+            if (iter.good())
             {
-                const point& sparsePt = iter();
+                const point& sparsePt = iter.val();
                 const point& fullPt = fullData[meshEdgeI];
 
                 if (fullPt != sparsePt)
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
index 3a17697164..037e3a18b2 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
@@ -86,7 +86,7 @@ Foam::label Foam::cellSplitter::newOwner
 
     const auto iter = cellToCells.cfind(old);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         // Unsplit cell
         return old;
@@ -113,7 +113,7 @@ Foam::label Foam::cellSplitter::newNeighbour
 
     const auto iter = cellToCells.cfind(old);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         // Unsplit cell
         return old;
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 46809fe804..3700bc8b87 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1063,7 +1063,7 @@ int main(int argc, char *argv[])
 
         const auto iter = fluentToFoamType.cfind(type);
 
-        if (iter.found())
+        if (iter.good())
         {
             // See if we have a periodic and can derive the other side.
             word neighbPatchName;
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 77dc4d738e..4e6a5b3a7c 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -225,7 +225,7 @@ void storeCellInZone
 {
     const auto zoneFnd = physToZone.cfind(regPhys);
 
-    if (zoneFnd.found())
+    if (zoneFnd.good())
     {
         // Existing zone for region
         zoneCells[zoneFnd()].append(celli);
@@ -592,7 +592,7 @@ void readCellsLegacy
             const auto regFnd = physToPatch.cfind(regPhys);
 
             label patchi = -1;
-            if (regFnd.found())
+            if (regFnd.good())
             {
                 // Existing patch for region
                 patchi = regFnd();
@@ -625,7 +625,7 @@ void readCellsLegacy
             const auto regFnd = physToPatch.cfind(regPhys);
 
             label patchi = -1;
-            if (regFnd.found())
+            if (regFnd.good())
             {
                 // Existing patch for region
                 patchi = regFnd();
@@ -934,7 +934,7 @@ void readCells
                 const auto regFnd = physToPatch.cfind(regPhys);
 
                 label patchi = -1;
-                if (regFnd.found())
+                if (regFnd.good())
                 {
                     // Existing patch for region
                     patchi = regFnd();
@@ -972,7 +972,7 @@ void readCells
                 const auto regFnd = physToPatch.cfind(regPhys);
 
                 label patchi = -1;
-                if (regFnd.found())
+                if (regFnd.good())
                 {
                     // Existing patch for region
                     patchi = regFnd();
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 79145cdae3..1b29209c13 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
             // (uses commutative hash)
             auto iter = vertsToBoundary.find(triFace(f[0], f[1], f[2]));
 
-            if (iter.found())
+            if (iter.good())
             {
                 const triFace& tri = iter.key();
                 const label facei = iter.val();
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index c9928cee38..97c67c26a8 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
 
                         const auto patchFind = regionToPatch.cfind(region);
 
-                        if (patchFind.found())
+                        if (patchFind.good())
                         {
                             patchi = *patchFind;
                         }
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 6c647b2938..9a594ec2da 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -124,7 +124,7 @@ void writePoints
 
             const auto e0Fnd = pointToObj.cfind(e[0]);
 
-            if (e0Fnd.found())
+            if (e0Fnd.good())
             {
                 v0 = *e0Fnd;
             }
@@ -139,7 +139,7 @@ void writePoints
 
             const auto e1Fnd = pointToObj.cfind(e[1]);
 
-            if (e1Fnd.found())
+            if (e1Fnd.good())
             {
                 v1 = *e1Fnd;
             }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 77774439ce..3000cf0aed 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -416,7 +416,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::markVerticesToRefer
         const auto iter = circumsphereOverlaps.cfind(cit->cellIndex());
 
         // Pre-tested circumsphere potential influence
-        if (iter.found())
+        if (iter.good())
         {
             const labelList& citOverlaps = iter();
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 7e857a1e27..4f04583e46 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -2263,7 +2263,7 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
 
         const auto iter = oldToNewIndices.cfind(vIndex);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label newIndex = *iter;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 338a38669d..cb77753c88 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
@@ -611,7 +611,7 @@ void Foam::featurePointConformer::reIndexPointPairs
 
         const auto newIndexIter = oldToNewIndices.cfind(currentIndex);
 
-        if (newIndexIter.found())
+        if (newIndexIter.good())
         {
             featurePointVertices_[vI].index() = *newIndexIter;
         }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
index 6800b09498..b4f3e88b16 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
@@ -193,7 +193,7 @@ void Foam::pointPairs<Triangulation>::reIndex(const Map<label>& oldToNewIndices)
         {
             const auto iter2 = oldToNewIndices.cfind(start.first());
 
-            if (iter2.found())
+            if (iter2.good())
             {
                 if (iter2() != -1)
                 {
@@ -210,7 +210,7 @@ void Foam::pointPairs<Triangulation>::reIndex(const Map<label>& oldToNewIndices)
         {
             const auto iter2 = oldToNewIndices.cfind(end.first());
 
-            if (iter2.found())
+            if (iter2.good())
             {
                 if (iter2() != -1)
                 {
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index a653517993..f902ff600f 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -292,11 +292,11 @@ void addToInterface
 
     auto iter = regionsToSize.find(interface);
 
-    if (iter.found())
+    if (iter.good())
     {
         // Check if zone present
         auto zoneIter = iter().find(zoneID);
-        if (zoneIter.found())
+        if (zoneIter.good())
         {
             // Found zone. Increment count.
             ++(*zoneIter);
@@ -408,7 +408,7 @@ void getInterfaceSizes
 
                     auto masterIter = regionsToSize.find(slaveIter.key());
 
-                    if (masterIter.found())
+                    if (masterIter.good())
                     {
                         // Same inter-region
                         Map<label>& masterInfo = *masterIter;
@@ -419,7 +419,7 @@ void getInterfaceSizes
                             const label slaveSize = iter.val();
 
                             auto zoneIter = masterInfo.find(zoneID);
-                            if (zoneIter.found())
+                            if (zoneIter.good())
                             {
                                 *zoneIter += slaveSize;
                             }
diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index b0f7f35696..0e0c80568c 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -248,7 +248,7 @@ void removeDict(dictionary& dict, const dictionary& dictToRemove)
                 purge = finder.dict().empty();
             }
         }
-        else if (finder.found() && !refEntry.isDict())
+        else if (finder.good() && !refEntry.isDict())
         {
             // Purge if entries match
             purge = (finder.ref() == refEntry);
@@ -482,7 +482,7 @@ int main(int argc, char *argv[])
             // Print the changed entry
             const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
-            if (finder.found())
+            if (finder.good())
             {
                 Info<< finder.ref();
             }
@@ -531,7 +531,7 @@ int main(int argc, char *argv[])
 
             const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
-            if (!finder.found())
+            if (!finder.good())
             {
                 FatalIOErrorInFunction(dictFile())
                     << "Cannot find entry " << scopedName
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index e6b8da253c..904adb05e3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -63,7 +63,7 @@ void Foam::domainDecomposition::addInterProcFace
 
     const auto patchiter = nbrToInterPatch[ownerProc].cfind(nbrProc);
 
-    if (patchiter.found())
+    if (patchiter.good())
     {
         // Existing interproc patch. Add to both sides.
         const label toNbrProcPatchi = *patchiter;
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 6221317d78..0ce18f312e 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -657,7 +657,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         // We don't want to map the decomposition (mapping already tested when
         // mapping the cell centre field)
         auto iter = objects.find("cellDist");
-        if (iter.found())
+        if (iter.good())
         {
             objects.erase(iter);
         }
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index edd58ceb13..9d38c16dcc 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -353,7 +353,7 @@ int main(int argc, char *argv[])
         /// Currently unused
         /// List<vectorField> dirs(nTracks);
         /// const auto Uiter = vectorFields.cfind(UName);
-        /// if (Uiter.found())
+        /// if (Uiter.good())
         /// {
         ///     const auto& UTracks = *Uiter;
         ///     forAll(UTracks, tracki)
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 30a5576a3a..26af769a45 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -97,7 +97,7 @@ IOobjectList preFilterFields
         for (const word& fldName : allNames)
         {
             const auto iter = cloudObjects.cfind(fldName);
-            if (!pred(fldName) || !iter.found())
+            if (!pred(fldName) || !iter.good())
             {
                 continue;  // reject
             }
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
 
                 const auto iter = trackTable.cfind(key);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     particleToTrack[np] = *iter;
                 }
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 568f8586c8..c1aaf562c2 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -116,7 +116,7 @@ HashTable<wordList> extractPatchGroups(const dictionary& boundaryDict)
         for (const word& groupName : groupNames)
         {
             auto groupIter = groupToPatch.find(groupName);
-            if (groupIter.found())
+            if (groupIter.good())
             {
                 (*groupIter).append(patchName);
             }
diff --git a/src/OSspecific/MSwindows/MSwindows.C b/src/OSspecific/MSwindows/MSwindows.C
index fb6f9111ab..8769e3d326 100644
--- a/src/OSspecific/MSwindows/MSwindows.C
+++ b/src/OSspecific/MSwindows/MSwindows.C
@@ -575,7 +575,7 @@ mode_t Foam::mode(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_mode;
         }
@@ -687,7 +687,7 @@ off_t Foam::fileSize(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_size;
         }
diff --git a/src/OSspecific/MSwindows/fileStat/fileStat.H b/src/OSspecific/MSwindows/fileStat/fileStat.H
index 24176aa2d9..3d4f8f96bd 100644
--- a/src/OSspecific/MSwindows/fileStat/fileStat.H
+++ b/src/OSspecific/MSwindows/fileStat/fileStat.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -120,7 +120,7 @@ public:
     // Access
 
         //- True if file-stat was successful
-        bool valid() const noexcept
+        bool good() const noexcept
         {
             return valid_;
         }
@@ -165,6 +165,12 @@ public:
 
         friend Istream& operator>>(Istream& is, fileStat& fs);
         friend Ostream& operator<<(Ostream& os, const fileStat& fs);
+
+
+    // Housekeeping
+
+        //- True if file-stat was successful
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OSspecific/MSwindows/memInfo/memInfo.C b/src/OSspecific/MSwindows/memInfo/memInfo.C
index 89628c9e89..2e332c70a0 100644
--- a/src/OSspecific/MSwindows/memInfo/memInfo.C
+++ b/src/OSspecific/MSwindows/memInfo/memInfo.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,13 +48,13 @@ Foam::memInfo::memInfo()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-bool Foam::memInfo::valid() const
+bool Foam::memInfo::good() const noexcept
 {
     return peak_ > 0;
 }
 
 
-void Foam::memInfo::clear()
+void Foam::memInfo::clear() noexcept
 {
     peak_ = size_ = rss_ = 0;
     free_ = 0;
diff --git a/src/OSspecific/MSwindows/memInfo/memInfo.H b/src/OSspecific/MSwindows/memInfo/memInfo.H
index f1972a71e8..9e8b8c0c1f 100644
--- a/src/OSspecific/MSwindows/memInfo/memInfo.H
+++ b/src/OSspecific/MSwindows/memInfo/memInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,15 +39,15 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef memInfo_H
-#define memInfo_H
+#ifndef Foam_memInfo_H
+#define Foam_memInfo_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class memInfo;
 class Istream;
 class Ostream;
@@ -62,7 +62,7 @@ Ostream& operator<<(Ostream& os, const memInfo& m);
 
 class memInfo
 {
-    // Private data
+    // Private Data
 
         //- Peak memory used by the process (VmPeak in /proc/PID/status)
         int peak_;
@@ -91,38 +91,25 @@ public:
     // Member Functions
 
         //- True if the memory information appears valid
-        bool valid() const;
+        bool good() const noexcept;
 
         //- Reset to zero
-        void clear();
+        void clear() noexcept;
 
         //- Update according to /proc/PID/status and /proc/memory contents
         const memInfo& update();
 
-
         //- Peak memory (VmPeak in /proc/PID/status) at last update()
-        inline int peak() const
-        {
-            return peak_;
-        }
+        int peak() const noexcept { return peak_; }
 
         //- Memory size (VmSize in /proc/PID/status) at last update()
-        inline int size() const
-        {
-            return size_;
-        }
+        int size() const noexcept { return size_; }
 
         //- Resident set size (VmRSS in /proc/PID/status) at last update()
-        inline int rss() const
-        {
-            return rss_;
-        }
+        int rss() const noexcept { return rss_; }
 
         //- System memory free (MemFree in /proc/meminfo)
-        inline int free() const
-        {
-            return free_;
-        }
+        int free() const noexcept { return free_; }
 
 
       // Write
@@ -138,6 +125,12 @@ public:
 
         //- Write peak/size/rss to stream
         friend Ostream& operator<<(Ostream& os, const memInfo& m);
+
+
+    // Housekeeping
+
+        //- True if the memory information appears valid
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 93c4709119..adc6e544de 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -714,7 +714,7 @@ mode_t Foam::mode(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_mode;
         }
@@ -846,7 +846,7 @@ off_t Foam::fileSize(const fileName& name, const bool followLink)
     if (!name.empty())
     {
         fileStat fileStatus(name, followLink);
-        if (fileStatus.valid())
+        if (fileStatus.good())
         {
             return fileStatus.status().st_size;
         }
diff --git a/src/OSspecific/POSIX/fileStat/fileStat.H b/src/OSspecific/POSIX/fileStat/fileStat.H
index 24176aa2d9..3d4f8f96bd 100644
--- a/src/OSspecific/POSIX/fileStat/fileStat.H
+++ b/src/OSspecific/POSIX/fileStat/fileStat.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -120,7 +120,7 @@ public:
     // Access
 
         //- True if file-stat was successful
-        bool valid() const noexcept
+        bool good() const noexcept
         {
             return valid_;
         }
@@ -165,6 +165,12 @@ public:
 
         friend Istream& operator>>(Istream& is, fileStat& fs);
         friend Ostream& operator<<(Ostream& os, const fileStat& fs);
+
+
+    // Housekeeping
+
+        //- True if file-stat was successful
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OSspecific/POSIX/memInfo/memInfo.C b/src/OSspecific/POSIX/memInfo/memInfo.C
index b1c9906fe9..63fc7cbd3c 100644
--- a/src/OSspecific/POSIX/memInfo/memInfo.C
+++ b/src/OSspecific/POSIX/memInfo/memInfo.C
@@ -48,13 +48,13 @@ Foam::memInfo::memInfo()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-bool Foam::memInfo::valid() const
+bool Foam::memInfo::good() const noexcept
 {
     return peak_ > 0;
 }
 
 
-void Foam::memInfo::clear()
+void Foam::memInfo::clear() noexcept
 {
     peak_ = size_ = rss_ = 0;
     free_ = 0;
diff --git a/src/OSspecific/POSIX/memInfo/memInfo.H b/src/OSspecific/POSIX/memInfo/memInfo.H
index abbae1a72d..0dd54af18c 100644
--- a/src/OSspecific/POSIX/memInfo/memInfo.H
+++ b/src/OSspecific/POSIX/memInfo/memInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,15 +39,15 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef memInfo_H
-#define memInfo_H
+#ifndef Foam_memInfo_H
+#define Foam_memInfo_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class memInfo;
 class Istream;
 class Ostream;
@@ -62,7 +62,7 @@ Ostream& operator<<(Ostream& os, const memInfo& m);
 
 class memInfo
 {
-    // Private data
+    // Private Data
 
         //- Peak memory used by the process (VmPeak in /proc/PID/status)
         int peak_;
@@ -91,38 +91,26 @@ public:
     // Member Functions
 
         //- True if the memory information appears valid
-        bool valid() const;
+        bool good() const noexcept;
 
         //- Reset to zero
-        void clear();
+        void clear() noexcept;
 
         //- Update according to /proc/PID/status and /proc/memory contents
         const memInfo& update();
 
 
         //- Peak memory (VmPeak in /proc/PID/status) at last update()
-        inline int peak() const
-        {
-            return peak_;
-        }
+        int peak() const noexcept { return peak_; }
 
         //- Memory size (VmSize in /proc/PID/status) at last update()
-        inline int size() const
-        {
-            return size_;
-        }
+        int size() const noexcept { return size_; }
 
         //- Resident set size (VmRSS in /proc/PID/status) at last update()
-        inline int rss() const
-        {
-            return rss_;
-        }
+        int rss() const noexcept { return rss_; }
 
         //- System memory free (MemFree in /proc/meminfo)
-        inline int free() const
-        {
-            return free_;
-        }
+        int free() const noexcept { return free_; }
 
 
       // Write
@@ -138,6 +126,12 @@ public:
 
         //- Write peak/size/rss to stream
         friend Ostream& operator<<(Ostream& os, const memInfo& m);
+
+
+    // Housekeeping
+
+        //- True if the memory information appears valid
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index 79c4b8f43c..a0483d57aa 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -101,9 +101,9 @@ const T* Foam::DictionaryBase<IDLListType, T>::cfind
 {
     const auto iter = hashedTs_.cfind(keyword);
 
-    if (iter.found())
+    if (iter.good())
     {
-        return *iter;
+        return iter.val();
     }
 
     return nullptr;
@@ -115,9 +115,9 @@ T* Foam::DictionaryBase<IDLListType, T>::find(const word& keyword)
 {
     auto iter = hashedTs_.find(keyword);
 
-    if (iter.found())
+    if (iter.good())
     {
-        return *iter;
+        return iter.val();
     }
 
     return nullptr;
@@ -129,14 +129,14 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
 {
     const auto iter = hashedTs_.cfind(keyword);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "'" << keyword << "' not found"
             << exit(FatalError);
     }
 
-    return *iter;
+    return iter.val();
 }
 
 
@@ -145,14 +145,14 @@ T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
 {
     auto iter = hashedTs_.find(keyword);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "'" << keyword << "' not found"
             << exit(FatalError);
     }
 
-    return *iter;
+    return iter.val();
 }
 
 
@@ -215,7 +215,7 @@ T* Foam::DictionaryBase<IDLListType, T>::remove(const word& keyword)
 {
     auto iter = hashedTs_.find(keyword);
 
-    if (iter.found())
+    if (iter.good())
     {
         T* ptr = IDLListType::remove(iter.val());
         hashedTs_.erase(iter);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 7cb9e521ae..a4fbe118b6 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -306,9 +306,9 @@ Foam::label Foam::inplaceMapValue
         label& value = iter.val();
 
         auto mapIter = mapper.find(value);
-        if (mapIter.found() && value != *mapIter)
+        if (mapIter.good() && value != mapIter.val())
         {
-            value = *mapIter;
+            value = mapIter.val();
             ++nChanged;
         }
     }
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index ed05c2e11c..f2d9cd47e6 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -183,7 +183,7 @@ bool Foam::dynamicCode::writeCommentSHA1(Ostream& os) const
 {
     const auto fnd = filterVars_.cfind("SHA1sum");
 
-    if (!fnd.found())
+    if (!fnd.good())
     {
         return false;
     }
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 0340be73b1..a5ecf4b667 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -93,7 +93,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
         const auto finder =
             dict.csearchCompat("libs", {{"functionObjectLibs", 1612}});
 
-        if (finder.found())
+        if (finder.good())
         {
             runTime.libs().open
             (
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index fb44d80e37..857dc3a315 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -151,7 +151,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObjectList::remove
 
     auto iter = indices_.find(key);  // Index of existing functionObject
 
-    if (iter.found())
+    if (iter.good())
     {
         oldIndex = *iter;
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index af4e2b6f12..9f730d0375 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -281,7 +281,7 @@ bool Foam::objectRegistry::checkOut(regIOobject* io) const
 
     iterator iter = obr.find(io->name());
 
-    if (iter.found())
+    if (iter.good())
     {
         if (objectRegistry::debug)
         {
@@ -374,7 +374,7 @@ bool Foam::objectRegistry::erase(const iterator& iter)
 {
     // Remove from registry - see notes in objectRegistry::clear()
 
-    if (iter.found())
+    if (iter.good())
     {
         regIOobject* ptr = const_cast<iterator&>(iter).val();
 
@@ -437,7 +437,7 @@ const Foam::regIOobject* Foam::objectRegistry::cfindIOobject
 {
     const_iterator iter = cfind(name);
 
-    if (iter.found())
+    if (iter.good())
     {
         return iter.val();
     }
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 6b2d25a957..a4cb56253d 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -546,9 +546,9 @@ const Type& Foam::objectRegistry::lookupObject
 {
     const_iterator iter = cfind(name);
 
-    if (iter.found())
+    if (iter.good())
     {
-        const Type* ptr = dynamic_cast<const Type*>(iter());
+        const Type* ptr = dynamic_cast<const Type*>(iter.val());
 
         if (ptr)
         {
diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index 7bee6513b5..33420c8346 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
@@ -135,10 +135,10 @@ Description
         {                                                                      \
             const auto& tbl = *prefix##TablePtr_;                              \
             auto iter = tbl.cfind(k);                                          \
-            if (!iter.found() && prefix##CompatTablePtr_)                      \
+            if (!iter.good() && prefix##CompatTablePtr_)                       \
             {                                                                  \
                 const auto altIter = prefix##CompatTablePtr_->cfind(k);        \
-                if (altIter.found())                                           \
+                if (altIter.good())                                            \
                 {                                                              \
                     const auto& alt = altIter.val();  /* <word,int> */         \
                     iter = tbl.cfind(alt.first);                               \
@@ -153,7 +153,7 @@ Description
                     }                                                          \
                 }                                                              \
             }                                                                  \
-            if (iter.found())                                                  \
+            if (iter.good())                                                   \
             {                                                                  \
                 return iter.val();                                             \
             }                                                                  \
diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C b/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C
index 195eef4301..0df7706169 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriverFunctions.C
@@ -174,7 +174,7 @@ static void writeFuncsImpl
 
         const auto iter = tbl.cfind(entryName);
 
-        if (!iter.found())
+        if (!iter.good())
         {
             continue;
         }
diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C b/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C
index 1d9c9f8403..511f3a1acc 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriverTemplates.C
@@ -117,7 +117,7 @@ const Foam::Function1<Type>* Foam::expressions::exprDriver::getFunction1Ptr
 
     const auto iter = tbl.cfind(name);
 
-    if (iter.found())
+    if (iter.good())
     {
         func = iter.val().get();
     }
diff --git a/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C b/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
index 9e3087599b..a8c7386a9e 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResultGlobals.C
@@ -204,11 +204,11 @@ Foam::expressions::exprResultGlobals::get
     {
         const auto tableIter = variables_.cfind(scopeName);
 
-        if (tableIter.found())
+        if (tableIter.good())
         {
             const auto resultIter = (*tableIter).cfind(name);
 
-            if (resultIter.found())
+            if (resultIter.good())
             {
                 return *(*resultIter);
             }
@@ -240,7 +240,7 @@ Foam::expressions::exprResultGlobals::addValue
 
     auto iter = tbl.find(name);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         tbl.set(name, new exprResult(value));
         iter = tbl.find(name);
@@ -322,7 +322,7 @@ bool Foam::expressions::exprResultGlobals::removeValue
 {
     auto iter = variables_.find(scope);
 
-    return (iter.found() && (*iter).erase(name));
+    return (iter.good() && iter.val().erase(name));
 }
 
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index a0f2576ed1..9c5f09ddfa 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -626,7 +626,7 @@ Foam::word Foam::argList::optionCompat(const word& optName)
     {
         const auto fnd = validOptionsCompat.cfind(optName.substr(1));
 
-        if (fnd.found())
+        if (fnd.good())
         {
             const auto& alt = fnd.val();
 
@@ -661,7 +661,7 @@ int Foam::argList::optionIgnore(const word& optName)
     {
         const auto fnd = ignoreOptionsCompat.cfind(optName);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             const auto& alt = fnd.val();
 
@@ -790,7 +790,7 @@ void Foam::argList::setCasePaths()
 
     const auto optIter = options_.cfind("case");  // [-case dir] specified?
 
-    if (optIter.found())
+    if (optIter.good())
     {
         caseDir = fileName::validate(optIter.val());  // includes 'clean'
 
@@ -932,8 +932,8 @@ Foam::argList::argList
             auto optIter = validOptions.cfind(optName);
             if
             (
-                optIter.found()
-             || (optIter = validParOptions.cfind(optName)).found()
+                optIter.good()
+             || (optIter = validParOptions.cfind(optName)).good()
             )
             {
                 wantArg = !optIter.val().empty();
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 9816c4fe56..62a485d85b 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -453,7 +453,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
 
         const auto iter = procsDirs_.cfind(procPath);
 
-        if (iter.found())
+        if (iter.good())
         {
             return iter.val();
         }
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 7f3563edb5..df2c0822c8 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -257,7 +257,7 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
         // directory is 0.01 (due to different time formats)
         const auto pathFnd = times_.cfind(io.time().path());
 
-        if (search && pathFnd.found())
+        if (search && pathFnd.good())
         {
             newInstancePath = findInstancePath
             (
@@ -2184,7 +2184,7 @@ Foam::instantList Foam::fileOperations::masterUncollatedFileOperation::findTimes
 ) const
 {
     const auto iter = times_.cfind(directory);
-    if (iter.found())
+    if (iter.good())
     {
         if (debug)
         {
@@ -2241,7 +2241,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::setTime
 
     HashPtrTable<DynamicList<instant>>::iterator iter = times_.find(tm.path());
 
-    if (iter.found())
+    if (iter.good())
     {
         DynamicList<instant>& times = *(iter.val());
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index fa64f1db63..255c6a4389 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -684,7 +684,7 @@ void Foam::GAMGAgglomeration::calculateRegionMaster
         const label coarsei = procAgglomMap[proci];
 
         auto iter = agglomToMaster.find(coarsei);
-        if (iter.found())
+        if (iter.good())
         {
             iter.val() = min(iter.val(), proci);
         }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 937aecdbbb..994c8792f8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -127,7 +127,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
 
         const auto fnd = cellsToCoarseFace.cfind(cellPair);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // Already have coarse face
             dynFaceRestrictAddressing.append(fnd.val());
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index eeb7807c9a..602511a176 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -115,7 +115,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
 
         const auto fnd = cellsToCoarseFace.cfind(cellPair);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // Already have coarse face
             dynFaceRestrictAddressing.append(fnd.val());
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
index 0cbb2f251a..fd2f6828a1 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
+++ b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
@@ -51,7 +51,7 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
 
     const auto fnd = pbm.groupPatchIDs().cfind(name());
 
-    if (!fnd.found())
+    if (!fnd.good())
     {
         if (&mesh == &thisPatch.boundaryMesh().mesh())
         {
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index 8f0c928b39..acc6007b98 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -776,7 +776,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
                         const auto fnd =
                             mergedMap.cfind(edge(agglom0, agglom1));
 
-                        if (fnd.found())
+                        if (fnd.good())
                         {
                             const labelPairList& elems = fnd();
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index c78c143e03..5d455e3bf6 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -96,7 +96,7 @@ Foam::label Foam::cellMatcher::calcLocalFaces
             const label vertI = f[localVertI];
 
             const auto iter = localPoint_.cfind(vertI);
-            if (iter.found())
+            if (iter.good())
             {
                 // Reuse local vertex number.
                 localFace[localVertI] = iter.val();
diff --git a/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H b/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
index 7ed69b1e04..fe8a2c1842 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
@@ -93,10 +93,13 @@ public:
         }
 
         //- Does the opposite face exist?
-        bool found() const noexcept
+        bool good() const noexcept
         {
             return oppositeIndex_ >= 0;
         }
+
+        //- Does the opposite face exist?
+        bool found() const noexcept { return good(); }
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 4cd6e6f2e6..f48ba801e3 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -257,7 +257,7 @@ void Foam::globalMeshData::countSharedEdges
 
         auto globalFnd = globalShared.find(e);
 
-        if (globalFnd.found())
+        if (globalFnd.good())
         {
             if (globalFnd() == -1)
             {
@@ -328,11 +328,11 @@ void Foam::globalMeshData::calcSharedEdges() const
 
         const auto e0Fnd = meshToShared.cfind(e[0]);
 
-        if (e0Fnd.found())
+        if (e0Fnd.good())
         {
             const auto e1Fnd = meshToShared.cfind(e[1]);
 
-            if (e1Fnd.found())
+            if (e1Fnd.good())
             {
                 // Found edge which uses shared points. Probably shared.
 
@@ -346,7 +346,7 @@ void Foam::globalMeshData::calcSharedEdges() const
 
                 auto iter = localShared.find(sharedEdge);
 
-                if (!iter.found())
+                if (!iter.good())
                 {
                     // First occurrence of this point combination. Store.
                     localShared.insert(sharedEdge, labelList(1, edgeI));
@@ -463,7 +463,7 @@ void Foam::globalMeshData::calcSharedEdges() const
 
         const auto edgeFnd = globalShared.cfind(e);
 
-        if (edgeFnd.found())
+        if (edgeFnd.good())
         {
             // My local edge is indeed a shared one. Go through all local edge
             // labels with this point combination.
@@ -1225,7 +1225,7 @@ void Foam::globalMeshData::calcPointBoundaryFaces
                 forAll(f, fp)
                 {
                     const auto iter = meshPointMap.cfind(f[fp]);
-                    if (iter.found())
+                    if (iter.good())
                     {
                         nPointFaces[iter.val()]++;
                     }
@@ -1260,7 +1260,7 @@ void Foam::globalMeshData::calcPointBoundaryFaces
                 {
                     const auto iter = meshPointMap.cfind(f[fp]);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         label bFacei =
                              pp.start() + i - mesh_.nInternalFaces();
@@ -1497,7 +1497,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
             const label celli = pCells[i];
             const auto fnd = meshCellMap.cfind(celli);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 bCells[i] = fnd();
             }
@@ -2514,7 +2514,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
 
         const auto iter = cpp.meshPointMap().cfind(meshPointi);
 
-        if (iter.found())
+        if (iter.good())
         {
             patchToCoupled[patchPointi] = iter();
             coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointi);
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index e500f48636..f34b7c542d 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -281,7 +281,7 @@ bool Foam::globalPoints::mergeInfo
     // Get the index into the procPoints list.
     const auto iter = meshToProcPoint_.cfind(localPointi);
 
-    if (iter.found())
+    if (iter.good())
     {
         if (mergeInfo(nbrInfo, localPointi, procPoints_[iter.val()]))
         {
@@ -330,7 +330,7 @@ bool Foam::globalPoints::storeInitialInfo
     // Get the index into the procPoints list.
     const auto iter = meshToProcPoint_.find(localPointi);
 
-    if (iter.found())
+    if (iter.good())
     {
         if (mergeInfo(nbrInfo, localPointi, procPoints_[iter.val()]))
         {
@@ -683,7 +683,7 @@ void Foam::globalPoints::receivePatchPoints
                     // Do we have information on pointA?
                     const auto procPointA = meshToProcPoint_.cfind(localA);
 
-                    if (procPointA.found())
+                    if (procPointA.good())
                     {
                         const labelPairList infoA = addSendTransform
                         (
@@ -700,7 +700,7 @@ void Foam::globalPoints::receivePatchPoints
                     // Same for info on pointB
                     const auto procPointB = meshToProcPoint_.cfind(localB);
 
-                    if (procPointB.found())
+                    if (procPointB.good())
                     {
                         const labelPairList infoB = addSendTransform
                         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 5b1670067d..5f7e691c76 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -353,7 +353,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
                 auto fnd = pointsToEdge.find(meshEdge);
 
-                if (!fnd.found())
+                if (!fnd.good())
                 {
                     // First occurrence of mesh edge. Store patch and my
                     // local index.
@@ -672,7 +672,7 @@ Foam::labelList Foam::polyBoundaryMesh::indices
         {
             const auto iter = groupPatchIDs().cfind(matcher);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Hash ids associated with the group
                 ids.insert(iter.val());
@@ -894,7 +894,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
             {
                 const auto iter = groupPatchIDs().cfind(matcher);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     // Hash ids associated with the group
                     ids.insert(iter.val());
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 771d2f3170..b64c0b6ee4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -1135,10 +1135,10 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
 
                 // Convert edge end points to corresponding points on B side.
                 const auto fnd0 = aToB.cfind(e[0]);
-                if (fnd0.found())
+                if (fnd0.good())
                 {
                     const auto fnd1 = aToB.cfind(e[1]);
-                    if (fnd1.found())
+                    if (fnd1.good())
                     {
                         edgeMap.insert(edge(fnd0(), fnd1()), edgeI);
                     }
@@ -1168,7 +1168,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
                 // Look up A edge from HashTable.
                 auto iter = edgeMap.find(e);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     const label edgeA = iter.val();
                     const edge& eA = edges()[edgeA];
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 524ef8746a..1db719cc37 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -46,7 +46,7 @@ void Foam::syncTools::combine
 {
     auto iter = pointValues.find(index);
 
-    if (iter.found())
+    if (iter.good())
     {
         cop(*iter, val);
     }
@@ -68,7 +68,7 @@ void Foam::syncTools::combine
 {
     auto iter = edgeValues.find(index);
 
-    if (iter.found())
+    if (iter.good())
     {
         cop(*iter, val);
     }
@@ -111,7 +111,7 @@ void Foam::syncTools::syncPointMap
         {
             const auto fnd = pointValues.cfind(sharedPtLabels[i]);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 combine
                 (
@@ -153,7 +153,7 @@ void Foam::syncTools::syncPointMap
                 {
                     const auto iter = pointValues.cfind(meshPts[i]);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         patchInfo.insert(nbrPts[i], *iter);
                     }
@@ -227,14 +227,14 @@ void Foam::syncTools::syncPointMap
 
                 const auto point0Fnd = pointValues.cfind(meshPtsA[e[0]]);
 
-                if (point0Fnd.found())
+                if (point0Fnd.good())
                 {
                     half0Values.insert(i, *point0Fnd);
                 }
 
                 const auto point1Fnd = pointValues.cfind(meshPtsB[e[1]]);
 
-                if (point1Fnd.found())
+                if (point1Fnd.good())
                 {
                     half1Values.insert(i, *point1Fnd);
                 }
@@ -250,7 +250,7 @@ void Foam::syncTools::syncPointMap
 
                 const auto half0Fnd = half0Values.cfind(i);
 
-                if (half0Fnd.found())
+                if (half0Fnd.good())
                 {
                     combine
                     (
@@ -263,7 +263,7 @@ void Foam::syncTools::syncPointMap
 
                 const auto half1Fnd = half1Values.cfind(i);
 
-                if (half1Fnd.found())
+                if (half1Fnd.good())
                 {
                     combine
                     (
@@ -340,7 +340,7 @@ void Foam::syncTools::syncPointMap
             // Do I have a value for my shared point
             const auto sharedFnd = sharedPointValues.cfind(iter.key());
 
-            if (sharedFnd.found())
+            if (sharedFnd.good())
             {
                 pointValues.set(*iter, *sharedFnd);
             }
@@ -397,7 +397,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto iter = edgeValues.cfind(meshEdge);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         const edge nbrEdge(nbrPts[e[0]], nbrPts[e[1]]);
                         patchInfo.insert(nbrEdge, *iter);
@@ -490,7 +490,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto iter = edgeValues.cfind(meshEdge0);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         half0Values.insert(edgei, *iter);
                     }
@@ -501,7 +501,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto iter = edgeValues.cfind(meshEdge1);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         half1Values.insert(edgei, *iter);
                     }
@@ -521,7 +521,7 @@ void Foam::syncTools::syncEdgeMap
 
                 const auto half1Fnd = half1Values.cfind(edgei);
 
-                if (half1Fnd.found())
+                if (half1Fnd.good())
                 {
                     const edge& e0 = edgesA[twoEdges[0]];
                     const edge meshEdge0(meshPtsA[e0[0]], meshPtsA[e0[1]]);
@@ -537,7 +537,7 @@ void Foam::syncTools::syncEdgeMap
 
                 const auto half0Fnd = half0Values.cfind(edgei);
 
-                if (half0Fnd.found())
+                if (half0Fnd.good())
                 {
                     const edge& e1 = edgesB[twoEdges[1]];
                     const edge meshEdge1(meshPtsB[e1[0]], meshPtsB[e1[1]]);
@@ -591,11 +591,11 @@ void Foam::syncTools::syncEdgeMap
 
             const auto v0Fnd = meshToShared.cfind(v0);
 
-            if (v0Fnd.found())
+            if (v0Fnd.good())
             {
                 const auto v1Fnd = meshToShared.cfind(v1);
 
-                if (v1Fnd.found())
+                if (v1Fnd.good())
                 {
                     const edge meshEdge(v0, v1);
 
@@ -607,7 +607,7 @@ void Foam::syncTools::syncEdgeMap
 
                     const auto edgeFnd = edgeValues.cfind(meshEdge);
 
-                    if (edgeFnd.found())
+                    if (edgeFnd.good())
                     {
                         // edge exists in edgeValues. See if already in map
                         // (since on same processor, e.g. cyclic)
@@ -683,7 +683,7 @@ void Foam::syncTools::syncEdgeMap
         // Do I have a value for the shared edge?
         const auto sharedFnd = sharedEdgeValues.cfind(sharedEdge);
 
-        if (sharedFnd.found())
+        if (sharedFnd.good())
         {
             combine
             (
@@ -747,7 +747,7 @@ void Foam::syncTools::syncPointList
     {
         const auto iter = mpm.cfind(meshPoints[i]);
 
-        if (iter.found())
+        if (iter.good())
         {
             cppFld[*iter] = pointValues[i];
         }
@@ -768,7 +768,7 @@ void Foam::syncTools::syncPointList
     {
         const auto iter = mpm.cfind(meshPoints[i]);
 
-        if (iter.found())
+        if (iter.good())
         {
             pointValues[i] = cppFld[*iter];
         }
@@ -906,7 +906,7 @@ void Foam::syncTools::syncEdgeList
     {
         const label meshEdgei = meshEdges[i];
         const auto iter = mpm.cfind(meshEdgei);
-        if (iter.found())
+        if (iter.good())
         {
             const label cppEdgei = iter();
             const edge& cppE = cppEdges[cppEdgei];
@@ -951,8 +951,8 @@ void Foam::syncTools::syncEdgeList
     forAll(meshEdges, i)
     {
         label meshEdgei = meshEdges[i];
-        Map<label>::const_iterator iter = mpm.find(meshEdgei);
-        if (iter != mpm.end())
+        const auto iter = mpm.cfind(meshEdgei);
+        if (iter.good())
         {
             label cppEdgei = iter();
             const edge& cppE = cppEdges[cppEdgei];
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 9e4c191c6e..c21094d9e6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -428,7 +428,7 @@ Foam::labelList Foam::ZoneMesh<ZoneType, MeshType>::indices
         {
             const auto iter = groupZoneIDs().cfind(matcher);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Hash ids associated with the group
                 ids.insert(iter.val());
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
index 115832ff97..1388fe54ea 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsMatch.C
@@ -55,7 +55,7 @@ void Foam::PatchTools::matchPoints
 
         const auto iter = p2.meshPointMap().cfind(meshPointi);
 
-        if (iter.found())
+        if (iter.good())
         {
             p1PointLabels[nMatches] = pointi;
             p2PointLabels[nMatches] = iter.val();
@@ -103,7 +103,7 @@ void Foam::PatchTools::matchEdges
 
         const auto iter = edgeToIndex.cfind(meshEdge2);
 
-        if (iter.found())
+        if (iter.good())
         {
             p1EdgeLabels[nMatches] = iter.val();
             p2EdgeLabels[nMatches] = edgei;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index f99a940bf9..3fa499ddc5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -64,7 +64,7 @@ Foam::PatchTools::pointNormals
             const label meshPointi = p.meshPoints()[patchPointi];
 
             const auto fnd = coupledPatchMP.cfind(meshPointi);
-            if (fnd.found())
+            if (fnd.good())
             {
                 const label coupledPointi = fnd.val();
 
@@ -181,7 +181,7 @@ Foam::PatchTools::pointNormals
         const label meshPointi = p.meshPoints()[patchPointi];
 
         const auto fnd = coupledPatchMP.cfind(meshPointi);
-        if (fnd.found())
+        if (fnd.good())
         {
             const label coupledPointi = fnd.val();
             extrudeN[patchPointi] = coupledPointNormals[coupledPointi];
diff --git a/src/OpenFOAM/primitives/enums/NamedEnum.C b/src/OpenFOAM/primitives/enums/NamedEnum.C
index f98ab8ca8f..3bbf71ee98 100644
--- a/src/OpenFOAM/primitives/enums/NamedEnum.C
+++ b/src/OpenFOAM/primitives/enums/NamedEnum.C
@@ -97,7 +97,7 @@ Foam::List<int> Foam::NamedEnum<EnumType, nEnum>::values() const
         {
             auto iter = lookup_.cfind(names[enumi]);
 
-            if (iter.found())
+            if (iter.good())
             {
                 lst[count++] = iter.val();
             }
@@ -135,7 +135,7 @@ EnumType Foam::NamedEnum<EnumType, nEnum>::lookup
     const word enumName(dict.lookup(key));
     auto iter = lookup_.cfind(enumName);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalIOErrorInFunction(dict)
             << enumName << " is not in enumeration: "
@@ -170,7 +170,7 @@ EnumType Foam::NamedEnum<EnumType, nEnum>::read(Istream& is) const
     const word enumName(is);
     auto iter = lookup_.cfind(enumName);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalIOErrorInFunction(is)
             << enumName << " is not in enumeration: "
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 7947676d98..b6187ab323 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -804,7 +804,7 @@ void Foam::stringOps::inplaceExpand
 
                 const auto fnd = mapping.cfind(varName);
 
-                if (fnd.found() ? (altType == '+') : (altType == '-'))
+                if (fnd.good() ? (altType == '+') : (altType == '-'))
                 {
                     // Found and ":+" alternative
                     // Not-found and ":-" alternative
@@ -812,7 +812,7 @@ void Foam::stringOps::inplaceExpand
                     s.replace(varBeg, varEnd - varBeg + 1, altValue);
                     varBeg += altValue.size();
                 }
-                else if (fnd.found())
+                else if (fnd.good())
                 {
                     // Found: use value
                     s.replace(varBeg, varEnd - varBeg + 1, *fnd);
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 076c03a1c0..ea01c4a316 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -734,7 +734,7 @@ void Foam::PstreamDetail::allToAllConsensus
     {
         // Do myself
         const auto iter = sendBufs.find(myProci);
-        if (iter.found() && (iter.val() != zeroValue))
+        if (iter.good() && (iter.val() != zeroValue))
         {
             // Do myself: insert_or_assign
             recvBufs(iter.key()) = iter.val();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 168c538e66..4cf128963e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -111,7 +111,7 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
     {
         auto ctorIter = additionalConstructors.cfind(deltaType);
 
-        if (ctorIter.found())
+        if (ctorIter.good())
         {
             return autoPtr<LESdelta>(ctorIter.val()(name, turbulence, dict));
         }
diff --git a/src/combustionModels/combustionModel/combustionModelTemplates.C b/src/combustionModels/combustionModel/combustionModelTemplates.C
index 7473db0270..a7b2c3737f 100644
--- a/src/combustionModels/combustionModel/combustionModelTemplates.C
+++ b/src/combustionModels/combustionModel/combustionModelTemplates.C
@@ -90,12 +90,12 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
 
     auto ctorIter = cnstrTable.cfind(thermoCombModelName);
 
-    if (!ctorIter.found())
+    if (!ctorIter.good())
     {
         ctorIter = cnstrTable.cfind(compCombModelName);
     }
 
-    if (!ctorIter.found())
+    if (!ctorIter.good())
     {
         const wordList names(cnstrTable.sortedToc());
 
diff --git a/src/conversion/ccm/reader/ccmReaderAux.C b/src/conversion/ccm/reader/ccmReaderAux.C
index 3031b000d6..6e996963f3 100644
--- a/src/conversion/ccm/reader/ccmReaderAux.C
+++ b/src/conversion/ccm/reader/ccmReaderAux.C
@@ -79,7 +79,7 @@ void Foam::ccm::reader::warnDuplicates
     {
         // Check duplicate names
         auto iter = hashed.find(item);
-        if (iter.found())
+        if (iter.good())
         {
             (*iter)++;
             duplicates = true;
diff --git a/src/conversion/ccm/reader/ccmReaderMesh.C b/src/conversion/ccm/reader/ccmReaderMesh.C
index db3087240e..9d8099de14 100644
--- a/src/conversion/ccm/reader/ccmReaderMesh.C
+++ b/src/conversion/ccm/reader/ccmReaderMesh.C
@@ -479,7 +479,7 @@ void Foam::ccm::reader::readCells
 
         // Lookup the name, type from boundary region info:
         auto dictIter = boundaryRegion_.find(info.ccmIndex);
-        if (dictIter.found())
+        if (dictIter.good())
         {
             dictionary& dict = dictIter.val();
 
@@ -1037,7 +1037,7 @@ void Foam::ccm::reader::readMonitoring
             auto iter = boundaryRegion_.cfind(ccmRegionId);
 
             word zoneName;
-            if (iter.found())
+            if (iter.good())
             {
                 iter().readEntry("Label", zoneName);
             }
@@ -2435,7 +2435,7 @@ void Foam::ccm::reader::addPatches
 
         auto citer = boundaryRegion_.cfind(origBndId_[patchI]);
 
-        if (citer.found())
+        if (citer.good())
         {
             citer().readEntry("Label", patchName);
             citer().readEntry("BoundaryType", patchType);
diff --git a/src/conversion/common/reader/meshReaderAux.C b/src/conversion/common/reader/meshReaderAux.C
index 0aef54aad5..e81e14149a 100644
--- a/src/conversion/common/reader/meshReaderAux.C
+++ b/src/conversion/common/reader/meshReaderAux.C
@@ -46,7 +46,7 @@ void Foam::meshReader::warnDuplicates
     {
         // Check duplicate name
         auto iter = hashed.find(w);
-        if (iter.found())
+        if (iter.good())
         {
             ++(*iter);
             duplicates = true;
diff --git a/src/conversion/common/tables/cellTable.C b/src/conversion/common/tables/cellTable.C
index 723d6743e3..607d253970 100644
--- a/src/conversion/common/tables/cellTable.C
+++ b/src/conversion/common/tables/cellTable.C
@@ -89,7 +89,7 @@ void Foam::cellTable::setEntry
     dict.add(keyWord, value);
 
     iterator iter = find(id);
-    if (iter.found())
+    if (iter.good())
     {
         iter().merge(dict);
     }
@@ -190,7 +190,7 @@ Foam::word Foam::cellTable::name(const label id) const
     word theName("cellTable_" + Foam::name(id));
 
     const_iterator iter = cfind(id);
-    if (iter.found())
+    if (iter.good())
     {
         iter().readIfPresent("Label", theName);
     }
@@ -301,7 +301,7 @@ void Foam::cellTable::setName(const label id)
 {
     iterator iter = find(id);
 
-    if (!iter.found() || !iter().found("Label"))
+    if (!iter.good() || !iter().found("Label"))
     {
         setName(id, "cellTable_" + Foam::name(id));
     }
@@ -448,7 +448,7 @@ void Foam::cellTable::addCellZones
     forAll(tableIds, celli)
     {
         const auto iter = typeToZone.cfind(tableIds[celli]);
-        if (iter.found())
+        if (iter.good())
         {
             zoneCells[*iter].append(celli);
         }
diff --git a/src/conversion/starcd/STARCDMeshReader.C b/src/conversion/starcd/STARCDMeshReader.C
index f021c5767a..b17252ac7d 100644
--- a/src/conversion/starcd/STARCDMeshReader.C
+++ b/src/conversion/starcd/STARCDMeshReader.C
@@ -718,7 +718,7 @@ void Foam::fileFormats::STARCDMeshReader::readBoundary
 
         auto iter = boundaryRegion_.cfind(origRegion[patchi]);
 
-        if (iter.found())
+        if (iter.good())
         {
             const dictionary& dict = *iter;
 
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index 8c4092a80b..70e996d297 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -207,7 +207,7 @@ void Foam::attachDetach::attachInterface
         {
             const auto rpmIter = removedPointMap.cfind(newFace[pointi]);
 
-            if (rpmIter.found())
+            if (rpmIter.good())
             {
                 // Point mapped. Replace it
                 newFace[pointi] = rpmIter();
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index c70db89dfc..de879f7cd3 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.C
@@ -399,7 +399,7 @@ void Foam::createShellMesh::calcPointRegions
 
             const auto fnd = globalToLocalRegion.cfind(globalRegionI);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 // Already encountered this global region. Assign same local one
                 pRegions[fp] = fnd();
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 41462314aa..11960dd876 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -736,7 +736,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
         {
             const auto iter = globalMasterToLocalMaster.cfind(globali);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Matched to existing master
                 pointToMaster.insert(pointi, *iter);
@@ -1133,7 +1133,7 @@ void Foam::fvMeshDistribute::findCouples
 
             const auto iter = map.cfind(myData);
 
-            if (iter.found())
+            if (iter.good())
             {
                 label nbrBFacei = *iter;
 
@@ -1239,7 +1239,7 @@ void Foam::fvMeshDistribute::findCouples
                     );
                     auto fnd = map.find(key);
 
-                    if (!fnd.found())
+                    if (!fnd.good())
                     {
                         // Insert
                         map.emplace(key, meshi, bFacei);
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index d39775a7df..e04075d2e0 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -217,7 +217,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
         {
             const auto rpmIter = removedPointMap.cfind(newFace[pointi]);
 
-            if (rpmIter.found())
+            if (rpmIter.good())
             {
                 // Point mapped. Replace it
                 newFace[pointi] = rpmIter();
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index a7d06e6479..477f31d042 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -117,7 +117,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
         oppositeFace lidFace =
             cells[mc[facei]].opposingFace(mf[facei], faces);
 
-        if (!lidFace.found())
+        if (!lidFace.good())
         {
             // This is not a valid layer; cannot continue
             nFaceErrors++;
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index b3f3c15784..33a7b9bf72 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -181,7 +181,7 @@ void Foam::cellCuts::syncProc()
 
                     const auto iter = faceSplitCut_.cfind(facei);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         const face& f = mesh().faces()[facei];
                         const labelList& fEdges = mesh().faceEdges()[facei];
@@ -2109,7 +2109,7 @@ bool Foam::cellCuts::validLoop
 
             const auto iter = faceSplitCut_.cfind(meshFacei);
 
-            if (!iter.found())
+            if (!iter.good())
             {
                 // Face not yet cut so insert.
                 newFaceSplitCut.insert(meshFacei, cutEdge);
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index a6abda9e91..8d27e71951 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -102,7 +102,7 @@ Foam::face Foam::boundaryCutter::addEdgeCutsToFace
 
         const auto fnd = edgeToAddedPoints.cfind(edgeI);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // edge has been cut. Introduce new vertices. Check order.
             const labelList& addedPoints = fnd();
@@ -231,7 +231,7 @@ bool Foam::boundaryCutter::splitFace
 
         const auto fnd = edgeToAddedPoints.cfind(edgeI);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             nSplitEdges++;
             nTotalSplits += fnd().size();
@@ -467,7 +467,7 @@ void Foam::boundaryCutter::setRefinement
 
             auto fnd = edgeToAddedPoints.find(edgeI);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 labelList& addedPoints = fnd();
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index eaedcda3c2..239ec27dbd 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -485,7 +485,7 @@ Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label facei) const
         EdgeMap<label>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // edge has been cut. Introduce new vertex.
             newFace[newFp++] = fnd.val();
@@ -547,7 +547,7 @@ Foam::face Foam::meshCutAndRemove::loopToFace
                     EdgeMap<label>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
-                    if (fnd.found())
+                    if (fnd.good())
                     {
                         newFace[newFacei++] = fnd.val();
                     }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index a8da54e3eb..d79b6c5918 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -431,7 +431,7 @@ Foam::face Foam::meshCutter::addEdgeCutsToFace(const label facei) const
         EdgeMap<label>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // edge has been cut. Introduce new vertex.
             newFace[newFp++] = fnd.val();
@@ -490,7 +490,7 @@ Foam::face Foam::meshCutter::loopToFace
                     EdgeMap<label>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
-                    if (fnd.found())
+                    if (fnd.good())
                     {
                         newFace[newFacei++] = fnd.val();
                     }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index bfbd8f4f9e..42a5446c5a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -68,7 +68,7 @@ void Foam::multiDirRefinement::addCells
 
         const auto iter = splitMap.cfind(refCell.cellNo());
 
-        if (!iter.found())
+        if (!iter.good())
         {
             FatalErrorInFunction
                 << "Problem : cannot find added cell for cell "
@@ -289,7 +289,7 @@ void Foam::multiDirRefinement::refineHex8
 
             auto iter = hexCellSet.find(celli);
 
-            if (iter.found())
+            if (iter.good())
             {
                 iter.val() = 2;
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 202cfb2595..c2a16e1a71 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -249,7 +249,7 @@ void Foam::undoableMeshCutter::setRefinement
             // Check if celli already part of split.
             auto findCell = liveSplitCells_.find(celli);
 
-            if (!findCell.found())
+            if (!findCell.good())
             {
                 // Celli not yet split. It cannot be unlive split cell
                 // since that would be illegal to split in the first
@@ -501,7 +501,7 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
         auto ownFind = liveSplitCells_.find(own);
         auto nbrFind = liveSplitCells_.find(nbr);
 
-        if (ownFind.found() && nbrFind.found())
+        if (ownFind.good() && nbrFind.good())
         {
             // Face is original splitFace.
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index c8dcc7ea9e..d714ffa5f9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -69,7 +69,7 @@ Foam::displacementLayeredMotionMotionSolver::getCylindrical
 {
     auto iter = cylSystems_.cfind(cellZoneI);
 
-    if (iter.found())
+    if (iter.good())
     {
         return *(iter.val());
     }
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index effa13b496..7b4bc566a7 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -1286,7 +1286,7 @@ Foam::label Foam::faceCoupleInfo::matchEdgeFaces
                     // master faces.
                     auto fnd = candidates.find(cutFacei);
 
-                    if (!fnd.found())
+                    if (!fnd.good())
                     {
                         // No info yet for cutFacei. Add all master faces as
                         // candidates
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index c03ab28114..1a4d0e48c8 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -425,10 +425,10 @@ void Foam::polyMeshAdder::insertVertices
         // See if any edge between v0,v1
 
         const auto v0Fnd = meshToMaster.cfind(v0);
-        if (v0Fnd.found())
+        if (v0Fnd.good())
         {
             const auto v1Fnd = meshToMaster.cfind(v1);
-            if (v1Fnd.found())
+            if (v1Fnd.good())
             {
                 // Get edge in cutPoint numbering
                 edge cutEdge
@@ -439,7 +439,7 @@ void Foam::polyMeshAdder::insertVertices
 
                 const auto iter = cutEdgeToPoints.cfind(cutEdge);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     const edge& e = iter.key();
                     const labelList& addedPoints = iter.val();
@@ -2011,7 +2011,7 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
 
         auto iter = sharedToMesh.find(sharedI);
 
-        if (iter.found())
+        if (iter.good())
         {
             // sharedI already used by other point. Add this one.
 
@@ -2202,7 +2202,7 @@ void Foam::polyMeshAdder::mergePoints
     {
         const auto iter = pointToMaster.cfind(pointi);
 
-        if (iter.found())
+        if (iter.good())
         {
             if (iter.val() != pointi)
             {
@@ -2227,7 +2227,7 @@ void Foam::polyMeshAdder::mergePoints
 
             const auto iter = pointToMaster.cfind(pointi);
 
-            if (iter.found())
+            if (iter.good())
             {
                 if (iter.val() != pointi)
                 {
@@ -2247,7 +2247,7 @@ void Foam::polyMeshAdder::mergePoints
 
                 const auto iter = pointToMaster.cfind(pointi);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     newF[fp] = iter.val();
                 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 9db2a1d408..8802246e92 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -1959,7 +1959,7 @@ void Foam::addPatchCellLayer::setRefinement
                     forAll(f, fp)
                     {
                         const auto fnd = minPointValue.find(f[fp]);
-                        if (fnd.found())
+                        if (fnd.good())
                         {
                             baseF.setSize(f.size(), labelMax);
                             if (baseF[fp] == labelMax)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 21e5944423..3a7c096bff 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -256,7 +256,7 @@ bool Foam::combineFaces::faceNeighboursValid
 
                 const auto iter = faceRegion.cfind(nbrI);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     neighbourRegions.insert(iter.val());
                 }
@@ -346,7 +346,7 @@ Foam::labelListList Foam::combineFaces::getMergeSets
 
                 auto regionFnd = regionToFaces.find(region);
 
-                if (regionFnd.found())
+                if (regionFnd.good())
                 {
                     labelList& setFaces = regionFnd();
                     label sz = setFaces.size();
@@ -890,7 +890,7 @@ void Foam::combineFaces::setUnrefinement
 
         const auto iter = masterToSet.cfind(masterFacei);
 
-        if (!iter.found())
+        if (!iter.good())
         {
             FatalErrorInFunction
                 << "Master face " << masterFacei
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 69a5bce97d..e1986b0962 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -970,7 +970,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
     auto edgeMidFnd = midPointToAnchors.find(edgeMidPointi);
 
-    if (!edgeMidFnd.found())
+    if (!edgeMidFnd.good())
     {
         midPointToAnchors.insert(edgeMidPointi, edge(anchorPointi, -1));
     }
@@ -997,7 +997,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
 
     auto faceMidFnd = midPointToFaceMids.find(edgeMidPointi);
 
-    if (!faceMidFnd.found())
+    if (!faceMidFnd.good())
     {
         midPointToFaceMids.insert(edgeMidPointi, edge(faceMidPointi, -1));
     }
@@ -1844,7 +1844,7 @@ bool Foam::hexRef8::matchHexShape
                     {
                         auto iter = pointFaces.find(pointi);
 
-                        if (iter.found())
+                        if (iter.good())
                         {
                             labelList& pFaces = iter.val();
                             pFaces.appendUniq(facei);
@@ -4313,7 +4313,7 @@ void Foam::hexRef8::updateMesh
 
             const auto fnd = savedCellLevel_.cfind(storedCelli);
 
-            if (!fnd.found())
+            if (!fnd.good())
             {
                 FatalErrorInFunction
                     << "Problem : trying to restore old value for new cell "
@@ -4386,7 +4386,7 @@ void Foam::hexRef8::updateMesh
 
             auto fnd = savedPointLevel_.find(storedPointi);
 
-            if (!fnd.found())
+            if (!fnd.good())
             {
                 FatalErrorInFunction
                     << "Problem : trying to restore old value for new point "
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index f7c9e36ed3..b5ecbd25fd 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -363,7 +363,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                         // Increment the usage count using two hash sets
                         auto euoIter = edgesUsedOnce.find(curCutFaceEdge);
 
-                        if (!euoIter.found())
+                        if (!euoIter.good())
                         {
                             // Pout<< "Found edge not used before: "
                             //     << curCutFaceEdge
@@ -439,7 +439,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                         bool otherSideFound = false;
 
-                        if (mpfAddrIter.found())
+                        if (mpfAddrIter.good())
                         {
                             bool miss = false;
 
@@ -461,7 +461,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                                         cutFaceGlobal[pointi]
                                     );
 
-                                if (!mpfAddrPointIter.found())
+                                if (!mpfAddrPointIter.good())
                                 {
                                     // Point is off the master patch. Skip
                                     miss = true;
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 896c6a37b8..52e3b233fa 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -445,7 +445,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
             // Try to find the cut point in retired points
             const auto rpmIter = rpm.cfind(pointi);
 
-            if (rpmIter.found())
+            if (rpmIter.good())
             {
                 if (debug)
                 {
@@ -463,7 +463,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
 
                 const auto cpepmIter = cpepm.cfind(pointi);
 
-                if (cpepmIter.found())
+                if (cpepmIter.good())
                 {
                     // Pout<< "Need to re-create hit for point "
                     //     << cutPoints[pointi]
diff --git a/src/fileFormats/abaqus/ABAQUSCore.C b/src/fileFormats/abaqus/ABAQUSCore.C
index bc478cfa06..b9c685b34d 100644
--- a/src/fileFormats/abaqus/ABAQUSCore.C
+++ b/src/fileFormats/abaqus/ABAQUSCore.C
@@ -459,7 +459,7 @@ Foam::fileFormats::ABAQUSCore::readHelper::readSurfaceElements
         }
 
         const auto faceIdIter = abqToFoamFaceMap.cfind(elemTypes_[index]);
-        if (!faceIdIter.found())
+        if (!faceIdIter.good())
         {
             Info<< "Abaqus reader: reject non-solid shape: " << nl;
         }
diff --git a/src/fileFormats/stl/STLAsciiParseI.H b/src/fileFormats/stl/STLAsciiParseI.H
index 7a0491d5be..c20ebf7455 100644
--- a/src/fileFormats/stl/STLAsciiParseI.H
+++ b/src/fileFormats/stl/STLAsciiParseI.H
@@ -35,7 +35,7 @@ inline void Foam::Detail::STLAsciiParse::beginSolid(word solidName)
     }
 
     auto iter = nameLookup_.cfind(solidName);
-    if (iter.found())
+    if (iter.good())
     {
         if (groupId_ != iter.val())
         {
diff --git a/src/fileFormats/stl/STLReader.C b/src/fileFormats/stl/STLReader.C
index 60cb4e84c1..e0597319eb 100644
--- a/src/fileFormats/stl/STLReader.C
+++ b/src/fileFormats/stl/STLReader.C
@@ -131,7 +131,7 @@ bool Foam::fileFormats::STLReader::readBINARY
         const label origId = stlTri.attrib();
 
         auto fnd = lookup.cfind(origId);
-        if (fnd.found())
+        if (fnd.good())
         {
             if (zoneI != *fnd)
             {
diff --git a/src/fileFormats/vtk/file/foamVtkSeriesWriter.C b/src/fileFormats/vtk/file/foamVtkSeriesWriter.C
index c5539f3957..f333e6b437 100644
--- a/src/fileFormats/vtk/file/foamVtkSeriesWriter.C
+++ b/src/fileFormats/vtk/file/foamVtkSeriesWriter.C
@@ -280,7 +280,7 @@ bool Foam::vtk::seriesWriter::appendCheck(fileNameInstant inst)
 
     const auto iter = existing_.find(inst.name());
 
-    if (iter.found())
+    if (iter.good())
     {
         for (fileNameInstant& dst : entries_)
         {
@@ -320,7 +320,7 @@ bool Foam::vtk::seriesWriter::removeDuplicates()
         {
             auto iter = filesSeen.find(inst.name());
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Mark previous location as being superseded
                 entries_[*iter].name().clear();
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index 7bd8ad7ca9..9dee45cd56 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -509,7 +509,7 @@ Foam::labelList Foam::faBoundaryMesh::indices
         {
             const auto iter = groupPatchIDs().cfind(matcher);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Hash ids associated with the group
                 ids.insert(iter.val());
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
index c890385278..32cf1d0013 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
@@ -513,7 +513,7 @@ Foam::fvMeshSubset::interpolate
 
                 const auto iter = meshPointMap.cfind(meshPointi);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     directAddressing[localI] = *iter;
                 }
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 66fe8239a9..6455384cc7 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -116,7 +116,7 @@ void Foam::singleCellFvMesh::agglomerateMesh
 
                     const auto iter = localToNbr.cfind(myZone);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         // Check that zone numbers are still the same.
                         if (iter.val() != nbrZone)
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
index 401a697e89..0aba815147 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C
@@ -116,7 +116,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
 
                 label constraintI = -1;
 
-                if (iter.found())
+                if (iter.good())
                 {
                     constraintI = iter.val();
                 }
@@ -174,7 +174,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
 
                     const auto iter = cpPointMap.cfind(ppp);
 
-                    if (iter.found())
+                    if (iter.good())
                     {
                         // Can just copy (instead of apply) constraint
                         // will already be consistent across multiple patches.
@@ -225,7 +225,7 @@ void Foam::pointConstraints::makePatchPatchAddressing()
 
                 label constraintI = -1;
 
-                if (iter.found())
+                if (iter.good())
                 {
                     //Pout<< indent << "on meshpoint:" << meshPointi
                     //    << " coupled:" << coupledPointi
diff --git a/src/functionObjects/field/binField/binModels/binModel/binModelNew.C b/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
index 2447b09919..9d09a4ebf8 100644
--- a/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
+++ b/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
@@ -41,7 +41,7 @@ Foam::autoPtr<Foam::binModel> Foam::binModel::New
 
     auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-    if (!cstrIter.found())
+    if (!cstrIter.good())
     {
         FatalIOErrorInLookup
         (
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index d2a16eeb98..d2c5982d6c 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -607,7 +607,7 @@ bool Foam::functionObjects::externalCoupled::read(const dictionary& dict)
             const wordList writeFields(groupDict.get<wordList>("writeFields"));
 
             auto fnd = regionToGroups_.find(regionGroupNames_.last());
-            if (fnd.found())
+            if (fnd.good())
             {
                 fnd().append(nGroups);
             }
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeControl.C b/src/functionObjects/utilities/runTimeControl/runTimeControl.C
index 07e89e5383..673eaee2ae 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeControl.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeControl.C
@@ -211,7 +211,7 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
 
             auto conditionIter = groupMap_.cfind(groupi);
 
-            if (!conditionIter.found())
+            if (!conditionIter.good())
             {
                 FatalErrorInFunction
                     << "group " << groupi << " not found in map"
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index a9cb925422..1011eb1823 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -272,7 +272,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
         tmp<DimensionedField<Type, volMesh>> tsu;
 
-        if (iter1.found())
+        if (iter1.good())
         {
             const auto& valueExpr = iter1.val();
 
@@ -357,7 +357,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
                 }
             }
         }
-        else if (iter2.found() && iter2.val()->good())
+        else if (iter2.good() && iter2.val()->good())
         {
             const dimensioned<Type> SuValue
             (
@@ -400,7 +400,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
         tmp<DimensionedField<scalar, volMesh>> tsp;
 
-        if (iter1.found())
+        if (iter1.good())
         {
             const auto& valueExpr = iter1.val();
 
@@ -483,7 +483,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
                 }
             }
         }
-        else if (iter2.found() && iter2.val()->good())
+        else if (iter2.good() && iter2.val()->good())
         {
             const dimensioned<scalar> SpValue
             (
diff --git a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C b/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
index 5108533f98..ae032898ae 100644
--- a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
+++ b/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
@@ -496,7 +496,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.scalarFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -506,7 +506,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.vectorFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -516,7 +516,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.sphTensorFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -526,7 +526,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.symmTensorFields_.cfind(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
@@ -536,7 +536,7 @@ void Foam::genericPatchFieldBase::rmapGeneric
     {
         const auto iter2 = rhs.tensorFields_.find(iter.key());
 
-        if (iter2.found())
+        if (iter2.good())
         {
             (*iter)->rmap(*iter2(), addr);
         }
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
index 4edf8770ec..baa9e9ecad 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCreate.C
@@ -409,7 +409,7 @@ Foam::blockMesh::mesh(const IOobject& io) const
 
                 label zonei = freeZonei;
 
-                if (iter.found())
+                if (iter.good())
                 {
                     zonei = *iter;
                 }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 397fb18255..b6f279b490 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1376,7 +1376,7 @@ Foam::label Foam::meshRefinement::splitFacesUndo
 
                 const auto oldFaceFnd = splitFaceToIndex.cfind(oldFacei);
 
-                if (oldFaceFnd.found())
+                if (oldFaceFnd.good())
                 {
                     labelPair& twoFaces = facePairs[oldFaceFnd.val()];
                     if (twoFaces[0] == -1)
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
index 1778e5b630..c1141c9e4a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
@@ -320,7 +320,7 @@ void Foam::meshRefinement::growSet
 //    if (!isMultiRegion[celli])
 //    {
 //        Map<FixedList<label, 3>>::iterator fnd = cellToRegions.find(celli);
-//        if (!fnd.found())
+//        if (!fnd.good())
 //        {
 //            cellToRegions.insert(celli, surface);
 //        }
@@ -1772,8 +1772,8 @@ void Foam::meshRefinement::selectIntersectedFaces
 //        const edge& e = edges[edgei];
 //        const edge meshE = edge(mp[e[0]], mp[e[1]]);
 //
-//        EdgeMap<label>::const_iterator iter = edgeMap.find(meshE);
-//        if (iter.found())
+//        const auto iter = edgeMap.cfind(meshE);
+//        if (iter.good())
 //        {
 //            initialEdges.append(edgei);
 //            initialEdgesInfo.append
@@ -1781,7 +1781,7 @@ void Foam::meshRefinement::selectIntersectedFaces
 //                edgeTopoDistanceData<label, uindirectPrimitivePatch>
 //                (
 //                    0,          // distance
-//                    iter()      // globalFacei
+//                    iter.val()  // globalFacei
 //                )
 //            );
 //        }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 77baff46e5..6297c58f2f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -1376,7 +1376,7 @@ void Foam::snappyLayerDriver::determineSidePatches
         {
             label patchi = edgePatchID[i];
             const auto fnd = wantedToAddedPatch.cfind(patchi);
-            if (fnd.found())
+            if (fnd.good())
             {
                 edgePatchID[i] = fnd.val();
             }
@@ -1968,7 +1968,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
 //                const label meshFacei = pp.addressing()[patchFacei];
 //                const label celli = mesh.faceOwner()[meshFacei];
 //                Map<labelList>::iterator faceFnd = cellToFaces.find(celli);
-//                if (faceFnd.found())
+//                if (faceFnd.good())
 //                {
 //                    labelList& faces = faceFnd();
 //                    faces.appendUniq(patchFacei);
@@ -2256,7 +2256,7 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
         forAll(f, fp)
         {
             const auto fnd = meshPointMap.cfind(f[fp]);
-            if (fnd.found())
+            if (fnd.good())
             {
                 const label patchPointi = fnd.val();
 
@@ -2973,7 +2973,7 @@ Foam::List<Foam::labelPair> Foam::snappyLayerDriver::getBafflesOnAddedMesh
         label oldFacei = newToOldFaces[facei];
 
         const auto faceFnd = baffleSet.find(oldFacei);
-        if (faceFnd.found())
+        if (faceFnd.good())
         {
             label bafflei = faceFnd();
             labelPair& p = newBaffles[bafflei];
@@ -4454,7 +4454,7 @@ void Foam::snappyLayerDriver::mapFaceZonePoints
         {
             const label oldFacei = map.faceMap()[facei];
             const auto iter = oldFaceToBaffle.find(oldFacei);
-            if (oldFacei != -1 && iter.found())
+            if (oldFacei != -1 && iter.good())
             {
                 const label bafflei = iter();
                 auto& newBaffle = newBaffles[bafflei];
@@ -4588,7 +4588,7 @@ void Foam::snappyLayerDriver::updatePatch
             const label oldMeshPointi =
                 map.pointMap()[newMeshPointi];
             const auto iter = baseMap.find(oldMeshPointi);
-            if (iter.found())
+            if (iter.good())
             {
                 newToOldPatchPoints[newPointi] = iter();
             }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 5defc3fb3e..9667c05783 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -798,7 +798,7 @@ void Foam::snappySnapDriver::freezeExposedPoints
     for (const label pointi : isFrozenPoint)
     {
         const auto iter = outside.meshPointMap().find(pointi);
-        if (iter.found())
+        if (iter.good())
         {
             outsideDisp[iter.val()] = Zero;
         }
@@ -1017,7 +1017,7 @@ void Foam::snappySnapDriver::getZoneSurfacePoints
 
             const auto iter = pp.meshPointMap().cfind(meshPointi);
 
-            if (iter.found())
+            if (iter.good())
             {
                 const label pointi = iter.val();
                 pointOnZone[pointi] = true;
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
index cb1a460bb7..c296ea7279 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
@@ -52,7 +52,7 @@ Foam::labelList Foam::snappySnapDriver::getFacePoints
 
             const auto iter = pp.meshPointMap().cfind(meshPointi);
 
-            if (iter.found())
+            if (iter.good())
             {
                 const label pointi = iter.val();
                 pointOnZone[pointi] = true;
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
index b1bbe31be5..cf2592485b 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
@@ -85,7 +85,7 @@ Foam::cyclicACMIGAMGInterface::cyclicACMIGAMGInterface
         {
             const auto iter = masterToCoarseFace.cfind(curMaster);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Already have coarse face
                 dynFaceRestrictAddressing.append(iter.val());
@@ -127,7 +127,7 @@ Foam::cyclicACMIGAMGInterface::cyclicACMIGAMGInterface
             {
                 const auto iter = masterToCoarseFace.cfind(curMaster);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     // Already have coarse face
                     dynNbrFaceRestrictAddressing.append(iter.val());
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
index 54194af015..13c893c3cb 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
@@ -85,7 +85,7 @@ Foam::cyclicAMIGAMGInterface::cyclicAMIGAMGInterface
         {
             const auto iter = masterToCoarseFace.cfind(curMaster);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Already have coarse face
                 dynFaceRestrictAddressing.append(iter.val());
@@ -127,7 +127,7 @@ Foam::cyclicAMIGAMGInterface::cyclicAMIGAMGInterface
             {
                 const auto iter = masterToCoarseFace.cfind(curMaster);
 
-                if (iter.found())
+                if (iter.good())
                 {
                     // Already have coarse face
                     dynNbrFaceRestrictAddressing.append(iter.val());
diff --git a/src/meshTools/meshStructure/meshStructure.C b/src/meshTools/meshStructure/meshStructure.C
index b3db56c4d5..1e26ca5308 100644
--- a/src/meshTools/meshStructure/meshStructure.C
+++ b/src/meshTools/meshStructure/meshStructure.C
@@ -338,7 +338,7 @@ void Foam::meshStructure::correct
                             )
                         );
 
-                        if (fnd.found())
+                        if (fnd.good())
                         {
                             faceToPatchEdgeAddressing_[facei] = fnd.val();
                             faceToPatchFaceAddressing_[facei] = 0;
diff --git a/src/meshTools/multiWorld/multiWorldConnectionsObject.C b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
index 3f0bcf293c..43e736228b 100644
--- a/src/meshTools/multiWorld/multiWorldConnectionsObject.C
+++ b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
@@ -280,7 +280,7 @@ void Foam::multiWorldConnections::createComms()
             // - create a communicator and cache its value
 
             auto iter = table_.find(connect);
-            if (iter.found() && iter.val() == -1)
+            if (iter.good() && iter.val() == -1)
             {
                 iter.val() = createCommunicator(connect);
             }
@@ -353,7 +353,7 @@ Foam::label Foam::multiWorldConnections::getCommById
 
     const auto iter = table_.cfind(worlds);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "No connection registered for worlds " << worlds
@@ -394,7 +394,7 @@ Foam::label Foam::multiWorldConnections::getCommByName
 
     const auto iter = table_.cfind(worlds);
 
-    if (!iter.found())
+    if (!iter.good())
     {
         FatalErrorInFunction
             << "No connection registered for worlds " << worlds
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index 7d6c0fb292..36e8eaadce 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -160,7 +160,7 @@ void Foam::localPointRegion::countPointRegions
                     {
                         // Multiple regions for this point. Add.
                         const auto iter = meshPointMap_.cfind(pointi);
-                        if (iter.found())
+                        if (iter.good())
                         {
                             labelList& regions = pointRegions[iter.val()];
                             if (!regions.found(region))
@@ -372,7 +372,7 @@ void Foam::localPointRegion::calcPointRegions
                         const label pointi = f[fp];
                         auto iter = minPointValue.find(pointi);
 
-                        if (!iter.found())
+                        if (!iter.good())
                         {
                             minPointValue.insert(pointi, minRegion[facei][fp]);
                         }
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index 8f31dd33f2..20ca5ece34 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -633,7 +633,7 @@ Foam::regionSplit::reduceRegionsImpl
                             // Record the minimum value seen
 
                             auto fnd = updateLookup.find(sent);
-                            if (!fnd.found())
+                            if (!fnd.good())
                             {
                                 updateLookup.insert(sent, recv);
                             }
diff --git a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
index f3b223ac09..ca7329dbec 100644
--- a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
@@ -79,7 +79,7 @@ Foam::label Foam::surfaceToCell::getNearest
 {
     const auto iter = cache.cfind(pointi);
 
-    if (iter.found())
+    if (iter.good())
     {
         return *iter;  // Return cached value
     }
diff --git a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
index cdeb753361..45f028653f 100644
--- a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
+++ b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
@@ -1282,7 +1282,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::holeToFace::calcClosure
         const edge meshE = edge(mp[e[0]], mp[e[1]]);
 
         auto iter = edgeMap.cfind(meshE);
-        if (iter.found())
+        if (iter.good())
         {
             // Found edge on patch connected to blocked face. Seed with the
             // (global) index of that blocked face
diff --git a/src/meshTools/topoSet/topoSets/faceZoneSet.C b/src/meshTools/topoSet/topoSets/faceZoneSet.C
index d44b4f3695..557cbae831 100644
--- a/src/meshTools/topoSet/topoSets/faceZoneSet.C
+++ b/src/meshTools/topoSet/topoSets/faceZoneSet.C
@@ -183,7 +183,7 @@ void Foam::faceZoneSet::subset(const topoSet& set)
 
         const auto iter = faceToIndex.cfind(facei);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label index = *iter;
 
@@ -231,7 +231,7 @@ void Foam::faceZoneSet::addSet(const topoSet& set)
 
         const auto iter = faceToIndex.cfind(facei);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label index = *iter;
 
@@ -282,7 +282,7 @@ void Foam::faceZoneSet::subtractSet(const topoSet& set)
 
         const auto iter = faceToIndex.cfind(facei);
 
-        if (iter.found())
+        if (iter.good())
         {
             const label index = *iter;
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 022ed5cf24..bf7069fd35 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -804,7 +804,7 @@ Foam::surfaceFeatures::surfaceFeatures
     {
         const auto iter = dynFeatEdges.cfind(surfEdges[eI]);
 
-        if (iter.found())
+        if (iter.good())
         {
             allEdgeStat[eI] = edgeStat[iter.val()];
         }
diff --git a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
index fe16d4e97c..fbec058fd8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
+++ b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
@@ -98,7 +98,7 @@ createZeroBoundaryPtr
     {
         auto patchTypeCstrIter =
             fvPatchField<Type>::patchConstructorTablePtr_->cfind(bm[pI].type());
-        if (patchTypeCstrIter.found())
+        if (patchTypeCstrIter.good())
         {
             actualPatchTypes[pI] = bm[pI].type();
         }
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C
index e252801633..2399f56912 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterface.C
@@ -114,7 +114,7 @@ Foam::calculatedProcessorGAMGInterface::calculatedProcessorGAMGInterface
 
         const auto fnd = cellsToCoarseFace.cfind(cellPair);
 
-        if (fnd.found())
+        if (fnd.good())
         {
             // Already have coarse face
             dynFaceRestrictAddressing.append(fnd.val());
diff --git a/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C b/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C
index 25cca9cf96..d3f42ad5a3 100644
--- a/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C
+++ b/src/overset/oversetCoupledPolyPatch/oversetGAMGInterface/oversetGAMGInterface.C
@@ -88,7 +88,7 @@ Foam::oversetGAMGInterface::oversetGAMGInterface
         {
             const auto iter = masterToCoarseFace.cfind(curMaster);
 
-            if (iter.found())
+            if (iter.good())
             {
                 // Already have coarse face
                 dynFaceRestrictAddressing.append(iter.val());
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index a3f6db6029..d81f9cba21 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1369,7 +1369,7 @@ void Foam::distributedTriSurfaceMesh::surfaceSide
                     for (const edge& e : edges)
                     {
                         auto iter = edgeToFaces.find(e);
-                        if (iter.found())
+                        if (iter.good())
                         {
                             if (iter().second() == -1)
                             {
diff --git a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
index 2ea4e4df1d..5e88cac729 100644
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@@ -335,7 +335,7 @@ void Foam::faMeshReconstructor::calcAddressing
 
             const auto fnd = globalEdgeMapping.cfind(globalEdge);
 
-            if (fnd.found())
+            if (fnd.good())
             {
                 faEdgeProcAddr_[edgei] = fnd.val();
             }
@@ -409,7 +409,7 @@ void Foam::faMeshReconstructor::calcAddressing
                 const label globalEdgei = faEdgeProcAddr_[patchEdgei];
 
                 const auto fnd = remapGlobal.cfind(globalEdgei);
-                if (fnd.found())
+                if (fnd.good())
                 {
                     newEdgeProcAddr[edgei] = fnd.val();
                     ++edgei;
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
index 7d17da77eb..6943f0d90a 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
@@ -92,7 +92,7 @@ void Foam::multiphaseSystem::solveAlphas()
 
             const auto cAlpha = cAlphas_.cfind(interfacePair(phase, phase2));
 
-            if (cAlpha.found())
+            if (cAlpha.good())
             {
                 surfaceScalarField phic
                 (
@@ -279,7 +279,7 @@ void Foam::multiphaseSystem::correctContactAngle
             const auto tp =
                 acap.thetaProps().cfind(interfacePair(phase1, phase2));
 
-            if (!tp.found())
+            if (!tp.good())
             {
                 FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(phase1, phase2)
@@ -560,7 +560,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
 
         auto iterCvm = Cvms_.cfind(interfacePair(phase, phase2));
 
-        if (iterCvm.found())
+        if (iterCvm.good())
         {
             tCvm.ref() += iterCvm()*phase2.rho()*phase2;
         }
@@ -568,7 +568,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
         {
             iterCvm = Cvms_.cfind(interfacePair(phase2, phase));
 
-            if (iterCvm.found())
+            if (iterCvm.good())
             {
                 tCvm.ref() += iterCvm()*phase.rho()*phase2;
             }
@@ -613,7 +613,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
 
         auto Cvm = Cvms_.cfind(interfacePair(phase, phase2));
 
-        if (Cvm.found())
+        if (Cvm.good())
         {
             tSvm.ref() += Cvm()*phase2.rho()*phase2*phase2.DDtU();
         }
@@ -621,7 +621,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
         {
             Cvm = Cvms_.cfind(interfacePair(phase2, phase));
 
-            if (Cvm.found())
+            if (Cvm.good())
             {
                 tSvm.ref() += Cvm()*phase.rho()*phase2*phase2.DDtU();
             }
@@ -786,7 +786,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
 
         const auto sigma = sigmas_.cfind(interfacePair(phase1, phase2));
 
-        if (sigma.found())
+        if (sigma.good())
         {
             tSurfaceTension.ref() +=
                 dimensionedScalar("sigma", dimSigma_, *sigma)
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
index d50e7e4ed9..ecffddb653 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
 
     auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-    if (!cstrIter.found())
+    if (!cstrIter.good())
     {
         FatalIOErrorInLookup
         (
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 27c998e006..a07a5ea347 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -610,7 +610,7 @@ void Foam::meshToMesh::distributeAndMergeCells
 
                 const auto fnd = procFaceToGlobalCell.cfind(key);
 
-                if (!fnd.found())
+                if (!fnd.good())
                 {
                     procFaceToGlobalCell.insert(key, -1);
                 }
@@ -725,7 +725,7 @@ void Foam::meshToMesh::distributeAndMergeCells
 
                 auto fnd = procFaceToGlobalCell.find(key);
 
-                if (fnd.found())
+                if (fnd.good())
                 {
                     label tgtFacei = fnd();
                     if (tgtFacei == -1)
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index bf2e91f9e6..071e6cd303 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -295,7 +295,7 @@ Foam::label Foam::probes::prepare(unsigned request)
         {                                                                     \
             Target.clear();  /* Remove old values */                          \
             const auto iter = selected.cfind(InputType::typeName);            \
-            if (iter.found())                                                 \
+            if (iter.good())                                                  \
             {                                                                 \
                 /* Add new (current) values */                                \
                 Target.append(iter.val().sortedToc());                        \
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 8f4603abe9..b1e31b816b 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -234,7 +234,7 @@ Foam::IOobjectList Foam::sampledSets::preCheckFields(unsigned request)
         #define doLocalCode(InputType)                                        \
         {                                                                     \
             const auto iter = selected.find(InputType::typeName);             \
-            if (iter.found())                                                 \
+            if (iter.good())                                                  \
             {                                                                 \
                 selectedFieldNames_.append(iter.val().sortedToc());           \
             }                                                                 \
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 225cc3752a..ed50dd69ef 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -236,7 +236,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
             // Convert groupId into zoneId
             const auto iterZone = zoneLookup.cfind(groupId);
-            if (iterZone.found())
+            if (iterZone.good())
             {
                 if (zoneId != *iterZone)
                 {
@@ -270,7 +270,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
             // Convert groupId into zoneId
             const auto iterZone = zoneLookup.cfind(groupId);
-            if (iterZone.found())
+            if (iterZone.good())
             {
                 if (zoneId != *iterZone)
                 {
@@ -411,7 +411,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         const label zoneId  = iter.val();
 
         const auto iterName = nameLookup.cfind(groupId);
-        if (iterName.found())
+        if (iterName.good())
         {
             names[zoneId] = *iterName;
         }
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 6f5c969394..d471bd66ae 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -124,7 +124,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
             const word groupName = word::validate(tokens[1]);
             const auto iterGroup = groupLookup.cfind(groupName);
 
-            if (iterGroup.found())
+            if (iterGroup.good())
             {
                 if (zoneId != *iterGroup)
                 {
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index fc91e99c3d..9c0ae4d633 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -178,7 +178,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
         {
             // Convert cellTableId to zoneId
             const auto iterGroup = lookup.cfind(cellTableId);
-            if (iterGroup.found())
+            if (iterGroup.good())
             {
                 if (zoneId != *iterGroup)
                 {
@@ -194,7 +194,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
 
                 const auto iterTableName = cellTableLookup.cfind(cellTableId);
 
-                if (iterTableName.found())
+                if (iterTableName.good())
                 {
                     dynNames.append(*iterTableName);
                 }
diff --git a/src/surfMesh/surfaceFormats/tri/TRIReader.C b/src/surfMesh/surfaceFormats/tri/TRIReader.C
index d1e42d6e1c..aa764f6ff3 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIReader.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIReader.C
@@ -111,7 +111,7 @@ bool Foam::fileFormats::TRIReader::readFile(const fileName& filename)
         const word name("zone" + rawName.substr(1));
 
         const auto iter = lookup.cfind(name);
-        if (iter.found())
+        if (iter.good())
         {
             if (zoneI != iter.val())
             {
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index 084e626996..ca69a45607 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -45,7 +45,7 @@ Foam::basicThermo::getThermoOrDie
     auto ctorIter = thermoTable.cfind(thermoTypeName);
 
     // Print error message if package not found in the table
-    if (!ctorIter.found())
+    if (!ctorIter.good())
     {
         FatalIOErrorInLookup
         (
@@ -109,7 +109,7 @@ Foam::basicThermo::getThermoOrDie
 
         auto ctorIter = thermoTable.cfind(thermoTypeName);
 
-        if (!ctorIter.found())
+        if (!ctorIter.good())
         {
             FatalIOErrorInLookup
             (
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index cf3ef8f3f3..4c01e3ea67 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -653,7 +653,7 @@ bool finishReaction = false;
         const auto reactionKeywordIter =
             reactionKeywordTable_.cfind(keyword);
 
-        if (reactionKeywordIter.found())
+        if (reactionKeywordIter.good())
         {
             switch (reactionKeywordIter.val())
             {
@@ -763,7 +763,7 @@ bool finishReaction = false;
             const auto specieIndexIter =
                 specieIndices_.cfind(currentSpecieName);
 
-            if (specieIndexIter.found())
+            if (specieIndexIter.good())
             {
                 if (finishReaction)
                 {
@@ -807,7 +807,7 @@ bool finishReaction = false;
         const auto reactionKeywordIter =
             reactionKeywordTable_.cfind(keyword);
 
-        if (reactionKeywordIter.found())
+        if (reactionKeywordIter.good())
         {
             switch (reactionKeywordIter.val())
             {
@@ -1118,7 +1118,7 @@ bool finishReaction = false;
             const auto specieIndexIter =
                 specieIndices_.cfind(keyword);
 
-            if (specieIndexIter.found())
+            if (specieIndexIter.good())
             {
                 currentThirdBodyIndex = specieIndexIter.val();
             }
@@ -1142,7 +1142,7 @@ bool finishReaction = false;
         const auto specieIndexIter =
             specieIndices_.cfind(currentSpecieName);
 
-        if (specieIndexIter.found())
+        if (specieIndexIter.good())
         {
             if (finishReaction)
             {
@@ -1309,7 +1309,7 @@ bool finishReaction = false;
             const auto specieIndexIter =
                 specieIndices_.cfind(pDependentSpecieName);
 
-            if (specieIndexIter.found())
+            if (specieIndexIter.good())
             {
                 thirdBodyEfficiencies = 0.0;
                 thirdBodyEfficiencies[specieIndexIter.val()] = 1.0;
@@ -1352,7 +1352,7 @@ bool finishReaction = false;
 
         const auto specieIndexIter = specieIndices_.cfind(currentSpecieName);
 
-        if (specieIndexIter.found())
+        if (specieIndexIter.good())
         {
             currentSpecieIndex = specieIndexIter.val();
         }

From 1dbb54c391d5bf99505114bc3d36e9b2e6eccd4f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Feb 2023 16:21:08 +0100
Subject: [PATCH 058/348] ENH: refine definition of PtrList emplace() and
 HashPtrTable emplace_set()

- like emplace_back(), return a reference to the new element
---
 applications/test/PtrList/Test-PtrList.C              |  4 +++-
 .../containers/HashTables/HashPtrTable/HashPtrTable.H |  4 ++--
 .../HashTables/HashPtrTable/HashPtrTableI.H           |  6 ++++--
 .../containers/PtrLists/PtrDynList/PtrDynList.H       |  6 ++++--
 .../containers/PtrLists/PtrDynList/PtrDynListI.H      | 11 +++++++----
 src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H    |  6 ++++--
 src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H   | 11 +++++++----
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index f3826d8a29..e6821e38d1 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -599,7 +599,9 @@ int main(int argc, char *argv[])
         dynPlanes.set(6, new plane(vector(2,2,1), vector::one));
         dynPlanes.set(10, new plane(vector(4,5,6), vector::one));
 
-        dynPlanes.emplace(12, vector(3,2,1), vector::one);
+        Info<< "emplaced :"
+            << dynPlanes.emplace(12, vector(3,2,1), vector::one) << endl;
+
         dynPlanes.emplace_back(Zero, vector::one);
     }
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 50175e0887..765c34b89e 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -207,9 +207,9 @@ public:
         inline bool emplace(const Key& key, Args&&... args);
 
         //- Emplace set an entry, overwriting any existing entries.
-        //  \return True, since it always overwrites any entries.
+        //  \return Reference to the new element.
         template<class... Args>
-        inline bool emplace_set(const Key& key, Args&&... args);
+        inline T& emplace_set(const Key& key, Args&&... args);
 
         //- No insert() with raw pointers (potential memory leaks).
         //- Use insert() with autoPtr or set()
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
index 682d24c8f6..f207bbceac 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
@@ -95,13 +95,15 @@ inline bool Foam::HashPtrTable<T, Key, Hash>::emplace
 
 template<class T, class Key, class Hash>
 template<class... Args>
-inline bool Foam::HashPtrTable<T, Key, Hash>::emplace_set
+inline T& Foam::HashPtrTable<T, Key, Hash>::emplace_set
 (
     const Key& key,
     Args&&... args
 )
 {
-    return this->set(key, new T(std::forward<Args>(args)...));
+    T* ptr = new T(std::forward<Args>(args)...);
+    (void)this->set(key, ptr);
+    return *ptr;
 }
 
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index 552184af39..8a7573645e 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -174,9 +174,11 @@ public:
         //- Remove and return the top element. Can be called on an empty list.
         inline autoPtr<T> remove();
 
-        //- Construct and set an element
+        //- Construct and set a new element at given position,
+        //- (discard old element at that location).
+        //- Return reference to the new list element.
         template<class... Args>
-        inline autoPtr<T> emplace(const label i, Args&&... args);
+        inline T& emplace(const label i, Args&&... args);
 
         //- Set element to given pointer and return old element (can be null).
         //- Auto-sizes list as required.
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index 47ac482d83..1c929f57db 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -220,8 +220,9 @@ template<class T, int SizeMin>
 template<class... Args>
 inline T& Foam::PtrDynList<T, SizeMin>::emplace_back(Args&&... args)
 {
-    this->push_back(new T(std::forward<Args>(args)...));
-    return this->back();
+    T* ptr = new T(std::forward<Args>(args)...);
+    this->push_back(ptr);
+    return *ptr;
 }
 
 
@@ -346,13 +347,15 @@ inline Foam::autoPtr<T> Foam::PtrDynList<T, SizeMin>::remove()
 
 template<class T, int SizeMin>
 template<class... Args>
-inline Foam::autoPtr<T> Foam::PtrDynList<T, SizeMin>::emplace
+inline T& Foam::PtrDynList<T, SizeMin>::emplace
 (
     const label i,
     Args&&... args
 )
 {
-    return this->set(i, new T(std::forward<Args>(args)...));
+    T* ptr = new T(std::forward<Args>(args)...);
+    (void)this->set(i, ptr);
+    return *ptr;
 }
 
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 8a5c89cb61..f59cfaff26 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -172,9 +172,11 @@ public:
         //- Move append another list to the end of this list.
         inline void push_back(PtrList<T>&& other);
 
-        //- Construct and set an element
+        //- Construct and set a new element at given position,
+        //- (discard old element at that location).
+        //- Return reference to the new list element.
         template<class... Args>
-        inline autoPtr<T> emplace(const label i, Args&&... args);
+        inline T& emplace(const label i, Args&&... args);
 
         //- Set element to given pointer and return old element (can be null)
         //  No-op if the new pointer value is identical to the current content.
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
index d08be8d531..921c4bed09 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
@@ -105,8 +105,9 @@ template<class T>
 template<class... Args>
 inline T& Foam::PtrList<T>::emplace_back(Args&&... args)
 {
-    UPtrList<T>::push_back(new T(std::forward<Args>(args)...));
-    return this->back();
+    T* ptr = new T(std::forward<Args>(args)...);
+    UPtrList<T>::push_back(ptr);
+    return *ptr;
 }
 
 
@@ -171,13 +172,15 @@ inline void Foam::PtrList<T>::push_back(PtrList<T>&& other)
 
 template<class T>
 template<class... Args>
-inline Foam::autoPtr<T> Foam::PtrList<T>::emplace
+inline T& Foam::PtrList<T>::emplace
 (
     const label i,
     Args&&... args
 )
 {
-    return set(i, new T(std::forward<Args>(args)...));
+    T* ptr = new T(std::forward<Args>(args)...);
+    (void)this->set(i, ptr);
+    return *ptr;
 }
 
 

From 74fd94dff307e5af671fd06a043dc74523298dd4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Feb 2023 09:25:20 +0100
Subject: [PATCH 059/348] REGRESSION: overly aggressive handling of MPI groups

- attempted reduction in bookkeeping (commit: 068ab8ccc797) meant that
  the worldComm didn't have a group from which sub-communicators could
  be spun off.

- do not force reset of PstreamBuffers positions

STYLE: UPstream::globalComm instead of '0'
---
 src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C     | 3 ---
 src/Pstream/mpi/UPstream.C                              | 8 ++++++--
 src/functionObjects/utilities/syncObjects/syncObjects.C | 5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index ff37820401..1979e80374 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -41,7 +41,6 @@ void Foam::PstreamBuffers::finalExchange
     // Could also check that it is not called twice
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
-    recvPositions_ = Zero;
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
@@ -102,7 +101,6 @@ void Foam::PstreamBuffers::finalExchange
     // Could also check that it is not called twice
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
-    recvPositions_ = Zero;
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
@@ -140,7 +138,6 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
     // Could also check that it is not called twice
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
-    recvPositions_ = Zero;
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 005707be61..61667ce2b0 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -535,12 +535,16 @@ void Foam::UPstream::allocatePstreamCommunicator
 
         PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_WORLD;
-        PstreamGlobals::MPIGroups_[index] = MPI_GROUP_NULL;
 
         // TBD: MPI_Comm_dup(MPI_COMM_WORLD, ...);
         // with pendingMPIFree_[index] = CommPending ...
         // Note: freePstreamCommunicator may need an update
 
+        MPI_Comm_group
+        (
+            PstreamGlobals::MPICommunicators_[index],
+           &PstreamGlobals::MPIGroups_[index]
+        );
         MPI_Comm_rank
         (
             PstreamGlobals::MPICommunicators_[index],
@@ -565,8 +569,8 @@ void Foam::UPstream::allocatePstreamCommunicator
 
         PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_SELF;
-        PstreamGlobals::MPIGroups_[index] = MPI_GROUP_NULL;
 
+        MPI_Comm_group(MPI_COMM_SELF, &PstreamGlobals::MPIGroups_[index]);
         MPI_Comm_rank(MPI_COMM_SELF, &myProcNo_[index]);
 
         // Number of ranks is always 1 (self communicator)
diff --git a/src/functionObjects/utilities/syncObjects/syncObjects.C b/src/functionObjects/utilities/syncObjects/syncObjects.C
index 88f613da6b..06776eae3b 100644
--- a/src/functionObjects/utilities/syncObjects/syncObjects.C
+++ b/src/functionObjects/utilities/syncObjects/syncObjects.C
@@ -90,9 +90,8 @@ void Foam::functionObjects::syncObjects::sync()
     // Note provision of explicit all-world communicator
     PstreamBuffers pBufs
     (
-        Pstream::commsTypes::nonBlocking,
-        UPstream::msgType(),
-        0
+        UPstream::globalComm,
+        UPstream::commsTypes::nonBlocking
     );
 
 

From 1ab9dca2abdd3b26af82d2713f0213ccdee98881 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Feb 2023 13:59:18 +0100
Subject: [PATCH 060/348] ENH: reduce all-to-all communication in mesh wave
 algorithms

- use persistent PstreamBuffers between iterations, restrict size
  information exchange to the processor neighbours (which is what the
  algorithm is handling there anyhow).
---
 .../polyMesh/globalMeshData/globalPoints.C    | 39 ++++++++++---------
 .../polyTopoChange/addPatchCellLayer.C        | 25 ------------
 .../polyTopoChange/addPatchCellLayer.H        |  3 --
 .../algorithms/MeshWave/FaceCellWave.C        | 18 +++++----
 .../algorithms/MeshWave/FaceCellWave.H        | 10 +++--
 .../algorithms/MeshWave/FaceCellWaveBase.C    |  3 +-
 .../algorithms/PointEdgeWave/PointEdgeWave.C  | 28 ++++++++-----
 .../algorithms/PointEdgeWave/PointEdgeWave.H  |  8 +++-
 .../PointEdgeWave/PointEdgeWaveBase.C         |  3 +-
 9 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index f34b7c542d..5466f41130 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -891,19 +891,22 @@ void Foam::globalPoints::calculateSharedPoints
     //   a point or edge.
     initOwnPoints(meshToPatchPoint, true, changedPoints);
 
+    // Note: to use 'scheduled' would have to intersperse send and receive.
+    // So for now just use nonBlocking. Also globalPoints itself gets
+    // constructed by mesh.globalData().patchSchedule() so creates a loop.
+    PstreamBuffers pBufs
+    (
+        (
+            Pstream::defaultCommsType == Pstream::commsTypes::scheduled
+          ? Pstream::commsTypes::nonBlocking
+          : Pstream::defaultCommsType
+        )
+    );
+
     // Do one exchange iteration to get neighbour points.
     {
-        // Note: to use 'scheduled' would have to intersperse send and receive.
-        // So for now just use nonBlocking. Also globalPoints itself gets
-        // constructed by mesh.globalData().patchSchedule() so creates a loop.
-        PstreamBuffers pBufs
-        (
-            (
-                Pstream::defaultCommsType == Pstream::commsTypes::scheduled
-              ? Pstream::commsTypes::nonBlocking
-              : Pstream::defaultCommsType
-            )
-        );
+        pBufs.clear();
+
         sendPatchPoints
         (
             mergeSeparated,
@@ -911,7 +914,9 @@ void Foam::globalPoints::calculateSharedPoints
             pBufs,
             changedPoints
         );
+
         pBufs.finishedSends();
+
         receivePatchPoints
         (
             mergeSeparated,
@@ -933,14 +938,8 @@ void Foam::globalPoints::calculateSharedPoints
 
     do
     {
-        PstreamBuffers pBufs
-        (
-            (
-                Pstream::defaultCommsType == Pstream::commsTypes::scheduled
-              ? Pstream::commsTypes::nonBlocking
-              : Pstream::defaultCommsType
-            )
-        );
+        pBufs.clear();
+
         sendPatchPoints
         (
             mergeSeparated,
@@ -948,7 +947,9 @@ void Foam::globalPoints::calculateSharedPoints
             pBufs,
             changedPoints
         );
+
         pBufs.finishedSends();
+
         receivePatchPoints
         (
             mergeSeparated,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 8802246e92..f0441afd67 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -452,31 +452,6 @@ Foam::label Foam::addPatchCellLayer::addSideFace
 }
 
 
-Foam::label Foam::addPatchCellLayer::findProcPatch
-(
-    const polyMesh& mesh,
-    const label nbrProcID
-)
-{
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    forAll(mesh.globalData().processorPatches(), i)
-    {
-        label patchi = mesh.globalData().processorPatches()[i];
-
-        if
-        (
-            refCast<const processorPolyPatch>(patches[patchi]).neighbProcNo()
-         == nbrProcID
-        )
-        {
-            return patchi;
-        }
-    }
-    return -1;
-}
-
-
 void Foam::addPatchCellLayer::setFaceProps
 (
     const polyMesh& mesh,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index b0d12af7ed..fe59a8f608 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -202,9 +202,6 @@ class addPatchCellLayer
             polyTopoChange&
         ) const;
 
-        //- Find patch to neighbouring processor
-        static label findProcPatch(const polyMesh&, const label nbrProcID);
-
         //- Extract properties from mesh face
         static void setFaceProps
         (
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index aeb8930324..325f93ba94 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -526,13 +526,15 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
     // Which patches are processor patches
     const labelList& procPatches = pData.processorPatches();
 
-    // Send all
+    // Which processors this processor is connected to
+    const labelList& neighbourProcs = pData.topology().procNeighbours();
 
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    // Reset buffers
+    pBufs_.clear();
 
     for (const label patchi : procPatches)
     {
-        const processorPolyPatch& procPatch =
+        const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
         // Allocate buffers
@@ -567,20 +569,20 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
                 << endl;
         }
 
-        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
+        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs_);
         //writeFaces(nSendFaces, sendFaces, sendFacesInfo, toNeighbour);
         toNeighbour
             << SubList<label>(sendFaces, nSendFaces)
             << SubList<Type>(sendFacesInfo, nSendFaces);
     }
 
-    pBufs.finishedSends();
+    // Finished sends
+    pBufs_.finishedNeighbourSends(neighbourProcs);
 
-    // Receive all
 
     for (const label patchi : procPatches)
     {
-        const processorPolyPatch& procPatch =
+        const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
         // Allocate buffers
@@ -588,7 +590,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
         List<Type> receiveFacesInfo;
 
         {
-            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs_);
             fromNeighbour >> receiveFaces >> receiveFacesInfo;
         }
 
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.H b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
index e98f41d413..e2dd118bd4 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.H
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,9 +51,10 @@ SourceFiles
 #define Foam_FaceCellWave_H
 
 #include "bitSet.H"
+#include "labelPair.H"
 #include "DynamicList.H"
 #include "primitiveFieldsFwd.H"
-#include "labelPair.H"
+#include "PstreamBuffers.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -83,6 +84,9 @@ protected:
         //- Reference to mesh
         const polyMesh& mesh_;
 
+        //- Buffers when updating processor patches
+        PstreamBuffers pBufs_;
+
         //- Track if face has changed
         bitSet changedFace_;
 
@@ -115,7 +119,7 @@ public:
     // Constructors
 
         //- Construct with mesh reference and set initial sizes
-        FaceCellWaveBase(const polyMesh& mesh);
+        explicit FaceCellWaveBase(const polyMesh& mesh);
 
 
     // Static Functions
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C b/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C
index 0666052af5..9cbeb1e675 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2012 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,6 +52,7 @@ Foam::FaceCellWaveBase::FaceCellWaveBase
 )
 :
     mesh_(mesh),
+    pBufs_(UPstream::commsTypes::nonBlocking),
     changedFace_(mesh_.nFaces()),
     changedCell_(mesh_.nCells()),
     changedFaces_(mesh_.nFaces()),
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index 9ccf3e3762..215be1c467 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -305,16 +305,24 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
 {
     // 1. Send all point info on processor patches.
 
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    const globalMeshData& pData = mesh_.globalData();
+
+    // Which patches are processor patches
+    const labelList& procPatches = pData.processorPatches();
+
+    // Which processors this processor is connected to
+    const labelList& neighbourProcs = pData.topology().procNeighbours();
+
+    // Reset buffers
+    pBufs_.clear();
 
     DynamicList<Type> patchInfo;
     DynamicList<label> thisPoints;
     DynamicList<label> nbrPoints;
 
-    forAll(mesh_.globalData().processorPatches(), i)
+    for (const label patchi : procPatches)
     {
-        label patchi = mesh_.globalData().processorPatches()[i];
-        const processorPolyPatch& procPatch =
+        const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
         patchInfo.clear();
@@ -347,28 +355,28 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         //        << "  Sending:" << patchInfo.size() << endl;
         //}
 
-        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
+        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs_);
         toNeighbour << nbrPoints << patchInfo;
     }
 
 
-    pBufs.finishedSends();
+    // Finished sends
+    pBufs_.finishedNeighbourSends(neighbourProcs);
 
     //
     // 2. Receive all point info on processor patches.
     //
 
-    forAll(mesh_.globalData().processorPatches(), i)
+    for (const label patchi : procPatches)
     {
-        label patchi = mesh_.globalData().processorPatches()[i];
-        const processorPolyPatch& procPatch =
+        const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
         List<Type> patchInfo;
         labelList patchPoints;
 
         {
-            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs_);
             fromNeighbour >> patchPoints >> patchInfo;
         }
 
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
index 453d6e4b17..10af737920 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,6 +64,7 @@ SourceFiles
 #include "bitSet.H"
 #include "scalarField.H"
 #include "tensorField.H"
+#include "PstreamBuffers.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -95,6 +96,9 @@ protected:
         //- Reference to mesh
         const polyMesh& mesh_;
 
+        //- Buffers when updating processor patches
+        PstreamBuffers pBufs_;
+
         //- Track if point has changed
         bitSet changedPoint_;
 
@@ -127,7 +131,7 @@ public:
     // Constructors
 
         //- Construct with mesh reference and set initial sizes
-        PointEdgeWaveBase(const polyMesh& mesh);
+        explicit PointEdgeWaveBase(const polyMesh& mesh);
 
 
     // Static Functions
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C
index 2af77fb4f2..2b67798974 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2012 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,6 +50,7 @@ Foam::PointEdgeWaveBase::PointEdgeWaveBase
 )
 :
     mesh_(mesh),
+    pBufs_(UPstream::commsTypes::nonBlocking),
     changedPoint_(mesh_.nPoints()),
     changedEdge_(mesh_.nEdges()),
     changedPoints_(mesh_.nPoints()),

From 2db3e2b64f9fb0d2f8915c4bea451d5a2c7128e8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Feb 2023 21:23:38 +0100
Subject: [PATCH 061/348] STYLE: simplify ensightMeshReader with
 emplace_back/push_back

STYLE: emplace for mesh zones
---
 .../ensightToFoam/ensightMeshReader.C         | 81 ++++++++-----------
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C | 19 ++---
 .../MeshedSurface/MeshedSurfaceZones.C        |  2 +-
 src/surfMesh/polySurface/polySurface.C        |  4 +-
 .../readers/ensight/ensightSurfaceReader.C    | 18 ++---
 src/surfMesh/surfMesh/surfMesh.C              |  2 +-
 src/surfMesh/triSurface/triSurface.C          |  4 +-
 7 files changed, 57 insertions(+), 73 deletions(-)

diff --git a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
index 25c64bbaf0..c151e94964 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
+++ b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -79,11 +79,11 @@ void Foam::fileFormats::ensightMeshReader::readVerts
         is.read(verti);
         //if (nodeIdToPoints.size())
         //{
-        //    verts.append(nodeIdToPoints[verti]);
+        //    verts.push_back(nodeIdToPoints[verti]);
         //}
         //else
         {
-            verts.append(verti-1);
+            verts.push_back(verti-1);
         }
     }
 }
@@ -672,29 +672,16 @@ bool Foam::fileFormats::ensightMeshReader::readGeometry
             bool finished = false;
             do
             {
-                label partIndex;
-                is.read(partIndex);
-                partIDs.append(partIndex);
-
                 // Make space
-                partNames.setSize(partIDs.size());
-                partPoints.append(new pointField(0));
-                partNodeIDs.append(new labelList(0));
-                partPointIDs.append(new Map<label>());
+                partIDs.emplace_back();
+                is.read(partIDs.back());
 
-                partCells.append(new faceListList(0));
-                partCellIDs.append(new labelList(0));
-                partCellElemIDs.append(new Map<label>());
-
-                partFaces.append(new faceList(0));
-                partFaceIDs.append(new labelList(0));
-                partFaceElemIDs.append(new Map<label>());
-
-                is.read(partNames.last());
+                partNames.emplace_back();
+                is.read(partNames.back());
 
                 Pout<< indent
-                    << "Reading part " << partIndex
-                    << " name " << partNames.last()
+                    << "Reading part " << partIDs.back()
+                    << " name " << partNames.back()
                     << " starting at line " << is.lineNumber()
                     << " position " << is.stdStream().tellg() << endl;
 
@@ -705,27 +692,27 @@ bool Foam::fileFormats::ensightMeshReader::readGeometry
                     read_node_ids,
                     read_elem_ids,
 
-                    partPoints.last(),
-                    partNodeIDs.last(),
-                    partPointIDs.last(),
+                    partPoints.emplace_back(),
+                    partNodeIDs.emplace_back(),
+                    partPointIDs.emplace_back(),
 
                     // Cells (cell-to-faces)
-                    partCells.last(),
-                    partCellIDs.last(),
-                    partCellElemIDs.last(),
+                    partCells.emplace_back(),
+                    partCellIDs.emplace_back(),
+                    partCellElemIDs.emplace_back(),
 
                     // Faces
-                    partFaces.last(),
-                    partFaceIDs.last(),
-                    partFaceElemIDs.last()
+                    partFaces.emplace_back(),
+                    partFaceIDs.emplace_back(),
+                    partFaceElemIDs.emplace_back()
                 );
 
-                partPoints.last() *= scaleFactor;
+                partPoints.back() *= scaleFactor;
 
                 Pout<< indent
-                    << "For part " << partIndex
-                    << " read cells " << partCells.last().size()
-                    << " faces " << partFaces.last().size()
+                    << "For part " << partIDs.back()
+                    << " read cells " << partCells.back().size()
+                    << " faces " << partFaces.back().size()
                     << endl;
 
                 Pout<< decrIndent;
@@ -952,7 +939,7 @@ bool Foam::fileFormats::ensightMeshReader::readGeometry
     // - but instead pass in ordered faces (lowest numbered vertex first)
     HashTable<cellFaceIdentifier, face, face::symmHasher> vertsToCell
     (
-        2*cellOffsets.last()
+        2*cellOffsets.back()
     );
 
     // Insert cell's faces into hashtable
@@ -1064,24 +1051,24 @@ bool Foam::fileFormats::ensightMeshReader::readGeometry
     if (vertsToCell.size())
     {
         // Unused internal or boundary faces
-        boundaryIds_.append(List<cellFaceIdentifier>(0));
+        boundaryIds_.emplace_back(vertsToCell.size());
         {
-            auto& cellAndFaces = boundaryIds_.last();
-            cellAndFaces.setSize(vertsToCell.size());
+            auto& cellAndFaces = boundaryIds_.back();
             label i = 0;
-            for (const auto& e : vertsToCell)
+            forAllConstIters(vertsToCell, iter)
             {
-                cellAndFaces[i++] = e;
+                cellAndFaces[i++] = iter.val();
             }
         }
-        patchTypes_.append("empty");
-        patchNames_.append("defaultFaces");
-        patchPhysicalTypes_.append("empty");
-        patchStarts_.append(0);
-        patchSizes_.append(0);
+
+        patchTypes_.push_back("empty");
+        patchNames_.push_back("defaultFaces");
+        patchPhysicalTypes_.push_back("empty");
+        patchStarts_.push_back(0);
+        patchSizes_.push_back(0);
 
         Pout<< "Introducing default patch " << patchNames_.size()-1
-            << " name " << patchNames_.last() << endl;
+            << " name " << patchNames_.back() << endl;
     }
 
     return true;
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index c21094d9e6..038a201295 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -133,7 +133,7 @@ void Foam::ZoneMesh<ZoneType, MeshType>::calcGroupIDs() const
 
         for (const word& groupName : groups)
         {
-            groupLookup(groupName).append(zonei);
+            groupLookup(groupName).push_back(zonei);
         }
     }
 
@@ -537,11 +537,9 @@ Foam::label Foam::ZoneMesh<ZoneType, MeshType>::findZoneID
         // Used for -dry-run, for example
         if (disallowGenericZones != 0)
         {
-            auto& zm = const_cast<ZoneMesh<ZoneType, MeshType>&>(*this);
-            zoneId = zm.size();
-
             Info<< "Creating dummy zone " << zoneName << endl;
-            zm.append(new ZoneType(zoneName, zoneId, zm));
+            auto& zm = const_cast<ZoneMesh<ZoneType, MeshType>&>(*this);
+            zm.emplace_back(zoneName, zm.size(), zm);
         }
     }
 
@@ -575,10 +573,9 @@ const ZoneType* Foam::ZoneMesh<ZoneType, MeshType>::cfindZone
     // Used for -dry-run, for example
     if (disallowGenericZones != 0)
     {
-        auto& zm = const_cast<ZoneMesh<ZoneType, MeshType>&>(*this);
-
         Info<< "Creating dummy zone " << zoneName << endl;
-        zm.append(new ZoneType(zoneName, zm.size(), zm));
+        auto& zm = const_cast<ZoneMesh<ZoneType, MeshType>&>(*this);
+        zm.emplace_back(zoneName, zm.size(), zm);
     }
 
     return nullptr;
@@ -678,7 +675,7 @@ void Foam::ZoneMesh<ZoneType, MeshType>::setGroup
     // Add to specified zones
     for (const label zonei : zoneIDs)
     {
-        zones[zonei].inGroups().appendUniq(groupName);
+        zones[zonei].inGroups().push_uniq(groupName);
         doneZone[zonei] = true;
     }
 
@@ -921,7 +918,7 @@ ZoneType& Foam::ZoneMesh<ZoneType, MeshType>::operator()
     if (!ptr)
     {
         ptr = new ZoneType(zoneName, this->size(), *this);
-        this->append(ptr);
+        this->push_back(ptr);
     }
 
     if (verbose)
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index 116771bcb7..ce8fb9e94f 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -58,7 +58,7 @@ void Foam::MeshedSurface<Face>::checkZones(const bool verbose)
 
     if (!zones.empty())
     {
-        surfZone& zn = zones.last();
+        surfZone& zn = zones.back();
 
         if ((zn.start() + zn.size()) < maxCount)
         {
diff --git a/src/surfMesh/polySurface/polySurface.C b/src/surfMesh/polySurface/polySurface.C
index 1b12eb90a2..37609d0e6a 100644
--- a/src/surfMesh/polySurface/polySurface.C
+++ b/src/surfMesh/polySurface/polySurface.C
@@ -69,7 +69,7 @@ void Foam::polySurface::calculateZoneIds(const UList<surfZone>& zones)
         WarningInFunction
             << "More faces " << size() << " than zones " << off << endl;
 
-        SubList<label>(zoneIds_, size()-off, off) = zones.last().index();
+        SubList<label>(zoneIds_, size()-off, off) = zones.back().index();
     }
     else if (size() < off)
     {
@@ -431,7 +431,7 @@ void Foam::polySurface::transfer
 //             << " ... extending final zone"
 //             << endl;
 //
-//         surfZones_.last().size() += count - nFaces();
+//         surfZones_.back().size() += count - nFaces();
 //     }
 //     else if (size() < count)
 //     {
diff --git a/src/surfMesh/readers/ensight/ensightSurfaceReader.C b/src/surfMesh/readers/ensight/ensightSurfaceReader.C
index ab72a87efc..394eebdcaf 100644
--- a/src/surfMesh/readers/ensight/ensightSurfaceReader.C
+++ b/src/surfMesh/readers/ensight/ensightSurfaceReader.C
@@ -254,7 +254,7 @@ void Foam::ensightSurfaceReader::readCase(ISstream& is)
     //     model: data/directory/geometry
     //
     // - use the last entry
-    meshFileName_ = stringOps::splitSpace(buffer).last().str();
+    meshFileName_ = stringOps::splitSpace(buffer).back().str();
 
     DebugInfo << "mesh file:" << meshFileName_ << endl;
 
@@ -295,8 +295,8 @@ void Foam::ensightSurfaceReader::readCase(ISstream& is)
             Info<< nl;
         }
 
-        fieldNames.append(parsed[parsed.size()-2].str());
-        fieldFileNames.append(parsed.last().str());
+        fieldNames.push_back(parsed[parsed.size()-2].str());
+        fieldFileNames.push_back(parsed.back().str());
     }
     fieldNames_.transfer(fieldNames);
     fieldFileNames_.transfer(fieldFileNames);
@@ -471,7 +471,7 @@ Foam::meshedSurface Foam::ensightSurfaceReader::readGeometry
             {
                 is.read(faceCount);
 
-                faceTypeInfo.append
+                faceTypeInfo.push_back
                 (
                     faceInfoTuple(ensightFaces::elemType::TRIA3, faceCount)
                 );
@@ -501,7 +501,7 @@ Foam::meshedSurface Foam::ensightSurfaceReader::readGeometry
                         is.read(fp);
                     }
 
-                    dynFaces.append(std::move(f));
+                    dynFaces.push_back(std::move(f));
                 }
             }
             else if
@@ -512,7 +512,7 @@ Foam::meshedSurface Foam::ensightSurfaceReader::readGeometry
             {
                 is.read(faceCount);
 
-                faceTypeInfo.append
+                faceTypeInfo.push_back
                 (
                     faceInfoTuple(ensightFaces::elemType::QUAD4, faceCount)
                 );
@@ -542,7 +542,7 @@ Foam::meshedSurface Foam::ensightSurfaceReader::readGeometry
                         is.read(fp);
                     }
 
-                    dynFaces.append(std::move(f));
+                    dynFaces.push_back(std::move(f));
                 }
             }
             else if
@@ -553,7 +553,7 @@ Foam::meshedSurface Foam::ensightSurfaceReader::readGeometry
             {
                 is.read(faceCount);
 
-                faceTypeInfo.append
+                faceTypeInfo.push_back
                 (
                     faceInfoTuple(ensightFaces::elemType::NSIDED, faceCount)
                 );
@@ -588,7 +588,7 @@ Foam::meshedSurface Foam::ensightSurfaceReader::readGeometry
                         is.read(fp);
                     }
 
-                    dynFaces.append(std::move(f));
+                    dynFaces.push_back(std::move(f));
                 }
             }
             else
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index 6daed2fbc9..2253f688a8 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -497,7 +497,7 @@ void Foam::surfMesh::checkZones(const bool verbose)
 
     if (!zones.empty())
     {
-        surfZone& zn = zones.last();
+        surfZone& zn = zones.back();
 
         if ((zn.start() + zn.size()) < maxCount)
         {
diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C
index 09c488b02e..d32e518997 100644
--- a/src/surfMesh/triSurface/triSurface.C
+++ b/src/surfMesh/triSurface/triSurface.C
@@ -343,12 +343,12 @@ Foam::triSurface::calcPatches(labelList& faceMap) const
     // Extend regions
     label maxRegion = patches_.size()-1;    // for non-compacted regions
 
-    if (faceMap.size())
+    if (!faceMap.empty())
     {
         maxRegion = max
         (
             maxRegion,
-            operator[](faceMap.last()).region()
+            operator[](faceMap.back()).region()
         );
     }
 

From 35dae3fc3b8addd8a9c069281686662f5985b72a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 09:33:00 +0100
Subject: [PATCH 062/348] STYLE: simpler mass-flow/volume-flow dimension check

* (dimMass/dimTime)    instead of  (dimDensity*dimVelocity*dimArea)
* (dimVolume/dimTime)  instead of  (dimVelocity*dimArea)
---
 .../solvers/multiphase/multiphaseEulerFoam/createFields.H | 2 +-
 .../solvers/multiphase/multiphaseEulerFoam/pEqn.H         | 2 +-
 .../multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H      | 2 +-
 .../multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H     | 2 +-
 .../derived/advective/advectiveFvPatchField.C             | 2 +-
 .../fields/fvPatchFields/derived/fan/fanFvPatchFields.C   | 2 +-
 .../derived/fanPressure/fanPressureFvPatchScalarField.C   | 4 ++--
 .../fluxCorrectedVelocityFvPatchVectorField.C             | 4 ++--
 .../mappedFlowRate/mappedFlowRateFvPatchVectorField.C     | 4 ++--
 .../plenumPressure/plenumPressureFvPatchScalarField.C     | 8 ++------
 ...ressureDirectedInletOutletVelocityFvPatchVectorField.C | 4 ++--
 .../pressureDirectedInletVelocityFvPatchVectorField.C     | 4 ++--
 ...pressureInletOutletParSlipVelocityFvPatchVectorField.C | 4 ++--
 .../pressureInletVelocityFvPatchVectorField.C             | 4 ++--
 .../pressureNormalInletOutletVelocityFvPatchVectorField.C | 4 ++--
 .../pressurePIDControlInletVelocityFvPatchVectorField.C   | 8 ++++----
 ...ePermeableAlphaInletOutletVelocityFvPatchVectorField.C | 4 ++--
 .../swirlFlowRateInletVelocityFvPatchVectorField.C        | 4 ++--
 .../syringePressure/syringePressureFvPatchScalarField.C   | 4 ++--
 .../waveSurfacePressureFvPatchScalarField.C               | 2 +-
 .../waveTransmissive/waveTransmissiveFvPatchField.C       | 2 +-
 .../limitedSchemes/PhiScheme/PhiScheme.C                  | 4 ++--
 .../surfaceInterpolation/schemes/CoBlended/CoBlended.H    | 4 ++--
 .../schemes/cellCoBlended/cellCoBlended.H                 | 4 ++--
 .../directionalPressureGradientExplicitSource.C           | 4 ++--
 .../PatchFlowRateInjection/PatchFlowRateInjection.C       | 2 +-
 .../filmPyrolysisVelocityCoupledFvPatchVectorField.C      | 4 ++--
 .../outletMachNumberPressureFvPatchScalarField.C          | 2 +-
 28 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
index 87a539ba75..15acdcacb7 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
@@ -37,7 +37,7 @@ surfaceScalarField phi
         IOobject::AUTO_WRITE
     ),
     mesh,
-    dimensionedScalar(dimArea*dimVelocity, Zero)
+    dimensionedScalar(dimVelocity*dimArea, Zero)
 );
 
 multiphaseSystem fluid(U, phi);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 4d3b927e4e..f5c7886eb2 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -53,7 +53,7 @@
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar(dimArea*dimVelocity, Zero)
+        dimensionedScalar(dimVelocity*dimArea, Zero)
     );
 
     volScalarField rho("rho", fluid.rho());
diff --git a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H
index 5e488110b0..5f65eb5129 100644
--- a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -180,7 +180,7 @@ while (pimple.correct())
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
+        dimensionedScalar(dimVelocity*dimArea, Zero)
     );
 
     forAll(phases, phasei)
diff --git a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H
index 98da1ded9b..f2e3d51067 100644
--- a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H
@@ -165,7 +165,7 @@ while (pimple.correct())
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
+        dimensionedScalar(dimVelocity*dimArea, Zero)
     );
 
     forAll(phases, phasei)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 4e40f829f7..d49596d030 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -166,7 +166,7 @@ Foam::advectiveFvPatchField<Type>::advectionSpeed() const
             phiName_
         );
 
-    if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchScalarField& rhop =
             this->patch().template lookupPatchField<volScalarField, scalar>
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 8100ad1b24..2e7c25d284 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -77,7 +77,7 @@ void Foam::fanFvPatchField<Foam::scalar>::calcFanJump()
             }
         }
 
-        if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+        if (phi.dimensions() == dimMass/dimTime)
         {
             Un /= patch().lookupPatchField<volScalarField, scalar>(rhoName_);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index 2105734dea..f339f3a854 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -162,11 +162,11 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
     // Average volumetric flow rate
     scalar volFlowRate = 0;
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         volFlowRate = dir*gSum(phip);
     }
-    else if (phi.dimensions() == dimVelocity*dimArea*dimDensity)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const scalarField& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index f600895920..08f995dbfe 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -115,11 +115,11 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
     const vectorField n(patch().nf());
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         operator==(*this - n*(n & *this) + n*phip/magS);
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
index 5bdeefc980..016619b6c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
@@ -140,12 +140,12 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
 
     vectorField n(patch().nf());
 
-    if (phiName.dimensions() == dimVelocity*dimArea)
+    if (phiName.dimensions() == dimVolume/dimTime)
     {
         // volumetric flow-rate
         operator==(n*U);
     }
-    else if (phiName.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phiName.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 8497772215..770634339f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -196,7 +196,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
 
     // Calculate the current mass flow rate
     scalar massFlowRate(1.0);
-    if (phi.internalField().dimensions() == dimVelocity*dimArea)
+    if (phi.internalField().dimensions() == dimVolume/dimTime)
     {
         if (hasRho_)
         {
@@ -209,11 +209,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
                 << exit(FatalError);
         }
     }
-    else if
-    (
-        phi.internalField().dimensions()
-     == dimDensity*dimVelocity*dimArea
-    )
+    else if (phi.internalField().dimensions() == dimMass/dimTime)
     {
         if (hasRho_)
         {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index fddcc8a57d..e2c83fb1c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -160,11 +160,11 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     tmp<scalarField> ndmagS = (n & inletDir_)*patch().magSf();
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         refValue() = inletDir_*phip/ndmagS;
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index dc7976ecb0..aa8c33a182 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -150,11 +150,11 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     tmp<scalarField> ndmagS = (n & inletDir_)*patch().magSf();
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         operator==(inletDir_*phip/ndmagS);
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 4c89daf49b..fc21808f87 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -134,11 +134,11 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
     vectorField Ut(patchInternalField());
     Ut -= n()*(Ut & n());
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         refValue() = Ut + n*phip/magSf;
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index e954a2cf79..a7e1fba8fb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -118,11 +118,11 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         operator==(n*phip/magS);
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 6340b222d1..c66edef9b1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -130,11 +130,11 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         refValue() = n*phip/magS;
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index 698f3dfc1b..ed7c739dfb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -238,11 +238,11 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::updateCoeffs()
 
     // Get the density
     scalar rho = 1;
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         // do nothing ...
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhoField =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
@@ -254,9 +254,9 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::updateCoeffs()
         FatalErrorInFunction
             << "The dimensions of the field " << phiName_
             << "are not recognised. The dimensions are " << phi.dimensions()
-            << ". The dimensions should be either " << dimVelocity*dimArea
+            << ". The dimensions should be either " << dimVolume/dimTime
             << " for an incompressible case, or "
-            << dimDensity*dimVelocity*dimArea << " for a compressible case."
+            << dimMass/dimTime << " for a compressible case."
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index 660ae711bb..8f70522e99 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -138,11 +138,11 @@ updateCoeffs()
 
     const vectorField n(patch().nf());
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         refValue() = (phip/patch().magSf())*n;
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index c0c37d2d9c..7f9092557a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -171,12 +171,12 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
         const surfaceScalarField& phi =
             db().lookupObject<surfaceScalarField>(phiName_);
 
-        if (phi.dimensions() == dimVelocity*dimArea)
+        if (phi.dimensions() == dimVolume/dimTime)
         {
             // volumetric flow-rate
             operator==(tangentialVelocity + n*avgU);
         }
-        else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+        else if (phi.dimensions() == dimMass/dimTime)
         {
             const fvPatchField<scalar>& rhop =
                 patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 137350c703..82627bce14 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -206,11 +206,11 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
     const fvsPatchField<scalar>& phip =
         patch().patchField<surfaceScalarField, scalar>(phi);
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         ams_ = ams0_ + deltaT*sum((*this*psi_)*phip);
     }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         ams_ = ams0_ + deltaT*sum(phip);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index fca845562e..7e33d7d86b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -164,7 +164,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
     // Change in zeta due to flux
     vectorField dZetap(dt*nf()*phi.boundaryField()[patchi]/patch().magSf());
 
-    if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    if (phi.dimensions() == dimMass/dimTime)
     {
         const scalarField& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 530e84ffbd..42d9cd4b21 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -121,7 +121,7 @@ Foam::waveTransmissiveFvPatchField<Type>::advectionSpeed() const
         this->patch().template
             lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
 
-    if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchScalarField& rhop =
             this->patch().template
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index 491230f954..da7f02d3eb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -68,7 +68,7 @@ Foam::PhiScheme<Type, PhiLimiter>::limiter
 
     tmp<surfaceScalarField> tUflux = this->faceFlux_;
 
-    if (this->faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea)
+    if (this->faceFlux_.dimensions() == dimMass/dimTime)
     {
         const volScalarField& rho =
             phi.db().objectRegistry::template lookupObject<volScalarField>
@@ -76,7 +76,7 @@ Foam::PhiScheme<Type, PhiLimiter>::limiter
 
         tUflux = this->faceFlux_/fvc::interpolate(rho);
     }
-    else if (this->faceFlux_.dimensions() != dimVelocity*dimArea)
+    else if (this->faceFlux_.dimensions() != dimVolume/dimTime)
     {
         FatalErrorInFunction
             << "dimensions of faceFlux are not correct"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index 6dfe043052..aa1f10e44d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -199,7 +199,7 @@ public:
             const fvMesh& mesh = this->mesh();
             tmp<surfaceScalarField> tUflux = faceFlux_;
 
-            if (faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea)
+            if (faceFlux_.dimensions() == dimMass/dimTime)
             {
                 // Currently assume that the density field
                 // corresponding to the mass-flux is named "rho"
@@ -209,7 +209,7 @@ public:
 
                 tUflux = faceFlux_/fvc::interpolate(rho);
             }
-            else if (faceFlux_.dimensions() != dimVelocity*dimArea)
+            else if (faceFlux_.dimensions() != dimVolume/dimTime)
             {
                 FatalErrorInFunction
                     << "dimensions of faceFlux are not correct"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 12b277b92f..488713445a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -208,7 +208,7 @@ public:
             const fvMesh& mesh = this->mesh();
             tmp<surfaceScalarField> tUflux = faceFlux_;
 
-            if (faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea)
+            if (faceFlux_.dimensions() == dimMass/dimTime)
             {
                 // Currently assume that the density field
                 // corresponding to the mass-flux is named "rho"
@@ -218,7 +218,7 @@ public:
 
                 tUflux = faceFlux_/fvc::interpolate(rho);
             }
-            else if (faceFlux_.dimensions() != dimVelocity*dimArea)
+            else if (faceFlux_.dimensions() != dimVolume/dimTime)
             {
                 FatalErrorInFunction
                     << "dimensions of faceFlux are not correct"
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index 7671078e5e..df48d608ef 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -268,7 +268,7 @@ void Foam::fv::directionalPressureGradientExplicitSource::correct
     {
         case pDarcyForchheimer:
         {
-            if (phi.dimensions() == dimVelocity*dimArea)
+            if (phi.dimensions() == dimVolume/dimTime)
             {
                 const auto& turbModel =
                     mesh().lookupObject<incompressible::turbulenceModel>
@@ -323,7 +323,7 @@ void Foam::fv::directionalPressureGradientExplicitSource::correct
             }
             reduce(totalphi, sumOp<scalar>());
 
-            if (phi.dimensions() == dimVelocity*dimArea)
+            if (phi.dimensions() == dimVolume/dimTime)
             {
                 volFlowRate = mag(totalphi);
             }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index ae5c3c88f8..b4cf007ec5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -133,7 +133,7 @@ Foam::scalar Foam::PatchFlowRateInjection<CloudType>::flowRate() const
     const scalarField& phip = phi.boundaryField()[patchId_];
 
     scalar flowRateIn = 0.0;
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {
         flowRateIn = max(0.0, -sum(phip));
     }
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 2e3e718946..210f7f942b 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -176,9 +176,9 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
     const surfaceScalarField& phi =
         db().lookupObject<surfaceScalarField>(phiName_);
 
-    if (phi.dimensions() == dimVelocity*dimArea)
+    if (phi.dimensions() == dimVolume/dimTime)
     {}
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    else if (phi.dimensions() == dimMass/dimTime)
     {
         const fvPatchField<scalar>& rhop =
             patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index ff96ab6487..5f69d2c0d1 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -160,7 +160,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
         patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
 
     // Calculate the current mass flow rate
-    if (phi.internalField().dimensions() != dimDensity*dimVelocity*dimArea)
+    if (phi.internalField().dimensions() != dimMass/dimTime)
     {
         FatalErrorInFunction
             <<"phi is not a mass flux." << exit(FatalError);

From 27a7ae2d1d44b703c8894c4a12188ac224ac28ea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 09:33:00 +0100
Subject: [PATCH 063/348] ENH: use simpler lookupPatchField form

---
 .../T/smoluchowskiJumpTFvPatchScalarField.C   | 12 ++--
 .../BCs/U/maxwellSlipUFvPatchVectorField.C    | 13 ++--
 .../BCs/rho/fixedRhoFvPatchScalarField.C      |  7 +--
 ...woPhaseRadCoupledMixedFvPatchScalarField.C | 63 +++++++++----------
 .../adjointOutletPressureFvPatchScalarField.C | 15 ++---
 .../adjointOutletVelocityFvPatchVectorField.C |  7 +--
 .../tractionDisplacementFvPatchVectorField.C  | 21 +++----
 ...DisplacementCorrectionFvPatchVectorField.C | 18 ++----
 etc/codeTemplates/BC/BC.C                     |  6 +-
 ...thDissipationRateInletFvPatchScalarField.C |  8 +--
 ...ngLengthFrequencyInletFvPatchScalarField.C |  8 +--
 .../porousBafflePressureFvPatchField.C        | 11 ++--
 ...entHeatFluxTemperatureFvPatchScalarField.C |  2 +-
 .../inletOutlet/inletOutletFaPatchField.C     |  5 +-
 .../derived/advective/advectiveFvPatchField.C | 20 ++----
 .../derived/fan/fanFvPatchFields.C            | 11 ++--
 .../fanPressureFvPatchScalarField.C           | 13 ++--
 ...malInletOutletVelocityFvPatchVectorField.C |  4 +-
 ...ureCompressibleDensityFvPatchScalarField.C |  3 +-
 .../flowRateInletVelocityFvPatchVectorField.C |  4 +-
 ...flowRateOutletVelocityFvPatchVectorField.C |  4 +-
 .../fluxCorrectedVelocityFvPatchVectorField.C | 13 ++--
 .../freestreamPressureFvPatchScalarField.C    |  5 +-
 .../inletOutlet/inletOutletFvPatchField.C     |  5 +-
 ...OutletTotalTemperatureFvPatchScalarField.C | 12 ++--
 ...erstitialInletVelocityFvPatchVectorField.C |  3 +-
 .../mappedField/mappedPatchFieldBase.C        |  6 +-
 .../mappedFlowRateFvPatchVectorField.C        |  9 +--
 .../movingWallVelocityFvPatchVectorField.C    |  2 +-
 .../outletInlet/outletInletFvPatchField.C     |  5 +-
 ...utletPhaseMeanVelocityFvPatchVectorField.C |  6 +-
 ...aseHydrostaticPressureFvPatchScalarField.C |  5 +-
 .../plenumPressureFvPatchScalarField.C        |  7 +--
 ...tedInletOutletVelocityFvPatchVectorField.C | 13 ++--
 ...eDirectedInletVelocityFvPatchVectorField.C | 13 ++--
 ...tOutletParSlipVelocityFvPatchVectorField.C | 13 ++--
 ...ureInletOutletVelocityFvPatchVectorField.C |  2 +-
 .../pressureInletVelocityFvPatchVectorField.C | 13 ++--
 ...malInletOutletVelocityFvPatchVectorField.C | 13 ++--
 ...IDControlInletVelocityFvPatchVectorField.C | 10 +--
 ...phaInletOutletVelocityFvPatchVectorField.C | 14 ++---
 ...ableAlphaTotalPressureFvPatchScalarField.C |  9 +--
 .../prghPressureFvPatchScalarField.C          |  6 +-
 ...talHydrostaticPressureFvPatchScalarField.C |  8 +--
 .../prghTotalPressureFvPatchScalarField.C     |  6 +-
 .../rotatingTotalPressureFvPatchScalarField.C |  2 +-
 .../supersonicFreestreamFvPatchVectorField.C  |  9 +--
 .../swirlFanVelocityFvPatchField.C            | 12 ++--
 ...lFlowRateInletVelocityFvPatchVectorField.C |  7 +--
 .../syringePressureFvPatchScalarField.C       | 10 +--
 .../totalPressureFvPatchScalarField.C         | 13 ++--
 .../totalTemperatureFvPatchScalarField.C      | 12 ++--
 ...sityKineticEnergyInletFvPatchScalarField.C |  8 +--
 .../uniformInletOutletFvPatchField.C          |  2 +-
 .../uniformTotalPressureFvPatchScalarField.C  | 13 ++--
 .../variableHeightFlowRateFvPatchField.C      |  3 +-
 ...tFlowRateInletVelocityFvPatchVectorField.C |  6 +-
 .../waveSurfacePressureFvPatchScalarField.C   |  6 +-
 .../waveTransmissiveFvPatchField.C            | 17 ++---
 .../extractEulerianParticles.C                |  8 +--
 .../field/momentumError/momentumError.C       |  2 +-
 .../PatchFlowRateInjection.C                  |  6 +-
 ...djointFarFieldPressureFvPatchScalarField.C |  2 +-
 .../copiedFixedValueFvPatchScalarField.C      |  2 +-
 ...sonJacksonParticleSlipFvPatchVectorField.C | 10 +--
 ...onJacksonParticleThetaFvPatchScalarField.C |  8 +--
 ...sonJacksonParticleSlipFvPatchVectorField.C | 22 +++----
 ...onJacksonParticleThetaFvPatchScalarField.C | 32 ++++------
 ...sRadiativeCoupledMixedFvPatchScalarField.C |  9 ++-
 ...rolysisVelocityCoupledFvPatchVectorField.C |  6 +-
 ...ilmHeightInletVelocityFvPatchVectorField.C | 11 +---
 ...allHeatFluxTemperatureFvPatchScalarField.C |  2 +-
 ...emperatureCoupledMixedFvPatchScalarField.C | 31 ++++-----
 ...tletMachNumberPressureFvPatchScalarField.C |  6 +-
 ...ableBaffleMassFractionFvPatchScalarField.C |  5 +-
 ...ermeableBaffleVelocityFvPatchVectorField.C |  2 +-
 .../temperatureCoupledBase.C                  | 10 +--
 .../thermalBaffle1DFvPatchScalarField.C       | 11 ++--
 ...RateAdvectiveDiffusiveFvPatchScalarField.C |  5 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.C |  5 +-
 ...eratureRadCoupledMixedFvPatchScalarField.C | 12 ++--
 .../MarshakRadiationFvPatchScalarField.C      |  6 +-
 ...iationFixedTemperatureFvPatchScalarField.C |  2 +-
 ...iffusiveRadiationMixedFvPatchScalarField.C |  5 +-
 ...veViewFactorFixedValueFvPatchScalarField.C |  2 +-
 ...iffusiveRadiationMixedFvPatchScalarField.C |  2 +-
 .../enthalpySorptionFvPatchScalarField.C      | 17 ++---
 .../speciesSorptionFvPatchScalarField.C       |  3 +-
 ...ndentAlphaContactAngleFvPatchScalarField.C |  2 +-
 .../alphaFixedPressureFvPatchScalarField.C    |  3 +-
 .../potentialFoam/cylinder/system/controlDict |  6 +-
 .../twoSimpleRotors/system/controlDict        |  3 +-
 .../twoSimpleRotors/system/controlDict        |  2 +-
 .../system/continuityFunctions                |  9 ++-
 94 files changed, 325 insertions(+), 517 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index d9fbc8f1dd..8b93ea74c3 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -165,14 +165,10 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvPatchScalarField& pmu =
-        patch().lookupPatchField<volScalarField, scalar>(muName_);
-    const fvPatchScalarField& prho =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
-    const fvPatchField<scalar>& ppsi =
-        patch().lookupPatchField<volScalarField, scalar>(psiName_);
-    const fvPatchVectorField& pU =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const auto& pmu = patch().lookupPatchField<volScalarField>(muName_);
+    const auto& prho = patch().lookupPatchField<volScalarField>(rhoName_);
+    const auto& ppsi = patch().lookupPatchField<volScalarField>(psiName_);
+    const auto& pU = patch().lookupPatchField<volVectorField>(UName_);
 
     // Prandtl number reading consistent with rhoCentralFoam
     const dictionary& thermophysicalProperties =
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 65ab5787b7..6d0bd7e488 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -155,12 +155,9 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const fvPatchScalarField& pmu =
-        patch().lookupPatchField<volScalarField, scalar>(muName_);
-    const fvPatchScalarField& prho =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
-    const fvPatchField<scalar>& ppsi =
-        patch().lookupPatchField<volScalarField, scalar>(psiName_);
+    const auto& pmu = patch().lookupPatchField<volScalarField>(muName_);
+    const auto& prho = patch().lookupPatchField<volScalarField>(rhoName_);
+    const auto& ppsi = patch().lookupPatchField<volScalarField>(psiName_);
 
     Field<scalar> C1
     (
@@ -187,8 +184,8 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
 
     if (curvature_)
     {
-        const fvPatchTensorField& ptauMC =
-            patch().lookupPatchField<volTensorField, tensor>(tauMCName_);
+        const auto& ptauMC =
+            patch().lookupPatchField<volTensorField>(tauMCName_);
         vectorField n(patch().nf());
 
         refValue() -= C1/prho*transform(I - n*n, (n & ptauMC));
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
index 08064c0ab2..bbc871e6b8 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
@@ -104,11 +104,8 @@ void Foam::fixedRhoFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvPatchField<scalar>& psip =
-        patch().lookupPatchField<volScalarField, scalar>(psiName_);
-
-    const fvPatchField<scalar>& pp =
-        patch().lookupPatchField<volScalarField, scalar>(pName_);
+    const auto& psip = patch().lookupPatchField<volScalarField>(psiName_);
+    const auto& pp = patch().lookupPatchField<volScalarField>(pName_);
 
     operator==(psip*pp);
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
index df3a1c5020..ba6b51f3d2 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
@@ -88,26 +88,29 @@ kappa
 
         case mtLookup:
         {
-            if (mesh.foundObject<volScalarField>(kappaName_))
             {
-                return patch().lookupPatchField<volScalarField, scalar>
-                (
-                    kappaName_
-                );
+                const auto* ptr =
+                    mesh.cfindObject<volScalarField>(kappaName_);
+
+                if (ptr)
+                {
+                    return patch().patchField(*ptr);
+                }
             }
-            else if (mesh.foundObject<volSymmTensorField>(kappaName_))
             {
-                const symmTensorField& KWall =
-                    patch().lookupPatchField<volSymmTensorField, scalar>
-                    (
-                        kappaName_
-                    );
+                const auto* ptr =
+                    mesh.cfindObject<volSymmTensorField>(kappaName_);
 
-                const vectorField n(patch().nf());
+                if (ptr)
+                {
+                    const symmTensorField& KWall = patch().patchField(*ptr);
 
-                return n & KWall & n;
+                    const vectorField n(patch().nf());
+
+                    return n & KWall & n;
+                }
             }
-            else
+
             {
                 FatalErrorInFunction
                     << "Did not find field " << kappaName_
@@ -117,9 +120,6 @@ kappa
                     << " or volSymmTensorField."
                     << exit(FatalError);
             }
-
-
-
             break;
         }
 
@@ -131,10 +131,8 @@ kappa
                 mesh.lookupObject<phaseSystem>("phaseProperties")
             );
 
-            tmp<scalarField> kappaEff
-            (
-                new scalarField(patch().size(), 0.0)
-            );
+            auto tkappaEff = tmp<scalarField>::New(patch().size(), Zero);
+            auto& kappaEff = tkappaEff.ref();
 
             forAll(fluid.phases(), phasei)
             {
@@ -142,10 +140,10 @@ kappa
 
                 const fvPatchScalarField& alpha = phase.boundaryField()[patchi];
 
-                kappaEff.ref() += alpha*phase.kappaEff(patchi)();
+                kappaEff += alpha*phase.kappaEff(patchi)();
             }
 
-            return kappaEff;
+            return tkappaEff;
 
             break;
         }
@@ -161,9 +159,11 @@ kappa
         }
     }
 
-    return scalarField(0);
+    // Return zero-sized (not nullptr)
+    return tmp<scalarField>::New();
 }
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
@@ -308,12 +308,11 @@ updateCoeffs()
 
     scalarField& Tp = *this;
 
-    const turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField&
-        nbrField = refCast
-            <const turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField>
-            (
-                nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
-            );
+    const auto& nbrField =
+        refCast
+        <
+            const turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
+        >(nbrPatch.lookupPatchField<volScalarField>(TnbrName_));
 
     // Swap to obtain full local values of neighbour internal field
     scalarField TcNbr(nbrField.patchInternalField());
@@ -330,13 +329,13 @@ updateCoeffs()
     scalarField qr(Tp.size(), 0.0);
     if (qrName_ != "none")
     {
-        qr = patch().lookupPatchField<volScalarField, scalar>(qrName_);
+        qr = patch().lookupPatchField<volScalarField>(qrName_);
     }
 
     scalarField qrNbr(Tp.size(), 0.0);
     if (qrNbrName_ != "none")
     {
-        qrNbr = nbrPatch.lookupPatchField<volScalarField, scalar>(qrNbrName_);
+        qrNbr = nbrPatch.lookupPatchField<volScalarField>(qrNbrName_);
         mpp.distribute(qrNbr);
     }
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index 549223501d..83dfb3eb3b 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -89,17 +89,10 @@ void Foam::adjointOutletPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>("phi");
-
-    const fvsPatchField<scalar>& phiap =
-        patch().lookupPatchField<surfaceScalarField, scalar>("phia");
-
-    const fvPatchField<vector>& Up =
-        patch().lookupPatchField<volVectorField, vector>("U");
-
-    const fvPatchField<vector>& Uap =
-        patch().lookupPatchField<volVectorField, vector>("Ua");
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>("phi");
+    const auto& phiap = patch().lookupPatchField<surfaceScalarField>("phia");
+    const auto& Up = patch().lookupPatchField<volVectorField>("U");
+    const auto& Uap = patch().lookupPatchField<volVectorField>("Ua");
 
     operator==((phiap/patch().magSf() - 1.0)*phip/patch().magSf() + (Up & Uap));
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 6b913b92df..98c1d8258b 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -90,11 +90,8 @@ void Foam::adjointOutletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const fvsPatchField<scalar>& phiap =
-        patch().lookupPatchField<surfaceScalarField, scalar>("phia");
-
-    const fvPatchField<vector>& Up =
-        patch().lookupPatchField<volVectorField, vector>("U");
+    const auto& phiap = patch().lookupPatchField<surfaceScalarField>("phia");
+    const auto& Up = patch().lookupPatchField<volVectorField>("U");
 
     scalarField Un(mag(patch().nf() & Up));
     vectorField UtHat((Up - patch().nf()*Un)/(Un + SMALL));
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index 297e5dc20c..ca656a739e 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -152,14 +152,9 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs()
         db().lookupObject<IOdictionary>("thermalProperties");
 
 
-    const fvPatchField<scalar>& rho =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
-
-    const fvPatchField<scalar>& rhoE =
-        patch().lookupPatchField<volScalarField, scalar>("E");
-
-    const fvPatchField<scalar>& nu =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+    const auto& rho = patch().lookupPatchField<volScalarField>("rho");
+    const auto& rhoE = patch().lookupPatchField<volScalarField>("E");
+    const auto& nu = patch().lookupPatchField<volScalarField>("nu");
 
     scalarField E(rhoE/rho);
     scalarField mu(E/(2.0*(1.0 + nu)));
@@ -176,8 +171,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs()
 
     vectorField n(patch().nf());
 
-    const fvPatchField<symmTensor>& sigmaD =
-        patch().lookupPatchField<volSymmTensorField, symmTensor>("sigmaD");
+    const auto& sigmaD = patch().lookupPatchField<volSymmTensorField>("sigmaD");
 
     gradient() =
     (
@@ -187,11 +181,10 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs()
 
     if (thermalProperties.get<bool>("thermalStress"))
     {
-        const fvPatchField<scalar>&  threeKalpha=
-            patch().lookupPatchField<volScalarField, scalar>("threeKalpha");
+        const auto& threeKalpha =
+            patch().lookupPatchField<volScalarField>("threeKalpha");
 
-        const fvPatchField<scalar>& T =
-            patch().lookupPatchField<volScalarField, scalar>("T");
+        const auto& T = patch().lookupPatchField<volScalarField>("T");
 
         gradient() += n*threeKalpha*T/twoMuLambda;
     }
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index 7936a80f1b..f0fdb53f43 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -152,14 +152,9 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs()
         "mechanicalProperties"
     );
 
-    const fvPatchField<scalar>& rho =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
-
-    const fvPatchField<scalar>& rhoE =
-        patch().lookupPatchField<volScalarField, scalar>("E");
-
-    const fvPatchField<scalar>& nu =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+    const auto& rho = patch().lookupPatchField<volScalarField>("rho");
+    const auto& rhoE = patch().lookupPatchField<volScalarField>("E");
+    const auto& nu = patch().lookupPatchField<volScalarField>("nu");
 
     scalarField E(rhoE/rho);
     scalarField mu(E/(2.0*(1.0 + nu)));
@@ -172,11 +167,8 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs()
 
     vectorField n(patch().nf());
 
-    const fvPatchField<symmTensor>& sigmaD =
-        patch().lookupPatchField<volSymmTensorField, symmTensor>("sigmaD");
-
-    const fvPatchField<tensor>& sigmaExp =
-        patch().lookupPatchField<volTensorField, tensor>("sigmaExp");
+    const auto& sigmaD = patch().lookupPatchField<volSymmTensorField>("sigmaD");
+    const auto& sigmaExp = patch().lookupPatchField<volTensorField>("sigmaExp");
 
     gradient() =
     (
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index bc945fb23c..b58cadd63d 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -205,10 +205,8 @@ void Foam::CLASS::updateCoeffs()
     );
 
     const scalarField& phip =
-        this->patch().template lookupPatchField<surfaceScalarField, scalar>
-        (
-            "phi"
-        );
+        this->patch().template lookupPatchField<surfaceScalarField>("phi");
+
     this->valueFraction() = 1.0 - pos0(phip);
 
     PARENT::updateCoeffs();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 9f4f0a2a16..c4af50f5a6 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -150,11 +150,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
 
     const scalar Cmu75 = pow(Cmu_, 0.75);
 
-    const fvPatchScalarField& kp =
-        patch().lookupPatchField<volScalarField, scalar>(kName_);
+    const auto& kp =
+        patch().lookupPatchField<volScalarField>(kName_);
 
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
+    const auto& phip =
+        patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
     this->refValue() = (Cmu75/mixingLength_)*pow(kp, 1.5);
     this->valueFraction() = 1.0 - pos0(phip);
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 2cbe3bd759..fca946ff5f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -139,11 +139,11 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
 
     const scalar Cmu25 = pow(Cmu, 0.25);
 
-    const fvPatchScalarField& kp =
-        patch().lookupPatchField<volScalarField, scalar>(kName_);
+    const auto& kp =
+        patch().lookupPatchField<volScalarField>(kName_);
 
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
+    const auto& phip =
+        patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
     this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
     this->valueFraction() = 1.0 - pos0(phip);
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index b045715f87..0f9ee0997a 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -141,16 +141,13 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
         return;
     }
 
-    const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     scalarField Un(phip/patch().magSf());
 
-    if (phi.dimensions() == dimMass/dimTime)
+    if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        Un /= patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        Un /= patch().lookupPatchField<volScalarField>(rhoName_);
     }
 
     if (uniformJump_)
@@ -185,7 +182,7 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
     {
         setJump
         (
-            jump()*patch().lookupPatchField<volScalarField, scalar>(rhoName_)
+            jump()*patch().lookupPatchField<volScalarField>(rhoName_)
         );
     }
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index 19424001cc..34c01bdc69 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -186,7 +186,7 @@ void atmTurbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
     }
 
     const scalarField& alphaEffp =
-        patch().lookupPatchField<volScalarField, scalar>(alphaEffName_);
+        patch().lookupPatchField<volScalarField>(alphaEffName_);
 
     const scalar t = db().time().timeOutputValue();
     const scalar Cp0 = Cp0_->value(t);
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index d69a4c89a4..361d58adb8 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -124,10 +124,7 @@ void Foam::inletOutletFaPatchField<Type>::updateCoeffs()
     }
 
     const Field<scalar>& phip =
-        this->patch(). template lookupPatchField<edgeScalarField, scalar>
-        (
-            phiName_
-        );
+        this->patch().template lookupPatchField<edgeScalarField>(phiName_);
 
     this->valueFraction() = 1.0 - pos(phip);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index d49596d030..c3ff10de38 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -156,23 +156,13 @@ template<class Type>
 Foam::tmp<Foam::scalarField>
 Foam::advectiveFvPatchField<Type>::advectionSpeed() const
 {
-    const surfaceScalarField& phi =
-        this->db().objectRegistry::template lookupObject<surfaceScalarField>
-        (phiName_);
+    const auto& phip =
+        this->patch().template lookupPatchField<surfaceScalarField>(phiName_);
 
-    fvsPatchField<scalar> phip =
-        this->patch().template lookupPatchField<surfaceScalarField, scalar>
-        (
-            phiName_
-        );
-
-    if (phi.dimensions() == dimMass/dimTime)
+    if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchScalarField& rhop =
-            this->patch().template lookupPatchField<volScalarField, scalar>
-            (
-                rhoName_
-            );
+        const auto& rhop =
+            this->patch().template lookupPatchField<volScalarField>(rhoName_);
 
         return phip/(rhop*this->patch().magSf());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 2e7c25d284..6028845530 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -38,11 +38,8 @@ void Foam::fanFvPatchField<Foam::scalar>::calcFanJump()
 {
     if (this->cyclicPatch().owner())
     {
-        const surfaceScalarField& phi =
-            db().lookupObject<surfaceScalarField>(phiName_);
-
-        const fvsPatchField<scalar>& phip =
-            patch().patchField<surfaceScalarField, scalar>(phi);
+        const auto& phip =
+            patch().lookupPatchField<surfaceScalarField>(phiName_);
 
         scalarField Un(max(phip/patch().magSf(), scalar(0)));
 
@@ -77,9 +74,9 @@ void Foam::fanFvPatchField<Foam::scalar>::calcFanJump()
             }
         }
 
-        if (phi.dimensions() == dimMass/dimTime)
+        if (phip.internalField().dimensions() == dimMass/dimTime)
         {
-            Un /= patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            Un /= patch().lookupPatchField<volScalarField>(rhoName_);
         }
 
         if (nonDimensional_)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index f339f3a854..e5d33858a1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -153,23 +153,20 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
     }
 
     // Retrieve flux field
-    const auto& phi = db().lookupObject<surfaceScalarField>(phiName());
-
-    const auto& phip = patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName());
 
     const int dir = 2*direction_ - 1;
 
     // Average volumetric flow rate
     scalar volFlowRate = 0;
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         volFlowRate = dir*gSum(phip);
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const scalarField& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName());
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName());
         volFlowRate = dir*gSum(phip/rhop);
     }
     else
@@ -218,7 +215,7 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
     totalPressureFvPatchScalarField::updateCoeffs
     (
         p0() - dir*pdFan,
-        patch().lookupPatchField<volVectorField, vector>(UName())
+        patch().lookupPatchField<volVectorField>(UName())
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index 56cf2631cb..4e559b0ca4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -166,8 +166,8 @@ void Foam::fixedNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
 
     if (fixTangentialInflow_)
     {
-        const fvsPatchField<scalar>& phip =
-            patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        const auto& phip =
+            patch().lookupPatchField<surfaceScalarField>(phiName_);
 
         valueFraction() += neg(phip)*(I - valueFraction());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
index cc92df7021..26166054f1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
@@ -105,8 +105,7 @@ void Foam::fixedPressureCompressibleDensityFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvPatchField<scalar>& pp =
-        patch().lookupPatchField<volScalarField, scalar>(pName_);
+    const auto& pp = patch().lookupPatchField<volScalarField>(pName_);
 
     const dictionary& thermoProps =
         db().lookupObject<IOdictionary>("thermodynamicProperties");
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index d32e3b94fd..2489daf9c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -218,8 +218,8 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
         // Mass flow-rate
         if (db().foundObject<volScalarField>(rhoName_))
         {
-            const fvPatchField<scalar>& rhop =
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            const auto& rhop =
+                patch().lookupPatchField<volScalarField>(rhoName_);
 
             updateValues(rhop);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index ac49bd1c70..eeb2d087d2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -200,8 +200,8 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateCoeffs()
         // Mass flow-rate
         if (db().foundObject<volScalarField>(rhoName_))
         {
-            const fvPatchField<scalar>& rhop =
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            const auto& rhop =
+                patch().lookupPatchField<volScalarField>(rhoName_);
 
             updateValues(rhop);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index 08f995dbfe..b3909cc88f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -106,23 +106,18 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
 
     zeroGradientFvPatchVectorField::evaluate();
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const vectorField n(patch().nf());
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         operator==(*this - n*(n & *this) + n*phip/magS);
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         operator==(*this - n*(n & *this) + n*phip/(rhop*magS));
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index d42bdee751..84042e179f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -121,10 +121,7 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
     }
 
     const Field<vector>& Up =
-        patch().template lookupPatchField<volVectorField, vector>
-        (
-            UName_
-        );
+        patch().template lookupPatchField<volVectorField>(UName_);
 
     valueFraction() = 0.5 + 0.5*(Up & patch().nf())/mag(Up);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index bd8f9a323b..9d7ba73865 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -126,10 +126,7 @@ void Foam::inletOutletFvPatchField<Type>::updateCoeffs()
     }
 
     const Field<scalar>& phip =
-        this->patch().template lookupPatchField<surfaceScalarField, scalar>
-        (
-            phiName_
-        );
+        this->patch().template lookupPatchField<surfaceScalarField>(phiName_);
 
     this->valueFraction() = 1.0 - pos0(phip);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 20f3fa227d..173f3829ce 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -169,14 +169,14 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvPatchVectorField& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const auto& Up =
+        patch().lookupPatchField<volVectorField>(UName_);
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
+    const auto& phip =
+        patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
-    const fvPatchField<scalar>& psip =
-        patch().lookupPatchField<volScalarField, scalar>(psiName_);
+    const auto& psip =
+        patch().lookupPatchField<volScalarField>(psiName_);
 
     scalar gM1ByG = (gamma_ - 1.0)/gamma_;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index e9a77fa0ad..3a6d2f7f0f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -135,8 +135,7 @@ void Foam::interstitialInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const fvPatchField<scalar>& alphap =
-        patch().lookupPatchField<volScalarField, scalar>(alphaName_);
+    const auto& alphap = patch().lookupPatchField<volScalarField>(alphaName_);
 
     operator==(inletVelocity_/alphap);
     fixedValueFvPatchVectorField::updateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index c891352101..cf24ab6fe7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -904,11 +904,7 @@ void Foam::mappedPatchFieldBase<Type>::mappedWeightField
     if (!fieldName.empty())
     {
         thisWeights.ref() *=
-            patchField_.patch().template lookupPatchField
-            <
-                volScalarField,
-                scalar
-            >
+            patchField_.patch().template lookupPatchField<volScalarField>
             (
                 fieldName
             ).patchInternalField();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
index 016619b6c4..f0b9e4144b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
@@ -127,8 +127,10 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
         nbrMesh
     ).boundary()[mpp.samplePolyPatch().index()];
 
-    scalarList phi =
-        nbrPatch.lookupPatchField<surfaceScalarField, scalar>(nbrPhiName_);
+    scalarList phi
+    (
+        nbrPatch.lookupPatchField<surfaceScalarField>(nbrPhiName_)
+    );
 
     mpp.distribute(phi);
 
@@ -147,8 +149,7 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
     }
     else if (phiName.dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         // mass flow-rate
         operator==(n*U/rhop);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
index 8e1bb149e7..e6a90deaab 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
@@ -117,7 +117,7 @@ Foam::movingWallVelocityFvPatchVectorField::Uwall() const
 
     scalarField phip
     (
-        p.patchField<surfaceScalarField, scalar>(fvc::meshPhi(U))
+        p.patchField<surfaceScalarField>(fvc::meshPhi(U))
     );
 
     const vectorField n(p.nf());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index c5e5e15f9c..c1fef7c612 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -126,10 +126,7 @@ void Foam::outletInletFvPatchField<Type>::updateCoeffs()
     }
 
     const Field<scalar>& phip =
-        this->patch().template lookupPatchField<surfaceScalarField, scalar>
-        (
-            phiName_
-        );
+        this->patch().template lookupPatchField<surfaceScalarField>(phiName_);
 
     this->valueFraction() = pos0(phip);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index d90b61c7bc..64dc0e549c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -132,8 +132,10 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    scalarField alphap =
-        patch().lookupPatchField<volScalarField, scalar>(alphaName_);
+    scalarField alphap
+    (
+        patch().lookupPatchField<volScalarField>(alphaName_)
+    );
 
     alphap = max(alphap, scalar(0));
     alphap = min(alphap, scalar(1));
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index e4b4028791..a5e0af6171 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -142,10 +142,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
     }
 
     const scalarField& alphap =
-        patch().lookupPatchField<volScalarField, scalar>
-        (
-            phaseFraction_
-        );
+        patch().lookupPatchField<volScalarField>(phaseFraction_);
 
     const uniformDimensionedVectorField& g =
         meshObjects::gravity::New(db().time());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 770634339f..321a85d299 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -177,10 +177,9 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
         (
             internalField().name()
         ).oldTime().boundaryField()[patch().index()];
-    const fvPatchField<vector>& U =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
-    const fvsPatchField<scalar>& phi =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+
+    const auto& U = patch().lookupPatchField<volVectorField>(UName_);
+    const auto& phi = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     // Get the timestep
     const scalar dt = db().time().deltaTValue();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index e2c83fb1c1..80429a5830 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -151,23 +151,18 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     tmp<vectorField> n = patch().nf();
     tmp<scalarField> ndmagS = (n & inletDir_)*patch().magSf();
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         refValue() = inletDir_*phip/ndmagS;
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         refValue() = inletDir_*phip/(rhop*ndmagS);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index aa8c33a182..c0ef598984 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -141,23 +141,18 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     tmp<vectorField> n = patch().nf();
     tmp<scalarField> ndmagS = (n & inletDir_)*patch().magSf();
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         operator==(inletDir_*phip/ndmagS);
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         operator==(inletDir_*phip/(rhop*ndmagS));
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index fc21808f87..34f089687f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -121,11 +121,7 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magSf = patch().magSf();
@@ -134,14 +130,13 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
     vectorField Ut(patchInternalField());
     Ut -= n()*(Ut & n());
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         refValue() = Ut + n*phip/magSf;
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         refValue() = Ut + n*phip/(rhop*magSf);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 52c9d9e829..a30aa581c5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -175,7 +175,7 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::updateCoeffs()
     }
 
     const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     valueFraction() = neg(phip)*(I - sqr(patch().nf()));
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index a7e1fba8fb..629aad6f38 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -109,23 +109,18 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         operator==(n*phip/magS);
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         operator==(n*phip/(rhop*magS));
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index c66edef9b1..7a0a8bfd74 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -121,23 +121,18 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     tmp<vectorField> n = patch().nf();
     const Field<scalar>& magS = patch().magSf();
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         refValue() = n*phip/magS;
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         refValue() = n*phip/(rhop*magS);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index ed7c739dfb..a93495d6fb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -222,10 +222,7 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::updateCoeffs()
     const scalar deltaT(db().time().deltaTValue());
 
     // Get the flux field
-    const surfaceScalarField& phi
-    (
-        db().lookupObject<surfaceScalarField>(phiName_)
-    );
+    const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
 
     // Update the old-time quantities
     if (timeIndex_ != db().time().timeIndex())
@@ -244,10 +241,9 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::updateCoeffs()
     }
     else if (phi.dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhoField =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
-        rho = gSum(rhoField*patch().magSf())/gSum(patch().magSf());
+        rho = gSum(rhop*patch().magSf())/gSum(patch().magSf());
     }
     else
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index 8f70522e99..ddb0204626 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -131,21 +131,17 @@ updateCoeffs()
         return;
     }
 
-    const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const vectorField n(patch().nf());
 
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         refValue() = (phip/patch().magSf())*n;
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         refValue() = (phip/(rhop*patch().magSf()))*n;
     }
@@ -164,7 +160,7 @@ updateCoeffs()
     if (alphaName_ != "none")
     {
         const scalarField& alphap =
-            patch().lookupPatchField<volScalarField, scalar>(alphaName_);
+            patch().lookupPatchField<volScalarField>(alphaName_);
 
         const scalarField alphaCut(pos(alphap - alphaMin_));
         valueFraction() = max(alphaCut, valueFraction());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
index 1141e88bcd..6bc84ada0d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
@@ -189,13 +189,13 @@ void Foam::prghPermeableAlphaTotalPressureFvPatchScalarField::updateSnGrad
     }
 
     const scalarField& rhop =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        patch().lookupPatchField<volScalarField>(rhoName_);
 
     const scalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const vectorField& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+        patch().lookupPatchField<volVectorField>(UName_);
 
     const uniformDimensionedVectorField& g =
         meshObjects::gravity::New(db().time());
@@ -226,7 +226,8 @@ void Foam::prghPermeableAlphaTotalPressureFvPatchScalarField::updateSnGrad
     if (alphaName_ != "none")
     {
         const scalarField& alphap =
-            patch().lookupPatchField<volScalarField, scalar>(alphaName_);
+            patch().lookupPatchField<volScalarField>(alphaName_);
+
         tmp<scalarField> alphaCut(pos(alphap - alphaMin_));
         valueFraction() = 1 - alphaCut;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index 551a140289..16ef1a9e75 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -147,10 +147,8 @@ void Foam::prghPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const scalarField& rhop = patch().lookupPatchField<volScalarField, scalar>
-    (
-        rhoName_
-    );
+    const scalarField& rhop =
+        patch().lookupPatchField<volScalarField>(rhoName_);
 
     const uniformDimensionedVectorField& g =
         meshObjects::gravity::New(db().time());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
index 10511de343..424839342c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
@@ -122,16 +122,16 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::updateCoeffs()
     }
 
     const scalarField& rhop =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        patch().lookupPatchField<volScalarField>(rhoName_);
 
     const scalarField& ph_rghp =
-        patch().lookupPatchField<volScalarField, scalar>(ph_rghName_);
+        patch().lookupPatchField<volScalarField>(ph_rghName_);
 
     const scalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const vectorField& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+        patch().lookupPatchField<volVectorField>(UName_);
 
     operator==
     (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 9d3d89590b..42dfb9c088 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -154,13 +154,13 @@ void Foam::prghTotalPressureFvPatchScalarField::updateCoeffs()
     }
 
     const scalarField& rhop =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        patch().lookupPatchField<volScalarField>(rhoName_);
 
     const scalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const vectorField& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+        patch().lookupPatchField<volVectorField>(UName_);
 
     const uniformDimensionedVectorField& g =
         meshObjects::gravity::New(db().time());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
index 0034ab05c1..c72a28c756 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -114,7 +114,7 @@ void Foam::rotatingTotalPressureFvPatchScalarField::updateCoeffs()
 
     const vectorField Up
     (
-        patch().lookupPatchField<volVectorField, vector>(UName())
+        patch().lookupPatchField<volVectorField>(UName())
       + rotationVelocity
     );
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 99b43776c7..923582b389 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -166,14 +166,11 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const fvPatchField<scalar>& pT =
-        patch().lookupPatchField<volScalarField, scalar>(TName_);
+    const auto& pT = patch().lookupPatchField<volScalarField>(TName_);
 
-    const fvPatchField<scalar>& pp =
-        patch().lookupPatchField<volScalarField, scalar>(pName_);
+    const auto& pp = patch().lookupPatchField<volScalarField>(pName_);
 
-    const fvPatchField<scalar>& ppsi =
-        patch().lookupPatchField<volScalarField, scalar>(psiName_);
+    const auto& ppsi = patch().lookupPatchField<volScalarField>(psiName_);
 
     // Need R of the free-stream flow.  Assume R is independent of location
     // along patch so use face 0
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
index 5a576a98d0..86e5291206 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
@@ -40,25 +40,21 @@ void Foam::swirlFanVelocityFvPatchField::calcFanJump()
     {
         const scalar rpm = rpm_->value(this->db().time().timeOutputValue());
 
-        const surfaceScalarField& phi =
-            db().lookupObject<surfaceScalarField>(phiName_);
+        const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
 
-        const fvPatchField<scalar>& pOwner =
-            patch().lookupPatchField<volScalarField, scalar>(pName_);
+        const auto& pOwner = patch().lookupPatchField<volScalarField>(pName_);
 
         const label nbrIndex = this->cyclicPatch().neighbPatchID();
 
         const fvPatch& nbrPatch = patch().boundaryMesh()[nbrIndex];
 
-        const fvPatchField<scalar>& pSlave =
-            nbrPatch.lookupPatchField<volScalarField, scalar>(pName_);
+        const auto& pSlave = nbrPatch.lookupPatchField<volScalarField>(pName_);
 
         scalarField deltaP(mag(pOwner - pSlave));
 
         if (phi.dimensions() == dimMass/dimTime)
         {
-            deltaP /=
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            deltaP /= patch().lookupPatchField<volScalarField>(rhoName_);
         }
 
         const vector axisHat =
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 7f9092557a..843068589b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -168,8 +168,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
 
         tmp<vectorField> n = patch().nf();
 
-        const surfaceScalarField& phi =
-            db().lookupObject<surfaceScalarField>(phiName_);
+        const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
 
         if (phi.dimensions() == dimVolume/dimTime)
         {
@@ -178,8 +177,8 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
         }
         else if (phi.dimensions() == dimMass/dimTime)
         {
-            const fvPatchField<scalar>& rhop =
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            const auto& rhop =
+                patch().lookupPatchField<volScalarField>(rhoName_);
 
             // mass flow-rate
             operator==(tangentialVelocity + n*avgU/rhop);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 82627bce14..ec63722e69 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -200,17 +200,13 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
     scalar t = db().time().value();
     scalar deltaT = db().time().deltaTValue();
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
-
-    if (phi.dimensions() == dimVolume/dimTime)
+    if (phip.internalField().dimensions() == dimVolume/dimTime)
     {
         ams_ = ams0_ + deltaT*sum((*this*psi_)*phip);
     }
-    else if (phi.dimensions() == dimMass/dimTime)
+    else if (phip.internalField().dimensions() == dimMass/dimTime)
     {
         ams_ = ams0_ + deltaT*sum(phip);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index 5fab5879ee..f6daed7a87 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -167,8 +167,7 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
         return;
     }
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     if (internalField().dimensions() == dimPressure)
     {
@@ -176,8 +175,8 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
         {
             // Variable density and low-speed compressible flow
 
-            const fvPatchField<scalar>& rho =
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            const auto& rho =
+                patch().lookupPatchField<volScalarField>(rhoName_);
 
             operator==(p0p - 0.5*rho*(1.0 - pos0(phip))*magSqr(Up));
         }
@@ -185,8 +184,8 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
         {
             // High-speed compressible flow
 
-            const fvPatchField<scalar>& psip =
-                patch().lookupPatchField<volScalarField, scalar>(psiName_);
+            const auto& psip =
+                patch().lookupPatchField<volScalarField>(psiName_);
 
             if (gamma_ > 1)
             {
@@ -238,7 +237,7 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs()
     updateCoeffs
     (
         p0(),
-        patch().lookupPatchField<volVectorField, vector>(UName())
+        patch().lookupPatchField<volVectorField>(UName())
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 081dbd516e..79c18cc670 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -157,14 +157,14 @@ void Foam::totalTemperatureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvPatchVectorField& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const auto& Up =
+        patch().lookupPatchField<volVectorField>(UName_);
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+    const auto& phip =
+        patch().lookupPatchField<surfaceScalarField>(phiName_);
 
-    const fvPatchField<scalar>& psip =
-        patch().lookupPatchField<volScalarField, scalar>(psiName_);
+    const auto& psip =
+        patch().lookupPatchField<volScalarField>(psiName_);
 
     scalar gM1ByG = (gamma_ - 1.0)/gamma_;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 73716f4426..d4c054908c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -133,11 +133,11 @@ updateCoeffs()
         return;
     }
 
-    const fvPatchVectorField& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const auto& Up =
+        patch().lookupPatchField<volVectorField>(UName_);
 
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
+    const auto& phip =
+        patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
     this->refValue() = 1.5*sqr(intensity_)*magSqr(Up);
     this->valueFraction() = 1.0 - pos0(phip);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 257dfc8151..1a40889aca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -152,7 +152,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::updateCoeffs()
     this->refValue() = uniformInletValue_->value(t);
 
     const Field<scalar>& phip =
-        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        this->patch().template lookupPatchField<surfaceScalarField>
         (
             phiName_
         );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 8199cee64c..f9a64f8722 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -155,8 +155,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
 
     scalar p0 = p0_->value(this->db().time().timeOutputValue());
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     if (internalField().dimensions() == dimPressure)
     {
@@ -164,8 +163,8 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
         {
             // Variable density and low-speed compressible flow
 
-            const fvPatchField<scalar>& rho =
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            const auto& rho =
+                patch().lookupPatchField<volScalarField>(rhoName_);
 
             operator==(p0 - 0.5*rho*(1.0 - pos0(phip))*magSqr(Up));
         }
@@ -173,8 +172,8 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
         {
             // High-speed compressible flow
 
-            const fvPatchField<scalar>& psip =
-                patch().lookupPatchField<volScalarField, scalar>(psiName_);
+            const auto& psip =
+                patch().lookupPatchField<volScalarField>(psiName_);
 
             if (gamma_ > 1)
             {
@@ -223,7 +222,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
 
 void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs()
 {
-    updateCoeffs(patch().lookupPatchField<volVectorField, vector>(UName_));
+    updateCoeffs(patch().lookupPatchField<volVectorField>(UName_));
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index ce850c96c1..1ee1eec1c6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -137,8 +137,7 @@ void Foam::variableHeightFlowRateFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     scalarField alphap(this->patchInternalField());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index d90a4d89a9..94b3a2522e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -109,8 +109,10 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
         return;
     }
 
-    scalarField alphap =
-        patch().lookupPatchField<volScalarField, scalar>(alphaName_);
+    scalarField alphap
+    (
+        patch().lookupPatchField<volScalarField>(alphaName_)
+    );
 
     alphap = max(alphap, scalar(0));
     alphap = min(alphap, scalar(1));
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 7e33d7d86b..0be57ad252 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -155,8 +155,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
     ddtSchemeType ddtScheme(ddtSchemeTypeNames_[ddtSchemeName]);
 
     // Retrieve the flux field from the database
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
+    const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
 
     // Cache the patch face-normal vectors
     tmp<vectorField> nf(patch().nf());
@@ -166,8 +165,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
 
     if (phi.dimensions() == dimMass/dimTime)
     {
-        const scalarField& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
 
         dZetap /= rhop;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 42d9cd4b21..aede4cebf4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -110,22 +110,23 @@ Foam::tmp<Foam::scalarField>
 Foam::waveTransmissiveFvPatchField<Type>::advectionSpeed() const
 {
     // Lookup the velocity and compressibility of the patch
-    const fvPatchField<scalar>& psip =
-        this->patch().template
-            lookupPatchField<volScalarField, scalar>(psiName_);
+    const auto& psip =
+        this->patch().template lookupPatchField<volScalarField>(psiName_);
 
-    const surfaceScalarField& phi =
+    const auto& phi =
         this->db().template lookupObject<surfaceScalarField>(this->phiName_);
 
-    fvsPatchField<scalar> phip =
+    scalarField phip
+    (
         this->patch().template
-            lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
+            lookupPatchField<surfaceScalarField>(this->phiName_)
+    );
 
     if (phi.dimensions() == dimMass/dimTime)
     {
-        const fvPatchScalarField& rhop =
+        const auto& rhop =
             this->patch().template
-                lookupPatchField<volScalarField, scalar>(this->rhoName_);
+                lookupPatchField<volScalarField>(this->rhoName_);
 
         phip /= rhop;
     }
diff --git a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C
index d0ae95a792..e7c86f2b12 100644
--- a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C
+++ b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C
@@ -161,15 +161,11 @@ Foam::functionObjects::extractEulerianParticles::phiU() const
 {
     DebugInFunction << endl;
 
-    const surfaceScalarField& phi
-    (
-        mesh_.lookupObject<surfaceScalarField>(phiName_)
-    );
+    const auto& phi = mesh_.lookupObject<surfaceScalarField>(phiName_);
 
     if (phi.dimensions() == dimMass/dimTime)
     {
-        const volScalarField& rho =
-            mesh_.lookupObject<volScalarField>(rhoName_);
+        const auto& rho = mesh_.lookupObject<volScalarField>(rhoName_);
 
         return phi/fvc::interpolate(rho);
     }
diff --git a/src/functionObjects/field/momentumError/momentumError.C b/src/functionObjects/field/momentumError/momentumError.C
index 39f93ed6c8..4eceecaefc 100644
--- a/src/functionObjects/field/momentumError/momentumError.C
+++ b/src/functionObjects/field/momentumError/momentumError.C
@@ -147,7 +147,7 @@ Foam::functionObjects::momentumError::momentumError
 {
     read(dict);
 
-    const auto& phi =lookupObject<surfaceScalarField>(phiName_);
+    const auto& phi = lookupObject<surfaceScalarField>(phiName_);
 
     const dimensionSet momDims
     (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index b4cf007ec5..ee813b1c83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -127,8 +127,7 @@ Foam::scalar Foam::PatchFlowRateInjection<CloudType>::flowRate() const
 {
    const polyMesh& mesh = this->owner().mesh();
 
-    const surfaceScalarField& phi =
-        mesh.lookupObject<surfaceScalarField>(phiName_);
+    const auto& phi = mesh.lookupObject<surfaceScalarField>(phiName_);
 
     const scalarField& phip = phi.boundaryField()[patchId_];
 
@@ -139,8 +138,7 @@ Foam::scalar Foam::PatchFlowRateInjection<CloudType>::flowRate() const
     }
     else
     {
-        const volScalarField& rho =
-            mesh.lookupObject<volScalarField>(rhoName_);
+        const auto& rho = mesh.lookupObject<volScalarField>(rhoName_);
         const scalarField& rhop = rho.boundaryField()[patchId_];
 
         flowRateIn = max(0.0, -sum(phip/rhop));
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
index 695f1e4c45..aad795f2a9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
@@ -110,7 +110,7 @@ void Foam::adjointFarFieldPressureFvPatchScalarField::updateCoeffs()
 
     // Adjoint flux
     //const fvsPatchField<scalar>& phiap =
-    //    patch().lookupPatchField<surfaceScalarField, scalar>("phia");
+    //    patch().lookupPatchField<surfaceScalarField>("phia");
 
     // Primal velocity
     const fvPatchField<vector>& Up = boundaryContrPtr_->Ub();
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index c9604b3394..d6d88cae2e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -101,7 +101,7 @@ void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
 
     operator==
     (
-        patch().lookupPatchField<volScalarField, scalar>(sourceFieldName_)
+        patch().lookupPatchField<volScalarField>(sourceFieldName_)
     );
 
     fixedValueFvPatchScalarField::updateCoeffs();
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 9959791aee..f2d159e07d 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -165,7 +165,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
     // lookup all the fields on this patch
     const fvPatchScalarField& alpha
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             phased.volScalarField::name()
         )
@@ -173,7 +173,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
 
     const fvPatchScalarField& gs0
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("gs0", phased.name())
         )
@@ -181,7 +181,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
 
     const scalarField nu
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("nut", phased.name())
         )
@@ -189,7 +189,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
 
     const scalarField nuFric
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("nuFric", phased.name())
         )
@@ -200,7 +200,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
     const fvPatchScalarField& Theta
     (
         db().foundObject<volScalarField>(ThetaName)
-      ? patch().lookupPatchField<volScalarField, scalar>(ThetaName)
+      ? patch().lookupPatchField<volScalarField>(ThetaName)
       : alpha
     );
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index cb21ff6520..85f52e183b 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -181,7 +181,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
     // lookup all the fields on this patch
     const fvPatchScalarField& alpha
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             phased.volScalarField::name()
         )
@@ -189,7 +189,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
 
     const fvPatchVectorField& U
     (
-        patch().lookupPatchField<volVectorField, vector>
+        patch().lookupPatchField<volVectorField>
         (
             IOobject::groupName("U", phased.name())
         )
@@ -197,7 +197,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
 
     const fvPatchScalarField& gs0
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("gs0", phased.name())
         )
@@ -205,7 +205,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
 
     const fvPatchScalarField& kappa
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("kappa", phased.name())
         )
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 1ae8453c4d..03d3a85cbe 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -163,25 +163,21 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
     );
 
     // lookup all the fields on this patch
-    const fvPatchScalarField& alpha
-    (
-        patch().lookupPatchField<volScalarField, scalar>
+    const auto& alpha =
+        patch().lookupPatchField<volScalarField>
         (
             phased.volScalarField::name()
-        )
-    );
+        );
 
-    const fvPatchScalarField& gs0
-    (
-        patch().lookupPatchField<volScalarField, scalar>
+    const auto& gs0 =
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("gs0", phased.name())
-        )
-    );
+        );
 
     const scalarField nu
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("nut", phased.name())
         )
@@ -189,7 +185,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
 
     const scalarField nuFric
     (
-        patch().lookupPatchField<volScalarField, scalar>
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("nuFric", phased.name())
         )
@@ -200,7 +196,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
     const fvPatchScalarField& Theta
     (
         db().foundObject<volScalarField>(ThetaName)
-      ? patch().lookupPatchField<volScalarField, scalar>(ThetaName)
+      ? patch().lookupPatchField<volScalarField>(ThetaName)
       : alpha
     );
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index cb2bfbdc30..6d2663a470 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -179,37 +179,29 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
     );
 
     // lookup all the fields on this patch
-    const fvPatchScalarField& alpha
-    (
-        patch().lookupPatchField<volScalarField, scalar>
+    const auto& alpha =
+        patch().lookupPatchField<volScalarField>
         (
             phased.volScalarField::name()
-        )
-    );
+        );
 
-    const fvPatchVectorField& U
-    (
-        patch().lookupPatchField<volVectorField, vector>
+    const auto& U =
+        patch().lookupPatchField<volVectorField>
         (
             IOobject::groupName("U", phased.name())
-        )
-    );
+        );
 
-    const fvPatchScalarField& gs0
-    (
-        patch().lookupPatchField<volScalarField, scalar>
+    const auto& gs0 =
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("gs0", phased.name())
-        )
-    );
+        );
 
-    const fvPatchScalarField& kappa
-    (
-        patch().lookupPatchField<volScalarField, scalar>
+    const auto& kappa =
+        patch().lookupPatchField<volScalarField>
         (
             IOobject::groupName("kappa", phased.name())
-        )
-    );
+        );
 
     const scalarField Theta(patchInternalField());
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index 7a7cabd103..9270915c13 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -266,14 +266,13 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs()
 
     scalarField intFld(patchInternalField());
 
-    const filmPyrolysisRadiativeCoupledMixedFvPatchScalarField&
-        nbrField =
+    const auto& nbrField =
         refCast
         <
             const filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
         >
         (
-            nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
+            nbrPatch.lookupPatchField<volScalarField>(TnbrName_)
         );
 
     // Swap to obtain full local values of neighbour internal field
@@ -307,7 +306,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs()
         coupledPatchi = patchi;
         if (qrName_ != "none")
         {
-            qr = nbrPatch.lookupPatchField<volScalarField, scalar>(qrName_);
+            qr = nbrPatch.lookupPatchField<volScalarField>(qrName_);
             mpp.distribute(qr);
         }
     }
@@ -316,7 +315,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs()
         coupledPatchi = nbrPatch.index();
         if (qrName_ != "none")
         {
-            qr = patch().lookupPatchField<volScalarField, scalar>(qrName_);
+            qr = patch().lookupPatchField<volScalarField>(qrName_);
         }
     }
     else
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 210f7f942b..549b41fd52 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -173,15 +173,13 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
     pyrModel.toPrimary(pyrPatchi, phiPyr);
 
 
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
+    const auto& phi = db().lookupObject<surfaceScalarField>(phiName_);
 
     if (phi.dimensions() == dimVolume/dimTime)
     {}
     else if (phi.dimensions() == dimMass/dimTime)
     {
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
         phiPyr /= rhop;
     }
     else
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
index a522f7f985..651f1349e0 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
@@ -114,14 +114,9 @@ void Foam::filmHeightInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
-
-    const fvPatchField<scalar>& rhop =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
-
-    const fvPatchField<scalar>& deltafp =
-        patch().lookupPatchField<volScalarField, scalar>(deltafName_);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
+    const auto& rhop = patch().lookupPatchField<volScalarField>(rhoName_);
+    const auto& deltafp = patch().lookupPatchField<volScalarField>(deltafName_);
 
     vectorField n(patch().nf());
     const scalarField& magSf = patch().magSf();
diff --git a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 0130150a92..26aa93d2ec 100644
--- a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -319,7 +319,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
     {
         qr =
             qrRelaxation_
-           *patch().lookupPatchField<volScalarField, scalar>(qrName_)
+           *patch().lookupPatchField<volScalarField>(qrName_)
           + (1 - qrRelaxation_)*qrPrevious_;
 
         qrPrevious_ = qr;
diff --git a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 5055a52571..668940de76 100644
--- a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -439,14 +439,12 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
     const fvPatch& nbrPatch =
         refCast<const fvMesh>(nbrMesh).boundary()[nbrPatchI];
 
-    const humidityTemperatureCoupledMixedFvPatchScalarField&
-        nbrField =
-        refCast
+    const auto& nbrField = refCast
         <
             const humidityTemperatureCoupledMixedFvPatchScalarField
         >
         (
-            nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
+            nbrPatch.lookupPatchField<volScalarField>(TnbrName_)
         );
 
     // Swap to obtain full local values of neighbour internal field
@@ -515,24 +513,21 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
                         const fixedGradientFvPatchField<scalar>
                     >
                     (
-                        patch().lookupPatchField<volScalarField, scalar>
-                        (
-                            specieName_
-                        )
+                        patch().lookupPatchField<volScalarField>(specieName_)
                     )
                 );
 
-            const fvPatchScalarField& pp =
-                patch().lookupPatchField<volScalarField, scalar>(pName_);
+            const auto& pp =
+                patch().lookupPatchField<volScalarField>(pName_);
 
-            const fvPatchVectorField& Up =
-                patch().lookupPatchField<volVectorField, vector>(UName_);
+            const auto& Up =
+                patch().lookupPatchField<volVectorField>(UName_);
 
-            const fvPatchScalarField& rhop =
-                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+            const auto& rhop =
+                patch().lookupPatchField<volScalarField>(rhoName_);
 
-            const fvPatchScalarField& mup =
-                patch().lookupPatchField<volScalarField, scalar>(muName_);
+            const auto& mup =
+                patch().lookupPatchField<volScalarField>(muName_);
 
             const vectorField Ui(Up.patchInternalField());
             const scalarField Yi(Yp.patchInternalField());
@@ -716,13 +711,13 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
     scalarField qr(Tp.size(), Zero);
     if (qrName_ != "none")
     {
-        qr = patch().lookupPatchField<volScalarField, scalar>(qrName_);
+        qr = patch().lookupPatchField<volScalarField>(qrName_);
     }
 
     scalarField qrNbr(Tp.size(), Zero);
     if (qrNbrName_ != "none")
     {
-        qrNbr = nbrPatch.lookupPatchField<volScalarField, scalar>(qrNbrName_);
+        qrNbr = nbrPatch.lookupPatchField<volScalarField>(qrNbrName_);
         mpp.distribute(qrNbr);
     }
 
diff --git a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index 5f69d2c0d1..49d6b0ce93 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -156,8 +156,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
 
     const scalarField pb(p.oldTime().boundaryField()[patchi]);
 
-    const fvsPatchField<scalar>& phi =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+    const auto& phi = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     // Calculate the current mass flow rate
     if (phi.internalField().dimensions() != dimMass/dimTime)
@@ -179,8 +178,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
 
     const scalarField gamma(thermoPtr->gamma()().boundaryField()[patchi]);
 
-    const fvPatchField<scalar>& rho =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+    const auto& rho = patch().lookupPatchField<volScalarField>(rhoName_);
 
     const scalarField Mb(mag(Ub)/sqrt(gamma*pb/rho));
 
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
index 3290afab04..e27c587628 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
@@ -132,8 +132,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::phiY() const
     const label nbrPatchi = samplePolyPatch().index();
     const fvPatch& nbrPatch = patch().boundaryMesh()[nbrPatchi];
 
-    const fvPatchScalarField& nbrYp =
-        nbrPatch.lookupPatchField<volScalarField, scalar>(YName);
+    const auto& nbrYp = nbrPatch.lookupPatchField<volScalarField>(YName);
     scalarField nbrYc(nbrYp.patchInternalField());
     mappedPatchBase::map().distribute(nbrYc);
 
@@ -149,7 +148,7 @@ void Foam::semiPermeableBaffleMassFractionFvPatchScalarField::updateCoeffs()
     }
 
     const scalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const turbulenceModel& turbModel =
         db().lookupObject<turbulenceModel>
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
index d587414463..1af5600c2a 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
@@ -139,7 +139,7 @@ void Foam::semiPermeableBaffleVelocityFvPatchVectorField::updateCoeffs()
     typedef semiPermeableBaffleMassFractionFvPatchScalarField YBCType;
 
     const scalarField& rhop =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+        patch().lookupPatchField<volScalarField>(rhoName_);
 
     const PtrList<volScalarField>& Y = composition().Y();
 
diff --git a/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index d6768f7fbb..adc76ad305 100644
--- a/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -341,10 +341,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
                 mesh.lookupObject<solidThermo>(basicThermo::dictName);
 
             const symmTensorField& alphaAni =
-                patch_.lookupPatchField<volSymmTensorField, scalar>
-                (
-                    alphaAniName_
-                );
+                patch_.lookupPatchField<volSymmTensorField>(alphaAniName_);
 
             const scalarField& pp = thermo.p().boundaryField()[patchi];
 
@@ -498,10 +495,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::alpha
         case mtDirectionalSolidThermo:
         {
             const symmTensorField& alphaAni =
-                patch_.lookupPatchField<volSymmTensorField, scalar>
-                (
-                    alphaAniName_
-                );
+                patch_.lookupPatchField<volSymmTensorField>(alphaAniName_);
 
             const vectorField n(patch_.nf());
 
diff --git a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index aea435936e..8ce9d2e6ef 100644
--- a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -220,7 +220,7 @@ const solidType& thermalBaffle1DFvPatchScalarField<solidType>::solid() const
         const thermalBaffle1DFvPatchScalarField& nbrField =
         refCast<const thermalBaffle1DFvPatchScalarField>
         (
-            nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_)
+            nbrPatch.template lookupPatchField<volScalarField>(TName_)
         );
 
         return nbrField.solid();
@@ -253,7 +253,7 @@ baffleThickness() const
         const thermalBaffle1DFvPatchScalarField& nbrField =
         refCast<const thermalBaffle1DFvPatchScalarField>
         (
-            nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_)
+            nbrPatch.template lookupPatchField<volScalarField>(TName_)
         );
 
         tmp<scalarField> tthickness
@@ -284,7 +284,7 @@ tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::qs() const
         const thermalBaffle1DFvPatchScalarField& nbrField =
         refCast<const thermalBaffle1DFvPatchScalarField>
         (
-            nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_)
+            nbrPatch.template lookupPatchField<volScalarField>(TName_)
         );
 
         tmp<scalarField> tqs(new scalarField(nbrField.qs()));
@@ -365,15 +365,14 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
         const scalarField kappaw(turbModel.kappaEff(patchi));
 
         const fvPatchScalarField& Tp =
-            patch().template lookupPatchField<volScalarField, scalar>(TName_);
+            patch().template lookupPatchField<volScalarField>(TName_);
 
 
         scalarField qr(Tp.size(), Zero);
 
         if (qrName_ != "none")
         {
-            qr = patch().template lookupPatchField<volScalarField, scalar>
-                (qrName_);
+            qr = patch().template lookupPatchField<volScalarField>(qrName_);
 
             qr = qrRelaxation_*qr + (1.0 - qrRelaxation_)*qrPrevious_;
             qrPrevious_ = qr;
diff --git a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index 6c28ad6cc9..d3a6193123 100644
--- a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -158,7 +158,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
 
     const label patchi = patch().index();
 
-    const compressible::turbulenceModel& turbModel =
+    const auto& turbModel =
         db().lookupObject<compressible::turbulenceModel>
         (
             IOobject::groupName
@@ -168,8 +168,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
             )
         );
 
-    const fvsPatchField<scalar>& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+    const auto& phip = patch().lookupPatchField<surfaceScalarField>(phiName_);
 
     const scalarField alphap(turbModel.alphaEff(patchi));
 
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index bb6c154687..e1b836fb11 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -346,10 +346,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
         const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
         >
         (
-            nbrPatch.lookupPatchField<volScalarField, scalar>
-            (
-                TnbrName_
-            )
+            nbrPatch.lookupPatchField<volScalarField>(TnbrName_)
         );
 
         // Swap to obtain full local values of neighbour K*delta
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index b6420d7a75..5dc9ad16eb 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -373,7 +373,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
         const auto& nbrField = refCast
                 <const turbulentTemperatureRadCoupledMixedFvPatchScalarField>
                 (
-                    nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
+                    nbrPatch.lookupPatchField<volScalarField>(TnbrName_)
                 );
 
         // Swap to obtain full local values of neighbour K*delta
@@ -421,7 +421,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
     scalarField qr(Tp.size(), Zero);
     if (qrName_ != "none")
     {
-        qr = patch().lookupPatchField<volScalarField, scalar>(qrName_);
+        qr = patch().lookupPatchField<volScalarField>(qrName_);
     }
 
     scalarField qrNbr(Tp.size(), Zero);
@@ -433,13 +433,11 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
             const label samplePatchi = mpp.samplePolyPatch().index();
             const fvPatch& nbrPatch =
                 refCast<const fvMesh>(nbrMesh).boundary()[samplePatchi];
-            qrNbr =
-                nbrPatch.lookupPatchField<volScalarField, scalar>(qrNbrName_);
+            qrNbr = nbrPatch.lookupPatchField<volScalarField>(qrNbrName_);
         }
         else
         {
-            qrNbr =
-                patch().lookupPatchField<volScalarField, scalar>(qrNbrName_);
+            qrNbr = patch().lookupPatchField<volScalarField>(qrNbrName_);
         }
         distribute(qrNbrName_, qrNbr);
     }
@@ -635,7 +633,7 @@ beta() const
         nbrField = refCast
             <const turbulentTemperatureRadCoupledMixedFvPatchScalarField>
             (
-                nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
+                nbrPatch.lookupPatchField<volScalarField>(TnbrName_)
             );
 
     // Swap to obtain full local values of neighbour internal field
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
index 2179217ff1..27f4bea985 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
@@ -133,15 +133,13 @@ void Foam::radiation::MarshakRadiationFvPatchScalarField::updateCoeffs()
     UPstream::msgType() = oldTag+1;
 
     // Temperature field
-    const scalarField& Tp =
-        patch().lookupPatchField<volScalarField, scalar>(TName_);
+    const auto& Tp = patch().lookupPatchField<volScalarField>(TName_);
 
     // Re-calc reference value
     refValue() = 4.0*constant::physicoChemical::sigma.value()*pow4(Tp);
 
     // Diffusion coefficient - created by radiation model's ::updateCoeffs()
-    const scalarField& gamma =
-        patch().lookupPatchField<volScalarField, scalar>("gammaRad");
+    const auto& gamma = patch().lookupPatchField<volScalarField>("gammaRad");
 
     const boundaryRadiationProperties& boundaryRadiation =
         boundaryRadiationProperties::New(internalField().mesh());
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
index b58d0e6d94..53a3e74fbf 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
@@ -158,7 +158,7 @@ updateCoeffs()
 
     // Diffusion coefficient - created by radiation model's ::updateCoeffs()
     const scalarField& gamma =
-        patch().lookupPatchField<volScalarField, scalar>("gammaRad");
+        patch().lookupPatchField<volScalarField>("gammaRad");
 
     //const scalarField temissivity = emissivity();
     const boundaryRadiationProperties& boundaryRadiation =
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index f0347d078a..b97fffa818 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -151,8 +151,7 @@ updateCoeffs()
     int oldTag = UPstream::msgType();
     UPstream::msgType() = oldTag+1;
 
-    const scalarField& Tp =
-        patch().lookupPatchField<volScalarField, scalar>(TName_);
+    const auto& Tp = patch().lookupPatchField<volScalarField>(TName_);
 
     const fvDOM& dom = db().lookupObject<fvDOM>("radiationProperties");
 
@@ -224,7 +223,7 @@ updateCoeffs()
     if (dom.useSolarLoad())
     {
         // Looking for primary heat flux single band
-        Ir += patch().lookupPatchField<volScalarField,scalar>
+        Ir += patch().lookupPatchField<volScalarField>
         (
             dom.primaryFluxName_ + "_0"
         );
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index a1fe42b8fe..614bb8b573 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -173,7 +173,7 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField::qro(label bandI) const
 
     if (radiation.useSolarLoad())
     {
-        tqrt.ref() += patch().lookupPatchField<volScalarField, scalar>
+        tqrt.ref() += patch().lookupPatchField<volScalarField>
         (
             radiation.primaryFluxName_ + "_"  + name(bandI)
         );
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index b9f061fde1..a0d90058d5 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -211,7 +211,7 @@ updateCoeffs()
     if (dom.useSolarLoad())
     {
         // Looking for primary heat flux single band
-        Ir += patch().lookupPatchField<volScalarField,scalar>
+        Ir += patch().lookupPatchField<volScalarField>
         (
             dom.primaryFluxName_ + "_" + name(lambdaId)
         );
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
index da1abae0ac..7cc73bc526 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
@@ -208,10 +208,7 @@ patchSource() const
     const auto& Yp =
         refCast<const speciesSorptionFvPatchScalarField>
         (
-            patch().lookupPatchField<volScalarField, scalar>
-            (
-                speciesName_
-            )
+            patch().lookupPatchField<volScalarField>(speciesName_)
         );
 
     // mass rate [kg/sec/m3]
@@ -224,11 +221,8 @@ patchSource() const
 
     if (includeHs_)
     {
-        const fvPatchField<scalar>& pp =
-            patch().lookupPatchField<volScalarField, scalar>(pName_);
-
-        const fvPatchField<scalar>& Tp =
-            patch().lookupPatchField<volScalarField, scalar>(TName_);
+        const auto& pp = patch().lookupPatchField<volScalarField>(pName_);
+        const auto& Tp = patch().lookupPatchField<volScalarField>(TName_);
 
         const auto& thermo = db().lookupObject<rhoReactionThermo>
         (
@@ -270,10 +264,7 @@ void Foam::enthalpySorptionFvPatchScalarField::updateCoeffs()
     const auto& Yp =
         refCast<const speciesSorptionFvPatchScalarField>
         (
-            patch().lookupPatchField<volScalarField, scalar>
-            (
-                speciesName_
-            )
+            patch().lookupPatchField<volScalarField>(speciesName_)
         );
 
     switch (enthalpyModel_)
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
index 24eeed4b48..7b1f9c7cd0 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
@@ -369,8 +369,7 @@ void Foam::speciesSorptionFvPatchScalarField::updateCoeffs()
             // mole fraction
             tmp<scalarField> tco = calcMoleFractions();
 
-            const fvPatchField<scalar>& pp =
-                patch().lookupPatchField<volScalarField, scalar>(pName_);
+            const auto& pp = patch().lookupPatchField<volScalarField>(pName_);
 
             cEq = max_*(kl_*tco()*pp/(1 + kl_*tco()*pp));
             break;
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index 91e9007bd7..b748264df6 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -113,7 +113,7 @@ Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::theta
 {
     return theta0_->value
     (
-        patch().lookupPatchField<volScalarField, scalar>(TName_)
+        patch().lookupPatchField<volScalarField>(TName_)
     );
 }
 
diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index 90aedae653..a0aa069ae1 100644
--- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -146,8 +146,7 @@ void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
     const uniformDimensionedVectorField& g =
         meshObjects::gravity::New(db().time());
 
-    const fvPatchField<scalar>& rho =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+    const auto& rho = patch().lookupPatchField<volScalarField>("rho");
 
     operator==(p_ - rho*(g.value() & patch().Cf()));
 
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index 1a3aebb7a0..09ab257862 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -56,13 +56,13 @@ functions
         #{
             // Lookup U
             Info<< "Looking up field U\n" << endl;
-            const volVectorField& U = mesh().lookupObject<volVectorField>("U");
+            const auto& U = mesh().lookupObject<volVectorField>("U");
 
             Info<< "Reading inlet velocity uInfX\n" << endl;
 
             scalar ULeft = 0.0;
             label leftI = mesh().boundaryMesh().findPatchID("left");
-            const fvPatchVectorField& fvp = U.boundaryField()[leftI];
+            const auto& fvp = U.boundaryField()[leftI];
             if (fvp.size())
             {
                 ULeft = fvp[0].x();
@@ -76,7 +76,7 @@ functions
 
             scalar magCylinder = 0.0;
             label cylI = mesh().boundaryMesh().findPatchID("cylinder");
-            const fvPatchVectorField& cylFvp = mesh().C().boundaryField()[cylI];
+            const auto& cylFvp = mesh().C().boundaryField()[cylI];
             if (cylFvp.size())
             {
                 magCylinder = mag(cylFvp[0]);
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
index 707cc621e4..fc24bd6706 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
@@ -112,8 +112,7 @@ functions
 
         codeWrite
         #{
-            const volScalarField& rho =
-                mesh().lookupObject<volScalarField>("rho");
+            const auto& rho = mesh().lookupObject<volScalarField>("rho");
 
             Info<< "rho volume = " << rho.weightedAverage(mesh().Vsc()) << endl;
         #};
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
index 3ef465007c..9251c16eca 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
@@ -98,7 +98,7 @@ functions
         codeWrite
         #{
 
-            const volScalarField& alpha =
+            const auto& alpha =
                 mesh().lookupObject<volScalarField>("alpha.water");
 
             Info<< "Alpha volume = " << alpha.weightedAverage(mesh().Vsc())
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index 83a756ea1e..eed20ab52b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -60,17 +60,16 @@ totalMass
 
     code
     #{
-        const volScalarField& alphaGas =
+        const auto& alphaGas =
             mesh().lookupObject<volScalarField>("alpha.gas");
-        const volScalarField& alphaLiquid =
+        const auto& alphaLiquid =
             mesh().lookupObject<volScalarField>("alpha.liquid");
 
-        const volScalarField& rhoGas =
+        const auto& rhoGas =
             mesh().lookupObject<volScalarField>("thermo:rho.gas");
-        const volScalarField& rhoLiquid =
+        const auto& rhoLiquid =
             mesh().lookupObject<volScalarField>("thermo:rho.liquid");
 
-
         const scalarField& v = mesh().V();
 
         Info<< "coded totalMass output:" << endl

From aafcd0b9e0f27af383957aea634c5fef3bf027f8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 12:08:11 +0100
Subject: [PATCH 064/348] TUT: use slash-scoped dictionary references

---
 .../system/rightFluid/createBafflesDict       |  4 +--
 .../combustion/coldEngineFoam/freePiston/0/T  |  7 ++---
 .../combustion/coldEngineFoam/freePiston/0/U  |  9 ++++---
 .../coldEngineFoam/freePiston/0/air           |  5 ++--
 .../coldEngineFoam/freePiston/0/alphat        |  5 ++--
 .../coldEngineFoam/freePiston/0/epsilon       |  7 ++---
 .../freePiston/0/include/boundaryConditions   |  6 ++---
 .../combustion/coldEngineFoam/freePiston/0/k  |  7 ++---
 .../coldEngineFoam/freePiston/0/nut           |  5 ++--
 .../combustion/coldEngineFoam/freePiston/0/p  |  7 ++---
 .../constant/turbulenceProperties             |  4 +--
 .../system/controlDict                        |  4 +--
 .../system/runTimePostProcessing              |  4 +--
 .../motorBike/system/runTimePostProcessing    |  4 +--
 .../simpleFoam/motorBike/system/forceCoeffs   |  4 +--
 .../simpleFoam/simpleCar/system/forceCoeffs   |  4 +--
 .../system/runTimePostProcessing              |  2 +-
 .../system/runTimePostProcessing              |  2 +-
 .../mixerVessel/system/createBafflesDict      |  6 ++---
 .../sphereDrop/0.orig/pointDisplacement       | 26 +++++++++++++-----
 .../system/createBafflesDict                  |  4 +--
 .../mixerVesselAMI/system/snappyHexMeshDict   | 27 +++++--------------
 .../motorBike/system/caseProperties           | 14 +++++-----
 .../system/bottomAir/caseProperties           |  6 ++---
 .../system/heater/caseProperties              |  8 +++---
 .../system/leftSolid/caseProperties           |  6 ++---
 .../system/rightSolid/caseProperties          |  6 ++---
 .../system/topAir/caseProperties              | 10 +++----
 28 files changed, 104 insertions(+), 99 deletions(-)

diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict
index d9a84cfedf..b0941d3999 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -68,7 +68,7 @@ baffles
 
                 patchFields
                 {
-                    ${...master.patchFields}
+                    ${../../master/patchFields}
                 }
             }
         }
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/T b/tutorials/combustion/coldEngineFoam/freePiston/0/T
index f3b768f5fd..f60a021a39 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/T
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ FoamFile
 
 dimensions      [0 0 0 1 0 0 0];
 
-internalField   uniform $:internalField.T;
+internalField   uniform $/internalField/T;
 
 boundaryField
 {
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.T;
+        $/wall/T;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/U b/tutorials/combustion/coldEngineFoam/freePiston/0/U
index 82daf73114..fab938120e 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/U
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM:.Uhe Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ FoamFile
 
 dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform $:internalField.U;
+internalField   uniform $/internalField/U;
 
 boundaryField
 {
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.U;
+        $/wall/U;
     }
 
     cylinderHead
@@ -44,9 +44,10 @@ boundaryField
 
     piston
     {
-        $:piston.U;
+        $/piston/U;
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/air b/tutorials/combustion/coldEngineFoam/freePiston/0/air
index 7a941102f1..4867423481 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/air
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.p;
+        $/wall/p;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/alphat b/tutorials/combustion/coldEngineFoam/freePiston/0/alphat
index 39e55ae3d0..072897a0f0 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/alphat
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.alphat;
+        $/wall/alphat;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon b/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon
index d630bd17c2..96c0d536ac 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ FoamFile
 
 dimensions      [0 2 -3 0 0 0 0];
 
-internalField   uniform $:internalField.epsilon;
+internalField   uniform $/internalField/epsilon;
 
 boundaryField
 {
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.epsilon;
+        $/wall/epsilon;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions b/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions
index b3dfefe0b8..394940a892 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/include/boundaryConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -35,13 +35,13 @@ wall
     k
     {
         type            kqRWallFunction;
-        value           uniform $:internalField.k;
+        value           uniform $/internalField/k;
     }
 
     epsilon
     {
         type            epsilonWallFunction;
-        value           uniform $:internalField.epsilon;
+        value           uniform $/internalField/epsilon;
     }
 
     nut
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/k b/tutorials/combustion/coldEngineFoam/freePiston/0/k
index 4e71076472..15b1b347a2 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/k
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM:.khe Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ FoamFile
 
 dimensions      [0 2 -2 0 0 0 0];
 
-internalField   uniform $:internalField.k;
+internalField   uniform $/internalField/k;
 
 boundaryField
 {
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.k;
+        $/wall/k;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/nut b/tutorials/combustion/coldEngineFoam/freePiston/0/nut
index 06c7a5f348..fc39b51df3 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/nut
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.nut;
+        $/wall/nut;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/p b/tutorials/combustion/coldEngineFoam/freePiston/0/p
index 51f5fe60ea..5203d7e108 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/p
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM:.phe Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform $:internalField.p;
+internalField   uniform $/internalField/p;
 
 boundaryField
 {
@@ -34,7 +34,7 @@ boundaryField
 
     liner
     {
-        $:wall.p;
+        $/wall/p;
     }
 
     cylinderHead
@@ -48,5 +48,6 @@ boundaryField
     }
 }
 
+#remove (wall piston)
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/turbulenceProperties
index 29ac5bcdb2..0a37bfb0dc 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ LES
 
     LESModel            kEqn;
 
-    ${:$LESModel}
+    ${/$LESModel}
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict
index a45b5f12e7..090d9763e7 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -80,7 +80,7 @@ functions
                 viscousDissipationCoeffs
                 {
                     fields          (T);
-                    rhoInf          $....rhoInf;
+                    rhoInf          ${../../../rhoInf};
                 }
             }
         }
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/runTimePostProcessing b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/runTimePostProcessing
index b6ba67db25..0fd59be820 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/runTimePostProcessing
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/runTimePostProcessing
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -48,7 +48,7 @@ postPro1
     // they are locally overridden
     colours
     {
-        ${..colourScheme.paraview};
+        ${../colourScheme/paraview};
     }
 
     // Line data
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runTimePostProcessing b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runTimePostProcessing
index acd2c99046..b9b8001cd4 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runTimePostProcessing
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runTimePostProcessing
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@ postPro1
     // Default colours. Used for colourBy == colour unless locally overridden
     colours
     {
-        ${..colourScheme.blueGradient};
+        ${../colourScheme/blueGradient};
     }
 
     camera
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
index edd0b230b6..80b32db72b 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -38,7 +38,7 @@ binField1
     fields                  (forceCoeff);
     patches                 (motorBikeGroup);
     decomposePatchValues    true;
-    CofR                    ${..forceCoeffs1.CofR};
+    CofR                    ${../forceCoeffs1/CofR};
 
     binData
     {
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/forceCoeffs b/tutorials/incompressible/simpleFoam/simpleCar/system/forceCoeffs
index f71c7eeb69..a6d829ff10 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/forceCoeffs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -38,7 +38,7 @@ binField1
     fields                  (forceCoeff);
     patches                 (body);
     decomposePatchValues    yes;
-    CofR                    ${..forceCoeffs1.CofR};
+    CofR                    ${../forceCoeffs1/CofR};
     cellZones               (porousZone);
 
     binData
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/runTimePostProcessing b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/runTimePostProcessing
index b9214d28c4..691472379b 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/runTimePostProcessing
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/runTimePostProcessing
@@ -64,7 +64,7 @@ postPro1
     // Default colours
     colours
     {
-        ${..colourScheme.paraview};
+        ${../colourScheme/paraview};
     }
 
     // Line data
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing
index ca93482176..3d3fc18109 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing
@@ -36,7 +36,7 @@ postPro1
     // they are locally overridden
     colours
     {
-        ${..colourScheme.greyGradient};
+        ${../colourScheme/greyGradient};
     }
 
     // Points (cloud) data
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict
index 3df7540dfd..0132dfcf73 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -39,7 +39,7 @@ baffles
             }
             slave
             {
-                ${..master}
+                ${../master}
             }
         }
     }
@@ -60,7 +60,7 @@ baffles
             }
             slave
             {
-                ${..master}
+                ${../master}
             }
         }
     }
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement
index 9b5261f839..3b6ef4aee8 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -14,8 +14,23 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "<constant>/dynamicMeshDict"
-#include "<system>/blockMeshDict"
+__blockMeshDict
+{
+    #include "<system>/blockMeshDict"
+}
+
+// Sphere properties
+sphereProperties
+{
+    centreOfMass    (0 ${/__blockMeshDict/sphereCentreHeight} 0);
+    momentOfInertia (2e-3 2e-3 2e-3);
+    velocity        (0 -3.77 0);
+    mass            2.08e-3;  // sphere mass 0.15 kg, 5 degree wedge
+}
+
+#remove __blockMeshDict
+
+// ------------------------------------------------------------------------- //
 
 dimensions      [0 1 0 0 0 0 0];
 
@@ -44,13 +59,10 @@ boundaryField
     sphere
     {
         type            sixDoFRigidBodyDisplacement;
-        centreOfMass    (0 $:sphereCentreHeight 0);
-        momentOfInertia (2e-3 2e-3 2e-3);
-        velocity        (0 -3.77 0);
+        $/sphereProperties;
         accelerationRelaxation  1;
         accelerationDamping     1;
 
-        mass            2.08e-3;  // sphere mass 0.15 kg, 5 degree wedge
 //      rhoInf          -1;       // needed only for solvers solving for
                                   // kinematic pressure
         report          on;
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict
index ab9029474f..16b8187c6a 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -68,7 +68,7 @@ baffles
 
                 patchFields
                 {
-                    ${...master.patchFields}
+                    ${../../master/patchFields}
                 }
             }
         }
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
index cfc856388b..f788f592e6 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -240,47 +240,32 @@ castellatedMeshControls
 
         shaftRotating
         {
+            ${../vessel};
             level (1 1);
-            patchInfo
-            {
-                ${...vessel.patchInfo}
-            }
         }
 
         shaft
         {
+            ${../vessel};
             level (1 1);
-            patchInfo
-            {
-                ${...vessel.patchInfo}
-            }
         }
 
         sparger
         {
+            ${../vessel};
             level (1 1);
-            patchInfo
-            {
-                ${...vessel.patchInfo}
-            }
         }
 
         stirrer
         {
+            ${../vessel};
             level (1 1);
-            patchInfo
-            {
-                ${...vessel.patchInfo}
-            }
         }
 
         baffles
         {
+            ${../vessel};
             level (1 1);
-            patchInfo
-            {
-                ${...vessel.patchInfo}
-            }
         }
 
         rotating
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties b/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties
index de5762041f..fca992b422 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -37,7 +37,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 
@@ -52,7 +52,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 
@@ -68,7 +68,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 
@@ -83,7 +83,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 
@@ -94,7 +94,7 @@ boundaryConditions
         patches         (upperWall);
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 
@@ -105,7 +105,7 @@ boundaryConditions
         patches         (frontAndBack);
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 }
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties
index 8cfe7edc20..177a15fcde 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -40,7 +40,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     thermalCoupledWalls
@@ -56,7 +56,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 }
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties
index 9c3a56c0e8..9df07b47ab 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -34,7 +34,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
             T       uniform 500;
         }
     }
@@ -49,7 +49,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     thermalCoupledWalls
@@ -63,7 +63,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 }
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties
index bc3326d95d..bf11563ddd 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -35,7 +35,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     thermalCoupledWalls
@@ -49,7 +49,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 }
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties
index 6169b8bd9a..197fc1a826 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -35,7 +35,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     thermalCoupledWalls
@@ -49,7 +49,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 }
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties
index eadbef93d8..0106ad5ff5 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -37,7 +37,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     outlet
@@ -51,7 +51,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     thermalWalls
@@ -67,7 +67,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
     thermalCoupledWalls
@@ -83,7 +83,7 @@ boundaryConditions
         }
         values
         {
-            $:initialConditions;
+            $/initialConditions;
         }
     }
 }

From 375a4792f973bc8268d7b6375bf5f04ad3fcb86a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 6 Feb 2023 11:21:15 +0100
Subject: [PATCH 065/348] ENH: HashSet, HashTable, HashPtrTable merge() method

- name and functionality similar to std::unordered_map (C++17).
  Formalizes what had been previously been implemented in IOobjectList
  but now manages without pointer deletion/creation.
---
 applications/test/HashSet/Test-hashSet.C      |  62 +++++++--
 .../test/HashTable2/Test-HashTable2.C         | 104 +++++++++++++--
 .../test/IOobjectList/Test-IOobjectList.C     |   2 +-
 .../HashTables/HashPtrTable/HashPtrTable.C    |  26 +++-
 .../HashTables/HashPtrTable/HashPtrTable.H    |  12 +-
 .../HashTables/HashPtrTable/HashPtrTableI.H   |   2 +-
 .../containers/HashTables/HashSet/HashSet.C   |  16 ++-
 .../containers/HashTables/HashSet/HashSet.H   |  14 +-
 .../HashTables/HashTable/HashTable.C          | 124 ++++++++++++++----
 .../HashTables/HashTable/HashTable.H          |  26 +++-
 .../HashTables/HashTable/HashTableI.H         |  26 ++++
 .../HashTables/HashTable/HashTableIter.C      |  81 ++++++++++--
 .../HashTables/HashTable/HashTableIterI.H     |   3 +-
 src/OpenFOAM/db/IOobjectList/IOobjectList.C   |  30 -----
 src/OpenFOAM/db/IOobjectList/IOobjectList.H   |  14 +-
 src/OpenFOAM/db/IOobjectList/IOobjectListI.H  |   4 +-
 16 files changed, 430 insertions(+), 116 deletions(-)

diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C
index c412b26523..b4bdd07cab 100644
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@@ -73,6 +73,22 @@ void printMinMax(const HashSet<Key, Hash>& set)
 }
 
 
+template<class Key, class Hash>
+void printHashSet(const HashSet<Key, Hash>& table)
+{
+    Info<< table.size() << '(' << nl;
+
+    for (const auto& key : table.sortedToc())
+    {
+        const auto iter = table.find(key);
+
+        Info<< "    " << key << " : " << Foam::name(&(iter.key())) << nl;
+    }
+
+    Info<< ')' << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
@@ -84,33 +100,33 @@ int main(int argc, char *argv[])
         << typeid(HashSet<label>::hasher).name() << nl << nl;
 
     hashedWordList words
-    {
+    ({
         "abc",
         "def",
         "ghi"
-    };
+    });
     words = { "def", "ghi", "xy", "all", "end", "all" };
 
     wordHashSet setA
-    {
+    ({
         "xx",
         "yy",
         "zz"
-    };
+    });
 
     setA = { "kjhk", "kjhk2", "abced" };
 
     HashTable<label> tableA
-    {
+    ({
         { "value1", 1 },
         { "value2", 2 },
         { "value3", 3 }
-    };
+    });
 
     HashTable<nil> tableB;
-    tableB.insert("value4", nil());
-    tableB.insert("value5", nil());
-    tableB.insert("value6", nil());
+    tableB.emplace("value4");
+    tableB.emplace("value5");
+    tableB.emplace("value6");
 
     Info<< "tableA keys: "; tableA.writeKeys(Info) << endl;
 
@@ -123,11 +139,11 @@ int main(int argc, char *argv[])
     }
 
     Map<label> mapA
-    {
+    ({
         { 1, 1 },
         { 2, 2 },
         { 3, 3 }
-    };
+    });
     mapA.set(4, 4);
 
     Info<< "hashedWordList: " << words << nl
@@ -185,9 +201,9 @@ int main(int argc, char *argv[])
     }
 
     labelHashSet setB
-    {
+    ({
         1, 11, 42
-    };
+    });
 
     Info<<"Set with min/max:" << minMax(setB)
         << " min:" << min(setB) << " max:" << max(setB) << nl;
@@ -309,6 +325,26 @@ int main(int argc, char *argv[])
     Info<< "setA1: " << setA1 << nl
         << "setB1: " << setB1 << nl;
 
+
+    // Merging
+    {
+        wordHashSet set0({ "abc", "kjhk", "kjhk2" });
+        wordHashSet set1({ "abc", "def", "ghi", "jkl" });
+
+        Info<< nl
+            << "Set0" << nl;
+        printHashSet(set0);
+        Info<< "Set1" << nl;
+        printHashSet(set1);
+
+        set1.merge(set0);
+
+        Info<< "merged 0" << nl;
+        printHashSet(set0);
+        Info<< "merged 1" << nl;
+        printHashSet(set1);
+    }
+
     return 0;
 }
 
diff --git a/applications/test/HashTable2/Test-HashTable2.C b/applications/test/HashTable2/Test-HashTable2.C
index 010251f807..19406361fc 100644
--- a/applications/test/HashTable2/Test-HashTable2.C
+++ b/applications/test/HashTable2/Test-HashTable2.C
@@ -79,26 +79,56 @@ public:
 };
 
 
+template<class T, class Key, class Hash>
+void printTable(const HashPtrTable<T, Key, Hash>& table)
+{
+    Info<< table.size() << '(' << nl;
+
+    for (const auto& key : table.sortedToc())
+    {
+        const auto iter = table.find(key);
+
+        Info
+            << "    " << iter.key() << " (" << Foam::name(&(iter.key()))
+            << ") : ";
+
+        if (iter.val())
+        {
+            Info<< *(iter.val());
+        }
+        else
+        {
+            Info<< "nullptr";
+        }
+
+        Info<< " (" << Foam::name(iter.val()) << ")" << nl;;
+    }
+
+    Info<< ')' << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main(int argc, char *argv[])
 {
-    HashTable<label, Foam::string> table1
-    {
+    HashTable<Label, Foam::string> table0
+    ({
+        {"abc", 123},
         {"kjhk", 10},
         {"kjhk2", 12}
-    };
+    });
 
-    Info<< "table1: " << table1 << nl
-        << "toc: " << flatOutput(table1.toc()) << nl;
+    Info<< "table0: " << table0 << nl
+        << "toc: " << flatOutput(table0.toc()) << nl;
 
     HashTable<label, label, Hash<label>> table2
-    {
+    ({
         {3, 10},
         {5, 12},
         {7, 16}
-    };
+    });
 
     Info<< "table2: " << table2 << nl
         << "toc: " << flatOutput(table2.toc()) << nl;
@@ -127,7 +157,7 @@ int main(int argc, char *argv[])
         table1.insert("ghi", 15);
         table1.insert("jkl", 20);
 
-        Info<< nl << "Table toc: " << flatOutput(table1.toc()) << nl;
+        Info<< nl << "Table toc: " << flatOutput(table1.sortedToc()) << nl;
 
         for (const word k : { "abc" })
         {
@@ -153,16 +183,30 @@ int main(int argc, char *argv[])
                     ;
             }
         }
+
+        Info<< nl
+            << "Table0: " << flatOutput(table0.sortedToc()) << nl
+            << "Table1: " << flatOutput(table1.sortedToc()) << nl;
+
+        table1.merge(table0);
+
+        Info<< "merged 0: " << flatOutput(table0.sortedToc()) << nl
+            << "merged 1: " << flatOutput(table1.sortedToc()) << nl;
     }
 
     {
+        HashPtrTable<Label> ptable0(0);
+        ptable0.emplace("abc", 123),
+        ptable0.emplace("kjhk", 10);
+        ptable0.emplace("kjhk2", 12);
+
         HashPtrTable<Label> ptable1(0);
         ptable1.insert("abc", autoPtr<Label>::New(5));
-        ptable1.insert("def", autoPtr<Label>::New(10));
-        ptable1.insert("ghi", autoPtr<Label>::New(15));
-        ptable1.insert("jkl", autoPtr<Label>::New(20));
+        ptable1.emplace("def", 10);
+        ptable1.emplace("ghi", 15);
+        ptable1.emplace("jkl", 20);
 
-        Info<< nl << "PtrTable toc: " << flatOutput(ptable1.toc()) << nl;
+        Info<< nl << "PtrTable toc: " << flatOutput(ptable1.sortedToc()) << nl;
 
         for (const word k : { "abc" })
         {
@@ -242,6 +286,20 @@ int main(int argc, char *argv[])
             }
         }
 
+        Info<< nl
+            << "Table0" << nl;
+        printTable(ptable0);
+
+        Info<< "Table1" << nl;
+        printTable(ptable1);
+
+        ptable1.merge(ptable0);
+
+        Info<< "merged 0" << nl;
+        printTable(ptable0);
+        Info<< "merged 1" << nl;
+        printTable(ptable1);
+
         Info<< nl << "Ending scope" << nl;
     }
 
@@ -277,6 +335,28 @@ int main(int argc, char *argv[])
             Info<< "got with " << (*iter).size() << nl;
         }
 
+        Info<< nl
+            << "Test (DIY) insert_or_assign" << nl;
+
+        label nKeys = 0;
+
+        for (const auto& key : { "abc", "foo", "mno", "xyz" })
+        {
+            Info<< key;
+            if (ltable1.contains(key))
+            {
+                Info<< " : " << ltable1[key];
+            }
+            else
+            {
+                Info<< " : n/a";
+            }
+
+            /// ltable1.insert_or_assign(key, identity(++nKeys));
+            ltable1(key) = identity(++nKeys);
+
+            Info<< "  --> " << ltable1[key] << nl;
+        }
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/applications/test/IOobjectList/Test-IOobjectList.C b/applications/test/IOobjectList/Test-IOobjectList.C
index 2e1e261a2f..5a74e1adfd 100644
--- a/applications/test/IOobjectList/Test-IOobjectList.C
+++ b/applications/test/IOobjectList/Test-IOobjectList.C
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
             Info<< "==target==" << nl; reportDetail(objects);
             Info<< "==source==" << nl; reportDetail(other);
 
-            objects.merge(std::move(other));
+            objects.merge(other);
             Info<< nl << "After merge" << nl;
 
             Info<< "==target==" << nl; reportDetail(objects);
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index f9b7c10fb4..10d7fad18c 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -150,6 +150,30 @@ void Foam::HashPtrTable<T, Key, Hash>::clear()
 }
 
 
+template<class T, class Key, class Hash>
+void Foam::HashPtrTable<T, Key, Hash>::merge
+(
+    HashPtrTable<T, Key, Hash>& source
+)
+{
+    // Use parent merge (of raw pointer entries)
+    // and by-pass any pointer deletions etc.
+    parent_type::merge(static_cast<parent_type&>(source));
+}
+
+
+template<class T, class Key, class Hash>
+void Foam::HashPtrTable<T, Key, Hash>::merge
+(
+    HashPtrTable<T, Key, Hash>&& source
+)
+{
+    // Use parent merge (of raw pointer entries)
+    // and by-pass any pointer deletions etc.
+    parent_type::merge(static_cast<parent_type&>(source));
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 765c34b89e..39d2fbff68 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -173,6 +173,16 @@ public:
         //- Clear all entries from table and delete any allocated pointers
         void clear();
 
+        //- Attempts to extract entries from source parameter and insert them
+        //- into \c this, does not overwrite existing entries.
+        //- The source will contains any items that could not be merged.
+        void merge(HashPtrTable<T, Key, Hash>& source);
+
+        //- Attempts to extract entries from source parameter and insert them
+        //- into \c this, does not overwrite existing entries.
+        //- The source will contains any items that could not be merged.
+        void merge(HashPtrTable<T, Key, Hash>&& source);
+
 
     // Reading/writing
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
index f207bbceac..2d3f8a4921 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 02d2390f66..7457fc6b30 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -232,6 +232,20 @@ inline Foam::label Foam::HashSet<Key, Hash>::unset
 }
 
 
+template<class Key, class Hash>
+void Foam::HashSet<Key, Hash>::merge(HashSet<Key, Hash>& source)
+{
+    parent_type::merge(source);
+}
+
+
+template<class Key, class Hash>
+void Foam::HashSet<Key, Hash>::merge(HashSet<Key, Hash>&& source)
+{
+    parent_type::merge(source);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Key, class Hash>
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 141fad2696..2288d57ead 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -197,7 +197,7 @@ public:
         //- Same as insert (no value to overwrite)
         bool set(const Key& key)
         {
-            return insert(key);
+            return this->parent_type::emplace(key);
         }
 
         //- Unset the specified key - same as erase
@@ -207,6 +207,16 @@ public:
             return this->parent_type::erase(key);
         }
 
+        //- Attempts to extract entries from source parameter and insert them
+        //- into \c this, does not overwrite existing entries.
+        //- The source will contains any items that could not be merged.
+        void merge(HashSet<Key, Hash>& source);
+
+        //- Attempts to extract entries from source parameter and insert them
+        //- into \c this, does not overwrite existing entries.
+        //- The source will contains any items that could not be merged.
+        void merge(HashSet<Key, Hash>&& source);
+
 
     // Convenience
 
@@ -370,7 +380,7 @@ public:
         //- Add entries to this HashSet
         this_type& operator|=(const this_type& rhs);
 
-        //- Only retain entries found in both HashSets
+        //- Only retain entries contained in both HashSets
         inline this_type& operator&=(const this_type& rhs);
 
         //- Only retain unique entries (xor)
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 94d91e5d80..e0cface7c1 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -359,7 +359,8 @@ bool Foam::HashTable<T, Key, Hash>::setEntry
 {
     if (!capacity_)
     {
-        resize(2);
+        // Same as default sizing
+        resize(128);
     }
 
     const label index = hashKeyIndex(key);
@@ -384,13 +385,9 @@ bool Foam::HashTable<T, Key, Hash>::setEntry
             new node_type(table_[index], key, std::forward<Args>(args)...);
 
         ++size_;
-        if (double(size_)/capacity_ > 0.8 && capacity_ < maxTableSize)
+        if (0.8*capacity_ < size_)  // Resize after 80% fill factor
         {
-            #ifdef FULLDEBUG
-            DebugInFunction << "Doubling table size\n";
-            #endif
-
-            resize(2*capacity_);
+            if (capacity_ < maxTableSize) resize(2*capacity_);
         }
     }
     else if (overwrite)
@@ -425,10 +422,7 @@ bool Foam::HashTable<T, Key, Hash>::setEntry
     }
     else
     {
-        // Do not overwrite existing entry (STL 'insert' convention)
-        #ifdef FULLDEBUG
-        DebugInFunction << "Not inserting " << key << ": already in table\n";
-        #endif
+        // Not overwriting existing entry
         return false;
     }
 
@@ -436,6 +430,52 @@ bool Foam::HashTable<T, Key, Hash>::setEntry
 }
 
 
+template<class T, class Key, class Hash>
+void Foam::HashTable<T, Key, Hash>::insert_node(node_type* entry)
+{
+    if (!entry) return;
+
+    if (!capacity_)
+    {
+        // Same as default sizing
+        resize(128);
+    }
+
+    const label index = hashKeyIndex(entry->key());
+
+    node_type* curr = nullptr;
+    //node_type* prev = nullptr;
+
+    for (node_type* ep = table_[index]; ep; ep = ep->next_)
+    {
+        if (entry->key() == ep->key())
+        {
+            curr = ep;
+            break;
+        }
+        //prev = ep;
+    }
+
+    if (!curr)
+    {
+        // Not found, insert it at the head
+        table_[index] = entry;
+
+        ++size_;
+        if (0.8*capacity_ < size_)  // Resize after 80% fill factor
+        {
+            if (capacity_ < maxTableSize) resize(2*capacity_);
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Not inserting " << entry->key() << ": already in table\n"
+            << exit(FatalError);
+    }
+}
+
+
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
 {
@@ -444,9 +484,7 @@ bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
     // The parameter should be (iterator&), but then the compiler doesn't find
     // it correctly and tries to call as (iterator) instead.
 
-    iterator& it = const_cast<iterator&>(iter);
-
-    return iterator_erase(it.entry_, it.index_);
+    return iterator_erase(const_cast<iterator&>(iter));
 }
 
 
@@ -454,7 +492,7 @@ template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const Key& key)
 {
     iterator iter(find(key));
-    return erase(iter);
+    return iterator_erase(iter);
 }
 
 
@@ -605,10 +643,6 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
 
     if (newCapacity == oldCapacity)
     {
-        #ifdef FULLDEBUG
-        DebugInFunction << "New table size == old table size\n";
-        #endif
-
         return;
     }
     else if (!newCapacity)
@@ -617,7 +651,8 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
         if (size_)
         {
             WarningInFunction
-                << "HashTable contains " << size_ << " cannot resize(0)" << nl;
+                << "HashTable contains " << size_
+                << " elements, cannot resize(0)" << nl;
         }
         else
         {
@@ -646,8 +681,7 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
 
     // Move to new table[] but with new chaining.
 
-    label nMove = size_;  // Allow early completion
-    for (label i=0; nMove && i < oldCapacity; ++i)
+    for (label i = 0, nPending = size_; nPending && i < oldCapacity; ++i)
     {
         for (node_type* ep = oldTable[i]; ep; /*nil*/)
         {
@@ -661,8 +695,8 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
                 table_[newIdx] = ep;
             }
 
-            ep = next;  // continue in the linked-list
-            --nMove;    // note any early completion
+            ep = next;      // continue in the linked-list
+            --nPending;     // note any early completion
         }
         oldTable[i] = nullptr;
     }
@@ -809,6 +843,46 @@ Foam::label Foam::HashTable<T, Key, Hash>::filterEntries
 }
 
 
+template<class T, class Key, class Hash>
+void Foam::HashTable<T, Key, Hash>::merge(HashTable<T, Key, Hash>& source)
+{
+    // Self-merge implicitly a no-op
+
+    if (node_type::stores_value())
+    {
+        // key/val pair
+        for (iterator iter = source.begin(); iter != source.end(); ++iter)
+        {
+            if (!contains(iter.key()))
+            {
+                node_type* entry = source.iterator_extract(iter);
+                this->insert_node(entry);
+            }
+        }
+    }
+    else
+    {
+        // key only, does not store a value.
+        // Since the key is const, juggling the node does not work
+
+        for (iterator iter = source.begin(); iter != source.end(); ++iter)
+        {
+            if (emplace(iter.key()))
+            {
+                source.erase(iter);
+            }
+        }
+    }
+}
+
+
+template<class T, class Key, class Hash>
+void Foam::HashTable<T, Key, Hash>::merge(HashTable<T, Key, Hash>&& source)
+{
+    merge(source);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index dcec3f00fa..7209f093a6 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -206,6 +206,17 @@ private:
         template<class... Args>
         bool setEntry(const bool overwrite, const Key& key, Args&&... args);
 
+        //- Insert node (low-level). The node must not previously exist!
+        void insert_node(node_type* entry);
+
+        //- Low-level entry erasure using iterator internals.
+        //  This invalidates the iterator until the next ++ operation.
+        //  \return True if the corresponding entry existed and was removed
+        bool iterator_erase(iterator& iter);
+
+        //- Unlink node from iterator (low-level).
+        node_type* iterator_extract(iterator& iter);
+
         //- Read hash table
         Istream& readTable(Istream& is);
 
@@ -532,6 +543,16 @@ public:
         //- Transfer contents into this table.
         void transfer(HashTable<T, Key, Hash>& rhs);
 
+        //- Attempts to extract entries from source parameter and insert them
+        //- into \c this, does not overwrite existing entries.
+        //- The source will contains any items that could not be merged.
+        void merge(HashTable<T, Key, Hash>& source);
+
+        //- Attempts to extract entries from source parameter and insert them
+        //- into \c this, does not overwrite existing entries.
+        //- The source will contains any items that could not be merged.
+        void merge(HashTable<T, Key, Hash>&& source);
+
 
     // Member Operators
 
@@ -714,11 +735,6 @@ protected:
             }
         };
 
-        //- Low-level entry erasure using iterator internals.
-        //  This invalidates the iterator until the next ++ operation.
-        //  \return True if the corresponding entry existed and was removed
-        bool iterator_erase(node_type*& entry, label& index);
-
 public:
 
         //- Forward iterator with non-const access
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 4fa30d87f0..4cf990347e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -198,6 +198,32 @@ inline bool Foam::HashTable<T, Key, Hash>::set
 }
 
 
+// FUTURE?
+// If 'key' already exists, assign \c std::forward<T>(obj) to the
+// entry. If it does not exist, uses insert()
+//
+// template<class T, class Key, class Hash>
+// inline void Foam::HashTable<T, Key, Hash>::insert_or_assign
+// (
+//     const Key& key,
+//     T&& obj
+// )
+// {
+//     iterator iter(this->find(key));
+//
+//     if (iter.good())
+//     {
+//         iter.val() = std::forward<T>(obj);
+//     }
+//     else
+//     {
+//         this->setEntry(true, key, std::forward<T>(obj));
+//         // iter = this->find(key);
+//     }
+//     // return iter.val();
+// }
+
+
 template<class T, class Key, class Hash>
 inline const T& Foam::HashTable<T, Key, Hash>::lookup
 (
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIter.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIter.C
index 33708cfa00..027696b373 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIter.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ Foam::HashTable<T, Key, Hash>::Iterator<Const>::Iterator
     container_(tbl),
     index_(0)
 {
-    if (tbl->size())
+    if (container_ && container_->size())
     {
         const label index = container_->hashKeyIndex(key);
 
@@ -62,12 +62,11 @@ Foam::HashTable<T, Key, Hash>::Iterator<Const>::Iterator
 // Any changes here may need changes in the iterator increment() method
 //
 template<class T, class Key, class Hash>
-bool Foam::HashTable<T, Key, Hash>::iterator_erase
-(
-    node_type*& entry,
-    label& index
-)
+bool Foam::HashTable<T, Key, Hash>::iterator_erase(iterator& iter)
 {
+    node_type* entry = iter.entry_;
+    const label index = iter.index_;
+
     // Safeguard against the following:
     // - empty table
     // - nullptr entry
@@ -98,8 +97,8 @@ bool Foam::HashTable<T, Key, Hash>::iterator_erase
         // Had previous element in linked list - reposition to there
         prev->next_ = entry->next_;
         delete entry;
-        entry = prev;
 
+        iter.entry_ = prev;
         return true;
     }
 
@@ -108,7 +107,7 @@ bool Foam::HashTable<T, Key, Hash>::iterator_erase
     delete entry;
 
     // Assign any non-nullptr value so it doesn't look like end()
-    entry = reinterpret_cast<node_type*>(this);
+    iter.entry_ = reinterpret_cast<node_type*>(this);
 
     // Mark the present index to continue and bring it back to the present
     // location with the next index.
@@ -116,10 +115,72 @@ bool Foam::HashTable<T, Key, Hash>::iterator_erase
     // Save: (-index-1), which has no ambiguity for index 0.
     // Retrieve:  (-(index+1))
 
-    index = (-index - 1);
+    iter.index_ = (-index - 1);
 
     return true;
 }
 
 
+//
+// Any changes here may need changes in the iterator increment() method
+//
+template<class T, class Key, class Hash>
+typename Foam::HashTable<T, Key, Hash>::node_type*
+Foam::HashTable<T, Key, Hash>::iterator_extract(iterator& iter)
+{
+    node_type* entry = iter.entry_;
+    const label index = iter.index_;
+
+    // Safeguard against the following:
+    // - empty table
+    // - nullptr entry
+    // - end iterator (which is also a nullptr)
+    // - negative index from a previous erase. See comment below.
+    if (!size_ || !entry || index < 0)
+    {
+        return nullptr;
+    }
+
+    // Decrease count
+    --size_;
+
+    // The previous element in the singly linked list
+    node_type* prev = nullptr;
+
+    for (node_type* ep = table_[index]; ep; ep = ep->next_)
+    {
+        if (ep == entry)
+        {
+            break;
+        }
+        prev = ep;
+    }
+
+    if (prev)
+    {
+        // Had previous element in linked list - reposition iterator to there
+        prev->next_ = entry->next_;
+        iter.entry_ = prev;
+
+        entry->next_ = nullptr;
+        return entry;
+    }
+
+    // Was first element on linked list
+    table_[index] = entry->next_;
+    iter.entry_ = table_[index];
+    entry->next_ = nullptr;
+
+    // Mark the present index to continue and bring it back to the present
+    // location with the next index.
+    //
+    // Save: (-index-1), which has no ambiguity for index 0.
+    // Retrieve:  (-(index+1))
+
+    iter.index_ = (-index - 1);
+
+    return entry;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIterI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIterI.H
index ab36301c5f..9139b0ad78 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIterI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIterI.H
@@ -70,7 +70,8 @@ inline Foam::HashTable<T, Key, Hash>::Iterator<Const>::Iterator
 
 
 //
-// Any changes here may need changes in iterator_erase() method too
+// Any changes here may need changes in iterator_erase(), iterator_extract()
+// methods too
 //
 template<class T, class Key, class Hash>
 template<bool Const>
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 05729db4fb..9cf21f9022 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -152,36 +152,6 @@ Foam::IOobjectList::IOobjectList
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::label Foam::IOobjectList::merge(IOobjectList&& other)
-{
-    // Remove by name to avoid uncertainties about invalid iterators
-
-    label count = 0;
-
-    wordList keys(other.toc());
-
-    for (const word& key : keys)
-    {
-        if (!found(key))
-        {
-            if (IOobject::debug)
-            {
-                InfoInFunction << "Merge " << key << nl;
-            }
-
-            if (add(other.remove(key)))
-            {
-                ++count;
-            }
-        }
-    }
-
-    return count;
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 const Foam::IOobject* Foam::IOobjectList::cfindObject
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 91d02f54a4..a108b17687 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -224,19 +224,11 @@ public:
 
     // Basic methods
 
-        //- Move insert IOobject into the list
-        inline bool add(autoPtr<IOobject>&& objectPtr);
-
         //- Move insert IOobject into the list
         inline bool add(autoPtr<IOobject>& objectPtr);
 
-        //- Add objects from other to this list without overwriting
-        //- existing keys.
-        //  After calling this, the other parameter will contains any items
-        //  that could not be merged.
-        //
-        //  \return number of items merged
-        label merge(IOobjectList&& other);
+        //- Move insert IOobject into the list
+        inline bool add(autoPtr<IOobject>&& objectPtr);
 
         //- Remove object from the list, by name or by iterator.
         //
@@ -362,7 +354,7 @@ public:
         //  word checkType = volScalarField::typeName;
         //
         //  Info<< checkType << "="
-        //      << (classes.found(checkType) ? classes[checkType].size() : 0)
+        //      << (classes.contains(checkType) ? classes[checkType].size() : 0)
         //      << nl;
         //  \endcode
         //  Using the two-parameter HashTable::lookup method lets us avoid
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectListI.H b/src/OpenFOAM/db/IOobjectList/IOobjectListI.H
index 31f3fe6f1d..e9f90e6361 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectListI.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectListI.H
@@ -109,7 +109,7 @@ inline Foam::IOobjectList::IOobjectList
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::IOobjectList::add(autoPtr<IOobject>&& objectPtr)
+inline bool Foam::IOobjectList::add(autoPtr<IOobject>& objectPtr)
 {
     if (objectPtr)
     {
@@ -120,7 +120,7 @@ inline bool Foam::IOobjectList::add(autoPtr<IOobject>&& objectPtr)
 }
 
 
-inline bool Foam::IOobjectList::add(autoPtr<IOobject>& objectPtr)
+inline bool Foam::IOobjectList::add(autoPtr<IOobject>&& objectPtr)
 {
     if (objectPtr)
     {

From 702225c24917fb4406122d109aa81e44b76f3e63 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 11 Feb 2023 13:28:51 +0100
Subject: [PATCH 066/348] ENH: add stdFoam::span container

- basic functionality similar to std::span (C++20).
  Holds pointer and size: for lightweight handling of address ranges.

- implements cdata_bytes() and data_bytes() methods for similarity
  with UList. For span, however, both container accesses are const
  but the data_bytes() method is only available when the
  underlying pointer is non-const.

  No specializations of std::as_bytes() or std::as_writeable_bytes()
  as free functions, since std::byte etc are not available anyhow.
---
 applications/test/span/Make/files          |   3 +
 applications/test/span/Make/options        |   2 +
 applications/test/span/Test-stdFoam-span.C | 156 +++++++++++++++++++
 src/OpenFOAM/include/stdFoam.H             | 173 ++++++++++++++++++++-
 4 files changed, 333 insertions(+), 1 deletion(-)
 create mode 100644 applications/test/span/Make/files
 create mode 100644 applications/test/span/Make/options
 create mode 100644 applications/test/span/Test-stdFoam-span.C

diff --git a/applications/test/span/Make/files b/applications/test/span/Make/files
new file mode 100644
index 0000000000..81d892eb39
--- /dev/null
+++ b/applications/test/span/Make/files
@@ -0,0 +1,3 @@
+Test-stdFoam-span.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-stdFoam-span
diff --git a/applications/test/span/Make/options b/applications/test/span/Make/options
new file mode 100644
index 0000000000..18e6fe47af
--- /dev/null
+++ b/applications/test/span/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/span/Test-stdFoam-span.C b/applications/test/span/Test-stdFoam-span.C
new file mode 100644
index 0000000000..fc6048b7b8
--- /dev/null
+++ b/applications/test/span/Test-stdFoam-span.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-stdFoam-span
+
+Description
+    Basic functionality test for span
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+
+#include "IOstreams.H"
+#include "StringStream.H"
+#include "scalar.H"
+#include "vector.H"
+#include "labelRange.H"
+#include "scalarList.H"
+
+using namespace Foam;
+
+template<class Type>
+void printInfo(const UList<Type>& list)
+{
+    Info<< "list: " << flatOutput(list) << nl
+        << "data: " << Foam::name(list.cdata())
+        << " size: " << Foam::name(list.size()) << nl;
+}
+
+
+template<class Type>
+void printInfo(const stdFoam::span<Type> span)
+{
+    Info<< "span: " << Foam::name(span.data())
+        << ", " << span.size() << nl;
+}
+
+template<class Type>
+void printContent(const stdFoam::span<Type> span)
+{
+    Info<< "range:";
+    for (const auto& val : span)
+    {
+        Info<< " " << val;
+    }
+    Info<< nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::noFunctionObjects();
+
+    #include "setRootCase.H"
+
+    {
+        const List<label> list1(identity(15));
+
+        printInfo(list1);
+
+        stdFoam::span<const label> span1;
+        printInfo(span1);
+
+        span1 = stdFoam::span<const label>(list1.cdata(), list1.size());
+        printInfo(span1);
+        printContent(span1);
+
+        auto subspan1 = span1.subspan(5);
+
+        printInfo(subspan1);
+        printContent(subspan1);
+
+        subspan1 = span1.subspan(5, 30);
+        printInfo(subspan1);
+        printContent(subspan1);
+
+        // non-const access: span1[6] = -100;
+        // non-const access: Info<< Foam::name(span1.data_bytes()) << endl;
+
+        Info<< Foam::name(span1.cdata_bytes()) << endl;
+    }
+
+    {
+        List<label> list1(identity(15));
+
+        printInfo(list1);
+
+        stdFoam::span<label> span1;
+        printInfo(span1);
+
+        span1 = stdFoam::span<label>(list1.data(), list1.size());
+        printInfo(span1);
+        printContent(span1);
+
+        auto subspan1 = span1.subspan(5);
+
+        printInfo(subspan1);
+        printContent(subspan1);
+
+        subspan1 = span1.subspan(5, 30);
+        printInfo(subspan1);
+        printContent(subspan1);
+
+        span1[6] = -100;
+        printInfo(span1);
+        printContent(span1);
+
+        Info<< Foam::name(span1.data_bytes()) << endl;
+
+
+        // With const span
+        const auto span2 = stdFoam::span<label>(list1.data(), list1.size());
+        printContent(span2);
+
+        // Span may be const, but its contents (pointers) needn't be
+        span2[1] = 100;
+        span2.front() = -1000;
+        span2.back() = 1000;
+        printInfo(list1);
+
+        printContent(span2.first(5));
+        printContent(span2.last(5));
+    }
+
+    Info<< "\nDone\n" << nl;
+    return 0;
+}
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/include/stdFoam.H b/src/OpenFOAM/include/stdFoam.H
index 877c5ef968..b6ebf2e822 100644
--- a/src/OpenFOAM/include/stdFoam.H
+++ b/src/OpenFOAM/include/stdFoam.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,6 +36,7 @@ Description
 #include <initializer_list>
 #include <memory>
 #include <utility>
+#include <type_traits>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -397,6 +398,176 @@ constexpr inline const T& max(const T& a, const T& b)
     )
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace stdFoam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class stdFoam::span Declaration
+\*---------------------------------------------------------------------------*/
+
+//- Rudimentary functionality similar to std::span for holding memory view
+template<class Type>
+class span
+{
+    // Private Data
+
+        //- The data pointer
+        Type* data_;
+
+        //- The size of the span
+        std::size_t size_;
+
+
+public:
+
+    // STL type definitions
+
+        using element_type = Type;
+        using value_type = std::remove_cv<Type>;
+        using size_type = std::size_t;
+        using pointer = Type*;
+        using const_pointer = const Type*;
+        using reference = Type&;
+        using const_reference = const Type&;
+        using difference_type = std::ptrdiff_t;
+        using iterator = Type*;
+
+
+    // Generated Methods
+
+        //- Copy construct
+        span(const span& other) noexcept = default;
+
+        //- Copy assignment
+        span& operator=(const span& other) noexcept = default;
+
+
+    // Constructors
+
+        //- Default construct
+        constexpr span() noexcept
+        :
+            data_(nullptr),
+            size_(0)
+        {}
+
+        //- Construct from pointer and size
+        constexpr span(pointer ptr, size_type count) noexcept
+        :
+            data_(ptr),
+            size_(count)
+        {}
+
+        //- Construct from begin/end pointers
+        constexpr span(pointer first, pointer last) noexcept
+        :
+            data_(first),
+            size_(last - first)
+        {}
+
+
+    //- Destructor
+    ~span() noexcept = default;
+
+
+    // Member Functions
+
+    // Iterators
+
+        //- Iterator to begin of span
+        constexpr iterator begin() const noexcept { return data_; }
+
+        //- Iterator to one-past end of span
+        constexpr iterator end() const noexcept { return (data_ + size_); }
+
+
+    // Element access
+
+        //- Access the first element. Undefined if span is empty
+        constexpr reference front() const { return *(data_); }
+
+        //- Access the last element. Undefined if span is empty
+        constexpr reference back() const { return *(data_ + size_ - 1); }
+
+        //- Access an element of the sequence
+        constexpr reference operator[](size_type idx) const
+        {
+           return *(data_ + idx);
+        }
+
+        //- Return a pointer to the beginning of the sequence
+        constexpr pointer data() const noexcept { return data_; }
+
+
+    // Observers
+
+        //- Number of elements in the sequence
+        constexpr size_type size() const noexcept { return size_; }
+
+        //- The size of the sequence in bytes
+        constexpr size_type size_bytes() const noexcept
+        {
+            return (size_*sizeof(Type));
+        }
+
+        //- True if the sequence is empty
+        constexpr bool empty() const noexcept { return !size_; }
+
+
+    // Subview
+
+        //- Obtains a span of the first count elements
+        span<Type> first(size_type count) const noexcept
+        {
+            return span<Type>(data_, count);
+        }
+
+        //- Obtains a span of the last count elements
+        span<Type> last(size_type count) const noexcept
+        {
+            return span<Type>(data_ + (size_ - count), count);
+        }
+
+        //- Obtains a sub-span starting at pos until end of the sequence
+        span<Type> subspan(size_type pos) const noexcept
+        {
+            return span<Type>(data_ + pos, size_ - pos);
+        }
+
+        //- Obtains a sub-span of length len starting at pos.
+        //  Graciously handles excess lengths.
+        span<Type> subspan(size_type pos, size_type len) const noexcept
+        {
+            return span<Type>(data_ + pos, std::min(size_ - pos, len));
+        }
+
+
+    // Additional members, similar to UList etc.
+    // The std::span has as_bytes() and as_writeable_bytes() as free functions
+
+        //- A readonly view as byte content
+        constexpr const char* cdata_bytes() const noexcept
+        {
+            return reinterpret_cast<const char*>(data_);
+        }
+
+        //- A writable view as byte content (if the pointer type is non-const).
+        //- Like data(), the const access itself is const.
+        template<class TypeT = Type>
+        typename std::enable_if<!std::is_const<TypeT>::value, char*>::type
+        data_bytes() const noexcept
+        {
+            return reinterpret_cast<char*>(data_);
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace stdFoam
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif

From a16f09b10cd976bf739a5678a7b70b80bbd7846e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 14 Feb 2023 22:00:52 +0100
Subject: [PATCH 067/348] ENH: refine resizing of zero-sized
 DynamicList/DynamicField

- since List is being used to manage the storage content for
  DynamicList, it needs to free old memory for zero-sized lists first.

  Consider this case (slightly exaggerated):

      line 0:  DynamicList<label> list;
      line 1:  list.reserve(100000);
      line 2:  list.reserve(200000);

  After line 0:
     - list has size=0, capacity=0 and data=nullptr

  After line 1:
     - list has size=0, capacity=1e+5 and data != nullptr

  After line 2:
     - list has size=0, capacity=2e+5 and data != nullptr

  ---

  The internal resizing associated with line 1 corresponds to what the
  List resize would naturally do. Namely allocate new storage, copy/move
  any overlapping elements (in this case none) before freeing the old
  storage and replacing with new storage.

  Applying the same resizing logic for line 2 means, however, that the
  old memory (1e5) and new memory (2e5) are temporarily both
  accessible - leading to an unnecessary memory peak.

  Now: if there is no overlap, just remove old memory first.
---
 src/OpenFOAM/containers/Lists/List/List.C | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 7286e7054f..55ea1f56a5 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -46,12 +46,25 @@ void Foam::List<T>::doResize(const label len)
     if (len > 0)
     {
         // With sign-check to avoid spurious -Walloc-size-larger-than
-        T* nv = new T[len];
-
         const label overlap = min(this->size_, len);
 
-        if (overlap)
+        if (!overlap)
         {
+            // Can discard old content before allocating new storage.
+            // - when used as storage for DynamicList, it is possible to have
+            //   a zero-sized List with a non-null data pointer.
+
+            if (this->v_) delete[] this->v_;
+            this->size_ = len;
+            this->v_ = new T[len];
+        }
+        else
+        {
+            // Recover old (overlapping) content when resizing
+
+            T* nv = new T[len];
+
+            // ie, std::copy(this->v_, this->v_ + overlap, nv);
             #ifdef USEMEMCPY
             if (is_contiguous<T>::value)
             {
@@ -69,11 +82,11 @@ void Foam::List<T>::doResize(const label len)
                     nv[i] = std::move(vp[i]);
                 }
             }
-        }
 
-        clear();
-        this->size_ = len;
-        this->v_ = nv;
+            delete[] this->v_;
+            this->size_ = len;
+            this->v_ = nv;
+        }
     }
     else
     {

From 83740ad408a000eaf2ccf94ee99c546ce9e5befc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 13 Feb 2023 12:01:51 +0100
Subject: [PATCH 068/348] ENH: avoid clearStorage for persistent PstreamBuffers

- added persistent buffer for zoneDistribute
- additional handling for clearing buffers
---
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 126 ++++++++++++------
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |  25 ++--
 .../polyMesh/globalMeshData/globalPoints.C    |   3 +
 .../fvMesh/zoneDistribute/zoneDistribute.C    |  22 +--
 .../fvMesh/zoneDistribute/zoneDistribute.H    |   5 +-
 .../fvMesh/zoneDistribute/zoneDistributeI.H   |  12 +-
 .../field/DMD/DMDModels/derived/STDMD/STDMD.C |   2 +
 .../algorithms/MeshWave/FaceCellWaveBase.C    |   5 +-
 .../PointEdgeWave/PointEdgeWaveBase.C         |   5 +-
 9 files changed, 131 insertions(+), 74 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index 1979e80374..b3286dac5f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -34,7 +34,6 @@ License
 void Foam::PstreamBuffers::finalExchange
 (
     const bool wait,
-    const bool needSizes,
     labelList& recvSizes
 )
 {
@@ -44,36 +43,7 @@ void Foam::PstreamBuffers::finalExchange
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
-        if
-        (
-            wait
-         && UPstream::parRun()
-         && UPstream::nProcsNonblockingExchange > 1
-         && UPstream::nProcsNonblockingExchange <= nProcs()
-        )
-        {
-            Pstream::exchangeConsensus<DynamicList<char>, char>
-            (
-                sendBuffers_,
-                recvBuffers_,
-                (tag_ + 314159),  // some unique tag?
-                comm_
-            );
-
-            // Copy back out
-            if (needSizes)
-            {
-                recvSizes.resize_nocopy(recvBuffers_.size());
-                forAll(recvBuffers_, proci)
-                {
-                    recvSizes[proci] = recvBuffers_[proci].size();
-                }
-            }
-
-            return;
-        }
-
-        // all-to-all
+        // Dense storage uses all-to-all
         Pstream::exchangeSizes(sendBuffers_, recvSizes, comm_);
 
         Pstream::exchange<DynamicList<char>, char>
@@ -94,7 +64,6 @@ void Foam::PstreamBuffers::finalExchange
     const labelUList& sendProcs,
     const labelUList& recvProcs,
     const bool wait,
-    const bool needSizes, // unused
     labelList& recvSizes
 )
 {
@@ -139,6 +108,37 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
     // but that is used for overlapping send/recv (eg, overset)
     finishedSendsCalled_ = true;
 
+    if (isGather)
+    {
+        // gather mode (all-to-one)
+
+        if (UPstream::master(comm_))
+        {
+            // Master: has no sends
+            clearSends();
+        }
+        else
+        {
+            // Non-master: only sends to master [0]
+
+            for (label proci=1; proci < sendBuffers_.size(); ++proci)
+            {
+                sendBuffers_[proci].clear();
+            }
+        }
+    }
+    else
+    {
+        // scatter mode (one-to-all)
+
+        if (!UPstream::master(comm_))
+        {
+            // Non-master: has no sends
+            clearSends();
+        }
+    }
+
+
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
         if (isGather)
@@ -216,7 +216,7 @@ Foam::PstreamBuffers::PstreamBuffers
 Foam::PstreamBuffers::~PstreamBuffers()
 {
     // Check that all data has been consumed.
-    forAll(recvPositions_, proci)
+    forAll(recvBuffers_, proci)
     {
         const label pos = recvPositions_[proci];
         const label len = recvBuffers_[proci].size();
@@ -260,22 +260,39 @@ Foam::label& Foam::PstreamBuffers::accessRecvPosition(const label proci)
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::PstreamBuffers::clear()
+void Foam::PstreamBuffers::clearSends()
 {
     for (DynamicList<char>& buf : sendBuffers_)
     {
         buf.clear();
     }
+}
+
+
+void Foam::PstreamBuffers::clearRecvs()
+{
     for (DynamicList<char>& buf : recvBuffers_)
     {
         buf.clear();
     }
     recvPositions_ = Zero;
+}
 
+
+void Foam::PstreamBuffers::clear()
+{
+    clearSends();
+    clearRecvs();
     finishedSendsCalled_ = false;
 }
 
 
+void Foam::PstreamBuffers::clearSend(const label proci)
+{
+    sendBuffers_[proci].clear();
+}
+
+
 void Foam::PstreamBuffers::clearRecv(const label proci)
 {
     recvBuffers_[proci].clear();
@@ -318,7 +335,7 @@ bool Foam::PstreamBuffers::hasRecvData() const
 {
     if (finishedSendsCalled_)
     {
-        forAll(recvPositions_, proci)
+        forAll(recvBuffers_, proci)
         {
             if (recvPositions_[proci] < recvBuffers_[proci].size())
             {
@@ -373,7 +390,7 @@ Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 
     if (finishedSendsCalled_)
     {
-        forAll(recvPositions_, proci)
+        forAll(recvBuffers_, proci)
         {
             const label len(recvBuffers_[proci].size() - recvPositions_[proci]);
 
@@ -401,11 +418,11 @@ Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount(const label proci) const
 
     if (finishedSendsCalled_)
     {
-        forAll(recvPositions_, i)
+        forAll(recvBuffers_, idx)
         {
-            if (i != proci)
+            const label len(recvBuffers_[idx].size() - recvPositions_[idx]);
+            if (idx != proci)
             {
-                const label len(recvBuffers_[i].size() - recvPositions_[i]);
                 maxLen = max(maxLen, len);
             }
         }
@@ -447,7 +464,7 @@ Foam::PstreamBuffers::peekRecvData(const label proci) const
         {
             return UList<char>
             (
-                const_cast<char*>(recvBuffers_[proci].cdata()) + pos,
+                const_cast<char*>(recvBuffers_[proci].cbegin(pos)),
                 (len - pos)
             );
         }
@@ -475,7 +492,7 @@ bool Foam::PstreamBuffers::allowClearRecv(bool on) noexcept
 void Foam::PstreamBuffers::finishedSends(const bool wait)
 {
     labelList recvSizes;
-    finalExchange(wait, false, recvSizes);
+    finalExchange(wait, recvSizes);
 }
 
 
@@ -485,7 +502,7 @@ void Foam::PstreamBuffers::finishedSends
     const bool wait
 )
 {
-    finalExchange(wait, true, recvSizes);
+    finalExchange(wait, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -509,7 +526,7 @@ void Foam::PstreamBuffers::finishedSends
 )
 {
     labelList recvSizes;
-    finalExchange(sendProcs, recvProcs, wait, false, recvSizes);
+    finalExchange(sendProcs, recvProcs, wait, recvSizes);
 }
 
 
@@ -521,7 +538,7 @@ void Foam::PstreamBuffers::finishedSends
     const bool wait
 )
 {
-    finalExchange(sendProcs, recvProcs, wait, true, recvSizes);
+    finalExchange(sendProcs, recvProcs, wait, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -605,6 +622,27 @@ bool Foam::PstreamBuffers::finishedSends
 }
 
 
+void Foam::PstreamBuffers::finishedNeighbourSends
+(
+    const labelUList& neighProcs,
+    labelList& recvSizes,
+    const bool wait
+)
+{
+    finishedSends(neighProcs, neighProcs, recvSizes, wait);
+}
+
+
+void Foam::PstreamBuffers::finishedNeighbourSends
+(
+    const labelUList& neighProcs,
+    const bool wait
+)
+{
+    finishedSends(neighProcs, neighProcs, wait);
+}
+
+
 void Foam::PstreamBuffers::finishedGathers(const bool wait)
 {
     labelList recvSizes;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index c3912569c9..05efab023b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -160,7 +160,6 @@ class PstreamBuffers
         void finalExchange
         (
             const bool wait,
-            const bool needSizes,   // If recvSizes needed or scratch
             labelList& recvSizes
         );
 
@@ -172,7 +171,6 @@ class PstreamBuffers
             const labelUList& sendProcs,
             const labelUList& recvProcs,
             const bool wait,
-            const bool needSizes,   // If recvSizes needed or scratch
             labelList& recvSizes
         );
 
@@ -354,15 +352,24 @@ public:
 
     // Edit
 
-        //- Clear individual buffers and reset states.
+        //- Clear all send/recv buffers and reset states.
         //  Does not remove the buffer storage.
         void clear();
 
+        //- Clear all send buffers (does not remove buffer storage)
+        void clearSends();
+
+        //- Clear all recv buffer and positions (does not remove buffer storage)
+        void clearRecvs();
+
+        //- Clear an individual send buffer (eg, data not required)
+        void clearSend(const label proci);
+
         //- Clear an individual receive buffer (eg, data not required)
         //  Does not remove the buffer storage.
         void clearRecv(const label proci);
 
-        //- Clear individual buffer storage and reset states.
+        //- Clear storage for all send/recv buffers and reset states.
         void clearStorage();
 
         //- Change allowClearRecv, return previous value
@@ -458,10 +465,7 @@ public:
         (
             const labelUList& neighProcs,
             const bool wait = true
-        )
-        {
-            finishedSends(neighProcs, neighProcs, wait);
-        }
+        );
 
         //- Mark sends as done using subset of send/recv ranks
         //- and recover the sizes (bytes) received.
@@ -478,10 +482,7 @@ public:
             const labelUList& neighProcs,
             labelList& recvSizes,
             const bool wait = true
-        )
-        {
-            finishedSends(neighProcs, neighProcs, recvSizes, wait);
-        }
+        );
 
 
     // Gather/scatter modes
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 5466f41130..e357bf5b22 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -903,6 +903,9 @@ void Foam::globalPoints::calculateSharedPoints
         )
     );
 
+    // Don't clear storage on persistent buffer
+    pBufs.allowClearRecv(false);
+
     // Do one exchange iteration to get neighbour points.
     {
         pBufs.clear();
diff --git a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C
index 89a0e372a4..c2064396d5 100644
--- a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C
+++ b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 DLR
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,8 +43,12 @@ Foam::zoneDistribute::zoneDistribute(const fvMesh& mesh)
     MeshObject<fvMesh, Foam::TopologicalMeshObject, zoneDistribute>(mesh),
     stencil_(zoneCPCStencil::New(mesh)),
     globalNumbering_(stencil_.globalNumbering()),
-    send_(UPstream::nProcs())
-{}
+    send_(UPstream::nProcs()),
+    pBufs_(UPstream::commsTypes::nonBlocking)
+{
+    // Don't clear storage on persistent buffer
+    pBufs_.allowClearRecv(false);
+}
 
 
 // * * * * * * * * * * * * * * * * Selectors  * * * * * * * * * * * * * * //
@@ -108,27 +112,27 @@ void Foam::zoneDistribute::setUpCommforZone
         // Stream the send data into PstreamBuffers,
         // which we also use to track the current topology.
 
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        pBufs_.clear();
 
         for (const int proci : UPstream::allProcs())
         {
             if (proci != UPstream::myProcNo() && !needed[proci].empty())
             {
                 // Serialize as List
-                UOPstream toProc(proci, pBufs);
+                UOPstream toProc(proci, pBufs_);
                 toProc << needed[proci].sortedToc();
             }
         }
 
-        pBufs.finishedSends(sendConnections_, sendProcs_, recvProcs_);
+        pBufs_.finishedSends(sendConnections_, sendProcs_, recvProcs_);
 
-        for (const int proci : pBufs.allProcs())
+        for (const int proci : pBufs_.allProcs())
         {
             send_[proci].clear();
 
-            if (proci != UPstream::myProcNo() && pBufs.recvDataCount(proci))
+            if (proci != UPstream::myProcNo() && pBufs_.recvDataCount(proci))
             {
-                UIPstream fromProc(proci, pBufs);
+                UIPstream fromProc(proci, pBufs_);
                 fromProc >> send_[proci];
             }
         }
diff --git a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.H b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.H
index 4a58c8445f..3b0e182a58 100644
--- a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.H
+++ b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 DLR
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,6 +102,9 @@ class zoneDistribute
         //- Parallel [cache]: recv data from these ranks
         DynamicList<label> recvProcs_;
 
+        //- Persistent set of exchange buffers
+        PstreamBuffers pBufs_;
+
 
     // Private Member Functions
 
diff --git a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H
index e82f33b4e5..32261eee49 100644
--- a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H
+++ b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H
@@ -173,7 +173,7 @@ Foam::Map<Type> Foam::zoneDistribute::getDatafromOtherProc
         // Stream the send data into PstreamBuffers,
         // which we also use to track the current topology.
 
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        pBufs_.clear();
 
         for (const int proci : UPstream::allProcs())
         {
@@ -191,18 +191,18 @@ Foam::Map<Type> Foam::zoneDistribute::getDatafromOtherProc
                     );
                 }
 
-                UOPstream toProc(proci, pBufs);
+                UOPstream toProc(proci, pBufs_);
                 toProc << sendValues;
             }
         }
 
-        pBufs.finishedSends(sendConnections_, sendProcs_, recvProcs_);
+        pBufs_.finishedSends(sendConnections_, sendProcs_, recvProcs_);
 
-        for (const int proci : pBufs.allProcs())
+        for (const int proci : pBufs_.allProcs())
         {
-            if (proci != UPstream::myProcNo() && pBufs.recvDataCount(proci))
+            if (proci != UPstream::myProcNo() && pBufs_.recvDataCount(proci))
             {
-                UIPstream fromProc(proci, pBufs);
+                UIPstream fromProc(proci, pBufs_);
                 Map<Type> tmpValues(fromProc);
 
                 neiValues += tmpValues;
diff --git a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
index 206f7025d0..f80669e29b 100644
--- a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
+++ b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
@@ -226,7 +226,9 @@ reducedKoopmanOperator()
         // Tests revealed that the distribution of "Q" does not affect
         // the final outcome of TSQR decomposition up to sign
 
+        // Don't clear storage on persistent buffer
         PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        pBufs.allowClearRecv(false);
 
         const label myProcNo = Pstream::myProcNo();
         const label procNoInSubset = myProcNo % nAgglomerationProcs_;
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C b/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C
index 9cbeb1e675..d40dbcc365 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWaveBase.C
@@ -59,7 +59,10 @@ Foam::FaceCellWaveBase::FaceCellWaveBase
     changedCells_(mesh_.nCells()),
     nUnvisitedFaces_(mesh_.nFaces()),
     nUnvisitedCells_(mesh_.nCells())
-{}
+{
+    // Don't clear storage on persistent buffer
+    pBufs_.allowClearRecv(false);
+}
 
 
 // ************************************************************************* //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C
index 2b67798974..044647f776 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWaveBase.C
@@ -57,7 +57,10 @@ Foam::PointEdgeWaveBase::PointEdgeWaveBase
     changedEdges_(mesh_.nEdges()),
     nUnvisitedPoints_(mesh_.nPoints()),
     nUnvisitedEdges_(mesh_.nEdges())
-{}
+{
+    // Don't clear storage on persistent buffer
+    pBufs_.allowClearRecv(false);
+}
 
 
 // ************************************************************************* //

From b6af124b80733287c9bfa0c639de193c3cc8675e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Feb 2023 20:49:44 +0100
Subject: [PATCH 069/348] ENH: add Pstream chunked transfer detail

- to service both List and Map exchanges with limited message sizes
  (termed 'data chunking' here) add a PstreamDetail for walking and
  dispatching.  Like other Detail components, the API is subject
  to (possibly breaking) changes in the future at any time.

  The regular exchangeBuf detail has this type of signature:

  PstreamDetail::exchangeBuf
  (
      const UList<std::pair<int, stdFoam::span<const Type>>>& sends,
      const UList<std::pair<int, stdFoam::span<Type>>>& recvs,
      ...
  )

    Where [rank, span] is the tuple pack.

  The basic idea is to pre-process the send/receive buffers and
  marshall them into a flat list of [rank, span] tuples.

  The originating buffers could be any type of container (List or Map)
  which is then marshalled into this given sequence that can be
  processed in source-agnostic fashion.

  If data chunking is required (when UPstream::maxCommsSize > 0)
  it is possible to make a cheap copy of the rank/address information
  and then walk different slices or views.

ENH: replace private static methods with PstreamDetail functions

- simpler to update locally.
---
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  | 141 ++---
 .../db/IOstreams/Pstreams/PstreamExchange.C   | 565 +++++++++++-------
 .../Pstreams/PstreamExchangeConsensus.C       |  12 -
 3 files changed, 397 insertions(+), 321 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 4a293d80bf..07399cf3bd 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -63,42 +63,6 @@ class Pstream
 :
     public UPstream
 {
-   // Private Static Functions
-
-        //- Exchange \em contiguous data.
-        //- Sends sendBufs, receives into recvBufs.
-        //  Data provided and received as container.
-        //
-        // No internal guards or resizing.
-        template<class Container, class T>
-        static void exchangeContainer
-        (
-            const UList<Container>& sendBufs,
-            const labelUList& recvSizes,  //!< Num of recv elements (not bytes)
-            List<Container>& recvBufs,
-            const int tag,
-            const label comm,
-            const bool wait               //!< Wait for requests to complete
-        );
-
-        //- Exchange \em contiguous data.
-        //- Sends sendBufs, receives into recvBufs.
-        //  Data provided and received as pointers.
-        //
-        // No internal guards or resizing.
-        template<class T>
-        static void exchangeBuf
-        (
-            const labelUList& sendSizes,  //!< Num of send elements (not bytes)
-            const UList<const char*>& sendBufs,
-            const labelUList& recvSizes,  //!< Num of recv elements (not bytes)
-            List<char*>& recvBufs,
-            const int tag,
-            const label comm,
-            const bool wait               //!< Wait for requests to complete
-        );
-
-
 protected:
 
     // Protected Data
@@ -504,62 +468,62 @@ public:
             );
 
 
-        // Exchange
+    // Exchange
 
-            //- Helper: exchange sizes of sendData for specified
-            //- set of send/receive processes.
-            template<class Container>
-            static void exchangeSizes
-            (
-                const labelUList& sendProcs,
-                const labelUList& recvProcs,
-                const Container& sendData,
-                labelList& sizes,
-                const label tag = UPstream::msgType(),
-                const label comm = UPstream::worldComm
-            );
+        //- Helper: exchange sizes of sendBufs for specified
+        //- set of send/receive processes.
+        template<class Container>
+        static void exchangeSizes
+        (
+            const labelUList& sendProcs,
+            const labelUList& recvProcs,
+            const Container& sendBufs,
+            labelList& sizes,
+            const label tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
+        );
 
-            //- Helper: exchange sizes of sendData.
-            //- The sendData is the data per processor (in the communicator).
-            //  Returns sizes of sendData on the sending processor.
-            //  \n
-            //  For \b non-parallel : copy sizes from sendData directly.
-            template<class Container>
-            static void exchangeSizes
-            (
-                const Container& sendData,
-                labelList& sizes,
-                const label comm = UPstream::worldComm
-            );
+        //- Helper: exchange sizes of sendBufs.
+        //- The sendBufs is the data per processor (in the communicator).
+        //  Returns sizes of sendBufs on the sending processor.
+        //  \n
+        //  For \b non-parallel : copy sizes from sendBufs directly.
+        template<class Container>
+        static void exchangeSizes
+        (
+            const Container& sendBufs,
+            labelList& recvSizes,
+            const label comm = UPstream::worldComm
+        );
 
+        //- Helper: exchange \em contiguous data.
+        //- Sends sendBufs, receives into recvBufs using predetermined receive
+        //- sizing.
+        //  If wait=true will wait for all transfers to finish.
+        template<class Container, class Type>
+        static void exchange
+        (
+            const UList<Container>& sendBufs,
+            const labelUList& recvSizes,
+            List<Container>& recvBufs,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            const bool wait = true  //!< Wait for requests to complete
+        );
 
-            //- Helper: exchange \em contiguous data.
-            //- Sends sendData, receives into recvData.
-            //  If wait=true will wait for all transfers to finish.
-            template<class Container, class Type>
-            static void exchange
-            (
-                const UList<Container>& sendData,
-                const labelUList& recvSizes,
-                List<Container>& recvData,
-                const int tag = UPstream::msgType(),
-                const label comm = UPstream::worldComm,
-                const bool wait = true  //!< Wait for requests to complete
-            );
-
-            //- Exchange \em contiguous data.
-            //- Sends sendData, receives into recvData.
-            //- Determines sizes to receive.
-            //  If wait=true will wait for all transfers to finish.
-            template<class Container, class Type>
-            static void exchange
-            (
-                const UList<Container>& sendData,
-                List<Container>& recvData,
-                const int tag = UPstream::msgType(),
-                const label comm = UPstream::worldComm,
-                const bool wait = true  //!< Wait for requests to complete
-            );
+        //- Exchange \em contiguous data.
+        //- Sends sendBufs, receives into recvBufs.
+        //- Determines sizes to receive.
+        //  If wait=true will wait for all transfers to finish.
+        template<class Container, class Type>
+        static void exchange
+        (
+            const UList<Container>& sendBufs,
+            List<Container>& recvBufs,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            const bool wait = true  //!< Wait for requests to complete
+        );
 
 
     // Non-blocking exchange
@@ -636,7 +600,6 @@ public:
     #include "PstreamGather.C"
     #include "PstreamCombineGather.C"
     #include "PstreamGatherList.C"
-    #include "PstreamExchangeConsensus.C"
     #include "PstreamExchange.C"
 #endif
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index 5e4aa2130f..9979998a8c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,43 +24,300 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Exchange data.
-
 \*---------------------------------------------------------------------------*/
 
 #include "Pstream.H"
 #include "contiguous.H"
 #include "PstreamReduceOps.H"
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * Details * * * * * * * * * * * * * * * * //
 
+namespace Foam
+{
+namespace PstreamDetail
+{
+
+//- Setup sends and receives, each specified as [rank, span] tuple
+//  The serial list of tuples can be populated from other lists, from maps
+//  of data or subsets of lists/maps etc.
+template<class Type>
+void exchangeBuf
+(
+    const UList<std::pair<int, stdFoam::span<const Type>>>& sends,
+    const UList<std::pair<int, stdFoam::span<Type>>>& recvs,
+
+    const int tag,
+    const label comm,
+    const bool wait
+)
+{
+    const label startOfRequests = UPstream::nRequests();
+    const int myProci = UPstream::myProcNo(comm);
+
+    // Set up receives
+    // ~~~~~~~~~~~~~~~
+
+    for (auto& slot : recvs)
+    {
+        // [rank, span]
+        const auto proci = slot.first;
+        auto& payload = slot.second;
+
+        if (proci != myProci && !payload.empty())
+        {
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                proci,
+                payload.data_bytes(),
+                payload.size_bytes(),
+                tag,
+                comm
+            );
+        }
+    }
+
+    // Set up sends
+    // ~~~~~~~~~~~~
+
+    for (const auto& slot : sends)
+    {
+        // [rank, span]
+        const auto proci = slot.first;
+        const auto& payload = slot.second;
+
+        if (proci != myProci && !payload.empty())
+        {
+            if
+            (
+               !UOPstream::write
+                (
+                    UPstream::commsTypes::nonBlocking,
+                    proci,
+                    payload.cdata_bytes(),
+                    payload.size_bytes(),
+                    tag,
+                    comm
+                )
+            )
+            {
+                FatalErrorInFunction
+                    << "Cannot send outgoing message to:"
+                    << proci << " nBytes:"
+                    << label(payload.size_bytes())
+                    << Foam::abort(FatalError);
+            }
+        }
+    }
+
+    // Wait for all to finish
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    if (wait)
+    {
+        UPstream::waitRequests(startOfRequests);
+    }
+}
+
+
+//- Chunked exchange of \em contiguous data.
+//- Setup sends and receives, each specified as [rank, span] tuple.
+//  The serial list of tuples can be populated from other lists, from
+//  maps of data or subsets of lists/maps etc.
+template<class Type>
+void exchangeChunkedBuf
+(
+    const UList<std::pair<int, stdFoam::span<const Type>>>& sends,
+    const UList<std::pair<int, stdFoam::span<Type>>>& recvs,
+
+    const int tag,
+    const label comm,
+    const bool wait
+)
+{
+    typedef std::pair<int, stdFoam::span<const Type>> sendTuple;
+    typedef std::pair<int, stdFoam::span<Type>> recvTuple;
+
+    // Caller already checked for parRun and maxChunkSize > 0
+
+    {
+        // Determine the number of chunks to send. Note that we
+        // only have to look at the sending data since we are
+        // guaranteed that some processor's sending size is some other
+        // processor's receive size. Also we can ignore any local comms.
+        //
+        // We need to send chunks so the number of iterations:
+        //  maxChunkSize                        iterations
+        //  ------------                        ----------
+        //  0                                   0
+        //  1..maxChunkSize                     1
+        //  maxChunkSize+1..2*maxChunkSize      2
+        //  ...
+
+        const label maxChunkSize =
+        (
+            max
+            (
+                static_cast<label>(1),
+                static_cast<label>(UPstream::maxCommsSize/sizeof(Type))
+            )
+        );
+
+        const int myProci = UPstream::myProcNo(comm);
+
+        label nChunks(0);
+        {
+            // Get max send count (elements)
+            auto maxCount = static_cast<stdFoam::span<char>::size_type>(0);
+
+            for (const auto& slot : sends)
+            {
+                // [rank, span]
+                const auto proci = slot.first;
+                const auto count = slot.second.size();
+
+                if (proci != myProci)
+                {
+                    maxCount = max(maxCount, count);
+                }
+            }
+
+            // Convert from send count (elements) to number of chunks.
+            // Can normally calculate with (count-1), but add some safety
+            if (maxCount)
+            {
+                nChunks = 1 + label(maxCount/maxChunkSize);
+            }
+
+            // MPI reduce (message tag is irrelevant)
+            reduce(nChunks, maxOp<label>(), UPstream::msgType(), comm);
+        }
+
+
+        // Dispatch the exchanges chunk-wise
+        List<sendTuple> sendChunks(sends);
+        List<recvTuple> recvChunks(recvs);
+
+        // Dispatch
+        for (label iter = 0; iter < nChunks; ++iter)
+        {
+            // The begin/end for the data window
+            const auto beg = static_cast<std::size_t>(iter*maxChunkSize);
+            const auto end = static_cast<std::size_t>((iter+1)*maxChunkSize);
+
+            forAll(sendChunks, sloti)
+            {
+                const auto& baseline = sends[sloti].second;
+                auto& payload = sendChunks[sloti].second;
+
+                // Window the data
+                if (beg < baseline.size())
+                {
+                    payload =
+                    (
+                        (end < baseline.size())
+                      ? baseline.subspan(beg, end - beg)
+                      : baseline.subspan(beg)
+                    );
+                }
+                else
+                {
+                    payload = baseline.first(0);  // zero-sized
+                }
+            }
+
+            forAll(recvChunks, sloti)
+            {
+                const auto& baseline = recvs[sloti].second;
+                auto& payload = recvChunks[sloti].second;
+
+                // Window the data
+                if (beg < baseline.size())
+                {
+                    payload =
+                    (
+                        (end < baseline.size())
+                      ? baseline.subspan(beg, end - beg)
+                      : baseline.subspan(beg)
+                    );
+                }
+                else
+                {
+                    payload = baseline.first(0);  // zero-sized
+                }
+            }
+
+
+            // Exchange data chunks
+            PstreamDetail::exchangeBuf<Type>
+            (
+                sendChunks,
+                recvChunks,
+                tag,
+                comm,
+                wait
+            );
+
+            // Debugging output - can report on master only...
+            #if 0 // ifdef Foam_PstreamExchange_debug_chunks
+            do
+            {
+                labelList sendStarts(sends.size());
+                labelList sendCounts(sends.size());
+
+                forAll(sendChunks, sloti)
+                {
+                    const auto& baseline = sends[sloti].second;
+                    const auto& payload = sendChunks[sloti].second;
+
+                    sendStarts[sloti] = (payload.data() - baseline.data());
+                    sendCounts[sloti] = (payload.size());
+                }
+
+                Info<< "iter " << iter
+                    << ": beg=" << flatOutput(sendStarts)
+                    << " len=" << flatOutput(sendCounts) << endl;
+            } while (false);
+            #endif
+        }
+    }
+}
+
+
+//- Exchange \em contiguous data using point-to-point communication.
+//- Sends sendBufs, receives into recvBufs.
+//  Data provided and received as container all of which have been
+//  properly sized before calling
+//
+// No internal guards or resizing.
 template<class Container, class Type>
-void Foam::Pstream::exchangeContainer
+void exchangeContainer
 (
     const UList<Container>& sendBufs,
-    const labelUList& recvSizes,
-    List<Container>& recvBufs,
+    UList<Container>& recvBufs,
     const int tag,
     const label comm,
-    const bool wait
+    const bool wait               //!< Wait for requests to complete
 )
 {
     const label startOfRequests = UPstream::nRequests();
+    const label myProci = UPstream::myProcNo(comm);
 
     // Set up receives
     // ~~~~~~~~~~~~~~~
 
-    forAll(recvSizes, proci)
+    forAll(recvBufs, proci)
     {
-        if (proci != Pstream::myProcNo(comm) && recvSizes[proci] > 0)
+        auto& recvData = recvBufs[proci];
+
+        if (proci != myProci && !recvData.empty())
         {
             UIPstream::read
             (
                 UPstream::commsTypes::nonBlocking,
                 proci,
-                recvBufs[proci].data_bytes(),
-                recvSizes[proci]*sizeof(Type),
+                recvData.data_bytes(),
+                recvData.size_bytes(),
                 tag,
                 comm
             );
@@ -73,7 +330,9 @@ void Foam::Pstream::exchangeContainer
 
     forAll(sendBufs, proci)
     {
-        if (proci != Pstream::myProcNo(comm) && sendBufs[proci].size() > 0)
+        const auto& sendData = sendBufs[proci];
+
+        if (proci != myProci && !sendData.empty())
         {
             if
             (
@@ -81,8 +340,8 @@ void Foam::Pstream::exchangeContainer
                 (
                     UPstream::commsTypes::nonBlocking,
                     proci,
-                    sendBufs[proci].cdata_bytes(),
-                    sendBufs[proci].size_bytes(),
+                    sendData.cdata_bytes(),
+                    sendData.size_bytes(),
                     tag,
                     comm
                 )
@@ -91,13 +350,12 @@ void Foam::Pstream::exchangeContainer
                 FatalErrorInFunction
                     << "Cannot send outgoing message. "
                     << "to:" << proci << " nBytes:"
-                    << label(sendBufs[proci].size_bytes())
+                    << label(sendData.size_bytes())
                     << Foam::abort(FatalError);
             }
         }
     }
 
-
     // Wait for all to finish
     // ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -108,79 +366,12 @@ void Foam::Pstream::exchangeContainer
 }
 
 
-template<class Type>
-void Foam::Pstream::exchangeBuf
-(
-    const labelUList& sendSizes,
-    const UList<const char*>& sendBufs,
-    const labelUList& recvSizes,
-    List<char*>& recvBufs,
-    const int tag,
-    const label comm,
-    const bool wait
-)
-{
-    const label startOfRequests = UPstream::nRequests();
+} // namespace PstreamDetail
+} // namespace Foam
 
-    // Set up receives
-    // ~~~~~~~~~~~~~~~
-
-    forAll(recvSizes, proci)
-    {
-        if (proci != Pstream::myProcNo(comm) && recvSizes[proci] > 0)
-        {
-            UIPstream::read
-            (
-                UPstream::commsTypes::nonBlocking,
-                proci,
-                recvBufs[proci],
-                recvSizes[proci]*sizeof(Type),
-                tag,
-                comm
-            );
-        }
-    }
-
-
-    // Set up sends
-    // ~~~~~~~~~~~~
-
-    forAll(sendBufs, proci)
-    {
-        if (proci != Pstream::myProcNo(comm) && sendSizes[proci] > 0)
-        {
-            if
-            (
-               !UOPstream::write
-                (
-                    UPstream::commsTypes::nonBlocking,
-                    proci,
-                    sendBufs[proci],
-                    sendSizes[proci]*sizeof(Type),
-                    tag,
-                    comm
-                )
-            )
-            {
-                FatalErrorInFunction
-                    << "Cannot send outgoing message. "
-                    << "to:" << proci << " nBytes:"
-                    << label(sendSizes[proci]*sizeof(Type))
-                    << Foam::abort(FatalError);
-            }
-        }
-    }
-
-
-    // Wait for all to finish
-    // ~~~~~~~~~~~~~~~~~~~~~~
-
-    if (wait)
-    {
-        UPstream::waitRequests(startOfRequests);
-    }
-}
+#include "PstreamExchangeConsensus.C"
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Container, class Type>
 void Foam::Pstream::exchange
@@ -194,44 +385,46 @@ void Foam::Pstream::exchange
 )
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
-    // if (!is_contiguous<Type>::value)
-    // {
-    //     FatalErrorInFunction
-    //         << "Contiguous data only: "
-    //         << sizeof(Type) << Foam::abort(FatalError);
-    // }
 
-    if (sendBufs.size() != UPstream::nProcs(comm))
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProcs = UPstream::nProcs(comm);
+
+    if (sendBufs.size() != numProcs)
     {
         FatalErrorInFunction
             << "Size of list " << sendBufs.size()
-            << " does not equal the number of processors "
-            << UPstream::nProcs(comm)
+            << " does not equal the number of processors " << numProcs
             << Foam::abort(FatalError);
     }
 
-    recvBufs.resize_nocopy(sendBufs.size());
+    recvBufs.resize_nocopy(numProcs);
 
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && numProcs > 1)
     {
         // Presize all receive buffers
         forAll(recvSizes, proci)
         {
-            const label nRecv = recvSizes[proci];
+            const label count = recvSizes[proci];
 
-            if (proci != Pstream::myProcNo(comm) && nRecv > 0)
+            if (proci != myProci && count > 0)
             {
-                recvBufs[proci].resize_nocopy(nRecv);
+                recvBufs[proci].resize_nocopy(count);
+            }
+            else
+            {
+                recvBufs[proci].clear();
             }
         }
 
+        typedef std::pair<int, stdFoam::span<const Type>> sendTuple;
+        typedef std::pair<int, stdFoam::span<Type>> recvTuple;
+
         if (UPstream::maxCommsSize <= 0)
         {
             // Do the exchanging in one go
-            exchangeContainer<Container, Type>
+            PstreamDetail::exchangeContainer<Container, Type>
             (
                 sendBufs,
-                recvSizes,
                 recvBufs,
                 tag,
                 comm,
@@ -240,117 +433,59 @@ void Foam::Pstream::exchange
         }
         else
         {
-            // Determine the number of chunks to send. Note that we
-            // only have to look at the sending data since we are
-            // guaranteed that some processor's sending size is some other
-            // processor's receive size. Also we can ignore any local comms.
+            // Dispatch using chunk-wise exchanges
+            // Populate send sequence
+            DynamicList<sendTuple> sends(sendBufs.size());
+            forAll(sendBufs, proci)
+            {
+                const auto& sendData = sendBufs[proci];
 
-            // We need to send chunks so the number of iterations:
-            //  maxChunkSize                        iterations
-            //  ------------                        ----------
-            //  0                                   0
-            //  1..maxChunkSize                     1
-            //  maxChunkSize+1..2*maxChunkSize      2
-            //  ...
+                if (proci != myProci && !sendData.empty())
+                {
+                    sends.push_back
+                    (
+                        sendTuple
+                        (
+                            proci,
+                            { sendData.cdata(), std::size_t(sendData.size()) }
+                        )
+                    );
+                }
+            }
 
-            const label maxChunkSize
+            // Populate recv sequence
+            DynamicList<recvTuple> recvs(recvBufs.size());
+            forAll(recvBufs, proci)
+            {
+                auto& recvData = recvBufs[proci];
+
+                if (proci != myProci && !recvData.empty())
+                {
+                    recvs.push_back
+                    (
+                        recvTuple
+                        (
+                            proci,
+                            { recvData.data(), std::size_t(recvData.size()) }
+                        )
+                    );
+                }
+            }
+
+            // Exchange buffers in chunks
+            PstreamDetail::exchangeChunkedBuf<Type>
             (
-                max
-                (
-                    static_cast<label>(1),
-                    static_cast<label>(UPstream::maxCommsSize/sizeof(Type))
-                )
+                sends,
+                recvs,
+                tag,
+                comm,
+                wait
             );
-
-            label nChunks(0);
-            {
-                // Get max send count (elements)
-                forAll(sendBufs, proci)
-                {
-                    if (proci != Pstream::myProcNo(comm))
-                    {
-                        nChunks = max(nChunks, sendBufs[proci].size());
-                    }
-                }
-
-                // Convert from send count (elements) to number of chunks.
-                // Can normally calculate with (count-1), but add some safety
-                if (nChunks)
-                {
-                    nChunks = 1 + (nChunks/maxChunkSize);
-                }
-                reduce(nChunks, maxOp<label>(), tag, comm);
-            }
-
-            labelList nRecv(sendBufs.size());
-            labelList nSend(sendBufs.size());
-            labelList startRecv(sendBufs.size(), Zero);
-            labelList startSend(sendBufs.size(), Zero);
-
-            List<const char*> charPtrSend(sendBufs.size());
-            List<char*> charPtrRecv(sendBufs.size());
-
-            for (label iter = 0; iter < nChunks; ++iter)
-            {
-                forAll(sendBufs, proci)
-                {
-                    nSend[proci] = min
-                    (
-                        maxChunkSize,
-                        sendBufs[proci].size()-startSend[proci]
-                    );
-                    nRecv[proci] = min
-                    (
-                        maxChunkSize,
-                        recvBufs[proci].size()-startRecv[proci]
-                    );
-
-                    charPtrSend[proci] =
-                    (
-                        nSend[proci] > 0
-                      ? reinterpret_cast<const char*>
-                        (
-                            &(sendBufs[proci][startSend[proci]])
-                        )
-                      : nullptr
-                    );
-                    charPtrRecv[proci] =
-                    (
-                        nRecv[proci] > 0
-                      ? reinterpret_cast<char*>
-                        (
-                            &(recvBufs[proci][startRecv[proci]])
-                        )
-                      : nullptr
-                    );
-                }
-
-                // Info<< "iter " << iter
-                //     << ": beg=" << flatOutput(startSend)
-                //     << " len=" << flatOutput(nSend) << endl;
-
-                exchangeBuf<Type>
-                (
-                    nSend,
-                    charPtrSend,
-                    nRecv,
-                    charPtrRecv,
-                    tag,
-                    comm,
-                    wait
-                );
-
-                forAll(nSend, proci)
-                {
-                    startSend[proci] += nSend[proci];
-                    startRecv[proci] += nRecv[proci];
-                }
-            }
         }
     }
 
     // Do myself
-    recvBufs[Pstream::myProcNo(comm)] = sendBufs[Pstream::myProcNo(comm)];
+    recvBufs[myProci] = sendBufs[myProci];
 }
 
 
@@ -365,6 +500,8 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
+    //const label myProci = UPstream::myProcNo(comm);
+
     if (sendBufs.size() != UPstream::nProcs(comm))
     {
         FatalErrorInFunction
@@ -415,18 +552,6 @@ void Foam::Pstream::exchangeSizes
 }
 
 
-// FUTURE?
-// template<class Container>
-// void Foam::Pstream::exchangeSizes
-// (
-//     const labelUList& neighProcs,
-//     const Container& sendBufs,
-//     labelList& recvSizes,
-//     const label tag,
-//     const label comm
-// );
-
-
 // Sparse sending
 template<class Container>
 void Foam::Pstream::exchangeSizes
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
index 0cf30fd437..4132e9bbd8 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
@@ -51,12 +51,6 @@ void Foam::Pstream::exchangeConsensus
 )
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
-    // if (!is_contiguous<Type>::value)
-    // {
-    //     FatalErrorInFunction
-    //         << "Contiguous data only." << sizeof(Type)
-    //         << Foam::abort(FatalError);
-    // }
 
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
@@ -201,12 +195,6 @@ void Foam::Pstream::exchangeConsensus
 )
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
-    // if (!is_contiguous<Type>::value)
-    // {
-    //     FatalErrorInFunction
-    //         << "Contiguous data only." << sizeof(Type)
-    //         << Foam::abort(FatalError);
-    // }
 
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);

From 1ce7a62209aeedf21adc1be673042648504288f6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Feb 2023 21:03:43 +0100
Subject: [PATCH 070/348] ENH: Pstream::exchange with Map<Container> data

- dynamic sparse data exchange using Map to hold data and sizes.

  Still uses the personalised exchange paradigm, but with non-blocking
  consensus exchange to obtain the sizes and regular point-to-point
  for the data exchange itself. This avoids an all-to-all but still
  keeps the point-to-point for overlapping communication, data
  chunking etc.
---
 .../parallel-chunks/Test-parallel-chunks.C    |  31 ++
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |  70 +++--
 .../db/IOstreams/Pstreams/PstreamExchange.C   | 288 ++++++++++++++++--
 3 files changed, 348 insertions(+), 41 deletions(-)

diff --git a/applications/test/parallel-chunks/Test-parallel-chunks.C b/applications/test/parallel-chunks/Test-parallel-chunks.C
index cbb372298f..b5181bccec 100644
--- a/applications/test/parallel-chunks/Test-parallel-chunks.C
+++ b/applications/test/parallel-chunks/Test-parallel-chunks.C
@@ -32,6 +32,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#define Foam_PstreamExchange_debug_chunks
+
 #include "List.H"
 #include "argList.H"
 #include "Time.H"
@@ -371,6 +373,7 @@ int main(int argc, char *argv[])
     }
 
     // Manually
+    Info<< "perform list exchange" << endl;
     {
         labelListList sendBufs(UPstream::nProcs());
         labelListList recvBufs(UPstream::nProcs());
@@ -397,6 +400,34 @@ int main(int argc, char *argv[])
         );
     }
 
+
+    Info<< "perform Map exchange" << endl;
+    {
+        Map<labelList> sendBufs;
+        Map<labelList> recvBufs;
+        Map<label> recvSizes;
+
+        if (Pstream::master())
+        {
+            for (const int proci : Pstream::allProcs())
+            {
+                if (proci != Pstream::myProcNo())
+                {
+                    sendBufs(proci) = identity(500);
+                }
+            }
+        }
+
+        Pstream::exchangeSizes(sendBufs, recvSizes);
+
+        Pstream::exchange<labelList, label>
+        (
+            sendBufs,
+            recvSizes,
+            recvBufs
+        );
+    }
+
     Info<< "End\n" << endl;
     return 0;
 }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 07399cf3bd..c0865f2ce2 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -496,6 +496,27 @@ public:
             const label comm = UPstream::worldComm
         );
 
+        //- Exchange the \b non-zero sizes of sendBufs entries (sparse map)
+        //- with other ranks in the communicator
+        //- using non-blocking consensus exchange.
+        //
+        //  Since the recvData map always cleared before receipt and sizes
+        //  of zero are never transmitted, a simple check
+        //  of its keys is sufficient to determine connectivity.
+        //
+        //  For \b non-parallel : copy size of rank (if it exists and non-empty)
+        //  from sendBufs to recvSizes.
+        //
+        //  \note The message tag is adjusted internally to improve uniqueness
+        template<class Container>
+        static void exchangeSizes
+        (
+            const Map<Container>& sendBufs,
+            Map<label>& recvSizes,
+            const label tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
+        );
+
         //- Helper: exchange \em contiguous data.
         //- Sends sendBufs, receives into recvBufs using predetermined receive
         //- sizing.
@@ -511,6 +532,22 @@ public:
             const bool wait = true  //!< Wait for requests to complete
         );
 
+        //- Exchange \em contiguous data.
+        //- Sends sendBufs, receives into recvBufs.
+        //  Data provided and received as container.
+        //
+        // No internal guards or resizing.
+        template<class Container, class Type>
+        static void exchange
+        (
+            const Map<Container>& sendBufs,
+            const Map<label>& recvSizes,  //!< Num of recv elements (not bytes)
+            Map<Container>& recvBufs,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            const bool wait = true  //!< Wait for requests to complete
+        );
+
         //- Exchange \em contiguous data.
         //- Sends sendBufs, receives into recvBufs.
         //- Determines sizes to receive.
@@ -525,30 +562,23 @@ public:
             const bool wait = true  //!< Wait for requests to complete
         );
 
-
-    // Non-blocking exchange
-
-        //- Exchange the \b non-zero sizes of sendBufs entries (sparse map)
-        //- with all ranks in the communicator
-        //- using non-blocking consensus exchange.
-        //
-        //  Since the recvData map always cleared before receipt and sizes
-        //  of zero are never transmitted, a simple check
-        //  of its keys is sufficient to determine connectivity.
-        //
-        //  For \b non-parallel : copy size of rank (if it exists and non-empty)
-        //  from sendBufs to recvSizes.
-        //
-        //  \note The message tag is adjusted internally to improve uniqueness
-        template<class Container>
-        static void exchangeSizes
+        //- Exchange \em contiguous data.
+        //- Sends sendBufs, receives into recvBufs.
+        //- Determines sizes to receive.
+        //  If wait=true will wait for all transfers to finish.
+        template<class Container, class Type>
+        static void exchange
         (
             const Map<Container>& sendBufs,
-            Map<label>& recvSizes,
-            const label tag = UPstream::msgType(),
-            const label comm = UPstream::worldComm
+            Map<Container>& recvBufs,
+            const int tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm,
+            const bool wait = true  //!< Wait for requests to complete
         );
 
+
+    // Non-blocking exchange
+
         //- Exchange \em contiguous data using non-blocking consensus
         //- Sends sendData, receives into recvData.
         //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index 9979998a8c..f98d47334c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -366,6 +366,89 @@ void exchangeContainer
 }
 
 
+//- Exchange \em contiguous data using point-to-point communication.
+//- Sends sendBufs, receives into recvBufs.
+//  Data provided and received as container all of which have been
+//  properly sized before calling
+//
+// No internal guards or resizing.
+template<class Container, class Type>
+void exchangeContainer
+(
+    const Map<Container>& sendBufs,
+    Map<Container>& recvBufs,
+    const int tag,
+    const label comm,
+    const bool wait               //!< Wait for requests to complete
+)
+{
+    const label startOfRequests = UPstream::nRequests();
+    const label myProci = UPstream::myProcNo(comm);
+
+    // Set up receives
+    // ~~~~~~~~~~~~~~~
+
+    forAllIters(recvBufs, iter)
+    {
+        const label proci = iter.key();
+        auto& recvData = iter.val();
+
+        if (proci != myProci && !recvData.empty())
+        {
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                proci,
+                recvData.data_bytes(),
+                recvData.size_bytes(),
+                tag,
+                comm
+            );
+        }
+    }
+
+
+    // Set up sends
+    // ~~~~~~~~~~~~
+
+    forAllConstIters(sendBufs, iter)
+    {
+        const label proci = iter.key();
+        const auto& sendData = iter.val();
+
+        if (proci != myProci && !sendData.empty())
+        {
+            if
+            (
+               !UOPstream::write
+                (
+                    UPstream::commsTypes::nonBlocking,
+                    proci,
+                    sendData.cdata_bytes(),
+                    sendData.size_bytes(),
+                    tag,
+                    comm
+                )
+            )
+            {
+                FatalErrorInFunction
+                    << "Cannot send outgoing message to:"
+                    << proci << " nBytes:"
+                    << label(sendData.size_bytes())
+                    << Foam::abort(FatalError);
+            }
+        }
+    }
+
+    // Wait for all to finish
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    if (wait)
+    {
+        UPstream::waitRequests(startOfRequests);
+    }
+}
+
 } // namespace PstreamDetail
 } // namespace Foam
 
@@ -489,6 +572,169 @@ void Foam::Pstream::exchange
 }
 
 
+template<class Container, class Type>
+void Foam::Pstream::exchange
+(
+    const Map<Container>& sendBufs,
+    const Map<label>& recvSizes,
+    Map<Container>& recvBufs,
+    const int tag,
+    const label comm,
+    const bool wait
+)
+{
+    static_assert(is_contiguous<Type>::value, "Contiguous data only!");
+
+    const int myProci = UPstream::myProcNo(comm);
+    const label numProcs = UPstream::nProcs(comm);
+
+    // Initial: clear out receive 'slots'
+    // Preferrable to clear out the map entries instead of the map itself
+    // since this can potentially preserve allocated space
+    // (eg DynamicList entries) between calls
+
+    forAllIters(recvBufs, iter)
+    {
+        iter.val().clear();
+    }
+
+    if (UPstream::parRun() && numProcs > 1)
+    {
+        // Presize all receive buffers
+        forAllIters(recvSizes, iter)
+        {
+            const label proci = iter.key();
+            const label count = iter.val();
+
+            if (proci != myProci && count > 0)
+            {
+                recvBufs(proci).resize_nocopy(count);
+            }
+        }
+
+        // Define the exchange sequences as a flattened list.
+        // We add an additional step of ordering the send/recv list
+        // by message size, which can help with transfer speeds.
+
+        typedef std::pair<int, stdFoam::span<const Type>> sendTuple;
+        typedef std::pair<int, stdFoam::span<Type>> recvTuple;
+
+        // Populate send sequences
+        DynamicList<sendTuple> sends(sendBufs.size());
+        forAllConstIters(sendBufs, iter)
+        {
+            const auto proci = iter.key();
+            const auto& sendData = iter.val();
+
+            if (proci != myProci && !sendData.empty())
+            {
+                sends.push_back
+                (
+                    sendTuple
+                    (
+                        proci,
+                        { sendData.cdata(), std::size_t(sendData.size()) }
+                    )
+                );
+            }
+        }
+
+        // Shorter messages first
+        std::sort
+        (
+            sends.begin(),
+            sends.end(),
+            [=](const sendTuple& a, const sendTuple& b)
+            {
+                return (a.second.size() < b.second.size());
+            }
+        );
+
+        // Populate recv sequences
+        DynamicList<recvTuple> recvs(recvBufs.size());
+        forAllIters(recvBufs, iter)
+        {
+            const auto proci = iter.key();
+            auto& recvData = recvBufs[proci];
+
+            if (proci != myProci && !recvData.empty())
+            {
+                recvs.push_back
+                (
+                    recvTuple
+                    (
+                        proci,
+                        { recvData.data(), std::size_t(recvData.size()) }
+                    )
+                );
+            }
+        }
+
+        // Shorter messages first
+        std::sort
+        (
+            recvs.begin(),
+            recvs.end(),
+            [=](const recvTuple& a, const recvTuple& b)
+            {
+                return (a.second.size() < b.second.size());
+            }
+        );
+
+
+        if (UPstream::maxCommsSize <= 0)
+        {
+            // Do the exchanging in a single go
+            PstreamDetail::exchangeBuf<Type>
+            (
+                sends,
+                recvs,
+                tag,
+                comm,
+                wait
+            );
+        }
+        else
+        {
+            // Exchange buffers in chunks
+            PstreamDetail::exchangeChunkedBuf<Type>
+            (
+                sends,
+                recvs,
+                tag,
+                comm,
+                wait
+            );
+        }
+    }
+
+
+    // Do myself
+    {
+        const auto iter = sendBufs.find(myProci);
+
+        bool needsCopy = iter.good();
+
+        if (needsCopy)
+        {
+            const auto& sendData = iter.val();
+
+            needsCopy = !sendData.empty();
+            if (needsCopy)
+            {
+                // insert_or_assign
+                recvBufs(myProci) = sendData;
+            }
+        }
+
+        if (!needsCopy)
+        {
+            recvBufs.erase(myProci);
+        }
+    }
+}
+
+
 template<class Container>
 void Foam::Pstream::exchangeSizes
 (
@@ -643,29 +889,9 @@ void Foam::Pstream::exchange
     const bool wait
 )
 {
-    if
-    (
-        wait
-     && UPstream::parRun()
-     && UPstream::nProcsNonblockingExchange > 1
-     && UPstream::nProcsNonblockingExchange <= UPstream::nProcs(comm)
-    )
-    {
-        // Use algorithm NBX: Nonblocking Consensus Exchange
-
-        Pstream::exchangeConsensus<Container, Type>
-        (
-            sendBufs,
-            recvBufs,
-            (tag + 314159),  // some unique tag?
-            comm
-        );
-        return;
-    }
-
     // Algorithm PEX: Personalized Exchange
     // - Step 1: each process writes the data sizes to each peer and
-    //   redistributes the vector (eg, MPI_Alltoall)
+    //   redistributes the vector (eg, MPI_Alltoall or non-blocking consensus)
     // - Step 2: size receive buffers and setup receives for all
     //   non-zero sendcounts. Post all sends and wait.
 
@@ -676,4 +902,24 @@ void Foam::Pstream::exchange
 }
 
 
+template<class Container, class Type>
+void Foam::Pstream::exchange
+(
+    const Map<Container>& sendBufs,
+    Map<Container>& recvBufs,
+    const int tag,
+    const label comm,
+    const bool wait
+)
+{
+    // Algorithm PEX: Personalized Exchange
+    // but using nonblocking consensus exchange for the sizes
+
+    Map<label> recvSizes;
+    exchangeSizes(sendBufs, recvSizes, tag, comm);
+
+    exchange<Container, Type>(sendBufs, recvSizes, recvBufs, tag, comm, wait);
+}
+
+
 // ************************************************************************* //

From fb69a54bc309f5893e2bb49de4741749b8d51c0e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 14 Feb 2023 11:24:22 +0100
Subject: [PATCH 071/348] ENH: avoid prior communication when using
 mapDistribute

- in most cases can simply construct mapDistribute with the sendMap
  and have it take care of communication and addressing for the
  corresponding constructMap.

  This removes code duplication, which in some cases was also using
  much less efficient mechanisms (eg, combineReduce on list of
  lists, or an allGatherList on the send sizes etc) and also
  reduces the number of places where Pstream::exchange/exchangeSizes
  is being called.

ENH: reduce communication in turbulentDFSEMInlet

- was doing an allGatherList to populate a mapDistribute.
  Now simply use PstreamBuffers mechanisms directly.
---
 applications/test/parallel/Test-parallel.C    |  46 +----
 .../DelaunayMesh/DistributedDelaunayMesh.C    |  45 +----
 .../backgroundMeshDecomposition.C             |  45 +----
 .../parLagrangianDistributor.C                |  36 ++--
 .../turbulentDFSEMInletFvPatchVectorField.C   | 105 +++---------
 .../basic/InteractionLists/InteractionLists.C |  47 +-----
 .../advancingFrontAMIParallelOps.C            |  43 +----
 .../nearestFaceAMI/nearestFaceAMI.C           |   1 -
 src/meshTools/processorLOD/box/box.C          |  63 +------
 src/meshTools/processorLOD/box/box.H          |  10 --
 .../distributedTriSurfaceMesh.C               | 159 +++++-------------
 .../meshToMesh/meshToMeshParallelOps.C        |  39 +----
 12 files changed, 105 insertions(+), 534 deletions(-)

diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index b6ac4f7e28..580ae453a8 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/applications/test/parallel/Test-parallel.C
@@ -67,54 +67,24 @@ void testMapDistribute()
     labelList nSend(Pstream::nProcs(), Zero);
     forAll(complexData, i)
     {
-        const label procI = complexData[i].first();
-        nSend[procI]++;
+        const label proci = complexData[i].first();
+        nSend[proci]++;
     }
 
     // Collect items to be sent
     labelListList sendMap(Pstream::nProcs());
-    forAll(sendMap, procI)
+    forAll(sendMap, proci)
     {
-        sendMap[procI].setSize(nSend[procI]);
+        sendMap[proci].resize_nocopy(nSend[proci]);
+        nSend[proci] = 0;
     }
-    nSend = 0;
     forAll(complexData, i)
     {
-        const label procI = complexData[i].first();
-        sendMap[procI][nSend[procI]++] = i;
+        const label proci = complexData[i].first();
+        sendMap[proci][nSend[proci]++] = i;
     }
 
-    // Sync how many to send
-    labelList nRecv;
-    Pstream::exchangeSizes(sendMap, nRecv);
-
-    // Collect items to be received
-    labelListList recvMap(Pstream::nProcs());
-    forAll(recvMap, procI)
-    {
-        recvMap[procI].setSize(nRecv[procI]);
-    }
-
-    label constructSize = 0;
-    // Construct with my own elements first
-    forAll(recvMap[Pstream::myProcNo()], i)
-    {
-        recvMap[Pstream::myProcNo()][i] = constructSize++;
-    }
-    // Construct from other processors
-    forAll(recvMap, procI)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            forAll(recvMap[procI], i)
-            {
-                recvMap[procI][i] = constructSize++;
-            }
-        }
-    }
-
-    // Construct distribute map (destructively)
-    mapDistribute map(constructSize, std::move(sendMap), std::move(recvMap));
+    mapDistribute map(std::move(sendMap));
 
     // Distribute complexData
     map.distribute(complexData);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 3000cf0aed..01c14c7060 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -54,7 +54,6 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
     forAll(toProc, i)
     {
         label proci = toProc[i];
-
         nSend[proci]++;
     }
 
@@ -64,8 +63,7 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
 
     forAll(nSend, proci)
     {
-        sendMap[proci].setSize(nSend[proci]);
-
+        sendMap[proci].resize_nocopy(nSend[proci]);
         nSend[proci] = 0;
     }
 
@@ -73,49 +71,10 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
     forAll(toProc, i)
     {
         label proci = toProc[i];
-
         sendMap[proci][nSend[proci]++] = i;
     }
 
-    // 4. Send over how many I need to receive
-    labelList recvSizes;
-    Pstream::exchangeSizes(sendMap, recvSizes);
-
-
-    // Determine receive map
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList constructMap(Pstream::nProcs());
-
-    // Local transfers first
-    constructMap[Pstream::myProcNo()] = identity
-    (
-        sendMap[Pstream::myProcNo()].size()
-    );
-
-    label constructSize = constructMap[Pstream::myProcNo()].size();
-
-    forAll(constructMap, proci)
-    {
-        if (proci != Pstream::myProcNo())
-        {
-            label nRecv = recvSizes[proci];
-
-            constructMap[proci].setSize(nRecv);
-
-            for (label i = 0; i < nRecv; i++)
-            {
-                constructMap[proci][i] = constructSize++;
-            }
-        }
-    }
-
-    return autoPtr<mapDistribute>::New
-    (
-        constructSize,
-        std::move(sendMap),
-        std::move(constructMap)
-    );
+    return autoPtr<mapDistribute>::New(std::move(sendMap));
 }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index a224a42ebd..3589c67ba8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -59,7 +59,6 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
     forAll(toProc, i)
     {
         label proci = toProc[i];
-
         nSend[proci]++;
     }
 
@@ -69,8 +68,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
 
     forAll(nSend, proci)
     {
-        sendMap[proci].setSize(nSend[proci]);
-
+        sendMap[proci].resize_nocopy(nSend[proci]);
         nSend[proci] = 0;
     }
 
@@ -78,49 +76,10 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
     forAll(toProc, i)
     {
         label proci = toProc[i];
-
         sendMap[proci][nSend[proci]++] = i;
     }
 
-    // 4. Send over how many I need to receive
-    labelList recvSizes;
-    Pstream::exchangeSizes(sendMap, recvSizes);
-
-
-    // Determine receive map
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList constructMap(Pstream::nProcs());
-
-    // Local transfers first
-    constructMap[Pstream::myProcNo()] = identity
-    (
-        sendMap[Pstream::myProcNo()].size()
-    );
-
-    label constructSize = constructMap[Pstream::myProcNo()].size();
-
-    forAll(constructMap, proci)
-    {
-        if (proci != Pstream::myProcNo())
-        {
-            label nRecv = recvSizes[proci];
-
-            constructMap[proci].setSize(nRecv);
-
-            for (label i = 0; i < nRecv; i++)
-            {
-                constructMap[proci][i] = constructSize++;
-            }
-        }
-    }
-
-    return autoPtr<mapDistribute>::New
-    (
-        constructSize,
-        std::move(sendMap),
-        std::move(constructMap)
-    );
+    return autoPtr<mapDistribute>::New(std::move(sendMap));
 }
 
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
index ef20c1cec0..0b7dbb462e 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
@@ -146,7 +146,6 @@ Foam::parLagrangianDistributor::distributeLagrangianPositions
 
     labelListList subMap;
 
-
     // Allocate transfer buffers
     PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
 
@@ -283,33 +282,24 @@ Foam::parLagrangianDistributor::distributeLagrangianPositions
         lpi.rename(cloudName);
     }
 
-    // Work the send indices (subMap) into a mapDistributeBase
-    labelListList sizes(Pstream::nProcs());
-    labelList& nsTransPs = sizes[Pstream::myProcNo()];
-    nsTransPs.setSize(Pstream::nProcs());
-    forAll(subMap, sendProcI)
-    {
-        nsTransPs[sendProcI] = subMap[sendProcI].size();
-    }
-    // Send sizes across. Note: blocks.
-    Pstream::combineReduce(sizes, Pstream::listEq());
+    // Until now (FEB-2023) we have always used processor ordering for the
+    // construct map (whereas mapDistribute has local transfers first),
+    // so we'll stick with that for now, but can likely just use the subMap
+    // directly with mapDistribute and have it determine the constructMap.
+
+    labelList recvSizes;
+    Pstream::exchangeSizes(subMap, recvSizes);
 
-    labelListList constructMap(Pstream::nProcs());
     label constructSize = 0;
-    forAll(constructMap, procI)
+    labelListList constructMap(Pstream::nProcs());
+
+    forAll(constructMap, proci)
     {
-        const label nRecv = sizes[procI][UPstream::myProcNo()];
-
-        labelList& map = constructMap[procI];
-
-        map.setSize(nRecv);
-        forAll(map, i)
-        {
-            map[i] = constructSize++;
-        }
+        const label len = recvSizes[proci];
+        constructMap[proci] = identity(len, constructSize);
+        constructSize += len;
     }
 
-
     return autoPtr<mapDistributeBase>::New
     (
         constructSize,
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 8d39187889..1e7508dc47 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -450,13 +450,16 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::convectEddies
         }
     }
 
-    reduce(nRecycled, sumOp<label>());
-
-    if (debug && nRecycled > 0)
+    if (debug)
     {
-        Info<< "Patch: " << patch().patch().name()
-            << " recycled " << nRecycled << " eddies"
-            << endl;
+        reduce(nRecycled, sumOp<label>());
+
+        if (nRecycled)
+        {
+            Info<< "Patch: " << patch().patch().name()
+                << " recycled " << nRecycled << " eddies"
+                << endl;
+        }
     }
 }
 
@@ -492,11 +495,11 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::calcOverlappingProcEddies
     Pstream::allGatherList(patchBBs);
 
     // Per processor indices into all segments to send
-    List<DynamicList<label>> dynSendMap(Pstream::nProcs());
+    List<DynamicList<label>> sendMap(UPstream::nProcs());
 
+    // Collect overlapping eddies
     forAll(eddies_, i)
     {
-        // Collect overlapping eddies
         const eddy& e = eddies_[i];
 
         // Eddy bounds
@@ -505,91 +508,41 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::calcOverlappingProcEddies
         ebb.min() += x;
         ebb.max() += x;
 
-        forAll(patchBBs, procI)
+        forAll(patchBBs, proci)
         {
             // Not including intersection with local patch
-            if (procI != Pstream::myProcNo())
+            if (proci != Pstream::myProcNo())
             {
-                if (ebb.overlaps(patchBBs[procI]))
+                if (ebb.overlaps(patchBBs[proci]))
                 {
-                    dynSendMap[procI].append(i);
+                    sendMap[proci].push_back(i);
                 }
             }
         }
     }
 
-    labelListList sendMap(Pstream::nProcs());
-    forAll(sendMap, procI)
+
+    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+
+    forAll(sendMap, proci)
     {
-        sendMap[procI].transfer(dynSendMap[procI]);
-    }
-
-    // Send the number of eddies for local processors to receive
-    labelListList sendSizes(Pstream::nProcs());
-    sendSizes[Pstream::myProcNo()].setSize(Pstream::nProcs());
-    forAll(sendMap, procI)
-    {
-        sendSizes[Pstream::myProcNo()][procI] = sendMap[procI].size();
-    }
-    Pstream::allGatherList(sendSizes);
-
-    // Determine order of receiving
-    labelListList constructMap(Pstream::nProcs());
-
-    // Local segment first
-    constructMap[Pstream::myProcNo()] = identity
-    (
-        sendMap[Pstream::myProcNo()].size()
-    );
-
-    label segmentI = constructMap[Pstream::myProcNo()].size();
-    forAll(constructMap, procI)
-    {
-        if (procI != Pstream::myProcNo())
+        if (proci != Pstream::myProcNo() && !sendMap[proci].empty())
         {
-            // What I need to receive is what other processor is sending to me
-            const label nRecv = sendSizes[procI][Pstream::myProcNo()];
-            constructMap[procI].setSize(nRecv);
+            UOPstream os(proci, pBufs);
 
-            for (label i = 0; i < nRecv; ++i)
-            {
-                constructMap[procI][i] = segmentI++;
-            }
+            os << UIndirectList<eddy>(eddies_, sendMap[proci]);
         }
     }
 
-    mapDistribute map(segmentI, std::move(sendMap), std::move(constructMap));
-
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
-
-    for (const int domain : Pstream::allProcs())
-    {
-        const labelList& sendElems = map.subMap()[domain];
-
-        if (domain != Pstream::myProcNo() && sendElems.size())
-        {
-            List<eddy> subEddies(UIndirectList<eddy>(eddies_, sendElems));
-
-            UOPstream toDomain(domain, pBufs);
-
-            toDomain<< subEddies;
-        }
-    }
-
-    // Start receiving
     pBufs.finishedSends();
 
-    // Consume
-    for (const int domain : Pstream::allProcs())
+    for (const int proci : pBufs.allProcs())
     {
-        const labelList& recvElems = map.constructMap()[domain];
-
-        if (domain != Pstream::myProcNo() && recvElems.size())
+        if (proci != Pstream::myProcNo() && pBufs.recvDataCount(proci))
         {
-            UIPstream str(domain, pBufs);
-            {
-                str >> overlappingEddies[domain];
-            }
+            UIPstream is(proci, pBufs);
+
+            is >> overlappingEddies[proci];
         }
     }
 
@@ -1001,10 +954,8 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::updateCoeffs()
             List<List<eddy>> overlappingEddies(Pstream::nProcs());
             calcOverlappingProcEddies(overlappingEddies);
 
-            forAll(overlappingEddies, procI)
+            for (const List<eddy>& eddies : overlappingEddies)
             {
-                const List<eddy>& eddies = overlappingEddies[procI];
-
                 if (eddies.size())
                 {
                     forAll(U, faceI)
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 5084b4956e..bd3ccbbd56 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -822,8 +822,7 @@ void Foam::InteractionLists<ParticleType>::buildMap
 
     forAll(nSend, proci)
     {
-        sendMap[proci].setSize(nSend[proci]);
-
+        sendMap[proci].resize_nocopy(nSend[proci]);
         nSend[proci] = 0;
     }
 
@@ -831,52 +830,10 @@ void Foam::InteractionLists<ParticleType>::buildMap
     forAll(toProc, i)
     {
         label proci = toProc[i];
-
         sendMap[proci][nSend[proci]++] = i;
     }
 
-    // 4. Send over how many I need to receive
-    labelList recvSizes;
-    Pstream::exchangeSizes(sendMap, recvSizes);
-
-
-    // Determine receive map
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList constructMap(Pstream::nProcs());
-
-    // Local transfers first
-    constructMap[Pstream::myProcNo()] = identity
-    (
-        sendMap[Pstream::myProcNo()].size()
-    );
-
-    label constructSize = constructMap[Pstream::myProcNo()].size();
-
-    forAll(constructMap, proci)
-    {
-        if (proci != Pstream::myProcNo())
-        {
-            const label nRecv = recvSizes[proci];
-
-            constructMap[proci].setSize(nRecv);
-
-            for (label i = 0; i < nRecv; i++)
-            {
-                constructMap[proci][i] = constructSize++;
-            }
-        }
-    }
-
-    mapPtr.reset
-    (
-        new mapDistribute
-        (
-            constructSize,
-            std::move(sendMap),
-            std::move(constructMap)
-        )
-    );
+    mapPtr.reset(new mapDistribute(std::move(sendMap)));
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
index f199d57314..31bad5e4d8 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
@@ -344,48 +344,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::advancingFrontAMI::calcProcMap
         }
     }
 
-
-    // Send over how many faces I need to receive
-    labelListList sendSizes(Pstream::nProcs());
-    sendSizes[Pstream::myProcNo()].setSize(Pstream::nProcs());
-    forAll(sendMap, proci)
-    {
-        sendSizes[Pstream::myProcNo()][proci] = sendMap[proci].size();
-    }
-    Pstream::allGatherList(sendSizes);
-
-
-    // Determine order of receiving
-    labelListList constructMap(Pstream::nProcs());
-
-    // My local segment first
-    constructMap[Pstream::myProcNo()] = identity
-    (
-        sendMap[Pstream::myProcNo()].size()
-    );
-
-    label segmentI = constructMap[Pstream::myProcNo()].size();
-    forAll(constructMap, proci)
-    {
-        if (proci != Pstream::myProcNo())
-        {
-            // What I need to receive is what other processor is sending to me
-            label nRecv = sendSizes[proci][Pstream::myProcNo()];
-            constructMap[proci].setSize(nRecv);
-
-            for (label i = 0; i < nRecv; ++i)
-            {
-                constructMap[proci][i] = segmentI++;
-            }
-        }
-    }
-
-    return autoPtr<mapDistribute>::New
-    (
-        segmentI, // size after construction
-        std::move(sendMap),
-        std::move(constructMap)
-    );
+    return autoPtr<mapDistribute>::New(std::move(sendMap));
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/nearestFaceAMI/nearestFaceAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/nearestFaceAMI/nearestFaceAMI.C
index d952925d3c..9b8054fa84 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/nearestFaceAMI/nearestFaceAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/nearestFaceAMI/nearestFaceAMI.C
@@ -80,7 +80,6 @@ Foam::autoPtr<Foam::mapDistribute> Foam::nearestFaceAMI::calcFaceMap
     labelListList sendMap(Pstream::nProcs());
     forAll(sendMap, proci)
     {
-        dynSendMap[proci].shrink();
         sendMap[proci].transfer(dynSendMap[proci]);
 
         if (debug)
diff --git a/src/meshTools/processorLOD/box/box.C b/src/meshTools/processorLOD/box/box.C
index c6c867f350..015acd3435 100644
--- a/src/meshTools/processorLOD/box/box.C
+++ b/src/meshTools/processorLOD/box/box.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -511,7 +511,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::processorLODs::box::createMap
                 allIDs.insert(elems);
             }
 
-            sendElems[proci] = allIDs.toc();
+            sendElems[proci] = allIDs.sortedToc();
         }
     }
 
@@ -530,59 +530,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::processorLODs::box::createMap
         }
     }
 
-    return createLODMap(sendElems);
-}
-
-
-Foam::autoPtr<Foam::mapDistribute> Foam::processorLODs::box::createLODMap
-(
-    List<labelList>& sendElems
-) const
-{
-    // Send over how many objects I need to receive
-    const label localProci = Pstream::myProcNo();
-    labelListList sendSizes(Pstream::nProcs());
-    sendSizes[localProci].setSize(Pstream::nProcs());
-    forAll(sendElems, proci)
-    {
-        sendSizes[localProci][proci] = sendElems[proci].size();
-    }
-    Pstream::allGatherList(sendSizes);
-
-
-    // Determine order of receiving
-    labelListList constructMap(Pstream::nProcs());
-
-    // My local segment first
-    constructMap[localProci] = identity(sendElems[localProci].size());
-
-    label segmenti = constructMap[localProci].size();
-    forAll(constructMap, proci)
-    {
-        if (proci != localProci)
-        {
-            // What I need to receive is what other processor is sending to me
-            label nRecv = sendSizes[proci][localProci];
-            constructMap[proci].setSize(nRecv);
-
-            for (label& addr : constructMap[proci])
-            {
-                addr = segmenti++;
-            }
-        }
-    }
-
-    autoPtr<mapDistribute> mapPtr
-    (
-        new mapDistribute
-        (
-            segmenti,                   // size after construction
-            std::move(sendElems),
-            std::move(constructMap)
-        )
-    );
-
-    return mapPtr;
+    return autoPtr<mapDistribute>::New(std::move(sendElems));
 }
 
 
@@ -618,9 +566,8 @@ Foam::processorLODs::box::box
             treeBoundBox srcBb(srcPoints_);
             srcBb.inflate(0.01);
 
-            DynamicList<treeBoundBox> newProcBoxes(1);
-            newProcBoxes.append(srcBb);
-            procBoxes.transfer(newProcBoxes);
+            procBoxes.resize(1);
+            procBoxes.front() = srcBb;
         }
     }
 }
diff --git a/src/meshTools/processorLOD/box/box.H b/src/meshTools/processorLOD/box/box.H
index 55e8e3d18d..029425a23c 100644
--- a/src/meshTools/processorLOD/box/box.H
+++ b/src/meshTools/processorLOD/box/box.H
@@ -49,7 +49,6 @@ Description
 
 namespace Foam
 {
-
 namespace processorLODs
 {
 
@@ -165,12 +164,6 @@ protected:
             const label nTgtElems
         );
 
-        //- Use the current list of send elements to create the mapDistribute
-        autoPtr<mapDistribute> createLODMap
-        (
-            List<labelList>& sendElems
-        ) const;
-
 
 public:
 
@@ -195,9 +188,6 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace processorLODs
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index d81f9cba21..f68410fbd8 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -608,10 +608,9 @@ Foam::distributedTriSurfaceMesh::distributeSegments
         }
 
         // Convert dynamicList to labelList
-        sendMap.setSize(Pstream::nProcs());
+        sendMap.resize_nocopy(Pstream::nProcs());
         forAll(sendMap, proci)
         {
-            dynSendMap[proci].shrink();
             sendMap[proci].transfer(dynSendMap[proci]);
         }
 
@@ -875,14 +874,9 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
 
 
     // Pack into distribution map
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    autoPtr<mapDistribute> mapPtr(new mapDistribute(std::move(sendMap)));
-
+    auto mapPtr = autoPtr<mapDistribute>::New(std::move(sendMap));
 
     // Send over queries
-    // ~~~~~~~~~~~~~~~~~
-
     mapPtr().distribute(triangleIndex);
 
     return mapPtr;
@@ -1119,10 +1113,9 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
         }
 
         // Convert dynamicList to labelList
-        sendMap.setSize(Pstream::nProcs());
+        sendMap.resize_nocopy(Pstream::nProcs());
         forAll(sendMap, proci)
         {
-            dynSendMap[proci].shrink();
             sendMap[proci].transfer(dynSendMap[proci]);
         }
 
@@ -4198,7 +4191,7 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
         labelListList sendMap(Pstream::nProcs());
         {
             // 1. Count
-            labelList nSend(Pstream::nProcs(), 0);
+            labelList nSend(Pstream::nProcs(), Zero);
             forAll(samples, samplei)
             {
                 // Find the processors this sample overlaps.
@@ -4224,9 +4217,9 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
 
             forAll(nSend, proci)
             {
-                sendMap[proci].setSize(nSend[proci]);
+                sendMap[proci].resize_nocopy(nSend[proci]);
+                nSend[proci] = 0;
             }
-            nSend = 0;
 
             // 2. Fill
             forAll(samples, samplei)
@@ -4236,8 +4229,7 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
                 {
                     if (contains(procBb_[proci], samples[samplei]))
                     {
-                        labelList& procSend = sendMap[proci];
-                        procSend[nSend[proci]++] = samplei;
+                        sendMap[proci][nSend[proci]++] = samplei;
                     }
                 }
             }
@@ -4525,7 +4517,7 @@ Foam::distributedTriSurfaceMesh::localQueries
     // cheap we do a multi-pass algorithm to save some memory temporarily.
 
     // 1. Count
-    labelList nSend(Pstream::nProcs(), 0);
+    labelList nSend(Pstream::nProcs(), Zero);
 
     forAll(info, i)
     {
@@ -4540,7 +4532,7 @@ Foam::distributedTriSurfaceMesh::localQueries
     labelListList sendMap(Pstream::nProcs());
     forAll(nSend, proci)
     {
-        sendMap[proci].setSize(nSend[proci]);
+        sendMap[proci].resize_nocopy(nSend[proci]);
         nSend[proci] = 0;
     }
 
@@ -4560,65 +4552,11 @@ Foam::distributedTriSurfaceMesh::localQueries
     }
 
 
-    // Send over how many i need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList sendSizes(Pstream::nProcs());
-    sendSizes[Pstream::myProcNo()].setSize(Pstream::nProcs());
-    forAll(sendMap, proci)
-    {
-        sendSizes[Pstream::myProcNo()][proci] = sendMap[proci].size();
-    }
-    Pstream::allGatherList(sendSizes);
-
-
-    // Determine receive map
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList constructMap(Pstream::nProcs());
-
-    // My local segments first
-    constructMap[Pstream::myProcNo()] = identity
-    (
-        sendMap[Pstream::myProcNo()].size()
-    );
-
-    label segmenti = constructMap[Pstream::myProcNo()].size();
-    forAll(constructMap, proci)
-    {
-        if (proci != Pstream::myProcNo())
-        {
-            // What i need to receive is what other processor is sending to me.
-            label nRecv = sendSizes[proci][Pstream::myProcNo()];
-            constructMap[proci].setSize(nRecv);
-
-            for (label i = 0; i < nRecv; i++)
-            {
-                constructMap[proci][i] = segmenti++;
-            }
-        }
-    }
-
-
     // Pack into distribution map
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    autoPtr<mapDistribute> mapPtr
-    (
-        new mapDistribute
-        (
-            segmenti, // size after construction
-            std::move(sendMap),
-            std::move(constructMap)
-        )
-    );
-    const mapDistribute& map = mapPtr();
-
+    auto mapPtr = autoPtr<mapDistribute>::New(std::move(sendMap));
 
     // Send over queries
-    // ~~~~~~~~~~~~~~~~~
-
-    map.distribute(triangleIndex);
+    mapPtr().distribute(triangleIndex);
 
     return mapPtr;
 }
@@ -4770,13 +4708,6 @@ void Foam::distributedTriSurfaceMesh::distribute
     }
 
 
-    // Send over how many faces/points i need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelList faceRecvSizes;
-    Pstream::exchangeSizes(faceSendMap, faceRecvSizes);
-
-
     // Exchange surfaces
     // ~~~~~~~~~~~~~~~~~
 
@@ -4821,61 +4752,55 @@ void Foam::distributedTriSurfaceMesh::distribute
     // Send all
     // ~~~~~~~~
 
-    PstreamBuffers pBufs(Pstream::defaultCommsType);
+    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
     forAll(faceSendMap, proci)
     {
-        if (proci != Pstream::myProcNo())
+        if (proci != Pstream::myProcNo() && !faceSendMap[proci].empty())
         {
-            if (faceSendMap[proci].size() > 0)
-            {
-                UOPstream str(proci, pBufs);
+            UOPstream os(proci, pBufs);
 
-                labelList pointMap;
-                triSurface subSurface
+            labelList pointMap;
+            triSurface subSurface
+            (
+                subsetMesh
                 (
-                    subsetMesh
-                    (
-                        *this,
-                        faceSendMap[proci],
-                        pointMap
-                    )
-                );
-                str << subSurface;
-            }
+                    *this,
+                    faceSendMap[proci],
+                    pointMap
+                )
+            );
+            os << subSurface;
         }
     }
 
-    pBufs.finishedSends();   // no-op for blocking
+    pBufs.finishedSends();
 
 
     // Receive and merge all
     // ~~~~~~~~~~~~~~~~~~~~~
 
-    forAll(faceRecvSizes, proci)
+    for (const int proci : pBufs.allProcs())
     {
-        if (proci != Pstream::myProcNo())
+        if (proci != Pstream::myProcNo() && pBufs.recvDataCount(proci))
         {
-            if (faceRecvSizes[proci] > 0)
-            {
-                UIPstream str(proci, pBufs);
+            UIPstream is(proci, pBufs);
 
-                // Receive
-                triSurface subSurface(str);
+            // Receive
+            triSurface subSurface(is);
 
-                // Merge into allSurf
-                merge
-                (
-                    mergeDist_,
-                    subSurface,
-                    subSurface.points(),
+            // Merge into allSurf
+            merge
+            (
+                mergeDist_,
+                subSurface,
+                subSurface.points(),
 
-                    allTris,
-                    allPoints,
-                    faceConstructMap[proci],
-                    pointConstructMap[proci]
-                );
-            }
+                allTris,
+                allPoints,
+                faceConstructMap[proci],
+                pointConstructMap[proci]
+            );
         }
     }
 
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index a07a5ea347..180290a469 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -232,42 +232,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
                 }
             }
 
-
-            // send over how many tgt cells I need to receive from each
-            // processor
-            labelListList sendSizes(Pstream::nProcs());
-            sendSizes[Pstream::myProcNo()].resize(Pstream::nProcs());
-            forAll(sendMap, proci)
-            {
-                sendSizes[Pstream::myProcNo()][proci] = sendMap[proci].size();
-            }
-            Pstream::allGatherList(sendSizes);
-
-
-            // determine order of receiving
-            labelListList constructMap(Pstream::nProcs());
-
-            label segmentI = 0;
-            forAll(constructMap, proci)
-            {
-                // what I need to receive is what other processor is sending
-                // to me
-                label nRecv = sendSizes[proci][Pstream::myProcNo()];
-                constructMap[proci].setSize(nRecv);
-
-                for (label i = 0; i < nRecv; i++)
-                {
-                    constructMap[proci][i] = segmentI++;
-                }
-            }
-
-            return autoPtr<mapDistribute>::New
-            (
-                segmentI,       // size after construction
-                std::move(sendMap),
-                std::move(constructMap)
-            );
-
+            return autoPtr<mapDistribute>::New(std::move(sendMap));
             break;
         }
     }

From f215ad15d1769017b419c9170c92df690eb8cebd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 14 Feb 2023 20:50:53 +0100
Subject: [PATCH 072/348] ENH: skip zero data sends via PstreamBuffers

- in several cases can use the PstreamBuffers recvDataCount(proci)
  on the receiving part of the logic
---
 .../polyMesh/globalMeshData/globalPoints.C    | 65 +++++++++++------
 .../polyMesh/syncTools/syncToolsTemplates.C   | 56 +++++++++++----
 .../constraint/processor/processorFaPatch.C   |  4 +-
 .../fvMesh/fvMeshSubset/fvMeshSubset.C        | 13 ++--
 .../RecycleInteraction/RecycleInteraction.C   | 12 ++--
 .../advancingFrontAMIParallelOps.C            | 72 +++++++++----------
 .../algorithms/MeshWave/FaceCellWave.C        | 45 +++++++-----
 .../algorithms/PointEdgeWave/PointEdgeWave.C  | 42 +++++++----
 src/meshTools/processorLOD/box/box.C          |  6 +-
 .../inverseDistanceCellCellStencil.C          | 23 +++---
 .../trackingInverseDistanceCellCellStencil.C  | 22 +++---
 11 files changed, 210 insertions(+), 150 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index e357bf5b22..50443ca893 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -487,6 +487,18 @@ void Foam::globalPoints::sendPatchPoints
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
     const labelPairList& patchInfo = globalTransforms_.patchTransformSign();
 
+    // Information to send:
+
+    // The patch face
+    DynamicList<label> patchFaces;
+
+    // Index in patch face
+    DynamicList<label> indexInFace;
+
+    // All information I currently hold about the patchPoint
+    DynamicList<labelPairList> allInfo;
+
+
     forAll(patches, patchi)
     {
         const polyPatch& pp = patches[patchi];
@@ -500,17 +512,17 @@ void Foam::globalPoints::sendPatchPoints
          && (mergeSeparated || patchInfo[patchi].first() == -1)
         )
         {
-            const processorPolyPatch& procPatch =
-                refCast<const processorPolyPatch>(pp);
+            const auto& procPatch = refCast<const processorPolyPatch>(pp);
+            const label nbrProci = procPatch.neighbProcNo();
 
-            // Information to send:
-            // patch face
-            DynamicList<label> patchFaces(pp.nPoints());
-            // index in patch face
-            DynamicList<label> indexInFace(pp.nPoints());
-            // all information I currently hold about this patchPoint
-            DynamicList<labelPairList> allInfo(pp.nPoints());
+            patchFaces.clear();
+            patchFaces.reserve(pp.nPoints());
 
+            indexInFace.clear();
+            indexInFace.reserve(pp.nPoints());
+
+            allInfo.clear();
+            allInfo.reserve(pp.nPoints());
 
             // Now collect information on all points mentioned in
             // changedPoints. Note that these points only should occur on
@@ -548,16 +560,20 @@ void Foam::globalPoints::sendPatchPoints
                 }
             }
 
-            // Send to neighbour
-            if (debug)
-            {
-                Pout<< " Sending from " << pp.name() << " to "
-                    << procPatch.neighbProcNo() << "   point information:"
-                    << patchFaces.size() << endl;
-            }
 
-            UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
-            toNeighbour << patchFaces << indexInFace << allInfo;
+            if (!patchFaces.empty())
+            {
+                // Send to neighbour
+                if (debug)
+                {
+                    Pout<< " Sending from " << pp.name() << " to proc:"
+                        << nbrProci << " point information:"
+                        << patchFaces.size() << endl;
+                }
+
+                UOPstream toNeighbour(nbrProci, pBufs);
+                toNeighbour << patchFaces << indexInFace << allInfo;
+            }
         }
     }
 }
@@ -594,15 +610,20 @@ void Foam::globalPoints::receivePatchPoints
          && (mergeSeparated || patchInfo[patchi].first() == -1)
         )
         {
-            const processorPolyPatch& procPatch =
-                refCast<const processorPolyPatch>(pp);
+            const auto& procPatch = refCast<const processorPolyPatch>(pp);
+            const label nbrProci = procPatch.neighbProcNo();
+
+            if (!pBufs.recvDataCount(nbrProci))
+            {
+                continue;
+            }
 
             labelList patchFaces;
             labelList indexInFace;
             List<labelPairList> nbrInfo;
 
             {
-                UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
+                UIPstream fromNeighbour(nbrProci, pBufs);
                 fromNeighbour >> patchFaces >> indexInFace >> nbrInfo;
             }
 
@@ -610,7 +631,7 @@ void Foam::globalPoints::receivePatchPoints
             {
                 Pout<< " On " << pp.name()
                     << " Received from "
-                    << procPatch.neighbProcNo() << "   point information:"
+                    << nbrProci << "   point information:"
                     << patchFaces.size() << endl;
             }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 1db719cc37..ac4015a8ec 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -140,6 +140,8 @@ void Foam::syncTools::syncPointMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
+                neighbProcs.append(nbrProci);
+
                 // Get data per patchPoint in neighbouring point numbers.
 
                 const labelList& meshPts = procPatch.meshPoints();
@@ -159,15 +161,18 @@ void Foam::syncTools::syncPointMap
                     }
                 }
 
-                neighbProcs.append(nbrProci);
-                UOPstream toNbr(nbrProci, pBufs);
-                toNbr << patchInfo;
+                if (!patchInfo.empty())
+                {
+                    UOPstream toNbr(nbrProci, pBufs);
+                    toNbr << patchInfo;
+                }
             }
         }
 
         // Limit exchange to involved procs
         pBufs.finishedNeighbourSends(neighbProcs);
 
+
         // Receive and combine.
         for (const polyPatch& pp : patches)
         {
@@ -178,8 +183,16 @@ void Foam::syncTools::syncPointMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                UIPstream fromNbr(nbrProci, pBufs);
-                Map<T> nbrPatchInfo(fromNbr);
+                if (!pBufs.recvDataCount(nbrProci))
+                {
+                    continue;
+                }
+
+                Map<T> nbrPatchInfo(0);
+                {
+                    UIPstream fromNbr(nbrProci, pBufs);
+                    fromNbr >> nbrPatchInfo;
+                }
 
                 // Transform
                 top(procPatch, nbrPatchInfo);
@@ -383,6 +396,8 @@ void Foam::syncTools::syncEdgeMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
+                neighbProcs.append(nbrProci);
+
                 // Get data per patch edge in neighbouring edge.
 
                 const edgeList& edges = procPatch.edges();
@@ -404,9 +419,11 @@ void Foam::syncTools::syncEdgeMap
                     }
                 }
 
-                neighbProcs.append(nbrProci);
-                UOPstream toNbr(nbrProci, pBufs);
-                toNbr << patchInfo;
+                if (!patchInfo.empty())
+                {
+                    UOPstream toNbr(nbrProci, pBufs);
+                    toNbr << patchInfo;
+                }
             }
         }
 
@@ -422,10 +439,16 @@ void Foam::syncTools::syncEdgeMap
             if (ppp && pp.nEdges())
             {
                 const auto& procPatch = *ppp;
+                const label nbrProci = procPatch.neighbProcNo();
 
-                EdgeMap<T> nbrPatchInfo;
+                if (!pBufs.recvDataCount(nbrProci))
                 {
-                    UIPstream fromNbr(procPatch.neighbProcNo(), pBufs);
+                    continue;
+                }
+
+                EdgeMap<T> nbrPatchInfo(0);
+                {
+                    UIPstream fromNbr(nbrProci, pBufs);
                     fromNbr >> nbrPatchInfo;
                 }
 
@@ -1115,6 +1138,8 @@ void Foam::syncTools::syncBoundaryFaceList
                     const auto& procPatch = *ppp;
                     const label nbrProci = procPatch.neighbProcNo();
 
+                    neighbProcs.append(nbrProci);
+
                     const SubList<T> fld
                     (
                         faceValues,
@@ -1122,7 +1147,6 @@ void Foam::syncTools::syncBoundaryFaceList
                         pp.start()-boundaryOffset
                     );
 
-                    neighbProcs.append(nbrProci);
                     UOPstream toNbr(nbrProci, pBufs);
                     toNbr << fld;
                 }
@@ -1140,11 +1164,13 @@ void Foam::syncTools::syncBoundaryFaceList
                 if (ppp && pp.size())
                 {
                     const auto& procPatch = *ppp;
+                    const label nbrProci = procPatch.neighbProcNo();
 
-                    List<T> recvFld(pp.size());
-
-                    UIPstream fromNbr(procPatch.neighbProcNo(), pBufs);
-                    fromNbr >> recvFld;
+                    List<T> recvFld;
+                    {
+                        UIPstream fromNbr(nbrProci, pBufs);
+                        fromNbr >> recvFld;
+                    }
 
                     top(procPatch, recvFld);
 
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index df278c6005..05da85691f 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -318,8 +318,8 @@ void Foam::processorFaPatch::updateMesh(PstreamBuffers& pBufs)
 
     if (Pstream::parRun())
     {
-        labelList nbrPatchEdge(nPoints());
-        labelList nbrIndexInEdge(nPoints());
+        labelList nbrPatchEdge;
+        labelList nbrIndexInEdge;
 
         {
             // Note cannot predict exact size since edgeList not (yet) sent as
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 3dba1abcd6..c31af3cca9 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -185,17 +185,13 @@ void Foam::fvMeshSubset::doCoupledPatches
             {
                 const label nbrProci = procPatch->neighbProcNo();
 
-                UOPstream toNeighbour(nbrProci, pBufs);
-
                 if (!nCellsUsingFace.empty())
                 {
+                    UOPstream toNeighbour(nbrProci, pBufs);
+
                     toNeighbour <<
                         SubList<label>(nCellsUsingFace, pp.size(), pp.start());
                 }
-                else
-                {
-                    toNeighbour << labelList();
-                }
             }
         }
 
@@ -210,6 +206,11 @@ void Foam::fvMeshSubset::doCoupledPatches
             {
                 const label nbrProci = procPatch->neighbProcNo();
 
+                if (!pBufs.recvDataCount(nbrProci))
+                {
+                    continue;
+                }
+
                 UIPstream fromNeighbour(nbrProci, pBufs);
 
                 const labelList nbrList(fromNeighbour);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C
index 59c16af5e1..18d415733f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C
@@ -246,11 +246,13 @@ void Foam::RecycleInteraction<CloudType>::postEvolve()
 
         pBufs.finishedSends();
 
-        if (!returnReduceOr(pBufs.hasRecvData()))
-        {
-            // No parcels to recycle
-            return;
-        }
+        // Not looping, so no early exit needed
+        //
+        // if (!returnReduceOr(pBufs.hasRecvData()))
+        // {
+        //     // No parcels to recycle
+        //     return;
+        // }
 
         // Retrieve from receive buffers
         for (const int proci : pBufs.allProcs())
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
index 31bad5e4d8..48f64ec658 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
@@ -74,20 +74,28 @@ void Foam::advancingFrontAMI::distributePatches
     List<labelList>& faceIDs
 ) const
 {
+    faces.resize_nocopy(Pstream::nProcs());
+    points.resize_nocopy(Pstream::nProcs());
+    faceIDs.resize_nocopy(Pstream::nProcs());
+
+
     PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
 
     for (const int domain : Pstream::allProcs())
     {
         const labelList& sendElems = map.subMap()[domain];
 
-        if (domain != Pstream::myProcNo() && sendElems.size())
+        if (sendElems.empty())
+        {
+            // Safety
+            faces[domain].clear();
+            points[domain].clear();
+            faceIDs[domain].clear();
+        }
+        else
         {
             faceList subFaces(UIndirectList<face>(pp, sendElems));
-            primitivePatch subPatch
-            (
-                SubList<face>(subFaces),
-                pp.points()
-            );
+            primitivePatch subPatch(SubList<face>(subFaces), pp.points());
 
             if (debug & 2)
             {
@@ -95,42 +103,28 @@ void Foam::advancingFrontAMI::distributePatches
                     << " sending faces " << subPatch.faceCentres() << endl;
             }
 
-            UOPstream toDomain(domain, pBufs);
-            toDomain
-                << subPatch.localFaces() << subPatch.localPoints()
-                << gi.toGlobal(sendElems);
+
+            if (domain == Pstream::myProcNo())
+            {
+                // Do send/receive for myself
+                faces[domain] = subPatch.localFaces();
+                points[domain] = subPatch.localPoints();
+                faceIDs[domain] = gi.toGlobal(sendElems);
+            }
+            else
+            {
+                // Normal send
+                UOPstream str(domain, pBufs);
+                str
+                    << subPatch.localFaces()
+                    << subPatch.localPoints()
+                    << gi.toGlobal(sendElems);
+            }
         }
     }
 
-    // Start receiving
     pBufs.finishedSends();
 
-    faces.setSize(Pstream::nProcs());
-    points.setSize(Pstream::nProcs());
-    faceIDs.setSize(Pstream::nProcs());
-
-    {
-        // Set up 'send' to myself
-        const labelList& sendElems = map.subMap()[Pstream::myProcNo()];
-        faceList subFaces(UIndirectList<face>(pp, sendElems));
-        primitivePatch subPatch
-        (
-            SubList<face>(subFaces),
-            pp.points()
-        );
-
-        // Receive
-        if (debug & 2)
-        {
-            Pout<< "distributePatches: to processor " << Pstream::myProcNo()
-                << " sending faces " << subPatch.faceCentres() << endl;
-        }
-
-        faces[Pstream::myProcNo()] = subPatch.localFaces();
-        points[Pstream::myProcNo()] = subPatch.localPoints();
-        faceIDs[Pstream::myProcNo()] = gi.toGlobal(sendElems);
-    }
-
     // Consume
     for (const int domain : Pstream::allProcs())
     {
@@ -138,9 +132,9 @@ void Foam::advancingFrontAMI::distributePatches
 
         if (domain != Pstream::myProcNo() && recvElems.size())
         {
-            UIPstream str(domain, pBufs);
+            UIPstream is(domain, pBufs);
 
-            str >> faces[domain]
+            is  >> faces[domain]
                 >> points[domain]
                 >> faceIDs[domain];
         }
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index 325f93ba94..11bdfed7b5 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -537,6 +537,8 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
         const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
+        const label nbrProci = procPatch.neighbProcNo();
+
         // Allocate buffers
         label nSendFaces;
         labelList sendFaces(procPatch.size());
@@ -561,45 +563,50 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
             sendFacesInfo
         );
 
-        if (debug & 2)
+        if (nSendFaces)
         {
-            Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
-                << " communicating with " << procPatch.neighbProcNo()
-                << "  Sending:" << nSendFaces
-                << endl;
-        }
+            if (debug & 2)
+            {
+                Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
+                    << "  send:" << nSendFaces << " to proc:" << nbrProci
+                    << endl;
+            }
 
-        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs_);
-        //writeFaces(nSendFaces, sendFaces, sendFacesInfo, toNeighbour);
-        toNeighbour
-            << SubList<label>(sendFaces, nSendFaces)
-            << SubList<Type>(sendFacesInfo, nSendFaces);
+            UOPstream os(nbrProci, pBufs_);
+            os
+                << SubList<label>(sendFaces, nSendFaces)
+                << SubList<Type>(sendFacesInfo, nSendFaces);
+        }
     }
 
     // Finished sends
     pBufs_.finishedNeighbourSends(neighbourProcs);
 
-
     for (const label patchi : procPatches)
     {
         const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
-        // Allocate buffers
+        const label nbrProci = procPatch.neighbProcNo();
+
+        if (!pBufs_.recvDataCount(nbrProci))
+        {
+            continue;
+        }
+
+
         labelList receiveFaces;
         List<Type> receiveFacesInfo;
-
         {
-            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs_);
-            fromNeighbour >> receiveFaces >> receiveFacesInfo;
+            UIPstream is(nbrProci, pBufs_);
+            is >> receiveFaces >> receiveFacesInfo;
         }
 
         if (debug & 2)
         {
             Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
-                << " communicating with " << procPatch.neighbProcNo()
-                << "  Receiving:" << receiveFaces.size()
-                << endl;
+                << "  recv:" << receiveFaces.size() << " from proci:"
+                << nbrProci << endl;
         }
 
         // Apply transform to received data for non-parallel planes
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index 215be1c467..02398a72db 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -325,6 +325,8 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
+        const label nbrProci = procPatch.neighbProcNo();
+
         patchInfo.clear();
         patchInfo.reserve(procPatch.nPoints());
         thisPoints.clear();
@@ -348,21 +350,25 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         // Adapt for leaving domain
         leaveDomain(procPatch, thisPoints, patchInfo);
 
-        //if (debug)
-        //{
-        //    Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
-        //        << " communicating with " << procPatch.neighbProcNo()
-        //        << "  Sending:" << patchInfo.size() << endl;
-        //}
+        if (patchInfo.size())
+        {
+            //if (debug & 2)
+            //{
+            //    Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
+            //        << "  send:" << patchInfo.size()
+            //        << " to proc:" << nbrProci << endl;
+            //}
 
-        UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs_);
-        toNeighbour << nbrPoints << patchInfo;
+            UOPstream os(nbrProci, pBufs_);
+            os << nbrPoints << patchInfo;
+        }
     }
 
 
     // Finished sends
     pBufs_.finishedNeighbourSends(neighbourProcs);
 
+
     //
     // 2. Receive all point info on processor patches.
     //
@@ -372,19 +378,25 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         const auto& procPatch =
             refCast<const processorPolyPatch>(mesh_.boundaryMesh()[patchi]);
 
-        List<Type> patchInfo;
-        labelList patchPoints;
+        const label nbrProci = procPatch.neighbProcNo();
 
+        if (!pBufs_.recvDataCount(nbrProci))
         {
-            UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs_);
-            fromNeighbour >> patchPoints >> patchInfo;
+            continue;
         }
 
-        //if (debug)
+        labelList patchPoints;
+        List<Type> patchInfo;
+        {
+            UIPstream is(nbrProci, pBufs_);
+            is >> patchPoints >> patchInfo;
+        }
+
+        //if (debug & 2)
         //{
         //    Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
-        //        << " communicating with " << procPatch.neighbProcNo()
-        //        << "  Received:" << patchInfo.size() << endl;
+        //        << "  recv:" << patchInfo.size() << " from proc:"
+        //        << nbrProci << endl;
         //}
 
         // Apply transform to received data for non-parallel planes
diff --git a/src/meshTools/processorLOD/box/box.C b/src/meshTools/processorLOD/box/box.C
index 015acd3435..9e2c08ba2b 100644
--- a/src/meshTools/processorLOD/box/box.C
+++ b/src/meshTools/processorLOD/box/box.C
@@ -110,7 +110,7 @@ void Foam::processorLODs::box::setRefineFlags
     // Identify src boxes that can be refined and send to all remote procs
     for (const int proci : Pstream::allProcs())
     {
-        if (proci != Pstream::myProcNo())
+        if (proci != Pstream::myProcNo() && !boxes_[proci].empty())
         {
             UOPstream toProc(proci, pBufs);
             toProc << nObjectsOfType_ << boxes_[proci] << newToOld_[proci];
@@ -123,10 +123,8 @@ void Foam::processorLODs::box::setRefineFlags
     // src boxes can/should be refined
     for (const int proci : Pstream::allProcs())
     {
-        if (proci == Pstream::myProcNo())
+        if (proci == Pstream::myProcNo() || !pBufs.recvDataCount(proci))
         {
-            // Not refining boxes I send to myself - will be sending all local
-            // elements
             continue;
         }
 
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index ea4fe54a4f..aef5b8d6ab 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -355,27 +355,26 @@ void Foam::cellCellStencils::inverseDistance::markPatchesAsHoles
     {
         if (procI != Pstream::myProcNo())
         {
-            //const treeBoundBox& srcBb = srcBbs[procI];
             const treeBoundBox& srcPatchBb = srcPatchBbs[procI];
             const treeBoundBox& tgtPatchBb = tgtPatchBbs[Pstream::myProcNo()];
 
             if (srcPatchBb.overlaps(tgtPatchBb))
             {
                 UIPstream is(procI, pBufs);
-                {
-                    treeBoundBox receivedBb(is);
-                    if (srcPatchBb != receivedBb)
-                    {
-                        FatalErrorInFunction
-                            << "proc:" << procI
-                            << " srcPatchBb:" << srcPatchBb
-                            << " receivedBb:" << receivedBb
-                            << exit(FatalError);
-                    }
-                }
+                const treeBoundBox receivedBb(is);
                 const labelVector zoneDivs(is);
                 const PackedList<2> srcPatchTypes(is);
 
+                // Verify validity
+                if (srcPatchBb != receivedBb)
+                {
+                    FatalErrorInFunction
+                        << "proc:" << procI
+                        << " srcPatchBb:" << srcPatchBb
+                        << " receivedBb:" << receivedBb
+                        << exit(FatalError);
+                }
+
                 forAll(tgtCellMap, tgtCelli)
                 {
                     label celli = tgtCellMap[tgtCelli];
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
index 3ec9093fd7..1917e31b8d 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
@@ -273,20 +273,20 @@ void Foam::cellCellStencils::trackingInverseDistance::markPatchesAsHoles
             if (srcPatchBb.overlaps(tgtPatchBb))
             {
                 UIPstream is(procI, pBufs);
-                {
-                    treeBoundBox receivedBb(is);
-                    if (srcPatchBb != receivedBb)
-                    {
-                        FatalErrorInFunction
-                            << "proc:" << procI
-                            << " srcPatchBb:" << srcPatchBb
-                            << " receivedBb:" << receivedBb
-                            << exit(FatalError);
-                    }
-                }
+                const treeBoundBox receivedBb(is);
                 const labelVector srcDivs(is);
                 const PackedList<2> srcPatchTypes(is);
 
+                // Verify validity
+                if (srcPatchBb != receivedBb)
+                {
+                    FatalErrorInFunction
+                        << "proc:" << procI
+                        << " srcPatchBb:" << srcPatchBb
+                        << " receivedBb:" << receivedBb
+                        << exit(FatalError);
+                }
+
                 forAll(tgtCellMap, tgtCelli)
                 {
                     label celli = tgtCellMap[tgtCelli];

From 521bdf0f07909c25f76f45d8ae3da4d4c766e5c4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Feb 2023 10:10:26 +0100
Subject: [PATCH 073/348] ENH: improve UPtrList sorting

- adjust nullptr checks to discourage flip-flop when confronted with
  multiple null values.

     Old:   (a && b) ? (*a < *b) : bool(a);
     New:   (a && b) ? (*a < *b) : !b;

  comparing (non-null < null) and (null < non-null) behaves
  identically, but comparing (null < null) now tests as true
  (ie, already sorted) whereas before it would have been false
  (ie, needs a swap)

- add UPtrList trimTrailingNull(), which reduces the effective
  (addressable) list size to ignore any trailing null pointers, but
  without reallocation. This is particularly useful when creating a
  UPtrList list view. For example,

     UPtrList<some_iterator> validValues(container.size());

     ...Loop to add valid entries, by some criteria...

     // Shorten list to hide null entries
     validValues.trimTrailingNull();

   This list view now only needs a single allocation, whereas using
   a resize (as was previously necessary) could invoke a second
   allocation, as well as recopying.
---
 .../PtrLists/PtrDynList/PtrDynListI.H         |  2 +-
 .../containers/PtrLists/UPtrList/UPtrList.C   | 41 +++++++++++++++----
 .../containers/PtrLists/UPtrList/UPtrList.H   | 19 ++++++---
 .../containers/PtrLists/UPtrList/UPtrListI.H  | 14 -------
 4 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index 1c929f57db..0320636bd6 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -187,7 +187,7 @@ template<class T, int SizeMin>
 inline Foam::label Foam::PtrDynList<T, SizeMin>::squeezeNull()
 {
     const label newLen = UPtrList<T>::squeezeNull();
-    resize(newLen);
+    PtrList<T>::setAddressableSize(newLen);
     return newLen;
 }
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.C
index 9ae4fcdec7..77b06feec8 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.C
@@ -65,6 +65,23 @@ Foam::label Foam::UPtrList<T>::squeezeNull()
 }
 
 
+template<class T>
+void Foam::UPtrList<T>::trimTrailingNull()
+{
+    label newLen = this->size();
+
+    for (label i = newLen-1; i >= 0 && !ptrs_[i]; --i)
+    {
+        --newLen;
+    }
+
+    // Or mutable?
+    // const_cast<Detail::PtrListDetail<T>&>(ptrs_).setAddressableSize(newLen);
+
+    ptrs_.setAddressableSize(newLen);
+}
+
+
 template<class T>
 void Foam::UPtrList<T>::reorder(const labelUList& oldToNew, const bool check)
 {
@@ -177,6 +194,22 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const UPtrList<T>& list)
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
+template<class T>
+void Foam::sort(UPtrList<T>& list)
+{
+    std::stable_sort
+    (
+        list.begin_ptr(),
+        list.end_ptr(),
+        // Compare less, with nullptr protect and sort nullptr to end
+        [](const T* const a, const T* const b) -> bool
+        {
+            return (a && b) ? (*a < *b) : !b;
+        }
+    );
+}
+
+
 template<class T, class Compare>
 void Foam::sort(UPtrList<T>& list, const Compare& comp)
 {
@@ -189,12 +222,4 @@ void Foam::sort(UPtrList<T>& list, const Compare& comp)
 }
 
 
-template<class T>
-void Foam::sort(UPtrList<T>& list)
-{
-    // ie, lessOp<T>() or std::less<T>()
-    Foam::sort(list, [](const T& a, const T& b) { return (a < b); });
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index b546ac0541..fc6eb9eb23 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -129,7 +129,7 @@ public:
             //- Compare dereferenced pointers
             bool operator()(const T* const a, const T* const b) const
             {
-                return (a && b) ? comp(*a, *b) : bool(a);
+                return (a && b) ? comp(*a, *b) : !b;
             }
         };
 
@@ -150,7 +150,7 @@ public:
                 const T* const a = values.get(ai);
                 const T* const b = values.get(bi);
 
-                return (a && b) ? (*a < *b) : bool(a);
+                return (a && b) ? (*a < *b) : !b;
             }
         };
 
@@ -171,7 +171,7 @@ public:
                 const T* const a = values.get(ai);
                 const T* const b = values.get(bi);
 
-                return (a && b) ? (*b < *a) : bool(b);
+                return (a && b) ? (*b < *a) : !a;
             }
         };
 
@@ -262,10 +262,15 @@ public:
         //- Alias for resize()
         void setSize(const label n) { this->resize(n); }
 
-        //- Squeeze out intermediate nullptr entries in the list of pointers
+        //- Squeeze out nullptr entries in the list of pointers after which
+        //- any null pointers will be at the end of the list
         //  \return the number of non-null entries
         label squeezeNull();
 
+        //- Reduce addressable list size to ignore any trailing null pointers.
+        //  The reduces the effective list length without reallocation
+        void trimTrailingNull();
+
         //- Append an element to the end of the list
         inline void push_back(T* ptr);
 
@@ -343,7 +348,7 @@ public:
             // Member Functions
 
             //- Return pointer, can be nullptr.
-            inline pointer get() const;
+            pointer get() const { return *ptr_; }
 
             // Member Operators
 
@@ -403,7 +408,7 @@ public:
             // Member Functions
 
             //- Return pointer, can be nullptr.
-            inline pointer get() const;
+            pointer get() const { return *ptr_; }
 
             // Member Operators
 
@@ -507,6 +512,8 @@ public:
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
 
 //- Inplace (stable) sorting of pointer list.
+//  This sort function includes null pointer guards and will also sort
+//  any null pointers to the end (eg, rubbish that can be truncated)
 template<class T>
 void sort(UPtrList<T>& list);
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index d0c29ba2c1..652ebd872a 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -281,13 +281,6 @@ iterator(T** ptr) noexcept
 {}
 
 
-template<class T>
-inline T* Foam::UPtrList<T>::iterator::get() const
-{
-    return *ptr_;
-}
-
-
 template<class T>
 inline T* Foam::UPtrList<T>::iterator::operator->() const
 {
@@ -455,13 +448,6 @@ const_iterator(const iterator& iter) noexcept
 {}
 
 
-template<class T>
-inline const T* Foam::UPtrList<T>::const_iterator::get() const
-{
-    return *ptr_;
-}
-
-
 template<class T>
 inline const T* Foam::UPtrList<T>::const_iterator::operator->() const
 {

From 58e4cfbc8a4071be1c13a45f3bc57d4b20d356c5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 13:24:07 +0100
Subject: [PATCH 074/348] REGRESSION: PstreamBuffers gather was clearing
 'send-to-self' on master

---
 .../db/IOstreams/Pstreams/PstreamBuffers.C       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index b3286dac5f..90a17969a5 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -112,19 +112,11 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
     {
         // gather mode (all-to-one)
 
-        if (UPstream::master(comm_))
-        {
-            // Master: has no sends
-            clearSends();
-        }
-        else
-        {
-            // Non-master: only sends to master [0]
+        // Only send to master [0]. Master is also allowed to 'send' to itself
 
-            for (label proci=1; proci < sendBuffers_.size(); ++proci)
-            {
-                sendBuffers_[proci].clear();
-            }
+        for (label proci=1; proci < sendBuffers_.size(); ++proci)
+        {
+            sendBuffers_[proci].clear();
         }
     }
     else

From cbb153372e0141498cf207875217c69125ecff84 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 14:04:41 +0100
Subject: [PATCH 075/348] ENH: robuster finite-area least squares gradient

- avoid division by zero for small edges
---
 .../leastSquaresFaVectors.C                   | 121 +++++++-----------
 1 file changed, 49 insertions(+), 72 deletions(-)

diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
index a6bd3a99f6..ebcd3d6d64 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
@@ -64,7 +64,8 @@ Foam::leastSquaresFaVectors::~leastSquaresFaVectors()
 void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
 {
     DebugInFunction
-        << "Constructing finite area least square gradient vectors" << nl;
+        << "Constructing finite area (invDist) least square gradient vectors"
+        << nl;
 
     pVectorsPtr_ = new edgeVectorField
     (
@@ -75,7 +76,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimensionedVector(dimless/dimLength, Zero)
@@ -91,7 +92,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimensionedVector(dimless/dimLength, Zero)
@@ -103,63 +104,45 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
     const labelUList& neighbour = mesh().neighbour();
 
     const areaVectorField& C = mesh().areaCentres();
-    const edgeScalarField& w = mesh().weights();
-
 
     // Set up temporary storage for the dd tensor (before inversion)
     symmTensorField dd(mesh().nFaces(), Zero);
 
     forAll(owner, facei)
     {
-        label own = owner[facei];
-        label nei = neighbour[facei];
+        const label own = owner[facei];
+        const label nei = neighbour[facei];
 
-        vector d = C[nei] - C[own];
+        const vector d(C[nei] - C[own]);
 
-        // Do not allow any mag(val) < SMALL
-        if (d.magSqr() < ROOTSMALL)
+        // No contribution when mag(val) < SMALL
+        const scalar magSqrDist = d.magSqr();
+        if (magSqrDist > ROOTSMALL)
         {
-            d = vector::uniform(SMALL);
+            const symmTensor wdd(sqr(d)/magSqrDist);
+            dd[own] += wdd;
+            dd[nei] += wdd;
         }
-
-        symmTensor wdd = (1.0/d.magSqr())*sqr(d);
-
-        dd[own] += wdd;
-        dd[nei] += wdd;
     }
 
 
-    forAll(lsP.boundaryField(), patchi)
+    for (const auto& patchLsP : lsP.boundaryField())
     {
-        const faePatchScalarField& pw = w.boundaryField()[patchi];
-
-        const faPatch& p = pw.patch();
+        const faPatch& p = patchLsP.patch();
         const labelUList& edgeFaces = p.edgeFaces();
 
         // Build the d-vectors
-        // HJ, reconsider deltas at the boundary, consistent with FVM
-        // Current implementation is good for fixedValue boundaries, but may
-        // cause problems with fixedGradient.  HJ, 4/Oct/2010
         const vectorField pd(p.delta());
 
-        if (p.coupled())
+        forAll(pd, patchFacei)
         {
-            forAll(pd, patchFacei)
-            {
-                const vector& d = pd[patchFacei];
+            const vector& d = pd[patchFacei];
 
-                dd[edgeFaces[patchFacei]] +=
-                    (1.0/magSqr(d))*sqr(d);
-            }
-        }
-        else
-        {
-            forAll(pd, patchFacei)
+            // No contribution when mag(val) < SMALL
+            const scalar magSqrDist = d.magSqr();
+            if (magSqrDist > ROOTSMALL)
             {
-                const vector& d = pd[patchFacei];
-
-                dd[edgeFaces[patchFacei]] +=
-                    (1.0/magSqr(d))*sqr(d);
+                dd[edgeFaces[patchFacei]] += sqr(d)/magSqrDist;
             }
         }
     }
@@ -172,60 +155,54 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
     // Revisit all faces and calculate the lsP and lsN vectors
     forAll(owner, facei)
     {
-        label own = owner[facei];
-        label nei = neighbour[facei];
+        const label own = owner[facei];
+        const label nei = neighbour[facei];
 
-        vector d = C[nei] - C[own];
+        const vector d(C[nei] - C[own]);
 
-        // Do not allow any mag(val) < SMALL
-        if (d.magSqr() < ROOTSMALL)
+        // No contribution when mag(val) < SMALL
+        const scalar magSqrDist = d.magSqr();
+        if (magSqrDist > ROOTSMALL)
         {
-            d = vector::uniform(SMALL);
+            lsP[facei] = (invDd[own] & d)/magSqrDist;
+            lsN[facei] = -(invDd[nei] & d)/magSqrDist;
         }
-
-        scalar magSfByMagSqrd = 1.0/d.magSqr();
-
-        lsP[facei] = magSfByMagSqrd*(invDd[own] & d);
-        lsN[facei] = -magSfByMagSqrd*(invDd[nei] & d);
+        // ... already zero from initialisation
+        // else
+        // {
+        //     lsP[facei] = Zero;
+        //     lsN[facei] = Zero;
+        // }
     }
 
-    forAll(lsP.boundaryField(), patchi)
+    for (auto& patchLsP : lsP.boundaryFieldRef())
     {
-        faePatchVectorField& patchLsP = lsP.boundaryFieldRef()[patchi];
-
-        const faePatchScalarField& pw = w.boundaryField()[patchi];
-
-        const faPatch& p = pw.patch();
+        const faPatch& p = patchLsP.patch();
         const labelUList& edgeFaces = p.edgeFaces();
 
         // Build the d-vectors
         const vectorField pd(p.delta());
 
-        if (p.coupled())
+        forAll(pd, patchFacei)
         {
-            forAll(pd, patchFacei)
-            {
-                const vector& d = pd[patchFacei];
+            const vector& d = pd[patchFacei];
 
-                patchLsP[patchFacei] =
-                    (1.0/magSqr(d))
-                   *(invDd[edgeFaces[patchFacei]] & d);
-            }
-        }
-        else
-        {
-            forAll(pd, patchFacei)
+            // No contribution when mag(val) < SMALL
+            const scalar magSqrDist = d.magSqr();
+            if (magSqrDist > ROOTSMALL)
             {
-                const vector& d = pd[patchFacei];
-
                 patchLsP[patchFacei] =
-                    (1.0/magSqr(d))
-                   *(invDd[edgeFaces[patchFacei]] & d);
+                    (invDd[edgeFaces[patchFacei]] & d)/magSqrDist;
             }
+            // ... already zero from initialisation
+            // else
+            // {
+            //     patchLsP[patchFacei] = Zero;
+            // }
         }
     }
 
-    DebugInFunction
+    DebugInfo
         << "Done constructing finite area least square gradient vectors" << nl;
 }
 

From aef990f8df3aef5d033f999b04271e2110308911 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 17 Feb 2023 13:24:29 +0100
Subject: [PATCH 076/348] SUBMODULE: update avalanche (compilation change only)

---
 modules/avalanche | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/avalanche b/modules/avalanche
index 8f0055e023..f97d2c3513 160000
--- a/modules/avalanche
+++ b/modules/avalanche
@@ -1 +1 @@
-Subproject commit 8f0055e02353b8a412aef2ff56ec17183256e645
+Subproject commit f97d2c3513ac99db65521cb112ae2c3974c4c265

From b71a05a72f499bad78b6dc470ae22458ef459ea2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 17 Feb 2023 17:19:14 +0100
Subject: [PATCH 077/348] ENH: add Function1::NewIfPresent without a redirect
 type

- simplifies handling, consistent with PatchFunction1

STYLE: use Function1 NewIfPresent instead of separate found/New
---
 .../functions/Function1/Function1/Function1.H | 20 ++++++--
 .../Function1/Function1/Function1New.C        | 16 ++++++-
 .../flowRateInletVelocityFvPatchVectorField.C | 27 ++++++-----
 ...flowRateOutletVelocityFvPatchVectorField.C | 47 ++++++++++---------
 ...flowRateOutletVelocityFvPatchVectorField.H | 10 ++--
 .../fixedTemperatureConstraint.C              |  2 +-
 .../ConeNozzleInjection/ConeNozzleInjection.C | 20 ++++----
 .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C |  7 +--
 .../PatchFunction1/PatchFunction1.H           |  6 ++-
 9 files changed, 94 insertions(+), 61 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 33b10d3976..fa64f4f0cd 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,7 +119,11 @@ protected:
 
 public:
 
-    typedef Type returnType;
+    // Data Types
+
+        //- The return type
+        typedef Type returnType;
+
 
     //- Runtime type information
     TypeName("Function1")
@@ -196,12 +200,20 @@ public:
             const bool mandatory = true
         );
 
-        //- An optional selector
+        //- An optional selector, with fallback redirection
+        static autoPtr<Function1<Type>> NewIfPresent
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const word& redirectType,
+            const objectRegistry* obrPtr = nullptr
+        );
+
+        //- An optional selector, without fallback redirection
         static autoPtr<Function1<Type>> NewIfPresent
         (
             const word& entryName,
             const dictionary& dict,
-            const word& redirectType = word::null,
             const objectRegistry* obrPtr = nullptr
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index b5be2d0a1e..0edde99337 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -225,6 +225,20 @@ Foam::Function1<Type>::NewIfPresent
 }
 
 
+template<class Type>
+Foam::autoPtr<Foam::Function1<Type>>
+Foam::Function1<Type>::NewIfPresent
+(
+    const word& entryName,
+    const dictionary& dict,
+    const objectRegistry* obrPtr
+)
+{
+    // mandatory = false
+    return Function1<Type>::New(entryName, dict, word::null, obrPtr, false);
+}
+
+
 template<class Type>
 Foam::refPtr<Foam::Function1<Type>>
 Foam::Function1<Type>::New
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 2489daf9c4..d2b3751b96 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -42,9 +42,9 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    flowRate_(),
+    flowRate_(nullptr),
     rhoName_("rho"),
-    rhoInlet_(0.0),
+    rhoInlet_(0),
     volumetric_(false),
     extrapolateProfile_(false)
 {}
@@ -59,6 +59,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict, false),
+    flowRate_(nullptr),
     rhoName_("rho"),
     rhoInlet_(dict.getOrDefault<scalar>("rhoInlet", -VGREAT)),
     volumetric_(false),
@@ -67,23 +68,25 @@ flowRateInletVelocityFvPatchVectorField
         dict.getOrDefault<Switch>("extrapolateProfile", false)
     )
 {
-    if (dict.found("volumetricFlowRate"))
+    flowRate_ =
+        Function1<scalar>::NewIfPresent("volumetricFlowRate", dict, &db());
+
+    if (flowRate_)
     {
         volumetric_ = true;
-        flowRate_ =
-            Function1<scalar>::New("volumetricFlowRate", dict, &db());
-    }
-    else if (dict.found("massFlowRate"))
-    {
-        volumetric_ = false;
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict, &db());
-        rhoName_ = dict.getOrDefault<word>("rho", "rho");
     }
     else
+    {
+        dict.readIfPresent("rho", rhoName_);
+        flowRate_ =
+            Function1<scalar>::NewIfPresent("massFlowRate", dict, &db());
+    }
+
+    if (!flowRate_)
     {
         FatalIOErrorInFunction(dict)
             << "Please supply either 'volumetricFlowRate' or"
-            << " 'massFlowRate' and 'rho'" << nl
+            << " 'massFlowRate' (optional: with 'rho')" << nl
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index eeb2d087d2..a1edea1a77 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -41,10 +41,10 @@ flowRateOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    flowRate_(),
-    volumetric_(false),
+    flowRate_(nullptr),
     rhoName_("rho"),
-    rhoOutlet_(0.0)
+    rhoOutlet_(0),
+    volumetric_(false)
 {}
 
 
@@ -57,26 +57,31 @@ flowRateOutletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict, false),
-    rhoOutlet_(dict.getOrDefault<scalar>("rhoOutlet", -VGREAT))
+    flowRate_(nullptr),
+    rhoName_("rho"),
+    rhoOutlet_(dict.getOrDefault<scalar>("rhoOutlet", -VGREAT)),
+    volumetric_(false)
 {
-    if (dict.found("volumetricFlowRate"))
+    flowRate_ =
+        Function1<scalar>::NewIfPresent("volumetricFlowRate", dict, &db());
+
+    if (flowRate_)
     {
         volumetric_ = true;
-        flowRate_ =
-            Function1<scalar>::New("volumetricFlowRate", dict, &db());
-        rhoName_ = "rho";
-    }
-    else if (dict.found("massFlowRate"))
-    {
-        volumetric_ = false;
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict, &db());
-        rhoName_ = dict.getOrDefault<word>("rho", "rho");
     }
     else
+    {
+        dict.readIfPresent("rho", rhoName_);
+        flowRate_ =
+            Function1<scalar>::NewIfPresent("massFlowRate", dict, &db());
+    }
+
+    if (!flowRate_)
     {
         FatalIOErrorInFunction(dict)
             << "Please supply either 'volumetricFlowRate' or"
-            << " 'massFlowRate' and 'rho'" << exit(FatalIOError);
+            << " 'massFlowRate' (optional: with 'rho')" << nl
+            << exit(FatalIOError);
     }
 
     // Value field require if mass based
@@ -105,9 +110,9 @@ flowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     flowRate_(ptf.flowRate_.clone()),
-    volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
-    rhoOutlet_(ptf.rhoOutlet_)
+    rhoOutlet_(ptf.rhoOutlet_),
+    volumetric_(ptf.volumetric_)
 {}
 
 
@@ -119,9 +124,9 @@ flowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(ptf),
     flowRate_(ptf.flowRate_.clone()),
-    volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
-    rhoOutlet_(ptf.rhoOutlet_)
+    rhoOutlet_(ptf.rhoOutlet_),
+    volumetric_(ptf.volumetric_)
 {}
 
 
@@ -134,9 +139,9 @@ flowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(ptf, iF),
     flowRate_(ptf.flowRate_.clone()),
-    volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
-    rhoOutlet_(ptf.rhoOutlet_)
+    rhoOutlet_(ptf.rhoOutlet_),
+    volumetric_(ptf.volumetric_)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H
index 43cfa9ff65..1e88968065 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H
@@ -111,22 +111,22 @@ class flowRateOutletVelocityFvPatchVectorField
 :
     public fixedValueFvPatchVectorField
 {
-    // Private data
+    // Private Data
 
         //- Outlet integral flow rate
         autoPtr<Function1<scalar>> flowRate_;
 
-        //- Is volumetric?
-        bool volumetric_;
-
         //- Name of the density field used to normalize the mass flux
         word rhoName_;
 
         //- Rho initialisation value (for start; if value not supplied)
         scalar rhoOutlet_;
 
+        //- Is volumetric?
+        bool volumetric_;
 
-    // Private member functions
+
+    // Private Member Functions
 
         //- Update the patch values given the appropriate density type and value
         template<class RhoType>
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 93c192c1f0..08f995d3ff 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -148,7 +148,7 @@ bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
 {
     if (fv::cellSetOption::read(dict))
     {
-        if (coeffs_.found(Tuniform_->name()))
+        if (Tuniform_ && coeffs_.found(Tuniform_->name(), keyType::LITERAL))
         {
             Tuniform_.reset
             (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 951bb484ed..527b32851d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -186,7 +186,15 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     tetPti_(-1),
     directionVsTime_(nullptr),
     direction_(Zero),
-    omegaPtr_(nullptr),
+    omegaPtr_
+    (
+        Function1<scalar>::NewIfPresent
+        (
+            "omega",
+            this->coeffDict(),
+            &owner.mesh()
+        )
+    ),
     parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
     flowRateProfile_
     (
@@ -247,16 +255,8 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     thetaInner_->userTimeToTime(time);
     thetaOuter_->userTimeToTime(time);
 
-    if (this->coeffDict().found("omega"))
+    if (omegaPtr_)
     {
-        omegaPtr_ =
-            Function1<scalar>::New
-            (
-                "omega",
-                this->coeffDict(),
-                &owner.mesh()
-            );
-
         omegaPtr_->userTimeToTime(time);
     }
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
index 520919a041..2bc115e61c 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
@@ -603,12 +603,7 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
     nonOverlapPatchID_(-1),
     srcMask_(),
     tgtMask_(),
-    srcScalePtr_
-    (
-        dict.found("scale")
-      ? PatchFunction1<scalar>::New(*this, "scale", dict)
-      : nullptr
-    ),
+    srcScalePtr_(PatchFunction1<scalar>::NewIfPresent(*this, "scale", dict)),
     AMITime_
     (
         IOobject
diff --git a/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H b/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H
index 2e3f6a6e98..b8e075e5f5 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H
+++ b/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H
@@ -102,7 +102,11 @@ protected:
 
 public:
 
-    typedef Field<Type> returnType;
+    // Data Types
+
+        //- The return type is a field of values
+        typedef Field<Type> returnType;
+
 
     //- Runtime type information
     TypeName("PatchFunction1")

From fe4688c27f39318a5739feffa4a5c809fd8db8fa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 31 Jan 2023 15:26:31 +0100
Subject: [PATCH 078/348] ENH: patch fields writeValueEntry method (frequently
 used)

- add base-level readValueEntry, readMixedEntries methods
  that allow optional or mandatory reading.

STYLE: wording for patch fields comments
---
 .../T/smoluchowskiJumpTFvPatchScalarField.C   |   4 +-
 .../BCs/U/maxwellSlipUFvPatchVectorField.C    |   4 +-
 .../BCs/rho/fixedRhoFvPatchScalarField.C      |   5 +-
 ...woPhaseRadCoupledMixedFvPatchScalarField.C |   2 +-
 .../adjointOutletPressureFvPatchScalarField.C |   4 +-
 .../adjointOutletVelocityFvPatchVectorField.C |   4 +-
 .../alphaContactAngleFvPatchScalarField.C     |   4 +-
 .../alphaContactAngleFvPatchScalarField.C     |   4 +-
 .../tractionDisplacementFvPatchVectorField.C  |   4 +-
 ...DisplacementCorrectionFvPatchVectorField.C |   4 +-
 etc/codeTemplates/BC/BC.C                     |   2 +-
 .../basicSymmetryPointPatchField.H            |   2 +-
 .../calculated/calculatedPointPatchField.H    |   2 +-
 .../basic/coupled/coupledPointPatchField.H    |   2 +-
 .../fixedValue/fixedValuePointPatchField.H    |   2 +-
 .../basic/value/valuePointPatchField.C        |  39 ++++++-
 .../basic/value/valuePointPatchField.H        |  28 ++++-
 .../zeroGradientPointPatchField.H             |   2 +-
 .../constraint/cyclic/cyclicPointPatchField.H |   2 +-
 .../cyclicSlip/cyclicSlipPointPatchField.H    |   2 +-
 .../constraint/empty/emptyPointPatchField.H   |   2 +-
 ...nonuniformTransformCyclicPointPatchField.H |   2 +-
 .../processor/processorPointPatchField.H      |   2 +-
 .../processorCyclicPointPatchField.H          |   2 +-
 .../symmetry/symmetryPointPatchField.H        |   2 +-
 .../symmetryPlanePointPatchField.H            |   2 +-
 .../constraint/wedge/wedgePointPatchField.H   |   2 +-
 .../codedFixedValuePointPatchField.C          |   2 +-
 .../fixedNormalSlipPointPatchField.H          |   2 +-
 .../derived/slip/slipPointPatchField.H        |   2 +-
 .../pointPatchField/pointPatchField.H         |  76 ++++++-------
 ...ayatillekeWallFunctionFvPatchScalarField.C |   2 +-
 ...thDissipationRateInletFvPatchScalarField.C |   4 +-
 ...ngLengthFrequencyInletFvPatchScalarField.C |   4 +-
 .../fixedShearStressFvPatchVectorField.C      |   4 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |   2 +-
 .../kLowReWallFunctionFvPatchScalarField.C    |   2 +-
 .../kqRWallFunctionFvPatchField.C             |   2 +-
 .../nutLowReWallFunctionFvPatchScalarField.C  |   2 +-
 ...utUBlendedWallFunctionFvPatchScalarField.C |   2 +-
 .../nutURoughWallFunctionFvPatchScalarField.C |   2 +-
 ...tUSpaldingWallFunctionFvPatchScalarField.C |   2 +-
 ...UTabulatedWallFunctionFvPatchScalarField.C |   2 +-
 .../nutUWallFunctionFvPatchScalarField.C      |   2 +-
 .../nutkRoughWallFunctionFvPatchScalarField.C |   2 +-
 .../nutkWallFunctionFvPatchScalarField.C      |   2 +-
 .../omegaWallFunctionFvPatchScalarField.C     |   2 +-
 ...ndaryLayerInletEpsilonFvPatchScalarField.C |   4 +-
 ...atmBoundaryLayerInletKFvPatchScalarField.C |   4 +-
 ...oundaryLayerInletOmegaFvPatchScalarField.C |   4 +-
 ...daryLayerInletVelocityFvPatchVectorField.C |   4 +-
 ...entHeatFluxTemperatureFvPatchScalarField.C |   4 +-
 ...atmAlphatkWallFunctionFvPatchScalarField.C |   2 +-
 ...atmEpsilonWallFunctionFvPatchScalarField.C |   2 +-
 .../atmNutUWallFunctionFvPatchScalarField.C   |   2 +-
 .../atmNutWallFunctionFvPatchScalarField.C    |   2 +-
 .../atmNutkWallFunctionFvPatchScalarField.C   |   2 +-
 .../atmOmegaWallFunctionFvPatchScalarField.C  |   2 +-
 .../freeSurfacePressureFvPatchScalarField.C   |   4 +-
 .../freeSurfaceVelocityFvPatchVectorField.C   |   4 +-
 ...yMotionDisplacementPointPatchVectorField.C |   2 +-
 ...yMotionDisplacementPointPatchVectorField.H |   2 +-
 .../basic/calculated/calculatedFaPatchField.C |   2 +-
 .../basic/calculated/calculatedFaPatchField.H |   2 +-
 .../basic/coupled/coupledFaPatchField.C       |   2 +-
 .../fixedGradient/fixedGradientFaPatchField.H |   4 +-
 .../basic/fixedValue/fixedValueFaPatchField.C |   2 +-
 .../basic/fixedValue/fixedValueFaPatchField.H |   4 +-
 .../basic/mixed/mixedFaPatchField.C           |  56 +++++++++-
 .../basic/mixed/mixedFaPatchField.H           |  33 +++++-
 .../basic/sliced/slicedFaPatchField.C         |   2 +-
 .../basic/sliced/slicedFaPatchField.H         |   4 +-
 .../basic/transform/transformFaPatchField.H   |   4 +-
 .../zeroGradient/zeroGradientFaPatchField.H   |   4 +-
 .../clampedPlate/clampedPlateFaPatchField.C   |   2 +-
 .../clampedPlate/clampedPlateFaPatchField.H   |   2 +-
 .../edgeNormalFixedValueFaPatchVectorField.C  |   2 +-
 .../fixedValueOutflowFaPatchField.C           |   2 +-
 .../fixedValueOutflowFaPatchField.H           |   4 +-
 .../inletOutlet/inletOutletFaPatchField.C     |   2 +-
 ...timeVaryingUniformFixedValueFaPatchField.C |   2 +-
 .../faPatchFields/faPatchField/faPatchField.C |  64 +++++++++--
 .../faPatchFields/faPatchField/faPatchField.H |  85 ++++++++++-----
 .../calculated/calculatedFaePatchField.C      |   2 +-
 .../calculated/calculatedFaePatchField.H      |  14 +--
 .../basic/coupled/coupledFaePatchField.C      |   2 +-
 .../basic/coupled/coupledFaePatchField.H      |   7 +-
 .../fixedValue/fixedValueFaePatchField.C      |   2 +-
 .../fixedValue/fixedValueFaePatchField.H      |   9 +-
 .../basic/sliced/slicedFaePatchField.H        |   3 +-
 .../constraint/cyclic/cyclicFaePatchField.H   |   6 +-
 .../constraint/empty/emptyFaePatchField.H     |   5 +-
 .../processor/processorFaePatchField.C        |   7 --
 .../processor/processorFaePatchField.H        |  10 +-
 .../symmetry/symmetryFaePatchField.H          |   5 +-
 .../constraint/wedge/wedgeFaePatchField.H     |   5 +-
 .../faePatchField/faePatchField.C             |  63 +++++++++--
 .../faePatchField/faePatchField.H             |  84 ++++++++++-----
 .../SRFFreestreamVelocityFvPatchVectorField.C |   4 +-
 .../SRFVelocityFvPatchVectorField.C           |   4 +-
 .../SRFWallVelocityFvPatchVectorField.C       |   4 +-
 .../exprValuePointPatchField.C                |   2 +-
 .../basic/calculated/calculatedFvPatchField.C |   2 +-
 .../basic/calculated/calculatedFvPatchField.H |   2 +-
 .../basic/coupled/coupledFvPatchField.C       |   2 +-
 .../directionMixedFvPatchField.C              |   2 +-
 .../extrapolatedCalculatedFvPatchField.H      |   2 +-
 .../basic/fixedValue/fixedValueFvPatchField.C |   2 +-
 .../basic/fixedValue/fixedValueFvPatchField.H |   4 +-
 .../basic/mixed/mixedFvPatchField.C           |  56 +++++++++-
 .../basic/mixed/mixedFvPatchField.H           |  23 +++-
 .../basic/sliced/slicedFvPatchField.C         |   2 +-
 .../basic/sliced/slicedFvPatchField.H         |   3 +-
 .../basic/transform/transformFvPatchField.H   |   4 +-
 .../zeroGradient/zeroGradientFvPatchField.H   |   4 +-
 .../cyclicACMI/cyclicACMIFvPatchField.C       |   2 +-
 .../cyclicAMI/cyclicAMIFvPatchField.C         |   2 +-
 .../acousticWaveTransmissiveFvPatchField.C    |   2 +-
 .../activeBaffleVelocityFvPatchVectorField.C  |   4 +-
 ...ureForceBaffleVelocityFvPatchVectorField.C |   4 +-
 .../derived/advective/advectiveFvPatchField.C |   2 +-
 .../codedFixedValueFvPatchField.C             |   2 +-
 ...lindricalInletVelocityFvPatchVectorField.C |   2 +-
 ...lectrostaticDepositionFvPatchScalarField.C |   4 +-
 .../fixedFluxPressureFvPatchScalarField.C     |   4 +-
 .../fixedInternalValueFvPatchField.H          |   4 +-
 .../derived/fixedJump/fixedJumpFvPatchField.C |   2 +-
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.C   |   2 +-
 .../derived/fixedMean/fixedMeanFvPatchField.C |   2 +-
 .../fixedMeanOutletInletFvPatchField.C        |   2 +-
 ...malInletOutletVelocityFvPatchVectorField.C |   4 +-
 .../fixedNormalSlipFvPatchField.C             |   2 +-
 ...ureCompressibleDensityFvPatchScalarField.C |   2 +-
 .../fixedProfile/fixedProfileFvPatchField.C   |   2 +-
 .../flowRateInletVelocityFvPatchVectorField.C |   2 +-
 ...flowRateOutletVelocityFvPatchVectorField.C |   2 +-
 .../fluxCorrectedVelocityFvPatchVectorField.C |   4 +-
 .../freestream/freestreamFvPatchField.C       |   2 +-
 .../freestreamPressureFvPatchScalarField.C    |   4 +-
 .../freestreamVelocityFvPatchVectorField.C    |   4 +-
 .../inletOutlet/inletOutletFvPatchField.C     |   2 +-
 ...OutletTotalTemperatureFvPatchScalarField.C |   4 +-
 .../interfaceCompressionFvPatchScalarField.C  |   4 +-
 ...erstitialInletVelocityFvPatchVectorField.C |   2 +-
 .../mappedField/mappedFieldFvPatchField.C     |   2 +-
 .../mappedFixedValueFvPatchField.C            |   2 +-
 .../mappedFlowRateFvPatchVectorField.C        |   2 +-
 ...mappedVelocityFluxFixedValueFvPatchField.C |   4 +-
 ...FlowRateOutletVelocityFvPatchVectorField.C |   2 +-
 .../movingWallVelocityFvPatchVectorField.C    |   4 +-
 .../derived/noSlip/noSlipFvPatchVectorField.C |   2 +-
 .../outletInlet/outletInletFvPatchField.C     |   2 +-
 .../outletMappedUniformInletFvPatchField.C    |   2 +-
 ...utletPhaseMeanVelocityFvPatchVectorField.C |   2 +-
 .../partialSlip/partialSlipFvPatchField.C     |   2 +-
 ...aseHydrostaticPressureFvPatchScalarField.C |   4 +-
 .../plenumPressureFvPatchScalarField.C        |   4 +-
 ...tedInletOutletVelocityFvPatchVectorField.C |   4 +-
 ...eDirectedInletVelocityFvPatchVectorField.C |   4 +-
 ...tOutletParSlipVelocityFvPatchVectorField.C |   4 +-
 ...ureInletOutletVelocityFvPatchVectorField.C |   4 +-
 .../pressureInletVelocityFvPatchVectorField.C |   4 +-
 ...malInletOutletVelocityFvPatchVectorField.C |   4 +-
 ...IDControlInletVelocityFvPatchVectorField.C |   2 +-
 ...phaInletOutletVelocityFvPatchVectorField.C |   2 +-
 .../prghPressureFvPatchScalarField.C          |   4 +-
 ...talHydrostaticPressureFvPatchScalarField.C |   4 +-
 .../prghTotalPressureFvPatchScalarField.C     |   4 +-
 ...ureInletOutletVelocityFvPatchVectorField.C |   4 +-
 .../rotatingWallVelocityFvPatchVectorField.C  |   4 +-
 .../supersonicFreestreamFvPatchVectorField.C  |   4 +-
 ...urfaceNormalFixedValueFvPatchVectorField.C |   2 +-
 ...lFlowRateInletVelocityFvPatchVectorField.C |   2 +-
 .../swirlInletVelocityFvPatchVectorField.C    |   2 +-
 .../syringePressureFvPatchScalarField.C       |   4 +-
 .../timeVaryingMappedFixedValueFvPatchField.C |   2 +-
 .../totalPressureFvPatchScalarField.C         |   4 +-
 .../totalTemperatureFvPatchScalarField.C      |   4 +-
 ...ranslatingWallVelocityFvPatchVectorField.C |   4 +-
 .../turbulentDFSEMInletFvPatchVectorField.C   |   2 +-
 .../turbulentDigitalFilterInletFvPatchField.C |   2 +-
 .../turbulentInletFvPatchField.C              |   2 +-
 ...sityKineticEnergyInletFvPatchScalarField.C |   4 +-
 ...ityHydrostaticPressureFvPatchScalarField.C |   4 +-
 .../uniformFixedGradientFvPatchField.C        |   2 +-
 .../uniformFixedValueFvPatchField.C           |   2 +-
 .../uniformInletOutletFvPatchField.C          |   2 +-
 ...niformNormalFixedValueFvPatchVectorField.C |   4 +-
 .../uniformTotalPressureFvPatchScalarField.C  |   4 +-
 .../variableHeightFlowRateFvPatchField.C      |   4 +-
 ...tFlowRateInletVelocityFvPatchVectorField.C |   2 +-
 .../waveSurfacePressureFvPatchScalarField.C   |   4 +-
 .../waveTransmissiveFvPatchField.C            |   2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.C |  61 +++++++++--
 .../fvPatchFields/fvPatchField/fvPatchField.H | 100 +++++++++++-------
 .../calculated/calculatedFvsPatchField.H      |   2 +-
 .../fixedValue/fixedValueFvsPatchField.H      |   4 +-
 .../basic/sliced/slicedFvsPatchField.H        |   3 +-
 .../fvsPatchField/fvsPatchField.C             |  65 ++++++++++--
 .../fvsPatchField/fvsPatchField.H             |  86 ++++++++++-----
 .../cellMotion/cellMotionFvPatchField.C       |   2 +-
 .../surfaceSlipDisplacementFvPatchField.H     |   2 +-
 ...llatingDisplacementPointPatchVectorField.C |   2 +-
 ...llatingDisplacementPointPatchVectorField.H |   2 +-
 ...OscillatingVelocityPointPatchVectorField.C |   2 +-
 ...OscillatingVelocityPointPatchVectorField.H |   2 +-
 ...llatingDisplacementPointPatchVectorField.C |   2 +-
 ...llatingDisplacementPointPatchVectorField.H |   2 +-
 ...oscillatingVelocityPointPatchVectorField.C |   2 +-
 ...oscillatingVelocityPointPatchVectorField.H |   2 +-
 ...surfaceDisplacementPointPatchVectorField.C |   2 +-
 ...surfaceDisplacementPointPatchVectorField.H |   2 +-
 ...aceSlipDisplacementPointPatchVectorField.C |   2 +-
 ...aceSlipDisplacementPointPatchVectorField.H |   2 +-
 ...polatedDisplacementPointPatchVectorField.C |   2 +-
 ...polatedDisplacementPointPatchVectorField.H |   2 +-
 .../waveDisplacementPointPatchVectorField.C   |   2 +-
 .../waveDisplacementPointPatchVectorField.H   |   2 +-
 .../genericFaPatchField/genericFaPatchField.C |   2 +-
 .../genericFaPatchField/genericFaPatchField.H |   2 +-
 .../genericFvPatchField/genericFvPatchField.C |   2 +-
 .../genericFvPatchField/genericFvPatchField.H |   2 +-
 .../genericFvsPatchField.C                    |   2 +-
 .../genericFvsPatchField.H                    |   2 +-
 .../genericPointPatchField.H                  |   2 +-
 ...edPointDisplacementPointPatchVectorField.C |   2 +-
 ...edPointDisplacementPointPatchVectorField.H |   2 +-
 .../zeroFixedValuePointPatchField.H           |   2 +-
 .../cyclicACMIPointPatchField.H               |   2 +-
 .../cyclicAMIPointPatchField.H                |   2 +-
 .../uniformFixedValuePointPatchField.H        |   2 +-
 ...djointFarFieldPressureFvPatchScalarField.C |   4 +-
 ...djointFarFieldVelocityFvPatchVectorField.C |   4 +-
 .../adjointInletVelocityFvPatchVectorField.C  |   4 +-
 .../adjointOutletPressureFvPatchScalarField.C |   4 +-
 .../adjointOutletVelocityFvPatchVectorField.C |   4 +-
 ...ointOutletVelocityFluxFvPatchVectorField.C |   4 +-
 .../adjointWallVelocityFvPatchVectorField.C   |   4 +-
 ...jointWallVelocityLowReFvPatchVectorField.C |   4 +-
 ...djointFarFieldNuaTildaFvPatchScalarField.C |   4 +-
 .../adjointFarFieldTMVar1FvPatchScalarField.C |   4 +-
 .../adjointFarFieldTMVar2FvPatchScalarField.C |   4 +-
 .../adjointInletNuaTildaFvPatchScalarField.C  |   4 +-
 .../adjointOutletFluxFvPatchField.C           |   2 +-
 .../adjointOutletKaFvPatchScalarField.C       |   4 +-
 .../adjointOutletNuaTildaFvPatchScalarField.C |   4 +-
 ...ointOutletNuaTildaFluxFvPatchScalarField.C |   4 +-
 .../adjointOutletWaFvPatchScalarField.C       |   4 +-
 .../alphaContactAngleFvPatchScalarField.C     |   4 +-
 ...imeVaryingMassSorptionFvPatchScalarField.C |   4 +-
 .../alphaContactAngleFvPatchScalarField.C     |   4 +-
 ...allBoilingWallFunctionFvPatchScalarField.C |   2 +-
 ...ayatillekeWallFunctionFvPatchScalarField.C |   2 +-
 ...haseChangeWallFunctionFvPatchScalarField.C |   2 +-
 ...allBoilingWallFunctionFvPatchScalarField.C |   2 +-
 .../copiedFixedValueFvPatchScalarField.C      |   2 +-
 ...ixedMultiPhaseHeatFluxFvPatchScalarField.C |   2 +-
 ...sonJacksonParticleSlipFvPatchVectorField.C |   4 +-
 ...onJacksonParticleThetaFvPatchScalarField.C |   4 +-
 ...sonJacksonParticleSlipFvPatchVectorField.C |   4 +-
 ...onJacksonParticleThetaFvPatchScalarField.C |   4 +-
 ...sRadiativeCoupledMixedFvPatchScalarField.C |   2 +-
 ...ysisTemperatureCoupledFvPatchScalarField.C |   4 +-
 ...rolysisVelocityCoupledFvPatchVectorField.C |   4 +-
 ...ilmHeightInletVelocityFvPatchVectorField.C |   4 +-
 ...linedFilmNusseltHeightFvPatchScalarField.C |   6 +-
 ...lmNusseltInletVelocityFvPatchVectorField.C |   6 +-
 ...alphatFilmWallFunctionFvPatchScalarField.C |   3 +-
 .../nutkFilmWallFunctionFvPatchScalarField.C  |   2 +-
 ...gidBodyDisplacementPointPatchVectorField.C |   2 +-
 ...gidBodyDisplacementPointPatchVectorField.H |   2 +-
 ...gidBodyDisplacementPointPatchVectorField.C |   2 +-
 ...gidBodyDisplacementPointPatchVectorField.H |   2 +-
 ...convectiveHeatTransferFvPatchScalarField.C |   2 +-
 ...allHeatFluxTemperatureFvPatchScalarField.C |   4 +-
 ...fixedIncidentRadiationFvPatchScalarField.C |   4 +-
 ...emperatureCoupledMixedFvPatchScalarField.C |   2 +-
 ...pedMassWallTemperatureFvPatchScalarField.C |   2 +-
 ...tletMachNumberPressureFvPatchScalarField.C |   4 +-
 ...ppedUniformInletHeatAdditionFvPatchField.C |   4 +-
 ...ableBaffleMassFractionFvPatchScalarField.C |   4 +-
 ...ermeableBaffleVelocityFvPatchVectorField.C |   4 +-
 .../thermalBaffle1DFvPatchScalarField.C       |   2 +-
 ...RateAdvectiveDiffusiveFvPatchScalarField.C |   2 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.C |   2 +-
 ...eratureRadCoupledMixedFvPatchScalarField.C |   2 +-
 ...ayatillekeWallFunctionFvPatchScalarField.C |   2 +-
 .../alphatWallFunctionFvPatchScalarField.C    |   2 +-
 .../sorptionWallFunctionFvPatchScalarField.C  |   4 +-
 .../wallHeatTransferFvPatchScalarField.C      |   4 +-
 .../energyJump/energyJumpFvPatchScalarField.C |   2 +-
 .../energyJumpAMIFvPatchScalarField.C         |   2 +-
 .../gradientEnergyFvPatchScalarField.C        |   4 +-
 .../MarshakRadiationFvPatchScalarField.C      |   2 +-
 ...iationFixedTemperatureFvPatchScalarField.C |   2 +-
 ...iffusiveRadiationMixedFvPatchScalarField.C |   2 +-
 ...veViewFactorFixedValueFvPatchScalarField.C |   2 +-
 ...iffusiveRadiationMixedFvPatchScalarField.C |   2 +-
 .../enthalpySorptionFvPatchScalarField.C      |   4 +-
 .../speciesSorptionFvPatchScalarField.C       |   4 +-
 ...haContactAngleTwoPhaseFvPatchScalarField.C |   2 +-
 ...stantAlphaContactAngleFvPatchScalarField.C |   2 +-
 ...namicAlphaContactAngleFvPatchScalarField.C |   2 +-
 ...ndentAlphaContactAngleFvPatchScalarField.C |   2 +-
 ...ryingAlphaContactAngleFvPatchScalarField.C |   2 +-
 .../alphaFixedPressureFvPatchScalarField.C    |   4 +-
 .../waveAlpha/waveAlphaFvPatchScalarField.C   |   2 +-
 .../waveVelocityFvPatchVectorField.C          |   2 +-
 .../waveMakerPointPatchVectorField.C          |   2 +-
 .../waveMakerPointPatchVectorField.H          |   2 +-
 310 files changed, 1138 insertions(+), 648 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index 8b93ea74c3..ff83ae3616 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -203,7 +203,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::updateCoeffs()
 // Write
 void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
@@ -213,7 +213,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
     os.writeEntry("accommodationCoeff", accommodationCoeff_);
     Twall_.writeEntry("Twall", os);
     os.writeEntry("gamma", gamma_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 6d0bd7e488..112be32386 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -197,7 +197,7 @@ void Foam::maxwellSlipUFvPatchVectorField::updateCoeffs()
 
 void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("T", "T", TName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
@@ -212,7 +212,7 @@ void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
     refValue().writeEntry("refValue", os);
     valueFraction().writeEntry("valueFraction", os);
 
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
index bbc871e6b8..e08ce4d68e 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.C
@@ -115,11 +115,10 @@ void Foam::fixedRhoFvPatchScalarField::updateCoeffs()
 
 void Foam::fixedRhoFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
     os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
index ba6b51f3d2..b8243c017b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
@@ -485,7 +485,7 @@ void turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     os.writeEntry("kappaMethod", KMethodTypeNames_[method_]);
     os.writeEntryIfDifferent<word>("kappa","none", kappaName_);
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index 83dfb3eb3b..58c9b2147b 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -102,8 +102,8 @@ void Foam::adjointOutletPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::adjointOutletPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 98c1d8258b..eec156bbb6 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -107,8 +107,8 @@ void Foam::adjointOutletVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::adjointOutletVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 9f3b22d053..9fb48aa278 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -126,9 +126,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 
 void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("thetaProperties", thetaProps_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 77b08137bc..9c11cf8913 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -126,9 +126,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 
 void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("thetaProperties", thetaProps_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index ca656a739e..1e9619c65e 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -195,10 +195,10 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs()
 
 void tractionDisplacementFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     traction_.writeEntry("traction", os);
     pressure_.writeEntry("pressure", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index f0fdb53f43..be853da48b 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -182,10 +182,10 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs()
 // Write
 void tractionDisplacementCorrectionFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     traction_.writeEntry("traction", os);
     pressure_.writeEntry("pressure", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index b58cadd63d..7c1bb0e8d6 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -225,7 +225,7 @@ void Foam::CLASS::write
     fieldData_.writeEntry("fieldData", os);
     timeVsData_->writeData(os);
     os.writeEntry("wordData", wordData_);
-    this->writeEntry("value", os);
+    FVPATCHF::writeValueEntry(os);
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
index 7db5c443d3..9377eb2e07 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
@@ -74,7 +74,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         basicSymmetryPointPatchField
         (
             const basicSymmetryPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
index 4571da163f..1ceaba98a4 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
@@ -77,7 +77,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         calculatedPointPatchField
         (
             const calculatedPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
index 6113b73f32..616743df38 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
@@ -78,7 +78,7 @@ public:
             const dictionary& dict
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         coupledPointPatchField
         (
             const coupledPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index f79cc07cd8..ed53c84404 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -78,7 +78,7 @@ public:
             const bool valueRequired=true
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         fixedValuePointPatchField
         (
             const fixedValuePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index f9eacfb3be..e47b18e14a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,41 @@ License
 #include "valuePointPatchField.H"
 #include "pointPatchFieldMapper.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::valuePointPatchField<Type>::readValueEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = pointPatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+    if (eptr)
+    {
+        Field<Type>::assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'value' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -164,7 +199,7 @@ template<class Type>
 void Foam::valuePointPatchField<Type>::write(Ostream& os) const
 {
     pointPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index ee6e119341..f49bce09a0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef valuePointPatchField_H
-#define valuePointPatchField_H
+#ifndef Foam_valuePointPatchField_H
+#define Foam_valuePointPatchField_H
 
 #include "pointPatchField.H"
 
@@ -55,6 +55,26 @@ class valuePointPatchField
     public pointPatchField<Type>,
     public Field<Type>
 {
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "value" entry into \c *this.
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readValueEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+        //- Write \c *this field as a "value" entry
+        void writeValueEntry(Ostream& os) const
+        {
+            Field<Type>::writeEntry("value", os);
+        }
+
+
 public:
 
     //- Declare type-name, virtual type (with debug switch)
@@ -85,7 +105,7 @@ public:
             const bool valueRequired=true
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         valuePointPatchField
         (
             const valuePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
index 2a9e712375..1026efac17 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
@@ -76,7 +76,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         zeroGradientPointPatchField
         (
             const zeroGradientPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index e3c19117c9..f8cccfa7b0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -83,7 +83,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         cyclicPointPatchField
         (
             const cyclicPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
index d24e73e5cf..600fc2080b 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
@@ -78,7 +78,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         cyclicSlipPointPatchField
         (
             const cyclicSlipPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
index 44e8b0d633..146c79dfdc 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
@@ -78,7 +78,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         emptyPointPatchField
         (
             const emptyPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
index 08264693c0..982884b84a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
@@ -78,7 +78,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         nonuniformTransformCyclicPointPatchField
         (
             const nonuniformTransformCyclicPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 6741795e03..ed9f82d669 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -82,7 +82,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         processorPointPatchField
         (
             const processorPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index 50d8243521..b4d5a5396a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -87,7 +87,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         processorCyclicPointPatchField
         (
             const processorCyclicPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
index 5fa3778483..7be7b6ff01 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
@@ -78,7 +78,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         symmetryPointPatchField
         (
             const symmetryPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
index f25e7c8f06..1422a61320 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
@@ -83,7 +83,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         symmetryPlanePointPatchField
         (
             const symmetryPlanePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
index 2b3c1cd2ab..7b2ebc8586 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
@@ -78,7 +78,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         wedgePointPatchField
         (
             const wedgePointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index 1b10db1f7e..af6f43bd5a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -238,7 +238,7 @@ Foam::codedFixedValuePointPatchField<Type>::redirectPatchField() const
         // Make sure to construct the patchfield with up-to-date value
 
         OStringStream os;
-        static_cast<const Field<Type>&>(*this).writeEntry("value", os);
+        this->writeValueEntry(os);
         IStringStream is(os.str());
         dictionary constructDict(is);
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
index 69d489e3a1..d4c031350e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
@@ -95,7 +95,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         fixedNormalSlipPointPatchField
         (
             const fixedNormalSlipPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
index 9f67b789cc..027cc956ad 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
@@ -77,7 +77,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         slipPointPatchField
         (
             const slipPointPatchField<Type>&,
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 32e1ad2d7e..97723a1a94 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -47,6 +47,7 @@ SourceFiles
 
 #include "pointPatch.H"
 #include "DimensionedField.H"
+#include "fieldTypes.H"
 #include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,8 +56,8 @@ namespace Foam
 {
 
 // Forward Declarations
-class objectRegistry;
 class dictionary;
+class objectRegistry;
 class pointPatchFieldMapper;
 class pointMesh;
 
@@ -266,7 +267,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         pointPatchField
         (
             const pointPatchField<Type>&,
@@ -361,47 +362,46 @@ public:
         static const word& zeroGradientType();
 
 
-        // Attributes
+    // Attributes
 
-            //- True if this patch field fixes a value
-            virtual bool fixesValue() const
-            {
-                return false;
-            }
+        //- True if this patch field fixes a value
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
 
-            //- True if this patch field is coupled
-            virtual bool coupled() const
-            {
-                return false;
-            }
+        //- True if this patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
 
-            //- The constraint type this pointPatchField implements.
-            virtual const word& constraintType() const
-            {
-                return word::null;
-            }
+        //- The constraint type this pointPatchField implements.
+        virtual const word& constraintType() const
+        {
+            return word::null;
+        }
 
 
-        // Access
+    // Access
 
-            //- Return the patch size
-            label size() const
-            {
-                return patch().size();
-            }
+        //- Return the patch size
+        label size() const
+        {
+            return patch().size();
+        }
 
-            //- Return const-reference to the dimensioned internal field
-            const DimensionedField<Type, pointMesh>& internalField()
-            const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the dimensioned internal field
+        const DimensionedField<Type, pointMesh>& internalField() const noexcept
+        {
+            return internalField_;
+        }
 
-            //- Return const-reference to the internal field values
-            const Field<Type>& primitiveField() const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the internal field values
+        const Field<Type>& primitiveField() const noexcept
+        {
+            return internalField_;
+        }
 
 
         // Evaluation Functions
@@ -537,9 +537,9 @@ public:
         // By generic these do nothing unless the patch actually has boundary
         // values
 
-            virtual void operator==(const pointPatchField<Type>&){}
-            virtual void operator==(const Field<Type>&){}
-            virtual void operator==(const Type&){}
+        virtual void operator==(const pointPatchField<Type>&){}
+        virtual void operator==(const Field<Type>&){}
+        virtual void operator==(const Type&){}
 
 
     // Ostream Operator
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 6570f60134..df8a340977 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -292,7 +292,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
     os.writeEntry("Prt", Prt_);
     os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
     os.writeEntryIfDifferent<scalar>("E", 9.8, E_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index c4af50f5a6..2266a1430a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -168,11 +168,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("mixingLength", mixingLength_);
     os.writeEntry("phi", this->phiName_);
     os.writeEntry("k", kName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index fca946ff5f..084965c11c 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -157,11 +157,11 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("mixingLength", mixingLength_);
     os.writeEntry("phi", this->phiName_);
     os.writeEntry("k", kName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index f375d61fd9..286eba0bbf 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -128,9 +128,9 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
 
 void Foam::fixedShearStressFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("tau", tau0_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 63d5e27b79..ebe1493312 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -615,7 +615,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::write
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index b5a6833644..9be86fab62 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -204,7 +204,7 @@ void Foam::kLowReWallFunctionFvPatchScalarField::write
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 35eaa1af8c..7b78f74e81 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -103,7 +103,7 @@ template<class Type>
 void Foam::kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
 {
     zeroGradientFvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
index 1d8f374bcb..f2fec85614 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
@@ -137,7 +137,7 @@ void Foam::nutLowReWallFunctionFvPatchScalarField::write
 ) const
 {
     nutWallFunctionFvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
index 77ca610cee..4f7e1c3591 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.C
@@ -232,7 +232,7 @@ void Foam::nutUBlendedWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 59f42256bc..bc5357d3a4 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -343,7 +343,7 @@ void Foam::nutURoughWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
index 76ed241788..4e36e6dac0 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
@@ -350,7 +350,7 @@ void Foam::nutUSpaldingWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index a8eb1c3d2a..5281d8159f 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -225,7 +225,7 @@ void Foam::nutUTabulatedWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
index 506d4caee1..af072fe580 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
@@ -313,7 +313,7 @@ void Foam::nutUWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
index 4902ce4c69..0610d97a80 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
@@ -242,7 +242,7 @@ void Foam::nutkRoughWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
index 7f846f29a4..8d9e40ea65 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
@@ -270,7 +270,7 @@ void Foam::nutkWallFunctionFvPatchScalarField::write
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 573edc8bbc..d38f1632c5 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -606,7 +606,7 @@ void Foam::omegaWallFunctionFvPatchScalarField::write
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index aff00e89ba..1c4216ed16 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -149,10 +149,10 @@ void atmBoundaryLayerInletEpsilonFvPatchScalarField::rmap
 
 void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     atmBoundaryLayer::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index 7fc3d768e3..1590676c7b 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -148,10 +148,10 @@ void atmBoundaryLayerInletKFvPatchScalarField::rmap
 
 void atmBoundaryLayerInletKFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     atmBoundaryLayer::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
index 7cc4e9490d..12aff01673 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
@@ -147,10 +147,10 @@ void atmBoundaryLayerInletOmegaFvPatchScalarField::rmap
 
 void atmBoundaryLayerInletOmegaFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     atmBoundaryLayer::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 077a47391b..51eacba6a0 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -148,10 +148,10 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::rmap
 
 void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     atmBoundaryLayer::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index 34c01bdc69..de95132cd0 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -230,12 +230,12 @@ void atmTurbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
 
 void atmTurbulentHeatFluxTemperatureFvPatchScalarField::write(Ostream& os) const
 {
-    fixedGradientFvPatchScalarField::write(os);
+    fixedGradientFvPatchField<scalar>::write(os);
     os.writeEntry("heatSource", heatSourceTypeNames[heatSource_]);
     os.writeEntry("alphaEff", alphaEffName_);
     Cp0_->writeData(os);
     q_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
index da7b552fa0..461b3a46c7 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
@@ -321,7 +321,7 @@ void atmAlphatkWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C
index 2476dd5cea..8b290036ea 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.C
@@ -236,7 +236,7 @@ void Foam::atmEpsilonWallFunctionFvPatchScalarField::write
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C
index 17161e0424..175f4d3c3a 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.C
@@ -215,7 +215,7 @@ void atmNutUWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
index 07cff2cf50..da1a3fd09a 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.C
@@ -236,7 +236,7 @@ void atmNutWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
index 77dae9169f..deaae7c9dc 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.C
@@ -223,7 +223,7 @@ void atmNutkWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C
index 762eec3204..d5ddca515b 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.C
@@ -220,7 +220,7 @@ void Foam::atmOmegaWallFunctionFvPatchScalarField::write
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
index a0964ff720..e6fdb5558d 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
@@ -166,9 +166,9 @@ void Foam::freeSurfacePressureFvPatchScalarField::updateCoeffs()
 
 void Foam::freeSurfacePressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     pa_.writeEntry("pa", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
index 29c9b16a0f..30076a0f3c 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
@@ -113,8 +113,8 @@ void Foam::freeSurfaceVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::freeSurfaceVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fixedGradientFvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fixedGradientFvPatchField<vector>::write(os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index 2fd56f1a4a..43ac06e52f 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -181,7 +181,7 @@ void solidBodyMotionDisplacementPointPatchVectorField::
 write(Ostream& os) const
 {
     // Note: write value
-    fixedValuePointPatchVectorField::write(os);
+    fixedValuePointPatchField<vector>::write(os);
 
     os.writeEntry(solidBodyMotionFunction::typeName, SBMFPtr_->type());
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
index b999e7f3d0..1ed9211e1b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
@@ -86,7 +86,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         solidBodyMotionDisplacementPointPatchVectorField
         (
             const solidBodyMotionDisplacementPointPatchVectorField&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
index 2a26313135..f266ca1457 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
@@ -211,7 +211,7 @@ template<class Type>
 void Foam::calculatedFaPatchField<Type>::write(Ostream& os) const
 {
     faPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
index 725a24812f..e800cb7a0c 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
@@ -80,7 +80,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         calculatedFaPatchField
         (
             const calculatedFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
index f51167f35c..5a029c1d5c 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
@@ -178,7 +178,7 @@ template<class Type>
 void Foam::coupledFaPatchField<Type>::write(Ostream& os) const
 {
     faPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
index 45c7969bf9..a7c959c76b 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
@@ -84,8 +84,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given fixedGradientFaPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedGradient patch field
+        //- onto a new patch
         fixedGradientFaPatchField
         (
             const fixedGradientFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
index 5cc1d79061..9b786c0c8c 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
@@ -133,7 +133,7 @@ template<class Type>
 void Foam::fixedValueFaPatchField<Type>::write(Ostream& os) const
 {
     faPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
index e363dcbe8a..a0ead76291 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
@@ -80,8 +80,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given fixedValueFaPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedValue patch field
+        //- onto a new patch
         fixedValueFaPatchField
         (
             const fixedValueFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index 72e0d958a8..226a11b02d 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +28,58 @@ License
 
 #include "mixedFaPatchField.H"
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::mixedFaPatchField<Type>::readMixedEntries
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = faPatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    // If there is a 'refValue', also require all others
+    const auto* hasValue = dict.findEntry("refValue", keyType::LITERAL);
+
+    if (!hasValue && IOobjectOption::isReadOptional(readOpt))
+    {
+        return false;
+    }
+
+    const auto* hasGrad = dict.findEntry("refGradient", keyType::LITERAL);
+    const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
+
+    // Combined error message on failure
+    if (!hasValue || !hasGrad || !hasFrac)
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entries:";
+
+        if (!hasValue) FatalIOError << " 'refValue'";
+        if (!hasGrad)  FatalIOError << " 'refGradient'";
+        if (!hasFrac)  FatalIOError << " 'valueFraction'";
+
+        FatalIOError
+            << " : missing for patch " << p.name()
+            << " : in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    // Everything verified - can assign
+    refValue_.assign(*hasValue, p.size());
+    refGrad_.assign(*hasGrad, p.size());
+    valueFraction_.assign(*hasFrac, p.size());
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::mixedFaPatchField<Type>::mixedFaPatchField
@@ -217,7 +269,7 @@ void Foam::mixedFaPatchField<Type>::write(Ostream& os) const
     refValue_.writeEntry("refValue", os);
     refGrad_.writeEntry("refGradient", os);
     valueFraction_.writeEntry("valueFraction", os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
index 9688abda35..e635690c1f 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +28,17 @@ Class
     Foam::mixedFaPatchField
 
 Description
+    This boundary condition provides a base class for 'mixed' type boundary
+    conditions, i.e. conditions that mix fixed value and patch-normal gradient
+    conditions.
+
+Usage
+    \table
+        Property     | Description                          | Required | Default
+        refValue     | fixed value                          | yes |
+        refGradient  | patch normal gradient                | yes |
+        valueFraction | value weighting (0-1)               | yes |
+    \endtable
 
 Author
     Zeljko Tukovic, FMENA
@@ -37,8 +49,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mixedFaPatchField_H
-#define mixedFaPatchField_H
+#ifndef Foam_mixedFaPatchField_H
+#define Foam_mixedFaPatchField_H
 
 #include "faPatchField.H"
 
@@ -56,7 +68,7 @@ class mixedFaPatchField
 :
     public faPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Value field
         Field<Type> refValue_;
@@ -68,6 +80,21 @@ class mixedFaPatchField
         scalarField valueFraction_;
 
 
+protected:
+
+        //- Read the "refValue", "refGradient" and "valueFraction" entries
+        //- into their respective places.
+        //  The reading can be optional (default), mandatory etc.
+        //  If refValue is to be read, refGradient and valueFraction must
+        //  also exist.
+        //  \returns True on success
+        bool readMixedEntries
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+
 public:
 
     //- Runtime type information
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
index 06bc08d8e9..becbcfcf05 100644
--- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C
@@ -265,7 +265,7 @@ template<class Type>
 void Foam::slicedFaPatchField<Type>::write(Ostream& os) const
 {
     faPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
index 32f1b350a1..ef83ff9cd8 100644
--- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
@@ -103,8 +103,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given slicedFaPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given sliced patch field
+        //- onto a new patch
         slicedFaPatchField
         (
             const slicedFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
index 22af0265ec..cfc991aba1 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
@@ -81,8 +81,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given transformFaPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given transform patch field
+        //- onto a new patch
         transformFaPatchField
         (
             const transformFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
index bbb1493097..3a0c3ef6cc 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
@@ -80,8 +80,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given zeroGradientFaPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given zeroGradient patch field
+        //- onto a new patch
         zeroGradientFaPatchField
         (
             const zeroGradientFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
index d1d340b8d9..d6fb84c4ed 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
@@ -167,7 +167,7 @@ template<class Type>
 void clampedPlateFaPatchField<Type>::write(Ostream& os) const
 {
     faPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
index ad740c900b..acce423a43 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
@@ -98,7 +98,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given clampedPlateFaPatchField<Type>
+        //- Construct by mapping the given clampedPlate patch field
         //- onto a new patch
         clampedPlateFaPatchField
         (
diff --git a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
index 1db9e22015..541dd89b0f 100644
--- a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
@@ -134,7 +134,7 @@ void Foam::edgeNormalFixedValueFaPatchVectorField::updateCoeffs()
 
 void Foam::edgeNormalFixedValueFaPatchVectorField::write(Ostream& os) const
 {
-    fixedValueFaPatchVectorField::write(os);
+    fixedValueFaPatchField<vector>::write(os);
     refValue_.writeEntry("refValue", os);
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
index 1f73182c1f..e254e255b4 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
@@ -133,7 +133,7 @@ template<class Type>
 void Foam::fixedValueOutflowFaPatchField<Type>::write(Ostream& os) const
 {
     faPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
index fa22145c57..ffbf7b22ba 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
@@ -80,8 +80,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given fixedValueOutflowFaPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedValueOutflow patch field
+        //- onto a new patch
         fixedValueOutflowFaPatchField
         (
             const fixedValueOutflowFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index 361d58adb8..cf93fde241 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -138,7 +138,7 @@ void Foam::inletOutletFaPatchField<Type>::write(Ostream& os) const
     faPatchField<Type>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     this->refValue().writeEntry("inletValue", os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
index 1bba29333b..2abee7d91c 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
@@ -132,7 +132,7 @@ void Foam::timeVaryingUniformFixedValueFaPatchField<Type>::write
 {
     faPatchField<Type>::write(os);
     timeSeries_.write(os);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index ff5fc8f317..8f04bb6514 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,9 +26,45 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "dictionary.H"
 #include "faPatchField.H"
 #include "faPatchFieldMapper.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::faPatchField<Type>::readValueEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = faPatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+    if (eptr)
+    {
+        Field<Type>::assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'value' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -49,11 +85,11 @@ Foam::faPatchField<Type>::faPatchField
 (
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
-    const Field<Type>& f
+    const Field<Type>& pfld
 )
 :
     faPatchFieldBase(p),
-    Field<Type>(f),
+    Field<Type>(pfld),
     internalField_(iF)
 {}
 
@@ -61,14 +97,13 @@ Foam::faPatchField<Type>::faPatchField
 template<class Type>
 Foam::faPatchField<Type>::faPatchField
 (
-    const faPatchField<Type>& ptf,
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
-    const faPatchFieldMapper& mapper
+    Field<Type>&& pfld
 )
 :
-    faPatchFieldBase(ptf, p),
-    Field<Type>(ptf, mapper),
+    faPatchFieldBase(p),
+    Field<Type>(std::move(pfld)),
     internalField_(iF)
 {}
 
@@ -101,6 +136,21 @@ Foam::faPatchField<Type>::faPatchField
 }
 
 
+template<class Type>
+Foam::faPatchField<Type>::faPatchField
+(
+    const faPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    faPatchFieldBase(ptf, p),
+    Field<Type>(ptf, mapper),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::faPatchField<Type>::faPatchField
 (
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index bc915135c5..fd8196ddfb 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,6 +51,7 @@ SourceFiles
 
 #include "faPatch.H"
 #include "DimensionedField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,8 +59,8 @@ namespace Foam
 {
 
 // Forward Declarations
-class objectRegistry;
 class dictionary;
+class objectRegistry;
 class faPatchFieldMapper;
 class areaMesh;
 
@@ -195,6 +196,25 @@ class faPatchField
         //- Reference to internal field
         const DimensionedField<Type, areaMesh>& internalField_;
 
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "value" entry into \c *this.
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readValueEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+        //- Write *this field as a "value" entry
+        void writeValueEntry(Ostream& os) const
+        {
+            Field<Type>::writeEntry("value", os);
+        }
+
 
 public:
 
@@ -259,12 +279,20 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct from patch and internal field and patch field
+        //- Construct from patch, internal field and patch field
         faPatchField
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const Field<Type>&
+            const Field<Type>& pfld
+        );
+
+        //- Construct from patch, internal field and patch field
+        faPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            Field<Type>&& pfld
         );
 
         //- Construct from patch, internal field and dictionary
@@ -375,37 +403,36 @@ public:
         static const word& zeroGradientType();
 
 
-        // Attributes
+    // Attributes
 
-            //- True if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return false;
-            }
+        //- True if this patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
 
-            //- True if this patch field is coupled
-            virtual bool coupled() const
-            {
-                return false;
-            }
+        //- True if this patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
 
 
-        // Access
+    // Access
 
-            //- Return const-reference to the dimensioned internal field
-            const DimensionedField<Type, areaMesh>& internalField()
-            const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the dimensioned internal field
+        const DimensionedField<Type, areaMesh>& internalField() const noexcept
+        {
+            return internalField_;
+        }
 
-            //- Return const-reference to the internal field values
-            const Field<Type>& primitiveField() const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the internal field values
+        const Field<Type>& primitiveField() const noexcept
+        {
+            return internalField_;
+        }
 
 
         // Mapping
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
index 93e3b6ccf4..d27fa0bfa6 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
@@ -134,7 +134,7 @@ template<class Type>
 void Foam::calculatedFaePatchField<Type>::write(Ostream& os) const
 {
     faePatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faePatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
index 3a3e2564e3..f2343d1f3f 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedFaePatchField_H
-#define calculatedFaePatchField_H
+#ifndef Foam_calculatedFaePatchField_H
+#define Foam_calculatedFaePatchField_H
 
 #include "faePatchField.H"
 
@@ -57,7 +57,6 @@ class calculatedFaePatchField
 :
     public faePatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -81,7 +80,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         calculatedFaePatchField
         (
             const calculatedFaePatchField<Type>&,
@@ -91,10 +90,7 @@ public:
         );
 
         //- Construct as copy
-        calculatedFaePatchField
-        (
-            const calculatedFaePatchField<Type>&
-        );
+        calculatedFaePatchField(const calculatedFaePatchField<Type>&);
 
         //- Construct and return a clone
         virtual tmp<faePatchField<Type>> clone() const
@@ -128,7 +124,7 @@ public:
     virtual ~calculatedFaePatchField() = default;
 
 
-    // Member functions
+    // Member Functions
 
         // Access
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
index e0e49569f5..0e8f5ef63e 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
@@ -104,7 +104,7 @@ template<class Type>
 void Foam::coupledFaePatchField<Type>::write(Ostream& os) const
 {
     faePatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faePatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
index 08630e0a00..a92fb3f175 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef coupledFaePatchField_H
-#define coupledFaePatchField_H
+#ifndef Foam_coupledFaePatchField_H
+#define Foam_coupledFaePatchField_H
 
 #include "faePatchField.H"
 #include "coupledFaPatch.H"
@@ -58,7 +58,6 @@ class coupledFaePatchField
 :
     public faePatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -74,7 +73,7 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
-        //- Construct from patch and internal field and patch field
+        //- Construct from patch, internal field and patch field
         coupledFaePatchField
         (
             const faPatch&,
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
index c1a626036a..0455efdbcf 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
@@ -92,7 +92,7 @@ template<class Type>
 void Foam::fixedValueFaePatchField<Type>::write(Ostream& os) const
 {
     faePatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    faePatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
index 7d55e6aa05..7d36b4d063 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValueFaePatchField_H
-#define fixedValueFaePatchField_H
+#ifndef Foam_fixedValueFaePatchField_H
+#define Foam_fixedValueFaePatchField_H
 
 #include "faePatchField.H"
 
@@ -57,7 +57,6 @@ class fixedValueFaePatchField
 :
     public faePatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -81,8 +80,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given fixedValueFaePatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedValue patch field
+        //- onto a new patch
         fixedValueFaePatchField
         (
             const fixedValueFaePatchField<Type>&,
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
index 134d1cda39..40caa47ba1 100644
--- a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
@@ -97,8 +97,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given slicedFaePatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given sliced patch field onto a new patch
         slicedFaePatchField
         (
             const slicedFaePatchField<Type>&,
diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
index 6034bad11f..180033d5e7 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicFaePatchField_H
-#define cyclicFaePatchField_H
+#ifndef Foam_cyclicFaePatchField_H
+#define Foam_cyclicFaePatchField_H
 
 #include "coupledFaePatchField.H"
 #include "cyclicFaPatch.H"
@@ -85,7 +85,7 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, edgeMesh>&,
-            const dictionary&
+            const dictionary& dict
         );
 
         //- Construct by mapping given cyclicFaePatchField onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
index f92bcd0b4e..03b86c0cda 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef emptyFaePatchField_H
-#define emptyFaePatchField_H
+#ifndef Foam_emptyFaePatchField_H
+#define Foam_emptyFaePatchField_H
 
 #include "faePatchField.H"
 #include "emptyFaPatch.H"
@@ -58,7 +58,6 @@ class emptyFaePatchField
 :
     public faePatchField<Type>
 {
-
 public:
 
     //- Runtime type information
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
index 2bf557d703..d39e63eb25 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
@@ -122,11 +122,4 @@ Foam::processorFaePatchField<Type>::processorFaePatchField
 {}
 
 
-// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::processorFaePatchField<Type>::~processorFaePatchField()
-{}
-
-
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H
index 3b6c5f8585..c8f9e6441f 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorFaePatchField_H
-#define processorFaePatchField_H
+#ifndef Foam_processorFaePatchField_H
+#define Foam_processorFaePatchField_H
 
 #include "coupledFaePatchField.H"
 #include "processorFaPatch.H"
@@ -57,7 +57,7 @@ class processorFaePatchField
 :
     public coupledFaePatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the processor patch
         const processorFaPatch& procPatch_;
@@ -135,8 +135,8 @@ public:
         }
 
 
-    // Destructor
-    virtual ~processorFaePatchField();
+    //- Destructor
+    virtual ~processorFaePatchField() = default;
 
 
     // Member Functions
diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
index 9c2ef73e2a..ff0d676a29 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmetryFaePatchField_H
-#define symmetryFaePatchField_H
+#ifndef Foam_symmetryFaePatchField_H
+#define Foam_symmetryFaePatchField_H
 
 #include "faePatchField.H"
 #include "symmetryFaPatch.H"
@@ -59,7 +59,6 @@ class symmetryFaePatchField
 :
     public faePatchField<Type>
 {
-
 public:
 
     //- Runtime type information
diff --git a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H
index 12f943a652..017e642643 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchField.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wedgeFaePatchField_H
-#define wedgeFaePatchField_H
+#ifndef Foam_wedgeFaePatchField_H
+#define Foam_wedgeFaePatchField_H
 
 #include "faePatchField.H"
 #include "wedgeFaPatch.H"
@@ -57,7 +57,6 @@ class wedgeFaePatchField
 :
     public faePatchField<Type>
 {
-
 public:
 
     //- Runtime type information
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
index d45518577a..26cfa178c9 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,41 @@ License
 #include "faePatchField.H"
 #include "faPatchFieldMapper.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::faePatchField<Type>::readValueEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = faePatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+    if (eptr)
+    {
+        Field<Type>::assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'value' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -49,11 +84,11 @@ Foam::faePatchField<Type>::faePatchField
 (
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
-    const Field<Type>& f
+    const Field<Type>& pfld
 )
 :
     faePatchFieldBase(p),
-    Field<Type>(f),
+    Field<Type>(pfld),
     internalField_(iF)
 {}
 
@@ -61,14 +96,13 @@ Foam::faePatchField<Type>::faePatchField
 template<class Type>
 Foam::faePatchField<Type>::faePatchField
 (
-    const faePatchField<Type>& ptf,
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
-    const faPatchFieldMapper& mapper
+    Field<Type>&& pfld
 )
 :
-    faePatchFieldBase(ptf, p),
-    Field<Type>(ptf, mapper),
+    faePatchFieldBase(p),
+    Field<Type>(std::move(pfld)),
     internalField_(iF)
 {}
 
@@ -98,6 +132,21 @@ Foam::faePatchField<Type>::faePatchField
 }
 
 
+template<class Type>
+Foam::faePatchField<Type>::faePatchField
+(
+    const faePatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    faePatchFieldBase(ptf, p),
+    Field<Type>(ptf, mapper),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::faePatchField<Type>::faePatchField
 (
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index 720a4f00e5..d4b73f5b13 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -51,6 +51,7 @@ SourceFiles
 
 #include "faPatch.H"
 #include "DimensionedField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,9 +59,8 @@ namespace Foam
 {
 
 // Forward Declarations
-
-class objectRegistry;
 class dictionary;
+class objectRegistry;
 class faPatchFieldMapper;
 class edgeMesh;
 
@@ -159,6 +159,25 @@ class faePatchField
         //- Reference to internal field
         const DimensionedField<Type, edgeMesh>& internalField_;
 
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "value" entry into \c *this.
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readValueEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+        //- Write \c *this field as a "value" entry
+        void writeValueEntry(Ostream& os) const
+        {
+            Field<Type>::writeEntry("value", os);
+        }
+
 
 public:
 
@@ -223,12 +242,20 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
-        //- Construct from patch and internal field and patch field
+        //- Construct from patch, internal field and patch field
         faePatchField
         (
             const faPatch&,
             const DimensionedField<Type, edgeMesh>&,
-            const Field<Type>&
+            const Field<Type>& pfld
+        );
+
+        //- Construct from patch, internal field and patch field
+        faePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            Field<Type>&& pfld
         );
 
         //- Construct from patch, internal field and dictionary
@@ -339,37 +366,36 @@ public:
         static const word& calculatedType();
 
 
-        // Attributes
+    // Attributes
 
-            //- True if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return false;
-            }
+        //- True if this patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
 
-            //- True if this patch field is coupled
-            virtual bool coupled() const
-            {
-                return false;
-            }
+        //- True if this patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
 
 
-        // Access
+    // Access
 
-            //- Return const-reference to the dimensioned internal field
-            const DimensionedField<Type, edgeMesh>& internalField()
-            const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the dimensioned internal field
+        const DimensionedField<Type, edgeMesh>& internalField() const noexcept
+        {
+            return internalField_;
+        }
 
-            //- Return const-reference to the internal field values
-            const Field<Type>& primitiveField() const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the internal field values
+        const Field<Type>& primitiveField() const noexcept
+        {
+            return internalField_;
+        }
 
 
         // Mapping
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index 2293143980..bdd1de4779 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -160,11 +160,11 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::SRFFreestreamVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("relative", relative_);
     os.writeEntry("UInf", UInf_);
     os.writeEntry("phi", this->phiName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
index d9fd52e7d9..a39dd2e622 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
@@ -154,10 +154,10 @@ void Foam::SRFVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::SRFVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("relative", relative_);
     inletValue_.writeEntry("inletValue", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
index 649c6d15d1..4ac7e6d14e 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFWallVelocityFvPatchVectorField/SRFWallVelocityFvPatchVectorField.C
@@ -131,8 +131,8 @@ void Foam::SRFWallVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::SRFWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
index 6551b09b7a..1fdce54c39 100644
--- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
+++ b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
@@ -240,7 +240,7 @@ void Foam::exprValuePointPatchField<Type>::write(Ostream& os) const
     this->parent_bctype::write(os);
     expressions::patchExprFieldBase::write(os);
 
-    this->writeEntry("value", os);
+    this->writeValueEntry(os);
 
     driver_.writeCommon(os, this->debug_ || debug);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index 520c50d258..f9ecc13974 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -220,7 +220,7 @@ template<class Type>
 void Foam::calculatedFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index 8bda1044d5..075edc9345 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -93,7 +93,7 @@ public:
             const bool valueRequired=true
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         calculatedFvPatchField
         (
             const calculatedFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 9af6d0d988..c68079214a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -213,7 +213,7 @@ template<class Type>
 void Foam::coupledFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index 51fc8fd9e8..1f23f5acc6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
@@ -208,7 +208,7 @@ void Foam::directionMixedFvPatchField<Type>::write(Ostream& os) const
     refValue_.writeEntry("refValue", os);
     refGrad_.writeEntry("refGradient", os);
     valueFraction_.writeEntry("valueFraction", os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
index 346fc3def6..3429c1bbf4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -92,7 +92,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         extrapolatedCalculatedFvPatchField
         (
             const extrapolatedCalculatedFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index e2ca03ba1f..f022f059db 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -156,7 +156,7 @@ template<class Type>
 void Foam::fixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index e192bfba74..13f7092153 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -105,8 +105,8 @@ public:
             const bool valueRequired=true
         );
 
-        //- Construct by mapping the given fixedValueFvPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedValue patch field
+        //- onto a new patch
         fixedValueFvPatchField
         (
             const fixedValueFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index a1ec7e3b99..3aa783d5b6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +28,58 @@ License
 
 #include "mixedFvPatchField.H"
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::mixedFvPatchField<Type>::readMixedEntries
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = fvPatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    // If there is a 'refValue', also require all others
+    const auto* hasValue = dict.findEntry("refValue", keyType::LITERAL);
+
+    if (!hasValue && IOobjectOption::isReadOptional(readOpt))
+    {
+        return false;
+    }
+
+    const auto* hasGrad = dict.findEntry("refGradient", keyType::LITERAL);
+    const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
+
+    // Combined error message on failure
+    if (!hasValue || !hasGrad || !hasFrac)
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entries:";
+
+        if (!hasValue) FatalIOError << " 'refValue'";
+        if (!hasGrad)  FatalIOError << " 'refGradient'";
+        if (!hasFrac)  FatalIOError << " 'valueFraction'";
+
+        FatalIOError
+            << " : missing for patch " << p.name()
+            << " : in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    // Everything verified - can assign
+    refValue_.assign(*hasValue, p.size());
+    refGrad_.assign(*hasGrad, p.size());
+    valueFraction_.assign(*hasFrac, p.size());
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::mixedFvPatchField<Type>::mixedFvPatchField
@@ -239,7 +291,7 @@ void Foam::mixedFvPatchField<Type>::write(Ostream& os) const
     refGrad_.writeEntry("refGradient", os);
     valueFraction_.writeEntry("valueFraction", os);
     source_.writeEntry("source", os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index deec0f77d9..3181d45b9c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,8 +70,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mixedFvPatchField_H
-#define mixedFvPatchField_H
+#ifndef Foam_mixedFvPatchField_H
+#define Foam_mixedFvPatchField_H
 
 #include "fvPatchField.H"
 
@@ -89,7 +89,7 @@ class mixedFvPatchField
 :
     public fvPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Value field
         Field<Type> refValue_;
@@ -104,6 +104,21 @@ class mixedFvPatchField
         Field<Type> source_;
 
 
+protected:
+
+        //- Read the 'refValue', 'refGradient' and 'valueFraction' entries
+        //- into their respective places.
+        //  The reading can be optional (default), mandatory etc.
+        //  If 'refValue' is to be read, refGradient and valueFraction must
+        //  also exist.
+        //  \returns True on success
+        bool readMixedEntries
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+
 public:
 
     //- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index f444464af0..d886c4d8d3 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -265,7 +265,7 @@ template<class Type>
 void Foam::slicedFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 8d1d515251..21ffe3bf11 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -103,8 +103,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given slicedFvPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given sliced patch field onto a new patch
         slicedFvPatchField
         (
             const slicedFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index 53766157f8..4bb2e5016f 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -80,8 +80,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given transformFvPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given transform patch field
+        //- onto a new patch
         transformFvPatchField
         (
             const transformFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
index 19902ae54b..05cc20e4b5 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
@@ -90,8 +90,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given zeroGradientFvPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given zeroGradient patch field
+        //- onto a new patch
         zeroGradientFvPatchField
         (
             const zeroGradientFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index b796999044..80ffb25e5c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -459,7 +459,7 @@ template<class Type>
 void Foam::cyclicACMIFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 61a7e49820..462335d418 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -439,7 +439,7 @@ template<class Type>
 void Foam::cyclicAMIFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C
index 9ebb26fbd5..cdad8bd4bd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/acousticWaveTransmissive/acousticWaveTransmissiveFvPatchField.C
@@ -112,7 +112,7 @@ void Foam::acousticWaveTransmissiveFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     os.writeEntry("advectiveSpeed", advectiveU_);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index ade392b016..c894f8d5af 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -295,14 +295,14 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::activeBaffleVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
     os.writeEntry("cyclicPatch", cyclicPatchName_);
     os.writeEntry("orientation", orientation_);
     os.writeEntry("openingTime", openingTime_);
     os.writeEntry("maxOpenFractionDelta", maxOpenFractionDelta_);
     os.writeEntry("openFraction", openFraction_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index e8148719a0..275cd38151 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -380,7 +380,7 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
 void Foam::activePressureForceBaffleVelocityFvPatchVectorField::
 write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
     os.writeEntry("cyclicPatch", cyclicPatchName_);
     os.writeEntry("openingTime", openingTime_);
@@ -389,7 +389,7 @@ write(Ostream& os) const
     os.writeEntry("minThresholdValue", minThresholdValue_);
     os.writeEntry("forceBased", fBased_);
     os.writeEntry("opening", opening_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index c3ff10de38..7090d4f49d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -339,7 +339,7 @@ void Foam::advectiveFvPatchField<Type>::write(Ostream& os) const
         os.writeEntry("lInf", lInf_);
     }
 
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 0ad7d09639..e247e42d98 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -236,7 +236,7 @@ Foam::codedFixedValueFvPatchField<Type>::redirectPatchField() const
         // Make sure to construct the patchfield with up-to-date value
 
         OStringStream os;
-        static_cast<const Field<Type>&>(*this).writeEntry("value", os);
+        this->writeValueEntry(os);
         IStringStream is(os.str());
         dictionary constructDict(is);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index b946c66c7d..cc824309b6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -158,7 +158,7 @@ void Foam::cylindricalInletVelocityFvPatchVectorField::write(Ostream& os) const
     axialVelocity_->writeData(os);
     radialVelocity_->writeData(os);
     rpm_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index c9718a9d7a..3a7ccee838 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -543,7 +543,7 @@ void Foam::electrostaticDepositionFvPatchScalarField::updateCoeffs()
 
 void Foam::electrostaticDepositionFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     h_.writeEntry("h", os);
 
@@ -574,7 +574,7 @@ void Foam::electrostaticDepositionFvPatchScalarField::write(Ostream& os) const
     qcum_.writeEntry("qCumulative", os);
     Vfilm_.writeEntry("Vfilm", os);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index de5afa2c80..c50dea362f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -174,8 +174,8 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fixedGradientFvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fixedGradientFvPatchField<scalar>::write(os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
index 8ab8a2be5d..d36397c073 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
@@ -100,8 +100,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given fixedInternalValueFvPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedInternalValue patch field
+        //- onto a new patch
         fixedInternalValueFvPatchField
         (
             const fixedInternalValueFvPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 3c4c046598..0f38fdc737 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -277,7 +277,7 @@ void Foam::fixedJumpFvPatchField<Type>::write(Ostream& os) const
         os.writeEntry("minJump", minJump_);
     }
 
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index f818753a31..b34710df2f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -178,7 +178,7 @@ void Foam::fixedJumpAMIFvPatchField<Type>::write(Ostream& os) const
         jump_.writeEntry("jump", os);
     }
 
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index 283d7cfb9e..d6d8a6eb24 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -132,7 +132,7 @@ void Foam::fixedMeanFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     meanValue_->writeData(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
index 8157fe7bd8..98b4a3af5b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
@@ -144,7 +144,7 @@ void Foam::fixedMeanOutletInletFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     meanValue_->writeData(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index 4e559b0ca4..bb58e32123 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -183,7 +183,7 @@ void Foam::fixedNormalInletOutletVelocityFvPatchVectorField::write
 )
 const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntry("fixTangentialInflow", fixTangentialInflow_);
 
@@ -191,7 +191,7 @@ const
     normalVelocity_->write(os);
     os.endBlock();
 
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index f4abae24a6..557ffce494 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -186,7 +186,7 @@ void Foam::fixedNormalSlipFvPatchField<Type>::write(Ostream& os) const
     if (writeValue_)
     {
         os.writeEntry("writeValue", "true");
-        this->writeEntry("value", os);
+        fvPatchField<Type>::writeValueEntry(os);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
index 26166054f1..bf7f79e066 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
@@ -129,7 +129,7 @@ void Foam::fixedPressureCompressibleDensityFvPatchScalarField::write
 {
     fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index 8cdf7aa347..d9237a2403 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -163,7 +163,7 @@ void Foam::fixedProfileFvPatchField<Type>::write(Ostream& os) const
     profile_->writeData(os);
     os.writeEntry("direction", dir_);
     os.writeEntry("origin", origin_);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index d2b3751b96..60e974ab55 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -258,7 +258,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
     {
         os.writeEntry("extrapolateProfile", extrapolateProfile_);
     }
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index a1edea1a77..a13f174803 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -238,7 +238,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::write(Ostream& os) const
         os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
         os.writeEntryIfDifferent<scalar>("rhoOutlet", -VGREAT, rhoOutlet_);
     }
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index b3909cc88f..fd02bf04bc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -135,10 +135,10 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
 
 void Foam::fluxCorrectedVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index d90bd730a6..437e18eadf 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -208,7 +208,7 @@ void Foam::freestreamFvPatchField<Type>::write(Ostream& os) const
     {
         freestreamValue().writeEntry("freestreamValue", os);
     }
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index 84042e179f..148b18ad74 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -131,10 +131,10 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::freestreamPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     freestreamValue().writeEntry("freestreamValue", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
index 4302bd4781..7953ad230d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
@@ -118,9 +118,9 @@ void Foam::freestreamVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::freestreamVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     freestreamValue().writeEntry("freestreamValue", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 9d7ba73865..cce6c7b6af 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -140,7 +140,7 @@ void Foam::inletOutletFvPatchField<Type>::write(Ostream& os) const
     fvPatchField<Type>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     this->refValue().writeEntry("inletValue", os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 173f3829ce..84198f6e2e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -191,13 +191,13 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::updateCoeffs()
 void Foam::inletOutletTotalTemperatureFvPatchScalarField::write(Ostream& os)
 const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
     os.writeEntryIfDifferent<word>("psi", "psi", psiName_);
     os.writeEntry("gamma", gamma_);
     T0_.writeEntry("T0", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C
index dee4c053b8..4bffab315d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C
@@ -110,8 +110,8 @@ void Foam::interfaceCompressionFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index 3a6d2f7f0f..ddf69cd2dd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -147,7 +147,7 @@ void Foam::interstitialInletVelocityFvPatchVectorField::write(Ostream& os) const
     fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("alpha", "alpha", alphaName_);
     inletVelocity_.writeEntry("inletVelocity", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
index 21ad7cdc0a..cd3da65504 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
@@ -193,7 +193,7 @@ void Foam::mappedFieldFvPatchField<Type>::write(Ostream& os) const
     fvPatchField<Type>::write(os);
     mappedPatchBase::write(os);
     mappedPatchFieldBase<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
index b3bbd452ce..ec190df0f1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
@@ -140,7 +140,7 @@ void Foam::mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     mappedPatchFieldBase<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
index f0b9e4144b..da5c416101 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
@@ -193,7 +193,7 @@ void Foam::mappedFlowRateFvPatchVectorField::write
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     os.writeEntry("nbrPhi", nbrPhiName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
index f0643e915b..973d696f24 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
@@ -236,9 +236,9 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
-    this->writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
index bd3c912d46..e1806f21b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
@@ -253,7 +253,7 @@ void Foam::matchedFlowRateOutletVelocityFvPatchVectorField::write
         os.writeEntry("volumetric", volumetric_);
         os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     }
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
index e6a90deaab..f4fabe7729 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
@@ -149,8 +149,8 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::movingWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
index 5c236bdfef..039c126276 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
@@ -89,7 +89,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
 
 void Foam::noSlipFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index c1fef7c612..8c621154a3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -140,7 +140,7 @@ void Foam::outletInletFvPatchField<Type>::write(Ostream& os) const
     fvPatchField<Type>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     this->refValue().writeEntry("outletValue", os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 7838e12c3f..32ea26c9fa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -462,7 +462,7 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::write(Ostream& os) const
     os.endBlock();
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
 
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 64dc0e549c..7f92fff288 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -174,7 +174,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::write
 
     os.writeEntry("Umean", Umean_);
     os.writeEntry("alpha", alphaName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 0c7141fc13..7f26c14fa9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -207,7 +207,7 @@ void Foam::partialSlipFvPatchField<Type>::write(Ostream& os) const
     if (writeValue_)
     {
         os.writeEntry("writeValue", "true");
-        this->writeEntry("value", os);
+        fvPatchField<Type>::writeValueEntry(os);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index a5e0af6171..1b6a532d22 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -162,12 +162,12 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::phaseHydrostaticPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("phaseFraction", "alpha", phaseFraction_);
     os.writeEntry("rho", rho_);
     os.writeEntry("pRefValue", pRefValue_);
     os.writeEntry("pRefPoint", pRefPoint_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 321a85d299..67de38f255 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -287,7 +287,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::plenumPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("gamma", gamma_);
     os.writeEntry("R", R_);
     os.writeEntry("supplyMassFlowRate", supplyMassFlowRate_);
@@ -304,7 +304,7 @@ void Foam::plenumPressureFvPatchScalarField::write(Ostream& os) const
     os.writeEntryIfDifferent<scalar>("timeScale", 0.0, timeScale_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index 80429a5830..4f1f1b5a4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -187,11 +187,11 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     inletDir_.writeEntry("inletDirection", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index c0ef598984..ffe06dfa7e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -175,11 +175,11 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     inletDir_.writeEntry("inletDirection", os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 34f089687f..6676732f48 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -161,10 +161,10 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index a30aa581c5..94d7392f31 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -190,13 +190,13 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::write
 )
 const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     if (tangentialVelocity_.size())
     {
         tangentialVelocity_.writeEntry("tangentialVelocity", os);
     }
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index 629aad6f38..720c1b57d5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -140,10 +140,10 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::pressureInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 7a0a8bfd74..4b316b0e67 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -157,10 +157,10 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("phi", phiName_);
     os.writeEntry("rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index a93495d6fb..46e5bce753 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -367,7 +367,7 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::write
     os.writeEntry("error", error_);
     os.writeEntry("errorIntegral", errorIntegral_);
 
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index ddb0204626..5bfce07557 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -182,7 +182,7 @@ void Foam::pressurePermeableAlphaInletOutletVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchVectorField::write(os);
+    mixedFvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     os.writeEntryIfDifferent<word>("alpha", "none", alphaName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index 16ef1a9e75..9baf21bbba 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -171,10 +171,10 @@ void Foam::prghPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::prghPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     p_.writeEntry("p", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
index 424839342c..53fa406082 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
@@ -148,12 +148,12 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     os.writeEntryIfDifferent<word>("ph_rgh", "ph_rgh", ph_rghName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 42dfb9c088..41fe07eee8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -188,12 +188,12 @@ void Foam::prghTotalPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::prghTotalPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     p0_.writeEntry("p0", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 512d5dbd64..b583ffed98 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -129,10 +129,10 @@ void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("phi", phiName());
     omega_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 9a8aad29f2..91dfeebc25 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -147,11 +147,11 @@ void Foam::rotatingWallVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("origin", origin_);
     os.writeEntry("axis", axis_);
     omega_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 923582b389..7c62b6b298 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -294,7 +294,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
 
 void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("T", "T", TName_);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
     os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
@@ -302,7 +302,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
     os.writeEntry("pInf", pInf_);
     os.writeEntry("TInf", TInf_);
     os.writeEntry("gamma", gamma_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index 2d700f99e5..15208df805 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -171,7 +171,7 @@ void Foam::surfaceNormalFixedValueFvPatchVectorField::updateCoeffs()
 
 void Foam::surfaceNormalFixedValueFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     refValue_.writeEntry("refValue", os);
     if (ramp_)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 843068589b..b4e4a38435 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -210,7 +210,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
     os.writeEntry("axis", axis_);
     flowRate_->writeData(os);
     rpm_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
index 1bd5718888..d3957f09ae 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
@@ -159,7 +159,7 @@ void Foam::swirlInletVelocityFvPatchVectorField::write(Ostream& os) const
     axialVelocity_->writeData(os);
     radialVelocity_->writeData(os);
     tangentialVelocity_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index ec63722e69..f484255a08 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -230,7 +230,7 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
 
 void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     os.writeEntry("Ap", Ap_);
     os.writeEntry("Sp", Sp_);
@@ -244,7 +244,7 @@ void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
     os.writeEntry("ams", ams_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index e014c44d80..184252a32c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -202,7 +202,7 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
 {
     fvPatchField<Type>::write(os);
     uniformValue_->writeData(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index f6daed7a87..b3bcd97273 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -244,14 +244,14 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::totalPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntry("rho", rhoName_);
     os.writeEntry("psi", psiName_);
     os.writeEntry("gamma", gamma_);
     p0_.writeEntry("p0", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 79c18cc670..b6ad51dd07 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -179,13 +179,13 @@ void Foam::totalTemperatureFvPatchScalarField::updateCoeffs()
 
 void Foam::totalTemperatureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("psi", "thermo:psi", psiName_);
     os.writeEntry("gamma", gamma_);
     T0_.writeEntry("T0", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index 6e5e2dfc5c..8071d987a0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -119,9 +119,9 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::translatingWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     U_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 1e7508dc47..3f82557b9e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -1027,7 +1027,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
     {
         L_->writeData(os);
     }
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C
index 80331851cb..f947bfb24f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchField.C
@@ -425,7 +425,7 @@ void Foam::turbulentDigitalFilterInletFvPatchField<Type>::write
     }
     L_.write(os);
 
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 996575e5e2..8b12da4d1b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -201,7 +201,7 @@ void Foam::turbulentInletFvPatchField<Type>::write(Ostream& os) const
     os.writeEntry("fluctuationScale", fluctuationScale_);
     referenceField_.writeEntry("referenceField", os);
     os.writeEntry("alpha", alpha_);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index d4c054908c..453e96a5f2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -151,11 +151,11 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("intensity", intensity_);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", this->phiName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index 54141fdc76..f691d7252f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -145,11 +145,11 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("rho", rho_);
     os.writeEntry("pRefValue", pRefValue_);
     os.writeEntry("pRefPoint", pRefPoint_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index d9d53982c3..f57aa6488c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -139,7 +139,7 @@ void Foam::uniformFixedGradientFvPatchField<Type>::write(Ostream& os) const
 {
     fixedGradientFvPatchField<Type>::write(os);
     uniformGradient_->writeData(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 4b8f236dc3..106737b8e7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -182,7 +182,7 @@ void Foam::uniformFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     uniformValue_->writeData(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 1a40889aca..d981820e78 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -169,7 +169,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::write(Ostream& os) const
     fvPatchField<Type>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     this->uniformInletValue_->writeData(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
index 4bede8adaa..0125ba01b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
@@ -178,13 +178,13 @@ void Foam::uniformNormalFixedValueFvPatchVectorField::updateCoeffs()
 
 void Foam::uniformNormalFixedValueFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     uniformValue_->writeData(os);
     if (ramp_)
     {
         ramp_->writeData(os);
     }
-    this->writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index f9a64f8722..1ebfba5288 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -228,14 +228,14 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::uniformTotalPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntry("rho", rhoName_);
     os.writeEntry("psi", psiName_);
     os.writeEntry("gamma", gamma_);
     p0_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index 1ee1eec1c6..308999acab 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -174,11 +174,11 @@ void Foam::variableHeightFlowRateFvPatchScalarField::updateCoeffs()
 
 void Foam::variableHeightFlowRateFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntry("lowerBound", lowerBound_);
     os.writeEntry("upperBound", upperBound_);
-    this->writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 94b3a2522e..7318a394af 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -139,7 +139,7 @@ void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField::write
     fvPatchField<vector>::write(os);
     flowRate_->writeData(os);
     os.writeEntry("alpha", alphaName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 0be57ad252..0eb44f87fa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -225,11 +225,11 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
 
 void Foam::waveSurfacePressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("zeta", "zeta", zetaName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index aede4cebf4..3afc210796 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -155,7 +155,7 @@ void Foam::waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
         os.writeEntry("lInf", this->lInf_);
     }
 
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index f2a7c4133f..d8d50701e8 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,41 @@ License
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::fvPatchField<Type>::readValueEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = fvPatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+    if (eptr)
+    {
+        Field<Type>::assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'value' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -47,6 +82,20 @@ Foam::fvPatchField<Type>::fvPatchField
 {}
 
 
+template<class Type>
+Foam::fvPatchField<Type>::fvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const word& patchType
+)
+:
+    fvPatchFieldBase(p, patchType),
+    Field<Type>(p.size()),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::fvPatchField<Type>::fvPatchField
 (
@@ -66,11 +115,11 @@ Foam::fvPatchField<Type>::fvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const word& patchType
+    const Field<Type>& pfld
 )
 :
-    fvPatchFieldBase(p, patchType),
-    Field<Type>(p.size()),
+    fvPatchFieldBase(p),
+    Field<Type>(pfld),
     internalField_(iF)
 {}
 
@@ -80,11 +129,11 @@ Foam::fvPatchField<Type>::fvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const Field<Type>& f
+    Field<Type>&& pfld
 )
 :
     fvPatchFieldBase(p),
-    Field<Type>(f),
+    Field<Type>(std::move(pfld)),
     internalField_(iF)
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 84d1e333cb..3d23bc0a2c 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,8 +59,8 @@ namespace Foam
 {
 
 // Forward Declarations
-class objectRegistry;
 class dictionary;
+class objectRegistry;
 class fvPatchFieldMapper;
 class volMesh;
 
@@ -231,6 +231,25 @@ class fvPatchField
         //- Reference to internal field
         const DimensionedField<Type, volMesh>& internalField_;
 
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "value" entry into \c *this.
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readValueEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+        //- Write \c *this field as a "value" entry
+        void writeValueEntry(Ostream& os) const
+        {
+            Field<Type>::writeEntry("value", os);
+        }
+
 
 public:
 
@@ -295,6 +314,14 @@ public:
             const DimensionedField<Type, volMesh>&
         );
 
+        //- Construct from patch, internal field and patch type
+        fvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const word& patchType
+        );
+
         //- Construct from patch, internal field and value
         fvPatchField
         (
@@ -303,20 +330,20 @@ public:
             const Type& value
         );
 
-        //- Construct from patch and internal field and patch type
+        //- Construct from patch, internal field and patch field
         fvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
-            const word& patchType
+            const Field<Type>& pfld
         );
 
-        //- Construct from patch and internal field and patch field
+        //- Construct from patch, internal field and patch field
         fvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
-            const Field<Type>&
+            Field<Type>&& pfld
         );
 
         //- Construct from patch, internal field and dictionary
@@ -435,44 +462,43 @@ public:
         static const word& zeroGradientType();
 
 
-        // Attributes
+    // Attributes
 
-            //- True if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return false;
-            }
+        //- True if this patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
 
-            //- True if the value of the patch field
-            //- is altered by assignment (the default)
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True if the value of the patch field
+        //- is altered by assignment (the default)
+        virtual bool assignable() const
+        {
+            return true;
+        }
 
-            //- True if this patch field is coupled
-            virtual bool coupled() const
-            {
-                return false;
-            }
+        //- True if this patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
 
 
-        // Access
+    // Access
 
-            //- Return const-reference to the dimensioned internal field
-            const DimensionedField<Type, volMesh>& internalField()
-            const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the dimensioned internal field
+        const DimensionedField<Type, volMesh>& internalField() const noexcept
+        {
+            return internalField_;
+        }
 
-            //- Return const-reference to the internal field values
-            const Field<Type>& primitiveField() const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the internal field values
+        const Field<Type>& primitiveField() const noexcept
+        {
+            return internalField_;
+        }
 
 
         // Mapping Functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
index fac044a301..838f03b2ff 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
@@ -77,7 +77,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         calculatedFvsPatchField
         (
             const calculatedFvsPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index 15da665a62..6d3d19f7e3 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -77,8 +77,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given fixedValueFvsPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given fixedValue patch field
+        //- onto a new patch
         fixedValueFvsPatchField
         (
             const fixedValueFvsPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index 1f185b83f4..d5ce648c96 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -97,8 +97,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping the given slicedFvsPatchField<Type>
-        //  onto a new patch
+        //- Construct by mapping the given sliced patch field onto a new patch
         slicedFvsPatchField
         (
             const slicedFvsPatchField<Type>&,
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index c88be8b532..8997ac61fc 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,41 @@ License
 #include "surfaceMesh.H"
 #include "fvPatchFieldMapper.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::fvsPatchField<Type>::readValueEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    const auto& p = fvsPatchFieldBase::patch();
+
+    if (!p.size()) return true;  // Can be exceptionally lazy
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+
+
+    const auto* eptr = dict.findEntry("value", keyType::LITERAL);
+
+    if (eptr)
+    {
+        Field<Type>::assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'value' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -52,11 +87,11 @@ Foam::fvsPatchField<Type>::fvsPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
-    const Field<Type>& f
+    const Field<Type>& pfld
 )
 :
     fvsPatchFieldBase(p),
-    Field<Type>(f),
+    Field<Type>(pfld),
     internalField_(iF)
 {}
 
@@ -64,14 +99,13 @@ Foam::fvsPatchField<Type>::fvsPatchField
 template<class Type>
 Foam::fvsPatchField<Type>::fvsPatchField
 (
-    const fvsPatchField<Type>& ptf,
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
-    const fvPatchFieldMapper& mapper
+    Field<Type>&& pfld
 )
 :
-    fvsPatchFieldBase(ptf, p),
-    Field<Type>(ptf, mapper),
+    fvsPatchFieldBase(p),
+    Field<Type>(std::move(pfld)),
     internalField_(iF)
 {}
 
@@ -108,6 +142,21 @@ Foam::fvsPatchField<Type>::fvsPatchField
 }
 
 
+template<class Type>
+Foam::fvsPatchField<Type>::fvsPatchField
+(
+    const fvsPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fvsPatchFieldBase(ptf, p),
+    Field<Type>(ptf, mapper),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::fvsPatchField<Type>::fvsPatchField(const fvsPatchField<Type>& ptf)
 :
@@ -161,7 +210,7 @@ template<class Type>
 void Foam::fvsPatchField<Type>::write(Ostream& os) const
 {
     os.writeEntry("type", type());
-    this->writeEntry("value", os);
+    Field<Type>::writeEntry("value", os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 3ee2f1dc26..1eb422705a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,6 +49,7 @@ SourceFiles
 
 #include "fvPatch.H"
 #include "DimensionedField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,8 +57,8 @@ namespace Foam
 {
 
 // Forward Declarations
-class objectRegistry;
 class dictionary;
+class objectRegistry;
 class fvPatchFieldMapper;
 class surfaceMesh;
 
@@ -153,6 +154,25 @@ class fvsPatchField
         //- Reference to internal field
         const DimensionedField<Type, surfaceMesh>& internalField_;
 
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "value" entry into \c *this.
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readValueEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
+
+        //- Write \c *this field as a "value" entry
+        void writeValueEntry(Ostream& os) const
+        {
+            Field<Type>::writeEntry("value", os);
+        }
+
 
 public:
 
@@ -217,12 +237,20 @@ public:
             const DimensionedField<Type, surfaceMesh>&
         );
 
-        //- Construct from patch and internal field and patch field
+        //- Construct from patch, internal field and patch field
         fvsPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, surfaceMesh>&,
-            const Field<Type>&
+            const Field<Type>& pfld
+        );
+
+        //- Construct from patch, internal field and patch field
+        fvsPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&,
+            Field<Type>&& pfld
         );
 
         //- Construct from patch, internal field and dictionary
@@ -338,37 +366,37 @@ public:
         static const word& calculatedType();
 
 
-        // Attributes
+    // Attributes
 
-            //- True if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return false;
-            }
+        //- True if this patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
 
-            //- True if this patch field is coupled
-            virtual bool coupled() const
-            {
-                return false;
-            }
+        //- True if this patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
 
 
-        // Access
+    // Access
 
-            //- Return const-reference to the dimensioned internal field
-            const DimensionedField<Type, surfaceMesh>& internalField()
-            const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the dimensioned internal field
+        const DimensionedField<Type, surfaceMesh>& internalField()
+        const noexcept
+        {
+            return internalField_;
+        }
 
-            //- Return const-reference to the internal field values
-            const Field<Type>& primitiveField() const noexcept
-            {
-                return internalField_;
-            }
+        //- Return const-reference to the internal field values
+        const Field<Type>& primitiveField() const noexcept
+        {
+            return internalField_;
+        }
 
 
         // Mapping Functions
diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
index 2e76dd66e9..a359d8fe66 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
+++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
@@ -126,7 +126,7 @@ template<class Type>
 void Foam::cellMotionFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 // ************************************************************************* //
diff --git a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
index 08dcc13a09..b94b01d537 100644
--- a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
+++ b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
@@ -143,7 +143,7 @@ public:
         {
             slipFvPatchField<Type>::write(os);
             // Only so we can easily postprocess.
-            this->writeEntry("value", os);
+            fvPatchField<Type>::writeValueEntry(os);
         }
 };
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index 5150f706f0..7ff26948cb 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -187,7 +187,7 @@ void angularOscillatingDisplacementPointPatchVectorField::write
     os.writeEntry("amplitude", amplitude_);
     os.writeEntry("omega", omega_);
     p0_.writeEntry("p0", os);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
index 8c9224a49b..fe7841d377 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
@@ -86,7 +86,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         angularOscillatingDisplacementPointPatchVectorField
         (
             const angularOscillatingDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index ccde191494..792daffdcf 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -192,7 +192,7 @@ void angularOscillatingVelocityPointPatchVectorField::write
     os.writeEntry("amplitude", amplitude_);
     os.writeEntry("omega", omega_);
     p0_.writeEntry("p0", os);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
index f1a7ae4a29..b73fab2a6d 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
@@ -86,7 +86,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         angularOscillatingVelocityPointPatchVectorField
         (
             const angularOscillatingVelocityPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index f4af033961..ddf65df7fb 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -121,7 +121,7 @@ void oscillatingDisplacementPointPatchVectorField::write(Ostream& os) const
     pointPatchField<vector>::write(os);
     os.writeEntry("amplitude", amplitude_);
     os.writeEntry("omega", omega_);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
index 34ae75cc68..f77cec2353 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
@@ -81,7 +81,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         oscillatingDisplacementPointPatchVectorField
         (
             const oscillatingDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index a2a9fa10f5..aca3b49f05 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -165,7 +165,7 @@ void oscillatingVelocityPointPatchVectorField::write(Ostream& os) const
     os.writeEntry("amplitude", amplitude_);
     os.writeEntry("omega", omega_);
     p0_.writeEntry("p0", os);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
index 8985f06dc8..bacd84bc1e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
@@ -83,7 +83,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         oscillatingVelocityPointPatchVectorField
         (
             const oscillatingVelocityPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 3d24412823..92c499d624 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -463,7 +463,7 @@ void Foam::surfaceDisplacementPointPatchVectorField::updateCoeffs()
 
 void Foam::surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
 {
-    fixedValuePointPatchVectorField::write(os);
+    fixedValuePointPatchField<vector>::write(os);
     os.writeEntry("velocity", velocity_);
     os.writeEntry("geometry", surfacesDict_);
     os.writeEntry("projectMode", projectModeNames_[projectMode_]);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index 3114eb82e5..0c39ddc7d2 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -154,7 +154,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         surfaceDisplacementPointPatchVectorField
         (
             const surfaceDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 645313a746..8d6b096d59 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -422,7 +422,7 @@ void Foam::surfaceSlipDisplacementPointPatchVectorField::write
     Ostream& os
 ) const
 {
-    pointPatchVectorField::write(os);
+    pointPatchField<vector>::write(os);
     os.writeEntry("geometry", surfacesDict_);
     os.writeEntry("projectMode", projectModeNames_[projectMode_]);
     os.writeEntry("projectDirection", projectDir_);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
index 6020c47d3b..2a46c18454 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
@@ -144,7 +144,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         surfaceSlipDisplacementPointPatchVectorField
         (
             const surfaceSlipDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index b22f5e8d05..8bdfdd3ef7 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -261,7 +261,7 @@ const
     pointPatchField<vector>::write(os);
     os.writeEntry("field", fieldName_);
     os.writeEntry("interpolationScheme", interpolationScheme_);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
index f261d3db46..e8105cd39d 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
@@ -120,7 +120,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         uniformInterpolatedDisplacementPointPatchVectorField
         (
             const uniformInterpolatedDisplacementPointPatchVectorField&,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index bfdb5643ff..ba83666650 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -127,7 +127,7 @@ void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
     os.writeEntry("amplitude", amplitude_);
     os.writeEntry("omega", omega_);
     os.writeEntry("waveNumber", waveNumber_);
-    writeEntry("value", os);
+    this->writeValueEntry( os);
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
index 8536c06917..284ad8e84c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
@@ -82,7 +82,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         waveDisplacementPointPatchVectorField
         (
             const waveDisplacementPointPatchVectorField&,
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
index 00bfded5d7..88bc831f56 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
@@ -108,7 +108,7 @@ void Foam::genericFaPatchField<Type>::write(Ostream& os) const
 {
     // Handle "value" separately
     genericPatchFieldBase::writeGeneric(os, true);
-    this->writeEntry("value", os);
+    faPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H
index fece0812da..7ad03942e7 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.H
@@ -88,7 +88,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         genericFaPatchField
         (
             const genericFaPatchField<Type>&,
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 0f72c34600..122e534d31 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -108,7 +108,7 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
 {
     // Handle "value" separately
     genericPatchFieldBase::writeGeneric(os, true);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
index 7c527fe050..f74273dcee 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
@@ -88,7 +88,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         genericFvPatchField
         (
             const genericFvPatchField<Type>&,
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
index a982f110cd..fbf1504573 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
@@ -108,7 +108,7 @@ void Foam::genericFvsPatchField<Type>::write(Ostream& os) const
 {
     // Handle "value" separately
     genericPatchFieldBase::writeGeneric(os, true);
-    this->writeEntry("value", os);
+    fvsPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H
index 3fe2a26c57..0447dd9971 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.H
@@ -87,7 +87,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         genericFvsPatchField
         (
             const genericFvsPatchField<Type>&,
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index 59b3be11f4..f772014971 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -84,7 +84,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         genericPointPatchField
         (
             const genericPointPatchField<Type>&,
diff --git a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
index c239481f9e..b2fad27088 100644
--- a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
+++ b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
@@ -446,7 +446,7 @@ const
         os.writeEntry("dataWritten", dataWritten_);
     }
 
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
index 26e7997b05..0afd14f059 100644
--- a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
+++ b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
@@ -129,7 +129,7 @@ public:
             const dictionary& dict
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         lumpedPointDisplacementPointPatchVectorField
         (
             const lumpedPointDisplacementPointPatchVectorField& rhs,
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
index e9051ae8e8..8b52d2d10e 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
@@ -85,7 +85,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         zeroFixedValuePointPatchField
         (
             const zeroFixedValuePointPatchField<Type>&,
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index 0c4017cd8d..fa2d54f387 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -129,7 +129,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         cyclicACMIPointPatchField
         (
             const cyclicACMIPointPatchField<Type>&,
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index d3237db8e5..78a8148c09 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -129,7 +129,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         cyclicAMIPointPatchField
         (
             const cyclicAMIPointPatchField<Type>&,
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
index 6d43549b71..cdf99837c4 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -103,7 +103,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<Type> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         uniformFixedValuePointPatchField
         (
             const uniformFixedValuePointPatchField<Type>&,
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
index aad795f2a9..c4dea30df3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
@@ -252,9 +252,9 @@ Foam::adjointFarFieldPressureFvPatchScalarField::gradientBoundaryCoeffs() const
 
 void Foam::adjointFarFieldPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
index 88de315419..71e56b5359 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
@@ -185,9 +185,9 @@ Foam::adjointFarFieldVelocityFvPatchVectorField::valueBoundaryCoeffs
 
 void Foam::adjointFarFieldVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
index a5e71cb4c3..869b4c9dec 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
@@ -131,9 +131,9 @@ Foam::adjointInletVelocityFvPatchVectorField::valueBoundaryCoeffs
 
 void Foam::adjointInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index b4f5015493..0e80d181e2 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -160,9 +160,9 @@ void Foam::adjointOutletPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::adjointOutletPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 4d3f2fce75..49adb64b19 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -164,9 +164,9 @@ void Foam::adjointOutletVelocityFvPatchVectorField::evaluate
 
 void Foam::adjointOutletVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
index 8b70903941..dd385480e3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
@@ -207,9 +207,9 @@ void Foam::adjointOutletVelocityFluxFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
index c26a7b863a..2ee1f2a848 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
@@ -225,11 +225,11 @@ void Foam::adjointWallVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::adjointWallVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("kappa", kappa_);
     os.writeEntry("E", E_);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
index 606eb24625..fb54a88b1a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
@@ -110,9 +110,9 @@ void Foam::adjointWallVelocityLowReFvPatchVectorField::updateCoeffs()
 
 void Foam::adjointWallVelocityLowReFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
-    writeEntry("value", os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
index edbdc4b09c..13340dc1b6 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
@@ -159,9 +159,9 @@ valueBoundaryCoeffs
 
 void adjointFarFieldNuaTildaFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
index 85675f0e35..35d9034a0c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
@@ -157,9 +157,9 @@ valueBoundaryCoeffs
 
 void adjointFarFieldTMVar1FvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
index 1bd84898be..b51d8be812 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
@@ -157,9 +157,9 @@ valueBoundaryCoeffs
 
 void adjointFarFieldTMVar2FvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
index a3d75d2fcc..72145995d1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
@@ -119,9 +119,9 @@ tmp<Field<scalar>> adjointInletNuaTildaFvPatchScalarField::valueBoundaryCoeffs
 
 void adjointInletNuaTildaFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
index 2ef57ef0c0..1f296db56b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
@@ -143,7 +143,7 @@ template<class Type>
 void Foam::adjointOutletFluxFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<Type>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
index 8a0aefde32..dbbfac5451 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
@@ -125,9 +125,9 @@ void adjointOutletKaFvPatchScalarField::updateCoeffs()
 
 void adjointOutletKaFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
index ef16a37865..32cc4f76c9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
@@ -123,9 +123,9 @@ void adjointOutletNuaTildaFvPatchScalarField::updateCoeffs()
 
 void adjointOutletNuaTildaFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
index f66e1972e7..2382fa4e17 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
@@ -146,9 +146,9 @@ adjointOutletNuaTildaFluxFvPatchScalarField::gradientInternalCoeffs() const
 
 void adjointOutletNuaTildaFluxFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
index e920a5d26b..68fab059d3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
@@ -125,9 +125,9 @@ void adjointOutletWaFvPatchScalarField::updateCoeffs()
 
 void adjointOutletWaFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("solverName", adjointSolverName_);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index b1b8750625..2c0e2f98bf 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -129,9 +129,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 
 void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("thetaProperties", thetaProps_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
index a57d9ebf09..166a9a9e0e 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
@@ -258,13 +258,13 @@ void Foam::timeVaryingMassSorptionFvPatchScalarField::updateCoeffs()
 
 void Foam::timeVaryingMassSorptionFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     os.writeEntry("kabs", kabs_);
     os.writeEntry("max", max_);
     os.writeEntryIfDifferent<scalar>("kdes", scalar(0), kdes_);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 8e065b876a..910ccf5abf 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -129,9 +129,9 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 
 void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("thetaProperties", thetaProps_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
index 6e37273ea0..2ec483d3e8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -199,7 +199,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
     os.writeEntry("fixedDmdt", fixedDmdt_);
     os.writeEntry("L", L_);
     dmdt_.writeEntry("dmdt", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
index b7cc56fcaa..90cf5c7570 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
@@ -323,7 +323,7 @@ void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::write
     os.writeEntry("kappa", kappa_);
     os.writeEntry("E", E_);
     dmdt_.writeEntry("dmdt", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
index e15a790684..dae81c48d9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -128,7 +128,7 @@ write(Ostream& os) const
     fvPatchField<scalar>::write(os);
     dmdt_.writeEntry("dmdt", os);
     mDotL_.writeEntry("mDotL", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 6e449c5080..c405a54f1a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -1323,7 +1323,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::write(Ostream& os) const
     qq_.writeEntry("qQuenching", os);
     alphatConv_.writeEntry("alphatConv", os);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index d6d88cae2e..147842955d 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -112,7 +112,7 @@ void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     os.writeEntry("sourceFieldName", sourceFieldName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
index 580c3e9cfc..cce56b32a4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
@@ -198,7 +198,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::write(Ostream& os) const
     fvPatchField<scalar>::write(os);
     os.writeEntry("relax", relax_);
     q_.writeEntry("q", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index f2d159e07d..a1d4580da7 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -240,9 +240,9 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("specularityCoefficient", specularityCoefficient_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 85f52e183b..d46037600c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -279,10 +279,10 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("restitutionCoefficient", restitutionCoefficient_);
     os.writeEntry("specularityCoefficient", specularityCoefficient_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 03d3a85cbe..84d56ae636 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -236,9 +236,9 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntry("specularityCoefficient", specularityCoefficient_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 6d2663a470..6947267135 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -271,10 +271,10 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("restitutionCoefficient", restitutionCoefficient_);
     os.writeEntry("specularityCoefficient", specularityCoefficient_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index 9270915c13..0f26223b0f 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -412,7 +412,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>
     (
         "filmRegion",
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 6c88b5302c..fb60eb8235 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -187,7 +187,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>
     (
         "filmRegion",
@@ -202,7 +202,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write
     );
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 549b41fd52..8847b50a72 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -212,7 +212,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>
     (
         "filmRegion",
@@ -227,7 +227,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write
     );
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
index 651f1349e0..0ecc19035a 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
@@ -129,11 +129,11 @@ void Foam::filmHeightInletVelocityFvPatchVectorField::updateCoeffs()
 
 void Foam::filmHeightInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
     os.writeEntryIfDifferent<word>("deltaf", "deltaf", deltafName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index dca945f905..d8c0c9436d 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -194,7 +194,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fixedValueFvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
+
     os.writeEntryIfDifferent<word>
     (
         "filmRegion",
@@ -204,7 +205,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write
     GammaMean_->writeData(os);
     a_->writeData(os);
     omega_->writeData(os);
-    writeEntry("value", os);
+
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 5bd9ea6a50..0833e9e46f 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -193,7 +193,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
+
     os.writeEntryIfDifferent<word>
     (
         "filmRegion",
@@ -203,7 +204,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write
     GammaMean_->writeData(os);
     a_->writeData(os);
     omega_->writeData(os);
-    writeEntry("value", os);
+
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index 2d326128ec..b0e370a718 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -257,7 +257,8 @@ void alphatFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
     os.writeEntryIfDifferent<scalar>("Cmu", 0.09, Cmu_);
     os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
     os.writeEntryIfDifferent<scalar>("Prt", 0.85, Prt_);
-    writeEntry("value", os);
+
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index 286d932162..63661a0c4a 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -273,7 +273,7 @@ void nutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     nutWallFunctionFvPatchScalarField::write(os);
     writeLocalEntries(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index 3c6da0ce0c..e804362b8b 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -274,7 +274,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
 
     initialPoints_.writeEntry("initialPoints", os);
 
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
index 06947e016d..e67f00ff6a 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -113,7 +113,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         sixDoFRigidBodyDisplacementPointPatchVectorField
         (
             const sixDoFRigidBodyDisplacementPointPatchVectorField&,
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index 52073798fe..df6763d435 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -200,7 +200,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::write
     pointPatchField<vector>::write(os);
     motion_.write(os);
     initialPoints_.writeEntry("initialPoints", os);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
index 339040f8fa..9bc259d00e 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -88,7 +88,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField
         (
             const uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField&,
diff --git a/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 519776723a..51d9c4d2d0 100644
--- a/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -164,7 +164,7 @@ void convectiveHeatTransferFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     os.writeEntry("L", L_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 26aa93d2ec..90fc37d1e2 100644
--- a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -476,7 +476,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     os.writeEntry("mode", operationModeNames[mode_]);
     temperatureCoupledBase::write(os);
@@ -537,7 +537,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
     refValue().writeEntry("refValue", os);
     refGrad().writeEntry("refGradient", os);
     valueFraction().writeEntry("valueFraction", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
index 90899164ac..16e7f55cd5 100644
--- a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
@@ -195,10 +195,10 @@ void Foam::radiation::fixedIncidentRadiationFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fixedGradientFvPatchScalarField::write(os);
+    fixedGradientFvPatchField<scalar>::write(os);
     temperatureCoupledBase::write(os);
     qrIncident_.writeEntry("qrIncident", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 668940de76..2661d4ba2e 100644
--- a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -767,7 +767,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
diff --git a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
index f34d171eae..2d1ecc121c 100644
--- a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
@@ -217,7 +217,7 @@ void Foam::lumpedMassWallTemperatureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     temperatureCoupledBase::write(os);
 
     os.writeEntry("Cp", Cp_);
diff --git a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index 49d6b0ce93..8c17484d03 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -244,7 +244,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::outletMachNumberPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("pBack", pBack_);
     os.writeEntryIfDifferent<scalar>("c1", 0, c1_);
     os.writeEntryIfDifferent<scalar>("A1", 0, A1_);
@@ -256,7 +256,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::write(Ostream& os) const
     os.writeEntryIfDifferent<word>("U", "U", UName_);
     os.writeEntryIfDifferent<scalar>("M", 0, M_);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index ac72f78aec..5e7b8daa3a 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -190,14 +190,14 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     os.writeEntry("outletPatch", outletPatchName_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
     os.writeEntry("Q", Q_);
     os.writeEntry("TMin", TMin_);
     os.writeEntry("TMax", TMax_);
 
-    this->writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
index e27c587628..d9d00a8bd3 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
@@ -170,11 +170,11 @@ void Foam::semiPermeableBaffleMassFractionFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     mappedPatchBase::write(os);
     os.writeEntryIfDifferent<scalar>("c", 0, c_);
     os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
index 1af5600c2a..579989b7f1 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
@@ -170,9 +170,9 @@ void Foam::semiPermeableBaffleVelocityFvPatchVectorField::write
     Ostream& os
 ) const
 {
-    fvPatchVectorField::write(os);
+    fvPatchField<vector>::write(os);
     os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 8ce9d2e6ef..053d10cf06 100644
--- a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -428,7 +428,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
 template<class solidType>
 void thermalBaffle1DFvPatchScalarField<solidType>::write(Ostream& os) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     mappedPatchBase::write(os);
 
     if (this->owner())
diff --git a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index d3a6193123..c898f212d2 100644
--- a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -206,7 +206,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::write
     os.writeEntry("phi", phiName_);
     os.writeEntry("rho", rhoName_);
     os.writeEntry("massFluxFraction", massFluxFraction_);
-    this->writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index e1b836fb11..cba676c86c 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -460,7 +460,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     os.writeEntry("Tnbr", TnbrName_);
     if (thicknessLayer_)
     {
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 5dc9ad16eb..ad59b17622 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -721,7 +721,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
 
     //os.writeEntry("Tnbr", TnbrName_);
     os.writeEntryIfDifferent<word>("Tnbr", "T", TnbrName_);
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index afd5c6d0ad..f0f4c23109 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -330,7 +330,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
     os.writeEntryIfDifferent<scalar>("Prt", 0.85, Prt_);
     os.writeEntryIfDifferent<scalar>("kappa", 0.41, kappa_);
     os.writeEntryIfDifferent<scalar>("E", 9.8, E_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index 2e24370be4..6849f44a1f 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -132,7 +132,7 @@ void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<scalar>("Prt", 0.85, Prt_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
index d289f63444..0c5a302f14 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
@@ -405,11 +405,11 @@ void sorptionWallFunctionFvPatchScalarField::updateCoeffs()
 
 void sorptionWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
-    fixedGradientFvPatchScalarField::write(os);
+    fixedGradientFvPatchField<scalar>::write(os);
 
     writeLocalEntries(os);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index fb8df7ace9..0dd64ccb0e 100644
--- a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -175,10 +175,10 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
 
 void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     Tinf_.writeEntry("Tinf", os);
     alphaWall_.writeEntry("alphaWall", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
index 50952eb0e3..8f3f0de5ac 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
@@ -140,7 +140,7 @@ void Foam::energyJumpFvPatchScalarField::updateCoeffs()
 void Foam::energyJumpFvPatchScalarField::write(Ostream& os) const
 {
     fixedJumpFvPatchField<scalar>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
index 0ff842683a..4e85bb0a00 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
@@ -138,7 +138,7 @@ void Foam::energyJumpAMIFvPatchScalarField::updateCoeffs()
 void Foam::energyJumpAMIFvPatchScalarField::write(Ostream& os) const
 {
     fixedJumpAMIFvPatchField<scalar>::write(os);
-    this->writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
index 75192df266..6d1a541014 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
@@ -121,8 +121,8 @@ void Foam::gradientEnergyFvPatchScalarField::updateCoeffs()
 
 void Foam::gradientEnergyFvPatchScalarField::write(Ostream& os) const
 {
-    fixedGradientFvPatchScalarField::write(os);
-    this->writeEntry("value", os);
+    fixedGradientFvPatchField<scalar>::write(os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
index 27f4bea985..7fce1ae957 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
@@ -168,7 +168,7 @@ void Foam::radiation::MarshakRadiationFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("T", "T", TName_);
 }
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
index 53a3e74fbf..6cd7f1e5e8 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
@@ -188,7 +188,7 @@ void Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     Trad_.writeEntry("Trad", os);
 }
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index b97fffa818..3257b4de80 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -373,7 +373,7 @@ void Foam::radiation::greyDiffusiveRadiationMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
     os.writeEntryIfDifferent<word>("T", "T", TName_);
     os.writeEntryIfDifferent<scalar>("qRadExt", Zero, qRadExt_);
     os.writeEntryIfDifferent<vector>("qRadExtDir", Zero, qRadExtDir_);
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 614bb8b573..f0548c186a 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -199,7 +199,7 @@ write
     Ostream& os
 ) const
 {
-    fixedValueFvPatchScalarField::write(os);
+    fixedValueFvPatchField<scalar>::write(os);
     qro_.writeEntry("qro", os);
 }
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index a0d90058d5..9ead8ee5c8 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -305,7 +305,7 @@ void Foam::radiation::wideBandDiffusiveRadiationMixedFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    mixedFvPatchScalarField::write(os);
+    mixedFvPatchField<scalar>::write(os);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
index 7cc73bc526..8762e82676 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
@@ -304,7 +304,7 @@ void Foam::enthalpySorptionFvPatchScalarField::updateCoeffs()
 
 void Foam::enthalpySorptionFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     os.writeEntry("enthalpyModel", enthalpyModelTypeNames[enthalpyModel_]);
 
@@ -323,7 +323,7 @@ void Foam::enthalpySorptionFvPatchScalarField::write(Ostream& os) const
 
     dhdt_.writeEntry("dhdt", os);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
index 7b1f9c7cd0..68eb91f02d 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
@@ -417,7 +417,7 @@ void Foam::speciesSorptionFvPatchScalarField::updateCoeffs()
 
 void Foam::speciesSorptionFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
 
     os.writeEntry
     (
@@ -440,7 +440,7 @@ void Foam::speciesSorptionFvPatchScalarField::write(Ostream& os) const
     mass_.writeEntry("mass", os);
     os.writeEntryIfDifferent<word>("p", "p", pName_);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 9a8e306c78..580b4e7310 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -159,7 +159,7 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fixedGradientFvPatchScalarField::write(os);
+    fixedGradientFvPatchField<scalar>::write(os);
     os.writeEntry("limit", limitControlNames_[limit_]);
 }
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index 473f4acc95..7e1c16b502 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -117,7 +117,7 @@ void Foam::constantAlphaContactAngleFvPatchScalarField::write
 {
     alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
     os.writeEntry("theta0", theta0_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index 0997a7cd49..7f61ba30b0 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -153,7 +153,7 @@ void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
     os.writeEntry("uTheta", uTheta_);
     os.writeEntry("thetaA", thetaA_);
     os.writeEntry("thetaR", thetaR_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index b748264df6..1b46c9c63d 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -126,7 +126,7 @@ void Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::write
     alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
     os.writeEntryIfDifferent<word>("T", "T", TName_);
     theta0_->writeData(os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index e83e93461b..e0344b0b86 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -138,7 +138,7 @@ void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
     os.writeEntry("thetaT0", thetaT0_);
     os.writeEntry("te", te_);
     os.writeEntry("thetaTe", thetaTe_);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index a0aa069ae1..55709d97ef 100644
--- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -159,9 +159,9 @@ void Foam::alphaFixedPressureFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    fvPatchField<scalar>::write(os);
     p_.writeEntry("p", os);
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 257ad4f852..a974fe80b5 100644
--- a/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -125,7 +125,7 @@ void Foam::waveAlphaFvPatchScalarField::write(Ostream& os) const
 
     os.writeEntry("waveDictName", waveDictName_);
 
-    writeEntry("value", os);
+    fvPatchField<scalar>::writeValueEntry(os);
 }
 
 
diff --git a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index 66b6b9d6a0..ec40b89819 100644
--- a/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -125,7 +125,7 @@ void Foam::waveVelocityFvPatchVectorField::write(Ostream& os) const
 
     os.writeEntry("waveDictName", waveDictName_);
 
-    writeEntry("value", os);
+    fvPatchField<vector>::writeValueEntry(os);
 }
 
 
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
index 481d88d98f..be8cbfb7c3 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
@@ -460,7 +460,7 @@ void Foam::waveMakerPointPatchVectorField::write(Ostream& os) const
     os.writeEntry("rampTime", rampTime_);
     os.writeEntry("secondOrder", secondOrder_);
     os.writeEntry("nPaddle", nPaddle_);
-    writeEntry("value", os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
index 8ccff2d454..e71e9044ef 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.H
@@ -239,7 +239,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given patchField<vector> onto a new patch
+        //- Construct by mapping given patch field onto a new patch
         waveMakerPointPatchVectorField
         (
             const waveMakerPointPatchVectorField&,

From 0767e21d8c8e22d9d6f6bb38e9384c44f0ca82fc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 09:33:00 +0100
Subject: [PATCH 079/348] ENH: more consistent convenience macros for creating
 patchFields

---
 applications/test/fvc2D/Test-fvc2D.C          |   7 +-
 .../pointPatchField/pointPatchField.H         |  84 +-------
 .../pointPatchField/pointPatchFieldMacros.H   | 143 ++++++++++++++
 .../pointPatchField/pointPatchFields.C        |  26 +--
 .../basicSymmetryFaPatchFields.H              |   7 +-
 .../calculated/calculatedFaPatchFields.H      |  16 +-
 .../basic/coupled/coupledFaPatchFields.H      |   7 +-
 .../fixedGradientFaPatchFields.H              |  16 +-
 .../fixedValue/fixedValueFaPatchFields.H      |   7 +-
 .../basic/mixed/mixedFaPatchFields.H          |   7 +-
 .../basic/transform/transformFaPatchFields.H  |  15 +-
 .../zeroGradient/zeroGradientFaPatchFields.H  |  13 +-
 .../constraint/cyclic/cyclicFaPatchFields.H   |   7 +-
 .../constraint/empty/emptyFaPatchFields.H     |  12 +-
 .../processor/processorFaPatchFields.H        |   3 +-
 .../symmetry/symmetryFaPatchFields.H          |   7 +-
 .../constraint/wedge/wedgeFaPatchFields.H     |   7 +-
 .../clampedPlate/clampedPlateFaPatchFields.H  |   7 +-
 .../fixedValueOutflowFaPatchFields.H          |   7 +-
 .../inletOutlet/inletOutletFaPatchFields.H    |   7 +-
 .../derived/slip/slipFaPatchFields.H          |   7 +-
 ...imeVaryingUniformFixedValueFaPatchFields.H |   7 +-
 .../faPatchFields/faPatchField/faPatchField.H |  93 +--------
 .../faPatchField/faPatchFieldMacros.H         | 142 ++++++++++++++
 .../faPatchField/faPatchFields.C              |  25 +--
 .../faPatchField/faPatchFields.H              |   5 +-
 .../faPatchField/faPatchFieldsFwd.H           |   7 +-
 .../calculated/calculatedFaePatchFields.H     |   7 +-
 .../basic/coupled/coupledFaePatchFields.C     |   6 +-
 .../basic/coupled/coupledFaePatchFields.H     |   7 +-
 .../fixedValue/fixedValueFaePatchFields.H     |   7 +-
 .../constraint/cyclic/cyclicFaePatchFields.H  |   7 +-
 .../constraint/empty/emptyFaePatchFields.H    |   7 +-
 .../processor/processorFaePatchFields.H       |   7 +-
 .../symmetry/symmetryFaePatchFields.H         |   7 +-
 .../constraint/wedge/wedgeFaePatchFields.H    |   7 +-
 .../faePatchField/faePatchField.H             |  61 +-----
 .../faePatchField/faePatchFieldMacros.H       | 142 ++++++++++++++
 .../faePatchField/faePatchFields.C            |  26 +--
 .../faePatchField/faePatchFields.H            |   7 +-
 .../faePatchField/faePatchFieldsFwd.H         |   8 +-
 .../derived/fan/fanFvPatchFields.C            |  16 +-
 .../fixedNormalSlipFvPatchFields.C            |  14 +-
 .../mappedMixedFieldFvPatchFields.C           |   1 -
 .../mappedMixed/mappedMixedFvPatchFields.C    |   1 -
 ...turbulentDigitalFilterInletFvPatchFields.C |   4 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H | 100 +---------
 .../fvPatchField/fvPatchFieldMacros.H         | 180 ++++++++++++++++++
 .../fvPatchField/fvPatchFields.C              |  19 +-
 .../fvsPatchField/fvsPatchField.H             |  60 +-----
 .../fvsPatchField/fvsPatchFieldMacros.H       | 143 ++++++++++++++
 .../fvsPatchField/fvsPatchFields.C            |  25 +--
 52 files changed, 917 insertions(+), 643 deletions(-)
 create mode 100644 src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMacros.H
 create mode 100644 src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMacros.H
 create mode 100644 src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldMacros.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMacros.H
 create mode 100644 src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldMacros.H

diff --git a/applications/test/fvc2D/Test-fvc2D.C b/applications/test/fvc2D/Test-fvc2D.C
index aea43f20c4..768de44a91 100644
--- a/applications/test/fvc2D/Test-fvc2D.C
+++ b/applications/test/fvc2D/Test-fvc2D.C
@@ -35,15 +35,18 @@ Description
 #include "vector2D.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     typedef GeometricField<vector2D, fvPatchField, volMesh> volVector2DField;
+    typedef fvPatchField<vector2D> fvPatchVector2DField;
 
     defineTemplateTypeNameAndDebug(volVector2DField::Internal, 0);
     defineTemplateTypeNameAndDebug(volVector2DField, 0);
 
-    typedef fvPatchField<vector2D> fvPatchVector2DField;
-    makeFvPatchField(fvPatchVector2DField)
+    defineTemplateRunTimeSelectionTable(fvPatchVector2DField, patch);
+    defineTemplateRunTimeSelectionTable(fvPatchVector2DField, patchMapper);
+    defineTemplateRunTimeSelectionTable(fvPatchVector2DField, dictionary);
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 97723a1a94..010b19a0e6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -589,90 +589,8 @@ const pointPatchField<Type>& operator+
     #include "zeroGradientPointPatchField.H"
 #endif
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Runtime selection macros
-
-#define addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \
-    addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        patch                                                                  \
-    );                                                                         \
-    addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        patchMapper                                                            \
-    );                                                                         \
-    addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        dictionary                                                             \
-    );
-
-
-// for non-templated patch fields
-#define makePointPatchTypeField(PatchTypeField,typePatchTypeField)             \
-    defineTypeNameAndDebug(typePatchTypeField, 0);                             \
-    addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
-
-
-// for templated patch fields
-#define makeTemplatePointPatchTypeField(PatchTypeField, typePatchTypeField)    \
-    defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                \
-    addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
-
-
-#define makePointPatchFields(type)                                             \
-    makeTemplatePointPatchTypeField                                            \
-    (                                                                          \
-        pointPatchScalarField,                                                 \
-        type##PointPatchScalarField                                            \
-    );                                                                         \
-    makeTemplatePointPatchTypeField                                            \
-    (                                                                          \
-        pointPatchVectorField,                                                 \
-        type##PointPatchVectorField                                            \
-    );                                                                         \
-    makeTemplatePointPatchTypeField                                            \
-    (                                                                          \
-        pointPatchSphericalTensorField,                                        \
-        type##PointPatchSphericalTensorField                                   \
-    );                                                                         \
-    makeTemplatePointPatchTypeField                                            \
-    (                                                                          \
-        pointPatchSymmTensorField,                                             \
-        type##PointPatchSymmTensorField                                        \
-    );                                                                         \
-    makeTemplatePointPatchTypeField                                            \
-    (                                                                          \
-        pointPatchTensorField,                                                 \
-        type##PointPatchTensorField                                            \
-    );
-
-
-#define makePointPatchFieldsTypeName(type)                                     \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchScalarField, 0);       \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchVectorField, 0);       \
-    defineNamedTemplateTypeNameAndDebug                                        \
-    (                                                                          \
-        type##PointPatchSphericalTensorField, 0                                \
-    );                                                                         \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchSymmTensorField, 0);   \
-    defineNamedTemplateTypeNameAndDebug(type##PointPatchTensorField, 0)
-
-
-#define makePointPatchFieldTypedefs(type)                                      \
-    typedef type##PointPatchField<scalar> type##PointPatchScalarField;         \
-    typedef type##PointPatchField<vector> type##PointPatchVectorField;         \
-    typedef type##PointPatchField<sphericalTensor>                             \
-        type##PointPatchSphericalTensorField;                                  \
-    typedef type##PointPatchField<symmTensor> type##PointPatchSymmTensorField;\
-    typedef type##PointPatchField<tensor> type##PointPatchTensorField;
-
+#include "pointPatchFieldMacros.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMacros.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMacros.H
new file mode 100644
index 0000000000..640662c4a9
--- /dev/null
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMacros.H
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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/>.
+
+Description
+    Macros for creating pointPatchField types.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_pointPatchFieldMacros_H
+#define Foam_pointPatchFieldMacros_H
+
+#include "fieldTypes.H"
+#include "pointPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Runtime selection macros
+
+#define addToPointPatchFieldRunTimeSelection\
+(PatchTypeField, typePatchTypeField)\
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patch                                                                 \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patchMapper                                                           \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        dictionary                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For non-templated (or typedef) patch fields.
+//- Define a concrete pointPatchField type and add to run-time tables
+//- Example, (pointPatchScalarField, calculatedPointPatchScalarField)
+#define makePointPatchTypeField(PatchTypeField, typePatchTypeField)           \
+                                                                              \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+    addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField);
+
+//- Define a pointPatchField type for a specific field type
+//- Example, (scalar, calculated)
+#define makePointPatchFieldTypeName(fieldType, bcType)                        \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        CAT4(bcType, PointPatch, CAPITALIZE(fieldType), Field),               \
+        0                                                                     \
+    );
+
+//- Add runTime selection for pointPatchField type of a specific field type
+//- Example, (scalar, calculated)
+#define addPointPatchFieldTypeRunTime(fieldType, bcType)                      \
+    addToPointPatchFieldRunTimeSelection                                      \
+    (                                                                         \
+        CAT3(pointPatch, CAPITALIZE(fieldType), Field),                       \
+        CAT4(bcType, PointPatch, CAPITALIZE(fieldType), Field)                \
+    );
+
+// For templated patch fields
+#define makePointPatchFieldType(fieldType, bcType)                            \
+    makePointPatchFieldTypeName(fieldType, bcType)                            \
+    addPointPatchFieldTypeRunTime(fieldType, bcType)
+
+//- Declare a typedef for a pointPatchField.
+//- Example, (scalar, calculated)
+#define makePointPatchFieldTypedef(fieldType, bcType)                         \
+    typedef                                                                   \
+        bcType##PointPatchField<fieldType>                                    \
+        CAT4(bcType, PointPatch, CAPITALIZE(fieldType), Field);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- For all standard field types:
+//- define a pointPatchField type and add to run-time tables
+#define makePointPatchFields(bcType)                                          \
+                                                                              \
+    makePointPatchFieldType(scalar, bcType);                                  \
+    makePointPatchFieldType(vector, bcType);                                  \
+    makePointPatchFieldType(sphericalTensor, bcType);                         \
+    makePointPatchFieldType(symmTensor, bcType);                              \
+    makePointPatchFieldType(tensor, bcType);
+
+
+//- For all standard field types: define a pointPatchField type
+//- Example, (calculated)
+#define makePointPatchFieldsTypeName(bcType)                                  \
+                                                                              \
+    makePointPatchFieldTypeName(scalar, bcType);                              \
+    makePointPatchFieldTypeName(vector, bcType);                              \
+    makePointPatchFieldTypeName(sphericalTensor, bcType);                     \
+    makePointPatchFieldTypeName(symmTensor, bcType);                          \
+    makePointPatchFieldTypeName(tensor, bcType);
+
+
+//- For all standard field types: define typedefs for the pointPatchField
+//- Example, (calculated)
+#define makePointPatchFieldTypedefs(bcType)                                   \
+                                                                              \
+    makePointPatchFieldTypedef(scalar, bcType);                               \
+    makePointPatchFieldTypedef(vector, bcType);                               \
+    makePointPatchFieldTypedef(sphericalTensor, bcType);                      \
+    makePointPatchFieldTypedef(symmTensor, bcType);                           \
+    makePointPatchFieldTypedef(tensor, bcType);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
index 7a9d947842..b9b962e175 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C
@@ -27,27 +27,21 @@ License
 
 #include "pointPatchFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#define makePointPatchField(PatchTypeField)                                   \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patch);               \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
-#define makePointPatchField(pointPatchTypeField)                               \
-                                                                               \
-defineTemplateRunTimeSelectionTable(pointPatchTypeField, patch);               \
-defineTemplateRunTimeSelectionTable(pointPatchTypeField, patchMapper);         \
-defineTemplateRunTimeSelectionTable(pointPatchTypeField, dictionary);
-
-makePointPatchField(pointPatchScalarField)
-makePointPatchField(pointPatchVectorField)
-makePointPatchField(pointPatchSphericalTensorField)
-makePointPatchField(pointPatchSymmTensorField)
-makePointPatchField(pointPatchTensorField)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+makePointPatchField(pointPatchScalarField);
+makePointPatchField(pointPatchVectorField);
+makePointPatchField(pointPatchSphericalTensorField);
+makePointPatchField(pointPatchSymmTensorField);
+makePointPatchField(pointPatchTensorField);
 
 } // End namespace Foam
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.H
index 5ed1455267..fd22338394 100644
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef basicSymmetryFaPatchFields_H
-#define basicSymmetryFaPatchFields_H
+#ifndef Foam_basicSymmetryFaPatchFields_H
+#define Foam_basicSymmetryFaPatchFields_H
 
 #include "basicSymmetryFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(basicSymmetry)
+makeFaPatchTypeFieldTypedefs(basicSymmetry);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFields.H
index 0c8ee738f9..2a3f522e09 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchFields.H
@@ -23,22 +23,12 @@ License
     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::calculatedFaPatchFields
-
-Description
-
-SourceFiles
-    calculatedFaPatchFields.C
-
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedFaPatchFields_H
-#define calculatedFaPatchFields_H
+#ifndef Foam_calculatedFaPatchFields_H
+#define Foam_calculatedFaPatchFields_H
 
 #include "calculatedFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(calculated)
+makeFaPatchTypeFieldTypedefs(calculated);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFields.H
index eefbc84a2b..84d92206c2 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef coupledFaPatchFields_H
-#define coupledFaPatchFields_H
+#ifndef Foam_coupledFaPatchFields_H
+#define Foam_coupledFaPatchFields_H
 
 #include "coupledFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(coupled)
+makeFaPatchTypeFieldTypedefs(coupled);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFields.H
index 0fabeb87da..b2509d2c56 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchFields.H
@@ -23,22 +23,12 @@ License
     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::fixedGradientFaPatchFields
-
-Description
-
-SourceFiles
-    fixedGradientFaPatchFields.C
-
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedGradientFaPatchFields_H
-#define fixedGradientFaPatchFields_H
+#ifndef Foam_fixedGradientFaPatchFields_H
+#define Foam_fixedGradientFaPatchFields_H
 
 #include "fixedGradientFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(fixedGradient)
+makeFaPatchTypeFieldTypedefs(fixedGradient);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFields.H
index fc3774111d..1ba6cd94cd 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValueFaPatchFields_H
-#define fixedValueFaPatchFields_H
+#ifndef Foam_fixedValueFaPatchFields_H
+#define Foam_fixedValueFaPatchFields_H
 
 #include "fixedValueFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(fixedValue)
+makeFaPatchTypeFieldTypedefs(fixedValue);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFields.H
index f40d7d529f..8e227b5214 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mixedFaPatchFields_H
-#define mixedFaPatchFields_H
+#ifndef Foam_mixedFaPatchFields_H
+#define Foam_mixedFaPatchFields_H
 
 #include "mixedFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(mixed)
+makeFaPatchTypeFieldTypedefs(mixed);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.H
index 3e14b9bb75..1321fc17a8 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchFields.H
@@ -23,21 +23,12 @@ License
     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::transformFaPatchFields
-
-Description
-
-SourceFiles
-    transformFaPatchFields.C
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef transformFaPatchFields_H
-#define transformFaPatchFields_H
+#ifndef Foam_transformFaPatchFields_H
+#define Foam_transformFaPatchFields_H
 
 #include "transformFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(transform)
+makeFaPatchTypeFieldTypedefs(transform);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFields.H
index 65f04da9d9..721dbe70c3 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchFields.H
@@ -23,19 +23,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
-SourceFiles
-    zeroGradientFaPatchFields.C
-
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef zeroGradientFaPatchFields_H
-#define zeroGradientFaPatchFields_H
+#ifndef Foam_zeroGradientFaPatchFields_H
+#define Foam_zeroGradientFaPatchFields_H
 
 #include "zeroGradientFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(zeroGradient)
+makeFaPatchTypeFieldTypedefs(zeroGradient);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFields.H b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFields.H
index 939e93115d..a2576a86bb 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicFaPatchFields_H
-#define cyclicFaPatchFields_H
+#ifndef Foam_cyclicFaPatchFields_H
+#define Foam_cyclicFaPatchFields_H
 
 #include "cyclicFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(cyclic)
+makeFaPatchTypeFieldTypedefs(cyclic);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFields.H b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFields.H
index 7f9cc4f55b..b3a2340296 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchFields.H
@@ -23,18 +23,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
-SourceFiles
-    emptyFaPatchFields.C
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef emptyFaPatchFields_H
-#define emptyFaPatchFields_H
+#ifndef Foam_emptyFaPatchFields_H
+#define Foam_emptyFaPatchFields_H
 
 #include "emptyFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(empty)
+makeFaPatchTypeFieldTypedefs(empty);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchFields.H b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchFields.H
index 7b3fe7ca53..74a8cd2b30 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchFields.H
@@ -29,7 +29,6 @@ License
 #define Foam_processorFaPatchFields_H
 
 #include "processorFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(processor)
+makeFaPatchTypeFieldTypedefs(processor);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFields.H b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFields.H
index 5431ce100e..d414ed219e 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmetryFaPatchFields_H
-#define symmetryFaPatchFields_H
+#ifndef Foam_symmetryFaPatchFields_H
+#define Foam_symmetryFaPatchFields_H
 
 #include "symmetryFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(symmetry)
+makeFaPatchTypeFieldTypedefs(symmetry);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.H b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.H
index f27c1b909f..7b71d0f059 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wedgeFaPatchFields_H
-#define wedgeFaPatchFields_H
+#ifndef Foam_wedgeFaPatchFields_H
+#define Foam_wedgeFaPatchFields_H
 
 #include "wedgeFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(wedge)
+makeFaPatchTypeFieldTypedefs(wedge);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFields.H
index 4a3a054907..4d67a2beb1 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef clampedPlateFaPatchFields_H
-#define clampedPlateFaPatchFields_H
+#ifndef Foam_clampedPlateFaPatchFields_H
+#define Foam_clampedPlateFaPatchFields_H
 
 #include "clampedPlateFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(clampedPlate)
+makeFaPatchTypeFieldTypedefs(clampedPlate);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFields.H
index edef365227..ad2bb79108 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValueOutflowFaPatchFields_H
-#define fixedValueOutflowFaPatchFields_H
+#ifndef Foam_fixedValueOutflowFaPatchFields_H
+#define Foam_fixedValueOutflowFaPatchFields_H
 
 #include "fixedValueOutflowFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(fixedValueOutflow)
+makeFaPatchTypeFieldTypedefs(fixedValueOutflow);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.H
index 5d37298787..ae61e29d17 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef inletOutletFaPatchFields_H
-#define inletOutletFaPatchFields_H
+#ifndef Foam_inletOutletFaPatchFields_H
+#define Foam_inletOutletFaPatchFields_H
 
 #include "inletOutletFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(inletOutlet)
+makeFaPatchTypeFieldTypedefs(inletOutlet);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFields.H
index 33069264d3..a1d4140ad1 100644
--- a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef slipFaPatchFields_H
-#define slipFaPatchFields_H
+#ifndef Foam_slipFaPatchFields_H
+#define Foam_slipFaPatchFields_H
 
 #include "slipFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(slip)
+makeFaPatchTypeFieldTypedefs(slip);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H
index 46bfc57c73..d99c594ba6 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H
@@ -26,11 +26,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef timeVaryingUniformFixedValueFaPatchFields_H
-#define timeVaryingUniformFixedValueFaPatchFields_H
+#ifndef Foam_timeVaryingUniformFixedValueFaPatchFields_H
+#define Foam_timeVaryingUniformFixedValueFaPatchFields_H
 
 #include "timeVaryingUniformFixedValueFaPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +38,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaPatchTypeFieldTypedefs(timeVaryingUniformFixedValue)
+makeFaPatchTypeFieldTypedefs(timeVaryingUniformFixedValue);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index fd8196ddfb..7025ed2b63 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -52,6 +52,7 @@ SourceFiles
 #include "faPatch.H"
 #include "DimensionedField.H"
 #include "fieldTypes.H"
+#include "scalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,6 +67,7 @@ class areaMesh;
 
 template<class Type> class faPatchField;
 template<class Type> class calculatedFaPatchField;
+template<class Type> class zeroGradientFaPatchField;
 
 template<class Type>
 Ostream& operator<<(Ostream&, const faPatchField<Type>&);
@@ -383,10 +385,10 @@ public:
 
         //- Return a pointer to a new calculatedFaPatchField created on
         //- freestore without setting patchField values
-        template<class Type2>
+        template<class AnyType>
         static tmp<faPatchField<Type>> NewCalculatedType
         (
-            const faPatchField<Type2>&
+            const faPatchField<AnyType>& pf
         );
 
 
@@ -589,93 +591,8 @@ public:
     #include "zeroGradientFaPatchField.H"
 #endif
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Runtime selection macros
-
-#define addToFaPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    PatchTypeField, typePatchTypeField, patch                                 \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    PatchTypeField,                                                           \
-    typePatchTypeField,                                                       \
-    patchMapper                                                               \
-);                                                                            \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
-(                                                                             \
-    PatchTypeField, typePatchTypeField, dictionary                            \
-);
-
-
-#define makeFaPatchTypeFieldTypeName(typePatchTypeField)                      \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);
-
-
-#define makeFaPatchFieldsTypeName(typePatchField)                             \
-                                                                              \
-makeFaPatchTypeFieldTypeName(typePatchField##FaPatchScalarField);             \
-makeFaPatchTypeFieldTypeName(typePatchField##FaPatchVectorField);             \
-makeFaPatchTypeFieldTypeName(typePatchField##FaPatchSphericalTensorField);    \
-makeFaPatchTypeFieldTypeName(typePatchField##FaPatchSymmTensorField);         \
-makeFaPatchTypeFieldTypeName(typePatchField##FaPatchTensorField);
-
-
-#define makeFaPatchTypeField(PatchTypeField, typePatchTypeField)              \
-                                                                              \
-defineTypeNameAndDebug(typePatchTypeField, 0);                                \
-                                                                              \
-addToFaPatchFieldRunTimeSelection                                             \
-(                                                                             \
-    PatchTypeField, typePatchTypeField                                        \
-);
-
-#define makeTemplateFaPatchTypeField(PatchTypeField, typePatchTypeField)      \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                   \
-                                                                              \
-addToFaPatchFieldRunTimeSelection                                             \
-(                                                                             \
-    PatchTypeField, typePatchTypeField                                        \
-);
-
-
-#define makeFaPatchFields(type)                                               \
-                                                                              \
-makeTemplateFaPatchTypeField(faPatchScalarField, type##FaPatchScalarField);   \
-makeTemplateFaPatchTypeField(faPatchVectorField, type##FaPatchVectorField);   \
-makeTemplateFaPatchTypeField                                                  \
-(                                                                             \
-    faPatchSphericalTensorField,                                              \
-    type##FaPatchSphericalTensorField                                         \
-);                                                                            \
-makeTemplateFaPatchTypeField                                                  \
-(                                                                             \
-    faPatchSymmTensorField,                                                   \
-    type##FaPatchSymmTensorField                                              \
-);                                                                            \
-makeTemplateFaPatchTypeField                                                  \
-(                                                                             \
-    faPatchTensorField,                                                       \
-    type##FaPatchTensorField                                                  \
-);
-
-
-#define makeFaPatchTypeFieldTypedefs(type)                                    \
-                                                                              \
-typedef type##FaPatchField<scalar> type##FaPatchScalarField;                  \
-typedef type##FaPatchField<vector> type##FaPatchVectorField;                  \
-typedef type##FaPatchField<sphericalTensor>                                   \
-     type##FaPatchSphericalTensorField;                                       \
-typedef type##FaPatchField<symmTensor> type##FaPatchSymmTensorField;          \
-typedef type##FaPatchField<tensor> type##FaPatchTensorField;
-
+#include "faPatchFieldMacros.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMacros.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMacros.H
new file mode 100644
index 0000000000..bc98115100
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMacros.H
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2016 Wikki Ltd
+    Copyright (C) 2023 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/>.
+
+Description
+    Macros for creating faPatchField types.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_faPatchFieldMacros_H
+#define Foam_faPatchFieldMacros_H
+
+#include "fieldTypes.H"
+#include "faPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Runtime selection macros
+
+#define addToFaPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \
+                                                                              \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patch                                                                 \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patchMapper                                                           \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        dictionary                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For non-templated (or typedef) patch fields.
+//- Define a concrete faPatchField type and add to run-time tables
+//- Example, (faPatchScalarField, calculatedFaPatchScalarField)
+#define makeFaPatchTypeField(PatchTypeField, typePatchTypeField)              \
+                                                                              \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+    addToFaPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField);
+
+//- Define a faPatchField type for a specific field type
+//- Example, (scalar, calculated)
+#define makeFaPatchFieldTypeName(fieldType, bcType)                           \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        CAT4(bcType, FaPatch, CAPITALIZE(fieldType), Field),                  \
+        0                                                                     \
+    );
+
+//- Add runTime selection for faPatchField type of a specific field type
+//- Example, (scalar, calculated)
+#define addFaPatchFieldTypeRunTime(fieldType, bcType)                         \
+    addToFaPatchFieldRunTimeSelection                                         \
+    (                                                                         \
+        CAT3(faPatch, CAPITALIZE(fieldType), Field),                          \
+        CAT4(bcType, FaPatch, CAPITALIZE(fieldType), Field)                   \
+    );
+
+// For templated patch fields
+#define makeFaPatchFieldType(fieldType, bcType)                               \
+    makeFaPatchFieldTypeName(fieldType, bcType)                               \
+    addFaPatchFieldTypeRunTime(fieldType, bcType)                             \
+
+//- Declare a typedef for a faPatchField. Example, (scalar, calculated)
+#define makeFaPatchFieldTypedef(fieldType, bcType)                            \
+    typedef                                                                   \
+        bcType##FaPatchField<fieldType>                                       \
+        CAT4(bcType, FaPatch, CAPITALIZE(fieldType), Field);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- For all standard field types:
+//- define a faPatchField type and add to run-time tables
+#define makeFaPatchFields(bcType)                                             \
+                                                                              \
+    makeFaPatchFieldType(scalar, bcType);                                     \
+    makeFaPatchFieldType(vector, bcType);                                     \
+    makeFaPatchFieldType(sphericalTensor, bcType);                            \
+    makeFaPatchFieldType(symmTensor, bcType);                                 \
+    makeFaPatchFieldType(tensor, bcType);
+
+
+//- For all standard field types: define a faPatchField type.
+//- Example, (calculated)
+#define makeFaPatchFieldsTypeName(bcType)                                     \
+                                                                              \
+    makeFaPatchFieldTypeName(scalar, bcType);                                 \
+    makeFaPatchFieldTypeName(vector, bcType);                                 \
+    makeFaPatchFieldTypeName(sphericalTensor, bcType);                        \
+    makeFaPatchFieldTypeName(symmTensor, bcType);                             \
+    makeFaPatchFieldTypeName(tensor, bcType);
+
+
+//- For all standard field types: define typedefs for the faPatchField.
+//- Example, (calculated)
+#define makeFaPatchTypeFieldTypedefs(bcType)                                  \
+                                                                              \
+    makeFaPatchFieldTypedef(scalar, bcType);                                  \
+    makeFaPatchFieldTypedef(vector, bcType);                                  \
+    makeFaPatchFieldTypedef(sphericalTensor, bcType);                         \
+    makeFaPatchFieldTypedef(symmTensor, bcType);                              \
+    makeFaPatchFieldTypedef(tensor, bcType);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C
index 1cfadb9c9c..1cff858480 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C
@@ -28,26 +28,21 @@ License
 #include "faPatchFields.H"
 #include "areaFaMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#define makeFaPatchField(PatchTypeField)                                      \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patch);               \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
-#define makeFaPatchField(faPatchTypeField)                                    \
-                                                                              \
-defineTemplateRunTimeSelectionTable(faPatchTypeField, patch);                 \
-defineTemplateRunTimeSelectionTable(faPatchTypeField, patchMapper);           \
-defineTemplateRunTimeSelectionTable(faPatchTypeField, dictionary);
-
-makeFaPatchField(faPatchScalarField)
-makeFaPatchField(faPatchVectorField)
-makeFaPatchField(faPatchSphericalTensorField)
-makeFaPatchField(faPatchSymmTensorField)
-makeFaPatchField(faPatchTensorField)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+makeFaPatchField(faPatchScalarField);
+makeFaPatchField(faPatchVectorField);
+makeFaPatchField(faPatchSphericalTensorField);
+makeFaPatchField(faPatchSymmTensorField);
+makeFaPatchField(faPatchTensorField);
 
 } // End namespace Foam
 
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.H
index 21acf6ab74..cd11bfd3d3 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.H
@@ -23,6 +23,9 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Description
+    Declarations for faPatchField types
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_faPatchFields_H
@@ -31,8 +34,6 @@ License
 #include "faPatchField.H"
 #include "faPatchFieldsFwd.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldsFwd.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldsFwd.H
index 9f04cd897f..67584bb3cb 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldsFwd.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldsFwd.H
@@ -23,10 +23,13 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Description
+    Forward declarations for faPatchField types
+
 \*---------------------------------------------------------------------------*/
 
-#ifndef faPatchFieldsFwd_H
-#define faPatchFieldsFwd_H
+#ifndef Foam_faPatchFieldsFwd_H
+#define Foam_faPatchFieldsFwd_H
 
 #include "fieldTypes.H"
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H
index b435e788eb..9553681d3f 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedFaePatchFields_H
-#define calculatedFaePatchFields_H
+#ifndef Foam_calculatedFaePatchFields_H
+#define Foam_calculatedFaePatchFields_H
 
 #include "calculatedFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(calculated)
+makeFaePatchTypeFieldTypedefs(calculated);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C
index d6b95a6026..336c5e3910 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C
@@ -29,17 +29,13 @@ License
 #include "coupledFaePatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 makeFaePatchFieldsTypeName(coupled);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H
index 39ee68269e..cced89e837 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef coupledFaePatchFields_H
-#define coupledFaePatchFields_H
+#ifndef Foam_coupledFaePatchFields_H
+#define Foam_coupledFaePatchFields_H
 
 #include "coupledFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(coupled)
+makeFaePatchTypeFieldTypedefs(coupled);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.H
index 5fa29c54ca..030b4c17b7 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValueFaePatchFields_H
-#define fixedValueFaePatchFields_H
+#ifndef Foam_fixedValueFaePatchFields_H
+#define Foam_fixedValueFaePatchFields_H
 
 #include "fixedValueFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(fixedValue)
+makeFaePatchTypeFieldTypedefs(fixedValue);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.H b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.H
index 50760a14fc..04e6582054 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicFaePatchFields_H
-#define cyclicFaePatchFields_H
+#ifndef Foam_cyclicFaePatchFields_H
+#define Foam_cyclicFaePatchFields_H
 
 #include "cyclicFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(cyclic)
+makeFaePatchTypeFieldTypedefs(cyclic);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.H b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.H
index 2577a79440..bba651b777 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef emptyFaePatchFields_H
-#define emptyFaePatchFields_H
+#ifndef Foam_emptyFaePatchFields_H
+#define Foam_emptyFaePatchFields_H
 
 #include "emptyFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(empty)
+makeFaePatchTypeFieldTypedefs(empty);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H
index 11f9b08d05..907809c4b5 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorFaePatchFields_H
-#define processorFaePatchFields_H
+#ifndef Foam_processorFaePatchFields_H
+#define Foam_processorFaePatchFields_H
 
 #include "processorFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(processor)
+makeFaePatchTypeFieldTypedefs(processor);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.H b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.H
index 9a7fb05cfe..41044c71e8 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmetryFaePatchFields_H
-#define symmetryFaePatchFields_H
+#ifndef Foam_symmetryFaePatchFields_H
+#define Foam_symmetryFaePatchFields_H
 
 #include "symmetryFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(symmetry)
+makeFaePatchTypeFieldTypedefs(symmetry);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.H b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.H
index f90c531f70..2fbd4ef28a 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wedgeFaePatchFields_H
-#define wedgeFaePatchFields_H
+#ifndef Foam_wedgeFaePatchFields_H
+#define Foam_wedgeFaePatchFields_H
 
 #include "wedgeFaePatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,7 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makeFaePatchTypeFieldTypedefs(wedge)
+makeFaePatchTypeFieldTypedefs(wedge);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index d4b73f5b13..69c355333c 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -472,67 +472,8 @@ public:
     #include "calculatedFaePatchField.H"
 #endif
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Runtime selection macros
-
-#define makeFaePatchTypeFieldTypeName(typePatchTypeField)                      \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);
-
-#define makeFaePatchFieldsTypeName(typePatchField)                             \
-                                                                               \
-makeFaePatchTypeFieldTypeName(typePatchField##FaePatchScalarField);            \
-makeFaePatchTypeFieldTypeName(typePatchField##FaePatchVectorField);            \
-makeFaePatchTypeFieldTypeName(typePatchField##FaePatchSphericalTensorField);   \
-makeFaePatchTypeFieldTypeName(typePatchField##FaePatchSymmTensorField);        \
-makeFaePatchTypeFieldTypeName(typePatchField##FaePatchTensorField);
-
-
-#define makeFaePatchTypeField(PatchTypeField, typePatchTypeField)              \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                    \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField, typePatchTypeField, patch                                  \
-);                                                                             \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField,                                                            \
-    typePatchTypeField,                                                        \
-    patchMapper                                                                \
-);                                                                             \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField, typePatchTypeField, dictionary                             \
-);
-
-
-#define makeFaePatchFields(type)                                               \
-                                                                               \
-makeFaePatchTypeField(faePatchScalarField, type##FaePatchScalarField);         \
-makeFaePatchTypeField(faePatchVectorField, type##FaePatchVectorField);         \
-makeFaePatchTypeField                                                          \
-(                                                                              \
-    faePatchSphericalTensorField,                                              \
-    type##FaePatchSphericalTensorField                                         \
-);                                                                             \
-makeFaePatchTypeField(faePatchSymmTensorField, type##FaePatchSymmTensorField); \
-makeFaePatchTypeField(faePatchTensorField, type##FaePatchTensorField);
-
-
-#define makeFaePatchTypeFieldTypedefs(type)                                    \
-                                                                               \
-typedef type##FaePatchField<scalar> type##FaePatchScalarField;                 \
-typedef type##FaePatchField<vector> type##FaePatchVectorField;                 \
-typedef type##FaePatchField<sphericalTensor>                                   \
-    type##FaePatchSphericalTensorField;                                        \
-typedef type##FaePatchField<symmTensor> type##FaePatchSymmTensorField;         \
-typedef type##FaePatchField<tensor> type##FaePatchTensorField;
-
+#include "faePatchFieldMacros.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldMacros.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldMacros.H
new file mode 100644
index 0000000000..090faa273b
--- /dev/null
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldMacros.H
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2016 Wikki Ltd
+    Copyright (C) 2023 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/>.
+
+Description
+    Macros for creating faePatchField types.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_faePatchFieldMacros_H
+#define Foam_faePatchFieldMacros_H
+
+#include "fieldTypes.H"
+#include "faePatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Runtime selection macros
+
+#define addToFaePatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)\
+                                                                              \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patch                                                                 \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patchMapper                                                           \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        dictionary                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For non-templated (or typedef) patch fields.
+//- Define a concrete faePatchField type and add to run-time tables
+//- Example, (faePatchScalarField, calculatedFaePatchScalarField)
+#define makeFaePatchTypeField(PatchTypeField, typePatchTypeField)             \
+                                                                              \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+    addToFaePatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField);
+
+//- Define a faePatchField type for a specific field type
+//- Example, (scalar, calculated)
+#define makeFaePatchFieldTypeName(fieldType, bcType)                          \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        CAT4(bcType, FaePatch, CAPITALIZE(fieldType), Field),                 \
+        0                                                                     \
+    );
+
+//- Add runTime selection for faePatchField type of a specific field type
+//- Example, (scalar, calculated)
+#define addFaePatchFieldTypeRunTime(fieldType, bcType)                        \
+    addToFaePatchFieldRunTimeSelection                                        \
+    (                                                                         \
+        CAT3(faePatch, CAPITALIZE(fieldType), Field),                         \
+        CAT4(bcType, FaePatch, CAPITALIZE(fieldType), Field)                  \
+    );
+
+// For templated patch fields
+#define makeFaePatchFieldType(fieldType, bcType)                              \
+    makeFaePatchFieldTypeName(fieldType, bcType)                              \
+    addFaePatchFieldTypeRunTime(fieldType, bcType)
+
+//- Declare a typedef for a faePatchField. Example, (scalar, calculated)
+#define makeFaePatchFieldTypedef(fieldType, bcType)                           \
+    typedef                                                                   \
+        bcType##FaePatchField<fieldType>                                      \
+        CAT4(bcType, FaePatch, CAPITALIZE(fieldType), Field);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- For all standard field types:
+//- define a faePatchField type and add to run-time tables
+#define makeFaePatchFields(bcType)                                            \
+                                                                              \
+    makeFaePatchFieldType(scalar, bcType);                                    \
+    makeFaePatchFieldType(vector, bcType);                                    \
+    makeFaePatchFieldType(sphericalTensor, bcType);                           \
+    makeFaePatchFieldType(symmTensor, bcType);                                \
+    makeFaePatchFieldType(tensor, bcType);
+
+
+//- For all standard field types: define a faePatchField type
+//- Example, (calculated)
+#define makeFaePatchFieldsTypeName(bcType)                                    \
+                                                                              \
+    makeFaePatchFieldTypeName(scalar, bcType);                                \
+    makeFaePatchFieldTypeName(vector, bcType);                                \
+    makeFaePatchFieldTypeName(sphericalTensor, bcType);                       \
+    makeFaePatchFieldTypeName(symmTensor, bcType);                            \
+    makeFaePatchFieldTypeName(tensor, bcType);
+
+
+//- For all standard field types: define typedefs for the faePatchField
+//- Example, (calculated)
+#define makeFaePatchTypeFieldTypedefs(bcType)                                 \
+                                                                              \
+    makeFaePatchFieldTypedef(scalar, bcType);                                 \
+    makeFaePatchFieldTypedef(vector, bcType);                                 \
+    makeFaePatchFieldTypedef(sphericalTensor, bcType);                        \
+    makeFaePatchFieldTypedef(symmTensor, bcType);                             \
+    makeFaePatchFieldTypedef(tensor, bcType);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C
index 29dcc54e3c..cba506b3a9 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C
@@ -28,27 +28,21 @@ License
 #include "faePatchFields.H"
 #include "edgeFaMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#define makeFaePatchField(PatchTypeField)                                     \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patch);               \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
-#define makeFaePatchField(faePatchTypeField)                                  \
-                                                                              \
-defineTemplateRunTimeSelectionTable(faePatchTypeField, patch);                \
-defineTemplateRunTimeSelectionTable(faePatchTypeField, patchMapper);          \
-defineTemplateRunTimeSelectionTable(faePatchTypeField, dictionary);
-
-makeFaePatchField(faePatchScalarField)
-makeFaePatchField(faePatchVectorField)
-makeFaePatchField(faePatchSphericalTensorField)
-makeFaePatchField(faePatchSymmTensorField)
-makeFaePatchField(faePatchTensorField)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+makeFaePatchField(faePatchScalarField);
+makeFaePatchField(faePatchVectorField);
+makeFaePatchField(faePatchSphericalTensorField);
+makeFaePatchField(faePatchSymmTensorField);
+makeFaePatchField(faePatchTensorField);
 
 } // End namespace Foam
 
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.H
index f3bc8dc854..822e6b1c5d 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.H
@@ -23,11 +23,8 @@ License
     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::faePatchField
-
 Description
-    Finite area edge-based patch fields
+    Declarations for faePatchField types
 
 \*---------------------------------------------------------------------------*/
 
@@ -37,8 +34,6 @@ Description
 #include "faePatchField.H"
 #include "faePatchFieldsFwd.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H
index 30bf953ec4..36e49bdf5e 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H
@@ -23,15 +23,13 @@ License
     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::faePatchField
-
 Description
+    Forward declarations for faePatchField types
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faePatchFieldsFwd_H
-#define faePatchFieldsFwd_H
+#ifndef Foam_faePatchFieldsFwd_H
+#define Foam_faePatchFieldsFwd_H
 
 #include "fieldTypes.H"
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
index 6028845530..e3e0b3a481 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchFields.C
@@ -31,6 +31,14 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchFieldType(scalar, fan);
+}
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<>
@@ -102,12 +110,4 @@ void Foam::fanFvPatchField<Foam::scalar>::calcFanJump()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeTemplatePatchTypeField(scalar, fan);
-}
-
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C
index b382a51f42..1975af0b2b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchFields.C
@@ -29,18 +29,12 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeTemplatePatchTypeField(vector, fixedNormalSlip);
-makeTemplatePatchTypeField(tensor, fixedNormalSlip);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makePatchFieldType(vector, fixedNormalSlip);
+    makePatchFieldType(tensor, fixedNormalSlip);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedMixedFieldFvPatchField/mappedMixedFieldFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedMixedFieldFvPatchField/mappedMixedFieldFvPatchFields.C
index 6eed3da77b..5fec5ef25a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedMixedFieldFvPatchField/mappedMixedFieldFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedMixedFieldFvPatchField/mappedMixedFieldFvPatchFields.C
@@ -36,7 +36,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-//makeTemplatePatchTypeField(scalar, mappedMixedField);
 makePatchFields(mappedMixedField);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchFields.C
index e7b8d4c915..4c4ace9e78 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchFields.C
@@ -36,7 +36,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-//makeTemplatePatchTypeField(scalar, mappedMixed);
 makePatchFields(mappedMixed);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFields.C
index 2dd5baaf48..40a36703ee 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDigitalFilterInlet/turbulentDigitalFilterInletFvPatchFields.C
@@ -36,8 +36,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makeTemplatePatchTypeField(scalar, turbulentDigitalFilterInlet);
-makeTemplatePatchTypeField(vector, turbulentDigitalFilterInlet);
+makePatchFieldType(scalar, turbulentDigitalFilterInlet);
+makePatchFieldType(vector, turbulentDigitalFilterInlet);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 3d23bc0a2c..cf86b37bd7 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -716,106 +716,8 @@ public:
     #include "zeroGradientFvPatchField.H"
 #endif
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Runtime selection macros
-
-#define makeFvPatchField(fvPatchTypeField)                                     \
-                                                                               \
-defineTemplateRunTimeSelectionTable(fvPatchTypeField, patch);                  \
-defineTemplateRunTimeSelectionTable(fvPatchTypeField, patchMapper);            \
-defineTemplateRunTimeSelectionTable(fvPatchTypeField, dictionary);
-
-
-#undef  addToPatchFieldRunTimeSelection
-#define addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)    \
-    addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        patch                                                                  \
-    );                                                                         \
-    addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        patchMapper                                                            \
-    );                                                                         \
-    addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        dictionary                                                             \
-    );
-
-
-// Use with caution
-#undef  addRemovableToPatchFieldRunTimeSelection
-#define addRemovableToPatchFieldRunTimeSelection\
-(PatchTypeField, typePatchTypeField)                                           \
-                                                                               \
-    addRemovableToRunTimeSelectionTable                                        \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        patch                                                                  \
-    );                                                                         \
-    addRemovableToRunTimeSelectionTable                                        \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        patchMapper                                                            \
-    );                                                                         \
-    addRemovableToRunTimeSelectionTable                                        \
-    (                                                                          \
-        PatchTypeField,                                                        \
-        typePatchTypeField,                                                    \
-        dictionary                                                             \
-    );
-
-
-// For non-templated patch fields
-#define makePatchTypeField(PatchTypeField, typePatchTypeField)                 \
-    defineTypeNameAndDebug(typePatchTypeField, 0);                             \
-    addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
-
-// For non-templated patch fields - use with caution
-#define makeRemovablePatchTypeField(PatchTypeField, typePatchTypeField)        \
-    defineTypeNameAndDebug(typePatchTypeField, 0);                             \
-    addRemovableToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
-
-// For templated patch fields
-#define makeTemplatePatchTypeField(fieldType, type)                            \
-    defineNamedTemplateTypeNameAndDebug                                        \
-    (                                                                          \
-        CAT4(type, FvPatch, CAPITALIZE(fieldType), Field),                     \
-        0                                                                      \
-    );                                                                         \
-    addToPatchFieldRunTimeSelection                                            \
-    (                                                                          \
-        CAT3(fvPatch, CAPITALIZE(fieldType), Field),                           \
-        CAT4(type, FvPatch, CAPITALIZE(fieldType), Field)                      \
-    )
-
-#define makePatchFields(type)                                                  \
-    FOR_ALL_FIELD_TYPES(makeTemplatePatchTypeField, type)
-
-#define makePatchFieldTypeName(fieldType, type)                                \
-    defineNamedTemplateTypeNameAndDebug                                        \
-    (                                                                          \
-        CAT4(type, FvPatch, CAPITALIZE(fieldType), Field),                     \
-        0                                                                      \
-    );
-
-#define makePatchFieldTypeNames(type)                                          \
-    FOR_ALL_FIELD_TYPES(makePatchFieldTypeName, type)
-
-#define makePatchTypeFieldTypedef(fieldType, type)                             \
-    typedef type##FvPatchField<fieldType>                                      \
-        CAT4(type, FvPatch, CAPITALIZE(fieldType), Field);
-
-#define makePatchTypeFieldTypedefs(type)                                       \
-    FOR_ALL_FIELD_TYPES(makePatchTypeFieldTypedef, type)
+#include "fvPatchFieldMacros.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMacros.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMacros.H
new file mode 100644
index 0000000000..1cf00e951d
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMacros.H
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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/>.
+
+Description
+    Macros for creating fvPatchField types.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_fvPatchFieldMacros_H
+#define Foam_fvPatchFieldMacros_H
+
+#include "fieldTypes.H"
+#include "fvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Runtime selection macros
+
+#undef  addToPatchFieldRunTimeSelection
+#define addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)   \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patch                                                                 \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patchMapper                                                           \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        dictionary                                                            \
+    );
+
+
+// Use with caution
+#undef  addRemovableToPatchFieldRunTimeSelection
+#define addRemovableToPatchFieldRunTimeSelection\
+(PatchTypeField, typePatchTypeField)                                          \
+                                                                              \
+    addRemovableToRunTimeSelectionTable                                       \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patch                                                                 \
+    );                                                                        \
+    addRemovableToRunTimeSelectionTable                                       \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patchMapper                                                           \
+    );                                                                        \
+    addRemovableToRunTimeSelectionTable                                       \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        dictionary                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For non-templated (or typedef) patch fields.
+//- Define a concrete fvPatchField type and add to run-time tables
+//- Example, (fvPatchScalarField, calculatedFvPatchScalarField)
+#define makePatchTypeField(PatchTypeField, typePatchTypeField)                \
+                                                                              \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+    addToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField);
+
+// For non-templated patch fields - use with caution
+#define makeRemovablePatchTypeField(PatchTypeField, typePatchTypeField)       \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+    addRemovableToPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
+
+
+//- Define a fvPatchField type for a specific field type
+//- Example, (scalar, calculated)
+#define makePatchFieldTypeName(fieldType, bcType)                             \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        CAT4(bcType, FvPatch, CAPITALIZE(fieldType), Field),                  \
+        0                                                                     \
+    );
+
+//- Add runTime selection for fvPatchField type of a specific field type
+//- Example, (scalar, calculated)
+#define addPatchFieldTypeRunTime(fieldType, bcType)                           \
+    addToPatchFieldRunTimeSelection                                           \
+    (                                                                         \
+        CAT3(fvPatch, CAPITALIZE(fieldType), Field),                          \
+        CAT4(bcType, FvPatch, CAPITALIZE(fieldType), Field)                   \
+    );
+
+// For templated patch fields
+#define makePatchFieldType(fieldType, bcType)                                 \
+    makePatchFieldTypeName(fieldType, bcType)                                 \
+    addPatchFieldTypeRunTime(fieldType, bcType)
+
+//- Declare a typedef for a fvPatchField. Example, (scalar, calculated)
+#define makePatchTypeFieldTypedef(fieldType, bcType)                          \
+    typedef                                                                   \
+        bcType##FvPatchField<fieldType>                                       \
+        CAT4(bcType, FvPatch, CAPITALIZE(fieldType), Field);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- For all standard field types:
+//- define a faPatchField type and add to run-time tables
+#define makePatchFields(bcType)                                               \
+                                                                              \
+    makePatchFieldType(scalar, bcType);                                       \
+    makePatchFieldType(vector, bcType);                                       \
+    makePatchFieldType(sphericalTensor, bcType);                              \
+    makePatchFieldType(symmTensor, bcType);                                   \
+    makePatchFieldType(tensor, bcType);
+
+
+//- For all standard field types: define a faPatchField type.
+//- Example, (calculated)
+#define makePatchFieldTypeNames(bcType)                                       \
+                                                                              \
+    makePatchFieldTypeName(scalar, bcType);                                   \
+    makePatchFieldTypeName(vector, bcType);                                   \
+    makePatchFieldTypeName(sphericalTensor, bcType);                          \
+    makePatchFieldTypeName(symmTensor, bcType);                               \
+    makePatchFieldTypeName(tensor, bcType);
+
+
+//- For all standard field types: define typedefs for the faPatchField
+//- Example, (calculated)
+#define makePatchTypeFieldTypedefs(bcType)                                    \
+                                                                              \
+    makePatchTypeFieldTypedef(scalar, bcType);                                \
+    makePatchTypeFieldTypedef(vector, bcType);                                \
+    makePatchTypeFieldTypedef(sphericalTensor, bcType);                       \
+    makePatchTypeFieldTypedef(symmTensor, bcType);                            \
+    makePatchTypeFieldTypedef(tensor, bcType);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Compatibility: OpenFOAM-v2212 and earlier
+
+#define makeTemplatePatchTypeField(fldType, bcType) \
+    makePatchFieldType(fldType, bcType)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C
index 15fa4f1052..d9905d8fe7 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFields.C
@@ -27,20 +27,21 @@ License
 
 #include "fvPatchFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#define makeFvPatchField(PatchTypeField)                                      \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patch);               \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
-makeFvPatchField(fvPatchScalarField)
-makeFvPatchField(fvPatchVectorField)
-makeFvPatchField(fvPatchSphericalTensorField)
-makeFvPatchField(fvPatchSymmTensorField)
-makeFvPatchField(fvPatchTensorField)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+makeFvPatchField(fvPatchScalarField);
+makeFvPatchField(fvPatchVectorField);
+makeFvPatchField(fvPatchSphericalTensorField);
+makeFvPatchField(fvPatchSymmTensorField);
+makeFvPatchField(fvPatchTensorField);
 
 } // End namespace Foam
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 1eb422705a..3527c89dfb 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -473,66 +473,8 @@ public:
     #include "calculatedFvsPatchField.H"
 #endif
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Runtime selection macros
-
-#define makeFvsPatchTypeFieldTypeName(type)                                    \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(type, 0);
-
-#define makeFvsPatchFieldsTypeName(type)                                       \
-                                                                               \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchScalarField);                      \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchVectorField);                      \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchSphericalTensorField);             \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchSymmTensorField);                  \
-makeFvsPatchTypeFieldTypeName(type##FvsPatchTensorField);
-
-#define makeFvsPatchTypeField(PatchTypeField, typePatchTypeField)              \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0);                    \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField, typePatchTypeField, patch                                  \
-);                                                                             \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField,                                                            \
-    typePatchTypeField,                                                        \
-    patchMapper                                                                \
-);                                                                             \
-                                                                               \
-addToRunTimeSelectionTable                                                     \
-(                                                                              \
-    PatchTypeField, typePatchTypeField, dictionary                             \
-);
-
-
-#define makeFvsPatchFields(type)                                               \
-                                                                               \
-makeFvsPatchTypeField(fvsPatchScalarField, type##FvsPatchScalarField);         \
-makeFvsPatchTypeField(fvsPatchVectorField, type##FvsPatchVectorField);         \
-makeFvsPatchTypeField                                                          \
-(                                                                              \
-    fvsPatchSphericalTensorField,                                              \
-    type##FvsPatchSphericalTensorField                                         \
-);                                                                             \
-makeFvsPatchTypeField(fvsPatchSymmTensorField, type##FvsPatchSymmTensorField); \
-makeFvsPatchTypeField(fvsPatchTensorField, type##FvsPatchTensorField);
-
-
-#define makeFvsPatchTypeFieldTypedefs(type)                                    \
-                                                                               \
-typedef type##FvsPatchField<scalar> type##FvsPatchScalarField;                 \
-typedef type##FvsPatchField<vector> type##FvsPatchVectorField;                 \
-typedef type##FvsPatchField<sphericalTensor>                                   \
-    type##FvsPatchSphericalTensorField;                                        \
-typedef type##FvsPatchField<symmTensor> type##FvsPatchSymmTensorField;         \
-typedef type##FvsPatchField<tensor> type##FvsPatchTensorField;
-
+#include "fvsPatchFieldMacros.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldMacros.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldMacros.H
new file mode 100644
index 0000000000..62828eaf92
--- /dev/null
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldMacros.H
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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/>.
+
+Description
+    Macros for creating fvsPatchField types.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_fvsPatchFieldMacros_H
+#define Foam_fvsPatchFieldMacros_H
+
+#include "fieldTypes.H"
+#include "fvsPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Runtime selection macros
+
+#define addToFvsPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)\
+                                                                              \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patch                                                                 \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        patchMapper                                                           \
+    );                                                                        \
+    addToRunTimeSelectionTable                                                \
+    (                                                                         \
+        PatchTypeField,                                                       \
+        typePatchTypeField,                                                   \
+        dictionary                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For non-templated (or typedef) patch fields.
+//- Define a concrete fvsPatchField type and add to run-time tables
+//- Example, (fvsPatchScalarField, calculatedFvsPatchScalarField)
+#define makeFvsPatchTypeField(PatchTypeField, typePatchTypeField)             \
+                                                                              \
+    defineTypeNameAndDebug(typePatchTypeField, 0);                            \
+    addToFvsPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField);
+
+
+//- Define a fvsPatchField type for a specific field type
+//- Example, (scalar, calculated)
+#define makeFvsPatchFieldTypeName(fieldType, bcType)                          \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        CAT4(bcType, FvsPatch, CAPITALIZE(fieldType), Field),                 \
+        0                                                                     \
+    );
+
+//- Add runTime selection for fvsPatchField type of a specific field type
+//- Example, (scalar, calculated)
+#define addFvsPatchFieldTypeRunTime(fieldType, bcType)                        \
+    addToFvsPatchFieldRunTimeSelection                                        \
+    (                                                                         \
+        CAT3(fvsPatch, CAPITALIZE(fieldType), Field),                         \
+        CAT4(bcType, FvsPatch, CAPITALIZE(fieldType), Field)                  \
+    );
+
+// For templated patch fields
+#define makeFvsPatchFieldType(fieldType, bcType)                              \
+    makeFvsPatchFieldTypeName(fieldType, bcType)                              \
+    addFvsPatchFieldTypeRunTime(fieldType, bcType)
+
+//- Declare a typedef for a fvsPatchField. Example, (scalar, calculated)
+#define makeFvsPatchFieldTypedef(fieldType, bcType)                           \
+    typedef                                                                   \
+        bcType##FvsPatchField<fieldType>                                      \
+        CAT4(bcType, FvsPatch, CAPITALIZE(fieldType), Field);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- For all standard field types:
+//- define a fvsPatchField type and add to run-time tables
+#define makeFvsPatchFields(bcType)                                            \
+                                                                              \
+    makeFvsPatchFieldType(scalar, bcType);                                    \
+    makeFvsPatchFieldType(vector, bcType);                                    \
+    makeFvsPatchFieldType(sphericalTensor, bcType);                           \
+    makeFvsPatchFieldType(symmTensor, bcType);                                \
+    makeFvsPatchFieldType(tensor, bcType);
+
+
+//- For all standard field types: define a fvsPatchField type
+//- Example, (calculated)
+#define makeFvsPatchFieldsTypeName(bcType)                                    \
+                                                                              \
+    makeFvsPatchFieldTypeName(scalar, bcType);                                \
+    makeFvsPatchFieldTypeName(vector, bcType);                                \
+    makeFvsPatchFieldTypeName(sphericalTensor, bcType);                       \
+    makeFvsPatchFieldTypeName(symmTensor, bcType);                            \
+    makeFvsPatchFieldTypeName(tensor, bcType);
+
+
+//- For all standard field types: define typedefs for the fvsPatchField
+//- Example, (calculated)
+#define makeFvsPatchTypeFieldTypedefs(bcType)                                 \
+                                                                              \
+    makeFvsPatchFieldTypedef(scalar, bcType);                                 \
+    makeFvsPatchFieldTypedef(vector, bcType);                                 \
+    makeFvsPatchFieldTypedef(sphericalTensor, bcType);                        \
+    makeFvsPatchFieldTypedef(symmTensor, bcType);                             \
+    makeFvsPatchFieldTypedef(tensor, bcType);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
index bd696c9ec1..40f12db9b8 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
@@ -27,26 +27,21 @@ License
 
 #include "fvsPatchFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#define makeFvsPatchField(PatchTypeField)                                     \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patch);               \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
+    defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
-#define makeFvsPatchField(fvsPatchTypeField)                                   \
-                                                                               \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch);                 \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper);           \
-defineTemplateRunTimeSelectionTable(fvsPatchTypeField, dictionary);
-
-makeFvsPatchField(fvsPatchScalarField)
-makeFvsPatchField(fvsPatchVectorField)
-makeFvsPatchField(fvsPatchSphericalTensorField)
-makeFvsPatchField(fvsPatchSymmTensorField)
-makeFvsPatchField(fvsPatchTensorField)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+makeFvsPatchField(fvsPatchScalarField);
+makeFvsPatchField(fvsPatchVectorField);
+makeFvsPatchField(fvsPatchSphericalTensorField);
+makeFvsPatchField(fvsPatchSymmTensorField);
+makeFvsPatchField(fvsPatchTensorField);
 
 } // End namespace Foam
 

From fdd7e4d87fc78444b207b4aefa6e0f995b64f730 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 14:08:01 +0100
Subject: [PATCH 080/348] STYLE: use push_back when walking cell queues

STYLE: use push_back for OTstream
---
 src/OpenFOAM/db/IOstreams/Tstreams/OTstream.C | 20 +++++++++----------
 src/OpenFOAM/db/IOstreams/Tstreams/OTstream.H |  4 ++--
 .../meshes/bandCompression/bandCompression.C  | 10 +++++-----
 .../primitives/strings/lists/SubStrings.H     | 16 +++++++--------
 src/meshTools/polyTopoChange/polyTopoChange.C |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.C b/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.C
index c1134f44e1..030090d3d5 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.C
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.C
@@ -35,7 +35,7 @@ bool Foam::OTstream::write(const token& tok)
 {
     if (tok.good())
     {
-        append(tok);
+        tokens().push_back(tok);
         return true;
     }
 
@@ -48,7 +48,7 @@ Foam::Ostream& Foam::OTstream::write(const char c)
     if (!std::isspace(c) && std::isprint(c))
     {
         // Should generally work, but need to verify corner cases
-        append(token(token::punctuationToken(c)));
+        tokens().push_back(token(token::punctuationToken(c)));
     }
 
     return *this;
@@ -76,7 +76,7 @@ Foam::Ostream& Foam::OTstream::write(const char* str)
 
 Foam::Ostream& Foam::OTstream::write(const word& str)
 {
-    append(token(str)); // tokenType::WORD
+    tokens().push_back(token(str)); // tokenType::WORD
 
     return *this;
 }
@@ -84,7 +84,7 @@ Foam::Ostream& Foam::OTstream::write(const word& str)
 
 Foam::Ostream& Foam::OTstream::write(const string& str)
 {
-    append(token(str)); // tokenType::STRING
+    tokens().push_back(token(str)); // tokenType::STRING
 
     return *this;
 }
@@ -98,11 +98,11 @@ Foam::Ostream& Foam::OTstream::writeQuoted
 {
     if (quoted)
     {
-        append(token(string(str))); // tokenType::STRING
+        tokens().push_back(token(string(str))); // tokenType::STRING
     }
     else if (!str.empty())
     {
-        append(token(word(str, false))); // tokenType::WORD
+        tokens().push_back(token(word(str, false))); // tokenType::WORD
     }
 
     return *this;
@@ -111,7 +111,7 @@ Foam::Ostream& Foam::OTstream::writeQuoted
 
 Foam::Ostream& Foam::OTstream::write(const int32_t val)
 {
-    append(token(label(val))); // tokenType::LABEL
+    tokens().push_back(token(label(val))); // tokenType::LABEL
 
     return *this;
 }
@@ -119,7 +119,7 @@ Foam::Ostream& Foam::OTstream::write(const int32_t val)
 
 Foam::Ostream& Foam::OTstream::write(const int64_t val)
 {
-    append(token(label(val))); // tokenType::LABEL
+    tokens().push_back(token(label(val))); // tokenType::LABEL
 
     return *this;
 }
@@ -127,7 +127,7 @@ Foam::Ostream& Foam::OTstream::write(const int64_t val)
 
 Foam::Ostream& Foam::OTstream::write(const float val)
 {
-    append(token(val)); // tokenType::FLOAT
+    tokens().push_back(token(val)); // tokenType::FLOAT
 
     return *this;
 }
@@ -135,7 +135,7 @@ Foam::Ostream& Foam::OTstream::write(const float val)
 
 Foam::Ostream& Foam::OTstream::write(const double val)
 {
-    append(token(val)); // tokenType::DOUBLE
+    tokens().push_back(token(val)); // tokenType::DOUBLE
 
     return *this;
 }
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.H
index 856ba2eab4..bd6076c043 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/OTstream.H
@@ -101,13 +101,13 @@ public:
     // Member Functions
 
         //- The tokens
-        const DynamicList<token>& tokens() const
+        const DynamicList<token>& tokens() const noexcept
         {
             return *this;
         }
 
         //- The tokens
-        DynamicList<token>& tokens()
+        DynamicList<token>& tokens() noexcept
         {
             return *this;
         }
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index 428421d4c0..ffcb574f48 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -137,8 +137,8 @@ Foam::labelList cuthill_mckee_algorithm
                     if (unvisited.test(nbr))
                     {
                         // Not visited (or removed), add to the list
-                        nbrCells.append(nbr);
-                        weights.append(nbrCount);
+                        nbrCells.push_back(nbr);
+                        weights.push_back(nbrCount);
                     }
                 }
 
@@ -284,8 +284,8 @@ Foam::labelList Foam::meshTools::bandCompression
                     if (unvisited.test(nbr))
                     {
                         // Not visited (or removed), add to the list
-                        nbrCells.append(nbr);
-                        weights.append(nbrCount);
+                        nbrCells.push_back(nbr);
+                        weights.push_back(nbrCount);
                     }
                 }
 
diff --git a/src/OpenFOAM/primitives/strings/lists/SubStrings.H b/src/OpenFOAM/primitives/strings/lists/SubStrings.H
index 79d38b947e..8279d2d10d 100644
--- a/src/OpenFOAM/primitives/strings/lists/SubStrings.H
+++ b/src/OpenFOAM/primitives/strings/lists/SubStrings.H
@@ -32,8 +32,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SubStrings_H
-#define SubStrings_H
+#ifndef Foam_SubStrings_H
+#define Foam_SubStrings_H
 
 #include <regex>  // For std::sub_match
 #include <string>
@@ -88,6 +88,12 @@ public:
             return len;
         }
 
+        //- Retrieve element at pos, converted to a string type.
+        StringType str(size_t pos) const
+        {
+            return (*this)[pos].str();
+        }
+
         //- Append sub-string defined by begin/end iterators
         void append
         (
@@ -116,12 +122,6 @@ public:
         {
             return this->back();
         }
-
-        //- Get element at pos, converted to a string type.
-        StringType str(size_t pos) const
-        {
-            return (*this)[pos].str();
-        }
 };
 
 
diff --git a/src/meshTools/polyTopoChange/polyTopoChange.C b/src/meshTools/polyTopoChange/polyTopoChange.C
index a2558d09ad..60b0cc76a9 100644
--- a/src/meshTools/polyTopoChange/polyTopoChange.C
+++ b/src/meshTools/polyTopoChange/polyTopoChange.C
@@ -687,8 +687,8 @@ Foam::label Foam::polyTopoChange::getCellOrder
                     if (unvisited.test(nbr))
                     {
                         // Not visited (or removed), add to the list
-                        nbrCells.append(nbr);
-                        weights.append(nbrCount);
+                        nbrCells.push_back(nbr);
+                        weights.push_back(nbrCount);
                     }
                 }
 

From c038a9447c0a8c6e98145405e681248954a6f1ee Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 14:30:21 +0100
Subject: [PATCH 081/348] STYLE: remove unneeded UPstream::listEq

- was only used in Pstream::combineReduce(...) with a full list,
  which should have been avoided in most cases anyhow.
  Much more efficient to simply gather the sizes directly
---
 .../containers/Lists/ListListOps/ListListOps.H   |  4 ++--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H    | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
index 93dd6625da..7bc9714971 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
@@ -86,8 +86,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ListListOps_H
-#define ListListOps_H
+#ifndef Foam_ListListOps_H
+#define Foam_ListListOps_H
 
 #include "labelList.H"
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 678747ec26..a51d68d33d 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -184,22 +184,6 @@ public:
                 friend Ostream& operator<<(Ostream&, const commsStruct&);
         };
 
-        //- combineReduce operator for lists. Used for counting.
-        struct listEq
-        {
-            template<class T>
-            void operator()(T& x, const T& y) const
-            {
-                forAll(y, i)
-                {
-                    if (y[i].size())
-                    {
-                        x[i] = y[i];
-                    }
-                }
-            }
-        };
-
 
 private:
 

From 446aff135031b2bbf9e327e55450e88a5fbfbc1b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 20 Feb 2023 09:48:58 +0100
Subject: [PATCH 082/348] ENH: add DeprecatedInFunction macro

- run-time warning about deprecated features. For example,

  DeprecatedInFunction(2212)
     << "Prefer using xyz boundary condition. "
     << "This boundary condition will be removed in the future." << endl;

CONFIG: mark exprFixedValue as deprecated

- same functionality is possible with uniformFixedValue and an
  expression PatchFunction1, which can also be easily changed to any
  other PatchFunction1
---
 src/OpenFOAM/db/error/messageStream.C         | 64 +++++++++++++++++--
 src/OpenFOAM/db/error/messageStream.H         | 28 ++++++--
 .../exprFixedValueFvPatchField.C              |  4 ++
 .../genericPatchFieldBase.C                   |  2 +-
 4 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/src/OpenFOAM/db/error/messageStream.C b/src/OpenFOAM/db/error/messageStream.C
index 4511a4bafa..55d3db1b22 100644
--- a/src/OpenFOAM/db/error/messageStream.C
+++ b/src/OpenFOAM/db/error/messageStream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +31,7 @@ Note
 
 #include "error.H"
 #include "dictionary.H"
+#include "foamVersion.H"
 #include "Pstream.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -167,7 +168,7 @@ std::ostream& Foam::messageStream::stdStream()
 
 Foam::OSstream& Foam::messageStream::operator()
 (
-    const string& functionName
+    const std::string& functionName
 )
 {
     OSstream& os = this->stream();
@@ -182,6 +183,57 @@ Foam::OSstream& Foam::messageStream::operator()
 }
 
 
+Foam::OSstream& Foam::messageStream::deprecated
+(
+    const int afterVersion,
+    const char* functionName,
+    const char* sourceFileName,
+    const int sourceFileLineNumber
+)
+{
+    OSstream& os = this->stream();
+
+    // No warning for 0 (unversioned) or -ve values (silent versioning).
+    // Also no warning for (version >= foamVersion::api), which
+    // can be used to denote future expiry dates of transition features.
+
+    if (afterVersion > 0 && afterVersion < foamVersion::api)
+    {
+        const int months =
+        (
+            // YYMM -> months
+            (12 * (foamVersion::api/100) + (foamVersion::api % 100))
+          - (12 * (afterVersion/100)  + (afterVersion % 100))
+        );
+
+        os  << nl
+            << ">>> DEPRECATED after version " << afterVersion;
+
+        if (afterVersion < 1000)
+        {
+            // Predates YYMM versioning (eg, 240 for version 2.4)
+            os  << ". This is very old! <<<" << nl;
+        }
+        else
+        {
+            os  << ". This is about " << months << " months old. <<<" << nl;
+        }
+    }
+
+    os  << nl;
+
+    if (functionName)  // nullptr check
+    {
+        os  << "    From " << functionName << nl
+            << "    in file " << sourceFileName
+            << " at line " << sourceFileLineNumber << nl;
+    }
+    os  << "    ";
+
+    return os;
+}
+
+
 Foam::OSstream& Foam::messageStream::operator()
 (
     const char* functionName,
@@ -194,7 +246,7 @@ Foam::OSstream& Foam::messageStream::operator()
     os  << nl
         << "    From " << functionName << nl
         << "    in file " << sourceFileName
-        << " at line " << sourceFileLineNumber << endl
+        << " at line " << sourceFileLineNumber << nl
         << "    ";
 
     return os;
@@ -203,7 +255,7 @@ Foam::OSstream& Foam::messageStream::operator()
 
 Foam::OSstream& Foam::messageStream::operator()
 (
-    const string& functionName,
+    const std::string& functionName,
     const char* sourceFileName,
     const int sourceFileLineNumber
 )
@@ -222,7 +274,7 @@ Foam::OSstream& Foam::messageStream::operator()
     const char* functionName,
     const char* sourceFileName,
     const int sourceFileLineNumber,
-    const string& ioFileName,
+    const std::string& ioFileName,
     const label ioStartLineNumber,
     const label ioEndLineNumber
 )
@@ -233,7 +285,7 @@ Foam::OSstream& Foam::messageStream::operator()
         << "    From " << functionName << nl
         << "    in file " << sourceFileName
         << " at line " << sourceFileLineNumber << nl
-        << "    Reading " << ioFileName;
+        << "    Reading \"" << ioFileName.c_str() << '"';
 
     if (ioStartLineNumber >= 0)
     {
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index c4f23fcd35..be382ec536 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,8 @@ SourceFiles
 #define Foam_messageStream_H
 
 #include "label.H"
-#include "string.H"
+#include "word.H"
+#include <string>
 #include <iostream>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -170,6 +171,17 @@ public:
         //- Return std::ostream for output operations.
         std::ostream& stdStream();
 
+        //- Report deprecation (after specified API version) with
+        //- 'From function-name, source file, line number'.
+        //  \return OSstream for further operations
+        OSstream& deprecated
+        (
+            const int afterVersion,
+            const char* functionName,
+            const char* sourceFileName,
+            const int sourceFileLineNumber = 0
+        );
+
         //- Implicit cast to OSstream for << operations
         operator OSstream&()
         {
@@ -186,11 +198,10 @@ public:
         //  \return OSstream for further operations
         OSstream& operator()
         (
-            const string& functionName
+            const std::string& functionName
         );
 
         //- Report 'From function-name, source file, line number'
-        //- Print basic message
         //  \return OSstream for further operations
         OSstream& operator()
         (
@@ -203,7 +214,7 @@ public:
         //  \return OSstream for further operations
         OSstream& operator()
         (
-            const string& functionName,
+            const std::string& functionName,
             const char* sourceFileName,
             const int sourceFileLineNumber = 0
         );
@@ -216,7 +227,7 @@ public:
             const char* functionName,
             const char* sourceFileName,
             const int sourceFileLineNumber,
-            const string& ioFileName,
+            const std::string& ioFileName,
             const label ioStartLineNumber = -1,
             const label ioEndLineNumber = -1
         );
@@ -328,6 +339,11 @@ extern messageStream SeriousError;
 //  for FUNCTION_NAME in file __FILE__ at line __LINE__
 #define WarningInFunction WarningIn(FUNCTION_NAME)
 
+//- Report a warning using Foam::Warning
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+#define DeprecatedInFunction(afterVersion)                                     \
+    ::Foam::Warning.deprecated(afterVersion, FUNCTION_NAME, __FILE__, __LINE__)
+
 
 //- Report an IO warning using Foam::Warning
 //  for functionName in file __FILE__ at line __LINE__
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
index eabf883256..fcf136ecbd 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
@@ -107,6 +107,10 @@ Foam::exprFixedValueFvPatchField<Type>::exprFixedValueFvPatchField
     ),
     driver_(this->patch(), dict_)
 {
+    DeprecatedInFunction(2212)
+        << "Use uniformFixedValue with an expression Function1 instead." << nl
+        << "    This boundary condition will be removed in the future" << endl;
+
     setDebug();
     DebugInFunction << nl;
 
diff --git a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C b/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
index ae032898ae..b5bd0c839e 100644
--- a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
+++ b/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
@@ -26,7 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "genericPatchFieldBase.H"
-#include "messageStream.H"
+#include "error.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

From fb2bf77e8edd64aa44584a9a76d0c02524e7bfe2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 20 Feb 2023 10:43:05 +0100
Subject: [PATCH 083/348] TUT: update keyword coordinateRotation -> rotation

---
 .../simpleFoam/rotatingCylinders/system/controlDict      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict
index 29eb9c4a98..f6f722ccae 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict
@@ -56,13 +56,8 @@ functions
         fields          (U);
         coordinateSystem
         {
-            origin          (0 0 0);
-            coordinateRotation
-            {
-                type            axesRotation;
-                e3              (0 0 1);
-                e1              (1 0 0);
-            }
+            origin      (0 0 0);
+            rotation    none;
         }
     }
 

From 256940538350518e5f24ff3266078542d977a87d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 20:06:00 +0100
Subject: [PATCH 084/348] ENH: implement NBX with recovery of sizes and
 non-blocking receives

---
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |   6 +-
 .../Pstreams/PstreamExchangeConsensus.C       | 238 +++++++++++++-----
 src/Pstream/mpi/UPstreamAllToAll.C            |   3 +
 src/Pstream/mpi/UPstreamWrappingTemplates.C   |  34 +--
 4 files changed, 207 insertions(+), 74 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index c0865f2ce2..cb17c2fc81 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -593,7 +593,8 @@ public:
             const UList<Container>& sendBufs,
             List<Container>& recvBufs,
             const int tag,
-            const label comm
+            const label comm,
+            const bool wait = true  //!< Wait for requests to complete
         );
 
         //- Exchange \em contiguous data using non-blocking consensus
@@ -614,7 +615,8 @@ public:
             const Map<Container>& sendBufs,
             Map<Container>& recvBufs,
             const int tag,
-            const label comm
+            const label comm,
+            const bool wait = true  //!< Wait for requests to complete
         );
 };
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
index 4132e9bbd8..5a9ff54349 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
@@ -39,60 +39,86 @@ Note
 #include "contiguous.H"
 #include "PstreamReduceOps.H"
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * Details * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace PstreamDetail
+{
+
+//- Exchange \em contiguous data using non-blocking consensus exchange
+//- with optional tracking of the receive sizes.
+//
+//  No internal guards or resizing - data containers are all properly
+//  sized before calling.
+//
+//  \param[in]  sendBufs  The send buffers list (size: numProcs)
+//  \param[out] recvBufs  The recv buffers list (size: numProcs)
+//  \param[out] recvSizes The recv sizes (size: 0 or numProcs).
+//     This parameter can be an empty list, in which case the receive sizes
+//     are not returned.
+//  \param tag   The message tag
+//  \param comm  The communicator
+//  \param wait  Wait for non-blocking receives to complete
+//  \param recvCommType If blocking or (default) non-blocking
 
 template<class Container, class Type>
-void Foam::Pstream::exchangeConsensus
+void exchangeConsensus
 (
     const UList<Container>& sendBufs,
-    List<Container>& recvBufs,
+    UList<Container>& recvBufs,
+    labelUList& recvSizes,
     const int tag,
-    const label comm
+    const label comm,
+    const bool wait = true,
+    const UPstream::commsTypes recvCommType = UPstream::commsTypes::nonBlocking
 )
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
 
+    const label startOfRequests = UPstream::nRequests();
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
-    if (sendBufs.size() != numProc)
+    // #ifdef FULLDEBUG
+    if (sendBufs.size() > numProc)
     {
         FatalErrorInFunction
-            << "Size of list " << sendBufs.size()
-            << " does not equal the number of processors " << numProc
+            << "Send buffers:" << sendBufs.size() << " > numProcs:" << numProc
             << Foam::abort(FatalError);
     }
+    if (recvBufs.size() < numProc)
+    {
+        FatalErrorInFunction
+            << "Recv buffers:" << recvBufs.size() << " < numProcs:" << numProc
+            << Foam::abort(FatalError);
+    }
+    // #endif
 
-    // Initial: resize and clear everything
-    recvBufs.resize_nocopy(sendBufs.size());
-
+    // Initial: clear all receive information
     for (auto& buf : recvBufs)
     {
         buf.clear();
     }
+    recvSizes = Zero;
 
     if (!UPstream::parRun() || numProc < 2)
     {
         // Do myself
         recvBufs[myProci] = sendBufs[myProci];
+        if (myProci < recvSizes.size())
+        {
+            recvSizes[myProci] = recvBufs.size();
+        }
         return;
     }
 
-    // This largely follows PstreamDetail::allToAllConsensus
-    // but more MPI wrapping used here.
 
-    DynamicList<UPstream::Request> requests(sendBufs.size());
+    // Algorithm NBX: Nonblocking consensus with List containers
 
-    //// profilingPstream::beginTiming();
+    DynamicList<UPstream::Request> sendRequests(sendBufs.size());
 
-    // If there are synchronisation problems,
-    // a beginning barrier can help, but should not be necessary
-    // when unique message tags are being used.
-
-    //// UPstream::barrier(comm);
-
-
-    // Start nonblocking synchronous send to process dest
+    // Start nonblocking synchronous send to processor dest
     for (label proci = 0; proci < numProc; ++proci)
     {
         const auto& sendData = sendBufs[proci];
@@ -104,15 +130,19 @@ void Foam::Pstream::exchangeConsensus
         else if (proci == myProci)
         {
             // Do myself
-            recvBufs[proci] = sendBufs[proci];
+            recvBufs[proci] = sendData;
+            if (proci < recvSizes.size())
+            {
+                recvSizes[proci] = sendData.size();
+            }
         }
         else
         {
-            // Has data to send
-
+            // Has data to send.
+            // The MPI send requests are tracked on a local list
             UOPstream::write
             (
-                requests.emplace_back(),
+                sendRequests.emplace_back(),
                 proci,
                 sendData.cdata_bytes(),
                 sendData.size_bytes(),
@@ -126,7 +156,7 @@ void Foam::Pstream::exchangeConsensus
 
     // Probe and receive
 
-    UPstream::Request barrierReq;
+    UPstream::Request barrierRequest;
 
     for (bool barrier_active = false, done = false; !done; /*nil*/)
     {
@@ -145,14 +175,20 @@ void Foam::Pstream::exchangeConsensus
             // - receive into dest buffer location
 
             const label proci = probed.first;
-            const label nRecv = (probed.second / sizeof(Type));
+            const label count = (probed.second / sizeof(Type));
 
             auto& recvData = recvBufs[proci];
-            recvData.resize_nocopy(nRecv);
+            recvData.resize_nocopy(count);
 
+            if (proci < recvSizes.size())
+            {
+                recvSizes[proci] = count;
+            }
+
+            // Any non-blocking MPI recv requests are tracked on internal stack
             UIPstream::read
             (
-                UPstream::commsTypes::scheduled,
+                recvCommType,
                 proci,
                 recvData.data_bytes(),
                 recvData.size_bytes(),
@@ -165,7 +201,7 @@ void Foam::Pstream::exchangeConsensus
         {
             // Test barrier for completion
             // - all received, or nothing to receive
-            if (UPstream::finishedRequest(barrierReq))
+            if (UPstream::finishedRequest(barrierRequest))
             {
                 done = true;
             }
@@ -173,29 +209,48 @@ void Foam::Pstream::exchangeConsensus
         else
         {
             // Check if all sends have arrived
-            if (UPstream::finishedRequests(requests))
+            if (UPstream::finishedRequests(sendRequests))
             {
-                UPstream::barrier(comm, &barrierReq);
+                UPstream::barrier(comm, &barrierRequest);
                 barrier_active = true;
             }
         }
     }
 
-    //// profilingPstream::addAllToAllTime();
+    // Wait for non-blocking receives to finish
+    if (wait && recvCommType == UPstream::commsTypes::nonBlocking)
+    {
+        UPstream::waitRequests(startOfRequests);
+    }
 }
 
 
+//- Exchange \em contiguous data using non-blocking consensus exchange.
+//
+//  No internal guards - the sending Map corresponds to a segment of
+//  0-numProcs.
+//
+//  \param[in]  sendBufs  The send buffers map (addr: 0-numProcs)
+//  \param[out] recvBufs  The recv buffers map
+//  \param tag   The message tag
+//  \param comm  The communicator
+//  \param wait  Wait for non-blocking receives to complete
+//  \param recvCommType If blocking or (default) non-blocking
+
 template<class Container, class Type>
-void Foam::Pstream::exchangeConsensus
+void exchangeConsensus
 (
     const Map<Container>& sendBufs,
     Map<Container>& recvBufs,
     const int tag,
-    const label comm
+    const label comm,
+    const bool wait = true,
+    const UPstream::commsTypes recvCommType = UPstream::commsTypes::nonBlocking
 )
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
 
+    const label startOfRequests = UPstream::nRequests();
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
@@ -229,16 +284,7 @@ void Foam::Pstream::exchangeConsensus
 
     // Algorithm NBX: Nonblocking consensus with Map (HashTable) containers
 
-    DynamicList<UPstream::Request> requests(sendBufs.size());
-
-    //// profilingPstream::beginTiming();
-
-    // If there are synchronisation problems,
-    // a beginning barrier can help, but should not be necessary
-    // when unique message tags are being used.
-
-    //// UPstream::barrier(comm);
-
+    DynamicList<UPstream::Request> sendRequests(sendBufs.size());
 
     // Start nonblocking synchronous send to process dest
     forAllConstIters(sendBufs, iter)
@@ -246,6 +292,15 @@ void Foam::Pstream::exchangeConsensus
         const label proci = iter.key();
         const auto& sendData = iter.val();
 
+        #ifdef FULLDEBUG
+        if (proci >= numProc)
+        {
+            FatalErrorInFunction
+                << "Send buffer:" << proci << " >= numProcs:" << numProc
+                << Foam::abort(FatalError);
+        }
+        #endif
+
         if (sendData.empty())
         {
             // Do not send/recv empty data
@@ -257,11 +312,11 @@ void Foam::Pstream::exchangeConsensus
         }
         else
         {
-            // Has data to send
-
+            // Has data to send.
+            // The MPI send requests are tracked on a local list
             UOPstream::write
             (
-                requests.emplace_back(),
+                sendRequests.emplace_back(),
                 proci,
                 sendData.cdata_bytes(),
                 sendData.size_bytes(),
@@ -275,7 +330,7 @@ void Foam::Pstream::exchangeConsensus
 
     // Probe and receive
 
-    UPstream::Request barrierReq;
+    UPstream::Request barrierRequest;
 
     for (bool barrier_active = false, done = false; !done; /*nil*/)
     {
@@ -294,14 +349,15 @@ void Foam::Pstream::exchangeConsensus
             // - receive into dest buffer location
 
             const label proci = probed.first;
-            const label nRecv = (probed.second / sizeof(Type));
+            const label count = (probed.second / sizeof(Type));
 
             auto& recvData = recvBufs(proci);
-            recvData.resize_nocopy(nRecv);
+            recvData.resize_nocopy(count);
 
+            // Any non-blocking MPI recv requests are tracked on internal stack
             UIPstream::read
             (
-                UPstream::commsTypes::scheduled,
+                recvCommType,
                 proci,
                 recvData.data_bytes(),
                 recvData.size_bytes(),
@@ -313,7 +369,7 @@ void Foam::Pstream::exchangeConsensus
         if (barrier_active)
         {
             // Test barrier for completion
-            if (UPstream::finishedRequest(barrierReq))
+            if (UPstream::finishedRequest(barrierRequest))
             {
                 done = true;
             }
@@ -321,15 +377,83 @@ void Foam::Pstream::exchangeConsensus
         else
         {
             // Check if all sends have arrived
-            if (UPstream::finishedRequests(requests))
+            if (UPstream::finishedRequests(sendRequests))
             {
-                UPstream::barrier(comm, &barrierReq);
+                UPstream::barrier(comm, &barrierRequest);
                 barrier_active = true;
             }
         }
     }
 
-    //// profilingPstream::addAllToAllTime();
+    // Wait for non-blocking receives to finish
+    if (wait && recvCommType == UPstream::commsTypes::nonBlocking)
+    {
+        UPstream::waitRequests(startOfRequests);
+    }
+}
+
+} // namespace PstreamDetail
+} // namespace Foam
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Container, class Type>
+void Foam::Pstream::exchangeConsensus
+(
+    const UList<Container>& sendBufs,
+    List<Container>& recvBufs,
+    const int tag,
+    const label comm,
+    const bool wait
+)
+{
+    static_assert(is_contiguous<Type>::value, "Contiguous data only!");
+
+    if (sendBufs.size() != UPstream::nProcs(comm))
+    {
+        FatalErrorInFunction
+            << "Send buffers size:" << sendBufs.size()
+            << " != numProcs:" << UPstream::nProcs(comm)
+            << Foam::abort(FatalError);
+    }
+
+    // Resize receive buffers. Individual clearing is done internally
+    recvBufs.resize_nocopy(sendBufs.size());
+    labelList dummyRecvSizes;
+
+    PstreamDetail::exchangeConsensus
+    (
+        sendBufs,
+        recvBufs,
+        dummyRecvSizes,
+        tag,
+        comm,
+        wait
+    );
+}
+
+
+template<class Container, class Type>
+void Foam::Pstream::exchangeConsensus
+(
+    const Map<Container>& sendBufs,
+    Map<Container>& recvBufs,
+    const int tag,
+    const label comm,
+    const bool wait
+)
+{
+    static_assert(is_contiguous<Type>::value, "Contiguous data only!");
+
+    PstreamDetail::exchangeConsensus
+    (
+        sendBufs,
+        recvBufs,
+        tag,
+        comm,
+        wait
+    );
 }
 
 
diff --git a/src/Pstream/mpi/UPstreamAllToAll.C b/src/Pstream/mpi/UPstreamAllToAll.C
index e9c4414781..98bc7192cd 100644
--- a/src/Pstream/mpi/UPstreamAllToAll.C
+++ b/src/Pstream/mpi/UPstreamAllToAll.C
@@ -51,6 +51,9 @@ void Foam::UPstream::allToAll                                                 \
 
 Pstream_CommonRoutines(int32_t, MPI_INT32_T);
 Pstream_CommonRoutines(int64_t, MPI_INT64_T);
+// Future?
+// Pstream_CommonRoutines(uint32_t, MPI_UINT32_T);
+// Pstream_CommonRoutines(uint64_t, MPI_UINT64_T);
 
 #undef Pstream_CommonRoutines
 
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index ea01c4a316..92fe2b6852 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -580,7 +580,7 @@ void Foam::PstreamDetail::allToAllConsensus
     // This is because we are dealing with a flat list of entries to
     // send and not a sparse Map etc.
 
-    DynamicList<MPI_Request> requests(sendData.size());
+    DynamicList<MPI_Request> sendRequests(sendData.size());
 
     profilingPstream::beginTiming();
 
@@ -614,7 +614,7 @@ void Foam::PstreamDetail::allToAllConsensus
                 proci,
                 tag,
                 PstreamGlobals::MPICommunicators_[comm],
-               &requests.emplace_back()
+               &sendRequests.emplace_back()
             );
         }
     }
@@ -622,7 +622,7 @@ void Foam::PstreamDetail::allToAllConsensus
 
     // Probe and receive
 
-    MPI_Request barrierReq;
+    MPI_Request barrierRequest;
 
     for (bool barrier_active = false, done = false; !done; /*nil*/)
     {
@@ -654,6 +654,7 @@ void Foam::PstreamDetail::allToAllConsensus
                     << exit(FatalError);
             }
 
+            // Regular receive (the data are small)
             MPI_Recv
             (
                &recvData[proci],
@@ -670,7 +671,7 @@ void Foam::PstreamDetail::allToAllConsensus
         {
             // Test barrier for completion
             // - all received, or nothing to receive
-            MPI_Test(&barrierReq, &flag, MPI_STATUS_IGNORE);
+            MPI_Test(&barrierRequest, &flag, MPI_STATUS_IGNORE);
 
             if (flag)
             {
@@ -682,8 +683,9 @@ void Foam::PstreamDetail::allToAllConsensus
             // Check if all sends have arrived
             MPI_Testall
             (
-                requests.size(), requests.data(),
-                &flag, MPI_STATUSES_IGNORE
+                sendRequests.size(),
+                sendRequests.data(),
+               &flag, MPI_STATUSES_IGNORE
             );
 
             if (flag)
@@ -691,7 +693,7 @@ void Foam::PstreamDetail::allToAllConsensus
                 MPI_Ibarrier
                 (
                     PstreamGlobals::MPICommunicators_[comm],
-                   &barrierReq
+                   &barrierRequest
                 );
                 barrier_active = true;
             }
@@ -746,7 +748,7 @@ void Foam::PstreamDetail::allToAllConsensus
     // Algorithm NBX: Nonblocking consensus
     // Implementation like above, but sending map data.
 
-    DynamicList<MPI_Request> requests(sendBufs.size());
+    DynamicList<MPI_Request> sendRequests(sendBufs.size());
 
     profilingPstream::beginTiming();
 
@@ -786,7 +788,7 @@ void Foam::PstreamDetail::allToAllConsensus
                 proci,
                 tag,
                 PstreamGlobals::MPICommunicators_[comm],
-               &requests.emplace_back()
+               &sendRequests.emplace_back()
             );
         }
     }
@@ -794,7 +796,7 @@ void Foam::PstreamDetail::allToAllConsensus
 
     // Probe and receive
 
-    MPI_Request barrierReq;
+    MPI_Request barrierRequest;
 
     for (bool barrier_active = false, done = false; !done; /*nil*/)
     {
@@ -829,9 +831,10 @@ void Foam::PstreamDetail::allToAllConsensus
 
             auto& recvData = recvBufs(proci);
 
+            // Regular receive [the data are small]
             MPI_Recv
             (
-                &recvData,
+               &recvData,
                 count,          // count=1 (see above)
                 datatype,
                 proci,
@@ -845,7 +848,7 @@ void Foam::PstreamDetail::allToAllConsensus
         {
             // Test barrier for completion
             // - all received, or nothing to receive
-            MPI_Test(&barrierReq, &flag, MPI_STATUS_IGNORE);
+            MPI_Test(&barrierRequest, &flag, MPI_STATUS_IGNORE);
 
             if (flag)
             {
@@ -857,8 +860,9 @@ void Foam::PstreamDetail::allToAllConsensus
             // Check if all sends have arrived
             MPI_Testall
             (
-                requests.size(), requests.data(),
-                &flag, MPI_STATUSES_IGNORE
+                sendRequests.size(),
+                sendRequests.data(),
+               &flag, MPI_STATUSES_IGNORE
             );
 
             if (flag)
@@ -866,7 +870,7 @@ void Foam::PstreamDetail::allToAllConsensus
                 MPI_Ibarrier
                 (
                     PstreamGlobals::MPICommunicators_[comm],
-                   &barrierReq
+                   &barrierRequest
                 );
                 barrier_active = true;
             }

From a7d77391faa8c2d5da9ea505211a369474c4c0ca Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 20 Feb 2023 16:00:45 +0100
Subject: [PATCH 085/348] BUG: selfComm had 0 instead of parent rank for
 UPstream::procID (#2706)

---
 src/Pstream/mpi/UPstream.C | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 61667ce2b0..f56d5631e9 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -348,6 +348,12 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
         // For testing: warn use of non-worldComm
         UPstream::warnComm = UPstream::worldComm;
 
+        // For selfComm : the processor number wrt the new world communicator
+        if (procIDs_[UPstream::selfComm].size())
+        {
+            procIDs_[UPstream::selfComm].front() = UPstream::myProcNo(subComm);
+        }
+
         if (debug)
         {
             // Check
@@ -565,7 +571,7 @@ void Foam::UPstream::allocatePstreamCommunicator
     }
     else if (parentIndex == -2)
     {
-        // Self communicator
+        // Self communicator (selfComm)
 
         PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_SELF;
@@ -588,8 +594,12 @@ void Foam::UPstream::allocatePstreamCommunicator
         }
         #endif
 
+        // For selfComm : the process IDs within the world communicator.
+        // Uses MPI_COMM_WORLD in case called before UPstream::globalComm
+        // was initialized
+
         procIDs_[index].resize_nocopy(1);
-        procIDs_[index] = 0;
+        MPI_Comm_rank(MPI_COMM_WORLD, &procIDs_[index].front());
     }
     else
     {

From 4d7180ae7c87bc992fe52fd38f375ed050f9b6ae Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 2 Feb 2023 14:15:24 +0100
Subject: [PATCH 086/348] COMP: rename field methods clamp() -> clamp_range()

- this is slightly longer to write (but consistent with clamp_min
  etc). The main reason is that this allows easier use of the clamp()
  free function.

STYLE: skip checks for bad/invalid clamping ranges

- ranges are either already validated before calling, the caller logic
  has already made the branching decision.
---
 applications/test/minMax2/Test-minMax2.C      | 11 ++-
 .../FieldFields/FieldField/FieldField.C       | 64 +++++++-------
 .../FieldFields/FieldField/FieldField.H       | 16 ++--
 src/OpenFOAM/fields/Fields/Field/Field.C      | 41 +++++----
 src/OpenFOAM/fields/Fields/Field/Field.H      | 16 ++--
 .../fields/Fields/Field/FieldFunctions.C      | 26 +++---
 .../GeometricField/GeometricField.C           | 88 +++++++++----------
 .../GeometricField/GeometricField.H           | 56 ++++++------
 8 files changed, 158 insertions(+), 160 deletions(-)

diff --git a/applications/test/minMax2/Test-minMax2.C b/applications/test/minMax2/Test-minMax2.C
index 201b0548d6..531235e6f5 100644
--- a/applications/test/minMax2/Test-minMax2.C
+++ b/applications/test/minMax2/Test-minMax2.C
@@ -162,9 +162,16 @@ int main(int argc, char *argv[])
 
         Info<< "result: " << result << nl;
 
-        someField.clamp(zero_one{});
-
+        someField.clamp_range(zero_one{});
         Info<< "inplace: " << someField << nl;
+
+        scalar val(1.414);
+
+        Info<< "clamp " << val
+            // nope << " : " << clamp(val, zero_one{})
+            // nope << " : " << clamp(val, scalarMinMax(zero_one{}))
+            << " : " << clamp(val, 0, 1)
+            << nl;
     }
 
     Info<< nl << "\nDone\n" << endl;
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 5566474746..17d07fb2f0 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -282,39 +282,6 @@ void FieldField<Field, Type>::replace
 }
 
 
-template<template<class> class Field, class Type>
-void FieldField<Field, Type>::clamp
-(
-    const Type& lower,
-    const Type& upper
-)
-{
-    if (lower < upper)
-    {
-        for (auto& ff : *this)
-        {
-            ff.clamp(lower, upper);
-        }
-    }
-}
-
-
-template<template<class> class Field, class Type>
-void FieldField<Field, Type>::clamp
-(
-    const MinMax<Type>& range
-)
-{
-    if (range.min() < range.max())
-    {
-        for (auto& ff : *this)
-        {
-            ff.clamp(range.min(), range.max());
-        }
-    }
-}
-
-
 template<template<class> class Field, class Type>
 void FieldField<Field, Type>::clamp_min
 (
@@ -341,6 +308,37 @@ void FieldField<Field, Type>::clamp_max
 }
 
 
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::clamp_range
+(
+    const Type& lower,
+    const Type& upper
+)
+{
+    // Note: no checks for bad/invalid clamping ranges
+
+    for (auto& ff : *this)
+    {
+        ff.clamp_range(lower, upper);
+    }
+}
+
+
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::clamp_range
+(
+    const MinMax<Type>& range
+)
+{
+    // Note: no checks for bad/invalid clamping ranges
+
+    for (auto& ff : *this)
+    {
+        ff.clamp_range(range.min(), range.max());
+    }
+}
+
+
 template<template<class> class Field, class Type>
 tmp<FieldField<Field, Type>> FieldField<Field, Type>::T() const
 {
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 11504cbe79..d8dbbcdf0e 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -149,20 +149,20 @@ public:
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range.
-        void clamp(const Type& lower, const Type& upper);
-
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range.
-        void clamp(const MinMax<Type>& range);
-
         //- Impose lower (floor) clamp on the field values (in-place)
         void clamp_min(const Type& lower);
 
         //- Impose upper (ceiling) clamp on the field values (in-place)
         void clamp_max(const Type& upper);
 
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not.
+        void clamp_range(const Type& lower, const Type& upper);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not.
+        void clamp_range(const MinMax<Type>& range);
+
         //- Return the field transpose (only defined for second rank tensors)
         tmp<FieldField<Field, Type>> T() const;
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index fad7a81541..64dc2d73a3 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -658,27 +658,6 @@ void Foam::Field<Type>::replace
 }
 
 
-template<class Type>
-void Foam::Field<Type>::clamp(const Type& lower, const Type& upper)
-{
-    // Use free functions min(), max() to impose component-wise clamping
-    if (lower < upper)
-    {
-        // std::for_each
-        for (auto& val : *this)
-        {
-            val = min(max(val, lower), upper);
-        }
-    }
-}
-
-template<class Type>
-void Foam::Field<Type>::clamp(const MinMax<Type>& range)
-{
-    clamp(range.min(), range.max());
-}
-
-
 template<class Type>
 void Foam::Field<Type>::clamp_min(const Type& lower)
 {
@@ -702,6 +681,26 @@ void Foam::Field<Type>::clamp_max(const Type& upper)
 }
 
 
+template<class Type>
+void Foam::Field<Type>::clamp_range(const Type& lower, const Type& upper)
+{
+    // Note: no checks for bad/invalid clamping ranges
+
+    // Use free functions min(), max() to impose component-wise clamping
+    // std::for_each
+    for (auto& val : *this)
+    {
+        val = min(max(val, lower), upper);
+    }
+}
+
+template<class Type>
+void Foam::Field<Type>::clamp_range(const MinMax<Type>& range)
+{
+    Field<Type>::clamp_range(range.min(), range.max());
+}
+
+
 template<class Type>
 template<class VSForm>
 VSForm Foam::Field<Type>::block(const label start) const
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index f398928d1a..0f5d81237f 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -434,20 +434,20 @@ public:
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range.
-        void clamp(const Type& lower, const Type& upper);
-
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range.
-        void clamp(const MinMax<Type>& range);
-
         //- Impose lower (floor) clamp on the field values (in-place)
         void clamp_min(const Type& lower);
 
         //- Impose upper (ceiling) clamp on the field values (in-place)
         void clamp_max(const Type& upper);
 
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not.
+        void clamp_range(const Type& lower, const Type& upper);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not.
+        void clamp_range(const MinMax<Type>& range);
+
         template<class VSForm>
         VSForm block(const label start) const;
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index bfcc7860d3..d3576ac210 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -664,28 +664,22 @@ void clamp
     const MinMax<Type>& range
 )
 {
+    // Note: no checks for bad/invalid clamping ranges
+
     if (result.cdata() == f1.cdata())
     {
         // Apply in-place
-        result.clamp(range);
+        result.clamp_range(range);
     }
     else
     {
-        if (range.good())
-        {
-            std::transform
-            (
-                f1.cbegin(),
-                f1.cbegin(result.size()),
-                result.begin(),
-                clampOp<Type>(range)
-            );
-        }
-        else
-        {
-            // No clamping
-            std::copy(f1.cbegin(), f1.cbegin(result.size()), result.begin());
-        }
+        std::transform
+        (
+            f1.cbegin(),
+            f1.cbegin(result.size()),
+            result.begin(),
+            clampOp<Type>(range)
+        );
     }
 }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 0f39b3f116..af2ef82dd9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -1249,50 +1249,6 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::replace
 }
 
 
-template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
-(
-    const Type& lower,
-    const Type& upper
-)
-{
-    primitiveFieldRef().clamp(lower, upper);
-    boundaryFieldRef().clamp(lower, upper);
-}
-
-
-template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
-(
-    const MinMax<Type>& range
-)
-{
-    primitiveFieldRef().clamp(range.min(), range.max());
-    boundaryFieldRef().clamp(range.min(), range.max());
-}
-
-
-template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
-(
-    const dimensioned<Type>& lower,
-    const dimensioned<Type>& upper
-)
-{
-    this->clamp(lower.value(), upper.value());
-}
-
-
-template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp
-(
-    const dimensioned<MinMax<Type>>& range
-)
-{
-    this->clamp(range.value());
-}
-
-
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_min
 (
@@ -1335,6 +1291,50 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_max
 }
 
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_range
+(
+    const Type& lower,
+    const Type& upper
+)
+{
+    primitiveFieldRef().clamp_range(lower, upper);
+    boundaryFieldRef().clamp_range(lower, upper);
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_range
+(
+    const MinMax<Type>& range
+)
+{
+    primitiveFieldRef().clamp_range(range.min(), range.max());
+    boundaryFieldRef().clamp_range(range.min(), range.max());
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_range
+(
+    const dimensioned<Type>& lower,
+    const dimensioned<Type>& upper
+)
+{
+    this->clamp_range(lower.value(), upper.value());
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::clamp_range
+(
+    const dimensioned<MinMax<Type>>& range
+)
+{
+    this->clamp_range(range.value());
+}
+
+
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::negate()
 {
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index cf4a09c683..d7fffa0d23 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -629,26 +629,6 @@ public:
             const dimensioned<cmptType>& ds
         );
 
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range.
-        void clamp(const Type& lower, const Type& upper);
-
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range.
-        void clamp(const MinMax<Type>& range);
-
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range. No dimension checking.
-        void clamp
-        (
-            const dimensioned<Type>& lower,
-            const dimensioned<Type>& upper
-        );
-
-        //- Clamp field values (in-place) to the specified range.
-        //  A no-op for an invalid range. No dimension checking.
-        void clamp(const dimensioned<MinMax<Type>>& range);
-
         //- Impose lower (floor) clamp on the field values (in-place)
         void clamp_min(const Type& lower);
 
@@ -663,6 +643,26 @@ public:
         //  No dimension checking
         void clamp_max(const dimensioned<Type>& upper);
 
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not. No dimension checking.
+        void clamp_range(const dimensioned<MinMax<Type>>& range);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not.
+        void clamp_range(const Type& lower, const Type& upper);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not.
+        void clamp_range(const MinMax<Type>& range);
+
+        //- Clamp field values (in-place) to the specified range.
+        //  Does not check if range is valid or not. No dimension checking.
+        void clamp_range
+        (
+            const dimensioned<Type>& lower,
+            const dimensioned<Type>& upper
+        );
+
 
     // Member Operators
 
@@ -715,17 +715,17 @@ public:
     // Housekeeping
 
         //- Clamp field values (in-place) to the specified range.
-        //  \deprecated(2023-01) prefer clamp() naming
+        //  \deprecated(2023-01) prefer clamp_range() naming
         void clip(const dimensioned<MinMax<Type>>& range)
         {
-            this->clamp(range);
+            this->clamp_range(range);
         }
 
         //- Clamp field values (in-place) to the specified range.
-        //  \deprecated(2023-01) prefer clamp() naming
+        //  \deprecated(2023-01) prefer clamp_range() naming
         void clip(const dimensioned<Type>& lo, const dimensioned<Type>& hi)
         {
-            this->clamp(lo.value(), hi.value());
+            this->clamp_range(lo.value(), hi.value());
         }
 
         //- Use minimum of the field and specified value. ie, clamp_max().
@@ -738,12 +738,12 @@ public:
         //  \deprecated(2023-01) prefer clamp_min()
         void max(const dimensioned<Type>& lower) { this->clamp_min(lower); }
 
-        //- Deprecated(2019-01) identical to clamp()
-        //  \deprecated(2019-01) identical to clamp()
-        FOAM_DEPRECATED_FOR(2019-01, "clamp() method")
+        //- Deprecated(2019-01) identical to clamp_range()
+        //  \deprecated(2019-01) identical to clamp_range()
+        FOAM_DEPRECATED_FOR(2019-01, "clamp_range() method")
         void maxMin(const dimensioned<Type>& lo, const dimensioned<Type>& hi)
         {
-            return this->clamp(lo.value(), hi.value());
+            return this->clamp_range(lo.value(), hi.value());
         }
 };
 

From 3d8a6a54331f64b212ed2c96bab6ca23169f1c26 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 20 Jan 2023 09:48:40 +0100
Subject: [PATCH 087/348] ENH: use GeometricField clamp_min, clamp_max,
 clamp_range

- newer naming allows for less confusing code.
  Eg,
      max(lower)  ->  clamp_min(lower)
      min(upper)  ->  clamp_max(upper)

- prefer combined method, for few operations.
  Eg,
      max(lower) + min(upper) -> clamp_range(lower, upper)

  The updated naming also helps avoid some obvious coding errors.
  Eg,

     Re.min(1200.0);
     Re.max(18800.0);

  instead of
     Re.clamp_range(1200.0, 18800.0);

- can also use implicit conversion of zero_one to MinMax<Type> for
  this type of code:

      lambda_.clamp_range(zero_one{});
---
 applications/solvers/combustion/XiFoam/bEqn.H |  5 +-
 .../solvers/combustion/fireFoam/YEEqn.H       |  4 +-
 .../solvers/combustion/reactingFoam/YEqn.H    |  4 +-
 .../chtMultiRegionFoam/fluid/YEqn.H           |  4 +-
 .../lagrangian/coalChemistryFoam/YEqn.H       |  4 +-
 .../lagrangian/reactingParcelFoam/YEqn.H      |  4 +-
 .../simpleReactingParcelFoam/YEqn.H           |  4 +-
 .../lagrangian/simpleCoalParcelFoam/YEqn.H    |  4 +-
 .../solvers/lagrangian/sprayFoam/YEqn.H       |  4 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   |  4 +-
 .../setTurbulenceFields/setTurbulenceFields.C | 10 +---
 .../LES/dynamicKEqn/dynamicKEqn.C             |  4 +-
 .../ReynoldsStress/ReynoldsStress.C           | 17 +++----
 .../relaxation/relaxation.C                   |  3 +-
 .../Poisson/PoissonPatchDistMethod.C          |  2 +-
 .../advectionDiffusionPatchDistMethod.C       |  2 +-
 src/functionObjects/field/comfort/comfort.C   | 16 ++++---
 .../field/limitFields/limitFields.C           | 46 +++++++++++++------
 .../field/limitFields/limitFields.H           | 15 +++---
 .../field/limitFields/limitFieldsTemplates.C  |  8 ++--
 .../stabilityBlendingFactor.C                 |  5 +-
 .../MultiComponentPhaseModel.C                |  2 +-
 .../ThermalPhaseChangePhaseSystem.C           |  4 +-
 .../TwoResistanceHeatTransferPhaseSystem.C    |  4 +-
 .../dragModels/IshiiZuber/IshiiZuber.C        |  2 +-
 .../liftModels/Moraga/Moraga.C                |  7 +--
 .../multiphaseSystem/multiphaseSystem.C       |  2 +-
 .../MultiComponentPhaseModel.C                |  4 +-
 .../kineticTheoryModel/kineticTheoryModel.C   |  6 +--
 .../twoPhaseSystem/twoPhaseSystem.C           |  2 +-
 .../kineticTheoryModel/kineticTheoryModel.C   |  6 +--
 .../dragModels/IshiiZuber/IshiiZuber.C        |  2 +-
 .../liftModels/Moraga/Moraga.C                |  7 +--
 .../twoPhaseSystem/twoPhaseSystem.C           |  3 +-
 .../filmTurbulenceModel/filmTurbulenceModel.C |  2 +-
 .../reactingOneDim/reactingOneDim.C           |  2 +-
 .../kinematicSingleLayer.C                    |  2 +-
 .../kinematicSingleLayerI.H                   |  2 +-
 .../filmTurbulenceModel/laminar/laminar.C     |  2 +-
 .../thixotropicViscosity.C                    |  6 +--
 .../waxSolventEvaporation.C                   |  3 +-
 .../thermoSingleLayer/thermoSingleLayer.C     | 19 +++++---
 .../thermoSingleLayer/thermoSingleLayer.H     | 29 ++++++++----
 .../thermoSingleLayer/thermoSingleLayerI.H    | 15 +++++-
 .../BilgerMixtureFraction.C                   |  6 +--
 45 files changed, 163 insertions(+), 145 deletions(-)

diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index fda39d3f51..38740d0dd5 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/bEqn.H
@@ -171,10 +171,7 @@ if (ign.ignited())
 
         fvOptions.correct(Su);
 
-        // Limit the maximum Su
-        // ~~~~~~~~~~~~~~~~~~~~
-        Su.min(SuMax);
-        Su.max(SuMin);
+        Su.clamp_range(SuMin, SuMax);
     }
     else
     {
diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H
index 5176956acc..adc849bc2d 100644
--- a/applications/solvers/combustion/fireFoam/YEEqn.H
+++ b/applications/solvers/combustion/fireFoam/YEEqn.H
@@ -39,13 +39,13 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 
     radiation->correct();
 
diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H
index 4d209a3d81..ea8681628a 100644
--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/applications/solvers/combustion/reactingFoam/YEqn.H
@@ -38,11 +38,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
index c32c1fdab2..b42c7986ab 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H
@@ -48,7 +48,7 @@ if (Y.size())
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
@@ -56,6 +56,6 @@ if (Y.size())
     if (Y.size())
     {
         Y[inertIndex] = scalar(1) - Yt;
-        Y[inertIndex].max(0.0);
+        Y[inertIndex].clamp_min(0);
     }
 }
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
index 49e3f70d89..f3cbb702a7 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@@ -40,11 +40,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
index c7f9dbce34..ecbf120887 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
@@ -41,11 +41,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
index 1510f8e391..db2d6c9b9c 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
@@ -38,11 +38,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 }
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H
index c81ac66c8b..a6f70bf4f2 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H
@@ -38,11 +38,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 }
diff --git a/applications/solvers/lagrangian/sprayFoam/YEqn.H b/applications/solvers/lagrangian/sprayFoam/YEqn.H
index 60a27fec85..e80f884202 100644
--- a/applications/solvers/lagrangian/sprayFoam/YEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/YEqn.H
@@ -39,11 +39,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.correct(Yi);
 
-            Yi.max(0.0);
+            Yi.clamp_min(0);
             Yt += Yi;
         }
     }
 
     Y[inertIndex] = scalar(1) - Yt;
-    Y[inertIndex].max(0.0);
+    Y[inertIndex].clamp_min(0);
 }
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 63f0e514ff..c072c06826 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -92,7 +92,7 @@ void blendField
         volScalarField fld(fieldHeader, mesh);
         scalarField& pf = fld.primitiveFieldRef();
         pf = (1 - mask)*pf + mask*boundaryLayerField;
-        fld.max(SMALL);
+        fld.clamp_min(SMALL);
 
         // Correct the processor patches only.
         // Do not correct BC
@@ -131,7 +131,7 @@ void calcOmegaField
         scalarField& pf = omega.primitiveFieldRef();
 
         pf = (1 - mask)*pf + mask*epsilonBL/(Cmu*kBL + SMALL);
-        omega.max(SMALL);
+        omega.clamp_min(SMALL);
 
         // Correct the processor patches only.
         // Do not correct BC
diff --git a/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C b/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
index 06481f514a..71d945503a 100644
--- a/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
+++ b/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -241,13 +241,7 @@ void calcF
     solve(fEqn);
 
     // (M:p. 2)
-    const dimensioned<scalarMinMax> fMinMax
-    (
-        dimless,
-        scalarMinMax(Zero, scalar(1) - Foam::exp(-scalar(400)/scalar(50)))
-    );
-
-    f.clip(fMinMax);
+    f.clamp_range(0, scalar(1) - Foam::exp(-scalar(400)/scalar(50)));
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
index 5b173b01aa..bdfc9ef03a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
@@ -102,7 +102,7 @@ volScalarField dynamicKEqn<BasicTurbulenceModel>::Ce() const
     (
         0.5*(filter_(magSqr(this->U_)) - magSqr(filter_(this->U_)))
     );
-    KK.max(dimensionedScalar("small", KK.dimensions(), SMALL));
+    KK.clamp_min(SMALL);
 
     return Ce(D, KK);
 }
@@ -245,7 +245,7 @@ void dynamicKEqn<BasicTurbulenceModel>::correct()
     tgradU.clear();
 
     volScalarField KK(0.5*(filter_(magSqr(U)) - magSqr(filter_(U))));
-    KK.max(dimensionedScalar("small", KK.dimensions(), SMALL));
+    KK.clamp_min(SMALL);
 
     tmp<fvScalarMatrix> kEqn
     (
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
index d1e785e409..b71be0e31f 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
@@ -39,20 +39,15 @@ void Foam::ReynoldsStress<BasicTurbulenceModel>::boundNormalStress
     volSymmTensorField& R
 ) const
 {
-    scalar kMin = this->kMin_.value();
+    const scalar kMin = this->kMin_.value();
 
-    R.max
+    R.clamp_min
     (
-        dimensionedSymmTensor
+        symmTensor
         (
-            "zero",
-            R.dimensions(),
-            symmTensor
-            (
-                kMin, -GREAT, -GREAT,
-                kMin, -GREAT,
-                kMin
-            )
+            kMin, -GREAT, -GREAT,
+            kMin, -GREAT,
+            kMin
         )
     );
 }
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
index eea9d2fc7a..10df906bd5 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
@@ -136,8 +136,7 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct
        - fvm::SuSp(rho*(tau + Rc), omega_)
     );
 
-    omega_.min(omega0);
-    omega_.max(0.0);
+    omega_.clamp_range(0, omega0.value());
 }
 
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C
index 2e54d2d5cb..5984f960c7 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C
@@ -120,7 +120,7 @@ bool Foam::patchDistMethods::Poisson::correct
     // Need to stabilise the y for overset meshes since the holed cells
     // keep the initial value (0.0) so the gradient of that will be
     // zero as well. Turbulence models do not like zero wall distance.
-    y.max(SMALL);
+    y.clamp_min(SMALL);
 
     // For overset: enforce smooth y field (yPsi is smooth, magGradyPsi is
     // not)
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
index be028a323c..4a78d65e05 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
@@ -153,7 +153,7 @@ bool Foam::patchDistMethods::advectionDiffusion::correct
     // Need to stabilise the y for overset meshes since the holed cells
     // keep the initial value (0.0) so the gradient of that will be
     // zero as well. Turbulence models do not like zero wall distance.
-    y.max(SMALL);
+    y.clamp_min(SMALL);
 
     // Only calculate n if the field is defined
     if (notNull(n))
diff --git a/src/functionObjects/field/comfort/comfort.C b/src/functionObjects/field/comfort/comfort.C
index 2952500de8..ed0d465e5c 100644
--- a/src/functionObjects/field/comfort/comfort.C
+++ b/src/functionObjects/field/comfort/comfort.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2019 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,6 +41,11 @@ namespace functionObjects
 }
 }
 
+
+// Temperature bounds based on EN ISO 7730 (10 - 40 degC)
+static const Foam::scalarMinMax Tbounds(283.15, 313.15);
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField> Foam::functionObjects::comfort::magU() const
@@ -93,7 +98,7 @@ Foam::dimensionedScalar Foam::functionObjects::comfort::Trad() const
     }
 
     // Bounds based on EN ISO 7730
-    if ((Trad.value() < 283.15) || (Trad.value() > 313.15))
+    if (!Tbounds.contains(Trad.value()))
     {
         WarningInFunction
             << "The calculated mean wall radiation temperature is out of the\n"
@@ -177,9 +182,6 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::comfort::Tcloth
 
     Tcl.storePrevIter();
 
-    // Same temperatures as for the radiation
-    const dimensionedScalar Tmin(dimTemperature, 283.15);
-    const dimensionedScalar Tmax(dimTemperature, 313.15);
 
     // Iterative solving of equation (2)
     do
@@ -208,7 +210,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::comfort::Tcloth
 
         // Make sure that Tcl is in some physical limit (same range as we used
         // for the radiative estimation - based on ISO EN 7730:2005)
-        Tcl.clip(Tmin, Tmax);
+        Tcl.clamp_range(Tbounds);
 
     } while (!converged(Tcl) && i++ < maxClothIter_);
 
@@ -422,7 +424,7 @@ bool Foam::functionObjects::comfort::execute()
 
     // Limit the velocity field to the values given in EN ISO 7733
     volScalarField Umag(mag(lookupObject<volVectorField>("U")));
-    Umag.clip(Umin, Umax);
+    Umag.clamp_range(Umin, Umax);
 
     // Calculate the turbulent intensity if turbulent kinetic energy field k
     // exists
diff --git a/src/functionObjects/field/limitFields/limitFields.C b/src/functionObjects/field/limitFields/limitFields.C
index c89d230848..c03eb37fcc 100644
--- a/src/functionObjects/field/limitFields/limitFields.C
+++ b/src/functionObjects/field/limitFields/limitFields.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd
+    Copyright (C) 2019-2023 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,9 +46,10 @@ const Foam::Enum
 >
 Foam::functionObjects::limitFields::limitTypeNames_
 ({
-    { limitType::MIN, "min" },
-    { limitType::MAX, "max" },
-    { limitType::BOTH, "both" },
+    { limitType::CLAMP_MIN, "min" },
+    { limitType::CLAMP_MAX, "max" },
+    { limitType::CLAMP_RANGE, "range" },
+    { limitType::CLAMP_RANGE, "both" },
 });
 
 
@@ -67,16 +68,31 @@ bool Foam::functionObjects::limitFields::limitScalarField
 
     auto& field = *fieldPtr;
 
-    if (limit_ & MIN)
+    if (limitType::CLAMP_NONE != withBounds_)
     {
-        Log << ": min(" << gMin(field) << ")";
-        field.max(dimensionedScalar("", field.dimensions(), min_));
+        MinMax<scalar> currentRange = gMinMax(field);
+
+        if (withBounds_ & limitType::CLAMP_MIN)
+        {
+            Log << ": min(" << currentRange.min() << ')';
+        }
+        if (withBounds_ & limitType::CLAMP_MAX)
+        {
+            Log << ": max(" << currentRange.max() << ')';
+        }
     }
 
-    if (limit_ & MAX)
+    if (limitType::CLAMP_MIN == withBounds_)
     {
-        Log << ": max(" << gMax(field) << ")";
-        field.min(dimensionedScalar("", field.dimensions(), max_));
+        field.clamp_min(min_);
+    }
+    else if (limitType::CLAMP_MAX == withBounds_)
+    {
+        field.clamp_max(max_);
+    }
+    else if (limitType::CLAMP_RANGE == withBounds_)
+    {
+        field.clamp_range(min_, max_);
     }
 
     return true;
@@ -93,8 +109,8 @@ Foam::functionObjects::limitFields::limitFields
 )
 :
     fvMeshFunctionObject(name, runTime, dict),
-    limit_(MIN),
     fieldSet_(mesh_),
+    withBounds_(limitType::CLAMP_NONE),
     min_(-VGREAT),
     max_(VGREAT)
 {
@@ -106,19 +122,21 @@ Foam::functionObjects::limitFields::limitFields
 
 bool Foam::functionObjects::limitFields::read(const dictionary& dict)
 {
+    withBounds_ = limitType::CLAMP_NONE;
+
     if (fvMeshFunctionObject::read(dict))
     {
         Info<< type() << " " << name() << ":" << nl;
 
-        limit_ = limitTypeNames_.get("limit", dict);
+        withBounds_ = limitTypeNames_.get("limit", dict);
 
-        if (limit_ & MIN)
+        if (withBounds_ & limitType::CLAMP_MIN)
         {
             min_ = dict.get<scalar>("min");
             Info<< "    Imposing lower limit " << min_ << nl;
         }
 
-        if (limit_ & MAX)
+        if (withBounds_ & limitType::CLAMP_MAX)
         {
             max_ = dict.get<scalar>("max");
             Info<< "    Imposing upper limit " << max_ << nl;
diff --git a/src/functionObjects/field/limitFields/limitFields.H b/src/functionObjects/field/limitFields/limitFields.H
index d40324fe8b..405d2c4316 100644
--- a/src/functionObjects/field/limitFields/limitFields.H
+++ b/src/functionObjects/field/limitFields/limitFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -127,9 +127,10 @@ public:
 
         enum limitType : unsigned
         {
-            MIN = 0x1,          //!< limit by minimum value
-            MAX = 0x2,          //!< limit by maximum value
-            BOTH = (MIN | MAX)  //!< limit by both minimum and maximum values
+            CLAMP_NONE = 0,     //!< No limit
+            CLAMP_MIN = 0x1,    //!< Clamp minimum value
+            CLAMP_MAX = 0x2,    //!< Clamp maximum value
+            CLAMP_RANGE = (CLAMP_MIN | CLAMP_MAX)  //!< Clamp min/max
         };
 
 
@@ -140,12 +141,12 @@ protected:
         //- Limit type names
         static const Enum<limitType> limitTypeNames_;
 
-        //- Limiting type
-        limitType limit_;
-
         //- Fields to limit
         volFieldSelection fieldSet_;
 
+        //- Limiting type
+        limitType withBounds_;
+
         //- Minimum limit
         scalar min_;
 
diff --git a/src/functionObjects/field/limitFields/limitFieldsTemplates.C b/src/functionObjects/field/limitFields/limitFieldsTemplates.C
index 3e1bc00483..0b20a6cbe2 100644
--- a/src/functionObjects/field/limitFields/limitFieldsTemplates.C
+++ b/src/functionObjects/field/limitFields/limitFieldsTemplates.C
@@ -47,23 +47,23 @@ bool Foam::functionObjects::limitFields::limitField(const word& fieldName)
 
     const dimensionedScalar eps("eps", field.dimensions(), ROOTVSMALL);
 
-    if (limit_ & MIN)
+    if (withBounds_ & limitType::CLAMP_MIN)
     {
         volScalarField mField(typeName + ":mag" + field.name(), mag(field));
         Log << " min(|" << gMin(mField) << "|)";
         //field.normalise();
         field /= mag(field) + eps;
-        mField.max(dimensionedScalar("min", field.dimensions(), min_));
+        mField.clamp_min(min_);
         field *= mField;
     }
 
-    if (limit_ & MAX)
+    if (withBounds_ & limitType::CLAMP_MAX)
     {
         volScalarField mField(typeName + ":mag" + field.name(), mag(field));
         Log << " max(|" << gMax(mField) << "|)";
         //field.normalise();
         field /= mag(field) + eps;
-        mField.min(dimensionedScalar("max", field.dimensions(), max_));
+        mField.clamp_max(max_);
         field *= mField;
     }
 
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 827d882b79..8837f3784d 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -448,8 +448,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
     }
 
     indicator.correctBoundaryConditions();
-    indicator.min(1.0);
-    indicator.max(0.0);
+    indicator.clamp_range(zero_one{});
 
     // Update the blended surface field
     auto& surBlended = mesh_.lookupObjectRef<surfaceScalarField>(resultName_);
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 3926d26730..1dca7f055c 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -428,7 +428,7 @@ void Foam::MultiComponentPhaseModel<BasePhaseModel, phaseThermo>::solveYi
     }
 
     X_[inertIndex_] = scalar(1) - Yt;
-    X_[inertIndex_].max(0.0);
+    X_[inertIndex_].clamp_min(0);
 
     calculateMassFractions();
 }
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index b91b656ae4..e3a2be4b9a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -425,8 +425,8 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctInterfaceThermo()
         volScalarField H2(heatTransferModelIter().second()->K());
 
         // Limit the H[12] to avoid /0
-        H1.max(SMALL);
-        H2.max(SMALL);
+        H1.clamp_min(SMALL);
+        H2.clamp_min(SMALL);
 
         Tf = (H1*T1 + H2*T2 + iDmdtNew*L)/(H1 + H2);
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C
index d2e61843e3..c08c6601a2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C
@@ -297,8 +297,8 @@ correctInterfaceThermo()
         );
 
         // Limit the H[12] to avoid /0
-        H1.max(SMALL);
-        H2.max(SMALL);
+        H1.clamp_min(SMALL);
+        H2.clamp_min(SMALL);
 
         Tf = (H1*T1 + H2*T2 + dmdt*L)/(H1 + H2);
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
index 8946f1093d..44f552f592 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
@@ -86,7 +86,7 @@ Foam::dragModels::IshiiZuber::CdRe() const
     );
 
     volScalarField F((muc/muMix)*sqrt(1 - pair_.dispersed()));
-    F.max(1e-3);
+    F.clamp_min(1e-3);
 
     const volScalarField Ealpha((1 + 17.67*pow(F, 0.8571428))/(18.67*F));
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
index 97364b5fe8..ee0067f732 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
@@ -87,11 +87,8 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::Moraga::Cl() const
             << endl;
     }
 
-    Re.min(1200.0);
-    Re.max(18800.0);
-
-    sqrSr.min(0.0016);
-    sqrSr.max(0.04);
+    Re.clamp_range(1200.0, 18800.0);
+    sqrSr.clamp_range(0.0016, 0.04);
 
     return 0.2*exp(- Re*sqrSr/3.6e5 - 0.12)*exp(Re*sqrSr/3.0e7);
 }
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
index 3b795194c9..e232ec1e39 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
@@ -708,7 +708,7 @@ void Foam::multiphaseSystem::solve()
         phase.alphaRhoPhiRef() =
             fvc::interpolate(phase.rho())*phase.alphaPhi();
 
-        phase.clip(SMALL, 1 - SMALL);
+        phase.clamp_range(SMALL, 1 - SMALL);
     }
 
     calcAlphas();
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 0f36a58829..9482f0244c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -124,14 +124,14 @@ void Foam::MultiComponentPhaseModel<BasePhaseModel>::correctThermo()
     if (inertIndex_ != -1)
     {
         Yi[inertIndex_] = scalar(1) - Yt;
-        Yi[inertIndex_].max(0);
+        Yi[inertIndex_].clamp_min(0);
     }
     else
     {
         forAll(Yi, i)
         {
             Yi[i] /= Yt;
-            Yi[i].max(0);
+            Yi[i].clamp_min(0);
         }
     }
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 25572bfb3c..cab9367831 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -526,8 +526,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
         kappa_ = conductivityModel_->kappa(alpha, Theta_, gs0_, rho, da, e_);
     }
 
-    Theta_.max(0);
-    Theta_.min(100);
+    Theta_.clamp_range(0, 100);
 
     {
         // particle viscosity (Table 3.2, p.47)
@@ -559,7 +558,8 @@ void Foam::RASModels::kineticTheoryModel::correct()
         );
 
         // Limit viscosity and add frictional viscosity
-        nut_.min(maxNut_);
+        nut_.clamp_max(maxNut_);
+
         nuFric_ = min(nuFric_, maxNut_ - nut_);
         nut_ += nuFric_;
     }
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
index c52aae49ed..51f8dd9898 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
@@ -340,7 +340,7 @@ void Foam::twoPhaseSystem::solve()
             << endl;
 
         // Ensure the phase-fractions are bounded
-        alpha1.clip(SMALL, 1 - SMALL);
+        alpha1.clamp_range(SMALL, 1 - SMALL);
 
         // Update the phase-fraction of the other phase
         alpha2 = scalar(1) - alpha1;
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index bca4b78442..010322104d 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -530,8 +530,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
         kappa_ = conductivityModel_->kappa(alpha, Theta_, gs0_, rho, da, e_);
     }
 
-    Theta_.max(0);
-    Theta_.min(100);
+    Theta_.clamp_range(0, 100);
 
     {
         // particle viscosity (Table 3.2, p.47)
@@ -563,7 +562,8 @@ void Foam::RASModels::kineticTheoryModel::correct()
         );
 
         // Limit viscosity and add frictional viscosity
-        nut_.min(maxNut_);
+        nut_.clamp_max(maxNut_);
+
         nuFric_ = min(nuFric_, maxNut_ - nut_);
         nut_ += nuFric_;
     }
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
index 96288f39d0..5aa9237fda 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
@@ -87,7 +87,7 @@ Foam::dragModels::IshiiZuber::CdRe() const
     );
 
     volScalarField F((muc/muMix)*sqrt(1 - pair_.dispersed()));
-    F.max(1e-3);
+    F.clamp_min(1e-3);
 
     volScalarField Ealpha((1 + 17.67*pow(F, 0.8571428))/(18.67*F));
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
index 8064581e6f..dca601c284 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
@@ -87,11 +87,8 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::Moraga::Cl() const
             << endl;
     }
 
-    Re.min(1200.0);
-    Re.max(18800.0);
-
-    sqrSr.min(0.0016);
-    sqrSr.max(0.04);
+    Re.clamp_range(1200.0, 18800.0);
+    sqrSr.clamp_range(0.0016, 0.04);
 
     return 0.2*exp(- Re*sqrSr/3.6e5 - 0.12)*exp(Re*sqrSr/3.0e7);
 }
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.C
index f4198b56fd..fdb52fea29 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.C
@@ -530,8 +530,7 @@ void Foam::twoPhaseSystem::solve()
             << endl;
 
         // Ensure the phase-fractions are bounded
-        alpha1.max(0);
-        alpha1.min(1);
+        alpha1.clamp_range(zero_one{});
 
         alpha2 = scalar(1) - alpha1;
     }
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
index 9fbbe55b35..486ab4767c 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
@@ -128,7 +128,7 @@ tmp<areaScalarField> filmTurbulenceModel::Cw() const
             const scalar h0 = film_.h0().value();
 
             Cw.primitiveFieldRef() = 3*mu/((h + h0)*rho);
-            Cw.min(5000.0);
+            Cw.clamp_max(5000.0);
 
             break;
         }
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index d3c1652d95..acadb10b20 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -276,7 +276,7 @@ void reactingOneDim::solveSpeciesMass()
         }
 
         YiEqn.solve(regionMesh().solver("Yi"));
-        Yi.max(0.0);
+        Yi.clamp_min(0);
         Yt += Yi;
     }
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index d448c5fdf6..3e624c271e 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -412,7 +412,7 @@ void kinematicSingleLayer::solveThickness
     }
 
     // Bound film thickness by a minimum of zero
-    delta_.max(0.0);
+    delta_.clamp_min(0);
 
     // Update U field
     U_ -= fvc::reconstruct(deltarUAf*phiAdd);
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index f3cd4b31dd..5a022e964b 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -250,7 +250,7 @@ inline tmp<volScalarField> kinematicSingleLayer::gNormClipped() const
     );
 
     volScalarField& gNormClipped = tgNormClipped.ref();
-    gNormClipped.min(0.0);
+    gNormClipped.clamp_max(0);
 
     return tgNormClipped;
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index 67a5dd47d8..fd2bbc8de7 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -136,7 +136,7 @@ tmp<fvVectorMatrix> laminar::Su(volVectorField& U) const
     // employ simple coeff-based model
     volScalarField Cs("Cs", Cf_*rhop*mag(Up - U));
     volScalarField Cw("Cw", mu/((1.0/3.0)*(delta + film.deltaSmall())));
-    Cw.min(5000.0);
+    Cw.clamp_max(5000.0);
 
     return
     (
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
index f7f991820f..931b23d3ff 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
@@ -85,8 +85,7 @@ thixotropicViscosity::thixotropicViscosity
         film.regionMesh()
     )
 {
-    lambda_.min(1);
-    lambda_.max(0);
+    lambda_.clamp_range(zero_one{});
 
     // Initialise viscosity to inf value because it cannot be evaluated yet
     mu_ = muInf_;
@@ -166,8 +165,7 @@ void thixotropicViscosity::correct
     lambdaEqn.relax();
     lambdaEqn.solve();
 
-    lambda_.min(1);
-    lambda_.max(0);
+    lambda_.clamp_range(zero_one{});
 
     mu_ = muInf_/(sqr(1 - K_*lambda_) + ROOTVSMALL);
     mu_.correctBoundaryConditions();
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
index 0b20fe648f..737382070c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
@@ -357,8 +357,7 @@ void waxSolventEvaporation::correctModel
         YsolventEqn.relax();
         YsolventEqn.solve();
 
-        Ysolvent_.min(1);
-        Ysolvent_.max(0);
+        Ysolvent_.clamp_range(zero_one{});
 
         scalarField dm
         (
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index d46132aa6f..79d805c38b 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -478,18 +478,23 @@ thermoSingleLayer::thermoSingleLayer
     ),
     phaseChange_(phaseChangeModel::New(*this, coeffs())),
     radiation_(filmRadiationModel::New(*this, coeffs())),
-    Tmin_(-VGREAT),
-    Tmax_(VGREAT)
+    withTbounds_(limitType::CLAMP_NONE),
+    Tbounds_(0, 5000)
 {
-    if (coeffs().readIfPresent("Tmin", Tmin_))
+    unsigned userLimits(limitType::CLAMP_NONE);
+
+    if (coeffs().readIfPresent("Tmin", Tbounds_.min()))
     {
-        Info<< "    limiting minimum temperature to " << Tmin_ << endl;
+        userLimits |= limitType::CLAMP_MIN;
+        Info<< "    limiting minimum temperature to " << Tbounds_.min() << nl;
     }
 
-    if (coeffs().readIfPresent("Tmax", Tmax_))
+    if (coeffs().readIfPresent("Tmax", Tbounds_.max()))
     {
-        Info<< "    limiting maximum temperature to " << Tmax_ << endl;
+        userLimits |= limitType::CLAMP_MAX;
+        Info<< "    limiting maximum temperature to " << Tbounds_.max() << nl;
     }
+    withTbounds_ = limitType(userLimits);
 
     if (thermo_.hasMultiComponentCarrier())
     {
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index 4ebda18c47..6835f1dee5 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef thermoSingleLayer_H
-#define thermoSingleLayer_H
+#ifndef Foam_thermoSingleLayer_H
+#define Foam_thermoSingleLayer_H
 
 #include "kinematicSingleLayer.H"
 #include "SLGThermo.H"
@@ -69,7 +70,7 @@ class thermoSingleLayer
 :
     public kinematicSingleLayer
 {
-    // Private member functions
+    // Private Member Functions
 
         //- No copy construct
         thermoSingleLayer(const thermoSingleLayer&) = delete;
@@ -83,7 +84,17 @@ class thermoSingleLayer
 
 protected:
 
-    // Protected data
+    // Protected Data
+
+        //- Enumerated limiter type
+        enum limitType : unsigned
+        {
+            CLAMP_NONE = 0,     //!< No limit
+            CLAMP_MIN = 0x1,    //!< Clamp minimum value
+            CLAMP_MAX = 0x2,    //!< Clamp maximum value
+            CLAMP_RANGE = (CLAMP_MIN | CLAMP_MAX)  //!< Clamp min/max
+        };
+
 
         // Thermo properties
 
@@ -184,14 +195,14 @@ protected:
 
         // Limits
 
-            //- Minimum temperature limit (optional)
-            scalar Tmin_;
+            //- Limiting type
+            limitType withTbounds_;
 
-            //- Maximum temperature limit (optional)
-            scalar Tmax_;
+            //- Temperature limits (optional)
+            scalarMinMax Tbounds_;
 
 
-    // Protected member functions
+    // Protected Member Functions
 
         //- Read control parameters from dictionary
         virtual bool read();
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index 1da7e294d1..2cfefdc521 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,8 +103,18 @@ inline tmp<volScalarField> thermoSingleLayer::T
         )
     );
 
-    tT.ref().min(Tmax_);
-    tT.ref().max(Tmin_);
+    if (limitType::CLAMP_MIN == withTbounds_)
+    {
+        tT.ref().clamp_min(Tbounds_.min());
+    }
+    else if (limitType::CLAMP_MAX == withTbounds_)
+    {
+        tT.ref().clamp_max(Tbounds_.max());
+    }
+    else if (limitType::CLAMP_RANGE == withTbounds_)
+    {
+        tT.ref().clamp_range(Tbounds_);
+    }
 
     return tT;
 }
diff --git a/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C b/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C
index dae741f81e..2db2a51f07 100644
--- a/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C
+++ b/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C
@@ -89,11 +89,7 @@ void Foam::functionObjects::BilgerMixtureFraction::calcBilgerMixtureFraction()
            /thermo_.W(i);
     }
     f_Bilger /= o2RequiredFuelOx_;
-    f_Bilger.clip
-    (
-        dimensionedScalar(dimless, 0),
-        dimensionedScalar(dimless, 1)
-    );
+    f_Bilger.clamp_range(zero_one{});
 }
 
 

From 6f68ce5239fca6628bf2c9c9047d05abbe45ef81 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 19 Jan 2023 09:40:26 +0100
Subject: [PATCH 088/348] ENH: update field function macros and 'reuse' field
 handling

- clearer, more consistent parameter naming, which helps when
  maintaining different field function types (eg, DimensionedFields,
  GeometricFields)

- provide reuseTmpGeometricField::New taking a reference (not a tmp),
  with forwarding. This helps centralise naming and acquisition etc

- split binary function macros into transform/interface
  for easier support of different transform loops.

- initial field macros for looping over ternaries
---
 .../DimensionedFieldFunctions.C               | 416 ++++++------
 .../DimensionedFieldFunctions.H               |  96 +--
 .../DimensionedFieldFunctionsM.C              | 534 ++++++++--------
 .../DimensionedFieldFunctionsM.H              | 209 ++++---
 .../DimensionedFieldReuseFunctions.H          | 149 +++--
 .../FieldField/FieldFieldFunctions.C          | 245 +++-----
 .../FieldField/FieldFieldFunctions.H          |   2 +-
 .../FieldField/FieldFieldFunctionsM.C         | 207 +++---
 .../FieldField/FieldFieldFunctionsM.H         |  61 +-
 .../FieldField/FieldFieldReuseFunctions.H     |  30 +-
 .../fields/Fields/Field/FieldFunctions.C      | 460 +++++++-------
 .../fields/Fields/Field/FieldFunctionsM.C     | 188 +++---
 .../fields/Fields/Field/FieldFunctionsM.H     | 130 ++--
 src/OpenFOAM/fields/Fields/Field/FieldM.H     | 113 +++-
 .../fields/Fields/Field/FieldReuseFunctions.H |  21 +-
 .../Fields/Field/undefFieldFunctionsM.H       |  27 +-
 .../GeometricField/GeometricFieldFunctions.C  | 592 ++++++++----------
 .../GeometricField/GeometricFieldFunctions.H  | 151 ++---
 .../GeometricField/GeometricFieldFunctionsM.C | 533 +++++++---------
 .../GeometricField/GeometricFieldFunctionsM.H | 207 +++---
 .../GeometricFieldReuseFunctions.H            | 154 +++--
 21 files changed, 2292 insertions(+), 2233 deletions(-)

diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index 487c655226..841324d1f2 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,32 +36,27 @@ License
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const DimensionedField<Type, GeoMesh>& df,
+    const DimensionedField<Type, GeoMesh>& f1,
     typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
 
     auto tres =
-        tmp<DimensionedField<powProductType, GeoMesh>>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            IOobject
-            (
-                "pow(" + df.name() + ',' + name(r) + ')',
-                df.instance(),
-                df.db()
-            ),
-            df.mesh(),
-            pow(df.dimensions(), r)
+            f1,
+            "pow(" + f1.name() + ',' + Foam::name(r) + ')',
+            pow(f1.dimensions(), r)
         );
 
-    pow<Type, r, GeoMesh>(tres.ref().field(), df.field());
+    pow<Type, r, GeoMesh>(tres.ref().field(), f1.field());
 
     return tres;
 }
@@ -71,166 +66,151 @@ template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf,
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,
     typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
 
-    const DimensionedField<Type, GeoMesh>& df = tdf();
+    const auto& f1 = tf1();
 
     auto tres =
-        reuseTmpDimensionedField<powProductType, Type, GeoMesh>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            tdf,
-            "pow(" + df.name() + ',' + name(r) + ')',
-            pow(df.dimensions(), r)
+            tf1,
+            "pow(" + f1.name() + ',' + Foam::name(r) + ')',
+            pow(f1.dimensions(), r)
         );
 
-    pow<Type, r, GeoMesh>(tres.ref().field(), df.field());
+    pow<Type, r, GeoMesh>(tres.ref().field(), f1.field());
 
-    tdf.clear();
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
-sqr(const DimensionedField<Type, GeoMesh>& df)
+sqr(const DimensionedField<Type, GeoMesh>& f1)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
+    typedef typename outerProduct<Type, Type>::type resultType;
 
     auto tres =
-        tmp<DimensionedField<outerProductType, GeoMesh>>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            IOobject
-            (
-                "sqr(" + df.name() + ')',
-                df.instance(),
-                df.db()
-            ),
-            df.mesh(),
-            sqr(df.dimensions())
+            f1,
+            "sqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    sqr(tres.ref().field(), df.field());
+    sqr(tres.ref().field(), f1.field());
 
     return tres;
 }
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
-sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
+sqr(const tmp<DimensionedField<Type, GeoMesh>>& tf1)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
+    typedef typename outerProduct<Type, Type>::type resultType;
 
-    const DimensionedField<Type, GeoMesh>& df = tdf();
+    const auto& f1 = tf1();
 
     auto tres =
-        reuseTmpDimensionedField<outerProductType, Type, GeoMesh>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            tdf,
-            "sqr(" + df.name() + ')',
-            sqr(df.dimensions())
+            tf1,
+            "sqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    sqr(tres.ref().field(), df.field());
+    sqr(tres.ref().field(), f1.field());
 
-    tdf.clear();
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-magSqr(const DimensionedField<Type, GeoMesh>& df)
+magSqr(const DimensionedField<Type, GeoMesh>& f1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
     auto tres =
-        tmp<DimensionedField<magType, GeoMesh>>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            IOobject
-            (
-                "magSqr(" + df.name() + ')',
-                df.instance(),
-                df.db()
-            ),
-            df.mesh(),
-            sqr(df.dimensions())
+            f1,
+            "magSqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    magSqr(tres.ref().field(), df.field());
+    magSqr(tres.ref().field(), f1.field());
 
     return tres;
 }
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-magSqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
+magSqr(const tmp<DimensionedField<Type, GeoMesh>>& tf1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    const DimensionedField<Type, GeoMesh>& df = tdf();
+    const auto& f1 = tf1();
 
     auto tres =
-        reuseTmpDimensionedField<magType, Type, GeoMesh>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            tdf,
-            "magSqr(" + df.name() + ')',
-            sqr(df.dimensions())
+            tf1,
+            "magSqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    magSqr(tres.ref().field(), df.field());
+    magSqr(tres.ref().field(), f1.field());
 
-    tdf.clear();
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-mag(const DimensionedField<Type, GeoMesh>& df)
+mag(const DimensionedField<Type, GeoMesh>& f1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
     auto tres =
-        tmp<DimensionedField<magType, GeoMesh>>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            IOobject
-            (
-                "mag(" + df.name() + ')',
-                df.instance(),
-                df.db()
-            ),
-            df.mesh(),
-            df.dimensions()
+            f1,
+            "mag(" + f1.name() + ')',
+            f1.dimensions()
         );
 
-    mag(tres.ref().field(), df.field());
+    mag(tres.ref().field(), f1.field());
 
     return tres;
 }
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-mag(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
+mag(const tmp<DimensionedField<Type, GeoMesh>>& tf1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    const DimensionedField<Type, GeoMesh>& df = tdf();
+    const auto& f1 = tf1();
 
     auto tres =
-        reuseTmpDimensionedField<magType, Type, GeoMesh>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            tdf,
-            "mag(" + df.name() + ')',
-            df.dimensions()
+            tf1,
+            "mag(" + f1.name() + ')',
+            f1.dimensions()
         );
 
-    mag(tres.ref().field(), df.field());
+    mag(tres.ref().field(), f1.field());
 
-    tdf.clear();
+    tf1.clear();
     return tres;
 }
 
@@ -243,24 +223,19 @@ tmp
         typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh
     >
 >
-cmptAv(const DimensionedField<Type, GeoMesh>& df)
+cmptAv(const DimensionedField<Type, GeoMesh>& f1)
 {
-    typedef typename DimensionedField<Type, GeoMesh>::cmptType cmptType;
+    typedef typename DimensionedField<Type, GeoMesh>::cmptType resultType;
 
     auto tres =
-        tmp<DimensionedField<cmptType, GeoMesh>>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            IOobject
-            (
-                "cmptAv(" + df.name() + ')',
-                df.instance(),
-                df.db()
-            ),
-            df.mesh(),
-            df.dimensions()
+            f1,
+            "cmptAv(" + f1.name() + ')',
+            f1.dimensions()
         );
 
-    cmptAv(tres.ref().field(), df.field());
+    cmptAv(tres.ref().field(), f1.field());
 
     return tres;
 }
@@ -274,51 +249,51 @@ tmp
         typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh
     >
 >
-cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
+cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tf1)
 {
-    typedef typename DimensionedField<Type, GeoMesh>::cmptType cmptType;
+    typedef typename DimensionedField<Type, GeoMesh>::cmptType resultType;
 
-    const DimensionedField<Type, GeoMesh>& df = tdf();
+    const auto& f1 = tf1();
 
     auto tres =
-        reuseTmpDimensionedField<cmptType, Type, GeoMesh>::New
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New
         (
-            tdf,
-            "cmptAv(" + df.name() + ')',
-            df.dimensions()
+            tf1,
+            "cmptAv(" + f1.name() + ')',
+            f1.dimensions()
         );
 
-    cmptAv(tres.ref().field(), df.field());
+    cmptAv(tres.ref().field(), f1.field());
 
-    tdf.clear();
+    tf1.clear();
     return tres;
 }
 
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                      \
+#define UNARY_REDUCTION_FUNCTION(ReturnType, Func, gFunc)                      \
                                                                                \
 template<class Type, class GeoMesh>                                            \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const DimensionedField<Type, GeoMesh>& df                                  \
+    const DimensionedField<Type, GeoMesh>& f1                                  \
 )                                                                              \
 {                                                                              \
-    return dimensioned<returnType>                                             \
+    return dimensioned<ReturnType>                                             \
     (                                                                          \
-        #func "(" + df.name() + ')',                                           \
-        df.dimensions(),                                                       \
-        dfunc(df.field())                                                      \
+        #Func "(" + f1.name() + ')',                                           \
+        f1.dimensions(),                                                       \
+        gFunc(f1.field())                                                      \
     );                                                                         \
 }                                                                              \
                                                                                \
 template<class Type, class GeoMesh>                                            \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1                            \
 )                                                                              \
 {                                                                              \
-    dimensioned<returnType> res = func(tdf1());                                \
-    tdf1.clear();                                                              \
+    dimensioned<ReturnType> res = Func(tf1());                                 \
+    tf1.clear();                                                               \
     return res;                                                                \
 }
 
@@ -347,7 +322,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
 
 
-// * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
 
@@ -363,32 +338,27 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
     auto tres =                                                                \
-        tmp<DimensionedField<productType, GeoMesh>>::New                       \
+        reuseTmpDimensionedField<resultType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + df1.name() + #op + df2.name() + ')',                     \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            df1.dimensions() op df2.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), df1.field(), df2.field());                \
+    Foam::OpFunc(tres.ref().field(), f1.field(), f2.field());                  \
                                                                                \
     return tres;                                                               \
 }                                                                              \
@@ -396,113 +366,108 @@ operator op                                                                    \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpDimensionedField<productType, Type2, GeoMesh>::New             \
+        reuseTmpDimensionedField<resultType, Type2, GeoMesh>::New              \
         (                                                                      \
-            tdf2,                                                              \
-            '(' + df1.name() + #op + df2.name() + ')',                         \
-            df1.dimensions() op df2.dimensions()                               \
+            tf2,                                                               \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), df1.field(), df2.field());                \
+    Foam::OpFunc(tres.ref().field(), f1.field(), f2.field());                  \
                                                                                \
-    tdf2.clear();                                                              \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpDimensionedField<productType, Type1, GeoMesh>::New             \
+        reuseTmpDimensionedField<resultType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            '(' + df1.name() + #op + df2.name() + ')',                         \
-            df1.dimensions() op df2.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), df1.field(), df2.field());                \
+    Foam::OpFunc(tres.ref().field(), f1.field(), f2.field());                  \
                                                                                \
-    tdf1.clear();                                                              \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpTmpDimensionedField                                            \
-        <productType, Type1, Type1, Type2, GeoMesh>::New                       \
+        <resultType, Type1, Type1, Type2, GeoMesh>::New                        \
         (                                                                      \
-            tdf1,                                                              \
-            tdf2,                                                              \
-            '(' + df1.name() + #op + df2.name() + ')',                         \
-            df1.dimensions() op df2.dimensions()                               \
+            tf1,                                                               \
+            tf2,                                                               \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), df1.field(), df2.field());                \
+    Foam::OpFunc(tres.ref().field(), f1.field(), f2.field());                  \
                                                                                \
-    tdf1.clear();                                                              \
-    tdf2.clear();                                                              \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const DimensionedField<Type, GeoMesh>& f1,                                 \
     const dimensioned<Form>& dvs                                               \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
+    typedef typename product<Type, Form>::type resultType;                     \
                                                                                \
     auto tres =                                                                \
-        tmp<DimensionedField<productType, GeoMesh>>::New                       \
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New               \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + df1.name() + #op + dvs.name() + ')',                     \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            df1.dimensions() op dvs.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + #Op + dvs.name() + ')',                          \
+            (f1.dimensions() Op dvs.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), df1.field(), dvs.value());                \
+    Foam::OpFunc(tres.ref().field(), f1.field(), dvs.value());                 \
                                                                                \
     return tres;                                                               \
 }                                                                              \
@@ -510,79 +475,74 @@ operator op                                                                    \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const DimensionedField<Type, GeoMesh>& f1,                                 \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    return df1 op dimensioned<Form>(static_cast<const Form&>(vs));             \
+    return f1 Op dimensioned<Form>(static_cast<const Form&>(vs));              \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,                           \
     const dimensioned<Form>& dvs                                               \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
+    typedef typename product<Type, Form>::type resultType;                     \
                                                                                \
-    const DimensionedField<Type, GeoMesh>& df1 = tdf1();                       \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpDimensionedField<productType, Type, GeoMesh>::New              \
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New               \
         (                                                                      \
-            tdf1,                                                              \
-            '(' + df1.name() + #op + dvs.name() + ')',                         \
-            df1.dimensions() op dvs.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + #Op + dvs.name() + ')',                          \
+            (f1.dimensions() Op dvs.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), df1.field(), dvs.value());                \
+    Foam::OpFunc(tres.ref().field(), f1.field(), dvs.value());                 \
                                                                                \
-    tdf1.clear();                                                              \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,                           \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    return tdf1 op dimensioned<Form>(static_cast<const Form&>(vs));            \
+    return tf1 Op dimensioned<Form>(static_cast<const Form&>(vs));             \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const DimensionedField<Type, GeoMesh>& df1                                 \
+    const DimensionedField<Type, GeoMesh>& f2                                  \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
+    typedef typename product<Form, Type>::type resultType;                     \
                                                                                \
     auto tres =                                                                \
-        tmp<DimensionedField<productType, GeoMesh>>::New                       \
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New               \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + dvs.name() + #op + df1.name() + ')',                     \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            dvs.dimensions() op df1.dimensions()                               \
+            f2,                                                                \
+            '(' + dvs.name() + #Op + f2.name() + ')',                          \
+            (dvs.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), dvs.value(), df1.field());                \
+    Foam::OpFunc(tres.ref().field(), dvs.value(), f2.field());                 \
                                                                                \
     return tres;                                                               \
 }                                                                              \
@@ -590,52 +550,52 @@ operator op                                                                    \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const DimensionedField<Type, GeoMesh>& df1                                 \
+    const DimensionedField<Type, GeoMesh>& f2                                  \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op df1;             \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) Op f2;              \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf2                            \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
+    typedef typename product<Form, Type>::type resultType;                     \
                                                                                \
-    const DimensionedField<Type, GeoMesh>& df1 = tdf1();                       \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpDimensionedField<productType, Type, GeoMesh>::New              \
+        reuseTmpDimensionedField<resultType, Type, GeoMesh>::New               \
         (                                                                      \
-            tdf1,                                                              \
-            '(' + dvs.name() + #op + df1.name() + ')',                         \
-            dvs.dimensions() op df1.dimensions()                               \
+            tf2,                                                               \
+            '(' + dvs.name() + #Op + f2.name() + ')',                          \
+            (dvs.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref().field(), dvs.value(), df1.field());                \
+    Foam::OpFunc(tres.ref().field(), dvs.value(), f2.field());                 \
                                                                                \
-    tdf1.clear();                                                              \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf2                            \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op tdf1;            \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) Op tf2;             \
 }
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index 81a625342f..3adb4ececb 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,13 +36,13 @@ License
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const DimensionedField<Type, GeoMesh>& df,
+    const DimensionedField<Type, GeoMesh>& f1,
     typename powProduct<Type, r>::type
 );
 
@@ -50,33 +50,33 @@ template<class Type, class GeoMesh, direction r>
 tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf,
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,
     typename powProduct<Type, r>::type
 );
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
-sqr(const DimensionedField<Type, GeoMesh>& df);
+sqr(const DimensionedField<Type, GeoMesh>& f1);
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
-sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
+sqr(const tmp<DimensionedField<Type, GeoMesh>>& tf1);
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-magSqr(const DimensionedField<Type, GeoMesh>& df);
+magSqr(const DimensionedField<Type, GeoMesh>& f1);
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-magSqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
+magSqr(const tmp<DimensionedField<Type, GeoMesh>>& tf1);
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-mag(const DimensionedField<Type, GeoMesh>& df);
+mag(const DimensionedField<Type, GeoMesh>& f1);
 
 template<class Type, class GeoMesh>
 tmp<DimensionedField<typename typeOfMag<Type>::type, GeoMesh>>
-mag(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
+mag(const tmp<DimensionedField<Type, GeoMesh>>& tf1);
 
 template<class Type, class GeoMesh>
 tmp
@@ -87,7 +87,7 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const DimensionedField<Type, GeoMesh>& df);
+cmptAv(const DimensionedField<Type, GeoMesh>& f1);
 
 template<class Type, class GeoMesh>
 tmp
@@ -98,21 +98,21 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
+cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tf1);
 
 
-// Forward to FieldFunction via dfunc()
-#define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                      \
+// Forward to FieldFunction via gFunc()
+#define UNARY_REDUCTION_FUNCTION(ReturnType, Func, gFunc)                      \
                                                                                \
 template<class Type, class GeoMesh>                                            \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const DimensionedField<Type, GeoMesh>& df                                  \
+    const DimensionedField<Type, GeoMesh>& f1                                  \
 );                                                                             \
 template<class Type, class GeoMesh>                                            \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1                            \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, max, gMax)
@@ -140,7 +140,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
 
 
-// * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
 
@@ -156,102 +156,102 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );                                                                             \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 template<class Type1, class Type2, class GeoMesh>                              \
 tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>           \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );                                                                             \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const DimensionedField<Type, GeoMesh>& f1,                                 \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const DimensionedField<Type, GeoMesh>& df1,                                \
+    const DimensionedField<Type, GeoMesh>& f1,                                 \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,                           \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                          \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,                           \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const DimensionedField<Type, GeoMesh>& df1                                 \
+    const DimensionedField<Type, GeoMesh>& f2                                  \
 );                                                                             \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const DimensionedField<Type, GeoMesh>& df1                                 \
+    const DimensionedField<Type, GeoMesh>& f2                                  \
 );                                                                             \
                                                                                \
 template<class Form, class Type, class GeoMesh>                                \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf2                            \
 );                                                                             \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type, class GeoMesh>   \
 tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>             \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                           \
+    const tmp<DimensionedField<Type, GeoMesh>>& tf2                            \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index 54978f94ac..e8ee293203 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,27 +33,32 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
                                                                                \
 TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Func(result.field(), f1.field());                                          \
+    result.oriented() = Dfunc(f1.oriented());                                  \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1                                \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + df1.name() + ')',                                  \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            Dfunc(df1.dimensions())                                            \
+            f1,                                                                \
+            #Func "(" + f1.name() + ')',                                       \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field());                                     \
-    tres.ref().oriented() = Dfunc(df1.oriented());                             \
-                                                                               \
+    Foam::Func(tres.ref(), f1);                                                \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -61,23 +66,21 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            #Func "(" + df1.name() + ')',                                      \
-            Dfunc(df1.dimensions())                                            \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ')',                                       \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field());                                     \
-    tres.ref().oriented() = Dfunc(df1.oriented());                             \
-                                                                               \
-    tdf1.clear();                                                              \
+    Foam::Func(tres.ref(), f1);                                                \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -87,27 +90,32 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                   \
                                                                                \
 TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Foam::OpFunc(result.field(), f1.field());                                  \
+    result.oriented() = Dfunc(f1.oriented());                                  \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1                                \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Op + df1.name(),                                              \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            Dfunc(df1.dimensions())                                            \
+            f1,                                                                \
+            #Op + f1.name(),                                                   \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field());                             \
-    tres.ref().oriented() = Dfunc(df1.oriented());                             \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1);                                              \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -115,23 +123,21 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            #Op + df1.name(),                                                  \
-            Dfunc(df1.dimensions())                                            \
+            tf1,                                                               \
+            #Op + f1.name(),                                                   \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field());                             \
-    tres.ref().oriented() = Dfunc(df1.oriented());                             \
-                                                                               \
-    tdf1.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1);                                              \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -141,28 +147,34 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
                                                                                \
 TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Foam::Func(result.field(), f1.field(), f2.field());                        \
+    result.oriented() = Func(f1.oriented(), f2.oriented());                    \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + df1.name() + ',' + df2.name() + ')',               \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            Func(df1.dimensions(), df2.dimensions())                           \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field(), df2.field());                        \
-    tres.ref().oriented() = Func(df1.oriented(), df2.oriented());              \
-                                                                               \
+    Foam::Func(tres.ref(), f1, f2);                                            \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -170,24 +182,22 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
         (                                                                      \
-            tdf2,                                                              \
-            #Func "(" + df1.name() + ',' + df2.name() + ')',                   \
-            Func(df1.dimensions(), df2.dimensions())                           \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field(), df2.field());                        \
-    tres.ref().oriented() = Func(df1.oriented(), df2.oriented());              \
-                                                                               \
-    tdf2.clear();                                                              \
+    Foam::Func(tres.ref(), f1, f2);                                            \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -195,26 +205,22 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
-    tmp<DimensionedField<ReturnType, GeoMesh>> tres                            \
-    (                                                                          \
+    auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            #Func "(" + df1.name() + ',' + df2.name() + ')',                   \
-            Func(df1.dimensions(), df2.dimensions())                           \
-        )                                                                      \
-    );                                                                         \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field(), df2.field());                        \
-    tres.ref().oriented() = Func(df1.oriented(), df2.oriented());              \
-                                                                               \
-    tdf1.clear();                                                              \
+    Foam::Func(tres.ref(), f1, f2);                                            \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -222,28 +228,26 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpTmpDimensionedField                                            \
         <ReturnType, Type1, Type1, Type2, GeoMesh>::New                        \
         (                                                                      \
-            tdf1,                                                              \
-            tdf2,                                                              \
-            #Func "(" + df1.name() + ',' + df2.name() + ')',                   \
-            Func(df1.dimensions(), df2.dimensions())                           \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field(), df2.field());                        \
-    tres.ref().oriented() = Func(df1.oriented(), df2.oriented());              \
-                                                                               \
-    tdf1.clear();                                                              \
-    tdf2.clear();                                                              \
+    Foam::Func(tres.ref(), f1, f2);                                            \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -253,28 +257,34 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const dimensioned<Type1>& dt1,                                             \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Func(result.field(), dt1.value(), f2.field());                             \
+    result.oriented() = f2.oriented();                                         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + dt1.name() + ',' + df2.name() + ')',               \
-                df2.instance(),                                                \
-                df2.db()                                                       \
-            ),                                                                 \
-            df2.mesh(),                                                        \
-            Func(dt1.dimensions(), df2.dimensions())                           \
+            f2,                                                                \
+            #Func "(" + dt1.name() + ',' + f2.name() + ')',                    \
+            Func(dt1.dimensions(), f2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), dt1.value(), df2.field());                        \
-    tres.ref().oriented() = df2.oriented();                                    \
-                                                                               \
+    Foam::Func(tres.ref(), dt1, f2);                                           \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -282,11 +292,11 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const Type1& s1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
-    return Func(dimensioned<Type1>(t1), df2);                                  \
+    return Foam::Func(dimensioned<Type1>(s1), f2);                             \
 }                                                                              \
                                                                                \
                                                                                \
@@ -294,63 +304,66 @@ TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
         (                                                                      \
-            tdf2,                                                              \
-            #Func "(" + dt1.name() + ',' + df2.name() + ')',                   \
-            Func(dt1.dimensions(), df2.dimensions())                           \
+            tf2,                                                               \
+            #Func "(" + dt1.name() + ',' + f2.name() + ')',                    \
+            Func(dt1.dimensions(), f2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), dt1.value(), df2.field());                        \
-    tres.ref().oriented() = df2.oriented();                                    \
-                                                                               \
-    tdf2.clear();                                                              \
+    Foam::Func(tres.ref(), dt1, f2);                                           \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
-                                                                               \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const Type1& s1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    return Func(dimensioned<Type2>(t1), tdf2);                                 \
+    return Foam::Func(dimensioned<Type2>(s1), tf2);                            \
 }
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Func(result.field(), f1.field(), dt2.value());                             \
+    result.oriented() = f1.oriented();                                         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + df1.name() + ',' + dt2.name() + ')',               \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            Func(df1.dimensions(), dt2.dimensions())                           \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + dt2.name() + ')',                    \
+            Func(f1.dimensions(), dt2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field(), dt2.value());                        \
-    tres.ref().oriented() = df1.oriented();                                    \
-                                                                               \
+    Foam::Func(tres.ref(), f1, dt2);                                           \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -358,35 +371,33 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const Type2& t2                                                            \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return Func(df1, dimensioned<Type2>(t2));                                  \
+    return Foam::Func(f1, dimensioned<Type2>(s2));                             \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            #Func "(" + df1.name() + ',' + dt2.name() + ')',                   \
-            Func(df1.dimensions(), dt2.dimensions())                           \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ',' + dt2.name() + ')',                    \
+            Func(f1.dimensions(), dt2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Func(tres.ref().field(), df1.field(), dt2.value());                        \
-    tres.ref().oriented() = df1.oriented();                                    \
-                                                                               \
-    tdf1.clear();                                                              \
+    Foam::Func(tres.ref(), f1, dt2);                                           \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -394,11 +405,11 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const Type2& t2                                                            \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return Func(tdf1, dimensioned<Type2>(t2));                                 \
+    return Foam::Func(tf1, dimensioned<Type2>(s2));                            \
 }
 
 
@@ -412,28 +423,35 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
                                                                                \
 TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Foam::OpFunc(result.field(), f1.field(), f2.field());                      \
+    result.oriented() = f1.oriented() Op f2.oriented();                        \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + df1.name() + OpName + df2.name() + ')',                  \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            df1.dimensions() Op df2.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field(), df2.field());                \
-    tres.ref().oriented() = df1.oriented() Op df2.oriented();                  \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -441,24 +459,22 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
         (                                                                      \
-            tdf2,                                                              \
-            '(' + df1.name() + OpName + df2.name() + ')',                      \
-            df1.dimensions() Op df2.dimensions()                               \
+            tf2,                                                               \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field(), df2.field());                \
-    tres.ref().oriented() = df1.oriented() Op df2.oriented();                  \
-                                                                               \
-    tdf2.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -466,53 +482,48 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            '(' + df1.name() + OpName + df2.name() + ')',                      \
-            df1.dimensions() Op df2.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field(), df2.field());                \
-    tres.ref().oriented() = df1.oriented() Op df2.oriented();                  \
-                                                                               \
-    tdf1.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
-                                                                               \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpTmpDimensionedField                                            \
         <ReturnType, Type1, Type1, Type2, GeoMesh>::New                        \
         (                                                                      \
-            tdf1,                                                              \
-            tdf2,                                                              \
-            '(' + df1.name() + OpName + df2.name() + ')',                      \
-            df1.dimensions() Op df2.dimensions()                               \
+            tf1,                                                               \
+            tf2,                                                               \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            f1.dimensions() Op f2.dimensions()                                 \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field(), df2.field());                \
-    tres.ref().oriented() = df1.oriented() Op df2.oriented();                  \
-                                                                               \
-    tdf1.clear();                                                              \
-    tdf2.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -522,29 +533,34 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const dimensioned<Type1>& dt1,                                             \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Foam::OpFunc(result.field(), dt1.value(), f2.field());                     \
+    result.oriented() = f2.oriented();                                         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + dt1.name() + OpName + df2.name() + ')',                  \
-                df2.instance(),                                                \
-                df2.db()                                                       \
-            ),                                                                 \
-            df2.mesh(),                                                        \
-            dt1.dimensions() Op df2.dimensions()                               \
+            f2,                                                                \
+            '(' + dt1.name() + OpName + f2.name() + ')',                       \
+            (dt1.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    tres.ref().oriented() = df2.oriented();                                    \
-                                                                               \
-    Foam::OpFunc(tres.ref().field(), dt1.value(), df2.field());                \
-                                                                               \
+    Foam::OpFunc(tres.ref(), dt1, f2);                                         \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -552,11 +568,11 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const Type1& s1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Type1>(t1) Op df2;                                      \
+    return dimensioned<Type1>(s1) Op f2;                                       \
 }                                                                              \
                                                                                \
                                                                                \
@@ -564,23 +580,21 @@ TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                      \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
         (                                                                      \
-            tdf2,                                                              \
-            '(' + dt1.name() + OpName + df2.name() + ')',                      \
-            dt1.dimensions() Op df2.dimensions()                               \
+            tf2,                                                               \
+            '(' + dt1.name() + OpName + f2.name() + ')',                       \
+            (dt1.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), dt1.value(), tdf2().field());             \
-    tres.ref().oriented() = df2.oriented();                                    \
-                                                                               \
-    tdf2.clear();                                                              \
+    Foam::OpFunc(tres.ref(), dt1, f2);                                         \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -588,39 +602,45 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const Type1& s1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Type1>(t1) Op tdf2;                                     \
+    return dimensioned<Type1>(s1) Op tf2;                                      \
 }
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const dimensioned<Type2>& dt2                                              \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Foam::OpFunc(result.field(), f1.field(), dt2.value());                     \
+    result.oriented() = f1.oriented();                                         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<DimensionedField<ReturnType, GeoMesh>>::New                        \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + df1.name() + OpName + dt2.name() + ')',                  \
-                df1.instance(),                                                \
-                df1.db()                                                       \
-            ),                                                                 \
-            df1.mesh(),                                                        \
-            df1.dimensions() Op dt2.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + OpName + dt2.name() + ')',                       \
+            (f1.dimensions() Op dt2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), df1.field(), dt2.value());                \
-    tres.ref().oriented() = df1.oriented();                                    \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, dt2);                                         \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -628,35 +648,33 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const Type2& t2                                                            \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return df1 Op dimensioned<Type2>(t2);                                      \
+    return f1 Op dimensioned<Type2>(s2);                                       \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                      \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
         (                                                                      \
-            tdf1,                                                              \
-            '(' + df1.name() + OpName + dt2.name() + ')',                      \
-            df1.dimensions() Op dt2.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + OpName + dt2.name() + ')',                       \
+            (f1.dimensions() Op dt2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref().field(), tdf1().field(), dt2.value());             \
-    tres.ref().oriented() = df1.oriented();                                    \
-                                                                               \
-    tdf1.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, dt2);                                         \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -664,11 +682,11 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const Type2& t2                                                            \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return tdf1 Op dimensioned<Type2>(t2);                                     \
+    return tf1 Op dimensioned<Type2>(s2);                                      \
 }
 
 #define BINARY_TYPE_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)     \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
index d7484d1729..a3157242f2 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,32 +31,46 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+void Func                                                                      \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df                                 \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1                           \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                   \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                   \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+void OpFunc                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1                                \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                          \
+    const DimensionedField<Type1, GeoMesh>& f1                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1                           \
 );
 
 
@@ -64,31 +79,39 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+void Func                                                                      \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );
 
 
@@ -97,62 +120,78 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+void Func                                                                      \
 (                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
     const dimensioned<Type1>& dt1,                                             \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
-(                                                                              \
-    const Type1& t1,                                                           \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const Type1& s1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+void Func                                                                      \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const Type2& t2                                                            \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
-(                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf2,                         \
-    const Type2& t2                                                            \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const Type2& s2                                                            \
 );
 
 
@@ -166,31 +205,39 @@ tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+void OpFunc                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );
 
 
@@ -199,62 +246,78 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+void OpFunc                                                                    \
 (                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
     const dimensioned<Type1>& dt1,                                             \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
-(                                                                              \
-    const Type1& t1,                                                           \
-    const DimensionedField<Type2, GeoMesh>& df2                                \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                          \
+    const Type1& s1,                                                           \
+    const DimensionedField<Type2, GeoMesh>& f2                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2                           \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+void OpFunc                                                                    \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const DimensionedField<Type1, GeoMesh>& df1,                               \
-    const Type2& t2                                                            \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
-(                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 (                                                                              \
-    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                         \
-    const Type2& t2                                                            \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const Type2& s2                                                            \
 );
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 4edd1b6f32..c1aae8ca0a 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,28 +35,51 @@ namespace Foam
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// One-parameter versions
 
 template<class TypeR, class Type1, class GeoMesh>
 struct reuseTmpDimensionedField
 {
+    //- Pass-through to New DimensionedField
     static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const DimensionedField<Type1, GeoMesh>& f1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const auto& df1 = tdf1();
+        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        (
+            IOobject
+            (
+                name,
+                f1.instance(),
+                f1.db()
+            ),
+            f1.mesh(),
+            dimensions
+        );
+    }
+
+    //- Dissimilar types: return new field
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
+    (
+        const tmp<DimensionedField<Type1, GeoMesh>>& tf1,
+        const word& name,
+        const dimensionSet& dimensions
+    )
+    {
+        const auto& f1 = tf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                df1.instance(),
-                df1.db()
+                f1.instance(),
+                f1.db()
             ),
-            df1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -70,38 +93,38 @@ struct reuseTmpDimensionedField<TypeR, TypeR, GeoMesh>
     //- for identical input and output types
     static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tf1,
         const word& name,
         const dimensionSet& dimensions,
         const bool initCopy = false
     )
     {
-        if (tdf1.movable())
+        if (tf1.movable())
         {
-            auto& df1 = tdf1.constCast();
+            auto& f1 = tf1.constCast();
 
-            df1.rename(name);
-            df1.dimensions().reset(dimensions);
-            return tdf1;
+            f1.rename(name);
+            f1.dimensions().reset(dimensions);
+            return tf1;
         }
 
-        const auto& df1 = tdf1();
+        const auto& f1 = tf1();
 
         auto tresult = tmp<DimensionedField<TypeR, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                df1.instance(),
-                df1.db()
+                f1.instance(),
+                f1.db()
             ),
-            df1.mesh(),
+            f1.mesh(),
             dimensions
         );
 
         if (initCopy)
         {
-            tresult.ref().field() = tdf1().field();
+            tresult.ref().field() = tf1().field();
         }
 
         return tresult;
@@ -113,7 +136,7 @@ struct reuseTmpDimensionedField<TypeR, TypeR, GeoMesh>
 template<class TypeR, class GeoMesh>
 tmp<DimensionedField<TypeR, GeoMesh>> New
 (
-    const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+    const tmp<DimensionedField<TypeR, GeoMesh>>& tf1,
     const word& name,
     const dimensionSet& dimensions,
     const bool initCopy = false
@@ -121,7 +144,7 @@ tmp<DimensionedField<TypeR, GeoMesh>> New
 {
     return reuseTmpDimensionedField<TypeR, TypeR, GeoMesh>::New
     (
-        tdf1,
+        tf1,
         name,
         dimensions,
         initCopy
@@ -134,23 +157,23 @@ struct reuseTmpTmpDimensionedField
 {
     static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const auto& df1 = tdf1();
+        const auto& f1 = tf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                df1.instance(),
-                df1.db()
+                f1.instance(),
+                f1.db()
             ),
-            df1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -162,32 +185,32 @@ struct reuseTmpTmpDimensionedField<TypeR, Type1, Type12, TypeR, GeoMesh>
 {
     static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        if (tdf2.movable())
+        if (tf2.movable())
         {
-            auto& df2 = tdf2.constCast();
+            auto& f2 = tf2.constCast();
 
-            df2.rename(name);
-            df2.dimensions().reset(dimensions);
-            return tdf2;
+            f2.rename(name);
+            f2.dimensions().reset(dimensions);
+            return tf2;
         }
 
-        const auto& df1 = tdf1();
+        const auto& f1 = tf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                df1.instance(),
-                df1.db()
+                f1.instance(),
+                f1.db()
             ),
-            df1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -199,32 +222,32 @@ struct reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, Type2, GeoMesh>
 {
     static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        if (tdf1.movable())
+        if (tf1.movable())
         {
-            auto& df1 = tdf1.constCast();
+            auto& f1 = tf1.constCast();
 
-            df1.rename(name);
-            df1.dimensions().reset(dimensions);
-            return tdf1;
+            f1.rename(name);
+            f1.dimensions().reset(dimensions);
+            return tf1;
         }
 
-        const auto& df1 = tdf1();
+        const auto& f1 = tf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                df1.instance(),
-                df1.db()
+                f1.instance(),
+                f1.db()
             ),
-            df1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -236,40 +259,40 @@ struct reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, TypeR, GeoMesh>
 {
     static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        if (tdf1.movable())
+        if (tf1.movable())
         {
-            auto& df1 = tdf1.constCast();
+            auto& f1 = tf1.constCast();
 
-            df1.rename(name);
-            df1.dimensions().reset(dimensions);
-            return tdf1;
+            f1.rename(name);
+            f1.dimensions().reset(dimensions);
+            return tf1;
         }
-        if (tdf2.movable())
+        if (tf2.movable())
         {
-            auto& df2 = tdf2.constCast();
+            auto& f2 = tf2.constCast();
 
-            df2.rename(name);
-            df2.dimensions().reset(dimensions);
-            return tdf2;
+            f2.rename(name);
+            f2.dimensions().reset(dimensions);
+            return tf2;
         }
 
-        const auto& df1 = tdf1();
+        const auto& f1 = tf1();
 
         return tmp<DimensionedField<TypeR, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                df1.instance(),
-                df1.db()
+                f1.instance(),
+                f1.db()
             ),
-            df1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 9be878df3d..abfeab9928 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,12 +90,9 @@ pow
     const FieldField<Field, Type>& f, typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
 
-    auto tres
-    (
-        FieldField<Field, powProductType>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
 
     pow<Type, r>(tres.ref(), f);
     return tres;
@@ -108,12 +105,9 @@ pow
     const tmp<FieldField<Field, Type>>& tf, typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, powProductType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     pow<Type, r>(tres.ref(), tf());
     tf.clear();
@@ -140,11 +134,10 @@ template<template<class> class Field, class Type>
 tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
 sqr(const FieldField<Field, Type>& f)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<FieldField<Field, outerProductType>> tres
-    (
-        FieldField<Field, outerProductType>::NewCalculatedType(f)
-    );
+    typedef typename outerProduct<Type, Type>::type resultType;
+
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
+
     sqr(tres.ref(), f);
     return tres;
 }
@@ -153,12 +146,9 @@ template<template<class> class Field, class Type>
 tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
 sqr(const tmp<FieldField<Field, Type>>& tf)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
+    typedef typename outerProduct<Type, Type>::type resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, outerProductType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     sqr(tres.ref(), tf());
     tf.clear();
@@ -185,12 +175,9 @@ template<template<class> class Field, class Type>
 tmp<FieldField<Field, typename typeOfMag<Type>::type>>
 magSqr(const FieldField<Field, Type>& f)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres
-    (
-        FieldField<Field, magType>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
 
     magSqr(tres.ref(), f);
     return tres;
@@ -200,12 +187,9 @@ template<template<class> class Field, class Type>
 tmp<FieldField<Field, typename typeOfMag<Type>::type>>
 magSqr(const tmp<FieldField<Field, Type>>& tf)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, magType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     magSqr(tres.ref(), tf());
     tf.clear();
@@ -232,12 +216,9 @@ template<template<class> class Field, class Type>
 tmp<FieldField<Field, typename typeOfMag<Type>::type>>
 mag(const FieldField<Field, Type>& f)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres
-    (
-        FieldField<Field, magType>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
 
     mag(tres.ref(), f);
     return tres;
@@ -247,12 +228,9 @@ template<template<class> class Field, class Type>
 tmp<FieldField<Field, typename typeOfMag<Type>::type>>
 mag(const tmp<FieldField<Field, Type>>& tf)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, magType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     mag(tres.ref(), tf());
     tf.clear();
@@ -281,12 +259,9 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
     const FieldField<Field, Type>& f
 )
 {
-    typedef typename FieldField<Field, Type>::cmptType cmptType;
+    typedef typename FieldField<Field, Type>::cmptType resultType;
 
-    auto tres
-    (
-        FieldField<Field, cmptType>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
 
     cmptMax(tres.ref(), f);
     return tres;
@@ -298,12 +273,9 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
     const tmp<FieldField<Field, Type>>& tf
 )
 {
-    typedef typename FieldField<Field, Type>::cmptType cmptType;
+    typedef typename FieldField<Field, Type>::cmptType resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, cmptType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     cmptMax(tres.ref(), tf());
     tf.clear();
@@ -332,12 +304,9 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
     const FieldField<Field, Type>& f
 )
 {
-    typedef typename FieldField<Field, Type>::cmptType cmptType;
+    typedef typename FieldField<Field, Type>::cmptType resultType;
 
-    auto tres
-    (
-        FieldField<Field, cmptType>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
 
     cmptMin(tres.ref(), f);
     return tres;
@@ -349,12 +318,9 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
     const tmp<FieldField<Field, Type>>& tf
 )
 {
-    typedef typename FieldField<Field, Type>::cmptType cmptType;
+    typedef typename FieldField<Field, Type>::cmptType resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, cmptType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     cmptMin(tres.ref(), tf());
     tf.clear();
@@ -383,12 +349,9 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
     const FieldField<Field, Type>& f
 )
 {
-    typedef typename FieldField<Field, Type>::cmptType cmptType;
+    typedef typename FieldField<Field, Type>::cmptType resultType;
 
-    auto tres
-    (
-        FieldField<Field, cmptType>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f);
 
     cmptAv(tres.ref(), f);
     return tres;
@@ -400,12 +363,9 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
     const tmp<FieldField<Field, Type>>& tf
 )
 {
-    typedef typename FieldField<Field, Type>::cmptType cmptType;
+    typedef typename FieldField<Field, Type>::cmptType resultType;
 
-    auto tres
-    (
-        reuseTmpFieldField<Field, cmptType, Type>::New(tf)
-    );
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf);
 
     cmptAv(tres.ref(), tf());
     tf.clear();
@@ -434,10 +394,7 @@ tmp<FieldField<Field, Type>> cmptMag
     const FieldField<Field, Type>& f
 )
 {
-    auto tres
-    (
-        FieldField<Field, Type>::NewCalculatedType(f)
-    );
+    auto tres = FieldField<Field, Type>::NewCalculatedType(f);
 
     cmptMag(tres.ref(), f);
     return tres;
@@ -456,12 +413,12 @@ tmp<FieldField<Field, Type>> cmptMag
 }
 
 
-#define TMP_UNARY_FUNCTION(returnType, func)                                   \
+#define TMP_UNARY_FUNCTION(ReturnType, Func)                                   \
                                                                                \
 template<template<class> class Field, class Type>                              \
-returnType func(const tmp<FieldField<Field, Type>>& tf1)                       \
+ReturnType Func(const tmp<FieldField<Field, Type>>& tf1)                       \
 {                                                                              \
-    returnType res = func(tf1());                                              \
+    ReturnType res = Func(tf1());                                              \
     tf1.clear();                                                               \
     return res;                                                                \
 }
@@ -529,9 +486,9 @@ TMP_UNARY_FUNCTION(Type, sum)
 template<template<class> class Field, class Type>
 typename typeOfMag<Type>::type sumMag(const FieldField<Field, Type>& f)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    magType result = Zero;
+    resultType result = Zero;
 
     const label loopLen = (f).size();
 
@@ -609,12 +566,12 @@ TMP_UNARY_FUNCTION(scalarMinMax, minMaxMag)
 
 
 // With reduction on ReturnType
-#define G_UNARY_FUNCTION(ReturnType, gFunc, func, rFunc)                       \
+#define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                       \
                                                                                \
 template<template<class> class Field, class Type>                              \
 ReturnType gFunc(const FieldField<Field, Type>& f)                             \
 {                                                                              \
-    ReturnType res = func(f);                                                  \
+    ReturnType res = Func(f);                                                  \
     reduce(res, rFunc##Op<ReturnType>());                                      \
     return res;                                                                \
 }                                                                              \
@@ -653,7 +610,7 @@ Type gAverage(const FieldField<Field, Type>& f)
     }
 
     WarningInFunction
-        << "empty fieldField, returning zero" << endl;
+        << "Empty FieldField, returning zero" << endl;
 
     return Zero;
 }
@@ -676,7 +633,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
-/* * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * */
+/* * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * */
 
 UNARY_OPERATOR(Type, Type, -, negate)
 
@@ -692,7 +649,7 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
                                                                                \
 template                                                                       \
 <                                                                              \
@@ -701,7 +658,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     FieldField<Field1, typename product<Type1, Type2>::type>& f,               \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -712,7 +669,7 @@ void opFunc                                                                    \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        opFunc(f[i], f1[i], f2[i]);                                            \
+        OpFunc(f[i], f1[i], f2[i]);                                            \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -724,35 +681,29 @@ template                                                                       \
     class Type2                                                                \
 >                                                                              \
 tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
     const FieldField<Field2, Type2>& f2                                        \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tres                                  \
-    (                                                                          \
-        FieldField<Field1, productType>::NewCalculatedType(f1)                 \
-    );                                                                         \
-    opFunc(tres.ref(), f1, f2);                                                \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = FieldField<Field1, resultType>::NewCalculatedType(f1);         \
+    OpFunc(tres.ref(), f1, f2);                                                \
     return tres;                                                               \
 }                                                                              \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
 tmp<FieldField<Field, typename product<Type1, Type2>::type>>                   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field, productType>> tres                                   \
-    (                                                                          \
-        reuseTmpFieldField<Field, productType, Type2>::New(tf2)                \
-    );                                                                         \
-    opFunc(tres.ref(), f1, tf2());                                             \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = reuseTmpFieldField<Field, resultType, Type2>::New(tf2);        \
+    OpFunc(tres.ref(), f1, tf2());                                             \
     tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
@@ -765,18 +716,15 @@ template                                                                       \
     class Type2                                                                \
 >                                                                              \
 tmp<FieldField<Field, typename product<Type1, Type2>::type>>                   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
     const tmp<FieldField<Field2, Type2>>& tf2                                  \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tres                                  \
-    (                                                                          \
-        FieldField<Field1, productType>::NewCalculatedType(f1)                 \
-    );                                                                         \
-    opFunc(tres.ref(), f1, tf2());                                             \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = FieldField<Field1, resultType>::NewCalculatedType(f1);         \
+    OpFunc(tres.ref(), f1, tf2());                                             \
     tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
@@ -789,18 +737,15 @@ template                                                                       \
     class Type2                                                                \
 >                                                                              \
 tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const tmp<FieldField<Field1, Type1>>& tf1,                                 \
     const FieldField<Field2, Type2>& f2                                        \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tres                                  \
-    (                                                                          \
-        reuseTmpFieldField<Field1, productType, Type1>::New(tf1)               \
-    );                                                                         \
-    opFunc(tres.ref(), tf1(), f2);                                             \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = reuseTmpFieldField<Field1, resultType, Type1>::New(tf1);       \
+    OpFunc(tres.ref(), tf1(), f2);                                             \
     tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
@@ -813,19 +758,19 @@ template                                                                       \
     class Type2                                                                \
 >                                                                              \
 tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                  \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const tmp<FieldField<Field1, Type1>>& tf1,                                 \
     const tmp<FieldField<Field2, Type2>>& tf2                                  \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType>> tres                                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres                                                                  \
     (                                                                          \
-        reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::New   \
+        reuseTmpTmpFieldField<Field1, resultType, Type1, Type1, Type2>::New    \
         (tf1, tf2)                                                             \
     );                                                                         \
-    opFunc(tres.ref(), tf1(), tf2());                                          \
+    OpFunc(tres.ref(), tf1(), tf2());                                          \
     tf1.clear();                                                               \
     tf2.clear();                                                               \
     return tres;                                                               \
@@ -839,18 +784,18 @@ template                                                                       \
     class Cmpt,                                                                \
     direction nCmpt                                                            \
 >                                                                              \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, typename product<Type, Form>::type>& f,                  \
+    FieldField<Field, typename product<Type, Form>::type>& result,             \
     const FieldField<Field, Type>& f1,                                         \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        opFunc(f[i], f1[i], vs);                                               \
+        OpFunc(result[i], f1[i], vs);                                          \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -863,18 +808,15 @@ template                                                                       \
     direction nCmpt                                                            \
 >                                                                              \
 tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType>> tres                                   \
-    (                                                                          \
-        FieldField<Field, productType>::NewCalculatedType(f1)                  \
-    );                                                                         \
-    opFunc(tres.ref(), f1, static_cast<const Form&>(vs));                      \
+    typedef typename product<Type, Form>::type resultType;                     \
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f1);          \
+    OpFunc(tres.ref(), f1, static_cast<const Form&>(vs));                      \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -887,18 +829,15 @@ template                                                                       \
     direction nCmpt                                                            \
 >                                                                              \
 tmp<FieldField<Field, typename product<Type, Form>::type>>                     \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const tmp<FieldField<Field, Type>>& tf1,                                   \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType>> tres                                   \
-    (                                                                          \
-        reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
-    );                                                                         \
-    opFunc(tres.ref(), tf1(), static_cast<const Form&>(vs));                   \
+    typedef typename product<Type, Form>::type resultType;                     \
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf1);         \
+    OpFunc(tres.ref(), tf1(), static_cast<const Form&>(vs));                   \
     tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
@@ -911,18 +850,18 @@ template                                                                       \
     class Cmpt,                                                                \
     direction nCmpt                                                            \
 >                                                                              \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, typename product<Form, Type>::type>& f,                  \
+    FieldField<Field, typename product<Form, Type>::type>& result,             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
     const FieldField<Field, Type>& f1                                          \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        opFunc(f[i], vs, f1[i]);                                               \
+        OpFunc(result[i], vs, f1[i]);                                          \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -935,18 +874,15 @@ template                                                                       \
     direction nCmpt                                                            \
 >                                                                              \
 tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
     const FieldField<Field, Type>& f1                                          \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType>> tres                                   \
-    (                                                                          \
-        FieldField<Field, productType>::NewCalculatedType(f1)                  \
-    );                                                                         \
-    opFunc(tres.ref(), static_cast<const Form&>(vs), f1);                      \
+    typedef typename product<Form, Type>::type resultType;                     \
+    auto tres = FieldField<Field, resultType>::NewCalculatedType(f1);          \
+    OpFunc(tres.ref(), static_cast<const Form&>(vs), f1);                      \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -959,18 +895,15 @@ template                                                                       \
     direction nCmpt                                                            \
 >                                                                              \
 tmp<FieldField<Field, typename product<Form, Type>::type>>                     \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
     const tmp<FieldField<Field, Type>>& tf1                                    \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType>> tres                                   \
-    (                                                                          \
-        reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
-    );                                                                         \
-    opFunc(tres.ref(), static_cast<const Form&>(vs), tf1());                   \
+    typedef typename product<Form, Type>::type resultType;                     \
+    auto tres = reuseTmpFieldField<Field, resultType, Type>::New(tf1);         \
+    OpFunc(tres.ref(), static_cast<const Form&>(vs), tf1());                   \
     tf1.clear();                                                               \
     return tres;                                                               \
 }
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index a9a7084e97..b1b0501e95 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -290,7 +290,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
-/* * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * */
+/* * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * */
 
 UNARY_OPERATOR(Type, Type, -, negate)
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index 500cd8d54e..d2dc88ce0b 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,92 +31,86 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type, Func)                                 \
+#define UNARY_FUNCTION(ReturnType, Type1, Func)                                \
                                                                                \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& res,                                        \
-    const FieldField<Field, Type>& f                                           \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1                                         \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (res).size();                                        \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        Func(res[i], f[i]);                                                    \
+        Func(result[i], f1[i]);                                                \
     }                                                                          \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
-    const FieldField<Field, Type>& f                                           \
+    const FieldField<Field, Type1>& f1                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, ReturnType>::NewCalculatedType(f)                    \
-    );                                                                         \
-    Func(tres.ref(), f);                                                       \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
+    Func(tres.ref(), f1);                                                      \
     return tres;                                                               \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
-    const tmp<FieldField<Field, Type>>& tf                                     \
+    const tmp<FieldField<Field, Type1>>& tf1                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres(New(tf));                          \
-    Func(tres.ref(), tf());                                                    \
-    tf.clear();                                                                \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
+    Func(tres.ref(), tf1());                                                   \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type, Op, OpFunc)                           \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                          \
                                                                                \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& res,                                        \
-    const FieldField<Field, Type>& f                                           \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1                                         \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (res).size();                                        \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        OpFunc(res[i], f[i]);                                                  \
+        OpFunc(result[i], f1[i]);                                              \
     }                                                                          \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
-    const FieldField<Field, Type>& f                                           \
+    const FieldField<Field, Type1>& f1                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, Type>::NewCalculatedType(f)                          \
-    );                                                                         \
-    OpFunc(tres.ref(), f);                                                     \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
+    OpFunc(tres.ref(), f1);                                                    \
     return tres;                                                               \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
-    const tmp<FieldField<Field, Type>>& tf                                     \
+    const tmp<FieldField<Field, Type1>>& tf1                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres(New(tf));                          \
-    OpFunc(tres.ref(), tf());                                                  \
-    tf.clear();                                                                \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
+    OpFunc(tres.ref(), tf1());                                                 \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -128,16 +122,16 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        Func(f[i], f1[i], f2[i]);                                              \
+        Func(result[i], f1[i], f2[i]);                                         \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -148,10 +142,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, Type1>::NewCalculatedType(f1)                        \
-    );                                                                         \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
     Func(tres.ref(), f1, f2);                                                  \
     return tres;                                                               \
 }                                                                              \
@@ -163,10 +154,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
-    );                                                                         \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2);        \
     Func(tres.ref(), f1, tf2());                                               \
     tf2.clear();                                                               \
     return tres;                                                               \
@@ -179,10 +167,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
-    );                                                                         \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
     Func(tres.ref(), tf1(), f2);                                               \
     tf1.clear();                                                               \
     return tres;                                                               \
@@ -195,7 +180,7 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
+    auto tres                                                                  \
     (                                                                          \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
             New(tf1, tf2)                                                      \
@@ -214,46 +199,40 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
-    const Type1& s,                                                            \
+    FieldField<Field, ReturnType>& result,                                     \
+    const Type1& s1,                                                           \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        Func(f[i], s, f2[i]);                                                  \
+        Func(result[i], s1, f2[i]);                                            \
     }                                                                          \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
-    const Type1& s,                                                            \
+    const Type1& s1,                                                           \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, Type2>::NewCalculatedType(f2)                        \
-    );                                                                         \
-    Func(tres.ref(), s, f2);                                                   \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f2);          \
+    Func(tres.ref(), s1, f2);                                                  \
     return tres;                                                               \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
-    const Type1& s,                                                            \
+    const Type1& s1,                                                           \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
-    );                                                                         \
-    Func(tres.ref(), s, tf2());                                                \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2);        \
+    Func(tres.ref(), s1, tf2());                                               \
     tf2.clear();                                                               \
     return tres;                                                               \
 }
@@ -264,16 +243,16 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        Func(f[i], f1[i], s);                                                  \
+        Func(result[i], f1[i], s2);                                            \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -281,14 +260,11 @@ TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, Type1>::NewCalculatedType(f1)                        \
-    );                                                                         \
-    Func(tres.ref(), f1, s);                                                   \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
+    Func(tres.ref(), f1, s2);                                                  \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -296,14 +272,11 @@ TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const tmp<FieldField<Field, Type1>>& tf1,                                  \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
-    );                                                                         \
-    Func(tres.ref(), tf1(), s);                                                \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
+    Func(tres.ref(), tf1(), s2);                                               \
     tf1.clear();                                                               \
     return tres;                                                               \
 }
@@ -321,16 +294,16 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        OpFunc(f[i], f1[i], f2[i]);                                            \
+        OpFunc(result[i], f1[i], f2[i]);                                       \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -341,10 +314,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, ReturnType>::NewCalculatedType(f1)                   \
-    );                                                                         \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
     OpFunc(tres.ref(), f1, f2);                                                \
     return tres;                                                               \
 }                                                                              \
@@ -356,10 +326,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
-    );                                                                         \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2);        \
     OpFunc(tres.ref(), f1, tf2());                                             \
     tf2.clear();                                                               \
     return tres;                                                               \
@@ -372,10 +339,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
-    );                                                                         \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
     OpFunc(tres.ref(), tf1(), f2);                                             \
     tf1.clear();                                                               \
     return tres;                                                               \
@@ -388,7 +352,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
+    auto tres                                                                  \
     (                                                                          \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
             New(tf1, tf2)                                                      \
@@ -407,46 +371,40 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
-    const Type1& s,                                                            \
+    FieldField<Field, ReturnType>& result,                                     \
+    const Type1& s1,                                                           \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        OpFunc(f[i], s, f2[i]);                                                \
+        OpFunc(result[i], s1, f2[i]);                                          \
     }                                                                          \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
-    const Type1& s,                                                            \
+    const Type1& s1,                                                           \
     const FieldField<Field, Type2>& f2                                         \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, Type2>::NewCalculatedType(f2)                        \
-    );                                                                         \
-    OpFunc(tres.ref(), s, f2);                                                 \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f2);          \
+    OpFunc(tres.ref(), s1, f2);                                                \
     return tres;                                                               \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
-    const Type1& s,                                                            \
+    const Type1& s1,                                                           \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                 \
-    );                                                                         \
-    OpFunc(tres.ref(), s, tf2());                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2);        \
+    OpFunc(tres.ref(), s1, tf2());                                             \
     tf2.clear();                                                               \
     return tres;                                                               \
 }
@@ -457,16 +415,16 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    const label loopLen = (f).size();                                          \
+    const label loopLen = (result).size();                                     \
                                                                                \
     for (label i = 0; i < loopLen; ++i)                                        \
     {                                                                          \
-        OpFunc(f[i], f1[i], s);                                                \
+        OpFunc(result[i], f1[i], s2);                                          \
     }                                                                          \
 }                                                                              \
                                                                                \
@@ -474,14 +432,11 @@ TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        FieldField<Field, Type1>::NewCalculatedType(f1)                        \
-    );                                                                         \
-    OpFunc(tres.ref(), f1, s);                                                 \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
+    OpFunc(tres.ref(), f1, s2);                                                \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -489,14 +444,11 @@ TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
     const tmp<FieldField<Field, Type1>>& tf1,                                  \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    tmp<FieldField<Field, ReturnType>> tres                                    \
-    (                                                                          \
-        reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                 \
-    );                                                                         \
-    OpFunc(tres.ref(), tf1(), s);                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
+    OpFunc(tres.ref(), tf1(), s2);                                             \
     tf1.clear();                                                               \
     return tres;                                                               \
 }
@@ -506,4 +458,5 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpFunc)              \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
index 1771f2365a..1e3b0501e8 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,9 +25,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    High performance macro functions for Field\<Type\> algebra.
-    These expand using either array element access (for vector machines)
-    or pointer dereferencing for scalar machines as appropriate.
+    Macro functions for FieldField\<Type\> algebra.
 
 \*---------------------------------------------------------------------------*/
 
@@ -37,20 +36,20 @@ Description
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& res,                                        \
-    const FieldField<Field, Type1>& f                                          \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
-    const FieldField<Field, Type1>& f                                          \
+    const FieldField<Field, Type1>& f1                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
-    const tmp<FieldField<Field, Type1>>& tf                                    \
+    const tmp<FieldField<Field, Type1>>& tf1                                   \
 );
 
 
@@ -61,20 +60,20 @@ tmp<FieldField<Field, ReturnType>> Func                                        \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& res,                                        \
-    const FieldField<Field, Type1>& f                                          \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
-    const FieldField<Field, Type1>& f                                          \
+    const FieldField<Field, Type1>& f1                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<FieldField<Field, ReturnType>> operator Op                                 \
 (                                                                              \
-    const tmp<FieldField<Field, Type1>>& tf                                    \
+    const tmp<FieldField<Field, Type1>>& tf1                                   \
 );
 
 
@@ -83,36 +82,36 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
                                                                                \
 TEMPLATE                                                                       \
-void func                                                                      \
+void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
     const FieldField<Field, Type2>& f2                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
     const FieldField<Field, Type2>& f2                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const tmp<FieldField<Field, Type1>>& tf1,                                  \
     const FieldField<Field, Type2>& f2                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const tmp<FieldField<Field, Type1>>& tf1,                                  \
     const tmp<FieldField<Field, Type2>>& tf2                                   \
@@ -124,22 +123,22 @@ tmp<FieldField<Field, ReturnType>> func                                        \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
-void func                                                                      \
+void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const Type1& s1,                                                           \
     const FieldField<Field, Type2>& f2                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const Type1& s1,                                                           \
     const FieldField<Field, Type1>& f2                                         \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const Type1& s1,                                                           \
     const tmp<FieldField<Field, Type1>>& tf2                                   \
@@ -149,25 +148,25 @@ tmp<FieldField<Field, ReturnType>> func                                        \
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
-void func                                                                      \
+void Func                                                                      \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
-tmp<FieldField<Field, ReturnType>> func                                        \
+tmp<FieldField<Field, ReturnType>> Func                                        \
 (                                                                              \
     const tmp<FieldField<Field, Type1>>& tf1,                                  \
-    const Type2& s                                                             \
+    const Type2& s2                                                            \
 );
 
 
@@ -183,7 +182,7 @@ tmp<FieldField<Field, ReturnType>> func                                        \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
     const FieldField<Field, Type2>& f2                                         \
 );                                                                             \
@@ -224,7 +223,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const Type1& s1,                                                           \
     const FieldField<Field, Type2>& f2                                         \
 );                                                                             \
@@ -249,7 +248,7 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    FieldField<Field, ReturnType>& f,                                          \
+    FieldField<Field, ReturnType>& result,                                     \
     const FieldField<Field, Type1>& f1,                                        \
     const Type2& s2                                                            \
 );                                                                             \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index f0bff7dead..7e51d03daf 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,10 +35,21 @@ namespace Foam
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// One-parameter versions
 
 template<template<class> class Field, class TypeR, class Type1>
 struct reuseTmpFieldField
 {
+    //- Pass-through to NewCalculatedType
+    static tmp<FieldField<Field, TypeR>> New
+    (
+        const FieldField<Field, Type1>& f1
+    )
+    {
+        return FieldField<Field, TypeR>::NewCalculatedType(f1);
+    }
+
+    //- Dissimilar types: just use size
     static tmp<FieldField<Field, TypeR>> New
     (
         const tmp<FieldField<Field, Type1>>& tf1
@@ -52,6 +63,8 @@ struct reuseTmpFieldField
 template<template<class> class Field, class TypeR>
 struct reuseTmpFieldField<Field, TypeR, TypeR>
 {
+    //- Identical input and return types:
+    //- allow optional copy assignment of the initial content
     static tmp<FieldField<Field, TypeR>> New
     (
         const tmp<FieldField<Field, TypeR>>& tf1,
@@ -63,19 +76,19 @@ struct reuseTmpFieldField<Field, TypeR, TypeR>
             return tf1;
         }
 
-        auto rtf = FieldField<Field, TypeR>::NewCalculatedType(tf1());
+        auto tresult = FieldField<Field, TypeR>::NewCalculatedType(tf1());
 
         if (initCopy)
         {
-            rtf.ref() = tf1();
+            tresult.ref() = tf1();
         }
 
-        return rtf;
+        return tresult;
     }
 };
 
 
-//- Global function forwards to reuseTmpFieldField::New
+//- This global function forwards to reuseTmpFieldField::New
 template<template<class> class Field, class TypeR>
 tmp<FieldField<Field, TypeR>> New
 (
@@ -87,6 +100,9 @@ tmp<FieldField<Field, TypeR>> New
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Two-parameter versions
+
 template
 <
     template<class> class Field,
@@ -97,6 +113,7 @@ template
 >
 struct reuseTmpTmpFieldField
 {
+    //- Dissimilar types: just use size
     static tmp<FieldField<Field, TypeR>> New
     (
         const tmp<FieldField<Field, Type1>>& tf1,
@@ -111,6 +128,7 @@ struct reuseTmpTmpFieldField
 template<template<class> class Field, class TypeR, class Type1, class Type12>
 struct reuseTmpTmpFieldField<Field, TypeR, Type1, Type12, TypeR>
 {
+    //- Second input has return type
     static tmp<FieldField<Field, TypeR>> New
     (
         const tmp<FieldField<Field, Type1>>& tf1,
@@ -130,6 +148,7 @@ struct reuseTmpTmpFieldField<Field, TypeR, Type1, Type12, TypeR>
 template<template<class> class Field, class TypeR, class Type2>
 struct reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, Type2>
 {
+    //- First input has return type
     static tmp<FieldField<Field, TypeR>> New
     (
         const tmp<FieldField<Field, TypeR>>& tf1,
@@ -149,6 +168,7 @@ struct reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, Type2>
 template<template<class> class Field, class TypeR>
 struct reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, TypeR>
 {
+    //- Both inputs have return type
     static tmp<FieldField<Field, TypeR>> New
     (
         const tmp<FieldField<Field, TypeR>>& tf1,
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index d3576ac210..f3e136c2e9 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -42,38 +42,40 @@ namespace Foam
 template<class Type>
 void component
 (
-    Field<typename Field<Type>::cmptType>& res,
-    const UList<Type>& f,
+    Field<typename Field<Type>::cmptType>& result,
+    const UList<Type>& f1,
     const direction d
 )
 {
-    typedef typename Field<Type>::cmptType cmptType;
+    typedef typename Field<Type>::cmptType resultType;
+
     TFOR_ALL_F_OP_F_FUNC_S
     (
-        cmptType, res, =, Type, f, .component, const direction, d
+        resultType, result, =, Type, f1, .component, const direction, d
     )
 }
 
 
 template<class Type>
-void T(Field<Type>& res, const UList<Type>& f)
+void T(Field<Type>& result, const UList<Type>& f1)
 {
-    TFOR_ALL_F_OP_F_FUNC(Type, res, =, Type, f, T)
+    TFOR_ALL_F_OP_F_FUNC(Type, result, =, Type, f1, T)
 }
 
 
 template<class Type, direction r>
 void pow
 (
-    Field<typename powProduct<Type, r>::type>& res,
-    const UList<Type>& vf
+    Field<typename powProduct<Type, r>::type>& result,
+    const UList<Type>& f1
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
+
     TFOR_ALL_F_OP_FUNC_F_S
     (
-        powProductType, res, =, pow, Type, vf, powProductType,
-        pTraits<powProductType>::zero
+        resultType, result, =, pow, Type, f1, resultType,
+        pTraits<resultType>::zero
     )
 }
 
@@ -81,16 +83,13 @@ template<class Type, direction r>
 tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
-    const UList<Type>& f,
+    const UList<Type>& f1,
     typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
-    auto tres
-    (
-        tmp<Field<powProductType>>::New(f.size())
-    );
-    pow<Type, r>(tres.ref(), f);
+    typedef typename powProduct<Type, r>::type resultType;
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    pow<Type, r>(tres.ref(), f1);
     return tres;
 }
 
@@ -98,14 +97,14 @@ template<class Type, direction r>
 tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<Field<Type>>& tf,
+    const tmp<Field<Type>>& tf1,
     typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
-    auto tres = reuseTmp<powProductType, Type>::New(tf);
-    pow<Type, r>(tres.ref(), tf());
-    tf.clear();
+    typedef typename powProduct<Type, r>::type resultType;
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    pow<Type, r>(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
@@ -113,35 +112,33 @@ pow
 template<class Type>
 void sqr
 (
-    Field<typename outerProduct<Type, Type>::type>& res,
-    const UList<Type>& vf
+    Field<typename outerProduct<Type, Type>::type>& result,
+    const UList<Type>& f1
 )
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
-    TFOR_ALL_F_OP_FUNC_F(outerProductType, res, =, sqr, Type, vf)
+    typedef typename outerProduct<Type, Type>::type resultType;
+
+    TFOR_ALL_F_OP_FUNC_F(resultType, result, =, sqr, Type, f1)
 }
 
 template<class Type>
 tmp<Field<typename outerProduct<Type, Type>::type>>
-sqr(const UList<Type>& f)
+sqr(const UList<Type>& f1)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
-    auto tres
-    (
-        tmp<Field<outerProductType>>::New(f.size())
-    );
-    sqr(tres.ref(), f);
+    typedef typename outerProduct<Type, Type>::type resultType;
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    sqr(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
 tmp<Field<typename outerProduct<Type, Type>::type>>
-sqr(const tmp<Field<Type>>& tf)
+sqr(const tmp<Field<Type>>& tf1)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
-    auto tres = reuseTmp<outerProductType, Type>::New(tf);
-    sqr(tres.ref(), tf());
-    tf.clear();
+    typedef typename outerProduct<Type, Type>::type resultType;
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    sqr(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
@@ -149,35 +146,35 @@ sqr(const tmp<Field<Type>>& tf)
 template<class Type>
 void magSqr
 (
-    Field<typename typeOfMag<Type>::type>& res,
-    const UList<Type>& f
+    Field<typename typeOfMag<Type>::type>& result,
+    const UList<Type>& f1
 )
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    TFOR_ALL_F_OP_FUNC_F(magType, res, =, magSqr, Type, f)
+    TFOR_ALL_F_OP_FUNC_F(resultType, result, =, magSqr, Type, f1)
 }
 
 template<class Type>
 tmp<Field<typename typeOfMag<Type>::type>>
-magSqr(const UList<Type>& f)
+magSqr(const UList<Type>& f1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres = tmp<Field<magType>>::New(f.size());
-    magSqr(tres.ref(), f);
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    magSqr(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
 tmp<Field<typename typeOfMag<Type>::type>>
-magSqr(const tmp<Field<Type>>& tf)
+magSqr(const tmp<Field<Type>>& tf1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres = reuseTmp<magType, Type>::New(tf);
-    magSqr(tres.ref(), tf());
-    tf.clear();
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    magSqr(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
@@ -185,164 +182,179 @@ magSqr(const tmp<Field<Type>>& tf)
 template<class Type>
 void mag
 (
-    Field<typename typeOfMag<Type>::type>& res,
-    const UList<Type>& f
+    Field<typename typeOfMag<Type>::type>& result,
+    const UList<Type>& f1
 )
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    TFOR_ALL_F_OP_FUNC_F(magType, res, =, mag, Type, f)
+    TFOR_ALL_F_OP_FUNC_F(resultType, result, =, mag, Type, f1)
 }
 
 template<class Type>
 tmp<Field<typename typeOfMag<Type>::type>>
-mag(const UList<Type>& f)
+mag(const UList<Type>& f1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres = tmp<Field<magType>>::New(f.size());
-    mag(tres.ref(), f);
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    mag(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
 tmp<Field<typename typeOfMag<Type>::type>>
-mag(const tmp<Field<Type>>& tf)
+mag(const tmp<Field<Type>>& tf1)
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
-    auto tres = reuseTmp<magType, Type>::New(tf);
-    mag(tres.ref(), tf());
-    tf.clear();
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    mag(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type>
-void cmptMax(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
+void cmptMax
+(
+    Field<typename Field<Type>::cmptType>& result,
+    const UList<Type>& f1
+)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    TFOR_ALL_F_OP_FUNC_F(cmptType, res, =, cmptMax, Type, f)
+    typedef typename Field<Type>::cmptType resultType;
+
+    TFOR_ALL_F_OP_FUNC_F(resultType, result, =, cmptMax, Type, f1)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f1)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    auto tres = tmp<Field<cmptType>>::New(f.size());
-    cmptMax(tres.ref(), f);
+    typedef typename Field<Type>::cmptType resultType;
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    cmptMax(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType>> cmptMax(const tmp<Field<Type>>& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const tmp<Field<Type>>& tf1)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    auto tres = reuseTmp<cmptType, Type>::New(tf);
-    cmptMax(tres.ref(), tf());
-    tf.clear();
+    typedef typename Field<Type>::cmptType resultType;
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    cmptMax(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type>
-void cmptMin(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
+void cmptMin
+(
+    Field<typename Field<Type>::cmptType>& result,
+    const UList<Type>& f1
+)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    TFOR_ALL_F_OP_FUNC_F(cmptType, res, =, cmptMin, Type, f)
+    typedef typename Field<Type>::cmptType resultType;
+
+    TFOR_ALL_F_OP_FUNC_F(resultType, result, =, cmptMin, Type, f1)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f1)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    auto tres = tmp<Field<cmptType>>::New(f.size());
-    cmptMin(tres.ref(), f);
+    typedef typename Field<Type>::cmptType resultType;
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    cmptMin(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType>> cmptMin(const tmp<Field<Type>>& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const tmp<Field<Type>>& tf1)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    auto tres = reuseTmp<cmptType, Type>::New(tf);
-    cmptMin(tres.ref(), tf());
-    tf.clear();
+    typedef typename Field<Type>::cmptType resultType;
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    cmptMin(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type>
-void cmptAv(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
+void cmptAv
+(
+    Field<typename Field<Type>::cmptType>& result,
+    const UList<Type>& f1
+)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    TFOR_ALL_F_OP_FUNC_F(cmptType, res, =, cmptAv, Type, f)
+    typedef typename Field<Type>::cmptType resultType;
+
+    TFOR_ALL_F_OP_FUNC_F(resultType, result, =, cmptAv, Type, f1)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f1)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    auto tres = tmp<Field<cmptType>>::New(f.size());
-    cmptAv(tres.ref(), f);
+    typedef typename Field<Type>::cmptType resultType;
+    auto tres = tmp<Field<resultType>>::New(f1.size());
+    cmptAv(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf1)
 {
-    typedef typename Field<Type>::cmptType cmptType;
-    auto tres = reuseTmp<cmptType, Type>::New(tf);
-    cmptAv(tres.ref(), tf());
-    tf.clear();
+    typedef typename Field<Type>::cmptType resultType;
+    auto tres = reuseTmp<resultType, Type>::New(tf1);
+    cmptAv(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type>
-void cmptMag(Field<Type>& res, const UList<Type>& f)
+void cmptMag(Field<Type>& result, const UList<Type>& f1)
 {
-    TFOR_ALL_F_OP_FUNC_F(Type, res, =, cmptMag, Type, f)
+    TFOR_ALL_F_OP_FUNC_F(Type, result, =, cmptMag, Type, f1)
 }
 
 template<class Type>
-tmp<Field<Type>> cmptMag(const UList<Type>& f)
+tmp<Field<Type>> cmptMag(const UList<Type>& f1)
 {
-    auto tres = tmp<Field<Type>>::New(f.size());
-    cmptMag(tres.ref(), f);
+    auto tres = tmp<Field<Type>>::New(f1.size());
+    cmptMag(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
-tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf)
+tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf1)
 {
-    auto tres = New(tf);
-    cmptMag(tres.ref(), tf());
-    tf.clear();
+    auto tres = New(tf1);
+    cmptMag(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
 
 template<class Type>
-void cmptMagSqr(Field<Type>& res, const UList<Type>& f)
+void cmptMagSqr(Field<Type>& result, const UList<Type>& f1)
 {
-    TFOR_ALL_F_OP_FUNC_F(Type, res, =, cmptMagSqr, Type, f)
+    TFOR_ALL_F_OP_FUNC_F(Type, result, =, cmptMagSqr, Type, f1)
 }
 
 template<class Type>
-tmp<Field<Type>> cmptMagSqr(const UList<Type>& f)
+tmp<Field<Type>> cmptMagSqr(const UList<Type>& f1)
 {
-    auto tres = tmp<Field<Type>>::New(f.size());
-    cmptMagSqr(tres.ref(), f);
+    auto tres = tmp<Field<Type>>::New(f1.size());
+    cmptMagSqr(tres.ref(), f1);
     return tres;
 }
 
 template<class Type>
-tmp<Field<Type>> cmptMagSqr(const tmp<Field<Type>>& tf)
+tmp<Field<Type>> cmptMagSqr(const tmp<Field<Type>>& tf1)
 {
-    auto tres = New(tf);
-    cmptMagSqr(tres.ref(), tf());
-    tf.clear();
+    auto tres = New(tf1);
+    cmptMagSqr(tres.ref(), tf1());
+    tf1.clear();
     return tres;
 }
 
@@ -358,13 +370,13 @@ ReturnType Func(const tmp<Field<Type>>& tf1)                                   \
 }
 
 template<class Type>
-Type max(const UList<Type>& f)
+Type max(const UList<Type>& f1)
 {
-    if (f.size())
+    if (f1.size())
     {
-        Type Max(f[0]);
-        TFOR_ALL_S_OP_FUNC_F_S(Type, Max, =, max, Type, f, Type, Max)
-        return Max;
+        Type result(f1[0]);
+        TFOR_ALL_S_OP_FUNC_F_S(Type, result, =, max, Type, f1, Type, result)
+        return result;
     }
 
     return pTraits<Type>::min;
@@ -373,13 +385,13 @@ Type max(const UList<Type>& f)
 TMP_UNARY_FUNCTION(Type, max)
 
 template<class Type>
-Type min(const UList<Type>& f)
+Type min(const UList<Type>& f1)
 {
-    if (f.size())
+    if (f1.size())
     {
-        Type Min(f[0]);
-        TFOR_ALL_S_OP_FUNC_F_S(Type, Min, =, min, Type, f, Type, Min)
-        return Min;
+        Type result(f1[0]);
+        TFOR_ALL_S_OP_FUNC_F_S(Type, result, =, min, Type, f1, Type, result)
+        return result;
     }
 
     return pTraits<Type>::max;
@@ -388,18 +400,19 @@ Type min(const UList<Type>& f)
 TMP_UNARY_FUNCTION(Type, min)
 
 template<class Type>
-Type sum(const UList<Type>& f)
+Type sum(const UList<Type>& f1)
 {
-    typedef typename Foam::typeOfSolve<Type>::type solveType;
+    typedef typename Foam::typeOfSolve<Type>::type resultType;
 
-    solveType Sum = Zero;
+    resultType result = Zero;
 
-    if (f.size())
+    if (f1.size())
     {
-        TFOR_ALL_S_OP_FUNC_F(solveType, Sum, +=, solveType, Type, f)
+        // Use resultType() as functional cast
+        TFOR_ALL_S_OP_FUNC_F(resultType, result, +=, resultType, Type, f1)
     }
 
-    return Type(Sum);
+    return Type(result);
 }
 
 TMP_UNARY_FUNCTION(Type, sum)
@@ -414,23 +427,23 @@ TMP_UNARY_FUNCTION(scalarMinMax, minMaxMag)
 
 
 template<class Type>
-Type maxMagSqr(const UList<Type>& f)
+Type maxMagSqr(const UList<Type>& f1)
 {
-    if (f.size())
+    if (f1.size())
     {
-        Type Max(f[0]);
+        Type result(f1[0]);
         TFOR_ALL_S_OP_FUNC_F_S
         (
             Type,
-            Max,
+            result,
             =,
             maxMagSqrOp<Type>(),
             Type,
-            f,
+            f1,
             Type,
-            Max
+            result
         )
-        return Max;
+        return result;
     }
 
     return Zero;
@@ -439,23 +452,23 @@ Type maxMagSqr(const UList<Type>& f)
 TMP_UNARY_FUNCTION(Type, maxMagSqr)
 
 template<class Type>
-Type minMagSqr(const UList<Type>& f)
+Type minMagSqr(const UList<Type>& f1)
 {
-    if (f.size())
+    if (f1.size())
     {
-        Type Min(f[0]);
+        Type result(f1[0]);
         TFOR_ALL_S_OP_FUNC_F_S
         (
             Type,
-            Min,
+            result,
             =,
             minMagSqrOp<Type>(),
             Type,
-            f,
+            f1,
             Type,
-            Min
+            result
         )
-        return Min;
+        return result;
     }
 
     return pTraits<Type>::rootMax;
@@ -467,12 +480,12 @@ template<class Type>
 typename scalarProduct<Type, Type>::type
 sumProd(const UList<Type>& f1, const UList<Type>& f2)
 {
-    typedef typename scalarProduct<Type, Type>::type prodType;
+    typedef typename scalarProduct<Type, Type>::type resultType;
 
-    prodType result = Zero;
+    resultType result = Zero;
     if (f1.size() && (f1.size() == f2.size()))
     {
-        TFOR_ALL_S_OP_F_OP_F(prodType, result, +=, Type, f1, &&, Type, f2)
+        TFOR_ALL_S_OP_F_OP_F(resultType, result, +=, Type, f1, &&, Type, f2)
     }
     return result;
 }
@@ -502,37 +515,39 @@ Type sumCmptProd(const UList<Type>& f1, const UList<Type>& f2)
 
 template<class Type>
 typename outerProduct1<Type>::type
-sumSqr(const UList<Type>& f)
+sumSqr(const UList<Type>& f1)
 {
-    typedef typename outerProduct1<Type>::type prodType;
-    prodType result = Zero;
-    if (f.size())
+    typedef typename outerProduct1<Type>::type resultType;
+
+    resultType result = Zero;
+    if (f1.size())
     {
-        TFOR_ALL_S_OP_FUNC_F(prodType, result, +=, sqr, Type, f)
+        TFOR_ALL_S_OP_FUNC_F(resultType, result, +=, sqr, Type, f1)
     }
     return result;
 }
 
 template<class Type>
 typename outerProduct1<Type>::type
-sumSqr(const tmp<Field<Type>>& tf)
+sumSqr(const tmp<Field<Type>>& tf1)
 {
-    typedef typename outerProduct1<Type>::type prodType;
-    prodType result = sumSqr(tf());
-    tf.clear();
+    typedef typename outerProduct1<Type>::type resultType;
+    resultType result = sumSqr(tf1());
+    tf1.clear();
     return result;
 }
 
 
 template<class Type>
 typename typeOfMag<Type>::type
-sumMag(const UList<Type>& f)
+sumMag(const UList<Type>& f1)
 {
-    typedef typename typeOfMag<Type>::type magType;
-    magType result = Zero;
-    if (f.size())
+    typedef typename typeOfMag<Type>::type resultType;
+
+    resultType result = Zero;
+    if (f1.size())
     {
-        TFOR_ALL_S_OP_FUNC_F(magType, result, +=, mag, Type, f)
+        TFOR_ALL_S_OP_FUNC_F(resultType, result, +=, mag, Type, f1)
     }
     return result;
 }
@@ -541,12 +556,12 @@ TMP_UNARY_FUNCTION(typename typeOfMag<Type>::type, sumMag)
 
 
 template<class Type>
-Type sumCmptMag(const UList<Type>& f)
+Type sumCmptMag(const UList<Type>& f1)
 {
     Type result = Zero;
-    if (f.size())
+    if (f1.size())
     {
-        TFOR_ALL_S_OP_FUNC_F(Type, result, +=, cmptMag, Type, f)
+        TFOR_ALL_S_OP_FUNC_F(Type, result, +=, cmptMag, Type, f1)
     }
     return result;
 }
@@ -554,13 +569,13 @@ Type sumCmptMag(const UList<Type>& f)
 TMP_UNARY_FUNCTION(Type, sumCmptMag)
 
 template<class Type>
-Type average(const UList<Type>& f)
+Type average(const UList<Type>& f1)
 {
-    if (f.size())
+    if (f1.size())
     {
-        Type avrg = sum(f)/f.size();
+        Type result = sum(f1)/f1.size();
 
-        return avrg;
+        return result;
     }
 
     WarningInFunction
@@ -608,10 +623,10 @@ typename scalarProduct<Type, Type>::type gSumProd
     const label comm
 )
 {
-    typedef typename scalarProduct<Type, Type>::type prodType;
+    typedef typename scalarProduct<Type, Type>::type resultType;
 
-    prodType result = sumProd(f1, f2);
-    reduce(result, sumOp<prodType>(), UPstream::msgType(), comm);
+    resultType result = sumProd(f1, f2);
+    reduce(result, sumOp<resultType>(), UPstream::msgType(), comm);
     return result;
 }
 
@@ -623,27 +638,27 @@ Type gSumCmptProd
     const label comm
 )
 {
-    Type SumProd = sumCmptProd(f1, f2);
-    reduce(SumProd, sumOp<Type>(), UPstream::msgType(), comm);
-    return SumProd;
+    Type result = sumCmptProd(f1, f2);
+    reduce(result, sumOp<Type>(), UPstream::msgType(), comm);
+    return result;
 }
 
 template<class Type>
 Type gAverage
 (
-    const UList<Type>& f,
+    const UList<Type>& f1,
     const label comm
 )
 {
-    label n = f.size();
-    Type s = sum(f);
+    label n = f1.size();
+    Type s = sum(f1);
     sumReduce(s, n, UPstream::msgType(), comm);
 
     if (n > 0)
     {
-        Type avrg = s/n;
+        Type result = s/n;
 
-        return avrg;
+        return result;
     }
 
     WarningInFunction
@@ -656,6 +671,8 @@ TMP_UNARY_FUNCTION(Type, gAverage)
 
 #undef TMP_UNARY_FUNCTION
 
+
+// Implement BINARY_FUNCTION_TRANSFORM_FS for clamp
 template<class Type>
 void clamp
 (
@@ -683,30 +700,7 @@ void clamp
     }
 }
 
-template<class Type>
-tmp<Field<Type>> clamp
-(
-    const UList<Type>& f1,
-    const MinMax<Type>& range
-)
-{
-    auto tres = tmp<Field<Type>>::New(f1.size());
-    clamp(tres.ref(), f1, range);
-    return tres;
-}
-
-template<class Type>
-tmp<Field<Type>> clamp
-(
-    const tmp<Field<Type>>& tf1,
-    const MinMax<Type>& range
-)
-{
-    auto tres = reuseTmp<Type, Type>::New(tf1);
-    clamp(tres.ref(), tf1(), range);
-    tf1.clear();
-    return tres;
-}
+BINARY_FUNCTION_INTERFACE_FS(Type, Type, MinMax<Type>, clamp)
 
 
 BINARY_FUNCTION(Type, Type, Type, max)
@@ -743,21 +737,21 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, divide)
 template<class Type1, class Type2>                                             \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<typename product<Type1, Type2>::type>& res,                          \
+    Field<typename product<Type1, Type2>::type>& result,                       \
     const UList<Type1>& f1,                                                    \
     const UList<Type2>& f2                                                     \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    TFOR_ALL_F_OP_F_OP_F(productType, res, =, Type1, f1, Op, Type2, f2)        \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    TFOR_ALL_F_OP_F_OP_F(resultType, result, =, Type1, f1, Op, Type2, f2)      \
 }                                                                              \
                                                                                \
 template<class Type1, class Type2>                                             \
 tmp<Field<typename product<Type1, Type2>::type>>                               \
 operator Op(const UList<Type1>& f1, const UList<Type2>& f2)                    \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    auto tres = tmp<Field<productType>>::New(f1.size());                       \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = tmp<Field<resultType>>::New(f1.size());                        \
     OpFunc(tres.ref(), f1, f2);                                                \
     return tres;                                                               \
 }                                                                              \
@@ -766,8 +760,8 @@ template<class Type1, class Type2>                                             \
 tmp<Field<typename product<Type1, Type2>::type>>                               \
 operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    auto tres = reuseTmp<productType, Type2>::New(tf2);                        \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = reuseTmp<resultType, Type2>::New(tf2);                         \
     OpFunc(tres.ref(), f1, tf2());                                             \
     tf2.clear();                                                               \
     return tres;                                                               \
@@ -777,8 +771,8 @@ template<class Type1, class Type2>                                             \
 tmp<Field<typename product<Type1, Type2>::type>>                               \
 operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    auto tres = reuseTmp<productType, Type1>::New(tf1);                        \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = reuseTmp<resultType, Type1>::New(tf1);                         \
     OpFunc(tres.ref(), tf1(), f2);                                             \
     tf1.clear();                                                               \
     return tres;                                                               \
@@ -788,8 +782,8 @@ template<class Type1, class Type2>                                             \
 tmp<Field<typename product<Type1, Type2>::type>>                               \
 operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)        \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
-    auto tres = reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
+    auto tres = reuseTmpTmp<resultType, Type1, Type1, Type2>::New(tf1, tf2);   \
     OpFunc(tres.ref(), tf1(), tf2());                                          \
     tf1.clear();                                                               \
     tf2.clear();                                                               \
@@ -799,22 +793,22 @@ operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)        \
 template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<typename product<Type, Form>::type>& res,                            \
+    Field<typename product<Type, Form>::type>& result,                         \
     const UList<Type>& f1,                                                     \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
+    typedef typename product<Type, Form>::type resultType;                     \
     TFOR_ALL_F_OP_F_OP_S                                                       \
-        (productType, res, =,Type, f1, Op, Form, static_cast<const Form&>(vs)) \
+        (resultType, result, =,Type, f1, Op, Form, static_cast<const Form&>(vs))\
 }                                                                              \
                                                                                \
 template<class Type, class Form, class Cmpt, direction nCmpt>                  \
 tmp<Field<typename product<Type, Form>::type>>                                 \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)     \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
-    auto tres = tmp<Field<productType>>::New(f1.size());                       \
+    typedef typename product<Type, Form>::type resultType;                     \
+    auto tres = tmp<Field<resultType>>::New(f1.size());                        \
     OpFunc(tres.ref(), f1, static_cast<const Form&>(vs));                      \
     return tres;                                                               \
 }                                                                              \
@@ -827,8 +821,8 @@ operator Op                                                                    \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
-    auto tres = reuseTmp<productType, Type>::New(tf1);                         \
+    typedef typename product<Type, Form>::type resultType;                     \
+    auto tres = reuseTmp<resultType, Type>::New(tf1);                          \
     OpFunc(tres.ref(), tf1(), static_cast<const Form&>(vs));                   \
     tf1.clear();                                                               \
     return tres;                                                               \
@@ -837,22 +831,22 @@ operator Op                                                                    \
 template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<typename product<Form, Type>::type>& res,                            \
+    Field<typename product<Form, Type>::type>& result,                         \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
     const UList<Type>& f1                                                      \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
+    typedef typename product<Form, Type>::type resultType;                     \
     TFOR_ALL_F_OP_S_OP_F                                                       \
-        (productType, res, =,Form,static_cast<const Form&>(vs), Op, Type, f1)  \
+        (resultType, result, =,Form,static_cast<const Form&>(vs), Op, Type, f1)\
 }                                                                              \
                                                                                \
 template<class Form, class Cmpt, direction nCmpt, class Type>                  \
 tmp<Field<typename product<Form, Type>::type>>                                 \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)     \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
-    auto tres = tmp<Field<productType>>::New(f1.size());                       \
+    typedef typename product<Form, Type>::type resultType;                     \
+    auto tres = tmp<Field<resultType>>::New(f1.size());                        \
     OpFunc(tres.ref(), static_cast<const Form&>(vs), f1);                      \
     return tres;                                                               \
 }                                                                              \
@@ -864,8 +858,8 @@ operator Op                                                                    \
     const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type>>& tf1        \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
-    auto tres = reuseTmp<productType, Type>::New(tf1);                         \
+    typedef typename product<Form, Type>::type resultType;                     \
+    auto tres = reuseTmp<resultType, Type>::New(tf1);                          \
     OpFunc(tres.ref(), static_cast<const Form&>(vs), tf1());                   \
     tf1.clear();                                                               \
     return tres;                                                               \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index 59b7a1fd24..e82f2e6345 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,77 +31,99 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_FUNCTION(ReturnType, Type, Func)                                 \
-                                                                               \
-TEMPLATE                                                                       \
-void Func(Field<ReturnType>& res, const UList<Type>& f)                        \
-{                                                                              \
-    TFOR_ALL_F_OP_FUNC_F(ReturnType, res, =, ::Foam::Func, Type, f)            \
-}                                                                              \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func(const UList<Type>& f)                              \
-{                                                                              \
-    auto tres = tmp<Field<ReturnType>>::New(f.size());                         \
-    Func(tres.ref(), f);                                                       \
-    return tres;                                                               \
-}                                                                              \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                        \
-{                                                                              \
-    auto tres = reuseTmp<ReturnType, Type>::New(tf);                           \
-    Func(tres.ref(), tf());                                                    \
-    tf.clear();                                                                \
-    return tres;                                                               \
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#define UNARY_OPERATOR(ReturnType, Type, Op, OpFunc)                           \
-                                                                               \
-TEMPLATE                                                                       \
-void OpFunc(Field<ReturnType>& res, const UList<Type>& f)                      \
-{                                                                              \
-    TFOR_ALL_F_OP_OP_F(ReturnType, res, =, Op, Type, f)                        \
-}                                                                              \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> operator Op(const UList<Type>& f)                       \
-{                                                                              \
-    auto tres = tmp<Field<ReturnType>>::New(f.size());                         \
-    OpFunc(tres.ref(), f);                                                     \
-    return tres;                                                               \
-}                                                                              \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)                 \
-{                                                                              \
-    auto tres = reuseTmp<ReturnType, Type>::New(tf);                           \
-    OpFunc(tres.ref(), tf());                                                  \
-    tf.clear();                                                                \
-    return tres;                                                               \
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+#define UNARY_FUNCTION(ReturnType, Type1, Func)                                \
                                                                                \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    Field<ReturnType>& res,                                                    \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_F(ReturnType, result, =, ::Foam::Func, Type1, f1)       \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1                                                     \
+)                                                                              \
+{                                                                              \
+    auto tres = tmp<Field<ReturnType>>::New(f1.size());                        \
+    Func(tres.ref(), f1);                                                      \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1                                               \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type1>::New(tf1);                         \
+    Func(tres.ref(), tf1());                                                   \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                          \
+                                                                               \
+TEMPLATE                                                                       \
+void OpFunc                                                                    \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_OP_F(ReturnType, result, =, Op, Type1, f1)                   \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const UList<Type1>& f1                                                     \
+)                                                                              \
+{                                                                              \
+    auto tres = tmp<Field<ReturnType>>::New(f1.size());                        \
+    OpFunc(tres.ref(), f1);                                                    \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> operator Op                                             \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1                                               \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type1>::New(tf1);                         \
+    OpFunc(tres.ref(), tf1());                                                 \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define BINARY_FUNCTION_TRANSFORM(ReturnType, Type1, Type2, Func)              \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const UList<Type2>& f2                                                     \
 )                                                                              \
 {                                                                              \
     TFOR_ALL_F_OP_FUNC_F_F                                                     \
     (                                                                          \
-        ReturnType, res, =, ::Foam::Func, Type1, f1, Type2, f2                 \
+        ReturnType, result, =, ::Foam::Func, Type1, f1, Type2, f2              \
     )                                                                          \
-}                                                                              \
+}
+
+#define BINARY_FUNCTION_INTERFACE(ReturnType, Type1, Type2, Func)              \
                                                                                \
 TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func                                                    \
@@ -155,24 +177,30 @@ tmp<Field<ReturnType>> Func                                                    \
     return tres;                                                               \
 }
 
+#define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
+    BINARY_FUNCTION_TRANSFORM(ReturnType, Type1, Type2, Func)                  \
+    BINARY_FUNCTION_INTERFACE(ReturnType, Type1, Type2, Func)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+#define BINARY_FUNCTION_TRANSFORM_SF(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    Field<ReturnType>& res,                                                    \
+    Field<ReturnType>& result,                                                 \
     const Type1& s1,                                                           \
     const UList<Type2>& f2                                                     \
 )                                                                              \
 {                                                                              \
     TFOR_ALL_F_OP_FUNC_S_F                                                     \
     (                                                                          \
-        ReturnType, res, =, ::Foam::Func, Type1, s1, Type2, f2                 \
+        ReturnType, result, =, ::Foam::Func, Type1, s1, Type2, f2              \
     )                                                                          \
-}                                                                              \
+}
+
+#define BINARY_FUNCTION_INTERFACE_SF(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func                                                    \
@@ -199,22 +227,28 @@ tmp<Field<ReturnType>> Func                                                    \
     return tres;                                                               \
 }
 
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+    BINARY_FUNCTION_TRANSFORM_SF(ReturnType, Type1, Type2, Func)               \
+    BINARY_FUNCTION_INTERFACE_SF(ReturnType, Type1, Type2, Func)
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+
+#define BINARY_FUNCTION_TRANSFORM_FS(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    Field<ReturnType>& res,                                                    \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
     TFOR_ALL_F_OP_FUNC_F_S                                                     \
     (                                                                          \
-        ReturnType, res, =, ::Foam::Func, Type1, f1, Type2, s2                 \
+        ReturnType, result, =, ::Foam::Func, Type1, f1, Type2, s2              \
     )                                                                          \
-}                                                                              \
+}
+
+#define BINARY_FUNCTION_INTERFACE_FS(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func                                                    \
@@ -241,6 +275,10 @@ tmp<Field<ReturnType>> Func                                                    \
     return tres;                                                               \
 }
 
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+    BINARY_FUNCTION_TRANSFORM_FS(ReturnType, Type1, Type2, Func)               \
+    BINARY_FUNCTION_INTERFACE_FS(ReturnType, Type1, Type2, Func)
+
 
 #define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
     BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
@@ -254,12 +292,12 @@ tmp<Field<ReturnType>> Func                                                    \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<ReturnType>& res,                                                    \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const UList<Type2>& f2                                                     \
 )                                                                              \
 {                                                                              \
-    TFOR_ALL_F_OP_F_OP_F(ReturnType, res, =, Type1, f1, Op, Type2, f2)         \
+    TFOR_ALL_F_OP_F_OP_F(ReturnType, result, =, Type1, f1, Op, Type2, f2)      \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
@@ -322,12 +360,12 @@ tmp<Field<ReturnType>> operator Op                                             \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<ReturnType>& res,                                                    \
+    Field<ReturnType>& result,                                                 \
     const Type1& s1,                                                           \
     const UList<Type2>& f2                                                     \
 )                                                                              \
 {                                                                              \
-    TFOR_ALL_F_OP_S_OP_F(ReturnType, res, =, Type1, s1, Op, Type2, f2)         \
+    TFOR_ALL_F_OP_S_OP_F(ReturnType, result, =, Type1, s1, Op, Type2, f2)      \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
@@ -361,12 +399,12 @@ tmp<Field<ReturnType>> operator Op                                             \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<ReturnType>& res,                                                    \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    TFOR_ALL_F_OP_F_OP_S(ReturnType, res, =, Type1, f1, Op, Type2, s2)         \
+    TFOR_ALL_F_OP_F_OP_S(ReturnType, result, =, Type1, f1, Op, Type2, s2)      \
 }                                                                              \
                                                                                \
 TEMPLATE                                                                       \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
index f975bffa52..1730ad22ba 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,9 +25,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    High performance macro functions for Field\<Type\> algebra.  These expand
-    using either array element access (for vector machines) or pointer
-    dereferencing for scalar machines as appropriate.
+    Macro functions for Field\<Type\> algebra.
 
 \*---------------------------------------------------------------------------*/
 
@@ -35,11 +34,13 @@ Description
 #define UNARY_FUNCTION(ReturnType, Type1, Func)                                \
                                                                                \
 TEMPLATE                                                                       \
-void Func(Field<ReturnType>& res, const UList<Type1>& f);                      \
+void Func(Field<ReturnType>& result, const UList<Type1>& f1);                  \
+                                                                               \
 TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func(const UList<Type1>& f);                            \
+tmp<Field<ReturnType>> Func(const UList<Type1>& f1);                           \
+                                                                               \
 TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func(const tmp<Field<Type1>>& tf);
+tmp<Field<ReturnType>> Func(const tmp<Field<Type1>>& tf1);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,65 +48,74 @@ tmp<Field<ReturnType>> Func(const tmp<Field<Type1>>& tf);
 #define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc)                          \
                                                                                \
 TEMPLATE                                                                       \
-void OpFunc(Field<ReturnType>& res, const UList<Type1>& f);                    \
+void OpFunc(Field<ReturnType>& res, const UList<Type1>& f1);                   \
+                                                                               \
 TEMPLATE                                                                       \
-tmp<Field<ReturnType>> operator Op(const UList<Type1>& f);                     \
+tmp<Field<ReturnType>> operator Op(const UList<Type1>& f1);                    \
+                                                                               \
 TEMPLATE                                                                       \
-tmp<Field<ReturnType>> operator Op(const tmp<Field<Type1>>& tf);
+tmp<Field<ReturnType>> operator Op(const tmp<Field<Type1>>& tf1);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define BINARY_FUNCTION_TRANSFORM(ReturnType, Type1, Type2, Func)              \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);
+
+#define BINARY_FUNCTION_INTERFACE(ReturnType, Type1, Type2, Func)              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2                                               \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2                                               \
+);
+
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
-                                                                               \
-TEMPLATE                                                                       \
-void Func                                                                      \
-(                                                                              \
-    Field<ReturnType>& f,                                                      \
-    const UList<Type1>& f1,                                                    \
-    const UList<Type2>& f2                                                     \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func                                                    \
-(                                                                              \
-    const UList<Type1>& f1,                                                    \
-    const UList<Type2>& f2                                                     \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func                                                    \
-(                                                                              \
-    const UList<Type1>& f1,                                                    \
-    const tmp<Field<Type2>>& tf2                                               \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func                                                    \
-(                                                                              \
-    const tmp<Field<Type1>>& tf1,                                              \
-    const UList<Type2>& f2                                                     \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<Field<ReturnType>> Func                                                    \
-(                                                                              \
-    const tmp<Field<Type1>>& tf1,                                              \
-    const tmp<Field<Type2>>& tf2                                               \
-);
-
+    BINARY_FUNCTION_TRANSFORM(ReturnType, Type1, Type2, Func)                  \
+    BINARY_FUNCTION_INTERFACE(ReturnType, Type1, Type2, Func)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+#define BINARY_FUNCTION_TRANSFORM_SF(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    Field<ReturnType>& f,                                                      \
+    Field<ReturnType>& result,                                                 \
     const Type1& s1,                                                           \
     const UList<Type2>& f2                                                     \
-);                                                                             \
+);
+
+#define BINARY_FUNCTION_INTERFACE_SF(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func                                                    \
@@ -121,16 +131,22 @@ tmp<Field<ReturnType>> Func                                                    \
     const tmp<Field<Type2>>& tf2                                               \
 );
 
+#define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
+    BINARY_FUNCTION_TRANSFORM_SF(ReturnType, Type1, Type2, Func)               \
+    BINARY_FUNCTION_INTERFACE_SF(ReturnType, Type1, Type2, Func)
 
-#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+
+#define BINARY_FUNCTION_TRANSFORM_FS(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    Field<ReturnType>& f,                                                      \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const Type2& s2                                                            \
-);                                                                             \
+);
+
+#define BINARY_FUNCTION_INTERFACE_FS(ReturnType, Type1, Type2, Func)           \
                                                                                \
 TEMPLATE                                                                       \
 tmp<Field<ReturnType>> Func                                                    \
@@ -146,6 +162,10 @@ tmp<Field<ReturnType>> Func                                                    \
     const Type2& s2                                                            \
 );
 
+#define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
+    BINARY_FUNCTION_TRANSFORM_FS(ReturnType, Type1, Type2, Func)               \
+    BINARY_FUNCTION_INTERFACE_FS(ReturnType, Type1, Type2, Func)
+
 
 #define BINARY_TYPE_FUNCTION(ReturnType, Type1, Type2, Func)                   \
     BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                    \
@@ -159,7 +179,7 @@ tmp<Field<ReturnType>> Func                                                    \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<ReturnType>& f,                                                      \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const UList<Type2>& f2                                                     \
 );                                                                             \
@@ -200,7 +220,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<ReturnType>& f,                                                      \
+    Field<ReturnType>& result,                                                 \
     const Type1& s1,                                                           \
     const UList<Type2>& f2                                                     \
 );                                                                             \
@@ -225,7 +245,7 @@ tmp<Field<ReturnType>> operator Op                                             \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    Field<ReturnType>& f,                                                      \
+    Field<ReturnType>& result,                                                 \
     const UList<Type1>& f1,                                                    \
     const Type2& s2                                                            \
 );                                                                             \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldM.H b/src/OpenFOAM/fields/Fields/Field/FieldM.H
index 307796eae3..0cb9072bfd 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldM.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,9 +25,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    High performance macro functions for Field\<Type\> algebra.  These expand
-    using either array element access (for vector machines) or pointer
-    dereferencing for scalar machines as appropriate.
+    Declaration macros for Field\<Type\> algebra.
 
 \*---------------------------------------------------------------------------*/
 
@@ -86,6 +84,34 @@ void checkFields
     }
 }
 
+template<class Type1, class Type2, class Type3, class Type4>
+void checkFields
+(
+    const UList<Type1>& f1,
+    const UList<Type2>& f2,
+    const UList<Type3>& f3,
+    const UList<Type4>& f4,
+    const char* op
+)
+{
+    if
+    (
+        f1.size() != f2.size()
+     || f1.size() != f3.size()
+     || f1.size() != f4.size()
+    )
+    {
+        FatalErrorInFunction
+            << " Field<"<<pTraits<Type1>::typeName<<"> f1("<<f1.size()<<')'
+            << ", Field<"<<pTraits<Type2>::typeName<<"> f2("<<f2.size()<<')'
+            << ", Field<"<<pTraits<Type3>::typeName<<"> f3("<<f3.size()<<')'
+            << " and Field<"<<pTraits<Type4>::typeName<<"> f4("<<f4.size()<<')'
+            << endl
+            << "    for operation " << op
+            << abort(FatalError);
+    }
+}
+
 #else
 
 template<class Type1, class Type2>
@@ -107,12 +133,23 @@ void checkFields
 )
 {}
 
+template<class Type1, class Type2, class Type3, class Type4>
+void checkFields
+(
+    const UList<Type1>&,
+    const UList<Type2>&,
+    const UList<Type3>&,
+    const UList<Type4>&,
+    const char*
+)
+{}
+
 #endif
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Member function : f1 OP Func f2
+// Unary Free Function : f1 OP Func f2
 
 #define TFOR_ALL_F_OP_FUNC_F(typeF1, f1, OP, FUNC, typeF2, f2)                 \
                                                                                \
@@ -133,7 +170,7 @@ void checkFields
     }
 
 
-// Member function : this f1 OP f2.FUNC()
+// Nullary Member Function : f1 OP f2.FUNC()
 
 #define TFOR_ALL_F_OP_F_FUNC(typeF1, f1, OP, typeF2, f2, FUNC)                 \
                                                                                \
@@ -154,7 +191,7 @@ void checkFields
     }
 
 
-// Member function : this field f1 OP FUNC(f2, f3)
+// Binary Free Function : f1 OP FUNC(f2, f3)
 
 #define TFOR_ALL_F_OP_FUNC_F_F(typeF1, f1, OP, FUNC, typeF2, f2, typeF3, f3)   \
                                                                                \
@@ -176,7 +213,7 @@ void checkFields
     }
 
 
-// Member function : s OP FUNC(f1, f2)
+// [reduction] Binary Free Function : s OP FUNC(f1, f2)
 
 #define TFOR_ALL_S_OP_FUNC_F_F(typeS, s, OP, FUNC, typeF1, f1, typeF2, f2)     \
                                                                                \
@@ -197,7 +234,7 @@ void checkFields
     }
 
 
-// Member function : this f1 OP FUNC(f2, s)
+// Binary Free Function : f1 OP FUNC(f2, s)
 
 #define TFOR_ALL_F_OP_FUNC_F_S(typeF1, f1, OP, FUNC, typeF2, f2, typeS, s)     \
                                                                                \
@@ -218,7 +255,7 @@ void checkFields
     }
 
 
-// Member function : s1 OP FUNC(f, s2)
+// [reduction] Binary Free Function : s1 OP FUNC(f, s2)
 
 #define TFOR_ALL_S_OP_FUNC_F_S(typeS1, s1, OP, FUNC, typeF, f, typeS2, s2)     \
                                                                                \
@@ -235,7 +272,7 @@ void checkFields
     }
 
 
-// Member function : this f1 OP FUNC(s, f2)
+// Binary Free Function : f1 OP FUNC(s, f2)
 
 #define TFOR_ALL_F_OP_FUNC_S_F(typeF1, f1, OP, FUNC, typeS, s, typeF2, f2)     \
                                                                                \
@@ -256,7 +293,7 @@ void checkFields
     }
 
 
-// Member function : this f1 OP FUNC(s1, s2)
+// Binary Free Function : f1 OP FUNC(s1, s2)
 
 #define TFOR_ALL_F_OP_FUNC_S_S(typeF1, f1, OP, FUNC, typeS1, s1, typeS2, s2)   \
                                                                                \
@@ -273,7 +310,7 @@ void checkFields
     }
 
 
-// Member function : this f1 OP f2 FUNC(s)
+// Unary Member Function : f1 OP f2 FUNC(s)
 
 #define TFOR_ALL_F_OP_F_FUNC_S(typeF1, f1, OP, typeF2, f2, FUNC, typeS, s)     \
                                                                                \
@@ -294,6 +331,56 @@ void checkFields
     }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Ternary Free Function : f1 OP FUNC(f2, f3, f4)
+
+#define TFOR_ALL_F_OP_FUNC_F_F_F\
+(typeF1, f1, OP, FUNC, typeF2, f2, typeF3, f3, typeF4, f4)                     \
+                                                                               \
+    /* Check fields have same size */                                          \
+    checkFields(f1, f2, f3, f4, "f1 " #OP " " #FUNC "(f2, f3, f4)");           \
+                                                                               \
+    /* Field access */                                                         \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+    List_CONST_ACCESS(typeF3, f3, f3P);                                        \
+    List_CONST_ACCESS(typeF4, f4, f4P);                                        \
+                                                                               \
+    /* Loop: f1 OP FUNC(f2, f3, f4) */                                         \
+    const label loopLen = (f1).size();                                         \
+                                                                               \
+    /* pragmas... */                                                           \
+    for (label i = 0; i < loopLen; ++i)                                        \
+    {                                                                          \
+        (f1P[i]) OP FUNC((f2P[i]), (f3P[i]), (f4P[i]));                        \
+    }
+
+// Ternary Free Function : f1 OP FUNC(f2, f3, s4)
+
+#define TFOR_ALL_F_OP_FUNC_F_F_S\
+(typeF1, f1, OP, FUNC, typeF2, f2, typeF3, f3, typeF4, s4)                     \
+                                                                               \
+    /* Check fields have same size */                                          \
+    checkFields(f1, f2, f3, "f1 " #OP " " #FUNC "(f2, f3, s)");                \
+                                                                               \
+    /* Field access */                                                         \
+    List_ACCESS(typeF1, f1, f1P);                                              \
+    List_CONST_ACCESS(typeF2, f2, f2P);                                        \
+    List_CONST_ACCESS(typeF3, f3, f3P);                                        \
+                                                                               \
+    /* Loop: f1 OP FUNC(f2, f3, s4) */                                         \
+    const label loopLen = (f1).size();                                         \
+                                                                               \
+    /* pragmas... */                                                           \
+    for (label i = 0; i < loopLen; ++i)                                        \
+    {                                                                          \
+        (f1P[i]) OP FUNC((f2P[i]), (f3P[i]), (s4));                            \
+    }
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 // Member operator : this field f1 OP1 f2 OP2 f3
 
 #define TFOR_ALL_F_OP_F_OP_F(typeF1, f1, OP1, typeF2, f2, OP2, typeF3, f3)     \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index d05c15d427..0d23585fe9 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,10 +35,18 @@ namespace Foam
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// One-parameter versions
 
 template<class TypeR, class Type1>
 struct reuseTmp
 {
+    //- Pass-through to tmp New
+    static tmp<Field<TypeR>> New(const Field<Type1>& f1)
+    {
+        return tmp<Field<TypeR>>::New(f1.size());
+    }
+
+    //- Dissimilar types: just use size
     static tmp<Field<TypeR>> New(const tmp<Field<Type1>>& tf1)
     {
         return tmp<Field<TypeR>>::New(tf1().size());
@@ -49,8 +57,8 @@ struct reuseTmp
 template<class TypeR>
 struct reuseTmp<TypeR, TypeR>
 {
-    //- Allow optional copy assignment of the initial content
-    //- for identical input and output types
+    //- Identical input and return types:
+    //- allow optional copy assignment of the initial content
     static tmp<Field<TypeR>> New
     (
         const tmp<Field<TypeR>>& tf1,
@@ -85,9 +93,13 @@ template<class TypeR> tmp<Field<TypeR>> New
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Two-parameter versions
+
 template<class TypeR, class Type1, class Type12, class Type2>
 struct reuseTmpTmp
 {
+    //- Dissimilar types: just use size
     static tmp<Field<TypeR>> New
     (
         const tmp<Field<Type1>>& tf1,
@@ -102,6 +114,7 @@ struct reuseTmpTmp
 template<class TypeR, class Type1, class Type12>
 struct reuseTmpTmp<TypeR, Type1, Type12, TypeR>
 {
+    //- Second input has return type
     static tmp<Field<TypeR>> New
     (
         const tmp<Field<Type1>>& tf1,
@@ -121,6 +134,7 @@ struct reuseTmpTmp<TypeR, Type1, Type12, TypeR>
 template<class TypeR, class Type2>
 struct reuseTmpTmp<TypeR, TypeR, TypeR, Type2>
 {
+    //- First input has return type
     static tmp<Field<TypeR>> New
     (
         const tmp<Field<TypeR>>& tf1,
@@ -140,6 +154,7 @@ struct reuseTmpTmp<TypeR, TypeR, TypeR, Type2>
 template<class TypeR>
 struct reuseTmpTmp<TypeR, TypeR, TypeR, TypeR>
 {
+    //- Both inputs have return type
     static tmp<Field<TypeR>> New
     (
         const tmp<Field<TypeR>>& tf1,
diff --git a/src/OpenFOAM/fields/Fields/Field/undefFieldFunctionsM.H b/src/OpenFOAM/fields/Fields/Field/undefFieldFunctionsM.H
index 3eb660e382..0a1e1cc9d3 100644
--- a/src/OpenFOAM/fields/Fields/Field/undefFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/Fields/Field/undefFieldFunctionsM.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,20 +27,40 @@ License
 \*---------------------------------------------------------------------------*/
 
 #undef UNARY_FUNCTION
+#undef UNARY_FUNCTION_TRANSFORM
+#undef UNARY_FUNCTION_INTERFACE
 
 #undef UNARY_OPERATOR
+#undef UNARY_OPERATOR_TRANSFORM
+#undef UNARY_OPERATOR_INTERFACE
 
 #undef BINARY_FUNCTION
+#undef BINARY_FUNCTION_TRANSFORM
+#undef BINARY_FUNCTION_INTERFACE
 
+#undef BINARY_TYPE_FUNCTION
 #undef BINARY_TYPE_FUNCTION_SF
 #undef BINARY_TYPE_FUNCTION_FS
-#undef BINARY_TYPE_FUNCTION
+#undef BINARY_FUNCTION_TRANSFORM_SF
+#undef BINARY_FUNCTION_INTERFACE_SF
+#undef BINARY_FUNCTION_TRANSFORM_FS
+#undef BINARY_FUNCTION_INTERFACE_FS
 
 #undef BINARY_OPERATOR
-
+#undef BINARY_TYPE_OPERATOR
 #undef BINARY_TYPE_OPERATOR_SF
 #undef BINARY_TYPE_OPERATOR_FS
-#undef BINARY_TYPE_OPERATOR
+
+#undef TERNARY_FUNCTION
+#undef TERNARY_FUNCTION_TRANSFORM
+#undef TERNARY_FUNCTION_INTERFACE
+#undef TERNARY_TYPE_FUNCTION
+#undef TERNARY_TYPE_FUNCTION_FFS
+#undef TERNARY_TYPE_FUNCTION_FSF
+#undef TERNARY_TYPE_FUNCTION_SFF
+#undef TERNARY_TYPE_FUNCTION_SSF
+#undef TERNARY_TYPE_FUNCTION_SFS
+#undef TERNARY_TYPE_FUNCTION_FSS
 
 #undef TEMPLATE
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index f6eb4fafd5..0c686d3be2 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ License
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void component
@@ -47,27 +47,27 @@ void component
         typename GeometricField<Type, PatchField, GeoMesh>::cmptType,
         PatchField,
         GeoMesh
-    >& gcf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf,
+    >& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
     const direction d
 )
 {
-    component(gcf.primitiveFieldRef(), gf.primitiveField(), d);
-    component(gcf.boundaryFieldRef(), gf.boundaryField(), d);
-    gcf.oriented() = gf.oriented();
+    component(result.primitiveFieldRef(), f1.primitiveField(), d);
+    component(result.boundaryFieldRef(), f1.boundaryField(), d);
+    result.oriented() = f1.oriented();
 }
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void T
 (
-     GeometricField<Type, PatchField, GeoMesh>& gf,
-     const GeometricField<Type, PatchField, GeoMesh>& gf1
+     GeometricField<Type, PatchField, GeoMesh>& result,
+     const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    T(gf.primitiveFieldRef(), gf1.primitiveField());
-    T(gf.boundaryFieldRef(), gf1.boundaryField());
-    gf.oriented() = gf1.oriented();
+    T(result.primitiveFieldRef(), f1.primitiveField());
+    T(result.boundaryFieldRef(), f1.boundaryField());
+    result.oriented() = f1.oriented();
 }
 
 
@@ -80,13 +80,14 @@ template
 >
 void pow
 (
-    GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>& gf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf1
+    GeometricField
+    <typename powProduct<Type, r>::type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    pow(gf.primitiveFieldRef(), gf1.primitiveField(), r);
-    pow(gf.boundaryFieldRef(), gf1.boundaryField(), r);
-    gf.oriented() = pow(gf1.oriented(), r);
+    pow(result.primitiveFieldRef(), f1.primitiveField(), r);
+    pow(result.boundaryFieldRef(), f1.boundaryField(), r);
+    result.oriented() = pow(f1.oriented(), r);
 }
 
 
@@ -100,28 +101,21 @@ template
 tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
-    const GeometricField<Type, PatchField, GeoMesh>& gf,
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
     typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
 
     auto tres =
-        tmp<GeometricField<powProductType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "pow(" + gf.name() + ',' + name(r) + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            pow(gf.dimensions(), r)
+            f1,
+            "pow(" + f1.name() + ',' + Foam::name(r) + ')',
+            pow(f1.dimensions(), r)
         );
 
-    pow<Type, r, PatchField, GeoMesh>(tres.ref(), gf);
+    pow<Type, r, PatchField, GeoMesh>(tres.ref(), f1);
 
     return tres;
 }
@@ -137,32 +131,25 @@ template
 tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,
     typename powProduct<Type, r>::type
 )
 {
-    typedef typename powProduct<Type, r>::type powProductType;
+    typedef typename powProduct<Type, r>::type resultType;
 
-    const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
+    const auto& f1 = tf1();
 
     auto tres =
-        tmp<GeometricField<powProductType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "pow(" + gf.name() + ',' + name(r) + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            pow(gf.dimensions(), r)
+            tf1,
+            "pow(" + f1.name() + ',' + Foam::name(r) + ')',
+            pow(f1.dimensions(), r)
         );
 
-    pow<Type, r, PatchField, GeoMesh>(tres.ref(), gf);
+    pow<Type, r, PatchField, GeoMesh>(tres.ref(), f1);
 
-    tgf.clear();
+    tf1.clear();
     return tres;
 }
 
@@ -171,13 +158,15 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 void sqr
 (
     GeometricField
-    <typename outerProduct<Type, Type>::type, PatchField, GeoMesh>& gf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf1
+    <
+        typename outerProduct<Type, Type>::type, PatchField, GeoMesh
+    >& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    sqr(gf.primitiveFieldRef(), gf1.primitiveField());
-    sqr(gf.boundaryFieldRef(), gf1.boundaryField());
-    gf.oriented() = sqr(gf1.oriented());
+    sqr(result.primitiveFieldRef(), f1.primitiveField());
+    sqr(result.boundaryFieldRef(), f1.boundaryField());
+    result.oriented() = sqr(f1.oriented());
 }
 
 
@@ -191,26 +180,19 @@ tmp
         GeoMesh
     >
 >
-sqr(const GeometricField<Type, PatchField, GeoMesh>& gf)
+sqr(const GeometricField<Type, PatchField, GeoMesh>& f1)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
+    typedef typename outerProduct<Type, Type>::type resultType;
 
     auto tres =
-        tmp<GeometricField<outerProductType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "sqr(" + gf.name() + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            sqr(gf.dimensions())
+            f1,
+            "sqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    sqr(tres.ref(), gf);
+    sqr(tres.ref(), f1);
 
     return tres;
 }
@@ -226,31 +208,23 @@ tmp
         GeoMesh
     >
 >
-sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
+sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1)
 {
-    typedef typename outerProduct<Type, Type>::type outerProductType;
+    typedef typename outerProduct<Type, Type>::type resultType;
 
-    const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
+    const auto& f1 = tf1();
 
     auto tres =
-        tmp<GeometricField<outerProductType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "sqr(" + gf.name() + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            sqr(gf.dimensions())
+            tf1,
+            "sqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    sqr(tres.ref(), gf);
-
-    tgf.clear();
+    sqr(tres.ref(), f1);
 
+    tf1.clear();
     return tres;
 }
 
@@ -258,13 +232,13 @@ sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 template<class Type, template<class> class PatchField, class GeoMesh>
 void magSqr
 (
-    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& gsf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    magSqr(gsf.primitiveFieldRef(), gf.primitiveField());
-    magSqr(gsf.boundaryFieldRef(), gf.boundaryField());
-    gsf.oriented() = magSqr(gf.oriented());
+    magSqr(result.primitiveFieldRef(), f1.primitiveField());
+    magSqr(result.boundaryFieldRef(), f1.boundaryField());
+    result.oriented() = magSqr(f1.oriented());
 }
 
 
@@ -272,27 +246,20 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 magSqr
 (
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
     auto tres =
-        tmp<GeometricField<magType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "magSqr(" + gf.name() + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            sqr(gf.dimensions())
+            f1,
+            "magSqr(" + f1.name() + ')',
+            sqr(f1.dimensions())
         );
 
-    magSqr(tres.ref(), gf);
+    magSqr(tres.ref(), f1);
 
     return tres;
 }
@@ -301,11 +268,11 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 magSqr
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1
 )
 {
-    auto tres = magSqr(tgf.cref());
-    tgf.clear();
+    auto tres = magSqr(tf1.cref());
+    tf1.clear();
 
     return tres;
 }
@@ -314,13 +281,13 @@ magSqr
 template<class Type, template<class> class PatchField, class GeoMesh>
 void mag
 (
-    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& gsf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    mag(gsf.primitiveFieldRef(), gf.primitiveField());
-    mag(gsf.boundaryFieldRef(), gf.boundaryField());
-    gsf.oriented() = mag(gf.oriented());
+    mag(result.primitiveFieldRef(), f1.primitiveField());
+    mag(result.boundaryFieldRef(), f1.boundaryField());
+    result.oriented() = mag(f1.oriented());
 }
 
 
@@ -328,27 +295,20 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 mag
 (
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    typedef typename typeOfMag<Type>::type magType;
+    typedef typename typeOfMag<Type>::type resultType;
 
     auto tres =
-        tmp<GeometricField<magType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "mag(" + gf.name() + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            gf.dimensions()
+            f1,
+            "mag(" + f1.name() + ')',
+            f1.dimensions()
         );
 
-    mag(tres.ref(), gf);
+    mag(tres.ref(), f1);
 
     return tres;
 }
@@ -357,11 +317,11 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 mag
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1
 )
 {
-    auto tres = mag(tgf.cref());
-    tgf.clear();
+    auto tres = mag(tf1.cref());
+    tf1.clear();
 
     return tres;
 }
@@ -375,13 +335,13 @@ void cmptAv
         typename GeometricField<Type, PatchField, GeoMesh>::cmptType,
         PatchField,
         GeoMesh
-    >& gcf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    >& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 )
 {
-    cmptAv(gcf.primitiveFieldRef(), gf.primitiveField());
-    cmptAv(gcf.boundaryFieldRef(), gf.boundaryField());
-    gcf.oriented() = cmptAv(gf.oriented());
+    cmptAv(result.primitiveFieldRef(), f1.primitiveField());
+    cmptAv(result.boundaryFieldRef(), f1.boundaryField());
+    result.oriented() = cmptAv(f1.oriented());
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -394,27 +354,20 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const GeometricField<Type, PatchField, GeoMesh>& gf)
+cmptAv(const GeometricField<Type, PatchField, GeoMesh>& f1)
 {
-    typedef typename GeometricField<Type, PatchField, GeoMesh>::cmptType
-        cmptType;
+    typedef typename
+        GeometricField<Type, PatchField, GeoMesh>::cmptType resultType;
 
     auto tres =
-        tmp<GeometricField<cmptType, PatchField, GeoMesh>>::New
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                "cmptAv(" + gf.name() + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            gf.dimensions()
+            f1,
+            "cmptAv(" + f1.name() + ')',
+            f1.dimensions()
         );
 
-    cmptAv(tres.ref(), gf);
+    cmptAv(tres.ref(), f1);
 
     return tres;
 }
@@ -430,68 +383,47 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
+cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1)
 {
-    typedef typename GeometricField<Type, PatchField, GeoMesh>::cmptType
-        cmptType;
-
-    const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
-
-    auto tres =
-        tmp<GeometricField<cmptType, PatchField, GeoMesh>>::New
-        (
-            IOobject
-            (
-                "cmptAv(" + gf.name() + ')',
-                gf.instance(),
-                gf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gf.mesh(),
-            gf.dimensions()
-        );
-
-    cmptAv(tres.ref(), gf);
-
-    tgf.clear();
+    auto tres = cmptAv(tf1.cref());
+    tf1.clear();
 
     return tres;
 }
 
 
-#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, binaryOp)     \
+#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(ReturnType, Func, BinaryOp)     \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+    const GeometricField<Type, PatchField, GeoMesh>& f1                        \
 )                                                                              \
 {                                                                              \
-    return dimensioned<returnType>                                             \
+    return dimensioned<ReturnType>                                             \
     (                                                                          \
-        #func "(" + gf.name() + ')',                                           \
-        gf.dimensions(),                                                       \
+        #Func "(" + f1.name() + ')',                                           \
+        f1.dimensions(),                                                       \
         returnReduce                                                           \
         (                                                                      \
-            Foam::func                                                         \
+            Foam::Func                                                         \
             (                                                                  \
-                Foam::func(gf.primitiveField()),                               \
-                Foam::func(gf.boundaryField())                                 \
+                Foam::Func(f1.primitiveField()),                               \
+                Foam::Func(f1.boundaryField())                                 \
             ),                                                                 \
-            binaryOp<returnType>()                                             \
+            BinaryOp<ReturnType>()                                             \
         )                                                                      \
     );                                                                         \
 }                                                                              \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1                  \
 )                                                                              \
 {                                                                              \
-    dimensioned<returnType> res = func(tgf1());                                \
-    tgf1.clear();                                                              \
+    dimensioned<ReturnType> res = Func(tf1());                                 \
+    tf1.clear();                                                               \
     return res;                                                                \
 }
 
@@ -503,30 +435,30 @@ UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(scalarMinMax, minMaxMag, minMaxMagOp)
 #undef UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY
 
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, gFunc)                      \
+#define UNARY_REDUCTION_FUNCTION(ReturnType, Func, gFunc)                      \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+    const GeometricField<Type, PatchField, GeoMesh>& f1                        \
 )                                                                              \
 {                                                                              \
-    return dimensioned<returnType>                                             \
+    return dimensioned<ReturnType>                                             \
     (                                                                          \
-        #func "(" + gf.name() + ')',                                           \
-        gf.dimensions(),                                                       \
-        gFunc(gf.primitiveField())                                             \
+        #Func "(" + f1.name() + ')',                                           \
+        f1.dimensions(),                                                       \
+        gFunc(f1.primitiveField())                                             \
     );                                                                         \
 }                                                                              \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1                  \
 )                                                                              \
 {                                                                              \
-    dimensioned<returnType> res = func(tgf1());                                \
-    tgf1.clear();                                                              \
+    dimensioned<ReturnType> res = Func(tf1());                                 \
+    tf1.clear();                                                               \
     return res;                                                                \
 }
 
@@ -548,7 +480,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
 
-// * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
 
@@ -564,64 +496,58 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
                                                                                \
 template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     GeometricField                                                             \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& gf,           \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& result,       \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    Foam::opFunc                                                               \
+    Foam::OpFunc                                                               \
     (                                                                          \
-        gf.primitiveFieldRef(),                                                \
-        gf1.primitiveField(),                                                  \
-        gf2.primitiveField()                                                   \
+        result.primitiveFieldRef(),                                            \
+        f1.primitiveField(),                                                   \
+        f2.primitiveField()                                                    \
     );                                                                         \
-    Foam::opFunc                                                               \
+    Foam::OpFunc                                                               \
     (                                                                          \
-        gf.boundaryFieldRef(),                                                 \
-        gf1.boundaryField(),                                                   \
-        gf2.boundaryField()                                                    \
+        result.boundaryFieldRef(),                                             \
+        f1.boundaryField(),                                                    \
+        f2.boundaryField()                                                     \
     );                                                                         \
                                                                                \
-    gf.oriented() = gf1.oriented() op gf2.oriented();                          \
+    result.oriented() = (f1.oriented() Op f2.oriented());                      \
 }                                                                              \
                                                                                \
+                                                                               \
 template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
 tmp                                                                            \
 <                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
     auto tres =                                                                \
-        tmp<GeometricField<productType, PatchField, GeoMesh>>::New             \
+        reuseTmpGeometricField<resultType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + gf1.name() + #op + gf2.name() + ')',                     \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            gf1.dimensions() op gf2.dimensions()                               \
+            f1,                                                                \
+           '(' + f1.name() + #Op + f2.name() + ')',                            \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), gf1, gf2);                                        \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
                                                                                \
     return tres;                                                               \
 }                                                                              \
@@ -633,28 +559,27 @@ tmp                                                                            \
 <                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>::New   \
+        reuseTmpGeometricField<resultType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf2,                                                              \
-            '(' + gf1.name() + #op + gf2.name() + ')',                         \
-            gf1.dimensions() op gf2.dimensions()                               \
+            tf2,                                                               \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
-    tgf2.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
                                                                                \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -664,28 +589,27 @@ tmp                                                                            \
 <                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>::New   \
+        reuseTmpGeometricField<resultType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            '(' + gf1.name() + #op + gf2.name() + ')',                         \
-            gf1.dimensions() op gf2.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
                                                                                \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -695,77 +619,69 @@ tmp                                                                            \
 <                                                                              \
     GeometricField<typename product<Type1, Type2>::type, PatchField, GeoMesh>  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type1, Type2>::type productType;                  \
+    typedef typename product<Type1, Type2>::type resultType;                   \
                                                                                \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpTmpGeometricField                                              \
-        <productType, Type1, Type1, Type2, PatchField, GeoMesh>::New           \
+        <resultType, Type1, Type1, Type2, PatchField, GeoMesh>::New            \
         (                                                                      \
-            tgf1,                                                              \
-            tgf2,                                                              \
-            '(' + gf1.name() + #op + gf2.name() + ')',                         \
-            gf1.dimensions() op gf2.dimensions()                               \
+            tf1,                                                               \
+            tf2,                                                               \
+            '(' + f1.name() + #Op + f2.name() + ')',                           \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
-    tgf2.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
                                                                                \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     GeometricField                                                             \
-    <typename product<Type, Form>::type, PatchField, GeoMesh>& gf,             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    <typename product<Type, Form>::type, PatchField, GeoMesh>& result,         \
+    const GeometricField<Type, PatchField, GeoMesh>& f1,                       \
     const dimensioned<Form>& dvs                                               \
 )                                                                              \
 {                                                                              \
-    Foam::opFunc(gf.primitiveFieldRef(), gf1.primitiveField(), dvs.value());   \
-    Foam::opFunc(gf.boundaryFieldRef(), gf1.boundaryField(), dvs.value());     \
-    gf.oriented() = gf1.oriented();                                            \
+    Foam::OpFunc(result.primitiveFieldRef(), f1.primitiveField(), dvs.value());\
+    Foam::OpFunc(result.boundaryFieldRef(), f1.boundaryField(), dvs.value());  \
+    result.oriented() = f1.oriented();                                         \
 }                                                                              \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const GeometricField<Type, PatchField, GeoMesh>& f1,                       \
     const dimensioned<Form>& dvs                                               \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
+    typedef typename product<Type, Form>::type resultType;                     \
                                                                                \
     auto tres =                                                                \
-        tmp<GeometricField<productType, PatchField, GeoMesh>>::New             \
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New     \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + gf1.name() + #op + dvs.name() + ')',                     \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            gf1.dimensions() op dvs.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + #Op + dvs.name() + ')',                          \
+            (f1.dimensions() Op dvs.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), gf1, dvs);                                        \
+    Foam::OpFunc(tres.ref(), f1, dvs);                                         \
                                                                                \
     return tres;                                                               \
 }                                                                              \
@@ -779,41 +695,40 @@ template                                                                       \
     class GeoMesh                                                              \
 >                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const GeometricField<Type, PatchField, GeoMesh>& f1,                       \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    return gf1 op dimensioned<Form>(static_cast<const Form&>(vs));             \
+    return f1 Op dimensioned<Form>(static_cast<const Form&>(vs));              \
 }                                                                              \
                                                                                \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,                 \
     const dimensioned<Form>& dvs                                               \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Type, Form>::type productType;                    \
+    typedef typename product<Type, Form>::type resultType;                     \
                                                                                \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();             \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New    \
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New     \
         (                                                                      \
-            tgf1,                                                              \
-            '(' + gf1.name() + #op + dvs.name() + ')',                         \
-            gf1.dimensions() op dvs.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + #Op + dvs.name() + ')',                          \
+            (f1.dimensions() Op dvs.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), gf1, dvs);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
+    Foam::OpFunc(tres.ref(), f1, dvs);                                         \
                                                                                \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -826,58 +741,51 @@ template                                                                       \
     class GeoMesh                                                              \
 >                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,                 \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
-    return tgf1 op dimensioned<Form>(static_cast<const Form&>(vs));            \
+    return tf1 Op dimensioned<Form>(static_cast<const Form&>(vs));             \
 }                                                                              \
                                                                                \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     GeometricField                                                             \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>& gf,             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>& result,         \
     const dimensioned<Form>& dvs,                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+    const GeometricField<Type, PatchField, GeoMesh>& f2                        \
 )                                                                              \
 {                                                                              \
-    Foam::opFunc(gf.primitiveFieldRef(), dvs.value(), gf1.primitiveField());   \
-    Foam::opFunc(gf.boundaryFieldRef(), dvs.value(), gf1.boundaryField());     \
-    gf.oriented() = gf1.oriented();                                            \
+    Foam::OpFunc(result.primitiveFieldRef(), dvs.value(), f2.primitiveField());\
+    Foam::OpFunc(result.boundaryFieldRef(), dvs.value(), f2.boundaryField());  \
+    result.oriented() = f2.oriented();                                         \
 }                                                                              \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+    const GeometricField<Type, PatchField, GeoMesh>& f2                        \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
+    typedef typename product<Form, Type>::type resultType;                     \
                                                                                \
     auto tres =                                                                \
-        tmp<GeometricField<productType, PatchField, GeoMesh>>::New             \
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New     \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + dvs.name() + #op + gf1.name() + ')',                     \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            dvs.dimensions() op gf1.dimensions()                               \
+            f2,                                                                \
+            '(' + dvs.name() + #Op + f2.name() + ')',                          \
+            (dvs.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), dvs, gf1);                                        \
+    Foam::OpFunc(tres.ref(), dvs, f2);                                         \
                                                                                \
     return tres;                                                               \
 }                                                                              \
@@ -891,40 +799,39 @@ template                                                                       \
     class GeoMesh                                                              \
 >                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+    const GeometricField<Type, PatchField, GeoMesh>& f2                        \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op gf1;             \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) Op f2;              \
 }                                                                              \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf2                  \
 )                                                                              \
 {                                                                              \
-    typedef typename product<Form, Type>::type productType;                    \
+    typedef typename product<Form, Type>::type resultType;                     \
                                                                                \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();             \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
-        reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New    \
+        reuseTmpGeometricField<resultType, Type, PatchField, GeoMesh>::New     \
         (                                                                      \
-            tgf1,                                                              \
-            '(' + dvs.name() + #op + gf1.name() + ')',                         \
-            dvs.dimensions() op gf1.dimensions()                               \
+            tf2,                                                               \
+            '(' + dvs.name() + #Op + f2.name() + ')',                          \
+            (dvs.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::opFunc(tres.ref(), dvs, gf1);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
+    Foam::OpFunc(tres.ref(), dvs, f2);                                         \
                                                                                \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -937,15 +844,16 @@ template                                                                       \
     class GeoMesh                                                              \
 >                                                                              \
 tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>>   \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf2                  \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Form>(static_cast<const Form&>(vs)) op tgf1;            \
+    return dimensioned<Form>(static_cast<const Form&>(vs)) Op tf2;             \
 }
 
+
 PRODUCT_OPERATOR(typeOfSum, +, add)
 PRODUCT_OPERATOR(typeOfSum, -, subtract)
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 1f65866247..9b91dc3c07 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ License
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void component
@@ -47,16 +47,16 @@ void component
         typename GeometricField<Type, PatchField, GeoMesh>::cmptType,
         PatchField,
         GeoMesh
-    >& gcf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf,
+    >& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
     const direction d
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void T
 (
-     GeometricField<Type, PatchField, GeoMesh>& gf,
-     const GeometricField<Type, PatchField, GeoMesh>& gf1
+     GeometricField<Type, PatchField, GeoMesh>& result,
+     const GeometricField<Type, PatchField, GeoMesh>& f1
 );
 
 template
@@ -68,8 +68,9 @@ template
 >
 void pow
 (
-    GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>& gf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf1
+    GeometricField
+    <typename powProduct<Type, r>::type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 );
 
 template
@@ -86,7 +87,7 @@ tmp
 >
 pow
 (
-    const GeometricField<Type, PatchField, GeoMesh>& gf,
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
     typename powProduct<Type, r>::type
 );
 
@@ -104,7 +105,7 @@ tmp
 >
 pow
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,
     typename powProduct<Type, r>::type
 );
 
@@ -112,7 +113,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 void sqr
 (
     GeometricField
-    <typename outerProduct<Type, Type>::type, PatchField, GeoMesh>& gf,
+    <typename outerProduct<Type, Type>::type, PatchField, GeoMesh>& f1,
     const GeometricField<Type, PatchField, GeoMesh>& gf1
 );
 
@@ -126,7 +127,7 @@ tmp
         GeoMesh
     >
 >
-sqr(const GeometricField<Type, PatchField, GeoMesh>& gf);
+sqr(const GeometricField<Type, PatchField, GeoMesh>& f1);
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 tmp
@@ -138,48 +139,48 @@ tmp
         GeoMesh
     >
 >
-sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
+sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1);
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void magSqr
 (
-    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& gsf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 magSqr
 (
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 magSqr
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void mag
 (
-    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& gsf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& tf1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 mag
 (
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<typename typeOfMag<Type>::type, PatchField, GeoMesh>>
 mag
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -190,8 +191,8 @@ void cmptAv
         typename GeometricField<Type, PatchField, GeoMesh>::cmptType,
         PatchField,
         GeoMesh
-    >& gcf,
-    const GeometricField<Type, PatchField, GeoMesh>& gf
+    >& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -204,7 +205,7 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const GeometricField<Type, PatchField, GeoMesh>& gf);
+cmptAv(const GeometricField<Type, PatchField, GeoMesh>& f1);
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 tmp
@@ -216,21 +217,21 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
+cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1);
 
 
-#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, binaryOp)     \
+#define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(ReturnType, Func, BinaryOp)     \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+    const GeometricField<Type, PatchField, GeoMesh>& f1                        \
 );                                                                             \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1                  \
 );
 
 UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, max, maxOp)
@@ -241,18 +242,18 @@ UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(scalarMinMax, minMaxMag, minMaxMagOp)
 #undef UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY
 
 
-#define UNARY_REDUCTION_FUNCTION(returnType, func, gFunc)                      \
+#define UNARY_REDUCTION_FUNCTION(ReturnType, Func, gFunc)                      \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf                        \
+    const GeometricField<Type, PatchField, GeoMesh>& f1                        \
 );                                                                             \
                                                                                \
 template<class Type, template<class> class PatchField, class GeoMesh>          \
-dimensioned<returnType> func                                                   \
+dimensioned<ReturnType> Func                                                   \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1                  \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, sum, gSum)
@@ -273,7 +274,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
 
-// * * * * * * * * * * * * * * * Global operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
 
@@ -289,16 +290,16 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define PRODUCT_OPERATOR(product, op, opFunc)                                  \
+#define PRODUCT_OPERATOR(product, Op, OpFunc)                                  \
                                                                                \
 template                                                                       \
 <class Type1, class Type2, template<class> class PatchField, class GeoMesh>    \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     GeometricField                                                             \
-    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& gf,           \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    <typename product<Type1, Type2>::type, PatchField, GeoMesh>& result,       \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -308,10 +309,10 @@ tmp                                                                            \
     GeometricField                                                             \
         <typename product<Type1, Type2>::type, PatchField, GeoMesh>            \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -321,10 +322,10 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Type1, Type2>::type, PatchField, GeoMesh>                \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -334,10 +335,10 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Type1, Type2>::type, PatchField, GeoMesh>                \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -347,19 +348,19 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Type1, Type2>::type, PatchField, GeoMesh>                \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );                                                                             \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     GeometricField                                                             \
-    <typename product<Type, Form>::type, PatchField, GeoMesh>& gf,             \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    <typename product<Type, Form>::type, PatchField, GeoMesh>& result,         \
+    const GeometricField<Type, PatchField, GeoMesh>& f1,                       \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
@@ -370,9 +371,9 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Type, Form>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const GeometricField<Type, PatchField, GeoMesh>& f1,                       \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
@@ -389,9 +390,9 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1,                      \
+    const GeometricField<Type, PatchField, GeoMesh>& f1,                       \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
@@ -402,9 +403,9 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Type, Form>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,                 \
     const dimensioned<Form>& dvs                                               \
 );                                                                             \
                                                                                \
@@ -421,20 +422,20 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,                \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,                 \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
 template                                                                       \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>      \
-void opFunc                                                                    \
+void OpFunc                                                                    \
 (                                                                              \
     GeometricField                                                             \
-    <typename product<Form, Type>::type, PatchField, GeoMesh>& gf,             \
+    <typename product<Form, Type>::type, PatchField, GeoMesh>& result,         \
     const dimensioned<Form>& dvs,                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+    const GeometricField<Type, PatchField, GeoMesh>& f2                        \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -444,10 +445,10 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+    const GeometricField<Type, PatchField, GeoMesh>& f2                        \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -463,10 +464,10 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const GeometricField<Type, PatchField, GeoMesh>& gf1                       \
+    const GeometricField<Type, PatchField, GeoMesh>& f2                        \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -476,10 +477,10 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const dimensioned<Form>& dvs,                                              \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf2                  \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -495,10 +496,10 @@ tmp                                                                            \
     GeometricField                                                             \
     <typename product<Form, Type>::type, PatchField, GeoMesh>                  \
 >                                                                              \
-operator op                                                                    \
+operator Op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1                 \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf2                  \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index 31d79a638d..97b916586a 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,39 +40,31 @@ namespace Foam
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
 )                                                                              \
 {                                                                              \
-    Foam::Func(res.primitiveFieldRef(), gf1.primitiveField());                 \
-    Foam::Func(res.boundaryFieldRef(), gf1.boundaryField());                   \
-    res.oriented() = gf1.oriented();                                           \
+    Foam::Func(result.primitiveFieldRef(), f1.primitiveField());               \
+    Foam::Func(result.boundaryFieldRef(), f1.boundaryField());                 \
+    result.oriented() = f1.oriented();                                         \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + gf1.name() + ')',                                  \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            Dfunc(gf1.dimensions())                                            \
+            f1,                                                                \
+            #Func "(" + f1.name() + ')',                                       \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1);                                               \
-                                                                               \
+    Foam::Func(tres.ref(), f1);                                                \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -80,23 +72,21 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            #Func "(" + gf1.name() + ')',                                      \
-            Dfunc(gf1.dimensions())                                            \
-       );                                                                      \
-                                                                               \
-    Foam::Func(tres.ref(), gf1);                                               \
-                                                                               \
-    tgf1.clear();                                                              \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ')',                                       \
+            Dfunc(f1.dimensions())                                             \
+        );                                                                     \
                                                                                \
+    Foam::Func(tres.ref(), f1);                                                \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -108,38 +98,31 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
 )                                                                              \
 {                                                                              \
-    Foam::OpFunc(res.primitiveFieldRef(), gf1.primitiveField());               \
-    Foam::OpFunc(res.boundaryFieldRef(), gf1.boundaryField());                 \
-    res.oriented() = gf1.oriented();                                           \
+    Foam::OpFunc(result.primitiveFieldRef(), f1.primitiveField());             \
+    Foam::OpFunc(result.boundaryFieldRef(), f1.boundaryField());               \
+    result.oriented() = f1.oriented();                                         \
 }                                                                              \
                                                                                \
+                                                                               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Op + gf1.name(),                                              \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            Dfunc(gf1.dimensions())                                            \
+            f1,                                                                \
+            #Op + f1.name(),                                                   \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1);                                             \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1);                                              \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -147,23 +130,21 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            #Op + gf1.name(),                                                  \
-            Dfunc(gf1.dimensions())                                            \
+            tf1,                                                               \
+            #Op + f1.name(),                                                   \
+            Dfunc(f1.dimensions())                                             \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1);                                             \
-                                                                               \
-    tgf1.clear();                                                              \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1);                                              \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -175,51 +156,43 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
     Foam::Func                                                                 \
     (                                                                          \
-        res.primitiveFieldRef(),                                               \
-        gf1.primitiveField(),                                                  \
-        gf2.primitiveField()                                                   \
+        result.primitiveFieldRef(),                                            \
+        f1.primitiveField(),                                                   \
+        f2.primitiveField()                                                    \
     );                                                                         \
     Foam::Func                                                                 \
     (                                                                          \
-        res.boundaryFieldRef(),                                                \
-        gf1.boundaryField(),                                                   \
-        gf2.boundaryField()                                                    \
+        result.boundaryFieldRef(),                                             \
+        f1.boundaryField(),                                                    \
+        f2.boundaryField()                                                     \
     );                                                                         \
-    res.oriented() = Func(gf1.oriented(), gf2.oriented());                     \
+    result.oriented() = Func(f1.oriented(), f2.oriented());                    \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + gf1.name() + ',' + gf2.name() + ')',               \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            Func(gf1.dimensions(), gf2.dimensions())                           \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1, gf2);                                          \
-                                                                               \
+    Foam::Func(tres.ref(), f1, f2);                                            \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -227,24 +200,22 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf2,                                                              \
-            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                   \
-            Func(gf1.dimensions(), gf2.dimensions())                           \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1, gf2);                                          \
-                                                                               \
-    tgf2.clear();                                                              \
-                                                                               \
+    Foam::Func(tres.ref(), f1, f2);                                            \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -252,24 +223,22 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                   \
-            Func(gf1.dimensions(), gf2.dimensions())                           \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1, gf2);                                          \
-                                                                               \
-    tgf1.clear();                                                              \
-                                                                               \
+    Foam::Func(tres.ref(), f1, f2);                                            \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -277,29 +246,27 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpTmpGeometricField                                              \
             <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>             \
         ::New                                                                  \
         (                                                                      \
-            tgf1,                                                              \
-            tgf2,                                                              \
-            #Func "(" + gf1.name() + ',' + gf2.name() + ')',                   \
-            Func(gf1.dimensions(), gf2.dimensions())                           \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ')',                     \
+            Func(f1.dimensions(), f2.dimensions())                             \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1, gf2);                                          \
-                                                                               \
-    tgf1.clear();                                                              \
-    tgf2.clear();                                                              \
-                                                                               \
+    Foam::Func(tres.ref(), f1, f2);                                            \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -311,14 +278,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
     const dimensioned<Type1>& dt1,                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    Foam::Func(res.primitiveFieldRef(), dt1.value(), gf2.primitiveField());    \
-    Foam::Func(res.boundaryFieldRef(), dt1.value(), gf2.boundaryField());      \
-    res.oriented() = gf2.oriented();                                           \
+    Foam::Func(result.primitiveFieldRef(), dt1.value(), f2.primitiveField());  \
+    Foam::Func(result.boundaryFieldRef(), dt1.value(), f2.boundaryField());    \
+    result.oriented() = f2.oriented();                                         \
 }                                                                              \
                                                                                \
                                                                                \
@@ -326,26 +293,18 @@ TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + dt1.name() + ',' + gf2.name() + ')',               \
-                gf2.instance(),                                                \
-                gf2.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf2.mesh(),                                                        \
-            Func(dt1.dimensions(), gf2.dimensions())                           \
+            f2,                                                                \
+            #Func "(" + dt1.name() + ',' + f2.name() + ')',                    \
+            Func(dt1.dimensions(), f2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), dt1, gf2);                                          \
-                                                                               \
+    Foam::Func(tres.ref(), dt1, f2);                                           \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -353,11 +312,11 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const Type1& s1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    return Func(dimensioned<Type1>(t1), gf2);                                  \
+    return Func(dimensioned<Type1>(s1), f2);                                   \
 }                                                                              \
                                                                                \
                                                                                \
@@ -365,23 +324,21 @@ TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf2,                                                              \
-            #Func "(" + dt1.name() + gf2.name() + ',' + ')',                   \
-            Func(dt1.dimensions(), gf2.dimensions())                           \
+            tf2,                                                               \
+            #Func "(" + dt1.name() + ',' + f2.name() + ')',                    \
+            Func(dt1.dimensions(), f2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), dt1, gf2);                                          \
-                                                                               \
-    tgf2.clear();                                                              \
-                                                                               \
+    Foam::Func(tres.ref(), dt1, f2);                                           \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -389,11 +346,11 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const Type1& s1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    return Func(dimensioned<Type1>(t1), tgf2);                                 \
+    return Func(dimensioned<Type1>(s1), tf2);                                  \
 }
 
 
@@ -402,41 +359,33 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 void Func                                                                      \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
-    Foam::Func(res.primitiveFieldRef(), gf1.primitiveField(), dt2.value());    \
-    Foam::Func(res.boundaryFieldRef(), gf1.boundaryField(), dt2.value());      \
-    res.oriented() = gf1.oriented();                                           \
+    Foam::Func(result.primitiveFieldRef(), f1.primitiveField(), dt2.value());  \
+    Foam::Func(result.boundaryFieldRef(), f1.boundaryField(), dt2.value());    \
+    result.oriented() = f1.oriented();                                         \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #Func "(" + gf1.name() + ',' + dt2.name() + ')',               \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            Func(gf1.dimensions(), dt2.dimensions())                           \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + dt2.name() + ')',                    \
+            Func(f1.dimensions(), dt2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1, dt2);                                          \
-                                                                               \
+    Foam::Func(tres.ref(), f1, dt2);                                           \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -444,35 +393,33 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const Type2& t2                                                            \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return Func(gf1, dimensioned<Type2>(t2));                                  \
+    return Func(f1, dimensioned<Type2>(s2));                                   \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            #Func "(" + gf1.name() + ',' + dt2.name() + ')',                   \
-            Func(gf1.dimensions(), dt2.dimensions())                           \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ',' + dt2.name() + ')',                    \
+            Func(f1.dimensions(), dt2.dimensions())                            \
         );                                                                     \
                                                                                \
-    Foam::Func(tres.ref(), gf1, dt2);                                          \
-                                                                               \
-    tgf1.clear();                                                              \
-                                                                               \
+    Foam::Func(tres.ref(), f1, dt2);                                           \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -480,11 +427,11 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const Type2& t2                                                            \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return Func(tgf1, dimensioned<Type2>(t2));                                 \
+    return Func(tf1, dimensioned<Type2>(s2));                                  \
 }
 
 
@@ -500,43 +447,43 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
     Foam::OpFunc                                                               \
-    (res.primitiveFieldRef(), gf1.primitiveField(), gf2.primitiveField());     \
+    (                                                                          \
+        result.primitiveFieldRef(),                                            \
+        f1.primitiveField(),                                                   \
+        f2.primitiveField()                                                    \
+    );                                                                         \
     Foam::OpFunc                                                               \
-    (res.boundaryFieldRef(), gf1.boundaryField(), gf2.boundaryField());        \
-    res.oriented() = gf1.oriented() Op gf2.oriented();                         \
+    (                                                                          \
+        result.boundaryFieldRef(),                                             \
+        f1.boundaryField(),                                                    \
+        f2.boundaryField()                                                     \
+    );                                                                         \
+    result.oriented() = (f1.oriented() Op f2.oriented());                      \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + gf1.name() + OpName + gf2.name() + ')',                  \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            gf1.dimensions() Op gf2.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -544,24 +491,22 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf2,                                                              \
-            '(' + gf1.name() + OpName + gf2.name() + ')',                      \
-            gf1.dimensions() Op gf2.dimensions()                               \
+            tf2,                                                               \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
-    tgf2.clear();                                                              \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -569,24 +514,22 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            '(' + gf1.name() + OpName + gf2.name() + ')',                      \
-            gf1.dimensions() Op gf2.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -594,28 +537,26 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpTmpGeometricField                                              \
             <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>::New        \
         (                                                                      \
-            tgf1,                                                              \
-            tgf2,                                                              \
-            '(' + gf1.name() + OpName + gf2.name() + ')',                      \
-            gf1.dimensions() Op gf2.dimensions()                               \
+            tf1,                                                               \
+            tf2,                                                               \
+            '(' + f1.name() + OpName + f2.name() + ')',                        \
+            (f1.dimensions() Op f2.dimensions())                               \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1, gf2);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
-    tgf2.clear();                                                              \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, f2);                                          \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }
 
@@ -627,14 +568,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
     const dimensioned<Type1>& dt1,                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    Foam::OpFunc(res.primitiveFieldRef(), dt1.value(), gf2.primitiveField());  \
-    Foam::OpFunc(res.boundaryFieldRef(), dt1.value(), gf2.boundaryField());    \
-    res.oriented() = gf2.oriented();                                           \
+    Foam::OpFunc(result.primitiveFieldRef(), dt1.value(), f2.primitiveField());\
+    Foam::OpFunc(result.boundaryFieldRef(), dt1.value(), f2.boundaryField());  \
+    result.oriented() = f2.oriented();                                         \
                                                                                \
 }                                                                              \
                                                                                \
@@ -642,26 +583,18 @@ TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + dt1.name() + OpName + gf2.name() + ')',                  \
-                gf2.instance(),                                                \
-                gf2.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf2.mesh(),                                                        \
-            dt1.dimensions() Op gf2.dimensions()                               \
+            f2,                                                                \
+            '(' + dt1.name() + OpName + f2.name() + ')',                       \
+            (dt1.dimensions() Op f2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), dt1, gf2);                                        \
-                                                                               \
+    Foam::OpFunc(tres.ref(), dt1, f2);                                         \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -670,10 +603,10 @@ TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
     const Type1& t1,                                                           \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Type1>(t1) Op gf2;                                      \
+    return dimensioned<Type1>(t1) Op f2;                                       \
 }                                                                              \
                                                                                \
                                                                                \
@@ -681,23 +614,21 @@ TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();            \
+    const auto& f2 = tf2();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf2,                                                              \
-            '(' + dt1.name() + OpName + gf2.name() + ')',                      \
-            dt1.dimensions() Op gf2.dimensions()                               \
-        ) ;                                                                    \
-                                                                               \
-    Foam::OpFunc(tres.ref(), dt1, gf2);                                        \
-                                                                               \
-    tgf2.clear();                                                              \
+            tf2,                                                               \
+            '(' + dt1.name() + OpName + f2.name() + ')',                       \
+            (dt1.dimensions() Op f2.dimensions())                              \
+        );                                                                     \
                                                                                \
+    Foam::OpFunc(tres.ref(), dt1, f2);                                         \
+    tf2.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -705,11 +636,11 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2                \
+    const Type1& s1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 )                                                                              \
 {                                                                              \
-    return dimensioned<Type1>(t1) Op tgf2;                                     \
+    return dimensioned<Type1>(s1) Op tf2;                                      \
 }
 
 
@@ -718,41 +649,33 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 void OpFunc                                                                    \
 (                                                                              \
-    GeometricField<ReturnType, PatchField, GeoMesh>& res,                      \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
-    Foam::OpFunc(res.primitiveFieldRef(), gf1.primitiveField(), dt2.value());  \
-    Foam::OpFunc(res.boundaryFieldRef(), gf1.boundaryField(), dt2.value());    \
-    res.oriented() = gf1.oriented();                                           \
+    Foam::OpFunc(result.primitiveFieldRef(), f1.primitiveField(), dt2.value());\
+    Foam::OpFunc(result.boundaryFieldRef(), f1.boundaryField(), dt2.value());  \
+    result.oriented() = f1.oriented();                                         \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
     auto tres =                                                                \
-        tmp<GeometricField<ReturnType, PatchField, GeoMesh>>::New              \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                '(' + gf1.name() + OpName + dt2.name() + ')',                  \
-                gf1.instance(),                                                \
-                gf1.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gf1.mesh(),                                                        \
-            gf1.dimensions() Op dt2.dimensions()                               \
+            f1,                                                                \
+            '(' + f1.name() + OpName + dt2.name() + ')',                       \
+            (f1.dimensions() Op dt2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1, dt2);                                        \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, dt2);                                         \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -760,35 +683,33 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1,                     \
-    const Type2& t2                                                            \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return gf1 Op dimensioned<Type2>(t2);                                      \
+    return f1 Op dimensioned<Type2>(s2);                                       \
 }                                                                              \
                                                                                \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
     const dimensioned<Type2>& dt2                                              \
 )                                                                              \
 {                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();            \
+    const auto& f1 = tf1();                                                    \
                                                                                \
     auto tres =                                                                \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
         (                                                                      \
-            tgf1,                                                              \
-            '(' + gf1.name() + OpName + dt2.name() + ')',                      \
-            gf1.dimensions() Op dt2.dimensions()                               \
+            tf1,                                                               \
+            '(' + f1.name() + OpName + dt2.name() + ')',                       \
+            (f1.dimensions() Op dt2.dimensions())                              \
         );                                                                     \
                                                                                \
-    Foam::OpFunc(tres.ref(), gf1, dt2);                                        \
-                                                                               \
-    tgf1.clear();                                                              \
-                                                                               \
+    Foam::OpFunc(tres.ref(), f1, dt2);                                         \
+    tf1.clear();                                                               \
     return tres;                                                               \
 }                                                                              \
                                                                                \
@@ -796,11 +717,11 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,               \
-    const Type2& t2                                                            \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const Type2& s2                                                            \
 )                                                                              \
 {                                                                              \
-    return tgf1 Op dimensioned<Type2>(t2);                                     \
+    return tf1 Op dimensioned<Type2>(s2);                                      \
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
index 83109528dd..0af9f5159d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,32 +31,46 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                         \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+void Func                                                                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df                       \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1                 \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                   \
+#define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                   \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+void OpFunc                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1                 \
 );
 
 
@@ -64,6 +79,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                        \
                                                                                \
 TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
@@ -73,22 +96,22 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );
 
 
@@ -97,62 +120,78 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+void Func                                                                      \
 (                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
     const dimensioned<Type1>& dt1,                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
-(                                                                              \
-    const Type1& t1,                                                           \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const Type1& s1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)                \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+void Func                                                                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
-    const Type2& t2                                                            \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
-(                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf2,               \
-    const Type2& t2                                                            \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const Type2& s2                                                            \
 );
 
 
@@ -166,95 +205,119 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)          \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+void OpFunc                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+void OpFunc                                                                    \
 (                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
     const dimensioned<Type1>& dt1,                                             \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
-(                                                                              \
-    const Type1& t1,                                                           \
-    const GeometricField<Type2, PatchField, GeoMesh>& df2                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
     const dimensioned<Type1>& dt1,                                             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const Type1& t1,                                                           \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2                \
+    const Type1& s1,                                                           \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const dimensioned<Type1>& dt1,                                             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const Type1& s1,                                                           \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2                 \
 );
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+void OpFunc                                                                    \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const GeometricField<Type1, PatchField, GeoMesh>& df1,                     \
-    const Type2& t2                                                            \
-);                                                                             \
-                                                                               \
-TEMPLATE                                                                       \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
-(                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
     const dimensioned<Type2>& dt2                                              \
 );                                                                             \
                                                                                \
 TEMPLATE                                                                       \
 tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 (                                                                              \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,               \
-    const Type2& t2                                                            \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const Type2& s2                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const dimensioned<Type2>& dt2                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const Type2& s2                                                            \
 );
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index a2c2fe3f56..afe8d4b65b 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,6 +76,7 @@ inline bool reusable
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// One-parameter versions
 
 template
 <
@@ -86,24 +87,46 @@ template
 >
 struct reuseTmpGeometricField
 {
+    //- Pass-through to New GeometricField
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
+        const GeometricField<Type1, PatchField, GeoMesh>& f1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const auto& gf1 = tgf1();
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        (
+            IOobject
+            (
+                name,
+                f1.instance(),
+                f1.db()
+            ),
+            f1.mesh(),
+            dimensions
+        );
+    }
+
+    //- Dissimilar types: return new field
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
+    (
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,
+        const word& name,
+        const dimensionSet& dimensions
+    )
+    {
+        const auto& f1 = tf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                gf1.instance(),
-                gf1.db()
+                f1.instance(),
+                f1.db()
             ),
-            gf1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -117,41 +140,41 @@ struct reuseTmpGeometricField<TypeR, TypeR, PatchField, GeoMesh>
     //- for identical input and output types
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tf1,
         const word& name,
         const dimensionSet& dimensions,
         const bool initCopy = false
     )
     {
-        if (Detail::reusable(tgf1))
+        if (Detail::reusable(tf1))
         {
-            auto& gf1 = tgf1.constCast();
+            auto& f1 = tf1.constCast();
 
-            gf1.rename(name);
-            gf1.dimensions().reset(dimensions);
-            return tgf1;
+            f1.rename(name);
+            f1.dimensions().reset(dimensions);
+            return tf1;
         }
 
-        const auto& gf1 = tgf1();
+        const auto& f1 = tf1();
 
-        auto rtgf = tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        auto tresult = tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                gf1.instance(),
-                gf1.db()
+                f1.instance(),
+                f1.db()
             ),
-            gf1.mesh(),
+            f1.mesh(),
             dimensions
         );
 
         if (initCopy)
         {
-            rtgf.ref() == gf1;
+            tresult.ref() == f1;
         }
 
-        return rtgf;
+        return tresult;
     }
 };
 
@@ -163,7 +186,7 @@ tmp
     GeometricField<TypeR, PatchField, GeoMesh>
 > New
 (
-    const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
+    const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tf1,
     const word& name,
     const dimensionSet& dimensions,
     const bool initCopy = false
@@ -171,7 +194,7 @@ tmp
 {
     return reuseTmpGeometricField<TypeR, TypeR, PatchField, GeoMesh>::New
     (
-        tgf1,
+        tf1,
         name,
         dimensions,
         initCopy
@@ -192,23 +215,23 @@ struct reuseTmpTmpGeometricField
 {
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        const auto& gf1 = tgf1();
+        const auto& f1 = tf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                gf1.instance(),
-                gf1.db()
+                f1.instance(),
+                f1.db()
             ),
-            gf1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -230,32 +253,32 @@ struct reuseTmpTmpGeometricField
 {
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        if (Detail::reusable(tgf2))
+        if (Detail::reusable(tf2))
         {
-            auto& gf2 = tgf2.constCast();
+            auto& f2 = tf2.constCast();
 
-            gf2.rename(name);
-            gf2.dimensions().reset(dimensions);
-            return tgf2;
+            f2.rename(name);
+            f2.dimensions().reset(dimensions);
+            return tf2;
         }
 
-        const auto& gf1 = tgf1();
+        const auto& f1 = tf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                gf1.instance(),
-                gf1.db()
+                f1.instance(),
+                f1.db()
             ),
-            gf1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -276,32 +299,32 @@ struct reuseTmpTmpGeometricField
 {
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        if (Detail::reusable(tgf1))
+        if (Detail::reusable(tf1))
         {
-            auto& gf1 = tgf1.constCast();
+            auto& f1 = tf1.constCast();
 
-            gf1.rename(name);
-            gf1.dimensions().reset(dimensions);
-            return tgf1;
+            f1.rename(name);
+            f1.dimensions().reset(dimensions);
+            return tf1;
         }
 
-        const auto& gf1 = tgf1();
+        const auto& f1 = tf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                gf1.instance(),
-                gf1.db()
+                f1.instance(),
+                f1.db()
             ),
-            gf1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
@@ -316,47 +339,46 @@ struct reuseTmpTmpGeometricField
 {
     static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tgf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
-        if (Detail::reusable(tgf1))
+        if (Detail::reusable(tf1))
         {
-            auto& gf1 = tgf1.constCast();
+            auto& f1 = tf1.constCast();
 
-            gf1.rename(name);
-            gf1.dimensions().reset(dimensions);
-            return tgf1;
+            f1.rename(name);
+            f1.dimensions().reset(dimensions);
+            return tf1;
         }
-        if (Detail::reusable(tgf2))
+        if (Detail::reusable(tf2))
         {
-            auto& gf2 = tgf2.constCast();
+            auto& f2 = tf2.constCast();
 
-            gf2.rename(name);
-            gf2.dimensions().reset(dimensions);
-            return tgf2;
+            f2.rename(name);
+            f2.dimensions().reset(dimensions);
+            return tf2;
         }
 
-        const auto& gf1 = tgf1();
+        const auto& f1 = tf1();
 
         return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
         (
             IOobject
             (
                 name,
-                gf1.instance(),
-                gf1.db()
+                f1.instance(),
+                f1.db()
             ),
-            gf1.mesh(),
+            f1.mesh(),
             dimensions
         );
     }
 };
 
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

From ab10b4a05cfdba1a27b0abedb3c6c033e5a80c1b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 21 Jan 2023 22:30:33 +0100
Subject: [PATCH 089/348] EHN: add FieldFunction interface for 0/1 clamping

- enables clamp(field, zero_one{}) returning a tmp Field
---
 applications/test/minMax2/Test-minMax2.C      |  6 +-
 .../DimensionedFieldFunctions.C               | 67 +++++++++++++++++-
 .../DimensionedFieldFunctions.H               | 31 ++++++++-
 .../FieldField/FieldFieldFunctions.C          |  1 +
 .../FieldField/FieldFieldFunctions.H          |  1 +
 .../fields/Fields/Field/FieldFunctions.C      | 26 +++++++
 .../fields/Fields/Field/FieldFunctions.H      |  1 +
 .../GeometricField/GeometricFieldFunctions.C  | 68 +++++++++++++++++++
 .../GeometricField/GeometricFieldFunctions.H  | 30 ++++++++
 .../primitives/ranges/MinMax/MinMax.H         |  3 +-
 10 files changed, 227 insertions(+), 7 deletions(-)

diff --git a/applications/test/minMax2/Test-minMax2.C b/applications/test/minMax2/Test-minMax2.C
index 531235e6f5..136681d75c 100644
--- a/applications/test/minMax2/Test-minMax2.C
+++ b/applications/test/minMax2/Test-minMax2.C
@@ -152,13 +152,13 @@ int main(int argc, char *argv[])
         Info<< nl
             << "field: " << flatOutput(someField) << nl;
         Info<< "clamp01: "
-            << flatOutput(clamp(someField, scalarMinMax(zero_one{}))()) << nl;
+            << flatOutput(clamp(someField, zero_one{})()) << nl;
 
         Info<< "clamp01: "
-            << clamp(tmp<scalarField>(someField), scalarMinMax(zero_one{}))<< nl;
+            << clamp(tmp<scalarField>(someField), zero_one{})<< nl;
 
         scalarField result(10);
-        clamp(result, someField, scalarMinMax(zero_one{}));
+        clamp(result, someField, zero_one{});
 
         Info<< "result: " << result << nl;
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index 841324d1f2..c2217d2fd1 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -319,7 +319,72 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
-BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
+
+// ------------------------------------------------------------------------- //
+
+// Clamp Methods
+
+template<class Type, class GeoMesh>
+void clamp
+(
+    DimensionedField<Type, GeoMesh>& result,
+    const DimensionedField<Type, GeoMesh>& f1,
+    const Foam::zero_one
+)
+{
+    const MinMax<Type> range(Foam::zero_one{});
+
+    clamp(result.field(), f1.field(), range);
+    result.oriented() = f1.oriented();
+}
+
+template<class Type, class GeoMesh>
+tmp<DimensionedField<Type, GeoMesh>>
+clamp
+(
+    const DimensionedField<Type, GeoMesh>& f1,
+    const Foam::zero_one
+)
+{
+    auto tres =
+        reuseTmpDimensionedField<Type, Type, GeoMesh>::New
+        (
+            f1,
+            "clamp01(" + f1.name() + ')',
+            f1.dimensions()
+        );
+
+    clamp(tres.ref(), f1, Foam::zero_one{});
+
+    return tres;
+}
+
+
+template<class Type, class GeoMesh>
+tmp<DimensionedField<Type, GeoMesh>>
+clamp
+(
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,
+    const Foam::zero_one
+)
+{
+    const auto& f1 = tf1();
+
+    auto tres =
+        reuseTmpDimensionedField<Type, Type, GeoMesh>::New
+        (
+            tf1,
+            "clamp01(" + f1.name() + ')',
+            f1.dimensions()
+        );
+
+    clamp(tres.field(), f1, Foam::zero_one{});
+
+    tf1.clear();
+    return tres;
+}
+
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index 3adb4ececb..537c736624 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -137,7 +137,36 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
-BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)
+
+// ------------------------------------------------------------------------- //
+
+// Clamp Methods
+
+template<class Type, class GeoMesh>
+void clamp
+(
+    DimensionedField<Type, GeoMesh>& result,
+    const DimensionedField<Type, GeoMesh>& f1,
+    const Foam::zero_one
+);
+
+template<class Type, class GeoMesh>
+tmp<DimensionedField<Type, GeoMesh>>
+clamp
+(
+    const DimensionedField<Type, GeoMesh>& f1,
+    const Foam::zero_one
+);
+
+template<class Type, class GeoMesh>
+tmp<DimensionedField<Type, GeoMesh>>
+clamp
+(
+    const tmp<DimensionedField<Type, GeoMesh>>& tf1,
+    const Foam::zero_one
+);
+
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index abfeab9928..dfda7e3602 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -630,6 +630,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
+// Note: works with zero_one through implicit conversion to MinMax
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index b1b0501e95..9776c63c37 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -287,6 +287,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
+// Note: works with zero_one through implicit conversion to MinMax
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index f3e136c2e9..4a4e8d1177 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -700,7 +700,33 @@ void clamp
     }
 }
 
+template<class Type>
+void clamp
+(
+    Field<Type>& result,
+    const UList<Type>& f1,
+    const Foam::zero_one&   // Note: macros generate a const reference
+)
+{
+    if (result.cdata() == f1.cdata())
+    {
+        // Apply in-place
+        result.clamp_range(Foam::zero_one{});
+    }
+    else
+    {
+        std::transform
+        (
+            f1.cbegin(),
+            f1.cbegin(result.size()),
+            result.begin(),
+            clampOp<Type>(Foam::zero_one{})
+        );
+    }
+}
+
 BINARY_FUNCTION_INTERFACE_FS(Type, Type, MinMax<Type>, clamp)
+BINARY_FUNCTION_INTERFACE_FS(Type, Type, Foam::zero_one, clamp)
 
 
 BINARY_FUNCTION(Type, Type, Type, max)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 57a0c5db18..9307b9d155 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -314,6 +314,7 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
+BINARY_TYPE_FUNCTION_FS(Type, Type, Foam::zero_one, clamp)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)  // Same as clamp
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index 0c686d3be2..a62fd98b54 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -480,6 +480,74 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
 
+// ------------------------------------------------------------------------- //
+
+// Clamp Methods
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void clamp
+(
+    GeometricField<Type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
+    const Foam::zero_one
+)
+{
+    const MinMax<Type> range(Foam::zero_one{});
+
+    clamp(result.primitiveFieldRef(), f1.primitiveField(), range);
+    clamp(result.boundaryFieldRef(), f1.boundaryField(), range);
+    result.oriented() = f1.oriented();
+}
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+tmp<GeometricField<Type, PatchField, GeoMesh>>
+clamp
+(
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
+    const Foam::zero_one
+)
+{
+    auto tres =
+        reuseTmpGeometricField<Type, Type, PatchField, GeoMesh>::New
+        (
+            f1,
+            "clamp01(" + f1.name() + ')',
+            f1.dimensions()
+        );
+
+    clamp(tres.ref(), f1, Foam::zero_one{});
+
+    return tres;
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+tmp<GeometricField<Type, PatchField, GeoMesh>>
+clamp
+(
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,
+    const Foam::zero_one
+)
+{
+    const auto& f1 = tf1();
+
+    auto tres =
+        reuseTmpGeometricField<Type, Type, PatchField, GeoMesh>::New
+        (
+            tf1,
+            "clamp01(" + f1.name() + ')',
+            f1.dimensions()
+        );
+
+    clamp(tres.ref(), f1, Foam::zero_one{});
+
+    tf1.clear();
+    return tres;
+}
+
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 9b91dc3c07..937a07e443 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
@@ -273,6 +273,36 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, min)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptMultiply)
 BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
+// ------------------------------------------------------------------------- //
+
+// Clamp Methods
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void clamp
+(
+    GeometricField<Type, PatchField, GeoMesh>& result,
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
+    const Foam::zero_one
+);
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+tmp<GeometricField<Type, PatchField, GeoMesh>>
+clamp
+(
+    const GeometricField<Type, PatchField, GeoMesh>& f1,
+    const Foam::zero_one
+);
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+tmp<GeometricField<Type, PatchField, GeoMesh>>
+clamp
+(
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tf1,
+    const Foam::zero_one
+);
+
+BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
+
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H b/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H
index 3738f8847a..be7a3ee8c8 100644
--- a/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H
+++ b/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H
@@ -85,6 +85,7 @@ Description
 #define Foam_MinMax_H
 
 #include "scalar.H"
+#include "zero.H"
 #include "Pair.H"
 #include "Tuple2.H"
 #include "VectorSpace.H"
@@ -97,8 +98,6 @@ namespace Foam
 
 // Forward Declarations
 template<class T> class MinMax;
-class zero;
-class zero_one;
 
 // Common min/max types
 typedef MinMax<label> labelMinMax;      //!< A label min/max range

From e1a710014c4db859be7bdd864e50e448af8f6bd5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 19 Jan 2023 16:03:39 +0100
Subject: [PATCH 090/348] ENH: define lerp field functions

- defined for lerp between two fields,
  either with a constant or a field of interpolation factors.

  * plain Field, DimensionedField, FieldField, GeometricFields

- using a field to lerp between two constants is not currently
  supported
---
 .../test/speed/vectorSpeed/Test-vectorSpeed.C | 200 ++++++++-
 .../DimensionedFieldFunctions.C               |   6 +
 .../DimensionedFieldFunctions.H               |   6 +
 .../DimensionedFieldFunctionsM.C              | 374 ++++++++++++++++
 .../DimensionedFieldFunctionsM.H              | 154 +++++++
 .../FieldField/FieldFieldFunctions.C          |   6 +
 .../FieldField/FieldFieldFunctions.H          |   5 +
 .../FieldField/FieldFieldFunctionsM.C         | 235 ++++++++++
 .../FieldField/FieldFieldFunctionsM.H         | 122 ++++++
 .../fields/Fields/Field/FieldFunctions.C      |   5 +
 .../fields/Fields/Field/FieldFunctions.H      |   5 +
 .../fields/Fields/Field/FieldFunctionsM.C     | 211 +++++++++
 .../fields/Fields/Field/FieldFunctionsM.H     | 132 ++++++
 .../GeometricField/GeometricFieldFunctions.C  |   6 +
 .../GeometricField/GeometricFieldFunctions.H  |   6 +
 .../GeometricField/GeometricFieldFunctionsM.C | 401 ++++++++++++++++++
 .../GeometricField/GeometricFieldFunctionsM.H | 154 +++++++
 17 files changed, 2017 insertions(+), 11 deletions(-)

diff --git a/applications/test/speed/vectorSpeed/Test-vectorSpeed.C b/applications/test/speed/vectorSpeed/Test-vectorSpeed.C
index 2ab430d34a..0acdc5d84c 100644
--- a/applications/test/speed/vectorSpeed/Test-vectorSpeed.C
+++ b/applications/test/speed/vectorSpeed/Test-vectorSpeed.C
@@ -1,3 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-vectorSpeed
+
+Description
+    Test speeds, usability of some field operations
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
 #include "primitiveFields.H"
 #include "cpuTime.H"
 #include "IOstreams.H"
@@ -5,12 +40,22 @@
 
 using namespace Foam;
 
-int main()
-{
-    const label nIter = 100;
-    const label size = 1000000;
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info<< "Initialising fields" << endl;
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::addBoolOption("lerp");
+
+    argList args(argc, argv);
+
+    const label nIter = 1000;
+    const label size = (1000000);
+
+    Info<< "Initialising fields. size:" << size
+        << " max:" << labelMax << endl;
+
+    scalarField onet(size);
 
     vectorField
         vf1(size, vector::one),
@@ -18,11 +63,14 @@ int main()
         vf3(size, vector::one),
         vf4(size);
 
-    Info<< "Done\n" << endl;
+    Info<< "Start loop: " << nIter << endl;
 
+    cpuTime timing;
+
+    // Timing is mostly malloc anyhow...
+
+    if (!args.found("lerp"))
     {
-        cpuTime executionTime;
-
         Info<< "vectorField algebra" << endl;
 
         for (int j=0; j<nIter; j++)
@@ -30,12 +78,142 @@ int main()
             vf4 = vf1 + vf2 - vf3;
         }
 
-        Info<< "ExecutionTime = "
-            << executionTime.elapsedCpuTime()
-            << " s\n" << endl;
+        Info<< "Timing = " << timing.cpuTimeIncrement() << " s" << endl;
 
         Snull<< vf4[1] << endl << endl;
     }
 
+    if (args.found("lerp"))
+    {
+        Info<< nl
+            << "testing timings with lerp 0.75" << nl
+            << "Main bottlenecks: malloc and looping" << nl;
+
+        scalar t = 0.75;
+        scalarField fract(size, t);
+
+        // Basic compilation tests:
+        lerp(vf1, vf2, fract)().size();             // list list list
+        lerp(0.5*vf1, vf2, fract)().size();         // tmp  list list
+        lerp(vf1, 0.5*vf2, fract)().size();         // list tmp  list
+        lerp(vf1, vf2, 0.5*fract)().size();         // list list tmp
+        lerp(0.5*vf1, 0.5*vf2, fract)().size();     // tmp  tmp  list
+        lerp(0.5*vf1, vf2, 0.5*fract)().size();     // tmp  list tmp
+        lerp(vf1, 1.0*vf2, 0.5*fract)().size();     // list tmp  tmp
+        lerp(0.5*vf1, 0.5*vf2, 0.5*fract)().size(); // tmp  tmp  tmp
+
+        // Basic compilation tests:
+        lerp(vf1, vf2, t)().size();                 // list list scalar
+        lerp(0.5*vf1, vf2, t)().size();             // tmp  list scalar
+        lerp(vf1, 0.5*vf2, t)().size();             // list tmp  scalar
+        lerp(0.5*vf1, 0.5*vf2, t)().size();         // tmp  tmp  scalar
+        lerp(vf1, 1.0*vf2, 0.5*t)().size();         // list tmp  scalar
+
+        // Other combinations (not yet included)
+        // list scalar list...
+        // scalar list list...
+
+
+        // Probable base line of single instruction multiple data
+        for (int j=0; j<nIter; j++)
+        {
+            const label loopLen = (vf1).size();
+
+            for (label i = 0; i < loopLen; ++i)
+            {
+                vf4[i] = (1-fract[i])*vf1[i] + fract[i]*vf2[i];
+            }
+        }
+
+        Info<< "(1-t)*a + t*b : Timing (no malloc) = "
+            << timing.cpuTimeIncrement() << " s" << endl;
+
+        Snull<< vf4[1] << endl << endl;
+
+        // With all loops written out
+        // - corresponds to what we would normally have
+        for (int j=0; j<nIter; j++)
+        {
+            const label loopLen = (vf1).size();
+
+            for (label i = 0; i < loopLen; ++i)
+            {
+                onet[i] = (1-fract[i]);
+            }
+
+            for (label i = 0; i < loopLen; ++i)
+            {
+                vf3[i] = (fract[i] * vf2[i]);
+            }
+
+            for (label i = 0; i < loopLen; ++i)
+            {
+                vf4[i] = onet[i] * vf1[i];
+            }
+
+            for (label i = 0; i < loopLen; ++i)
+            {
+                vf4[i] += vf3[i];
+            }
+        }
+
+        Info<< "(1-t)*a + t*b : Looping (no malloc) = "
+            << timing.cpuTimeIncrement() << " s" << endl;
+
+        Snull<< vf4[1] << endl << endl;
+
+        for (int j=0; j<nIter; j++)
+        {
+            lerp(vf4, vf1, vf2, fract);
+        }
+
+        Info<< "lerp(a, b, t) : Timing (no malloc) = "
+            << timing.cpuTimeIncrement() << " s" << endl;
+
+        Snull<< vf4[1] << endl << endl;
+
+        Info<< nl;
+
+        // Now with tmp fields
+        // ~~~~~~~~~~~~~~~~~~~
+
+        for (int j=0; j<nIter; j++)
+        {
+            vf4 = (1-fract)*vf1 + fract*vf2;
+        }
+
+        Info<< "(1-t)*a + t*b : Timing (with malloc) = "
+            << timing.cpuTimeIncrement() << " s" << endl;
+
+        Snull<< vf4[1] << endl << endl;
+
+        for (int j=0; j<nIter; j++)
+        {
+            // With field 't'
+            vf4 = lerp(vf1, vf2, fract);
+        }
+
+        Info<< "lerp(a, b, t) : Timing (with malloc) = "
+            << timing.cpuTimeIncrement() << " s" << endl;
+
+        Snull<< vf4[1] << endl << endl;
+
+        for (int j=0; j<nIter; j++)
+        {
+            // With scalar 't'
+            vf4 = lerp(vf1, vf2, t);
+        }
+
+        Info<< "lerp(a, b, t) : Timing (with malloc) scalar = "
+            << timing.cpuTimeIncrement() << " s" << endl;
+
+        Snull<< vf4[1] << endl << endl;
+    }
+
+
+    Info<< nl << "Done" << nl << endl;
     return 0;
 }
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index c2217d2fd1..621b49200f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
@@ -387,6 +387,12 @@ clamp
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index 537c736624..e444690399 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -169,6 +169,12 @@ clamp
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index e8ee293203..c748949715 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
@@ -694,4 +694,378 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Func(result.field(), f1.field(), f2.field(), f3.field());                  \
+    result.oriented() = Func(f1.oriented(), f2.oriented());                    \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+)                                                                              \
+{                                                                              \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+)                                                                              \
+{                                                                              \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
+        (                                                                      \
+            tf2,                                                               \
+            #Func "(" + f1.name() +','+ f2.name() +','+ f3.name() +')',        \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+)                                                                              \
+{                                                                              \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type3, GeoMesh>::New              \
+        (                                                                      \
+            tf3,                                                               \
+            #Func "(" + f1.name() +','+ f2.name() +','+ f3.name() +')',        \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpDimensionedField                                            \
+        <ReturnType, Type1, Type1, Type2, GeoMesh>::New                        \
+        (                                                                      \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() +','+ f2.name() +','+ f3.name() +')',        \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpDimensionedField                                            \
+        <ReturnType, Type1, Type1, Type3, GeoMesh>::New                        \
+        (                                                                      \
+            tf1,                                                               \
+            tf3,                                                               \
+            #Func "(" + f1.name() +','+ f2.name() +','+ f3.name() +')',        \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf1.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+)                                                                              \
+{                                                                              \
+    const auto& f2 = tf2();                                                    \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpDimensionedField                                            \
+        <ReturnType, Type2, Type2, Type3, GeoMesh>::New                        \
+        (                                                                      \
+            tf2,                                                               \
+            tf3,                                                               \
+            #Func "(" + f1.name() +','+ f2.name() +','+ f3.name() +')',        \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    /* TBD: check all three types? */                                          \
+    auto tres =                                                                \
+        reuseTmpTmpDimensionedField                                            \
+        <ReturnType, Type1, Type1, Type2, GeoMesh>::New                        \
+        (                                                                      \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() +','+ f2.name() +','+ f3.name() +')',        \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    /* TBD: reset dimensions? */                                               \
+    Func(result.field(), f1.field(), f2.field(), dt3.value());                 \
+    result.oriented() = Func(f1.oriented(), f2.oriented());                    \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, dt3);                                             \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(f1, f2, dimensioned<Type3>(s3));                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New              \
+        (                                                                      \
+            tf1,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, dt3);                                             \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(tf1, f2, dimensioned<Type3>(s3));                              \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New              \
+        (                                                                      \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, dt3);                                             \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(f1, tf2, dimensioned<Type3>(s3));                              \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpDimensionedField                                            \
+        <ReturnType, Type1, Type1, Type2, GeoMesh>::New                        \
+        (                                                                      \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Func(tres.ref(), f1, f2, dt3);                                             \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Func(tf1, tf2, dimensioned<Type3>(s3));                             \
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
index a3157242f2..7c1d81c6df 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
@@ -326,4 +326,158 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const DimensionedField<Type3, GeoMesh>& f3                                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const tmp<DimensionedField<Type3, GeoMesh>>& tf3                           \
+);
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    DimensionedField<ReturnType, GeoMesh>& result,                             \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const DimensionedField<Type2, GeoMesh>& f2,                                \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const DimensionedField<Type1, GeoMesh>& f1,                                \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                                \
+(                                                                              \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tf1,                          \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tf2,                          \
+    const Type3& s3                                                            \
+);
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index dfda7e3602..54a489deac 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -634,6 +634,12 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
+
 /* * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * */
 
 UNARY_OPERATOR(Type, Type, -, negate)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index 9776c63c37..843bf67c58 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
@@ -290,6 +290,11 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 // Note: works with zero_one through implicit conversion to MinMax
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
 
 /* * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * */
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index d2dc88ce0b..5becaa4753 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
@@ -459,4 +459,239 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const FieldField<Field, Type3>& f3                                         \
+)                                                                              \
+{                                                                              \
+    const label loopLen = (result).size();                                     \
+                                                                               \
+    for (label i = 0; i < loopLen; ++i)                                        \
+    {                                                                          \
+        Func(result[i], f1[i], f2[i], f3[i]);                                  \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const FieldField<Field, Type3>& f3                                         \
+)                                                                              \
+{                                                                              \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2,                                        \
+    const FieldField<Field, Type3>& f3                                         \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
+    Func(tres.ref(), tf1(), f2, f3);                                           \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const FieldField<Field, Type3>& f3                                         \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2);        \
+    Func(tres.ref(), f1, tf2(), f3);                                           \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type3>::New(tf3);        \
+    Func(tres.ref(), f1, f2, tf3());                                           \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const FieldField<Field, Type3>& f3                                         \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tres                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
+            New(tf1, tf2)                                                      \
+    );                                                                         \
+    Func(tres.ref(), tf1(), tf2(), f3);                                        \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2,                                        \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tres                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type3>::        \
+            New(tf1, tf3)                                                      \
+    );                                                                         \
+    Func(tres.ref(), tf1(), f2, tf3());                                        \
+    tf1.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tres                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type2, Type2, Type3>::        \
+            New(tf2, tf3)                                                      \
+    );                                                                         \
+    Func(tres.ref(), f1, tf2(), tf3());                                        \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+)                                                                              \
+{                                                                              \
+    /* TBD: check all three types? */                                          \
+    tmp<FieldField<Field, ReturnType>> tres                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
+            New(tf1, tf2)                                                      \
+    );                                                                         \
+    Func(tres.ref(), tf1(), tf2(), tf3());                                     \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    const label loopLen = (result).size();                                     \
+                                                                               \
+    for (label i = 0; i < loopLen; ++i)                                        \
+    {                                                                          \
+        Func(result[i], f1[i], f2[i], s3);                                     \
+    }                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = FieldField<Field, ReturnType>::NewCalculatedType(f1);          \
+    Func(tres.ref(), f1, f2, s3);                                              \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2,                                        \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1);        \
+    Func(tres.ref(), tf1(), f2, s3);                                           \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2);        \
+    Func(tres.ref(), f1, tf2(), s3);                                           \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    tmp<FieldField<Field, ReturnType>> tres                                    \
+    (                                                                          \
+        reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::        \
+            New(tf1, tf2)                                                      \
+    );                                                                         \
+    Func(tres.ref(), tf1(), tf2(), s3);                                        \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
index 1e3b0501e8..81aac62600 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
@@ -273,4 +273,126 @@ tmp<FieldField<Field, ReturnType>> operator Op                                 \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const FieldField<Field, Type3>& f3                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const FieldField<Field, Type3>& f3                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2,                                        \
+    const FieldField<Field, Type3>& f3                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const FieldField<Field, Type3>& f3                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const FieldField<Field, Type3>& f3                                         \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2,                                        \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const tmp<FieldField<Field, Type3>>& tf3                                   \
+);
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    FieldField<Field, ReturnType>& result,                                     \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const FieldField<Field, Type2>& f2,                                        \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const FieldField<Field, Type2>& f2,                                        \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const FieldField<Field, Type1>& f1,                                        \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<FieldField<Field, ReturnType>> Func                                        \
+(                                                                              \
+    const tmp<FieldField<Field, Type1>>& tf1,                                  \
+    const tmp<FieldField<Field, Type2>>& tf2,                                  \
+    const Type3& s3                                                            \
+);
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index 4a4e8d1177..583c443971 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -741,6 +741,11 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
 
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)  // Same as clamp
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
 
 /* * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * */
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 9307b9d155..6ed4076872 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -317,6 +317,11 @@ BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 BINARY_TYPE_FUNCTION_FS(Type, Type, Foam::zero_one, clamp)
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clip)  // Same as clamp
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index e82f2e6345..39829843ab 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
@@ -438,4 +438,215 @@ tmp<Field<ReturnType>> operator Op                                             \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const UList<Type3>& f3                                                     \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_F_F_F                                                   \
+    (                                                                          \
+        ReturnType, result, =, ::Foam::Func, Type1, f1, Type2, f2, Type3, f3   \
+    )                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const UList<Type3>& f3                                                     \
+)                                                                              \
+{                                                                              \
+    auto tres = tmp<Field<ReturnType>>::New(f1.size());                        \
+    Func(tres.ref(), f1, f2, f3);                                              \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2,                                                    \
+    const UList<Type3>& f3                                                     \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type1>::New(tf1);                         \
+    Func(tres.ref(), tf1(), f2, f3);                                           \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const UList<Type3>& f3                                                     \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type2>::New(tf2);                         \
+    Func(tres.ref(), f1, tf2(), f3);                                           \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const tmp<Field<Type3>>& tf3                                               \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type3>::New(tf3);                         \
+    Func(tres.ref(), f1, f2, tf3());                                           \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const UList<Type3>& f3                                                     \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);   \
+    Func(tres.ref(), tf1(), tf2(), f3);                                        \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2,                                                    \
+    const tmp<Field<Type3>>& tf3                                               \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpTmp<ReturnType, Type1, Type1, Type3>::New(tf1, tf3);   \
+    Func(tres.ref(), tf1(), f2, tf3());                                        \
+    tf1.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const tmp<Field<Type3>>& tf3                                               \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpTmp<ReturnType, Type2, Type2, Type3>::New(tf2, tf3);   \
+    Func(tres.ref(), f1, tf2(), tf3());                                        \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const tmp<Field<Type3>>& tf3                                               \
+)                                                                              \
+{                                                                              \
+    /* TBD: check all three types? */                                          \
+    auto tres = reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);   \
+    Func(tres.ref(), tf1(), tf2(), tf3());                                     \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    TFOR_ALL_F_OP_FUNC_F_F_S                                                   \
+    (                                                                          \
+        ReturnType, result, =, ::Foam::Func, Type1, f1, Type2, f2, Type3, s3   \
+    )                                                                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = tmp<Field<ReturnType>>::New(f1.size());                        \
+    Func(tres.ref(), f1, f2, s3);                                              \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2,                                                    \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type1>::New(tf1);                         \
+    Func(tres.ref(), tf1(), f2, s3);                                           \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmp<ReturnType, Type2>::New(tf2);                         \
+    Func(tres.ref(), f1, tf2(), s3);                                           \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    auto tres = reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);   \
+    Func(tres.ref(), tf1(), tf2(), s3);                                        \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
index 1730ad22ba..e8fcb52c5e 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
@@ -270,4 +270,136 @@ tmp<Field<ReturnType>> operator Op                                             \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const UList<Type3>& f3                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const UList<Type3>& f3                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2,                                                    \
+    const UList<Type3>& f3                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const UList<Type3>& f3                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const tmp<Field<Type3>>& tf3                                               \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const UList<Type3>& f3                                                     \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2,                                                    \
+    const tmp<Field<Type3>>& tf3                                               \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const tmp<Field<Type3>>& tf3                                               \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const tmp<Field<Type3>>& tf3                                               \
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Permutations of ternary functions taking non-field argument(s)
+//
+// FFS (defined)
+// FSF (not defined)
+// SFF (not defined)
+// SSF (not defined)
+// SFS (not defined)
+// FSS (not defined)
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    Field<ReturnType>& result,                                                 \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const UList<Type2>& f2,                                                    \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const UList<Type2>& f2,                                                    \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const UList<Type1>& f1,                                                    \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<Field<ReturnType>> Func                                                    \
+(                                                                              \
+    const tmp<Field<Type1>>& tf1,                                              \
+    const tmp<Field<Type2>>& tf2,                                              \
+    const Type3& s3                                                            \
+);
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index a62fd98b54..18d2b0cdeb 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
@@ -548,6 +548,12 @@ clamp
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 937a07e443..65863a90c0 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
@@ -304,6 +304,12 @@ clamp
 BINARY_TYPE_FUNCTION_FS(Type, Type, MinMax<Type>, clamp)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+TERNARY_FUNCTION(Type, Type, Type, scalar, lerp)
+TERNARY_TYPE_FUNCTION_FFS(Type, Type, Type, scalar, lerp)
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 UNARY_OPERATOR(Type, Type, -, negate, transform)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index 97b916586a..d8e5ec5b92 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
@@ -732,6 +732,407 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+)                                                                              \
+{                                                                              \
+    Foam::Func                                                                 \
+    (                                                                          \
+        result.primitiveFieldRef(),                                            \
+        f1.primitiveField(),                                                   \
+        f2.primitiveField(),                                                   \
+        f3.primitiveField()                                                    \
+    );                                                                         \
+    Foam::Func                                                                 \
+    (                                                                          \
+        result.boundaryFieldRef(),                                             \
+        f1.boundaryField(),                                                    \
+        f2.boundaryField(),                                                    \
+        f3.boundaryField()                                                     \
+    );                                                                         \
+    result.oriented() = Func(f1.oriented(), f2.oriented());                    \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+)                                                                              \
+{                                                                              \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+)                                                                              \
+{                                                                              \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            f2,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+)                                                                              \
+{                                                                              \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type3, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            f3,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>             \
+        ::New                                                                  \
+        (                                                                      \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type1, Type1, Type3, PatchField, GeoMesh>             \
+        ::New                                                                  \
+        (                                                                      \
+            tf1,                                                               \
+            tf3,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf1.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+)                                                                              \
+{                                                                              \
+    const auto& f2 = tf2();                                                    \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type2, Type2, Type3, PatchField, GeoMesh>             \
+        ::New                                                                  \
+        (                                                                      \
+            tf2,                                                               \
+            tf3,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
+    const auto& f3 = tf3();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>             \
+        ::New                                                                  \
+        (                                                                      \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + f3.name() + ')',   \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, f3);                                        \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    tf3.clear();                                                               \
+    return tres;                                                               \
+}
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<ReturnType, PatchField, GeoMesh>& result,                   \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    Foam::Func                                                                 \
+    (                                                                          \
+        result.primitiveFieldRef(),                                            \
+        f1.primitiveField(),                                                   \
+        f2.primitiveField(),                                                   \
+        dt3.value()                                                            \
+    );                                                                         \
+    Foam::Func                                                                 \
+    (                                                                          \
+        result.boundaryFieldRef(),                                             \
+        f1.boundaryField(),                                                    \
+        f2.boundaryField(),                                                    \
+        dt3.value()                                                            \
+    );                                                                         \
+    result.oriented() = Func(f1.oriented(), f2.oriented());                    \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, dt3.value());                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Foam::Func(f1, f2, dimensioned<Type>(s3));                          \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            f1,                                                                \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, dt3.value());                               \
+    tf1.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Foam::Func(tf1, f2, dimensioned<Type>(s3));                         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New    \
+        (                                                                      \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, dt3.value());                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Foam::Func(f1, tf2, dimensioned<Type>(s3));                         \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const dimensioned<Type3>& dt3                                              \
+)                                                                              \
+{                                                                              \
+    const auto& f1 = tf1();                                                    \
+    const auto& f2 = tf2();                                                    \
+                                                                               \
+    auto tres =                                                                \
+        reuseTmpTmpGeometricField                                              \
+            <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>             \
+        ::New                                                                  \
+        (                                                                      \
+            tf1,                                                               \
+            tf2,                                                               \
+            #Func "(" + f1.name() + ',' + f2.name() + ',' + dt3.name() + ')',  \
+            Func(f1.dimensions(), f2.dimensions())                             \
+        );                                                                     \
+                                                                               \
+    Foam::Func(tres.ref(), f1, f2, dt3.value());                               \
+    tf1.clear();                                                               \
+    tf2.clear();                                                               \
+    return tres;                                                               \
+}                                                                              \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const Type3& s3                                                            \
+)                                                                              \
+{                                                                              \
+    return Foam::Func(tf1, tf2, dimensioned<Type>(s3));                        \
+}
+
+
+// ************************************************************************* //
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
index 0af9f5159d..259e1cbea0 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
@@ -326,4 +326,158 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op               \
     BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define TERNARY_FUNCTION(ReturnType, Type1, Type2, Type3, Func)                \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<Type1, PatchField, GeoMesh>& result,                        \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const GeometricField<Type3, PatchField, GeoMesh>& f3                       \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const tmp<GeometricField<Type3, PatchField, GeoMesh>>& tf3                 \
+);
+
+
+#define TERNARY_TYPE_FUNCTION_FFS(ReturnType, Type1, Type2, Type3, Func)       \
+                                                                               \
+TEMPLATE                                                                       \
+void Func                                                                      \
+(                                                                              \
+    GeometricField<Type1, PatchField, GeoMesh>& result,                        \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const GeometricField<Type2, PatchField, GeoMesh>& f2,                      \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const GeometricField<Type1, PatchField, GeoMesh>& f1,                      \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const Type3& s3                                                            \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const dimensioned<Type3>& dt3                                              \
+);                                                                             \
+                                                                               \
+TEMPLATE                                                                       \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                      \
+(                                                                              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tf1,                \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tf2,                \
+    const Type3& s3                                                            \
+);
+
+
 // ************************************************************************* //

From 70d526cd82f2788886bbe7b7802c9555e22c35a1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 19 Jan 2023 16:12:49 +0100
Subject: [PATCH 091/348] ENH: neg(x) instead of '1 - pos0(x)' for less-than 0
 check

- fewer operations

ENH: replace 'neg(x)*a + pos0(x)*b' with 'lerp(a, b, pos0(x))'

- uses pos0 as a 0-1 selector. Fewer operations.
---
 etc/codeTemplates/BC/BC.C                                | 2 +-
 .../DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C      | 4 ++--
 .../turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C | 4 ++--
 ...tMixingLengthDissipationRateInletFvPatchScalarField.C | 2 +-
 ...rbulentMixingLengthFrequencyInletFvPatchScalarField.C | 2 +-
 .../derived/inletOutlet/inletOutletFaPatchField.C        | 2 +-
 .../SRFFreestreamVelocityFvPatchVectorField.C            | 2 +-
 .../derived/inletOutlet/inletOutletFvPatchField.C        | 2 +-
 .../inletOutletTotalTemperatureFvPatchScalarField.C      | 4 ++--
 .../plenumPressure/plenumPressureFvPatchScalarField.C    | 9 +++++++--
 ...essureDirectedInletOutletVelocityFvPatchVectorField.C | 2 +-
 ...ressureInletOutletParSlipVelocityFvPatchVectorField.C | 2 +-
 ...pressureNormalInletOutletVelocityFvPatchVectorField.C | 2 +-
 ...PermeableAlphaInletOutletVelocityFvPatchVectorField.C | 2 +-
 .../prghPermeableAlphaTotalPressureFvPatchScalarField.C  | 2 +-
 .../prghTotalHydrostaticPressureFvPatchScalarField.C     | 2 +-
 .../prghTotalPressureFvPatchScalarField.C                | 2 +-
 .../totalPressure/totalPressureFvPatchScalarField.C      | 8 ++++----
 .../totalTemperatureFvPatchScalarField.C                 | 2 +-
 ...bulentIntensityKineticEnergyInletFvPatchScalarField.C | 2 +-
 .../uniformInletOutlet/uniformInletOutletFvPatchField.C  | 2 +-
 .../uniformTotalPressureFvPatchScalarField.C             | 8 ++++----
 .../geometricVoF/cellCuts/cutFace/cutFaceAdvect.C        | 8 ++++----
 23 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index 7c1bb0e8d6..7dc8098b37 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -207,7 +207,7 @@ void Foam::CLASS::updateCoeffs()
     const scalarField& phip =
         this->patch().template lookupPatchField<surfaceScalarField>("phi");
 
-    this->valueFraction() = 1.0 - pos0(phip);
+    this->valueFraction() = neg(phip);
 
     PARENT::updateCoeffs();
 }
diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index 514c894e5a..f930a4c3cb 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -113,7 +113,7 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::dTilda
     if (fe_)
     {
         tmp<volScalarField> fe1 =
-            2*(pos0(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.));
+            2*lerp(pow(expTerm, -9.), pow(expTerm, -11.09), pos0(alpha));
         tmp<volScalarField> fe2 = 1 - max(ft(magGradU), fl(magGradU));
         tmp<volScalarField> fe = max(fe1 - 1, scalar(0))*psi*fe2;
 
@@ -129,7 +129,7 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::dTilda
     // Simplified formulation from Gritskevich et al. paper (2011) where fe = 0
     return max
     (
-        fdTilda*lRAS + (1 - fdTilda)*lLES,
+        lerp(lLES, lRAS, fdTilda),
         dimensionedScalar("SMALL", dimLength, SMALL)
     );
 }
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
index 42c5691e26..be6e5cafd2 100644
--- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
@@ -109,7 +109,7 @@ tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::dTilda
     if (fe_)
     {
         tmp<volScalarField> fe1 =
-            2*(pos0(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.));
+            2*lerp(pow(expTerm, -9.), pow(expTerm, -11.09), pos0(alpha));
         tmp<volScalarField> fe2 = 1 - max(ft(magGradU), fl(magGradU));
         tmp<volScalarField> fe = max(fe1 - 1, scalar(0))*fe2;
 
@@ -124,7 +124,7 @@ tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::dTilda
     // Simplified formulation from Gritskevich et al. paper (2011) where fe = 0
     return max
     (
-        fdTilda*lRAS + (1 - fdTilda)*lLES,
+        lerp(lLES, lRAS, fdTilda),
         dimensionedScalar(dimLength, SMALL)
     );
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 2266a1430a..dfdff55615 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -157,7 +157,7 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
         patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
     this->refValue() = (Cmu75/mixingLength_)*pow(kp, 1.5);
-    this->valueFraction() = 1.0 - pos0(phip);
+    this->valueFraction() = neg(phip);
 
     inletOutletFvPatchScalarField::updateCoeffs();
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 084965c11c..1fec48c218 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -146,7 +146,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
         patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
     this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
-    this->valueFraction() = 1.0 - pos0(phip);
+    this->valueFraction() = neg(phip);
 
     inletOutletFvPatchScalarField::updateCoeffs();
 }
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index cf93fde241..9c9749be92 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -126,7 +126,7 @@ void Foam::inletOutletFaPatchField<Type>::updateCoeffs()
     const Field<scalar>& phip =
         this->patch().template lookupPatchField<edgeScalarField>(phiName_);
 
-    this->valueFraction() = 1.0 - pos(phip);
+    this->valueFraction() = neg(phip);
 
     mixedFaPatchField<Type>::updateCoeffs();
 }
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index bdd1de4779..da50a57f7e 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -152,7 +152,7 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs()
     }
 
     // Set the inlet-outlet choice based on the direction of the freestream
-    valueFraction() = 1.0 - pos0(refValue() & patch().Sf());
+    valueFraction() = neg(refValue() & patch().Sf());
 
     mixedFvPatchField<vector>::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index cce6c7b6af..459620bf6b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -128,7 +128,7 @@ void Foam::inletOutletFvPatchField<Type>::updateCoeffs()
     const Field<scalar>& phip =
         this->patch().template lookupPatchField<surfaceScalarField>(phiName_);
 
-    this->valueFraction() = 1.0 - pos0(phip);
+    this->valueFraction() = neg(phip);
 
     mixedFvPatchField<Type>::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 84198f6e2e..4e25428a0b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -181,8 +181,8 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::updateCoeffs()
     scalar gM1ByG = (gamma_ - 1.0)/gamma_;
 
     this->refValue() =
-        T0_/(1.0 + 0.5*psip*gM1ByG*(1.0 - pos0(phip))*magSqr(Up));
-    this->valueFraction() = 1.0 - pos0(phip);
+        T0_/(1.0 + 0.5*psip*gM1ByG*(neg(phip))*magSqr(Up));
+    this->valueFraction() = neg(phip);
 
     inletOutletFvPatchScalarField::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 67de38f255..364e24d3aa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -272,7 +272,12 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
     // Limit to prevent outflow
     const scalarField p_new
     (
-        (1.0 - pos0(phi))*t*plenumPressure + pos0(phi)*max(p, plenumPressure)
+        lerp
+        (
+            t*plenumPressure,           // Negative phi
+            max(p, plenumPressure),     // Positive phi
+            pos0(phi)                   // 0-1 selector
+        )
     );
 
     // Relaxation fraction
@@ -280,7 +285,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs()
     const scalar fraction = oneByFraction < 1.0 ? 1.0 : 1.0/oneByFraction;
 
     // Set the new value
-    operator==((1.0 - fraction)*p_old + fraction*p_new);
+    operator==(lerp(p_old, p_new, fraction));
     fixedValueFvPatchScalarField::updateCoeffs();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index 4f1f1b5a4e..db7d962d81 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -176,7 +176,7 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
             << exit(FatalError);
     }
 
-    valueFraction() = 1.0 - pos0(phip);
+    valueFraction() = neg(phip);
 
     mixedFvPatchVectorField::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 6676732f48..d3b2100080 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -150,7 +150,7 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
             << exit(FatalError);
     }
 
-    valueFraction() = 1.0 - pos0(phip);
+    valueFraction() = neg(phip);
 
     mixedFvPatchVectorField::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 4b316b0e67..e6d254f67d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -146,7 +146,7 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
             << exit(FatalError);
     }
 
-    valueFraction() = 1.0 - pos0(phip);
+    valueFraction() = neg(phip);
 
     mixedFvPatchVectorField::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index 5bfce07557..30fdd16204 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -155,7 +155,7 @@ updateCoeffs()
             << exit(FatalError);
     }
 
-    valueFraction() = 1.0 - pos0(phip);
+    valueFraction() = neg(phip);
 
     if (alphaName_ != "none")
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
index 6bc84ada0d..ecd795af13 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
@@ -215,7 +215,7 @@ void Foam::prghPermeableAlphaTotalPressureFvPatchScalarField::updateSnGrad
     tmp<scalarField> p
     (
         p0_->value(t)
-      - 0.5*rhop*(1.0 - pos0(phip))*magSqr(Up)
+      - 0.5*rhop*(neg(phip))*magSqr(Up)
       - rhop*((g.value() & patch().Cf()) - ghRef.value())
     );
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
index 53fa406082..2360322800 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
@@ -136,7 +136,7 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::updateCoeffs()
     operator==
     (
         ph_rghp
-      - 0.5*rhop*(1.0 - pos0(phip))*magSqr(Up)
+      - 0.5*rhop*(neg(phip))*magSqr(Up)
     );
 
     fixedValueFvPatchScalarField::updateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 41fe07eee8..4e442c6c4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -178,7 +178,7 @@ void Foam::prghTotalPressureFvPatchScalarField::updateCoeffs()
     operator==
     (
         p0_
-      - 0.5*rhop*(1.0 - pos0(phip))*magSqr(Up)
+      - 0.5*rhop*(neg(phip))*magSqr(Up)
       - rhop*((g.value() & patch().Cf()) - ghRef.value())
     );
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index b3bcd97273..0bf923b69a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -178,7 +178,7 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
             const auto& rho =
                 patch().lookupPatchField<volScalarField>(rhoName_);
 
-            operator==(p0p - 0.5*rho*(1.0 - pos0(phip))*magSqr(Up));
+            operator==(p0p - 0.5*rho*(neg(phip))*magSqr(Up));
         }
         else
         {
@@ -196,14 +196,14 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
                     p0p
                    /pow
                     (
-                        (1.0 + 0.5*psip*gM1ByG*(1.0 - pos0(phip))*magSqr(Up)),
+                        (1.0 + 0.5*psip*gM1ByG*(neg(phip))*magSqr(Up)),
                         1.0/gM1ByG
                     )
                 );
             }
             else
             {
-                operator==(p0p/(1.0 + 0.5*psip*(1.0 - pos0(phip))*magSqr(Up)));
+                operator==(p0p/(1.0 + 0.5*psip*(neg(phip))*magSqr(Up)));
             }
         }
 
@@ -211,7 +211,7 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
     else if (internalField().dimensions() == dimPressure/dimDensity)
     {
         // Incompressible flow
-        operator==(p0p - 0.5*(1.0 - pos0(phip))*magSqr(Up));
+        operator==(p0p - 0.5*(neg(phip))*magSqr(Up));
     }
     else
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index b6ad51dd07..b9cabaefc5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -170,7 +170,7 @@ void Foam::totalTemperatureFvPatchScalarField::updateCoeffs()
 
     operator==
     (
-        T0_/(1.0 + 0.5*psip*gM1ByG*(1.0 - pos0(phip))*magSqr(Up))
+        T0_/(1.0 + 0.5*psip*gM1ByG*(neg(phip))*magSqr(Up))
     );
 
     fixedValueFvPatchScalarField::updateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 453e96a5f2..06f5809c0d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -140,7 +140,7 @@ updateCoeffs()
         patch().lookupPatchField<surfaceScalarField>(this->phiName_);
 
     this->refValue() = 1.5*sqr(intensity_)*magSqr(Up);
-    this->valueFraction() = 1.0 - pos0(phip);
+    this->valueFraction() = neg(phip);
 
     inletOutletFvPatchScalarField::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index d981820e78..3a54b9ce6e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -157,7 +157,7 @@ void Foam::uniformInletOutletFvPatchField<Type>::updateCoeffs()
             phiName_
         );
 
-    this->valueFraction() = 1.0 - pos0(phip);
+    this->valueFraction() = neg(phip);
 
     mixedFvPatchField<Type>::updateCoeffs();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 1ebfba5288..833c5e819b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -166,7 +166,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
             const auto& rho =
                 patch().lookupPatchField<volScalarField>(rhoName_);
 
-            operator==(p0 - 0.5*rho*(1.0 - pos0(phip))*magSqr(Up));
+            operator==(p0 - 0.5*rho*(neg(phip))*magSqr(Up));
         }
         else
         {
@@ -184,14 +184,14 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
                     p0
                    /pow
                     (
-                        (1.0 + 0.5*psip*gM1ByG*(1.0 - pos0(phip))*magSqr(Up)),
+                        (1.0 + 0.5*psip*gM1ByG*(neg(phip))*magSqr(Up)),
                         1.0/gM1ByG
                     )
                 );
             }
             else
             {
-                operator==(p0/(1.0 + 0.5*psip*(1.0 - pos0(phip))*magSqr(Up)));
+                operator==(p0/(1.0 + 0.5*psip*(neg(phip))*magSqr(Up)));
             }
         }
 
@@ -199,7 +199,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
     else if (internalField().dimensions() == dimPressure/dimDensity)
     {
         // Incompressible flow
-        operator==(p0 - 0.5*(1.0 - pos0(phip))*magSqr(Up));
+        operator==(p0 - 0.5*(neg(phip))*magSqr(Up));
     }
     else
     {
diff --git a/src/transportModels/geometricVoF/cellCuts/cutFace/cutFaceAdvect.C b/src/transportModels/geometricVoF/cellCuts/cutFace/cutFaceAdvect.C
index 0f7dde785f..79b023edfe 100644
--- a/src/transportModels/geometricVoF/cellCuts/cutFace/cutFaceAdvect.C
+++ b/src/transportModels/geometricVoF/cellCuts/cutFace/cutFaceAdvect.C
@@ -412,7 +412,7 @@ Foam::scalar Foam::cutFaceAdvect::timeIntegratedArea
         // If all cuttings are in the future but non of them within [0,dt] then
         // if cell is filling up (Un0 > 0) face must be empty during whole time
         // interval
-        tIntArea = magSf * dt * (1 - pos0(Un0));
+        tIntArea = magSf * dt * neg(Un0);
         return tIntArea;
     }
 
@@ -437,7 +437,7 @@ Foam::scalar Foam::cutFaceAdvect::timeIntegratedArea
         // If Un0 > 0 cell is filling up and it must initially be empty.
         // If Un0 < 0 cell must initially be full(y immersed in fluid A).
         time = firstTime;
-        initialArea = magSf * (1.0 - pos0(Un0));
+        initialArea = magSf * neg(Un0);
         tIntArea = initialArea * time;
         cutPoints(fPts, pTimes, time, FIIL);
     }
@@ -669,7 +669,7 @@ Foam::scalar Foam::cutFaceAdvect::timeIntegratedArea
         // If all cuttings are in the future but non of them within [0,dt] then
         // if cell is filling up (Un0 > 0) face must be empty during whole time
         // interval
-        tIntArea = magSf * dt * (1 - pos0(Un0));
+        tIntArea = magSf * dt * neg(Un0);
         return tIntArea;
     }
 
@@ -694,7 +694,7 @@ Foam::scalar Foam::cutFaceAdvect::timeIntegratedArea
         // If Un0 > 0 cell is filling up and it must initially be empty.
         // If Un0 < 0 cell must initially be full(y immersed in fluid A).
         time = firstTime;
-        initialArea = magSf * (1.0 - pos0(Un0));
+        initialArea = magSf * neg(Un0);
         tIntArea = initialArea * time;
         cutPoints(faceI, time, FIIL);
     }

From 128516b8744b7aaf1b41d7ec1069e360632fa184 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 19 Jan 2023 17:48:16 +0100
Subject: [PATCH 092/348] ENH: use lerp for valueFraction (mixed BCs) and field
 relaxation

Note:
  in some borderline cases (eg, PDRFoam) the multiplication order
  and rounding imposed by the lerp function may affect the
  results slightly.

  eg,  (valueFraction_ * this->patch().deltaCoeffs()*refValue_)
  vs.  (valueFraction_ * (this->patch().deltaCoeffs()*refValue_))
---
 .../basic/mixed/mixedFaPatchField.C           | 36 ++++++++++--------
 .../fvPatchFields/exprMixedFvPatchField.C     | 17 ++-------
 .../basic/mixed/mixedFvPatchField.C           | 38 +++++++++++--------
 .../derived/fixedJump/fixedJumpFvPatchField.C |  2 +-
 .../partialSlip/partialSlipFvPatchField.C     | 18 ++++++---
 ...aseHydrostaticPressureFvPatchScalarField.C |  2 +-
 ...tedInletOutletVelocityFvPatchVectorField.C |  5 +--
 ...malInletOutletVelocityFvPatchVectorField.C |  7 ++--
 ...phaInletOutletVelocityFvPatchVectorField.C |  5 +--
 ...allHeatFluxTemperatureFvPatchScalarField.C | 14 +++----
 10 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index 226a11b02d..b1216ad42f 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -198,12 +198,11 @@ void Foam::mixedFaPatchField<Type>::evaluate(const Pstream::commsTypes)
 
     Field<Type>::operator=
     (
-        valueFraction_*refValue_
-      +
-        (1.0 - valueFraction_)*
+        lerp
         (
-            this->patchInternalField()
-          + refGrad_/this->patch().deltaCoeffs()
+            this->patchInternalField() + refGrad_/this->patch().deltaCoeffs(),
+            refValue_,
+            valueFraction_
         )
     );
 
@@ -214,11 +213,12 @@ void Foam::mixedFaPatchField<Type>::evaluate(const Pstream::commsTypes)
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::mixedFaPatchField<Type>::snGrad() const
 {
-    return
+    return lerp
+    (
+        refGrad_,
+        (refValue_ - this->patchInternalField())*this->patch().deltaCoeffs(),
         valueFraction_
-       *(refValue_ - this->patchInternalField())
-       *this->patch().deltaCoeffs()
-      + (1.0 - valueFraction_)*refGrad_;
+    );
 }
 
 
@@ -238,9 +238,12 @@ Foam::tmp<Foam::Field<Type>> Foam::mixedFaPatchField<Type>::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return
-         valueFraction_*refValue_
-       + (1.0 - valueFraction_)*refGrad_/this->patch().deltaCoeffs();
+    return lerp
+    (
+        refGrad_/this->patch().deltaCoeffs(),
+        refValue_,
+        valueFraction_
+    );
 }
 
 
@@ -256,9 +259,12 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::mixedFaPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    return
-        valueFraction_*this->patch().deltaCoeffs()*refValue_
-      + (1.0 - valueFraction_)*refGrad_;
+    return lerp
+    (
+        refGrad_,
+        this->patch().deltaCoeffs()*refValue_,
+        valueFraction_
+    );
 }
 
 
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
index 10394092a8..acfa22fd2c 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
@@ -234,25 +234,14 @@ Foam::exprMixedFvPatchField<Type>::exprMixedFvPatchField
     }
     else
     {
-        // Emulate mixedFvPatchField<Type>::evaluate,
+        // Like mixedFvPatchField<Type>::evaluate()
         // but avoid our own updateCoeffs
         if (!this->updated())
         {
-            this->parent_bctype::updateCoeffs();
+            mixedFvPatchField<Type>::updateCoeffs();
         }
 
-        Field<Type>::operator=
-        (
-            this->valueFraction()*this->refValue()
-          +
-            (1.0 - this->valueFraction())*
-            (
-                this->patchInternalField()
-              + this->refGrad()/this->patch().deltaCoeffs()
-            )
-        );
-
-        fvPatchField<Type>::evaluate();
+        mixedFvPatchField<Type>::evaluate();
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 3aa783d5b6..4be6c72ed6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -209,7 +209,6 @@ void Foam::mixedFvPatchField<Type>::rmap
 template<class Type>
 void Foam::mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
-
     if (!this->updated())
     {
         this->updateCoeffs();
@@ -217,11 +216,11 @@ void Foam::mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
     Field<Type>::operator=
     (
-        valueFraction_*refValue_
-      + (1.0 - valueFraction_)
-       *(
-            this->patchInternalField()
-          + refGrad_/this->patch().deltaCoeffs()
+        lerp
+        (
+            this->patchInternalField() + refGrad_/this->patch().deltaCoeffs(),
+            refValue_,
+            valueFraction_
         )
     );
 
@@ -233,11 +232,12 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::snGrad() const
 {
-    return
+    return lerp
+    (
+        refGrad_,
+        (refValue_ - this->patchInternalField())*this->patch().deltaCoeffs(),
         valueFraction_
-       *(refValue_ - this->patchInternalField())
-       *this->patch().deltaCoeffs()
-      + (1.0 - valueFraction_)*refGrad_;
+    );
 }
 
 
@@ -259,9 +259,12 @@ Foam::mixedFvPatchField<Type>::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return
-        valueFraction_*refValue_
-      + (1.0 - valueFraction_)*refGrad_/this->patch().deltaCoeffs();
+    return lerp
+    (
+        refGrad_/this->patch().deltaCoeffs(),
+        refValue_,
+        valueFraction_
+    );
 }
 
 
@@ -277,9 +280,12 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    return
-        valueFraction_*this->patch().deltaCoeffs()*refValue_
-      + (1.0 - valueFraction_)*refGrad_;
+    return lerp
+    (
+        refGrad_,
+        this->patch().deltaCoeffs()*refValue_,
+        valueFraction_
+    );
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 0f38fdc737..e938771640 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -212,7 +212,7 @@ void Foam::fixedJumpFvPatchField<Type>::relax()
         return;
     }
 
-    jump_ = relaxFactor_*jump_ + (1 - relaxFactor_)*jump0_;
+    jump_ = lerp(jump0_, jump_, relaxFactor_);
 
     if (timeIndex_ != this->db().time().timeIndex())
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 7f26c14fa9..0d343a904a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -153,8 +153,12 @@ Foam::partialSlipFvPatchField<Type>::snGrad() const
 
     return
     (
-        valueFraction_*refValue_
-      + (1.0 - valueFraction_)*transform(I - sqr(nHat), pif) - pif
+        lerp
+        (
+            transform(I - sqr(nHat), pif),
+            refValue_,
+            valueFraction_
+        ) - pif
     )*this->patch().deltaCoeffs();
 }
 
@@ -174,10 +178,12 @@ void Foam::partialSlipFvPatchField<Type>::evaluate
 
     Field<Type>::operator=
     (
-        valueFraction_*refValue_
-      +
-        (1.0 - valueFraction_)
-       *transform(I - sqr(nHat), this->patchInternalField())
+        lerp
+        (
+            transform(I - sqr(nHat), this->patchInternalField()),
+            refValue_,
+            valueFraction_
+        )
     );
 
     parent_bctype::evaluate();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 1b6a532d22..a234a37342 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -180,7 +180,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::operator=
 {
     fvPatchScalarField::operator=
     (
-        valueFraction()*refValue() + (1 - valueFraction())*ptf
+        lerp(ptf, refValue(), valueFraction())
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index db7d962d81..b2cef93cf2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -204,8 +204,7 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::operator=
 {
     fvPatchField<vector>::operator=
     (
-        valueFraction()*(inletDir_*(inletDir_ & pvf))
-      + (1 - valueFraction())*pvf
+        lerp(pvf, inletDir_*(inletDir_ & pvf), valueFraction())
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index e6d254f67d..e0ea49b05d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -171,10 +171,11 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::operator=
     const fvPatchField<vector>& pvf
 )
 {
+    tmp<vectorField> n = patch().nf();
+
     fvPatchField<vector>::operator=
     (
-        valueFraction()*(patch().nf()*(patch().nf() & pvf))
-      + (1 - valueFraction())*pvf
+        lerp(pvf, n()*(n() & pvf), valueFraction())
     );
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index 30fdd16204..0a23414a40 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -202,8 +202,7 @@ void Foam::pressurePermeableAlphaInletOutletVelocityFvPatchVectorField
 
     fvPatchField<vector>::operator=
     (
-        valueFraction()*(n()*(n() & pvf))
-      + (1 - valueFraction())*pvf
+        lerp(pvf, n()*(n() & pvf), valueFraction())
     );
 }
 
diff --git a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 90fc37d1e2..a409459da4 100644
--- a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -317,11 +317,12 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
     scalarField qr(Tp.size(), Zero);
     if (qrName_ != "none")
     {
-        qr =
+        qr = lerp
+        (
+            qrPrevious_,
+            patch().lookupPatchField<volScalarField>(qrName_),
             qrRelaxation_
-           *patch().lookupPatchField<volScalarField>(qrName_)
-          + (1 - qrRelaxation_)*qrPrevious_;
-
+        );
         qrPrevious_ = qr;
     }
 
@@ -454,9 +455,8 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         }
     }
 
-    valueFraction() =
-        relaxation_*valueFraction() + (1 - relaxation_)*valueFraction0;
-    refValue() = relaxation_*refValue() + (1 - relaxation_)*refValue0;
+    valueFraction() = lerp(valueFraction0, valueFraction(), relaxation_);
+    refValue() = lerp(refValue0, refValue(), relaxation_);
 
     mixedFvPatchScalarField::updateCoeffs();
 

From 4d45cfd5a94a2117bb91bf6276453074b1ef0fe0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 20 Jan 2023 11:55:12 +0100
Subject: [PATCH 093/348] ENH: lerp for patch/neighbour weights

---
 .../basic/coupled/coupledFaPatchField.C             |  8 ++++++--
 .../edgeInterpolation/schemes/Gamma/Gamma.H         |  2 +-
 .../basic/coupled/coupledFvPatchField.C             |  8 ++++++--
 .../surfaceInterpolationScheme.C                    | 13 +++++++++----
 .../surface/isoSurface/isoSurfacePointTemplates.C   | 11 ++++++-----
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
index 5a029c1d5c..8ac312d804 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
@@ -130,8 +130,12 @@ void Foam::coupledFaPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     Field<Type>::operator=
     (
-        this->patch().weights()*this->patchInternalField()
-      + (1.0 - this->patch().weights())*patchNeighbourField()
+        lerp
+        (
+            this->patchNeighbourField(),
+            this->patchInternalField(),
+            this->patch().weights()
+        )
     );
 }
 
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
index c4bd351639..d8de90a17e 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
@@ -112,7 +112,7 @@ public:
         scalar phict = 1 - 0.5*gradf/gradcf;
         scalar limiter = min(max(phict/k_, 0), 1);
 
-        return limiter*cdWeight + (1 - limiter)*udWeight;
+        return lerp(udWeight, cdWeight, limiter);
     }
 };
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index c68079214a..389b562632 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -139,8 +139,12 @@ void Foam::coupledFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
     Field<Type>::operator=
     (
-        this->patch().weights()*this->patchInternalField()
-      + (1.0 - this->patch().weights())*this->patchNeighbourField()
+        lerp
+        (
+            this->patchNeighbourField(),
+            this->patchInternalField(),
+            this->patch().weights()
+        )
     );
 
     fvPatchField<Type>::evaluate();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 69a88da168..f7f8669492 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -264,6 +264,9 @@ Foam::surfaceInterpolationScheme<Type>::dotInterpolate
 
     for (label fi=0; fi<P.size(); fi++)
     {
+        // Same as:
+        // sfi[fi] = Sfi[fi] & lerp(vfi[N[fi]], vfi[P[fi]], lambda[fi]);
+        // but maybe the compiler notices the fused multiply add form
         sfi[fi] = Sfi[fi] & (lambda[fi]*(vfi[P[fi]] - vfi[N[fi]]) + vfi[N[fi]]);
     }
 
@@ -282,9 +285,11 @@ Foam::surfaceInterpolationScheme<Type>::dotInterpolate
         {
             psf =
                 pSf
-              & (
-                    pLambda*vf.boundaryField()[pi].patchInternalField()
-                  + (1.0 - pLambda)*vf.boundaryField()[pi].patchNeighbourField()
+              & lerp
+                (
+                    vf.boundaryField()[pi].patchNeighbourField(),
+                    vf.boundaryField()[pi].patchInternalField(),
+                    pLambda
                 );
         }
         else
diff --git a/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C b/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
index 8f077680ac..a4bf332ae3 100644
--- a/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
+++ b/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
@@ -111,11 +111,12 @@ Foam::isoSurfacePoint::adaptPatchFields
                 sliceFldBf[patchi]
             );
 
-            const scalarField& w = mesh.weights().boundaryField()[patchi];
-
-            tmp<Field<Type>> f =
-                w*pfld.patchInternalField()
-              + (1.0-w)*pfld.patchNeighbourField();
+            tmp<Field<Type>> f = lerp
+            (
+                pfld.patchNeighbourField(),
+                pfld.patchInternalField(),
+                mesh.weights().boundaryField()[patchi]
+            );
 
             bitSet isCollocated
             (

From ba6667a344aac2603c8313c90f6fd2646c58ed45 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Feb 2023 18:39:19 +0100
Subject: [PATCH 094/348] STYLE: use clamp/clamp_range instead of max(min(...,
 upper), lower)

---
 .../multiphase/cavitatingFoam/alphavPsi.H     | 11 +----
 .../setAlphaField/setAlphaField.C             |  2 +-
 .../uniformInterpolationTable.C               |  2 +-
 .../functions/Function1/ramp/ramp.H           |  2 +-
 .../RAS/kOmegaSSTLM/kOmegaSSTLM.C             |  2 +-
 src/combustionModels/EDC/EDC.C                |  4 +-
 src/engine/include/StCorr.H                   |  2 +-
 .../activeBaffleVelocityFvPatchVectorField.C  | 20 ++++-----
 ...ureForceBaffleVelocityFvPatchVectorField.C | 27 ++++--------
 ...aseHydrostaticPressureFvPatchScalarField.C |  4 +-
 .../averageNeighbourFvGeometryScheme.C        | 21 +++------
 .../highAspectRatioFvGeometryScheme.C         | 11 +----
 .../limitedSchemes/MUSCL/MUSCL.H              |  2 +-
 .../limitedSchemes/Minmod/Minmod.H            |  2 +-
 .../limitedSchemes/Phi/Phi.H                  |  2 +-
 .../limitedSchemes/QUICK/QUICK.H              |  2 +-
 .../limitedSchemes/QUICK/QUICKV.H             |  2 +-
 .../filteredLinear/filteredLinear.H           |  2 +-
 .../filteredLinear2/filteredLinear2.H         |  2 +-
 .../filteredLinear2/filteredLinear2V.H        |  2 +-
 .../filteredLinear3/filteredLinear3.H         |  2 +-
 .../filteredLinear3/filteredLinear3V.H        |  2 +-
 .../limitedCubic/limitedCubic.H               |  4 +-
 .../limitedCubic/limitedCubicV.H              |  2 +-
 .../limitedLinear/limitedLinear.H             |  2 +-
 .../schemes/CoBlended/CoBlended.H             | 18 +++-----
 .../schemes/cellCoBlended/cellCoBlended.H     | 10 ++---
 .../schemes/clippedLinear/clippedLinear.H     | 43 +++++++------------
 .../spray/submodels/BreakupModel/ETAB/ETAB.C  |  2 +-
 .../spray/submodels/BreakupModel/TAB/TAB.C    |  2 +-
 .../lineSearch/lineSearch/lineSearch.C        |  2 +-
 .../MassTransferPhaseSystem.C                 |  4 +-
 .../TDNBModels/Shirai/Shirai.C                |  2 +-
 .../TolubinskiKostanchuk.C                    |  6 ++-
 .../curvatureSeparation/curvatureSeparation.C |  2 +-
 .../curvatureSeparation/curvatureSeparation.C |  2 +-
 .../plicSchemes/plicRDF/plicRDF.C             |  2 +-
 ...haContactAngleTwoPhaseFvPatchScalarField.C |  9 ++--
 38 files changed, 89 insertions(+), 151 deletions(-)

diff --git a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
index ed799ae4b4..51f3eecd20 100644
--- a/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
+++ b/applications/solvers/multiphase/cavitatingFoam/alphavPsi.H
@@ -1,14 +1,5 @@
 {
-    alphav =
-        max
-        (
-            min
-            (
-                (rho - rholSat)/(rhovSat - rholSat),
-                scalar(1)
-            ),
-            scalar(0)
-        );
+    alphav = clamp((rho - rholSat)/(rhovSat - rholSat), zero_one{});
     alphal = 1.0 - alphav;
 
     Info<< "max-min alphav: " << max(alphav).value()
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
index 44a67715ab..1db1a547f4 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
@@ -108,7 +108,7 @@ void setAlpha
     {
         cutCell.calcSubCell(cellI, 0.0);
 
-        alpha1[cellI] = max(min(cutCell.VolumeOfFluid(), 1), 0);
+        alpha1[cellI] = clamp(cutCell.VolumeOfFluid(), 0, 1);
 
         if (writeOBJ && (mag(cutCell.faceArea()) >= 1e-14))
         {
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index 24cae2e413..fa121c73f1 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -149,7 +149,7 @@ Type Foam::uniformInterpolationTable<Type>::interpolate(scalar x) const
 {
     if (bound_)
     {
-        x = max(min(xMax() - SMALL*dx_, x), x0_);
+        x = clamp(x, x0_, (xMax() - SMALL*dx_));
     }
     else
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index cda3b71016..2dc4e26c17 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -100,7 +100,7 @@ protected:
         //- that forms the basis of many more complex ramp functions
         inline scalar linearRamp(const scalar t) const
         {
-            return max(min((t - start_)/duration_, 1), 0);
+            return clamp((t - start_)/duration_, 0, 1);
         }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
index 8c30e1a403..c4a6af700a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
@@ -310,7 +310,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::ReThetat0
             }
 
             lambda = sqr(thetat)/nu[celli]*dUsds[celli];
-            lambda = max(min(lambda, 0.1), -0.1);
+            lambda = clamp(lambda, -0.1, 0.1);
 
             lambdaErr = mag(lambda - lambda0);
 
diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C
index 879ac19628..66ac5e9780 100644
--- a/src/combustionModels/EDC/EDC.C
+++ b/src/combustionModels/EDC/EDC.C
@@ -109,13 +109,13 @@ void Foam::combustionModels::EDC<ReactionThermo>::correct()
                 const scalar nu = mu[i]/(rho[i] + SMALL);
 
                 const scalar Da =
-                    max(min(sqrt(nu/(epsilon[i] + SMALL))/tc[i], 10), 1e-10);
+                    clamp(sqrt(nu/(epsilon[i] + SMALL))/tc[i], 1e-10, 10);
 
                 const scalar ReT = sqr(k[i])/(nu*epsilon[i] + SMALL);
                 const scalar CtauI = min(C1_/(Da*sqrt(ReT + 1)), 2.1377);
 
                 const scalar CgammaI =
-                    max(min(C2_*sqrt(Da*(ReT + 1)), 5), 0.4082);
+                    clamp(C2_*sqrt(Da*(ReT + 1)), 0.4082, 5);
 
                 const scalar gammaL =
                     CgammaI*pow025(nu*epsilon[i]/(sqr(k[i]) + SMALL));
diff --git a/src/engine/include/StCorr.H b/src/engine/include/StCorr.H
index 735bd090f2..b91e79ba41 100644
--- a/src/engine/include/StCorr.H
+++ b/src/engine/include/StCorr.H
@@ -80,7 +80,7 @@
             );
             dimensionedScalar AkEst = gSum(mgb*mesh.V().field());
 
-            StCorr.value() = max(min((Ak/AkEst).value(), 10.0), 1.0);
+            StCorr.value() = clamp((Ak/AkEst).value(), 1, 10);
 
             Info<< "StCorr = " << StCorr.value() << endl;
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index c894f8d5af..7de63c424d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -249,22 +249,18 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
         }
 
         openFraction_ =
-            max
             (
-                min
+                openFraction_
+              + min
                 (
-                    openFraction_
-                  + min
-                    (
-                        this->db().time().deltaTValue()/openingTime_,
-                        maxOpenFractionDelta_
-                    )
-                   *(orientation_*sign(forceDiff)),
-                    1 - 1e-6
-                ),
-                1e-6
+                    this->db().time().deltaTValue()/openingTime_,
+                    maxOpenFractionDelta_
+                )
+                *(orientation_*sign(forceDiff))
             );
 
+        openFraction_ = clamp(openFraction_, 1e-6, 1 - 1e-6);
+
         Info<< "openFraction = " << openFraction_ << endl;
 
         vectorField::subField Sfw = this->patch().patch().faceAreas();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 275cd38151..c69104703d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -299,27 +299,18 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
         if (mag(valueDiff) > mag(minThresholdValue_) || baffleActivated_)
         {
             openFraction_ =
-                max
+            (
+                openFraction_
+              + min
                 (
-                    min
-                    (
-                        openFraction_
-                      + min
-                        (
-                          this->db().time().deltaT().value()/openingTime_,
-                          maxOpenFractionDelta_
-                        ),
-                        1 - 1e-6
-                    ),
-                    1e-6
-                );
+                    this->db().time().deltaT().value()/openingTime_,
+                    maxOpenFractionDelta_
+                )
+            );
 
-             baffleActivated_ = true;
-        }
-        else
-        {
-            openFraction_ = max(min(1 - 1e-6, openFraction_), 1e-6);
+            baffleActivated_ = true;
         }
+        openFraction_ = clamp(openFraction_, 1e-6, 1 - 1e-6);
 
         if (Pstream::master())
         {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index a234a37342..d3ddb15c90 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -148,9 +148,9 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
         meshObjects::gravity::New(db().time());
 
     // scalar rhor = 1000;
-    // scalarField alphap1 = max(min(alphap, scalar(1)), scalar(0));
+    // scalarField alphap1 = clamp(alphap, zero_one{});
     // valueFraction() = alphap1/(alphap1 + rhor*(1.0 - alphap1));
-    valueFraction() = max(min(alphap, scalar(1)), scalar(0));
+    valueFraction() = clamp(alphap, zero_one{});
 
     refValue() =
         pRefValue_
diff --git a/src/finiteVolume/fvMesh/fvGeometryScheme/averageNeighbour/averageNeighbourFvGeometryScheme.C b/src/finiteVolume/fvMesh/fvGeometryScheme/averageNeighbour/averageNeighbourFvGeometryScheme.C
index a33c5b99a2..8476a24df4 100644
--- a/src/finiteVolume/fvMesh/fvGeometryScheme/averageNeighbour/averageNeighbourFvGeometryScheme.C
+++ b/src/finiteVolume/fvMesh/fvGeometryScheme/averageNeighbour/averageNeighbourFvGeometryScheme.C
@@ -512,22 +512,11 @@ void Foam::averageNeighbourFvGeometryScheme::makeNonOrthoWeights
     scalarField& faceWeights
 ) const
 {
-    cosAngles =
-        max
-        (
-            scalar(0),
-            min
-            (
-                scalar(1),
-                polyMeshTools::faceOrthogonality
-                (
-                    mesh_,
-                    faceNormals,
-                    cellCentres
-                )
-            )
-        );
-
+    cosAngles = clamp
+    (
+        polyMeshTools::faceOrthogonality(mesh_, faceNormals, cellCentres),
+        zero_one{}
+    );
 
     // Make weight: 0 for ortho faces, 1 for 90degrees non-ortho
     //const scalarField faceWeights(scalar(1)-cosAngles);
diff --git a/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C b/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C
index 1202b80880..84c3eb064a 100644
--- a/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C
+++ b/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C
@@ -192,16 +192,7 @@ void Foam::highAspectRatioFvGeometryScheme::calcAspectRatioWeights
         delta = SMALL;
     }
 
-    cellWeight =
-    max
-    (
-        scalar(0),
-        min
-        (
-            scalar(1),
-            (aratio-minAspect_)/delta
-        )
-    );
+    cellWeight = clamp((aratio-minAspect_)/delta, zero_one{});
 
     faceWeight.setSize(mesh_.nFaces());
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.H
index 9e0d97b83a..55d13e373b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/MUSCL/MUSCL.H
@@ -81,7 +81,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return max(min(min(2*r, 0.5*r + 0.5), 2), 0);
+        return clamp(min(2*r, 0.5*r + 0.5), 0, 2);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H
index 6c34e5928b..91d05ea146 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H
@@ -81,7 +81,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return max(min(r, 1), 0);
+        return clamp(r, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
index 24c44f4d77..2b3ef8f7da 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
@@ -107,7 +107,7 @@ public:
             ((faceFlux - phiU)/stabilise(phiCD - phiU, SMALL) + k_);
 
         // Limit the limiter between upwind and central
-        return max(min(PLimiter, 1), 0);
+        return clamp(PLimiter, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H
index 8512576f2f..ae66624997 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H
@@ -100,7 +100,7 @@ public:
         scalar QLimiter = (phif - phiU)/stabilise(phiCD - phiU, SMALL);
 
         // Limit the limiter between upwind and downwind
-        return max(min(QLimiter, 2), 0);
+        return clamp(QLimiter, 0, 2);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H
index f71e54f197..fe6f9b011a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H
@@ -99,7 +99,7 @@ public:
         scalar QLimiter = (phif - phiU)/stabilise(phiCD - phiU, SMALL);
 
         // Limit the limiter between upwind and downwind
-        return max(min(QLimiter, 2), 0);
+        return clamp(QLimiter, 0, 2);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
index 6e563156ae..d7ee786056 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
@@ -93,7 +93,7 @@ public:
            /(max(mag(dcP), mag(dcN)) + SMALL);
 
         // Limit the limiter between linear and 20% upwind
-        return max(min(limiter, 1), 0.8);
+        return clamp(limiter, 0.8, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
index a68fcbaf8e..9378fd1a01 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
@@ -141,7 +141,7 @@ public:
         }
 
         // Limit the limiter between linear and upwind
-        return max(min(limiter, 1), 0);
+        return clamp(limiter, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
index 2a035c1e39..e8dcf7a6aa 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
@@ -143,7 +143,7 @@ public:
         }
 
         // Limit the limiter between linear and upwind
-        return max(min(limiter, 1), 0);
+        return clamp(limiter, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
index 48105a0b34..043a0e5630 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
@@ -108,7 +108,7 @@ public:
         scalar limiter = 1 - k_*(dN - df)*(dP - df)/max(sqr(dN + dP), SMALL);
 
         // Limit the limiter between linear and upwind
-        return max(min(limiter, 1), 0);
+        return clamp(limiter, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
index 9c2f596b86..d69562b2e5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
@@ -110,7 +110,7 @@ public:
         scalar limiter = 1 - k_*(dN - df)*(dP - df)/max(sqr(dN + dP), SMALL);
 
         // Limit the limiter between linear and upwind
-        return max(min(limiter, 1), 0);
+        return clamp(limiter, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H
index 2a9408ce0e..5ca1cbb0c7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H
@@ -124,11 +124,11 @@ public:
             cubicLimiter = twor;
         }
 
-        return max(min(cubicLimiter, 2), 0);
+        return clamp(cubicLimiter, 0, 2);
         */
 
         // Limit the limiter to obey the TVD constraint
-        return max(min(min(twor, cubicLimiter), 2), 0);
+        return clamp(min(twor, cubicLimiter), 0, 2);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H
index 3efede0496..b67b474765 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H
@@ -122,7 +122,7 @@ public:
             (fVphif - fVphiU)/stabilise(fVphiCD - fVphiU, SMALL);
 
         // Limit the limiter to obey the TVD constraint
-        return max(min(min(twor, cubicLimiter), 2), 0);
+        return clamp(min(twor, cubicLimiter), 0, 2);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
index 819ddd8af8..159bcc695e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
@@ -97,7 +97,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return max(min(twoByk_*r, 1), 0);
+        return clamp(twoByk_*r, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index aa1f10e44d..80bd3add72 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -36,7 +36,7 @@ Description
     face-based Courant number and the lower and upper Courant number limits
     supplied:
     \f[
-        weight = 1 - max(min((Co - Co1)/(Co2 - Co1), 1), 0)
+        weight = 1 - clamp((Co - Co1)/(Co2 - Co1), 0, 1)
     \f]
     where
     \vartable
@@ -222,18 +222,14 @@ public:
                 (
                     vf.name() + "BlendingFactor",
                     scalar(1)
-                  - max
+                  - clamp
                     (
-                        min
                         (
-                            (
-                                mesh.time().deltaT()*mesh.deltaCoeffs()
-                               *mag(tUflux)/mesh.magSf()
-                              - Co1_
-                            )/(Co2_ - Co1_),
-                            scalar(1)
-                        ),
-                        scalar(0)
+                            mesh.time().deltaT()*mesh.deltaCoeffs()
+                            *mag(tUflux)/mesh.magSf()
+                          - Co1_
+                        )/(Co2_ - Co1_),
+                        zero_one{}
                     )
                 )
             );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 488713445a..d9ca8e77a3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -253,14 +253,10 @@ public:
                 (
                     vf.name() + "BlendingFactor",
                     scalar(1)
-                  - max
+                  - clamp
                     (
-                        min
-                        (
-                            (fvc::interpolate(Co) - Co1_)/(Co2_ - Co1_),
-                            scalar(1)
-                        ),
-                        scalar(0)
+                        (fvc::interpolate(Co) - Co1_)/(Co2_ - Co1_),
+                        zero_one{}
                     )
                 )
             );
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index e2f10a660c..4ed0fd576d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -58,25 +58,24 @@ class clippedLinear
 :
     public surfaceInterpolationScheme<Type>
 {
-    // Private data
+    // Private Data
 
-        const scalar cellSizeRatio_;
         scalar wfLimit_;
 
 
     // Private Member Functions
 
-        void calcWfLimit()
+        static scalar calcWfLimit(scalar cellSizeRatio)
         {
-            if (cellSizeRatio_ <= 0 || cellSizeRatio_ > 1)
+            if (cellSizeRatio <= 0 || cellSizeRatio > 1)
             {
                 FatalErrorInFunction
-                    << "Given cellSizeRatio of " << cellSizeRatio_
+                    << "Given cellSizeRatio of " << cellSizeRatio
                     << " is not between 0 and 1"
                     << exit(FatalError);
             }
 
-            wfLimit_ = cellSizeRatio_/(1.0 + cellSizeRatio_);
+            return cellSizeRatio/(1.0 + cellSizeRatio);
         }
 
 
@@ -96,19 +95,15 @@ public:
         clippedLinear(const fvMesh& mesh, const scalar cellSizeRatio)
         :
             surfaceInterpolationScheme<Type>(mesh),
-            cellSizeRatio_(cellSizeRatio)
-        {
-            calcWfLimit();
-        }
+            wfLimit_(calcWfLimit(cellSizeRatio))
+        {}
 
         //- Construct from Istream
         clippedLinear(const fvMesh& mesh, Istream& is)
         :
             surfaceInterpolationScheme<Type>(mesh),
-            cellSizeRatio_(readScalar(is))
-        {
-            calcWfLimit();
-        }
+            wfLimit_(calcWfLimit(readScalar(is)))
+        {}
 
         //- Construct from faceFlux and Istream
         clippedLinear
@@ -119,10 +114,8 @@ public:
         )
         :
             surfaceInterpolationScheme<Type>(mesh),
-            cellSizeRatio_(readScalar(is))
-        {
-            calcWfLimit();
-        }
+            wfLimit_(calcWfLimit(readScalar(is)))
+        {}
 
 
     // Member Functions
@@ -141,6 +134,8 @@ public:
             );
             const surfaceScalarField& cdWeights = tcdWeights();
 
+            const scalarMinMax bounds(wfLimit_, 1 - wfLimit_);
+
             tmp<surfaceScalarField> tclippedLinearWeights
             (
                 new surfaceScalarField
@@ -159,7 +154,7 @@ public:
                 tclippedLinearWeights.ref();
 
             clippedLinearWeights.primitiveFieldRef() =
-                max(min(cdWeights.primitiveField(), 1 - wfLimit_), wfLimit_);
+                clamp(cdWeights.primitiveField(), bounds);
 
             surfaceScalarField::Boundary& clwbf =
                 clippedLinearWeights.boundaryFieldRef();
@@ -169,15 +164,7 @@ public:
                 if (clwbf[patchi].coupled())
                 {
                     clwbf[patchi] =
-                        max
-                        (
-                            min
-                            (
-                                cdWeights.boundaryField()[patchi],
-                                1 - wfLimit_
-                            ),
-                            wfLimit_
-                        );
+                        clamp(cdWeights.boundaryField()[patchi], bounds);
                 }
                 else
                 {
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
index 5d6bdb0172..c642019c79 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
@@ -131,7 +131,7 @@ bool Foam::ETAB<CloudType>::update
             scalar phic = y1/a;
 
             // constrain phic within -1 to 1
-            phic = max(min(phic, 1), -1);
+            phic = clamp(phic, -1, 1);
 
             scalar phit = acos(phic);
             scalar phi = phit;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
index 97202f99c2..f7d552949a 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
@@ -143,7 +143,7 @@ bool Foam::TAB<CloudType>::update
             scalar phic = y1/a;
 
             // constrain phic within -1 to 1
-            phic = max(min(phic, 1), -1);
+            phic = clamp(phic, -1, 1);
 
             scalar phit = acos(phic);
             scalar phi = phit;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
index 571adab467..ef4a26bfee 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
@@ -167,7 +167,7 @@ void Foam::lineSearch::reset()
         // step_ = 2*(oldMeritValue_-prevMeritValue_)/directionalDeriv_;
         // Interpolate in order to get same improvement with the previous
         // optimisation cycle
-        step_ = max(min(step_*prevMeritDeriv_/directionalDeriv_, 1.), minStep_);
+        step_ = clamp(step_*prevMeritDeriv_/directionalDeriv_, minStep_, 1);
         Info<< "\n------- Computing initial step-------" << endl;
         Info<< "old dphi(0) "  << prevMeritDeriv_ << endl;
         Info<< "dphi(0) "      << directionalDeriv_ << endl;
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
index 559fee3e63..e9039e3971 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
@@ -617,7 +617,7 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
             scalar dmdt21 = dmdtNet[celli];
             scalar coeffs12Cell = coeffs12[celli];
 
-            scalar alpha1Limited = max(min(alpha1[celli], 1.0), 0.0);
+            scalar alpha1Limited = clamp(alpha1[celli], 0, 1);
 
             // exp.
             SuPhase1[celli] += coeffs1[celli]*dmdt21;
@@ -660,7 +660,7 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
             scalar dmdt12 = -dmdtNet[celli];
             scalar coeffs21Cell = -coeffs12[celli];
 
-            scalar alpha2Limited = max(min(alpha2[celli], 1.0), 0.0);
+            scalar alpha2Limited = clamp(alpha2[celli], 0, 1);
 
             // exp
             SuPhase2[celli] += coeffs2[celli]*dmdt12;
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
index d8e1700687..d446b54588 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
@@ -75,7 +75,7 @@ Foam::wallBoilingModels::TDNBModels::Shirai::TDNB
 {
     tmp<scalarField> tp = liquid.thermo().p().boundaryField()[patchi];
 
-    const scalarField pRatio(max(min(tp/Pc_, scalar(1)), scalar(0)));
+    const scalarField pRatio(clamp(tp/Pc_, zero_one{}));
 
     return
     (
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
index 9ee761d938..f724b50bdb 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
@@ -78,7 +78,11 @@ TolubinskiKostanchuk::dDeparture
     const scalarField& L
 ) const
 {
-    return max(min(dRef_*exp(-(Tsatw - Tl)/scalar(45)), dMax_), dMin_);
+    return clamp
+    (
+        dRef_*exp(-(Tsatw - Tl)/scalar(45)),
+        scalarMinMax(dMin_, dMax_)
+    );
 }
 
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index ee40e48424..77b628724c 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -148,7 +148,7 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
         volCosAngle.write();
     }
 
-    return max(min(cosAngle, scalar(1)), scalar(-1));
+    return clamp(cosAngle, scalarMinMax(-1, 1));
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index d46e00a9f9..a5474ef420 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -215,7 +215,7 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
         volCosAngle.write();
     }
 
-    return max(min(cosAngle, scalar(1)), scalar(-1));
+    return clamp(cosAngle, scalarMinMax(-1, 1));
 }
 
 
diff --git a/src/transportModels/geometricVoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C b/src/transportModels/geometricVoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
index 10fe2c055a..62db3416f8 100644
--- a/src/transportModels/geometricVoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
+++ b/src/transportModels/geometricVoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
@@ -279,7 +279,7 @@ void Foam::reconstruction::plicRDF::calcResidual
             if (mag(normal) != 0 && j != 0)
             {
                 vector n = normal/mag(normal);
-                scalar cosAngle = max(min((cellNormal & n), 1), -1);
+                scalar cosAngle = clamp((cellNormal & n), -1, 1);
                 avgDiffNormal += acos(cosAngle) * mag(normal);
                 weight += mag(normal);
                 if (cosAngle < maxDiffNormal)
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 580b4e7310..401b53ab91 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -133,11 +133,8 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
         gradient() =
         patch().deltaCoeffs()
        *(
-           max(min
-           (
-               *this + gradient()/patch().deltaCoeffs(),
-               scalar(1)), scalar(0)
-           ) - *this
+           clamp(*this + gradient()/patch().deltaCoeffs(), zero_one{})
+         - *this
        );
     }
     else if (limit_ == lcZeroGradient)
@@ -149,7 +146,7 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
 
     if (limit_ == lcAlpha)
     {
-        scalarField::operator=(max(min(*this, scalar(1)), scalar(0)));
+        scalarField::operator=(clamp(*this, zero_one{}));
     }
 }
 

From 1cc72ea7e3493a26e09d5dd07cdfd5e1164d6678 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Feb 2023 18:39:19 +0100
Subject: [PATCH 095/348] STYLE: use clamp/clamp_range instead of min(max(...,
 upper), lower)

---
 applications/solvers/combustion/XiFoam/bEqn.H |  2 +-
 .../constant/constant.C                       | 57 +++++++------------
 .../interfaceHeatResistance.C                 | 14 +----
 .../twoPhaseMixtureEThermo.C                  | 44 ++++++--------
 .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.C   |  4 +-
 .../Merkle/Merkle.C                           |  2 +-
 .../SchnerrSauer/SchnerrSauer.C               |  6 +-
 .../vectorTools/vectorTools.H                 |  4 +-
 .../adaptiveSolver/adaptiveSolver.C           |  2 +-
 src/OpenFOAM/meshes/meshShapes/face/face.C    |  4 +-
 .../polyMesh/polyMeshCheck/polyMeshCheck.C    |  6 +-
 .../primitiveShapes/triangle/triangleI.H      |  2 +-
 .../InputValueMapper/InputValueMapperI.H      |  6 +-
 src/OpenFOAM/primitives/triad/triad.C         |  2 +-
 .../RAS/kOmegaSSTLM/kOmegaSSTLM.C             |  2 +-
 .../RAS/realizableKE/realizableKE.C           |  2 +-
 .../edgeInterpolation/edgeInterpolation.C     |  6 +-
 .../edgeInterpolation/schemes/Gamma/Gamma.H   |  2 +-
 .../limitedSchemes/Gamma/Gamma.H              |  2 +-
 .../limitedSchemes/SFCD/SFCD.H                |  2 +-
 .../surfaceFieldValue/surfaceFieldValue.C     |  4 +-
 .../stabilityBlendingFactor.C                 |  2 +-
 .../stabilityBlendingFactor.H                 |  2 +-
 .../solidificationMeltingSource.C             |  2 +-
 .../multiNormal/multiNormal.C                 |  2 +-
 .../distributionModels/normal/normal.C        |  2 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |  2 +-
 .../DistortedSphereDragForce.C                |  2 +-
 .../Templates/SprayParcel/SprayParcel.C       |  4 +-
 .../spray/submodels/BreakupModel/ETAB/ETAB.C  |  3 +-
 .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C |  4 +-
 .../searchableCone/searchableCone.C           |  4 +-
 .../faceTriangulation/faceTriangulation.C     |  2 +-
 .../MassTransferPhaseSystem.C                 |  7 +--
 .../phasesSystem/massTransferModels/Lee/Lee.C | 14 ++---
 .../multiphaseInterSystem.C                   |  8 +--
 .../multiphaseSystem/multiphaseSystem.C       |  3 +-
 .../virtualMassModels/Lamb/Lamb.C             |  2 +-
 .../SinclairJackson/SinclairJacksonRadial.C   |  6 +-
 .../SinclairJackson/SinclairJacksonRadial.C   |  6 +-
 .../virtualMassModels/Lamb/Lamb.C             |  2 +-
 ...gidBodyDisplacementPointPatchVectorField.C |  2 +-
 .../sixDoFRigidBodyMotionSolver.C             |  2 +-
 ...ppedUniformInletHeatAdditionFvPatchField.C |  2 +-
 .../specie/thermo/janaf/janafThermoI.H        |  8 +--
 .../isoAdvection/isoAdvection.C               |  2 +-
 .../incompressibleTwoPhaseMixture.C           |  8 +--
 .../interfaceCompression.H                    |  7 ++-
 .../waveMakerPointPatchVectorField.C          |  2 +-
 .../irregularWaveModel/irregularWaveModel.C   |  2 +-
 50 files changed, 122 insertions(+), 167 deletions(-)

diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index 38740d0dd5..91d211ae2a 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/bEqn.H
@@ -215,7 +215,7 @@ if (ign.ignited())
           + (
                 scalar(1)
               + (2*XiShapeCoef)
-               *(scalar(0.5) - min(max(b, scalar(0)), scalar(1)))
+               *(scalar(0.5) - clamp(b, zero_one{}))
             )*(XiEqStar - scalar(1.001))
         );
 
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
index 36342d9393..78400b60ff 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
@@ -99,17 +99,6 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
 Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
 {
-
-    volScalarField limitedAlpha1
-    (
-        min(max(mixture_.alpha1(), scalar(0)), scalar(1))
-    );
-
-    volScalarField limitedAlpha2
-    (
-        min(max(mixture_.alpha2(), scalar(0)), scalar(1))
-    );
-
     const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
 
     const twoPhaseMixtureEThermo& thermo =
@@ -124,11 +113,15 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
 
     volScalarField mDotE
     (
-        "mDotE", coeffE_*mixture_.rho1()*limitedAlpha1*max(T - TSat, T0)
+        "mDotE",
+        coeffE_*mixture_.rho1()*clamp(mixture_.alpha1(), zero_one{})
+      * max(T - TSat, T0)
     );
     volScalarField mDotC
     (
-        "mDotC", coeffC_*mixture_.rho2()*limitedAlpha2*max(TSat - T, T0)
+        "mDotC",
+        coeffC_*mixture_.rho2()*clamp(mixture_.alpha2(), zero_one{})
+      * max(TSat - T, T0)
     );
 
     if (mesh_.time().outputTime())
@@ -148,16 +141,6 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
 Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
 {
-    volScalarField limitedAlpha1
-    (
-        min(max(mixture_.alpha1(), scalar(0)), scalar(1))
-    );
-
-    volScalarField limitedAlpha2
-    (
-        min(max(mixture_.alpha2(), scalar(0)), scalar(1))
-    );
-
     const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
 
     const twoPhaseMixtureEThermo& thermo =
@@ -170,8 +153,14 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
 
     return Pair<tmp<volScalarField>>
     (
-        coeffC_*mixture_.rho2()*limitedAlpha2*pos(TSat - T),
-        coeffE_*mixture_.rho1()*limitedAlpha1*pos(T - TSat)
+        (
+            coeffC_*mixture_.rho2()*clamp(mixture_.alpha2(), zero_one{})
+          * pos(TSat - T)
+        ),
+        (
+            coeffE_*mixture_.rho1()*clamp(mixture_.alpha1(), zero_one{})
+          * pos(T - TSat)
+        )
     );
 }
 
@@ -201,25 +190,17 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::TSource() const
 
     const dimensionedScalar& TSat = thermo.TSat();
 
-    dimensionedScalar L = mixture_.Hf2() - mixture_.Hf1();
-
-    volScalarField limitedAlpha1
-    (
-        min(max(mixture_.alpha1(), scalar(0)), scalar(1))
-    );
-
-    volScalarField limitedAlpha2
-    (
-        min(max(mixture_.alpha2(), scalar(0)), scalar(1))
-    );
+    const dimensionedScalar L = mixture_.Hf2() - mixture_.Hf1();
 
     const volScalarField Vcoeff
     (
-        coeffE_*mixture_.rho1()*limitedAlpha1*L*pos(T - TSat)
+        coeffE_*mixture_.rho1()*clamp(mixture_.alpha1(), zero_one{})
+      * L*pos(T - TSat)
     );
     const volScalarField Ccoeff
     (
-        coeffC_*mixture_.rho2()*limitedAlpha2*L*pos(TSat - T)
+        coeffC_*mixture_.rho2()*clamp(mixture_.alpha2(), zero_one{})
+      * L*pos(TSat - T)
     );
 
     TSource =
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
index 3961c127bd..f59700f556 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
@@ -167,20 +167,10 @@ Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::temperaturePhaseChangeTwoPhaseMixtures::interfaceHeatResistance::
 mDotAlphal() const
 {
-    volScalarField limitedAlpha1
-    (
-        min(max(mixture_.alpha1(), scalar(0)), scalar(1))
-    );
-
-    volScalarField limitedAlpha2
-    (
-        min(max(mixture_.alpha2(), scalar(0)), scalar(1))
-    );
-
     return Pair<tmp<volScalarField>>
     (
-        (mDotc_/(limitedAlpha2 + SMALL)),
-       -(mDote_/(limitedAlpha1 + SMALL))
+        (mDotc_/clamp(mixture_.alpha2(), scalarMinMax(SMALL, 1))),
+       -(mDote_/clamp(mixture_.alpha1(), scalarMinMax(SMALL, 1)))
     );
 }
 
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
index 26b975263e..0cf652dbf5 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
@@ -155,7 +155,7 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::Cp() const
 {
     const volScalarField limitedAlpha1
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_, zero_one{})
     );
 
     return tmp<volScalarField>
@@ -176,13 +176,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::Cp
     const label patchi
 ) const
 {
-    const volScalarField limitedAlpha1
+    const scalarField alpha1p
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_.boundaryField()[patchi], zero_one{})
     );
 
-    const scalarField& alpha1p = limitedAlpha1.boundaryField()[patchi];
-
     return
     (
         alpha1p*Cp1().value() + (scalar(1) - alpha1p)*Cp2().value()
@@ -194,7 +192,7 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::rho() const
 {
     const volScalarField limitedAlpha1
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_, zero_one{})
     );
 
     return tmp<volScalarField>
@@ -214,13 +212,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::rho
     const label patchi
 ) const
 {
-    const volScalarField limitedAlpha1
+    const scalarField alpha1p
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_.boundaryField()[patchi], zero_one{})
     );
 
-    const scalarField& alpha1p = limitedAlpha1.boundaryField()[patchi];
-
     return
     (
         alpha1p*rho1().value() + (scalar(1) - alpha1p)*rho2().value()
@@ -232,7 +228,7 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::Cv() const
 {
     const volScalarField limitedAlpha1
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_, zero_one{})
     );
 
     return tmp<volScalarField>
@@ -253,13 +249,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::Cv
     const label patchi
 ) const
 {
-    const volScalarField limitedAlpha1
+    const scalarField alpha1p
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_.boundaryField()[patchi], zero_one{})
     );
 
-    const scalarField& alpha1p = limitedAlpha1.boundaryField()[patchi];
-
     return
     (
         alpha1p*Cv1().value() + (scalar(1) - alpha1p)*Cv2().value()
@@ -339,7 +333,7 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::kappa() const
 {
     const volScalarField limitedAlpha1
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_, zero_one{})
     );
 
     return tmp<volScalarField>
@@ -358,13 +352,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::kappa
     const label patchi
 ) const
 {
-    const volScalarField limitedAlpha1
+    const scalarField alpha1p
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_.boundaryField()[patchi], zero_one{})
     );
 
-    const scalarField& alpha1p = limitedAlpha1.boundaryField()[patchi];
-
     return (alpha1p*kappa1().value() + (1 - alpha1p)*kappa2().value());
 }
 
@@ -402,13 +394,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::kappaEff
     const label patchi
 ) const
 {
-    const volScalarField limitedAlpha1
+    const scalarField alpha1p
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_.boundaryField()[patchi], zero_one{})
     );
 
-    const scalarField& alpha1p = limitedAlpha1.boundaryField()[patchi];
-
     return
         (alpha1p*kappa1().value() + (1 - alpha1p)*kappa2().value()) + kappat;
 
@@ -435,13 +425,11 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::alphaEff
     const label patchi
 ) const
 {
-    const volScalarField limitedAlpha1
+    const scalarField alpha1p
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_.boundaryField()[patchi], zero_one{})
     );
 
-    const scalarField& alpha1p = limitedAlpha1.boundaryField()[patchi];
-
     const scalarField rho
     (
         alpha1p*rho1().value() + (1.0 - alpha1p)*rho2().value()
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
index ce32f5a5ea..ad6fe801d9 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
@@ -70,7 +70,7 @@ Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
-    volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
+    volScalarField limitedAlpha1(clamp(alpha1_, zero_one{}));
 
     return Pair<tmp<volScalarField>>
     (
@@ -85,7 +85,7 @@ Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
-    volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
+    volScalarField limitedAlpha1(clamp(alpha1_, zero_one{}));
 
     return Pair<tmp<volScalarField>>
     (
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
index ff323e83bb..75d5964db6 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
@@ -82,7 +82,7 @@ Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
-    volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
+    volScalarField limitedAlpha1(clamp(alpha1_, zero_one{}));
 
     return Pair<tmp<volScalarField>>
     (
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
index b1e1d3e7a0..c65d51185b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
@@ -99,7 +99,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::pCoeff
     const volScalarField& p
 ) const
 {
-    volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
+    volScalarField limitedAlpha1(clamp(alpha1_, zero_one{}));
     volScalarField rho
     (
         limitedAlpha1*rho1() + (scalar(1) - limitedAlpha1)*rho2()
@@ -117,7 +117,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField pCoeff(this->pCoeff(p));
 
-    volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
+    volScalarField limitedAlpha1(clamp(alpha1_, zero_one{}));
 
     return Pair<tmp<volScalarField>>
     (
@@ -134,7 +134,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField pCoeff(this->pCoeff(p));
 
-    volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
+    volScalarField limitedAlpha1(clamp(alpha1_, zero_one{}));
     volScalarField apCoeff(limitedAlpha1*pCoeff);
 
     return Pair<tmp<volScalarField>>
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
index dee620181c..45594daba1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H
@@ -114,7 +114,7 @@ namespace vectorTools
         scalar cosPhi = (a & b)/(mag(a)*mag(b) + tolerance);
 
         // Enforce bounding between -1 and 1
-        return min(max(cosPhi, -1), 1);
+        return clamp(cosPhi, -1, 1);
     }
 
     //- Calculate angle between a and b in radians
@@ -129,7 +129,7 @@ namespace vectorTools
         scalar cosPhi = (a & b)/(mag(a)*mag(b) + tolerance);
 
         // Enforce bounding between -1 and 1
-        return acos( min(max(cosPhi, -1), 1) );
+        return acos(clamp(cosPhi, -1, 1));
     }
 
     //- Calculate angle between a and b in degrees
diff --git a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
index 126b0cbc1e..04be67825b 100644
--- a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
+++ b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
@@ -101,7 +101,7 @@ void Foam::adaptiveSolver::solve
     if (err > pow(maxScale_/safeScale_, -1.0/alphaInc_))
     {
         dxTry =
-            min(max(safeScale_*pow(err, -alphaInc_), minScale_), maxScale_)*dx;
+            clamp(safeScale_*pow(err, -alphaInc_), minScale_, maxScale_)*dx;
     }
     else
     {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 470e4b7b47..bf646864a7 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -76,7 +76,7 @@ Foam::label Foam::face::mostConcaveAngle
 
         // NOTE: is -ve angle since left edge pointing in other direction
         scalar edgeCos = (leftEdge & rightEdge);
-        scalar edgeAngle = acos(max(-1.0, min(1.0, edgeCos)));
+        scalar edgeAngle = acos(clamp(edgeCos, -1, 1));
 
         scalar angle;
 
@@ -205,7 +205,7 @@ Foam::label Foam::face::split
             splitEdge.normalise();
 
             const scalar splitCos = splitEdge & rightEdge;
-            const scalar splitAngle = acos(max(-1.0, min(1.0, splitCos)));
+            const scalar splitAngle = acos(clamp(splitCos, -1, 1));
             const scalar angleDiff = fabs(splitAngle - bisectAngle);
 
             if (angleDiff < minDiff)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index 04fc7a63b7..255335aafa 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -101,7 +101,7 @@ bool Foam::polyMesh::checkFaceOrthogonality
                         << " between cells " << own[facei]
                         << " and " << nei[facei]
                         << ": Angle = "
-                        << radToDeg(::acos(min(1.0, max(-1.0, ortho[facei]))))
+                        << radToDeg(::acos(clamp(ortho[facei], -1, 1)))
                         << " deg." << endl;
                 }
 
@@ -130,9 +130,9 @@ bool Foam::polyMesh::checkFaceOrthogonality
             if (debug || report)
             {
                 Info<< "    Mesh non-orthogonality Max: "
-                    << radToDeg(::acos(min(1.0, max(-1.0, minDDotS))))
+                    << radToDeg(::acos(clamp(minDDotS, -1, 1)))
                     << " average: "
-                    << radToDeg(::acos(min(1.0, max(-1.0, sumDDotS/nSummed))))
+                    << radToDeg(::acos(clamp(sumDDotS/nSummed, -1, 1)))
                     << endl;
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index 70f5f177b9..212cdcdc3b 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -334,7 +334,7 @@ inline Foam::scalar Foam::triangle<Point, PointRef>::circumRadius() const
     }
 
     const scalar a = (d1 + d2)*(d2 + d3)*(d3 + d1) / denom;
-    return 0.5*Foam::sqrt(min(GREAT, max(0, a)));
+    return 0.5*Foam::sqrt(clamp(a, 0, GREAT));
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H
index 8b769ac647..7fee35bec8 100644
--- a/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H
+++ b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H
@@ -47,7 +47,7 @@ inline Type Foam::Function1Types::InputValueMapper<Type>::value
         }
         case mappingMode::MINMAX:
         {
-            scalar tlim = min(max(t, min_), max_);
+            scalar tlim = clamp(t, min_, max_);
 
             return value_->value(tlim);
         }
@@ -86,8 +86,8 @@ Type Foam::Function1Types::InputValueMapper<Type>::integrate
         }
         case mappingMode::MINMAX:
         {
-            scalar xlim0 = min(max(x1, min_), max_);
-            scalar xlim1 = min(max(x2, min_), max_);
+            scalar xlim0 = clamp(x1, min_, max_);
+            scalar xlim1 = clamp(x2, min_, max_);
 
             Type intValue = value_->integrate(xlim0, xlim1);
 
diff --git a/src/OpenFOAM/primitives/triad/triad.C b/src/OpenFOAM/primitives/triad/triad.C
index c4dccf9929..53e362c5c1 100644
--- a/src/OpenFOAM/primitives/triad/triad.C
+++ b/src/OpenFOAM/primitives/triad/triad.C
@@ -395,7 +395,7 @@ Foam::scalar Foam::diff(const triad& A, const triad& B)
             (tmpA[dir] & tmpB[dir])
            /(Foam::mag(tmpA[dir])*Foam::mag(tmpA[dir]) + SMALL);
 
-        cosPhi = min(max(cosPhi, -1), 1);
+        cosPhi = clamp(cosPhi, -1, 1);
 
         sumDifference += mag(cosPhi - 1);
     }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
index c4a6af700a..d78511df8d 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
@@ -70,7 +70,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::epsilonByk
 ) const
 {
     return
-        min(max(gammaIntEff_, scalar(0.1)), scalar(1))
+        clamp(gammaIntEff_, scalarMinMax(0.1, 1))
        *kOmegaSST<BasicTurbulenceModel>::epsilonByk(F1, gradU);
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index a579204d0e..f519ce37f0 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -63,7 +63,7 @@ tmp<volScalarField> realizableKE<BasicTurbulenceModel>::rCmu
 
     volScalarField phis
     (
-        (1.0/3.0)*acos(min(max(sqrt(6.0)*W, -scalar(1)), scalar(1)))
+        (1.0/3.0)*acos(clamp(sqrt(6.0)*W, scalarMinMax(-1, 1)))
     );
     volScalarField As(sqrt(6.0)*cos(phis));
     volScalarField Us(sqrt(S2/2.0 + magSqr(skew(gradU))));
diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
index a75f322260..0e5f0b25f5 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
+++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
@@ -529,11 +529,7 @@ void Foam::edgeInterpolation::makeCorrectionVectors() const
     if (owner.size() > 0)
     {
         scalarField sinAlpha(deltaCoeffs*mag(CorrVecs.internalField()));
-
-        forAll(sinAlpha, edgeI)
-        {
-            sinAlpha[edgeI] = max(-1, min(sinAlpha[edgeI], 1));
-        }
+        sinAlpha.clamp_range(-1, 1);
 
         NonOrthogCoeff = max(Foam::asin(sinAlpha)*180.0/M_PI);
     }
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
index d8de90a17e..80b118a7e4 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
@@ -110,7 +110,7 @@ public:
         gradcf = stabilise(gradcf, SMALL);
 
         scalar phict = 1 - 0.5*gradf/gradcf;
-        scalar limiter = min(max(phict/k_, 0), 1);
+        scalar limiter = clamp(phict/k_, 0, 1);
 
         return lerp(udWeight, cdWeight, limiter);
     }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
index fc1f89eaae..5996e45d4b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
@@ -97,7 +97,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return min(max(phict/k_, 0), 1);
+        return clamp(phict/k_, 0, 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H
index c6aa9920af..a9298c1214 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H
@@ -82,7 +82,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        scalar limitPhict = min(max(phict, 0), 0.5);
+        scalar limitPhict = clamp(phict, 0, 0.5);
         return limitPhict/(1 - limitPhict);
     }
 };
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index 22d691e199..e4091007a8 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -670,7 +670,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::processValues
             // Uniformity index
             const scalar ui = 1 - numer/(2*mag(mean*areaTotal) + ROOTVSMALL);
 
-            return min(max(ui, 0), 1);
+            return clamp(ui, 0, 1);
         }
 
         default:
@@ -756,7 +756,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::processValues
             // Uniformity index
             const scalar ui = 1 - numer/(2*mag(mean*areaTotal) + ROOTVSMALL);
 
-            return vector(min(max(ui, 0), 1), 0, 0);
+            return vector(clamp(ui, 0, 1), 0, 0);
         }
 
         default:
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 8837f3784d..7839740c32 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -417,7 +417,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
             max
             (
                 indicator,
-                min(max(scalar(0), (Co - Co1_)/(Co2_ - Co1_)), scalar(1))
+                clamp((Co - Co1_)/(Co2_ - Co1_), zero_one{})
             );
 
         if (first)
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
index 5823e65495..541553c734 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
@@ -152,7 +152,7 @@ Description
     For option 6, the following relation is used:
 
     \f[
-        fCoWeight = min(max((Co - Co1)/(Co2 - Co1), 0), 1)
+        fCoWeight = clamp((Co - Co1)/(Co2 - Co1), 0, 1)
     \f]
 
     where
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index d8fff9fb1d..2154433865 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -147,7 +147,7 @@ void Foam::fv::solidificationMeltingSource::update(const volScalarField& Cp)
         scalar Cpc = Cp[celli];
         scalar alpha1New = alpha1_[celli] + relax_*Cpc*(Tc - Tmelt_)/L_;
 
-        alpha1_[celli] = max(0, min(alpha1New, 1));
+        alpha1_[celli] = clamp(alpha1New, 0, 1);
         deltaT_[i] = Tc - Tmelt_;
     }
 
diff --git a/src/lagrangian/distributionModels/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
index 43761f9326..8067ca5feb 100644
--- a/src/lagrangian/distributionModels/multiNormal/multiNormal.C
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
@@ -168,7 +168,7 @@ Foam::scalar Foam::distributionModels::multiNormal::sample
     // Note: numerical approximation of the inverse function yields slight
     //       inaccuracies
 
-    return min(max(x, minValue_), maxValue_);
+    return clamp(x, minValue_, maxValue_);
 }
 
 
diff --git a/src/lagrangian/distributionModels/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C
index 203dc1a3a1..a3b27ae2a2 100644
--- a/src/lagrangian/distributionModels/normal/normal.C
+++ b/src/lagrangian/distributionModels/normal/normal.C
@@ -108,7 +108,7 @@ Foam::scalar Foam::distributionModels::normal::sample() const
     // Note: numerical approximation of the inverse function yields slight
     //       inaccuracies
 
-    return min(max(x, minValue_), maxValue_);
+    return clamp(x, minValue_, maxValue_);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 7d507350a9..013fa5b954 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -300,7 +300,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 
     // Calculate the new temperature and the enthalpy transfer terms
     scalar Tnew = T_ + deltaT;
-    Tnew = min(max(Tnew, cloud.constProps().TMin()), cloud.constProps().TMax());
+    Tnew = clamp(Tnew, cloud.constProps().TMin(), cloud.constProps().TMax());
 
     dhsTrans -= m*Cp_*deltaTcp;
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
index 1a71c63e05..5d4502bade 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
@@ -84,7 +84,7 @@ Foam::forceSuSp Foam::DistortedSphereDragForce<CloudType>::calcCoupled
 ) const
 {
     // Limit the drop distortion to y=0 (sphere) and y=1 (disk)
-    const scalar y = min(max(p.y(), scalar(0)), scalar(1));
+    const scalar y = clamp(p.y(), 0, 1);
 
     // (LMR:Eq. 10)
     return
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
index 0968e7a077..8c3809b23e 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
@@ -361,9 +361,7 @@ Foam::scalar Foam::SprayParcel<ParcelType>::chi
         }
     }
 
-    chi = min(1.0, max(chi, 0.0));
-
-    return chi;
+    return clamp(chi, 0, 1);
 }
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
index c642019c79..fe5d8468c5 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
@@ -177,8 +177,7 @@ bool Foam::ETAB<CloudType>::update
                     Kbr =k2_*omega*sqrtWe;
                 }
 
-                scalar rWetmp = 1.0/Wetmp;
-                scalar cosdtbu = max(-1.0, min(1.0, 1.0 - rWetmp));
+                scalar cosdtbu = clamp((1.0 - 1.0/Wetmp), -1, 1);
                 scalar dtbu = romega*acos(cosdtbu);
                 scalar decay = exp(-Kbr*dtbu);
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
index 2bc115e61c..c0af94ad08 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
@@ -326,8 +326,8 @@ void Foam::cyclicACMIPolyPatch::resetAMI(const UList<point>& points) const
     // Note:
     // - assumes that the non-overlap patches are decomposed using the same
     //   decomposition as the coupled patches (per side)
-    srcMask_ = min(scalar(1), max(scalar(0), AMI.srcWeightsSum()));
-    tgtMask_ = min(scalar(1), max(scalar(0), AMI.tgtWeightsSum()));
+    srcMask_ = clamp(AMI.srcWeightsSum(), zero_one{});
+    tgtMask_ = clamp(AMI.tgtWeightsSum(), zero_one{});
 
     if (debug)
     {
diff --git a/src/meshTools/searchableSurfaces/searchableCone/searchableCone.C b/src/meshTools/searchableSurfaces/searchableCone/searchableCone.C
index 4e47cb144f..379eaacf92 100644
--- a/src/meshTools/searchableSurfaces/searchableCone/searchableCone.C
+++ b/src/meshTools/searchableSurfaces/searchableCone/searchableCone.C
@@ -113,11 +113,11 @@ void Foam::searchableCone::findNearestAndNormal
     v.normalise();
 
     // Nearest and normal on disk at point1
-    point disk1Point(point1_ + min(max(magV, innerRadius1_), radius1_)*v);
+    point disk1Point(point1_ + clamp(magV, innerRadius1_, radius1_)*v);
     vector disk1Normal(-unitDir_);
 
     // Nearest and normal on disk at point2
-    point disk2Point(point2_ + min(max(magV, innerRadius2_), radius2_)*v);
+    point disk2Point(point2_ + clamp(magV, innerRadius2_, radius2_)*v);
     vector disk2Normal(unitDir_);
 
     // Nearest and normal on cone. Initialise to far-away point so if not
diff --git a/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C b/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
index f6cac88650..aab6832a25 100644
--- a/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
@@ -83,7 +83,7 @@ void Foam::faceTriangulation::calcHalfAngle
 )
 {
     // truncate cos to +-1 to prevent negative numbers
-    scalar cos = max(-1, min(1, e0 & e1));
+    scalar cos = clamp((e0 & e1), -1, 1);
 
     scalar sin = (e0 ^ e1) & normal;
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
index e9039e3971..df41e3555b 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
@@ -600,11 +600,8 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
 
         if (includeDivU)
         {
-            SuPhase1 +=
-                fvc::div(phi)*min(max(alpha1, scalar(0)), scalar(1));
-
-            SuPhase2 +=
-                fvc::div(phi)*min(max(alpha2, scalar(0)), scalar(1));
+            SuPhase1 += fvc::div(phi)*clamp(alpha1, zero_one{});
+            SuPhase2 += fvc::div(phi)*clamp(alpha2, zero_one{});
         }
 
         // NOTE: dmdtNet is distributed in terms =
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C
index d0cde4679e..61cf147853 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C
@@ -57,7 +57,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::Kexp
     {
         const volScalarField from
         (
-            min(max(this->pair().from(), scalar(0)), scalar(1))
+            clamp(this->pair().from(), zero_one{})
         );
 
         const volScalarField coeff
@@ -95,9 +95,9 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSp
 {
     if (this->modelVariable_ == variable)
     {
-        volScalarField from
+        const volScalarField from
         (
-            min(max(this->pair().from(), scalar(0)), scalar(1))
+            clamp(this->pair().from(), zero_one{})
         );
 
         const volScalarField coeff
@@ -123,7 +123,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSp
     }
     else
     {
-        return tmp<volScalarField> ();
+        return nullptr;
     }
 }
 
@@ -138,9 +138,9 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSu
 {
     if (this->modelVariable_ == variable)
     {
-        volScalarField from
+        const volScalarField from
         (
-            min(max(this->pair().from(), scalar(0)), scalar(1))
+            clamp(this->pair().from(), zero_one{})
         );
 
         const volScalarField coeff
@@ -165,7 +165,7 @@ Foam::meltingEvaporationModels::Lee<Thermo, OtherThermo>::KSu
     }
     else
     {
-        return tmp<volScalarField> ();
+        return nullptr;
     }
 }
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
index 3df86d343a..fc654b05c1 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
@@ -1277,12 +1277,12 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseInterSystem::nVolHatfv
 {
     const volScalarField alpha1m
     (
-        min(max(alpha1, scalar(0)), scalar(1))
+        clamp(alpha1, zero_one{})
     );
 
     const volScalarField alpha2m
     (
-        min(max(alpha2, scalar(0)), scalar(1))
+        clamp(alpha2, zero_one{})
     );
 
     const volVectorField gradAlphaf
@@ -1311,12 +1311,12 @@ Foam::tmp<Foam::surfaceVectorField> Foam::multiphaseInterSystem::nHatfv
 
     const volScalarField alpha1b
     (
-        min(max(alpha1, scalar(0)), scalar(1))
+        clamp(alpha1, zero_one{})
     );
 
     const volScalarField alpha2b
     (
-        min(max(alpha2, scalar(0)), scalar(1))
+        clamp(alpha2, zero_one{})
     );
 
     surfaceVectorField gradAlphaf
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
index ffda1f535a..7758370b7f 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
@@ -286,8 +286,7 @@ void Foam::multiphaseInter::multiphaseSystem::solveAlphas()
 
             // Add alpha*div(U)
             //const volScalarField& alpha = phase;
-            //Su_[phase.name()] +=
-            //    fvc::div(phi)*min(max(alpha, scalar(0)), scalar(1));
+            //Su_[phase.name()] += fvc::div(phi)*clamp(alpha, zero_one{});
         }
 
         // Fill Su and Sp
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
index ee9c252ce4..5743794240 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
@@ -69,7 +69,7 @@ Foam::virtualMassModels::Lamb::~Lamb()
 
 Foam::tmp<Foam::volScalarField> Foam::virtualMassModels::Lamb::Cvm() const
 {
-    volScalarField E(min(max(pair_.E(), SMALL), 1 - SMALL));
+    volScalarField E(clamp(pair_.E(), scalarMinMax(SMALL, 1 - SMALL)));
     volScalarField rtOmEsq(sqrt(1 - sqr(E)));
 
     return
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index 4e7ffdb7c1..e0e840b418 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -90,7 +90,11 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
 {
     volScalarField aByaMax
     (
-        cbrt(min(max(alpha, scalar(1e-3)), alphaMinFriction)/alphaMax)
+        cbrt
+        (
+            clamp(alpha, scalarMinMax(1e-3, alphaMinFriction.value()))
+          / alphaMax
+        )
     );
 
     return (1.0/(3*alphaMax))/sqr(aByaMax - sqr(aByaMax));
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index d8560e28a1..19eca49367 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -90,7 +90,11 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
 {
     volScalarField aByaMax
     (
-        cbrt(min(max(alpha, scalar(1e-3)), alphaMinFriction)/alphaMax)
+        cbrt
+        (
+            clamp(alpha, scalarMinMax(1e-3, alphaMinFriction.value()))
+          / alphaMax
+        )
     );
 
     return (1.0/(3*alphaMax))/sqr(aByaMax - sqr(aByaMax));
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
index c08f64a232..1ce201fde8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
@@ -69,7 +69,7 @@ Foam::virtualMassModels::Lamb::~Lamb()
 
 Foam::tmp<Foam::volScalarField> Foam::virtualMassModels::Lamb::Cvm() const
 {
-    volScalarField E(min(max(pair_.E(), SMALL), 1 - SMALL));
+    volScalarField E(clamp(pair_.E(), scalarMinMax(SMALL, 1 - SMALL)));
     volScalarField rtOmEsq(sqrt(1 - sqr(E)));
 
     return
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index e804362b8b..ee455f158a 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -233,7 +233,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
         g_ = g.value();
     }
 
-    // scalar ramp = min(max((t.value() - 5)/10, 0), 1);
+    // scalar ramp = clamp((t.value() - 5)/10, 0, 1);
     scalar ramp = 1.0;
 
     motion_.update
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index eb6d00851c..d3559f4ea9 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -219,7 +219,7 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
         coeffDict().readIfPresent("g", g);
     }
 
-    // const scalar ramp = min(max((this->db().time().value() - 5)/10, 0), 1);
+    // const scalar ramp = clamp((this->db().time().value() - 5)/10, 0, 1);
     const scalar ramp = 1.0;
 
     if (test_)
diff --git a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index 5e7b8daa3a..900c93ad25 100644
--- a/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -170,7 +170,7 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
 
         scalar totalPhiCp = gSum(outletPatchPhi)*gAverage(Cpf);
 
-        operator==(min(max(averageOutletField + Q_/totalPhiCp, TMin_), TMax_));
+        operator==(clamp(averageOutletField + Q_/totalPhiCp, TMin_, TMax_));
     }
     else
     {
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index 919b1454dc..587907582c 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -123,12 +123,10 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::limit
             << Tlow_ << " -> " << Thigh_ << ";  T = " << T
             << endl;
 
-        return min(max(T, Tlow_), Thigh_);
-    }
-    else
-    {
-        return T;
+        return clamp(T, Tlow_, Thigh_);
     }
+
+    return T;
 }
 
 
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
index 344901b84e..fc9e8746a3 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
@@ -631,7 +631,7 @@ void Foam::isoAdvection::applyBruteForceBounding()
 
     if (dict_.getOrDefault("clip", true))
     {
-        alpha1_ = min(scalar(1), max(scalar(0), alpha1_));
+        alpha1_.clamp_range(zero_one{});
         alpha1Changed = true;
     }
 
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index ba81228b88..4ad68c9825 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -48,7 +48,7 @@ void Foam::incompressibleTwoPhaseMixture::calcNu()
     const volScalarField limitedAlpha1
     (
         "limitedAlpha1",
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_, zero_one{})
     );
 
     // Average kinematic viscosity calculated from dynamic viscosity
@@ -128,7 +128,7 @@ Foam::incompressibleTwoPhaseMixture::mu() const
 {
     const volScalarField limitedAlpha1
     (
-        min(max(alpha1_, scalar(0)), scalar(1))
+        clamp(alpha1_, zero_one{})
     );
 
     return tmp<volScalarField>::New
@@ -153,7 +153,7 @@ Foam::incompressibleTwoPhaseMixture::muf() const
 {
     const surfaceScalarField alpha1f
     (
-        min(max(fvc::interpolate(alpha1_), scalar(0)), scalar(1))
+        clamp(fvc::interpolate(alpha1_), zero_one{})
     );
 
     return tmp<surfaceScalarField>::New
@@ -170,7 +170,7 @@ Foam::incompressibleTwoPhaseMixture::nuf() const
 {
     const surfaceScalarField alpha1f
     (
-        min(max(fvc::interpolate(alpha1_), scalar(0)), scalar(1))
+        clamp(fvc::interpolate(alpha1_), zero_one{})
     );
 
     return tmp<surfaceScalarField>::New
diff --git a/src/transportModels/interfaceProperties/interfaceCompression/interfaceCompression.H b/src/transportModels/interfaceProperties/interfaceCompression/interfaceCompression.H
index bfc7d5e999..52a24a45cf 100644
--- a/src/transportModels/interfaceProperties/interfaceCompression/interfaceCompression.H
+++ b/src/transportModels/interfaceProperties/interfaceCompression/interfaceCompression.H
@@ -71,10 +71,11 @@ public:
         //return min(max(4*min(phiP*(1 - phiP), phiN*(1 - phiN)), 0), 1);
 
         // Quartic compression scheme
-        return
-            min(max(
+        return clamp
+        (
             1 - max(sqr(1 - 4*phiP*(1 - phiP)), sqr(1 - 4*phiN*(1 - phiN))),
-            0), 1);
+            0, 1
+        );
     }
 };
 
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
index be8cbfb7c3..c4168f0969 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
@@ -89,7 +89,7 @@ Foam::scalar Foam::waveMakerPointPatchVectorField::timeCoeff
     const scalar t
 ) const
 {
-    return max(0, min(t/rampTime_, 1));
+    return clamp(t/rampTime_, 0, 1);
 }
 
 
diff --git a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
index 059a4e498e..aac185602f 100644
--- a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
+++ b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
@@ -46,7 +46,7 @@ Foam::scalar Foam::waveModels::irregularWaveModel::timeCoeff
     const scalar t
 ) const
 {
-    return max(0, min(t/rampTime_, 1));
+    return clamp(t/rampTime_, 0, 1);
 }
 
 

From f180740b030602906fe620d4f9c943d5c4e5f64a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Feb 2023 18:39:19 +0100
Subject: [PATCH 096/348] STYLE: lerp and emplace_back to simplify streamline
 coding

---
 .../field/streamLine/streamLineBase.C         | 87 ++++++++-----------
 .../field/streamLine/streamLineParticle.C     | 21 ++---
 .../wallBoundedStreamLineParticleTemplates.C  | 11 +--
 3 files changed, 49 insertions(+), 70 deletions(-)

diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 512fff95e1..e5fa1db6d9 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -272,33 +272,29 @@ void Foam::functionObjects::streamLineBase::storePoint
     DynamicList<vectorList>& newVectors
 ) const
 {
-    const label sz = newTrack.size();
-
     const List<point>& track = allTracks_[tracki];
 
-    newTrack.append((1.0-w)*track[lefti] + w*track[righti]);
+    newTrack.push_back(lerp(track[lefti], track[righti], w));
 
     // Scalars
     {
-        newScalars.append(scalarList(allScalars_.size()));
-        scalarList& newVals = newScalars[sz];
+        scalarList& newVals = newScalars.emplace_back(allScalars_.size());
 
-        forAll(allScalars_, scalari)
+        forAll(allScalars_, i)
         {
-            const scalarList& trackVals = allScalars_[scalari][tracki];
-            newVals[scalari] = (1.0-w)*trackVals[lefti] + w*trackVals[righti];
+            const scalarList& trackVals = allScalars_[i][tracki];
+            newVals[i] = lerp(trackVals[lefti], trackVals[righti], w);
         }
     }
 
     // Vectors
     {
-        newVectors.append(vectorList(allVectors_.size()));
-        vectorList& newVals = newVectors[sz];
+        vectorList& newVals = newVectors.emplace_back(allVectors_.size());
 
-        forAll(allVectors_, vectori)
+        forAll(allVectors_, i)
         {
-            const vectorList& trackVals = allVectors_[vectori][tracki];
-            newVals[vectori] = (1.0-w)*trackVals[lefti] + w*trackVals[righti];
+            const vectorList& trackVals = allVectors_[i][tracki];
+            newVals[i] = lerp(trackVals[lefti], trackVals[righti], w);
         }
     }
 }
@@ -343,9 +339,9 @@ void Foam::functionObjects::streamLineBase::trimToBox
                         segmenti-1,
                         segmenti,
 
-                        newTracks.last(),
-                        newScalars.last(),
-                        newVectors.last()
+                        newTracks.back(),
+                        newScalars.back(),
+                        newVectors.back()
                     );
 
                     if (!bb.contains(endPt))
@@ -363,14 +359,14 @@ void Foam::functionObjects::streamLineBase::trimToBox
                                 segmenti-1,
                                 segmenti,
 
-                                newTracks.last(),
-                                newScalars.last(),
-                                newVectors.last()
+                                newTracks.back(),
+                                newScalars.back(),
+                                newVectors.back()
                             );
 
-                            newTracks.last().shrink();
-                            newScalars.last().shrink();
-                            newVectors.last().shrink();
+                            newTracks.back().shrink();
+                            newScalars.back().shrink();
+                            newVectors.back().shrink();
                         }
                     }
                 }
@@ -382,18 +378,7 @@ void Foam::functionObjects::streamLineBase::trimToBox
                     if (bb.intersects(startPt, endPt, clipPt))
                     {
                         // New track
-                        newTracks.append
-                        (
-                            new DynamicList<point>(track.size()/10)
-                        );
-                        newScalars.append
-                        (
-                            new DynamicList<scalarList>(track.size()/10)
-                        );
-                        newVectors.append
-                        (
-                            new DynamicList<vectorList>(track.size()/10)
-                        );
+                        const label defltCapacity(track.size()/10);
 
                         // Store point and interpolated values
                         storePoint
@@ -404,9 +389,9 @@ void Foam::functionObjects::streamLineBase::trimToBox
                             segmenti-1,
                             segmenti,
 
-                            newTracks.last(),
-                            newScalars.last(),
-                            newVectors.last()
+                            newTracks.emplace_back(defltCapacity),
+                            newScalars.emplace_back(defltCapacity),
+                            newVectors.emplace_back(defltCapacity)
                         );
 
                         if (!bb.contains(endPt))
@@ -427,14 +412,14 @@ void Foam::functionObjects::streamLineBase::trimToBox
                                 segmenti-1,
                                 segmenti,
 
-                                newTracks.last(),
-                                newScalars.last(),
-                                newVectors.last()
+                                newTracks.back(),
+                                newScalars.back(),
+                                newVectors.back()
                             );
 
-                            newTracks.last().shrink();
-                            newScalars.last().shrink();
-                            newVectors.last().shrink();
+                            newTracks.back().shrink();
+                            newScalars.back().shrink();
+                            newVectors.back().shrink();
                         }
                     }
                 }
@@ -442,7 +427,7 @@ void Foam::functionObjects::streamLineBase::trimToBox
         }
 
         // Last point
-        if (bb.contains(track.last()))
+        if (bb.contains(track.back()))
         {
             storePoint
             (
@@ -452,9 +437,9 @@ void Foam::functionObjects::streamLineBase::trimToBox
                 track.size()-2,
                 track.size()-1,
 
-                newTracks.last(),
-                newScalars.last(),
-                newVectors.last()
+                newTracks.back(),
+                newScalars.back(),
+                newVectors.back()
             );
         }
     }
@@ -476,9 +461,9 @@ void Foam::functionObjects::streamLineBase::trimToBox(const treeBoundBox& bb)
         if (track.size())
         {
             // New track. Assume it consists of the whole track
-            newTracks.append(new DynamicList<point>(track.size()));
-            newScalars.append(new DynamicList<scalarList>(track.size()));
-            newVectors.append(new DynamicList<vectorList>(track.size()));
+            newTracks.emplace_back(track.size());
+            newScalars.emplace_back(track.size());
+            newVectors.emplace_back(track.size());
 
             // Trim, split and append to newTracks
             trimToBox(bb, tracki, newTracks, newScalars, newVectors);
diff --git a/src/functionObjects/field/streamLine/streamLineParticle.C b/src/functionObjects/field/streamLine/streamLineParticle.C
index ed61271c1a..41c2bb8e8d 100644
--- a/src/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/functionObjects/field/streamLine/streamLineParticle.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,17 +57,17 @@ Foam::vector Foam::streamLineParticle::interpolateFields
     if
     (
         sampledPositions_.empty()
-     || magSqr(sampledPositions_.last() - position) > Foam::sqr(SMALL)
+     || sampledPositions_.back().distSqr(position) > Foam::sqr(SMALL)
     )
     {
         // Store new location
-        sampledPositions_.append(position);
+        sampledPositions_.push_back(position);
 
         // Scalar fields
         sampledScalars_.resize(td.vsInterp_.size());
         forAll(td.vsInterp_, i)
         {
-            sampledScalars_[i].append
+            sampledScalars_[i].push_back
             (
                 td.vsInterp_[i].interpolate(tetCoords, tetIs, tetIs.face())
             );
@@ -77,7 +77,7 @@ Foam::vector Foam::streamLineParticle::interpolateFields
         sampledVectors_.resize(td.vvInterp_.size());
         forAll(td.vvInterp_, i)
         {
-            sampledVectors_[i].append
+            sampledVectors_[i].push_back
             (
                 td.vvInterp_[i].interpolate(tetCoords, tetIs, tetIs.face())
             );
@@ -85,7 +85,7 @@ Foam::vector Foam::streamLineParticle::interpolateFields
             if (td.vvInterp_.get(i) == &(td.UInterp_))
             {
                 foundU = true;
-                U = sampledVectors_[i].last();
+                U = sampledVectors_[i].back();
             }
         }
     }
@@ -272,19 +272,16 @@ bool Foam::streamLineParticle::move
 
         // Transfer particle data into trackingData.
         {
-            td.allPositions_.append(vectorList());
-            td.allPositions_.last().transfer(sampledPositions_);
+            td.allPositions_.emplace_back().transfer(sampledPositions_);
         }
 
         forAll(sampledScalars_, i)
         {
-            td.allScalars_[i].append(scalarList());
-            td.allScalars_[i].last().transfer(sampledScalars_[i]);
+            td.allScalars_[i].emplace_back().transfer(sampledScalars_[i]);
         }
         forAll(sampledVectors_, i)
         {
-            td.allVectors_[i].append(vectorList());
-            td.allVectors_[i].last().transfer(sampledVectors_[i]);
+            td.allVectors_[i].emplace_back().transfer(sampledVectors_[i]);
         }
     }
 
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleTemplates.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleTemplates.C
index 46b136d101..c69f1a18c1 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleTemplates.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -117,19 +117,16 @@ bool Foam::wallBoundedStreamLineParticle::move
 
         // Transfer particle data into trackingData.
         {
-            td.allPositions_.append(vectorList());
-            td.allPositions_.last().transfer(sampledPositions_);
+            td.allPositions_.emplace_back().transfer(sampledPositions_);
         }
 
         forAll(sampledScalars_, i)
         {
-            td.allScalars_[i].append(scalarList());
-            td.allScalars_[i].last().transfer(sampledScalars_[i]);
+            td.allScalars_[i].emplace_back().transfer(sampledScalars_[i]);
         }
         forAll(sampledVectors_, i)
         {
-            td.allVectors_[i].append(vectorList());
-            td.allVectors_[i].last().transfer(sampledVectors_[i]);
+            td.allVectors_[i].emplace_back().transfer(sampledVectors_[i]);
         }
     }
 

From 74d65ed018b067065beb9353cc06cc35e52572ee Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 21 Feb 2023 09:57:37 +0100
Subject: [PATCH 097/348] CONFIG: additional test for mpfr library in cgal
 config (#2664)

- other systems (eg, ARM64 linux with clang) do not have a separate
  mpfr library configured so also check for mpfr (gmp is assumed to be
  the same) and return corresponding cgal flavour (eg, header-no-mpfr)
---
 wmake/scripts/have_cgal | 72 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/wmake/scripts/have_cgal b/wmake/scripts/have_cgal
index eaf1973103..7308dae177 100644
--- a/wmake/scripts/have_cgal
+++ b/wmake/scripts/have_cgal
@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2020 OpenCFD Ltd.
+#     Copyright (C) 2018-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -14,12 +14,16 @@
 #     have_cgal
 #
 # Description
-#     Detection/setup of CGAL
+#     Detection/setup of CGAL (with/without mpfr support)
 #
 # Requires
 #     CGAL_ARCH_PATH
 # or  config.sh/CGAL (when CGAL_ARCH_PATH is empty)
 #
+# Optional
+#     MPFR_ARCH_PATH
+# or  config.sh/CGAL (when CGAL_ARCH_PATH is empty)
+#
 # Functions provided
 #     have_cgal, no_cgal, echo_cgal, query_cgal
 #
@@ -42,6 +46,7 @@
 no_cgal()
 {
     unset HAVE_CGAL CGAL_FLAVOUR CGAL_INC_DIR CGAL_LIB_DIR
+    unset HAVE_MPFR MPFR_INC_DIR MPFR_LIB_DIR
 }
 
 
@@ -56,6 +61,62 @@ echo_cgal()
 }
 
 
+# Search
+# $1 : prefix (*_ARCH_PATH, system, ...)
+#
+# On success, return 0 and export variables
+# -> HAVE_MPFR, MPFR_INC_DIR, MPFR_LIB_DIR
+search_mpfr()
+{
+    local warn # warn="==> skip mpfr"
+    local incName="mpfr.h"
+    local libName="libmpfr"
+
+    local prefix="${1:-system}"
+    local header library
+
+    # ----------------------------------
+    if isNone "$prefix"
+    then
+        [ -n "$warn" ] && echo "$warn (disabled)"
+        return 1
+    elif hasAbsdir "$prefix"
+    then
+        header=$(findFirstFile "$prefix/include/$incName")
+        library=$(findExtLib "$libName")
+    elif isSystem "$prefix"
+    then
+        header=$(findSystemInclude -name="$incName")
+        prefix=$(sysPrefix "$header")
+    else
+        unset prefix
+    fi
+    # ----------------------------------
+
+    # Header
+    [ -n "$header" ] || {
+        [ -n "$warn" ] && echo "$warn (no header)"
+        return 2
+    }
+
+    # Library may be optional - eg, header-only
+    [ -n "$library" ] \
+    || library=$(findLibrary -prefix="$prefix" -name="$libName") \
+    || {
+        [ -n "$warn" ] && echo "==> $warn (no library)"
+        return 2
+    }
+
+    # ----------------------------------
+
+    # OK
+    export HAVE_MPFR=true
+    export MPFR_ARCH_PATH="$prefix"
+    export MPFR_INC_DIR="${header%/*}"     # Basename
+    export MPFR_LIB_DIR="${library%/*}"    # Basename
+}
+
+
 # Search
 # $1 : prefix (*_ARCH_PATH, system, ...)
 #
@@ -110,6 +171,10 @@ search_cgal()
     # OK
     export HAVE_CGAL=true
     export CGAL_FLAVOUR="${flavour:-library}"
+    if [ "$HAVE_MPFR" != true ]
+    then
+        CGAL_FLAVOUR="${CGAL_FLAVOUR}-no-mpfr"
+    fi
     export CGAL_ARCH_PATH="$prefix"
     export CGAL_INC_DIR="${header%/*}"     # Basename
     export CGAL_LIB_DIR="${library%/*}"    # Basename
@@ -138,6 +203,9 @@ have_cgal()
     # Need boost for cgal
     search_boost "$BOOST_ARCH_PATH"
 
+    # May need mpfr/gmp for cgal
+    search_mpfr "$MPFR_ARCH_PATH"
+
     search_cgal "$CGAL_ARCH_PATH"
 }
 

From d006339c9a50c8a2a455c35226d2ba3489c947f8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 21 Feb 2023 13:14:25 +0100
Subject: [PATCH 098/348] ENH: remove restricted precision for calc/eval
 (#2635)

- in earlier versions: used 'fixed' notation
  to force floating point numbers to be printed with at least
  some decimal digits. However, in the meantime we are more
  flexible with handling float/int input so remove this constraint.

- use ITstream::toString, which makes the string expansion of ${var}
  and the expression expansion of $[var] consistent.
---
 applications/test/dictionary/testDictEval5    | 39 +++++++++++++++++++
 src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C | 35 ++++++++++-------
 .../functionEntries/calcEntry/calcEntry.C     |  7 ++--
 .../expressions/exprEntry/expressionEntry.C   | 15 ++-----
 .../primitives/strings/stringOps/stringOps.C  | 39 +++++++++----------
 5 files changed, 85 insertions(+), 50 deletions(-)
 create mode 100644 applications/test/dictionary/testDictEval5

diff --git a/applications/test/dictionary/testDictEval5 b/applications/test/dictionary/testDictEval5
new file mode 100644
index 0000000000..535a100bc6
--- /dev/null
+++ b/applications/test/dictionary/testDictEval5
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      dictionary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Test evaluation with small values
+
+dp #eval{ sqrt(3./2.) *1e-3};
+a  #eval{ 2/sqrt(2.)*$dp };
+A_square #eval{ $a*$a };
+A_inlet #eval{ $A_square-2*degToRad(180)*$dp*$dp*0.25 };
+Q $A_inlet;
+Qerror #eval{$A_inlet};
+e #eval{0.2526944494428081};
+Uin #eval{ $Q/($A_square*$e) };
+
+// Bypass
+
+alt_dp #eval{ sqrt(3./2.) *1e-3};
+alt_a  #eval{ 2/sqrt(2.)*$[alt_dp] };
+alt_A_square #eval{ $[alt_a]*$[alt_a] };
+alt_A_inlet #eval{ $[alt_A_square]-2*degToRad(180)*$[alt_dp]*$[alt_dp]*0.25 };
+alt_Q $alt_A_inlet;
+alt_Qerror #eval{ $[alt_A_inlet] };
+alt_e #eval{0.2526944494428081};
+alt_Uin #eval{ $[alt_Q]/($[alt_A_square]*$[alt_e]) };
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C
index c779dba4de..884cffe2fd 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -287,11 +287,11 @@ void Foam::ITstream::print(Ostream& os) const
     }
     else
     {
-        os  << toks.first().lineNumber();
+        os  << toks.front().lineNumber();
 
-        if (toks.first().lineNumber() < toks.last().lineNumber())
+        if (toks.front().lineNumber() < toks.back().lineNumber())
         {
-            os  << '-' << toks.last().lineNumber();
+            os  << '-' << toks.back().lineNumber();
         }
     }
     os  << ", ";
@@ -302,17 +302,22 @@ void Foam::ITstream::print(Ostream& os) const
 
 std::string Foam::ITstream::toString() const
 {
-    // NOTE: may wish to have special handling if there is a single token
-    // and it is already a string or word
+    const tokenList& toks = *this;
+    const label nToks = toks.size();
+
+    if (nToks == 1 && toks.front().isStringType())
+    {
+        // Already a string-type (WORD, STRING, ...). Just copy.
+        return toks.front().stringToken();
+    }
 
     OStringStream buf;
-    unsigned i = 0;
-    for (const token& tok : *this)
+    buf.precision(16);      // Some reasonably high precision
+    bool addSpace = false;  // Separate from previous token with a space
+    for (const token& tok : toks)
     {
-        if (i++)
-        {
-            buf << ' ';
-        }
+        if (addSpace) buf << token::SPACE;
+        addSpace = true;
         buf << tok;
     }
 
@@ -345,7 +350,7 @@ void Foam::ITstream::seek(label pos)
 
         if (nToks)
         {
-            lineNumber_ = toks.first().lineNumber();
+            lineNumber_ = toks.front().lineNumber();
         }
 
         setOpened();
@@ -358,7 +363,7 @@ void Foam::ITstream::seek(label pos)
 
         if (nToks)
         {
-            lineNumber_ = toks.last().lineNumber();
+            lineNumber_ = toks.back().lineNumber();
         }
 
         setEof();
@@ -461,7 +466,7 @@ Foam::Istream& Foam::ITstream::read(token& tok)
 
         if (nToks)
         {
-            tok.lineNumber(toks.last().lineNumber());
+            tok.lineNumber(toks.back().lineNumber());
         }
         else
         {
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.C
index cf3b0734de..35e854bde7 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/calcEntry/calcEntry.C
@@ -87,13 +87,14 @@ Foam::string Foam::functionEntries::calcEntry::evaluate
     dictionary codeDict(parentDict, codeSubDict);
 
     // Use function to write stream
-    OStringStream os(is.format());
+    OStringStream buf(is.format());
+    buf.precision(16);      // Some reasonably high precision
 
     streamingFunctionType function = getFunction(parentDict, codeDict);
-    (*function)(os, parentDict);
+    (*function)(buf, parentDict);
 
     // Return evaluated content as string
-    return os.str();
+    return buf.str();
 }
 
 
diff --git a/src/OpenFOAM/expressions/exprEntry/expressionEntry.C b/src/OpenFOAM/expressions/exprEntry/expressionEntry.C
index 7a2158e7d7..17921cd418 100644
--- a/src/OpenFOAM/expressions/exprEntry/expressionEntry.C
+++ b/src/OpenFOAM/expressions/exprEntry/expressionEntry.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 Bernhard Gschaider
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -238,18 +238,9 @@ void Foam::exprTools::expressionEntry::inplaceExpand
 
             if (castTo.empty())
             {
-                // Serialized with spaces
+                // Serialized with spaces - fails for non-primitiveEntry
                 ITstream& its = eptr->stream();
-
-                if (its.size() == 1 && its[0].isStringType())
-                {
-                    // Already a string-type (WORD, STRING, ...). Just copy.
-                    varValue = its[0].stringToken();
-                }
-                else
-                {
-                    varValue = its.toString();
-                }
+                varValue = its.toString();
             }
             else
             {
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index b6187ab323..5413326a10 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -231,33 +231,32 @@ static inline std::string entryToString
 
     if (eptr)
     {
-        OStringStream buf;
-        // Force floating point numbers to be printed with at least
-        // some decimal digits.
-        buf << fixed;
-        buf.precision(IOstream::defaultPrecision());
+        // Note, for OpenFOAM-v2212 and earlier: used 'fixed' notation
+        // to force floating point numbers to be printed with at least
+        // some decimal digits. However, in the meantime we are more
+        // flexible with handling float/int input so remove this constraint.
 
-        if (allowSubDict && eptr->isDict())
+        if (eptr->isDict())
         {
-            eptr->dict().write(buf, false);
-            str = buf.str();
-        }
-        else
-        {
-            // Fail for non-primitiveEntry
-            const auto& pe = dynamicCast<const primitiveEntry>(*eptr);
-
-            if (pe.size() == 1 && pe[0].isStringType())
+            if (allowSubDict)
             {
-                // Already a string-type (WORD, STRING, ...). Just copy.
-                str = pe[0].stringToken();
+                OStringStream buf;
+                buf.precision(16);  // Some reasonably high precision
+
+                eptr->dict().write(buf, false);
+                str = buf.str();
             }
             else
             {
-                pe.write(buf, true);
-                str = buf.str();
+                // Ignore silently...
             }
         }
+        else
+        {
+            // Serialized with spaces (primitiveEntry)
+            ITstream& its = eptr->stream();
+            return its.toString();
+        }
     }
 
     return str;

From 0b7c0844f4f3978e20515e9992c9fee9553e63a1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 21 Feb 2023 13:39:36 +0100
Subject: [PATCH 099/348] TUT: replace calc with eval for wallMountedHump
 (faster!)

---
 .../setups.orig/common/system/blockMeshDict   | 234 ++++++++----------
 1 file changed, 110 insertions(+), 124 deletions(-)

diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/blockMeshDict
index a3c6de41ec..567cfa8a69 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -53,7 +53,7 @@ dxFocus     0.005;
 dxOutlet    0.05;
 
 // cell-to-cell growth ratio from focus region to outlet (x-Zone 3)
-rxOutlet     1.2;
+rxOutlet    1.2;
 
 // y-spacing of 1st near-wall cell at bottom wall
 dyWall      1.5e-05;
@@ -65,7 +65,7 @@ ryBL        1.15;
 LyBL        0.05;
 
 // y-spacing in focus region (y-Zone 2)
-dyFocus     0.005;        
+dyFocus     0.005;
 
 // vertical length of y-Zone 2
 LyFocus     0.11;
@@ -91,21 +91,19 @@ dz          0.01;
 // * * * * meshing / x-direction
 
 // x-Zone 1 with grading
-NxCorrZ1    #codeStream
+NxZ1    #codeStream
 {
     code
     #{
-        scalar tol        = 1.0e-10;
-        scalar residual   = 1.0e+10;
+        const scalar tol  = 1.0e-10;
+        const int maxIter = 100;
         scalar expRcorr   = $rxInlet;
         scalar totExpR    = $dxInlet/$dxFocus;
         scalar Nx         = Foam::log(totExpR)/Foam::log(expRcorr);
         scalar deltaStart = $dxFocus;
         scalar lEdge      = $x1Bottom - $xInlet;
-        int iter          = 0;
-        int iterMax       = 100;
 
-        while ((residual > tol) && (iter < iterMax))
+        for (int iter=0; iter < maxIter; ++iter)
         {
             scalar coeff  = pow(totExpR, 1./(Nx-1.));
             scalar coeffN = pow(totExpR, Nx/(Nx-1.));
@@ -114,35 +112,33 @@ NxCorrZ1    #codeStream
             scalar fPrime = deltaStart * Foam::log(totExpR) * (1./sqr(Nx-1.)) * ((1.-coeff)*coeffN - (1.-coeffN)*coeff)/ sqr(1.-coeff);
             Nx            = Nx - (f/fPrime);
 
-            residual      = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
-            iter++;
+            scalar residual = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
+            if (residual <= tol) break;
         }
-        os  << Nx << endl;
+        os  << floor(Nx);
     #};
 };
-totExpZ1x    #calc "$dxFocus/$dxInlet";
-NxZ1         #calc "static_cast<int>( $NxCorrZ1 )";
-totExpZ1xTop #calc "($x2Top - $x1Top)/($NxZ1*$dxInlet)";
+
+totExpZ1x    #eval{ $dxFocus/$dxInlet };
+totExpZ1xTop #eval{ ($x2Top - $x1Top)/($NxZ1*$dxInlet) };
 
 // x-Zone 2 with uniform spacing
-NxFocus     #calc "static_cast<int>( ($x2Bottom-$x1Bottom)/$dxFocus )";
+NxFocus      #eval{ floor( ($x2Bottom-$x1Bottom)/$dxFocus ) };
 
 // x-Zone 3 with grading
-NxCorrZ3    #codeStream
+NxZ3    #codeStream
 {
     code
     #{
-        scalar tol        = 1.0e-10;
-        scalar residual   = 1.0e+10;
+        const scalar tol  = 1.0e-10;
+        const int maxIter = 100;
         scalar expRcorr   = $rxOutlet;
         scalar totExpR    = $dxOutlet/(1.05377349658562*$dxFocus);
         scalar Nx         = Foam::log(totExpR)/Foam::log(expRcorr);
         scalar deltaStart = $dxFocus;
         scalar lEdge      = $xOutlet - $x2Bottom;
-        int iter          = 0;
-        int iterMax       = 100;
 
-        while ((residual > tol) && (iter < iterMax))
+        for (int iter=0; iter < maxIter; ++iter)
         {
             scalar coeff  = pow(totExpR, 1./(Nx-1.));
             scalar coeffN = pow(totExpR, Nx/(Nx-1.));
@@ -151,63 +147,58 @@ NxCorrZ3    #codeStream
             scalar fPrime = deltaStart * Foam::log(totExpR) * (1./sqr(Nx-1.)) * ((1.-coeff)*coeffN - (1.-coeffN)*coeff)/ sqr(1.-coeff);
             Nx            = Nx - (f/fPrime);
 
-            residual      = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
-            iter++;
+            scalar residual = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
+            if (residual <= tol) break;
         }
-        os  << Nx << endl;
+        os  << floor(Nx);
     #};
 };
-totExpZ3x    #calc "$dxOutlet/$dxFocus";
-NxZ3         #calc "static_cast<int>( $NxCorrZ3 )";
+totExpZ3x    #eval{ $dxOutlet/$dxFocus };
 
 rxOutletcorr #codeStream
 {
     code
     #{
-        scalar tol        = 1.0e-10;
-        scalar residual   = 1.0e+10;
+        const scalar tol  = 1.0e-10;
+        const int maxIter = 100;
         scalar expRcorr   = $rxOutlet;
         scalar deltaStart = 1.00141417674807*($x2Top - $x1Top)/$NxFocus;
         scalar lEdge      = $xOutlet - $x2Top;
         int Nx            = $NxZ3;
-        int iter          = 0;
-        int iterMax       = 100;
 
-        while ((residual > tol) && (iter < iterMax))
+        for (int iter=0; iter < maxIter; ++iter)
         {
             scalar f      = (deltaStart*((pow(expRcorr, Nx))-1)/(expRcorr-1)) - lEdge;
             scalar fPrime = deltaStart*((expRcorr-1)*Nx*(pow(expRcorr, (Nx-1)))-((pow(expRcorr, Nx))-1))/(sqr(expRcorr-1));
             expRcorr      = expRcorr - (f/fPrime);
 
-            residual      = mag((deltaStart*(pow(expRcorr, Nx)-1)/(expRcorr-1)) - lEdge);
-            iter++;
+            scalar residual = mag((deltaStart*(pow(expRcorr, Nx)-1)/(expRcorr-1)) - lEdge);
+            if (residual <= tol) break;
         }
-        os  << expRcorr << endl;
+        os  << expRcorr;
     #};
 };
-totExpZ3xTop #calc "pow($rxOutletcorr, $NxZ3-1.0)";
+totExpZ3xTop #eval{ pow($rxOutletcorr, $NxZ3-1.0) };
 
 // total number of cells in the x-direction
-Nx           #calc "static_cast<int>( $NxZ1 + $NxFocus + $NxZ3 )";
+Nx           #eval{ floor( $NxZ1 + $NxFocus + $NxZ3 ) };
 
 // * * * * meshing / y-direction
 
 // y-Zone 1 with grading
-NyCorrZ1    #codeStream
+NyZ1    #codeStream
 {
     code
     #{
-        scalar tol        = 1.0e-10;
-        scalar residual   = 1.0e+10;
+        const scalar tol  = 1.0e-10;
+        const int maxIter = 100;
         scalar expRcorr   = $ryBL;
         scalar totExpR    = $dyFocus/$dyWall;
         scalar Nx         = Foam::log(totExpR)/Foam::log(expRcorr);
         scalar deltaStart = $dyWall;
         scalar lEdge      = $LyBL;
-        int iter          = 0;
-        int iterMax       = 100;
 
-        while ((residual > tol) && (iter < iterMax))
+        for (int iter=0; iter < maxIter; ++iter)
         {
             scalar coeff  = pow(totExpR, 1./(Nx-1.));
             scalar coeffN = pow(totExpR, Nx/(Nx-1.));
@@ -216,34 +207,31 @@ NyCorrZ1    #codeStream
             scalar fPrime = deltaStart * Foam::log(totExpR) * (1./sqr(Nx-1.)) * ((1.-coeff)*coeffN - (1.-coeffN)*coeff)/ sqr(1.-coeff);
             Nx            = Nx - (f/fPrime);
 
-            residual      = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
-            iter++;
+            scalar residual = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
+            if (residual <= tol) break;
         }
-        os  << Nx << endl;
+        os  << floor(Nx);
     #};
 };
-totExpZ1y   #calc "$dyFocus/$dyWall";
-NyZ1        #calc "static_cast<int>( $NyCorrZ1 )";
+totExpZ1y   #eval{ $dyFocus/$dyWall };
 
 // y-Zone 2 with uniform spacing
-NyZ2        #calc "static_cast<int>( $LyFocus/$dyFocus )";
+NyZ2        #eval{ floor( $LyFocus/$dyFocus )};
 
 // y-Zone 3 with grading
-NyCorrZ3    #codeStream
+NyZ3    #codeStream
 {
     code
     #{
-        scalar tol        = 1.0e-10;
-        scalar residual   = 1.0e+10;
+        const scalar tol  = 1.0e-10;
+        const int maxIter = 100;
         scalar expRcorr   = $ryMid;
         scalar totExpR    = $dyMid/$dyFocus;
         scalar Nx         = Foam::log(totExpR)/Foam::log(expRcorr);
         scalar deltaStart = $dyFocus;
         scalar lEdge      = $LyMid;
-        int iter          = 0;
-        int iterMax       = 100;
 
-        while ((residual > tol) && (iter < iterMax))
+        for (int iter=0; iter < maxIter; ++iter)
         {
             scalar coeff  = pow(totExpR, 1./(Nx-1.));
             scalar coeffN = pow(totExpR, Nx/(Nx-1.));
@@ -252,31 +240,29 @@ NyCorrZ3    #codeStream
             scalar fPrime = deltaStart * Foam::log(totExpR) * (1./sqr(Nx-1.)) * ((1.-coeff)*coeffN - (1.-coeffN)*coeff)/ sqr(1.-coeff);
             Nx            = Nx - (f/fPrime);
 
-            residual      = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
-            iter++;
+            scalar residual = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
+            if (residual <= tol) break;
         }
-        os  << Nx << endl;
+        os  << floor(Nx);
     #};
 };
-totExpZ3y   #calc "$dyMid/$dyFocus";
-NyZ3        #calc "static_cast<int>( $NyCorrZ3 )";
+totExpZ3y   #eval{ $dyMid/$dyFocus };
+
 
 // y-Zone 4 with grading
-NyCorrZ4    #codeStream
+NyZ4    #codeStream
 {
     code
     #{
-        scalar tol        = 1.0e-10;
-        scalar residual   = 1.0e+10;
+        const scalar tol  = 1.0e-10;
+        const int maxIter = 100;
         scalar expRcorr   = $ryTop;
         scalar totExpR    = $dyMid/$dyTop;
         scalar Nx         = Foam::log(totExpR)/Foam::log(expRcorr);
         scalar deltaStart = $dyTop;
         scalar lEdge      = $yMax - $yMin - $LyMid - $LyFocus - $LyBL;
-        int iter          = 0;
-        int iterMax       = 100;
 
-        while ((residual > tol) && (iter < iterMax))
+        for (int iter=0; iter < maxIter; ++iter)
         {
             scalar coeff  = pow(totExpR, 1./(Nx-1.));
             scalar coeffN = pow(totExpR, Nx/(Nx-1.));
@@ -285,79 +271,79 @@ NyCorrZ4    #codeStream
             scalar fPrime = deltaStart * Foam::log(totExpR) * (1./sqr(Nx-1.)) * ((1.-coeff)*coeffN - (1.-coeffN)*coeff)/ sqr(1.-coeff);
             Nx            = Nx - (f/fPrime);
 
-            residual      = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
-            iter++;
+            scalar residual = mag((deltaStart*((1.-coeffN) / ((1.-coeff)))) - lEdge);
+            if (residual <= tol) break;
         }
-        os  << Nx << endl;
+        os  << floor(Nx);
     #};
 };
-totExpZ4y   #calc "$dyTop/$dyMid";
-NyZ4        #calc "static_cast<int>( $NyCorrZ4 )";
+totExpZ4y   #eval{ $dyTop/$dyMid };
 
 // total number of cells in the y-direction
-Ny          #calc "static_cast<int>( $NyZ1 + $NyZ2 + $NyZ3 + $NyZ4 )";
+Ny          #eval{ floor($NyZ1 + $NyZ2 + $NyZ3 + $NyZ4) };
 
 // * * * * meshing / z-direction
 
 // total number of cells in the z-direction
-Nz          #calc "static_cast<int>( ($zMax-$zMin)/$dz )";
+Nz          #eval{ floor(($zMax-$zMin)/$dz) };
 
 // * * * * report additional grid statistics
 #codeStream
 {
     code
     #{
-        Info  << endl;
-        Info  << "Computed grid parameters:" << endl;
-        Info  << "    > x-direction: " << endl;
-        Info  << "      - Zone 1 (x): " << endl;
-        Info  << "        - first spacing:                        dxInlet      = " << $dxInlet << " x c" << endl;
-        Info  << "        - last spacing:                         dxFocus      = " << $dxFocus << " x c" << endl;
-        Info  << "        - number of cells:                      NxZ1         = " << $NxZ1 << endl;
-        Info  << "        - cell-to-cell ratio (prescribed):      rxInlet      = " << $rxInlet << endl;
-        Info  << "        - first-to-last ratio (bottom):         totExpZ1x    = " << $totExpZ1x << endl;
-        Info  << "        - first-to-last ratio (top):            totExpZ1xTop = " << $totExpZ1xTop << endl;
-        Info  << "      - Zone 2 (x): " << endl;
-        Info  << "        - first / last spacing:                 dxFocus      = " << $dxFocus << " x c" << endl;
-        Info  << "        - number of cells:                      NxFocus      = " << $NxFocus << endl;
-        Info  << "        - cell-to-cell ratio:                   rxFocus      = 1" << endl;
-        Info  << "      - Zone 3 (x): " << endl;
-        Info  << "        - first spacing:                        dxFocus      = " << $dxFocus << " x c" << endl;
-        Info  << "        - last spacing:                         dxOutlet     = " << $dxOutlet << " x c" << endl;
-        Info  << "        - number of cells:                      NxZ3         = " << $NxZ3 << endl;
-        Info  << "        - cell-to-cell ratio (prescribed):      rxOutlet     = " << $rxOutlet << endl;
-        Info  << "        - cell-to-cell ratio (corrected,top):   rxOutletcorr = " << $rxOutletcorr << endl;
-        Info  << "        - first-to-last ratio (bottom):         totExpZ3x    = " << $totExpZ3x << endl;
-        Info  << "        - first-to-last ratio (top):            totExpZ3xTop = " << $totExpZ3xTop << endl;
-        Info  << "    - Total number of cells (x):              Nx           = " << $Nx << endl;
-        Info  << endl;
-        Info  << "    > y-directions: " << endl;
-        Info  << "      - Zone 1 (y): " << endl;
-        Info  << "        - length of edge:                       LyBL         = " << $LyBL << " x c" << endl;
-        Info  << "        - first spacing:                        dyWall       = " << $dyWall << " x c" << endl;
-        Info  << "        - last spacing:                         dyFocus      = " << $dyFocus << " x c" << endl;
-        Info  << "        - number of cells:                      NyZ1         = " << $NyZ1 << endl;
-        Info  << "        - cell-to-cell ratio (prescribed):      ryBL         = " << $ryBL << endl;
-        Info  << "        - first-to-last ratio:                  totExpZ1y    = " << $totExpZ1y << endl;
-        Info  << "      - Zone 2 (y): " << endl;
-        Info  << "        - length of edge:                       LyFocus      = " << $LyFocus << " x c" << endl;
-        Info  << "        - first / last spacing:                 dyFocus      = " << $dyFocus << " x c" << endl;
-        Info  << "        - number of cells:                      NyZ2         = " << $NyZ2 << endl;
-        Info  << "        - cell-to-cell ratio:                   ryFocus      = 1" << endl;
-        Info  << "      - Zone 3 (y): " << endl;
-        Info  << "        - length of edge:                       LyMid        = " << $LyMid << " x c" << endl;
-        Info  << "        - first spacing:                        dyFocus      = " << $dyFocus << " x c" << endl;
-        Info  << "        - last spacing:                         dyMid        = " << $dyMid << " x c" << endl;
-        Info  << "        - number of cells:                      NyZ3         = " << $NyZ3 << endl;
-        Info  << "        - cell-to-cell ratio (prescribed):      ryMid        = " << $ryMid << endl;
-        Info  << "        - first-to-last ratio:                  totExpZ3y    = " << $totExpZ3y << endl;
-        Info  << "      - Zone 4 (y): " << endl;
-        Info  << "        - first spacing:                        dyMid        = " << $dyMid << " x c" << endl;
-        Info  << "        - last spacing:                         dyTop        = " << $dyTop << " x c" << endl;
-        Info  << "        - number of cells:                      NyZ4         = " << $NyZ4 << endl;
-        Info  << "        - cell-to-cell ratio (prescribed):      ryTop        = " << $ryTop << endl;
-        Info  << "        - first-to-last ratio:                  totExpZ4y    = " << $totExpZ4y << endl;
-        Info  << "    - Total number of cells (y):              Ny           = " << $Ny << endl << endl;
+        Info<< nl
+            << "Computed grid parameters:" << nl
+            << "    > x-direction: " << nl
+            << "      - Zone 1 (x): " << nl
+            << "        - first spacing:                        dxInlet      = " << $dxInlet << " x c" << nl
+            << "        - last spacing:                         dxFocus      = " << $dxFocus << " x c" << nl
+            << "        - number of cells:                      NxZ1         = " << $NxZ1 << nl
+            << "        - cell-to-cell ratio (prescribed):      rxInlet      = " << $rxInlet << nl
+            << "        - first-to-last ratio (bottom):         totExpZ1x    = " << $totExpZ1x << nl
+            << "        - first-to-last ratio (top):            totExpZ1xTop = " << $totExpZ1xTop << nl
+            << "      - Zone 2 (x): " << nl
+            << "        - first / last spacing:                 dxFocus      = " << $dxFocus << " x c" << nl
+            << "        - number of cells:                      NxFocus      = " << $NxFocus << nl
+            << "        - cell-to-cell ratio:                   rxFocus      = 1" << nl
+            << "      - Zone 3 (x): " << nl
+            << "        - first spacing:                        dxFocus      = " << $dxFocus << " x c" << nl
+            << "        - last spacing:                         dxOutlet     = " << $dxOutlet << " x c" << nl
+            << "        - number of cells:                      NxZ3         = " << $NxZ3 << nl
+            << "        - cell-to-cell ratio (prescribed):      rxOutlet     = " << $rxOutlet << nl
+            << "        - cell-to-cell ratio (corrected,top):   rxOutletcorr = " << $rxOutletcorr << nl
+            << "        - first-to-last ratio (bottom):         totExpZ3x    = " << $totExpZ3x << nl
+            << "        - first-to-last ratio (top):            totExpZ3xTop = " << $totExpZ3xTop << nl
+            << "    - Total number of cells (x):                Nx           = " << $Nx << nl
+            << endl;
+        Info<< "    > y-direction: " << nl
+            << "      - Zone 1 (y): " << nl
+            << "        - length of edge:                       LyBL         = " << $LyBL << " x c" << nl
+            << "        - first spacing:                        dyWall       = " << $dyWall << " x c" << nl
+            << "        - last spacing:                         dyFocus      = " << $dyFocus << " x c" << nl
+            << "        - number of cells:                      NyZ1         = " << $NyZ1 << nl
+            << "        - cell-to-cell ratio (prescribed):      ryBL         = " << $ryBL << nl
+            << "        - first-to-last ratio:                  totExpZ1y    = " << $totExpZ1y << nl
+            << "      - Zone 2 (y): " << nl
+            << "        - length of edge:                       LyFocus      = " << $LyFocus << " x c" << nl
+            << "        - first / last spacing:                 dyFocus      = " << $dyFocus << " x c" << nl
+            << "        - number of cells:                      NyZ2         = " << $NyZ2 << nl
+            << "        - cell-to-cell ratio:                   ryFocus      = 1" << nl
+            << "      - Zone 3 (y): " << nl
+            << "        - length of edge:                       LyMid        = " << $LyMid << " x c" << nl
+            << "        - first spacing:                        dyFocus      = " << $dyFocus << " x c" << nl
+            << "        - last spacing:                         dyMid        = " << $dyMid << " x c" << nl
+            << "        - number of cells:                      NyZ3         = " << $NyZ3 << nl
+            << "        - cell-to-cell ratio (prescribed):      ryMid        = " << $ryMid << nl
+            << "        - first-to-last ratio:                  totExpZ3y    = " << $totExpZ3y << nl
+            << "      - Zone 4 (y): " << nl
+            << "        - first spacing:                        dyMid        = " << $dyMid << " x c" << nl
+            << "        - last spacing:                         dyTop        = " << $dyTop << " x c" << nl
+            << "        - number of cells:                      NyZ4         = " << $NyZ4 << nl
+            << "        - cell-to-cell ratio (prescribed):      ryTop        = " << $ryTop << nl
+            << "        - first-to-last ratio:                  totExpZ4y    = " << $totExpZ4y << nl
+            << "    - Total number of cells (y):                Ny           = " << $Ny << nl
+            << endl;
     #};
 };
 

From 899d59686c6b731f6a02027c8c3bf4ae60e7eb81 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 21 Feb 2023 14:15:37 +0100
Subject: [PATCH 100/348] CONFIG: increment API level to 2301

---
 META-INFO/api-info          | 2 +-
 wmake/rules/General/general | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/META-INFO/api-info b/META-INFO/api-info
index 433789f6fe..edf8f1afde 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
-api=2212
+api=2301
 patch=230110
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index bca9d5fee0..ca8d294ba7 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,5 +1,5 @@
 #-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM=2212
+WM_VERSION = OPENFOAM=2301
 
 AR         = ar
 ARFLAGS    = cr

From 9938a13b2a527128348a10fcd19cbef3f17a8295 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Feb 2023 15:33:25 +0100
Subject: [PATCH 101/348] ENH: simplify generic patch field code

---
 src/genericPatchFields/Make/files             |   3 +-
 .../genericPatchFieldBase.C                   | 277 +++++-------------
 .../genericPatchFieldBase.H                   |  40 +--
 .../genericPatchFieldBaseTemplates.C          |  94 ++----
 .../genericFaPatchField/genericFaPatchField.C |  12 +-
 .../genericFaPatchFields.C                    |  12 +-
 .../genericFaPatchFields.H                    |   4 +-
 .../genericFaePatchField.C                    | 142 +++++++++
 .../genericFaePatchField.H                    | 165 +++++++++++
 .../genericFaePatchFields.C                   |  39 +++
 .../genericFaePatchFields.H                   |  51 ++++
 .../genericFvPatchField/genericFvPatchField.C |  12 +-
 .../genericFvPatchFields.C                    |  12 +-
 .../genericFvPatchFields.H                    |   6 +-
 .../genericFvsPatchField.C                    |  12 +-
 .../genericFvsPatchFields.C                   |  14 +-
 .../genericFvsPatchFields.H                   |   7 +-
 .../genericPointPatchField.C                  |   2 +-
 .../genericPointPatchField.H                  |   4 +-
 .../genericPointPatchFields.C                 |  13 +-
 .../genericPointPatchFields.H                 |   5 +-
 21 files changed, 579 insertions(+), 347 deletions(-)
 rename src/genericPatchFields/{genericPatchFieldBase => common}/genericPatchFieldBase.C (62%)
 rename src/genericPatchFields/{genericPatchFieldBase => common}/genericPatchFieldBase.H (94%)
 rename src/genericPatchFields/{genericPatchFieldBase => common}/genericPatchFieldBaseTemplates.C (51%)
 create mode 100644 src/genericPatchFields/genericFaePatchField/genericFaePatchField.C
 create mode 100644 src/genericPatchFields/genericFaePatchField/genericFaePatchField.H
 create mode 100644 src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C
 create mode 100644 src/genericPatchFields/genericFaePatchField/genericFaePatchFields.H

diff --git a/src/genericPatchFields/Make/files b/src/genericPatchFields/Make/files
index 17ebcb95fa..031ed5e4b7 100644
--- a/src/genericPatchFields/Make/files
+++ b/src/genericPatchFields/Make/files
@@ -1,6 +1,7 @@
-genericPatchFieldBase/genericPatchFieldBase.C
+common/genericPatchFieldBase.C
 
 genericFaPatchField/genericFaPatchFields.C
+/* not yet needed:  genericFaePatchField/genericFaePatchFields.C */
 genericFvPatchField/genericFvPatchFields.C
 genericFvsPatchField/genericFvsPatchFields.C
 genericPointPatchField/genericPointPatchFields.C
diff --git a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C b/src/genericPatchFields/common/genericPatchFieldBase.C
similarity index 62%
rename from src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
rename to src/genericPatchFields/common/genericPatchFieldBase.C
index b5bd0c839e..e37cc4af16 100644
--- a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.C
+++ b/src/genericPatchFields/common/genericPatchFieldBase.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -88,7 +88,7 @@ void Foam::genericPatchFieldBase::genericFatalSolveError
 ) const
 {
     FatalError
-        << " (actual type " << actualTypeName_ << ')'
+        << " (Actual type " << actualTypeName_ << ')'
         << "\n    on patch " << patchName
         << " of field " << io.name() << " in file " << io.objectPath() << nl
         << nl
@@ -161,10 +161,6 @@ bool Foam::genericPatchFieldBase::processEntry
         return false;
     }
 
-    #undef FIELDSIZE_CHECK
-    #define FIELDSIZE_CHECK(fieldLen)  \
-        checkFieldSize(fieldLen, patchSize, patchName, key, io)
-
 
     // First token
     token tok(is);
@@ -179,6 +175,7 @@ bool Foam::genericPatchFieldBase::processEntry
             // without a compound type.
             // Just treat as scalar and hope for the best.
             scalarFields_.insert(key, autoPtr<scalarField>::New());
+            return true;
         }
         else if (!tok.isCompound())
         {
@@ -190,130 +187,50 @@ bool Foam::genericPatchFieldBase::processEntry
                 << exit(FatalIOError);
             return false;
         }
-        else if
-        (
-            tok.compoundToken().type()
-         == token::Compound<List<scalar>>::typeName
-        )
-        {
-            auto fPtr = autoPtr<scalarField>::New();
 
-            fPtr->transfer
-            (
-                dynamicCast<token::Compound<List<scalar>>>
-                (
-                    tok.transferCompoundToken(is)
-                )
-            );
-
-            if (!FIELDSIZE_CHECK(fPtr->size()))
-            {
-                return false;
-            }
-
-            scalarFields_.insert(key, fPtr);
+        #undef  doLocalCode
+        #define doLocalCode(ValueType, Member)                                \
+        if                                                                    \
+        (                                                                     \
+            tok.compoundToken().type()                                        \
+         == token::Compound<List<ValueType>>::typeName                        \
+        )                                                                     \
+        {                                                                     \
+            auto fPtr = autoPtr<Field<ValueType>>::New();                     \
+                                                                              \
+            fPtr->transfer                                                    \
+            (                                                                 \
+                dynamicCast<token::Compound<List<ValueType>>>                 \
+                (                                                             \
+                    tok.transferCompoundToken(is)                             \
+                )                                                             \
+            );                                                                \
+                                                                              \
+            if (!checkFieldSize(fPtr->size(), patchSize, patchName, key, io)) \
+            {                                                                 \
+                return false;                                                 \
+            }                                                                 \
+                                                                              \
+            this->Member.insert(key, fPtr);                                   \
+            return true;                                                      \
         }
-        else if
-        (
-            tok.compoundToken().type()
-         == token::Compound<List<vector>>::typeName
-        )
-        {
-            auto fPtr = autoPtr<vectorField>::New();
 
-            fPtr->transfer
-            (
-                dynamicCast<token::Compound<List<vector>>>
-                (
-                    tok.transferCompoundToken(is)
-                )
-            );
+        //doLocalCode(label, labelFields_);
+        doLocalCode(scalar, scalarFields_);
+        doLocalCode(vector, vectorFields_);
+        doLocalCode(sphericalTensor, sphTensorFields_);
+        doLocalCode(symmTensor, symmTensorFields_);
+        doLocalCode(tensor, tensorFields_);
+        #undef doLocalCode
 
-            if (!FIELDSIZE_CHECK(fPtr->size()))
-            {
-                return false;
-            }
-            vectorFields_.insert(key, fPtr);
-        }
-        else if
-        (
-            tok.compoundToken().type()
-         == token::Compound<List<sphericalTensor>>::typeName
-        )
-        {
-            auto fPtr = autoPtr<sphericalTensorField>::New();
-
-            fPtr->transfer
-            (
-                dynamicCast<token::Compound<List<sphericalTensor>>>
-                (
-                    tok.transferCompoundToken(is)
-                )
-            );
-
-            if (!FIELDSIZE_CHECK(fPtr->size()))
-            {
-                return false;
-            }
-
-            sphTensorFields_.insert(key, fPtr);
-        }
-        else if
-        (
-            tok.compoundToken().type()
-         == token::Compound<List<symmTensor>>::typeName
-        )
-        {
-            auto fPtr = autoPtr<symmTensorField>::New();
-
-            fPtr->transfer
-            (
-                dynamicCast<token::Compound<List<symmTensor>>>
-                (
-                    tok.transferCompoundToken(is)
-                )
-            );
-
-            if (!FIELDSIZE_CHECK(fPtr->size()))
-            {
-                return false;
-            }
-
-            symmTensorFields_.insert(key, fPtr);
-        }
-        else if
-        (
-            tok.compoundToken().type()
-         == token::Compound<List<tensor>>::typeName
-        )
-        {
-            auto fPtr = autoPtr<tensorField>::New();
-
-            fPtr->transfer
-            (
-                dynamicCast<token::Compound<List<tensor>>>
-                (
-                    tok.transferCompoundToken(is)
-                )
-            );
-
-            if (!FIELDSIZE_CHECK(fPtr->size()))
-            {
-                return false;
-            }
-
-            tensorFields_.insert(key, fPtr);
-        }
-        else
-        {
-            FatalIOErrorInFunction(dict_)
-                << "\n    unsupported compound " << tok.compoundToken()
-                << "\n    on patch " << patchName << " of field "
-                << io.name() << " in file "
-                << io.objectPath() << nl
-                << exit(FatalIOError);
-            return false;
-        }
+        // Fall-through
+        FatalIOErrorInFunction(dict_)
+            << "\n    unsupported compound " << tok.compoundToken() << nl
+            << "\n    on patch " << patchName << " of field "
+            << io.name() << " in file "
+            << io.objectPath() << nl
+            << exit(FatalIOError);
+        return false;
     }
     else if (tok.isWord("uniform"))
     {
@@ -321,6 +238,9 @@ bool Foam::genericPatchFieldBase::processEntry
 
         if (!tok.isPunctuation())
         {
+            // Unfortunately cannot distinguish between
+            // labelField and scalarField...
+
             scalarFields_.insert
             (
                 key,
@@ -413,8 +333,6 @@ bool Foam::genericPatchFieldBase::processEntry
         }
     }
 
-    #undef FIELDSIZE_CHECK
-
     return true;
 }
 
@@ -430,30 +348,27 @@ void Foam::genericPatchFieldBase::putEntry
     if
     (
         e.isStream()
-     && e.stream().size()
-     && e.stream()[0].isWord("nonuniform")
+     && e.stream().peek().isWord("nonuniform")
     )
     {
-        if (scalarFields_.found(key))
-        {
-            scalarFields_.cfind(key)()->writeEntry(key, os);
-        }
-        else if (vectorFields_.found(key))
-        {
-            vectorFields_.cfind(key)()->writeEntry(key, os);
-        }
-        else if (sphTensorFields_.found(key))
-        {
-            sphTensorFields_.cfind(key)()->writeEntry(key, os);
-        }
-        else if (symmTensorFields_.found(key))
-        {
-            symmTensorFields_.cfind(key)()->writeEntry(key, os);
-        }
-        else if (tensorFields_.found(key))
-        {
-            tensorFields_.cfind(key)()->writeEntry(key, os);
+        #undef  doLocalCode
+        #define doLocalCode(ValueType, Member)                                \
+        {                                                                     \
+            const auto iter = this->Member.cfind(key);                        \
+            if (iter.good())                                                  \
+            {                                                                 \
+                iter.val()->writeEntry(key, os);                              \
+                return;                                                       \
+            }                                                                 \
         }
+
+        //doLocalCode(label, labelFields_);
+        doLocalCode(scalar, scalarFields_);
+        doLocalCode(vector, vectorFields_);
+        doLocalCode(sphericalTensor, sphTensorFields_);
+        doLocalCode(symmTensor, symmTensorFields_);
+        doLocalCode(tensor, tensorFields_);
+        #undef doLocalCode
     }
     else
     {
@@ -492,55 +407,25 @@ void Foam::genericPatchFieldBase::rmapGeneric
     const labelList& addr
 )
 {
-    forAllIters(scalarFields_, iter)
-    {
-        const auto iter2 = rhs.scalarFields_.cfind(iter.key());
-
-        if (iter2.good())
-        {
-            (*iter)->rmap(*iter2(), addr);
-        }
+    #undef  doLocalCode
+    #define doLocalCode(ValueType, Member)                                    \
+    forAllIters(this->Member, iter)                                           \
+    {                                                                         \
+        const auto iter2 = rhs.Member.cfind(iter.key());                      \
+                                                                              \
+        if (iter2.good())                                                     \
+        {                                                                     \
+            iter.val()->rmap(*iter2.val(), addr);                             \
+        }                                                                     \
     }
 
-    forAllIters(vectorFields_, iter)
-    {
-        const auto iter2 = rhs.vectorFields_.cfind(iter.key());
-
-        if (iter2.good())
-        {
-            (*iter)->rmap(*iter2(), addr);
-        }
-    }
-
-    forAllIters(sphTensorFields_, iter)
-    {
-        const auto iter2 = rhs.sphTensorFields_.cfind(iter.key());
-
-        if (iter2.good())
-        {
-            (*iter)->rmap(*iter2(), addr);
-        }
-    }
-
-    forAllIters(symmTensorFields_, iter)
-    {
-        const auto iter2 = rhs.symmTensorFields_.cfind(iter.key());
-
-        if (iter2.good())
-        {
-            (*iter)->rmap(*iter2(), addr);
-        }
-    }
-
-    forAllIters(tensorFields_, iter)
-    {
-        const auto iter2 = rhs.tensorFields_.find(iter.key());
-
-        if (iter2.good())
-        {
-            (*iter)->rmap(*iter2(), addr);
-        }
-    }
+    //doLocalCode(label, labelFields_);
+    doLocalCode(scalar, scalarFields_);
+    doLocalCode(vector, vectorFields_);
+    doLocalCode(sphericalTensor, sphTensorFields_);
+    doLocalCode(symmTensor, symmTensorFields_);
+    doLocalCode(tensor, tensorFields_);
+    #undef doLocalCode
 }
 
 
diff --git a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.H b/src/genericPatchFields/common/genericPatchFieldBase.H
similarity index 94%
rename from src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.H
rename to src/genericPatchFields/common/genericPatchFieldBase.H
index f22346c7de..91e4e96b59 100644
--- a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBase.H
+++ b/src/genericPatchFields/common/genericPatchFieldBase.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef genericPatchFieldBase_H
-#define genericPatchFieldBase_H
+#ifndef Foam_genericPatchFieldBase_H
+#define Foam_genericPatchFieldBase_H
 
 #include "dictionary.H"
 #include "primitiveFields.H"
@@ -54,6 +54,26 @@ namespace Foam
 
 class genericPatchFieldBase
 {
+    // Private Data
+
+        //- The non-generic patch name
+        word actualTypeName_;
+
+        //- Copy of the input dictionary (used for transcribing)
+        dictionary dict_;
+
+
+    // The data fields read.
+    // Do not need to handle generic for 'label' since these
+    // will be limited to known field types.
+
+        HashPtrTable<scalarField> scalarFields_;
+        HashPtrTable<vectorField> vectorFields_;
+        HashPtrTable<sphericalTensorField> sphTensorFields_;
+        HashPtrTable<symmTensorField> symmTensorFields_;
+        HashPtrTable<tensorField> tensorFields_;
+
+
     // Private Member Functions
 
         bool checkFieldSize
@@ -68,20 +88,6 @@ class genericPatchFieldBase
 
 protected:
 
-    // Protected Data
-
-        //- The non-generic patch name
-        word actualTypeName_;
-
-        dictionary dict_;
-
-        HashPtrTable<scalarField> scalarFields_;
-        HashPtrTable<vectorField> vectorFields_;
-        HashPtrTable<sphericalTensorField> sphTensorFields_;
-        HashPtrTable<symmTensorField> symmTensorFields_;
-        HashPtrTable<tensorField> tensorFields_;
-
-
     // Protected Member Functions
 
         //- Add error message to FatalError about solving with
diff --git a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBaseTemplates.C b/src/genericPatchFields/common/genericPatchFieldBaseTemplates.C
similarity index 51%
rename from src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBaseTemplates.C
rename to src/genericPatchFields/common/genericPatchFieldBaseTemplates.C
index 9b1041ab45..86e44e7de3 100644
--- a/src/genericPatchFields/genericPatchFieldBase/genericPatchFieldBaseTemplates.C
+++ b/src/genericPatchFields/common/genericPatchFieldBaseTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,50 +36,24 @@ void Foam::genericPatchFieldBase::mapGeneric
     const MapperType& mapper
 )
 {
-    forAllConstIters(rhs.scalarFields_, iter)
-    {
-        scalarFields_.insert
-        (
-            iter.key(),
-            autoPtr<scalarField>::New(*iter(), mapper)
-        );
+    #undef  doLocalCode
+    #define doLocalCode(ValueType, Member)                                    \
+    forAllIters(rhs.Member, iter)                                             \
+    {                                                                         \
+        this->Member.insert                                                   \
+        (                                                                     \
+            iter.key(),                                                       \
+            autoPtr<Field<ValueType>>::New(*iter.val(), mapper)               \
+        );                                                                    \
     }
 
-    forAllConstIters(rhs.vectorFields_, iter)
-    {
-        vectorFields_.insert
-        (
-            iter.key(),
-            autoPtr<vectorField>::New(*iter(), mapper)
-        );
-    }
-
-    forAllConstIters(rhs.sphTensorFields_, iter)
-    {
-        sphTensorFields_.insert
-        (
-            iter.key(),
-            autoPtr<sphericalTensorField>::New(*iter(), mapper)
-        );
-    }
-
-    forAllConstIters(rhs.symmTensorFields_, iter)
-    {
-        symmTensorFields_.insert
-        (
-            iter.key(),
-            autoPtr<symmTensorField>::New(*iter(), mapper)
-        );
-    }
-
-    forAllConstIters(rhs.tensorFields_, iter)
-    {
-        tensorFields_.insert
-        (
-            iter.key(),
-            autoPtr<tensorField>::New(*iter(), mapper)
-        );
-    }
+    //doLocalCode(label, labelFields_);
+    doLocalCode(scalar, scalarFields_);
+    doLocalCode(vector, vectorFields_);
+    doLocalCode(sphericalTensor, sphTensorFields_);
+    doLocalCode(symmTensor, symmTensorFields_);
+    doLocalCode(tensor, tensorFields_);
+    #undef doLocalCode
 }
 
 
@@ -89,30 +63,20 @@ void Foam::genericPatchFieldBase::autoMapGeneric
     const MapperType& mapper
 )
 {
-    forAllIters(scalarFields_, iter)
-    {
-        (*iter)->autoMap(mapper);
+    #undef  doLocalCode
+    #define doLocalCode(ValueType, Member)                                    \
+    forAllIters(this->Member, iter)                                           \
+    {                                                                         \
+        iter.val()->autoMap(mapper);                                          \
     }
 
-    forAllIters(vectorFields_, iter)
-    {
-        (*iter)->autoMap(mapper);
-    }
-
-    forAllIters(sphTensorFields_, iter)
-    {
-        (*iter)->autoMap(mapper);
-    }
-
-    forAllIters(symmTensorFields_, iter)
-    {
-        (*iter)->autoMap(mapper);
-    }
-
-    forAllIters(tensorFields_, iter)
-    {
-        (*iter)->autoMap(mapper);
-    }
+    //doLocalCode(label, labelFields_);
+    doLocalCode(scalar, scalarFields_);
+    doLocalCode(vector, vectorFields_);
+    doLocalCode(sphericalTensor, sphTensorFields_);
+    doLocalCode(symmTensor, symmTensorFields_);
+    doLocalCode(tensor, tensorFields_);
+    #undef doLocalCode
 }
 
 
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
index 88bc831f56..e60212bf5d 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C
@@ -41,7 +41,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
     parent_bctype(p, iF)
 {
     FatalErrorInFunction
-        << "Trying to construct genericFaPatchField on patch "
+        << "Trying to construct generic patchField on patch "
         << this->patch().name()
         << " of field " << this->internalField().name() << nl
         << abort(FatalError);
@@ -63,7 +63,7 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
     const word& patchName = this->patch().name();
     const IOobject& io = this->internalField();
 
-    if (!dict.found("value"))
+    if (!dict.findEntry("value", keyType::LITERAL))
     {
         reportMissingEntry("value", patchName, io);
     }
@@ -148,7 +148,7 @@ Foam::genericFaPatchField<Type>::valueInternalCoeffs
 ) const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFaPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -169,7 +169,7 @@ Foam::genericFaPatchField<Type>::valueBoundaryCoeffs
 ) const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFaPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -187,7 +187,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::genericFaPatchField<Type>::gradientInternalCoeffs() const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFaPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -205,7 +205,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::genericFaPatchField<Type>::gradientBoundaryCoeffs() const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFaPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.C
index fd92f4be98..d1c16d1590 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.C
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.C
@@ -29,17 +29,11 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "areaFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeFaPatchFields(generic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeFaPatchFields(generic);
+}
 
 // ************************************************************************* //
diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.H b/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.H
index 06ac62d2a5..0e57579fe8 100644
--- a/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.H
+++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchFields.H
@@ -25,8 +25,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef genericFaPatchFields_H
-#define genericFaPatchFields_H
+#ifndef Foam_genericFaPatchFields_H
+#define Foam_genericFaPatchFields_H
 
 #include "genericFaPatchField.H"
 #include "fieldTypes.H"
diff --git a/src/genericPatchFields/genericFaePatchField/genericFaePatchField.C b/src/genericPatchFields/genericFaePatchField/genericFaePatchField.C
new file mode 100644
index 0000000000..3bc19c68e8
--- /dev/null
+++ b/src/genericPatchFields/genericFaePatchField/genericFaePatchField.C
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "genericFaePatchField.H"
+#include "faPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::genericFaePatchField<Type>::genericFaePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF
+)
+:
+    parent_bctype(p, iF)
+{
+    FatalErrorInFunction
+        << "Trying to construct generic patchField on patch "
+        << this->patch().name()
+        << " of field " << this->internalField().name()
+        << abort(FatalError);
+}
+
+
+template<class Type>
+Foam::genericFaePatchField<Type>::genericFaePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const dictionary& dict
+)
+:
+    parent_bctype(p, iF, dict),
+    genericPatchFieldBase(dict)
+{
+    const label patchSize = this->size();
+    const word& patchName = this->patch().name();
+    const IOobject& io = this->internalField();
+
+    if (!dict.findEntry("value", keyType::LITERAL))
+    {
+        reportMissingEntry("value", patchName, io);
+    }
+
+    // Handle "value" separately
+    processGeneric(patchSize, patchName, io, true);
+}
+
+
+template<class Type>
+Foam::genericFaePatchField<Type>::genericFaePatchField
+(
+    const genericFaePatchField<Type>& rhs,
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    parent_bctype(rhs, p, iF, mapper),
+    genericPatchFieldBase(zero{}, rhs)
+{
+    this->mapGeneric(rhs, mapper);
+}
+
+
+template<class Type>
+Foam::genericFaePatchField<Type>::genericFaePatchField
+(
+    const genericFaePatchField<Type>& rhs,
+    const DimensionedField<Type, edgeMesh>& iF
+)
+:
+    parent_bctype(rhs, iF),
+    genericPatchFieldBase(rhs)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::genericFaePatchField<Type>::write(Ostream& os) const
+{
+    // Handle "value" separately
+    genericPatchFieldBase::writeGeneric(os, true);
+    faePatchField<Type>::writeValueEntry(os);
+}
+
+
+template<class Type>
+void Foam::genericFaePatchField<Type>::autoMap
+(
+    const faPatchFieldMapper& m
+)
+{
+    parent_bctype::autoMap(m);
+    this->autoMapGeneric(m);
+}
+
+
+template<class Type>
+void Foam::genericFaePatchField<Type>::rmap
+(
+    const faePatchField<Type>& rhs,
+    const labelList& addr
+)
+{
+    parent_bctype::rmap(rhs, addr);
+
+    const auto* base = isA<genericPatchFieldBase>(rhs);
+    if (base)
+    {
+        this->rmapGeneric(*base, addr);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/genericPatchFields/genericFaePatchField/genericFaePatchField.H b/src/genericPatchFields/genericFaePatchField/genericFaePatchField.H
new file mode 100644
index 0000000000..48c6cc59ce
--- /dev/null
+++ b/src/genericPatchFields/genericFaePatchField/genericFaePatchField.H
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::genericFaePatchField
+
+Description
+    This boundary condition provides a generic version of the \c calculated
+    condition, useful as a fallback for handling unknown patch types.  Not
+    generally applicable as a user-specified condition.
+
+See also
+    Foam::calculatedFaePatchField
+
+SourceFiles
+    genericFaePatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef genericFaePatchField_H
+#define genericFaePatchField_H
+
+#include "calculatedFaePatchField.H"
+#include "genericPatchFieldBase.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class genericFaePatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class genericFaePatchField
+:
+    public calculatedFaePatchField<Type>,
+    public genericPatchFieldBase
+{
+    //- The parent boundary condition type
+    typedef calculatedFaePatchField<Type> parent_bctype;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("generic");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        genericFaePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        genericFaePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given patch field onto a new patch
+        genericFaePatchField
+        (
+            const genericFaePatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Default copy construct
+        genericFaePatchField(const genericFaePatchField<Type>&) = default;
+
+        //- Construct and return a clone
+        virtual tmp<faePatchField<Type>> clone() const
+        {
+            return tmp<faePatchField<Type>>
+            (
+                new genericFaePatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        genericFaePatchField
+        (
+            const genericFaePatchField<Type>&,
+            const DimensionedField<Type, edgeMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faePatchField<Type>> clone
+        (
+            const DimensionedField<Type, edgeMesh>& iF
+        ) const
+        {
+            return tmp<faePatchField<Type>>
+            (
+                new genericFaePatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+
+    // Mapping Functions
+
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap(const faPatchFieldMapper&);
+
+        //- Reverse map the given faPatchField onto this faPatchField
+        virtual void rmap
+        (
+            const faePatchField<Type>&,
+            const labelList&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "genericFaePatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C b/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C
new file mode 100644
index 0000000000..66f5fbc9b1
--- /dev/null
+++ b/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "genericFaePatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "edgeFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaePatchFields(generic);
+}
+
+// ************************************************************************* //
diff --git a/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.H b/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.H
new file mode 100644
index 0000000000..8f7d32bf23
--- /dev/null
+++ b/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_genericFaePatchFields_H
+#define Foam_genericFaePatchFields_H
+
+#include "genericFaePatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaePatchTypeFieldTypedefs(generic);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 122e534d31..33e9f8dc66 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -41,7 +41,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
     parent_bctype(p, iF)
 {
     FatalErrorInFunction
-        << "Trying to construct an genericFvPatchField on patch "
+        << "Trying to construct generic patchField on patch "
         << this->patch().name()
         << " of field " << this->internalField().name()
         << abort(FatalError);
@@ -63,7 +63,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
     const word& patchName = this->patch().name();
     const IOobject& io = this->internalField();
 
-    if (!dict.found("value"))
+    if (!dict.findEntry("value", keyType::LITERAL))
     {
         reportMissingEntry("value", patchName, io);
     }
@@ -148,7 +148,7 @@ Foam::genericFvPatchField<Type>::valueInternalCoeffs
 ) const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -169,7 +169,7 @@ Foam::genericFvPatchField<Type>::valueBoundaryCoeffs
 ) const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -187,7 +187,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::genericFvPatchField<Type>::gradientInternalCoeffs() const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -204,7 +204,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::genericFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
index 9bce301420..de4b0ba85b 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
@@ -29,17 +29,11 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(generic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makePatchFields(generic);
+}
 
 // ************************************************************************* //
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
index 24cce8a482..e3734a11bd 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,11 +26,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef genericFvPatchFields_H
-#define genericFvPatchFields_H
+#ifndef Foam_genericFvPatchFields_H
+#define Foam_genericFvPatchFields_H
 
 #include "genericFvPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
index fbf1504573..eeefc2ea6d 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchField.C
@@ -40,7 +40,7 @@ Foam::genericFvsPatchField<Type>::genericFvsPatchField
     parent_bctype(p, iF)
 {
     FatalErrorInFunction
-        << "Trying to construct an genericFvsPatchField on patch "
+        << "Trying to construct generic patchField on patch "
         << this->patch().name()
         << " of field " << this->internalField().name()
         << abort(FatalError);
@@ -62,7 +62,7 @@ Foam::genericFvsPatchField<Type>::genericFvsPatchField
     const word& patchName = this->patch().name();
     const IOobject& io = this->internalField();
 
-    if (!dict.found("value"))
+    if (!dict.findEntry("value", keyType::LITERAL))
     {
         reportMissingEntry("value", patchName, io);
     }
@@ -148,7 +148,7 @@ Foam::genericFvsPatchField<Type>::valueInternalCoeffs
 ) const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvsPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -169,7 +169,7 @@ Foam::genericFvsPatchField<Type>::valueBoundaryCoeffs
 ) const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvsPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -187,7 +187,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::genericFvsPatchField<Type>::gradientInternalCoeffs() const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvsPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
@@ -204,7 +204,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::genericFvsPatchField<Type>::gradientBoundaryCoeffs() const
 {
     FatalErrorInFunction
-        << "Cannot be called for a genericFvsPatchField";
+        << "Cannot be called for a generic patchField";
 
     genericFatalSolveError
     (
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.C b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.C
index 97538f2f56..03d59edfe7 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.C
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,17 +30,11 @@ License
 #include "fvsPatchFields.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeFvsPatchFields(generic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeFvsPatchFields(generic);
+}
 
 // ************************************************************************* //
diff --git a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.H b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.H
index 74b0a93a79..78f3f3806b 100644
--- a/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.H
+++ b/src/genericPatchFields/genericFvsPatchField/genericFvsPatchFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,8 +25,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef genericFvsPatchFields_H
-#define genericFvsPatchFields_H
+#ifndef Foam_genericFvsPatchFields_H
+#define Foam_genericFvsPatchFields_H
 
 #include "genericFvsPatchField.H"
 #include "fieldTypes.H"
@@ -40,6 +40,7 @@ namespace Foam
 
 makeFvsPatchTypeFieldTypedefs(generic);
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 7352d82c5c..5a8aa41099 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -41,7 +41,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
     parent_bctype(p, iF)
 {
     FatalErrorInFunction
-        << "Trying to construct genericPointPatchField on patch "
+        << "Trying to construct generic patchField on patch "
         << this->patch().name()
         << " of field " << this->internalField().name() << nl
         << abort(FatalError);
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index f772014971..c91f40202f 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef genericPointPatchField_H
-#define genericPointPatchField_H
+#ifndef Foam_genericPointPatchField_H
+#define Foam_genericPointPatchField_H
 
 #include "calculatedPointPatchField.H"
 #include "genericPatchFieldBase.H"
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
index 8e5b0f3270..cc054649d7 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,17 +30,11 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePointPatchFields(generic);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makePointPatchFields(generic);
+}
 
 // ************************************************************************* //
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
index 3793b4e29d..5cdd68329e 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,8 +26,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef genericPointPatchFields_H
-#define genericPointPatchFields_H
+#ifndef Foam_genericPointPatchFields_H
+#define Foam_genericPointPatchFields_H
 
 #include "genericPointPatchField.H"
 #include "fieldTypes.H"

From 8a2cd2edfb8b50275a514184845558e6e2f782d1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 24 Feb 2023 18:51:55 +0100
Subject: [PATCH 102/348] STYLE: use nProcs check on PstreamBuffers

---
 .../polyPatches/constraint/processor/processorPolyPatch.C     | 4 ++--
 .../faMesh/faPatches/constraint/processor/processorFaPatch.C  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 1bc1fc4336..c805f018f6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -199,7 +199,7 @@ void Foam::processorPolyPatch::initGeometry(PstreamBuffers& pBufs)
 {
     if (Pstream::parRun())
     {
-        if (neighbProcNo() >= Pstream::nProcs(pBufs.comm()))
+        if (neighbProcNo() >= pBufs.nProcs())
         {
             FatalErrorInFunction
                 << "On patch " << name()
@@ -362,7 +362,7 @@ void Foam::processorPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
 
     if (Pstream::parRun())
     {
-        if (neighbProcNo() >= Pstream::nProcs(pBufs.comm()))
+        if (neighbProcNo() >= pBufs.nProcs())
         {
             FatalErrorInFunction
                 << "On patch " << name()
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index 05da85691f..ab7fc628b0 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -178,7 +178,7 @@ void Foam::processorFaPatch::initGeometry(PstreamBuffers& pBufs)
 {
     if (Pstream::parRun())
     {
-        if (neighbProcNo() >= Pstream::nProcs(pBufs.comm()))
+        if (neighbProcNo() >= pBufs.nProcs())
         {
             FatalErrorInFunction
                 << "On patch " << name()
@@ -270,7 +270,7 @@ void Foam::processorFaPatch::initUpdateMesh(PstreamBuffers& pBufs)
 
     if (Pstream::parRun())
     {
-        if (neighbProcNo() >= Pstream::nProcs(pBufs.comm()))
+        if (neighbProcNo() >= pBufs.nProcs())
         {
             FatalErrorInFunction
                 << "On patch " << name()

From 7246b49eac4e26d902394522ee2ece91fe031cbb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 24 Feb 2023 17:17:04 +0100
Subject: [PATCH 103/348] ENH: downgrade finiteArea processor edge-length
 checks

- now simply warn (on FULLDEBUG) instead of Fatal.
  Avoids spurious errors on small edges.
---
 .../faPatches/constraint/processor/processorFaPatch.C      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index ab7fc628b0..0dab3f8636 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -211,6 +211,7 @@ void Foam::processorFaPatch::calcGeometry(PstreamBuffers& pBufs)
                 >> neighbEdgeFaceCentres_;
         }
 
+        #ifdef FULLDEBUG
         const scalarField& magEl = magEdgeLengths();
 
         forAll(magEl, edgei)
@@ -220,14 +221,14 @@ void Foam::processorFaPatch::calcGeometry(PstreamBuffers& pBufs)
 
             if (mag(magEl[edgei] - nmagEl)/avEl > 1e-6)
             {
-                FatalErrorInFunction
+                WarningInFunction
                     << "edge " << edgei
                     << " length does not match neighbour by "
                     << 100*mag(magEl[edgei] - nmagEl)/avEl
-                    << "% -- possible edge ordering problem"
-                    << exit(FatalError);
+                    << "% -- possible edge ordering problem" << nl;
             }
         }
+        #endif
 
         calcTransformTensors
         (

From f3d447579afa27ec7b935f1515ccad2cedf62661 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Feb 2023 15:33:25 +0100
Subject: [PATCH 104/348] ENH: provide explicit literal/regex for dictionary
 findEntry

---
 .../exprResult/exprResultDelayed.C            |  4 +--
 .../fvGeometryScheme/fvGeometryScheme.C       |  6 ++---
 .../sampledSet/sampledSets/sampledSets.C      |  4 +--
 .../sampledSurfaces/sampledSurfaces.C         |  2 +-
 ...eratureRadCoupledMixedFvPatchScalarField.C |  2 +-
 .../boundaryRadiationProperties.C             | 25 ++++++++-----------
 6 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/OpenFOAM/expressions/exprResult/exprResultDelayed.C b/src/OpenFOAM/expressions/exprResult/exprResultDelayed.C
index 2772997afe..4adda6a125 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResultDelayed.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResultDelayed.C
@@ -99,9 +99,9 @@ Foam::expressions::exprResultDelayed::exprResultDelayed
     storeInterval_(dict.get<scalar>("storeInterval")),
     delay_(dict.get<scalar>("delay"))
 {
-    const entry *eptr = dict.findEntry("storedValues");
+    const entry *eptr = dict.findEntry("storedValues", keyType::LITERAL);
 
-    if (eptr)
+    if (eptr && eptr->isStream())
     {
         storedValues_ = DLList<ValueAtTime>(eptr->stream());
     }
diff --git a/src/finiteVolume/fvMesh/fvGeometryScheme/fvGeometryScheme/fvGeometryScheme.C b/src/finiteVolume/fvMesh/fvGeometryScheme/fvGeometryScheme/fvGeometryScheme.C
index 88686584c0..fb47050156 100644
--- a/src/finiteVolume/fvMesh/fvGeometryScheme/fvGeometryScheme/fvGeometryScheme.C
+++ b/src/finiteVolume/fvMesh/fvGeometryScheme/fvGeometryScheme/fvGeometryScheme.C
@@ -106,11 +106,11 @@ Foam::tmp<Foam::fvGeometryScheme> Foam::fvGeometryScheme::New
     const word& defaultScheme
 )
 {
-    const entry* ePtr = dict.findEntry("method");
+    const entry* eptr = dict.findEntry("method", keyType::LITERAL);
     const word schemeName
     (
-        ePtr
-      ? word(ePtr->stream())
+        eptr
+      ? word(eptr->stream())
       : dict.getOrDefault<word>("type", defaultScheme)
     );
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index b1e31b816b..12242b7421 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -292,7 +292,7 @@ void Foam::sampledSets::initDict(const dictionary& dict, const bool initial)
         writers_.clear();
     }
 
-    const entry* eptr = dict.findEntry("sets");
+    const entry* eptr = dict.findEntry("sets", keyType::LITERAL);
 
     if (eptr && eptr->isDict())
     {
@@ -529,7 +529,7 @@ bool Foam::sampledSets::read(const dictionary& dict)
     samplePointScheme_ =
         dict.getOrDefault<word>("interpolationScheme", "cellPoint");
 
-    const entry* eptr = dict.findEntry("sets");
+    const entry* eptr = dict.findEntry("sets", keyType::LITERAL);
 
     if (eptr)
     {
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 9a1a9524b6..d7de7db89d 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -297,7 +297,7 @@ bool Foam::sampledSurfaces::read(const dictionary& dict)
     sampleNodeScheme_ =
         dict.getOrDefault<word>("interpolationScheme", "cellPoint");
 
-    const entry* eptr = dict.findEntry("surfaces");
+    const entry* eptr = dict.findEntry("surfaces", keyType::LITERAL);
 
     // Surface writer type and format options
     const word writerType =
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index ad59b17622..9794da70ff 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -128,7 +128,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
             << exit(FatalError);
     }
 
-    //const auto* eptr = dict.findEntry("thicknessLayers");
+    //const auto* eptr = dict.findEntry("thicknessLayers", keyType::LITERAL);
     //if (eptr)
     //{
     //    // Detect either a list (parsed as a scalarList) or
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
index ee564a3421..c77ec73321 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
@@ -89,14 +89,16 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties
             {
                 const label patchi = pp.index();
 
-                const auto* ePtr = radiationDict.findEntry(pp.name());
+                // Allow wildcard matches
+                const auto* eptr =
+                    radiationDict.findEntry(pp.name(), keyType::REGEX);
 
-                if (ePtr && ePtr->isDict())
+                if (eptr && eptr->isDict())
                 {
                     radBoundaryPropertiesPtrList_.set
                     (
                         patchi,
-                        boundaryRadiationPropertiesPatch::New(ePtr->dict(), pp)
+                        boundaryRadiationPropertiesPatch::New(eptr->dict(), pp)
                     );
 
                     matchedEntries.insert(pp.name());
@@ -132,32 +134,25 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties
             {
                 const label zonei = fz.index();
 
-                if (!matchedEntries.found(fz.name()))
+                if (!matchedEntries.contains(fz.name()))
                 {
                     // Note: avoid wildcard matches. Assume user explicitly
                     // provided information for faceZones.
-                    const auto* ePtr = radiationDict.findEntry
+
+                    const auto* eptr = radiationDict.findEntry
                     (
                         fz.name(),
                         keyType::LITERAL
                     );
 
-                    // Skip face zones that are not used in boundary radiation
-                    if (!ePtr)
+                    if (eptr && eptr->isDict())
                     {
-                        continue;
-                    }
-
-                    if (ePtr->isDict())
-                    {
-                        const dictionary& dict = ePtr->dict();
-
                         radZonePropertiesPtrList_.set
                         (
                             zonei,
                             boundaryRadiationPropertiesPatch::New
                             (
-                                dict,
+                                eptr->dict(),
                                 dummyRef
                             )
                         );

From d88272f031d9c90485da029455ce6d65bfcdb9fa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Feb 2023 18:25:33 +0100
Subject: [PATCH 105/348] ENH: relocate zero_one to pTraits, allows reuse for
 scalar clamping

ENH: add pTraits and IO for std::int8_t

STYLE: cull some implicitly available includes

- pTraits.H is included by label/scalar etc
- zero.H is included by UList

STYLE: cull redundant forward declarations for Istream/Ostream
---
 applications/test/List/Test-List.C            |   2 +-
 applications/test/minMax2/Test-minMax2.C      |   3 +-
 applications/test/sizeof/Test-sizeof.C        |   6 +-
 .../mesh/advanced/selectCells/edgeStats.H     |   7 +-
 .../pdrFields/obstacles/PDRobstacleTypes.C    |   4 +-
 .../setAlphaField/setAlphaField.C             |   2 +-
 src/OSspecific/MSwindows/cpuInfo/cpuInfo.H    |   2 +-
 src/OSspecific/POSIX/cpuInfo/cpuInfo.H        |   2 +-
 src/OpenFOAM/Make/files                       |   7 +-
 .../dynamicIndexedOctree.H                    |   1 -
 .../algorithms/indexedOctree/indexedOctree.H  |   1 -
 .../LinkedLists/accessTypes/ILList/ILList.H   |   3 -
 .../LinkedLists/accessTypes/LList/LList.H     |   4 -
 .../LinkedLists/accessTypes/UILList/UILList.H |   2 -
 src/OpenFOAM/containers/Lists/List/UList.H    |   3 -
 src/OpenFOAM/containers/Lists/List/UListI.H   |   1 -
 .../containers/Lists/policy/ListPolicy.H      |  21 ++-
 .../IOobjects/CompactIOList/CompactIOList.H   |   2 -
 .../db/IOstreams/IOstreams/InfoProxy.H        |  12 +-
 .../db/IOstreams/memory/memoryStreamBuffer.H  |   7 +-
 .../functionEntries/codeStream/codeStream.H   |   1 +
 .../dimensionedType/dimensionedType.C         |   1 -
 src/OpenFOAM/global/debug/debug.H             |   2 +-
 src/OpenFOAM/global/debug/simpleRegIOobject.H |   2 +-
 src/OpenFOAM/global/profiling/profiling.H     |   5 +-
 src/OpenFOAM/matrices/Matrix/MatrixTools.H    |   7 +-
 src/OpenFOAM/primitives/Scalar/Scalar.H       |   7 +
 .../Scalar/doubleScalar/doubleScalar.H        |   5 +-
 .../Scalar/floatScalar/floatScalar.H          |   5 +-
 .../primitives/VectorSpace/products.H         |   4 +-
 src/OpenFOAM/primitives/bools/bool/bool.H     |  35 ++--
 src/OpenFOAM/primitives/chars/char/char.H     |  29 +---
 src/OpenFOAM/primitives/chars/wchar/wchar.H   |   4 +-
 src/OpenFOAM/primitives/complex/complex.H     |  15 +-
 src/OpenFOAM/primitives/direction/direction.H |  10 +-
 .../primitives/direction/directionIO.C        |   4 +-
 .../functions/Function1/ramp/ramp.H           |   2 +-
 .../primitives/hashes/SHA1/SHA1Digest.H       |   2 +-
 src/OpenFOAM/primitives/ints/int/int.H        |   1 +
 src/OpenFOAM/primitives/ints/int16/int16.H    |   9 +-
 src/OpenFOAM/primitives/ints/int32/int32.H    |  30 ++--
 src/OpenFOAM/primitives/ints/int64/int64.H    |  30 ++--
 src/OpenFOAM/primitives/ints/int8/int8.C      | 105 ++++++++++++
 src/OpenFOAM/primitives/ints/int8/int8.H      | 154 ++++++++++++++++++
 src/OpenFOAM/primitives/ints/uint16/uint16.H  |   9 +-
 src/OpenFOAM/primitives/ints/uint32/uint32.H  |  19 +--
 src/OpenFOAM/primitives/ints/uint64/uint64.H  |  18 +-
 src/OpenFOAM/primitives/ints/uint8/uint8.C    |  14 ++
 src/OpenFOAM/primitives/ints/uint8/uint8.H    |   9 +-
 src/OpenFOAM/primitives/ints/uint8/uint8IO.C  |  44 -----
 .../primitives/random/Random/Random.H         |   4 +-
 .../ranges/labelRange/labelRanges.H           |   2 -
 .../ranges/scalarRange/scalarRange.H          |   1 -
 .../primitives/ranges/sliceRange/sliceRange.H |   6 +-
 .../spatialTransform/spatialTransform.H       |   6 +-
 src/OpenFOAM/primitives/traits/contiguous.H   |  18 +-
 src/OpenFOAM/primitives/traits/one.H          |  31 +---
 src/OpenFOAM/primitives/traits/pTraits.H      |   9 +
 src/OpenFOAM/primitives/traits/zero.H         |  21 +--
 src/finiteArea/faMatrices/faMatrix/faMatrix.H |   1 -
 .../edgeInterpolation/schemes/Gamma/Gamma.H   |   2 +-
 .../derived/turbulentDFSEMInlet/eddy/eddy.H   |   4 +-
 .../finiteVolume/fvm/fvmLaplacian.H           |   1 -
 .../fvMatrices/fvMatrix/fvMatrix.H            |   1 -
 .../fvMatrices/solvers/MULES/MULES.H          |   1 -
 .../limitedSchemes/Gamma/Gamma.H              |   2 +-
 .../limitedSchemes/Minmod/Minmod.H            |   2 +-
 .../limitedSchemes/Phi/Phi.H                  |   2 +-
 .../filteredLinear2/filteredLinear2.H         |   2 +-
 .../filteredLinear2/filteredLinear2V.H        |   2 +-
 .../filteredLinear3/filteredLinear3.H         |   2 +-
 .../filteredLinear3/filteredLinear3V.H        |   2 +-
 .../limitedLinear/limitedLinear.H             |   2 +-
 .../schemes/CoBlended/CoBlended.H             |   2 +-
 .../eulerianParticle/eulerianParticle.H       |   7 +-
 .../fieldAverageItem/fieldAverageItem.H       |   6 +-
 .../surfaceFieldValue/surfaceFieldValue.C     |   4 +-
 .../stabilityBlendingFactor.H                 |   2 +-
 .../solidificationMeltingSource.C             |   2 +-
 .../distributionModels/binned/binned.H        |   7 +-
 .../distributionModels/general/general.H      |   8 +-
 .../DistortedSphereDragForce.C                |   2 +-
 .../Templates/SprayParcel/SprayParcel.C       |   2 +-
 .../movement/lumpedPointMovement.C            |   2 +-
 .../state/lumpedPointState.H                  |   4 -
 .../gradingDescriptor/gradingDescriptor.H     |   2 -
 .../gradingDescriptor/gradingDescriptors.H    |   1 -
 .../PointIntegrateData/PointIntegrateData.H   |   4 +-
 .../PatchEdgeFaceWave/patchEdgeFaceInfo.H     |   3 +-
 .../algorithms/PointEdgeWave/PointData.H      |   2 -
 .../algorithms/PointEdgeWave/pointEdgePoint.H |   3 +-
 .../edgeMesh/edgeMeshTools/edgeMeshTools.H    |   6 +-
 .../MassTransferPhaseSystem.C                 |   4 +-
 .../rigidBodyInertia/rigidBodyInertia.H       |   7 +-
 .../rigidBodyModelState/rigidBodyModelState.H |   7 +-
 .../surface/isoSurface/isoSurfaceParams.H     |   5 +-
 ...gidBodyDisplacementPointPatchVectorField.C |   2 +-
 .../sixDoFRigidBodyMotionState.H              |   2 -
 src/surfMesh/MeshedSurface/MeshedSurface.H    |   2 -
 .../UnsortedMeshedSurface.H                   |   2 -
 .../waveMakerPointPatchVectorField.C          |   2 +-
 .../irregularWaveModel/irregularWaveModel.C   |   2 +-
 102 files changed, 475 insertions(+), 427 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/ints/int8/int8.C
 create mode 100644 src/OpenFOAM/primitives/ints/int8/int8.H
 delete mode 100644 src/OpenFOAM/primitives/ints/uint8/uint8IO.C

diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index e676a859a4..03e77dcfef 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -81,7 +81,7 @@ namespace ListPolicy
 {
 
 // Override on a per-type basis
-template<> struct short_length<short> : std::integral_constant<short,20> {};
+template<> struct short_length<short> : std::integral_constant<int,20> {};
 
 } // End namespace ListPolicy
 } // End namespace Detail
diff --git a/applications/test/minMax2/Test-minMax2.C b/applications/test/minMax2/Test-minMax2.C
index 136681d75c..ec02d21d3d 100644
--- a/applications/test/minMax2/Test-minMax2.C
+++ b/applications/test/minMax2/Test-minMax2.C
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
         Random rnd(4567);
         for (scalar& val : someField)
         {
-            val = rnd.position(-0.2, 1.2);
+            val = rnd.position(scalar(-0.2), scalar(1.2));
         }
 
         Info<< nl
@@ -171,6 +171,7 @@ int main(int argc, char *argv[])
             // nope << " : " << clamp(val, zero_one{})
             // nope << " : " << clamp(val, scalarMinMax(zero_one{}))
             << " : " << clamp(val, 0, 1)
+            << " : " << clamp(val, zero_one{})
             << nl;
     }
 
diff --git a/applications/test/sizeof/Test-sizeof.C b/applications/test/sizeof/Test-sizeof.C
index a5bd8ce9a7..13f0aac07a 100644
--- a/applications/test/sizeof/Test-sizeof.C
+++ b/applications/test/sizeof/Test-sizeof.C
@@ -33,7 +33,7 @@ Description
 #include "Switch.H"
 #include "string.H"
 #include "dictionary.H"
-#include "nil.H"
+#include "zero.H"
 #include "IOstreams.H"
 #include "PstreamBuffers.H"
 #include "argList.H"
@@ -82,8 +82,8 @@ int main(int argc, char *argv[])
     }
 
     {
-        nil x;
-        cout<<"nil:" << sizeof(x) << nl;
+        zero x;
+        cout<<"zero:" << sizeof(x) << nl;
     }
     #if 0
     {
diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.H b/applications/utilities/mesh/advanced/selectCells/edgeStats.H
index 79e70feba3..d197fdcb30 100644
--- a/applications/utilities/mesh/advanced/selectCells/edgeStats.H
+++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef edgeStats_H
-#define edgeStats_H
+#ifndef Foam_edgeStats_H
+#define Foam_edgeStats_H
 
 #include "direction.H"
 #include "scalar.H"
@@ -45,9 +45,8 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
-class Ostream;
 class twoDPointCorrector;
 
 /*---------------------------------------------------------------------------*\
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C
index 31c559d86f..04e798cf0c 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacleTypes.C
@@ -62,7 +62,7 @@ namespace Foam
 // Volume porosity -> blockage
 inline scalar getPorosity(const dictionary& dict)
 {
-    return 1 - clamp(dict.getOrDefault<scalar>("porosity", 0), 0, 1);
+    return 1 - clamp(dict.getOrDefault<scalar>("porosity", 0), zero_one{});
 }
 
 // Direction porosities -> blockage
@@ -74,7 +74,7 @@ inline vector getPorosities(const dictionary& dict)
     {
         for (scalar& val : blockage)
         {
-            val = 1 - clamp(val, 0, 1);
+            val = 1 - clamp(val, zero_one{});
         }
     }
 
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
index 1db1a547f4..78f9b77e55 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
@@ -108,7 +108,7 @@ void setAlpha
     {
         cutCell.calcSubCell(cellI, 0.0);
 
-        alpha1[cellI] = clamp(cutCell.VolumeOfFluid(), 0, 1);
+        alpha1[cellI] = clamp(cutCell.VolumeOfFluid(), zero_one{});
 
         if (writeOBJ && (mag(cutCell.faceArea()) >= 1e-14))
         {
diff --git a/src/OSspecific/MSwindows/cpuInfo/cpuInfo.H b/src/OSspecific/MSwindows/cpuInfo/cpuInfo.H
index 5b175074cb..7da2ac5bc6 100644
--- a/src/OSspecific/MSwindows/cpuInfo/cpuInfo.H
+++ b/src/OSspecific/MSwindows/cpuInfo/cpuInfo.H
@@ -50,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class Ostream;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OSspecific/POSIX/cpuInfo/cpuInfo.H b/src/OSspecific/POSIX/cpuInfo/cpuInfo.H
index f9d5c5646b..37cac03d92 100644
--- a/src/OSspecific/POSIX/cpuInfo/cpuInfo.H
+++ b/src/OSspecific/POSIX/cpuInfo/cpuInfo.H
@@ -50,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class Ostream;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index b0404996bc..7753533552 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -42,22 +42,21 @@ $(chars)/lists/charUList.C
 primitives/direction/directionIO.C
 
 ints = primitives/ints
+$(ints)/uint/uintIO.C
 $(ints)/uint8/uint8.C
-$(ints)/uint8/uint8IO.C
 $(ints)/uint16/uint16.C
 $(ints)/uint32/uint32.C
 $(ints)/uint32/uint32IO.C
 $(ints)/uint64/uint64.C
 $(ints)/uint64/uint64IO.C
-$(ints)/uint/uintIO.C
+$(ints)/uLabel/uLabel.C
+$(ints)/int/intIO.C
 $(ints)/int16/int16.C
 $(ints)/int32/int32.C
 $(ints)/int32/int32IO.C
 $(ints)/int64/int64.C
 $(ints)/int64/int64IO.C
-$(ints)/int/intIO.C
 $(ints)/label/label.C
-$(ints)/uLabel/uLabel.C
 $(ints)/lists/labelList.C
 $(ints)/lists/labelIOList.C
 $(ints)/lists/labelListIOList.C
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index 6a93fc4ba6..d1b9aaf3ca 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -48,7 +48,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
 template<class Type> class dynamicIndexedOctree;
 template<class Type>
 Ostream& operator<<(Ostream&, const dynamicIndexedOctree<Type>&);
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index 3b9878365c..c9c7887e92 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -53,7 +53,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
 template<class Type> class indexedOctree;
 template<class Type> Ostream& operator<<(Ostream&, const indexedOctree<Type>&);
 
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index 038cfb7383..984c3c5400 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -47,9 +47,6 @@ namespace Foam
 {
 
 // Forward Declarations
-
-class Istream;
-class Ostream;
 template<class LListBase, class T> class ILList;
 
 template<class LListBase, class T> Istream& operator>>
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index c99dc344cd..9e7e39311c 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -48,10 +48,6 @@ namespace Foam
 {
 
 // Forward Declarations
-
-class Istream;
-class Ostream;
-
 template<class LListBase, class T> class LList;
 
 template<class LListBase, class T>
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index 7c3448af24..c97c523968 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -49,8 +49,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Ostream;
-
 template<class LListBase, class T> class UILList;
 
 template<class LListBase, class T>
diff --git a/src/OpenFOAM/containers/Lists/List/UList.H b/src/OpenFOAM/containers/Lists/List/UList.H
index 2c6339e1c9..01d5d1b562 100644
--- a/src/OpenFOAM/containers/Lists/List/UList.H
+++ b/src/OpenFOAM/containers/Lists/List/UList.H
@@ -57,7 +57,6 @@ SourceFiles
 #include "ListPolicy.H"
 
 #include <iterator>
-#include <type_traits>
 #include <vector>  // i.e, std::vector
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,8 +65,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 class labelRange;
 
 template<class T> class List;
diff --git a/src/OpenFOAM/containers/Lists/List/UListI.H b/src/OpenFOAM/containers/Lists/List/UListI.H
index 93f6a1788c..183b5e6893 100644
--- a/src/OpenFOAM/containers/Lists/List/UListI.H
+++ b/src/OpenFOAM/containers/Lists/List/UListI.H
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
-#include "pTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/policy/ListPolicy.H b/src/OpenFOAM/containers/Lists/policy/ListPolicy.H
index 7cf2711415..aa63fc7448 100644
--- a/src/OpenFOAM/containers/Lists/policy/ListPolicy.H
+++ b/src/OpenFOAM/containers/Lists/policy/ListPolicy.H
@@ -31,10 +31,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ListPolicy_H
-#define ListPolicy_H
+#ifndef Foam_ListPolicy_H
+#define Foam_ListPolicy_H
 
-#include "label.H"
 #include <type_traits>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -43,9 +42,9 @@ namespace Foam
 {
 
 // Forward Declarations
+class keyType;
 class word;
 class wordRe;
-class keyType;
 
 namespace Detail
 {
@@ -58,11 +57,11 @@ namespace ListPolicy
 //
 //  Default definition: 10
 template<class T>
-struct short_length : std::integral_constant<label,10> {};
+struct short_length : std::integral_constant<int,10> {};
 
-// Could override on a per-type basis
+// Can override on a per-type basis
 // Eg,
-// template<> struct short_length<label> : std::integral_constant<label,20> {};
+// template<> struct short_length<label> : std::integral_constant<int,20> {};
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,19 +74,19 @@ struct short_length : std::integral_constant<label,10> {};
 template<class T>
 struct no_linebreak : std::is_arithmetic<T> {};
 
-// Specialization for word, wordRe, keyType
+// Specialization for word-like classes
 // These elements are normally fairly short, so ok to output a few (eg, 10)
 // of them on a single line.
 
+//- Suppress line-breaks for keyType
+template<> struct no_linebreak<keyType> : std::true_type {};
+
 //- Suppress line-breaks for word
 template<> struct no_linebreak<word> : std::true_type {};
 
 //- Suppress line-breaks for wordRe
 template<> struct no_linebreak<wordRe> : std::true_type {};
 
-//- Suppress line-breaks for keyType
-template<> struct no_linebreak<keyType> : std::true_type {};
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index b3357a4ee2..20312ff262 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -51,8 +51,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 template<class T, class BaseType> class CompactIOList;
 
 template<class T, class BaseType> Istream& operator>>
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
index d005719361..b8190bab0d 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
@@ -31,23 +31,25 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef InfoProxy_H
-#define InfoProxy_H
+#ifndef Foam_InfoProxy_H
+#define Foam_InfoProxy_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward Declarations
 class Ostream;
 
+template<class T> class InfoProxy;
+template<class T> Ostream& operator<<(Ostream&, const InfoProxy<T>&);
+
+
 /*---------------------------------------------------------------------------*\
                            Class InfoProxy Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class T> class InfoProxy;
-template<class T> Ostream& operator<<(Ostream&, const InfoProxy<T>&);
-
 template<class T>
 class InfoProxy
 {
diff --git a/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H b/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
index fe72912421..4bfc1daa08 100644
--- a/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
+++ b/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
@@ -32,8 +32,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef memoryStreamBuffer_H
-#define memoryStreamBuffer_H
+#ifndef Foam_memoryStreamBuffer_H
+#define Foam_memoryStreamBuffer_H
 
 #include "UList.H"
 #include <type_traits>
@@ -44,9 +44,6 @@ Description
 namespace Foam
 {
 
-// Forward Declarations
-class Ostream;
-
 /*---------------------------------------------------------------------------*\
                           Class memorybuf Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
index 036c260faf..de9361190a 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.H
@@ -101,6 +101,7 @@ SourceFiles
 
 namespace Foam
 {
+
 // Forward Declarations
 class dlLibraryTable;
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 6071afae1e..3c4d681d95 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dimensionedType.H"
-#include "pTraits.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/debug/debug.H b/src/OpenFOAM/global/debug/debug.H
index 3e931becc2..53fab0d2a2 100644
--- a/src/OpenFOAM/global/debug/debug.H
+++ b/src/OpenFOAM/global/debug/debug.H
@@ -43,7 +43,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class dictionary;
 class Istream;
 class Ostream;
diff --git a/src/OpenFOAM/global/debug/simpleRegIOobject.H b/src/OpenFOAM/global/debug/simpleRegIOobject.H
index 1be6091fda..d9c51e9a76 100644
--- a/src/OpenFOAM/global/debug/simpleRegIOobject.H
+++ b/src/OpenFOAM/global/debug/simpleRegIOobject.H
@@ -42,7 +42,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class Istream;
 class Ostream;
 
diff --git a/src/OpenFOAM/global/profiling/profiling.H b/src/OpenFOAM/global/profiling/profiling.H
index d2fba7f5d4..fe711bad20 100644
--- a/src/OpenFOAM/global/profiling/profiling.H
+++ b/src/OpenFOAM/global/profiling/profiling.H
@@ -52,8 +52,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef profiling_H
-#define profiling_H
+#ifndef Foam_profiling_H
+#define Foam_profiling_H
 
 #include "profilingTrigger.H"
 #include "IOdictionary.H"
@@ -69,7 +69,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Ostream;
 class cpuInfo;
 class memInfo;
 class profilingInformation;
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixTools.H b/src/OpenFOAM/matrices/Matrix/MatrixTools.H
index 95fa5bcd59..0c61d5b1ed 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixTools.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixTools.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef MatrixTools_H
-#define MatrixTools_H
+#ifndef Foam_MatrixTools_H
+#define Foam_MatrixTools_H
 
 #include "Matrix.H"
 
@@ -44,9 +44,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
-class Ostream;
-
 /*---------------------------------------------------------------------------*\
                        Namespace MatrixTools Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index d8d41cae97..4fe5c81b66 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -294,6 +294,13 @@ inline bool notEqual(const Scalar a, const Scalar b)
 }
 
 
+//- Clamp scalar value to a 0-1 range
+inline Scalar clamp(const Scalar val, const Foam::zero_one)
+{
+    return (val < 0) ? 0 : (1 < val) ? 1 : val;
+}
+
+
 // Fast implementation, and with scalar promotion of upper/lower limits
 inline Scalar clamp(const Scalar& val, const Scalar& lower, const Scalar& upper)
 {
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
index 5718d2d79d..fba14df589 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
@@ -35,12 +35,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_doubleScalar_H
-#define Foam_doubleScalar_H
+#ifndef Foam_primitives_double_H
+#define Foam_primitives_double_H
 
 #include "scalarFwd.H"
 #include "doubleFloat.H"
 #include "direction.H"
+#include "pTraits.H"
 #include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
index cb5dd78912..8d041a0111 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
@@ -35,12 +35,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_floatScalar_H
-#define Foam_floatScalar_H
+#ifndef Foam_primitives_float_H
+#define Foam_primitives_float_H
 
 #include "scalarFwd.H"
 #include "doubleFloat.H"
 #include "direction.H"
+#include "pTraits.H"
 #include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/VectorSpace/products.H b/src/OpenFOAM/primitives/VectorSpace/products.H
index fcf9f4a464..640d53d257 100644
--- a/src/OpenFOAM/primitives/VectorSpace/products.H
+++ b/src/OpenFOAM/primitives/VectorSpace/products.H
@@ -32,8 +32,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef products_H
-#define products_H
+#ifndef Foam_products_H
+#define Foam_products_H
 
 #include "direction.H"
 #include "pTraits.H"
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index 5e37495e05..0e791d0404 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -35,18 +35,17 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef bool_H
-#define bool_H
+#ifndef Foam_primitives_bool_H
+#define Foam_primitives_bool_H
+
+#include "pTraits.H"
+#include "direction.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // IOstream Operators
 
 //- Read bool from stream using Foam::Switch(Istream&)
@@ -58,18 +57,12 @@ Ostream& operator<<(Ostream& os, const bool b);
 //- Read bool from stream using Foam::Switch(Istream&)
 bool readBool(Istream& is);
 
-} // End namespace Foam
 
+/*---------------------------------------------------------------------------*\
+                         Specialization pTraits<bool>
+\*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "pTraits.H"
-#include "direction.H"
-
-namespace Foam
-{
-
-// Template specialisation for pTraits<bool>
+//- Template specialisation for pTraits\<bool\>
 template<>
 class pTraits<bool>
 {
@@ -121,16 +114,10 @@ public:
     // Member Functions
 
         //- Return the value
-        operator bool() const noexcept
-        {
-            return p_;
-        }
+        operator bool() const noexcept { return p_; }
 
         //- Access the value
-        operator bool&() noexcept
-        {
-            return p_;
-        }
+        operator bool&() noexcept { return p_; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/chars/char/char.H b/src/OpenFOAM/primitives/chars/char/char.H
index 7708e2be9e..959e0f075c 100644
--- a/src/OpenFOAM/primitives/chars/char/char.H
+++ b/src/OpenFOAM/primitives/chars/char/char.H
@@ -38,15 +38,13 @@ SourceFiles
 #ifndef Foam_primitives_char_H
 #define Foam_primitives_char_H
 
+#include "pTraits.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Read single character
@@ -76,16 +74,9 @@ inline bool isspace(char c) noexcept
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "pTraits.H"
-
-namespace Foam
-{
+/*---------------------------------------------------------------------------*\
+                         Specialization pTraits<char>
+\*---------------------------------------------------------------------------*/
 
 //- Template specialisation for pTraits\<char\>
 template<>
@@ -115,16 +106,10 @@ public:
     // Member Functions
 
         //- Return the value
-        operator char() const noexcept
-        {
-            return p_;
-        }
+        operator char() const noexcept { return p_; }
 
         //- Access the value
-        operator char&() noexcept
-        {
-            return p_;
-        }
+        operator char&() noexcept { return p_; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/chars/wchar/wchar.H b/src/OpenFOAM/primitives/chars/wchar/wchar.H
index 25a80bc554..67a4b3a618 100644
--- a/src/OpenFOAM/primitives/chars/wchar/wchar.H
+++ b/src/OpenFOAM/primitives/chars/wchar/wchar.H
@@ -38,8 +38,8 @@ See also
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wchar_H
-#define wchar_H
+#ifndef Foam_primitives_wchar_H
+#define Foam_primitives_wchar_H
 
 #include <cwchar>
 #include <string>
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index 459a5710bf..6fa4bc5bf0 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -44,7 +44,6 @@ SourceFiles
 #include "zero.H"
 #include "contiguous.H"
 #include <complex>
-#include <type_traits>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -224,10 +223,10 @@ public:
 
 
 /*---------------------------------------------------------------------------*\
-                      Class pTraits<complex> Declaration
+                        Specialization pTraits<complex>
 \*---------------------------------------------------------------------------*/
 
-// Template specialisation for pTraits<complex>
+//- Template specialisation for pTraits<complex>
 template<>
 class pTraits<complex>
 {
@@ -288,16 +287,10 @@ public:
     // Member Functions
 
         //- Return the value
-        operator complex() const noexcept
-        {
-            return p_;
-        }
+        operator complex() const noexcept { return p_; }
 
         //- Access the value
-        operator complex&() noexcept
-        {
-            return p_;
-        }
+        operator complex&() noexcept { return p_; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/direction/direction.H b/src/OpenFOAM/primitives/direction/direction.H
index 2e3ec46de1..b9f67e4370 100644
--- a/src/OpenFOAM/primitives/direction/direction.H
+++ b/src/OpenFOAM/primitives/direction/direction.H
@@ -36,21 +36,19 @@ Note
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef primitives_direction_H
-#define primitives_direction_H
+#ifndef Foam_primitives_direction_H
+#define Foam_primitives_direction_H
 
 #include <cstdint>
 #include <iostream>
 
+#include "pTraits.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 typedef uint8_t direction;
diff --git a/src/OpenFOAM/primitives/direction/directionIO.C b/src/OpenFOAM/primitives/direction/directionIO.C
index c17a3b6546..739e0b4882 100644
--- a/src/OpenFOAM/primitives/direction/directionIO.C
+++ b/src/OpenFOAM/primitives/direction/directionIO.C
@@ -47,7 +47,7 @@ Foam::Istream& Foam::operator>>(Istream& is, direction& val)
     if (!t.good())
     {
         FatalIOErrorInFunction(is)
-            << "Bad token - could not get direction"
+            << "Bad token - could not get uint8/direction"
             << exit(FatalIOError);
         is.setBad();
         return is;
@@ -60,7 +60,7 @@ Foam::Istream& Foam::operator>>(Istream& is, direction& val)
     else
     {
         FatalIOErrorInFunction(is)
-            << "Wrong token type - expected label (direction), found "
+            << "Wrong token type - expected label (uint8/direction), found "
             << t.info()
             << exit(FatalIOError);
         is.setBad();
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index 2dc4e26c17..f85f4b8881 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -100,7 +100,7 @@ protected:
         //- that forms the basis of many more complex ramp functions
         inline scalar linearRamp(const scalar t) const
         {
-            return clamp((t - start_)/duration_, 0, 1);
+            return clamp((t - start_)/duration_, zero_one{});
         }
 
 
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
index f7456ef1b2..c8d0e7fa27 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
@@ -50,9 +50,9 @@ namespace Foam
 {
 
 // Forward Declarations
-class SHA1;
 class Istream;
 class Ostream;
+class SHA1;
 
 /*---------------------------------------------------------------------------*\
                          Class SHA1Digest Declaration
diff --git a/src/OpenFOAM/primitives/ints/int/int.H b/src/OpenFOAM/primitives/ints/int/int.H
index 906660fd31..48900d3c8c 100644
--- a/src/OpenFOAM/primitives/ints/int/int.H
+++ b/src/OpenFOAM/primitives/ints/int/int.H
@@ -37,6 +37,7 @@ SourceFiles
 #ifndef Foam_primitives_int_H
 #define Foam_primitives_int_H
 
+#include "int8.H"
 #include "int16.H"
 #include "int32.H"
 #include "int64.H"
diff --git a/src/OpenFOAM/primitives/ints/int16/int16.H b/src/OpenFOAM/primitives/ints/int16/int16.H
index f7abe5ea16..21587e88e6 100644
--- a/src/OpenFOAM/primitives/ints/int16/int16.H
+++ b/src/OpenFOAM/primitives/ints/int16/int16.H
@@ -27,7 +27,7 @@ Primitive
     int16_t
 
 Description
-    16bit signed integer. I/O is done via an int32.
+    16bit signed integer. I/O is done as an int32.
 
 SourceFiles
     int16.C
@@ -38,6 +38,9 @@ SourceFiles
 #define Foam_primitives_int16_H
 
 #include <cstdint>
+
+#include "direction.H"
+#include "pTraits.H"
 #include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,10 +48,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of int16 value
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.H b/src/OpenFOAM/primitives/ints/int32/int32.H
index a4d83b2d6f..bd97eae76b 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32.H
+++ b/src/OpenFOAM/primitives/ints/int32/int32.H
@@ -52,10 +52,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of int32 value
@@ -76,6 +72,12 @@ struct nameOp<int32_t>
 };
 
 
+inline int32_t mag(const int32_t val)
+{
+    return ::abs(val);
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 //- Read int32_t from stream
@@ -131,6 +133,10 @@ Ostream& operator<<(Ostream& os, const int32_t val);
 #endif
 
 
+/*---------------------------------------------------------------------------*\
+                        Specialization pTraits<int32_t>
+\*---------------------------------------------------------------------------*/
+
 //- Template specialization for pTraits<int32_t>
 template<>
 class pTraits<int32_t>
@@ -187,25 +193,13 @@ public:
     // Member Functions
 
         //- Return the value
-        operator int32_t() const noexcept
-        {
-            return p_;
-        }
+        operator int32_t() const noexcept { return p_; }
 
         //- Access the value
-        operator int32_t&() noexcept
-        {
-            return p_;
-        }
+        operator int32_t&() noexcept { return p_; }
 };
 
 
-inline int32_t mag(const int32_t val)
-{
-    return ::abs(val);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.H b/src/OpenFOAM/primitives/ints/int64/int64.H
index ff77dfe2a6..49766d2621 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64.H
+++ b/src/OpenFOAM/primitives/ints/int64/int64.H
@@ -52,10 +52,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of int64 value
@@ -76,6 +72,12 @@ struct nameOp<int64_t>
 };
 
 
+inline int64_t mag(const int64_t val)
+{
+    return ::labs(val);
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 //- Read int64_t from stream
@@ -130,6 +132,10 @@ Ostream& operator<<(Ostream& os, const int64_t val);
 #endif
 
 
+/*---------------------------------------------------------------------------*\
+                        Specialization pTraits<int64_t>
+\*---------------------------------------------------------------------------*/
+
 //- Template specialization for pTraits<int64_t>
 template<>
 class pTraits<int64_t>
@@ -186,25 +192,13 @@ public:
     // Member Functions
 
         //- Return the value
-        operator int64_t() const noexcept
-        {
-            return p_;
-        }
+        operator int64_t() const noexcept { return p_; }
 
         //- Access the value
-        operator int64_t&() noexcept
-        {
-            return p_;
-        }
+        operator int64_t&() noexcept { return p_; }
 };
 
 
-inline int64_t mag(const int64_t val)
-{
-    return ::labs(val);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/ints/int8/int8.C b/src/OpenFOAM/primitives/ints/int8/int8.C
new file mode 100644
index 0000000000..e411d5f992
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/int8/int8.C
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "int8.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const char* const Foam::pTraits<int8_t>::typeName = "int8";
+const char* const Foam::pTraits<int8_t>::componentNames[] = { "" };
+
+const int8_t Foam::pTraits<int8_t>::zero = 0;
+const int8_t Foam::pTraits<int8_t>::one = 1;
+const int8_t Foam::pTraits<int8_t>::min = INT8_MIN;
+const int8_t Foam::pTraits<int8_t>::max = INT8_MAX;
+const int8_t Foam::pTraits<int8_t>::rootMin = INT8_MIN;
+const int8_t Foam::pTraits<int8_t>::rootMax = INT8_MAX;
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pTraits<int8_t>::pTraits(Istream& is)
+{
+    is >> p_;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+// int8_t Foam::readInt8(Istream& is)
+// {
+//     int8_t val(0);
+//     is >> val;
+//
+//     return val;
+// }
+
+
+Foam::Istream& Foam::operator>>(Istream& is, int8_t& val)
+{
+    token t(is);
+
+    if (!t.good())
+    {
+        FatalIOErrorInFunction(is)
+            << "Bad token - could not get int8"
+            << exit(FatalIOError);
+        is.setBad();
+        return is;
+    }
+
+    // Accept separated '-' (or '+') while expecting a number.
+    // This can arise during dictionary expansions (Eg, -$value)
+
+    if (t.isLabel())
+    {
+        val = int8_t(t.labelToken());
+    }
+    else
+    {
+        FatalIOErrorInFunction(is)
+            << "Wrong token type - expected label (int8), found "
+            << t.info() << exit(FatalIOError);
+        is.setBad();
+        return is;
+    }
+
+    is.check(FUNCTION_NAME);
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const int8_t val)
+{
+    os.write(label(val));
+    os.check(FUNCTION_NAME);
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/int8/int8.H b/src/OpenFOAM/primitives/ints/int8/int8.H
new file mode 100644
index 0000000000..734b5323a9
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/int8/int8.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Primitive
+    int8_t
+
+Description
+    8bit signed integer
+
+SourceFiles
+    int8.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_primitives_int8_H
+#define Foam_primitives_int8_H
+
+#include <cstdint>
+#include <climits>
+#include <cstdlib>
+
+#include "direction.H"
+#include "pTraits.H"
+#include "word.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- A word representation of uint8 value
+inline word name(const int8_t val)
+{
+    return word(std::to_string(int(val)), false); // Needs no stripping
+}
+
+
+//- A word representation of uint8 value
+template<>
+struct nameOp<int8_t>
+{
+    word operator()(const int8_t val) const
+    {
+        return word(std::to_string(int(val)), false); // Needs no stripping
+    }
+};
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+//- Read from stream (as label)
+Istream& operator>>(Istream& is, int8_t& val);
+
+//- Write to stream (as label)
+Ostream& operator<<(Ostream& os, const int8_t val);
+
+
+/*---------------------------------------------------------------------------*\
+                        Specialization pTraits<int8_t>
+\*---------------------------------------------------------------------------*/
+
+//- Template specialization for pTraits<int8_t>
+template<>
+class pTraits<int8_t>
+{
+    int8_t p_;
+
+public:
+
+    // Typedefs
+
+        //- Component type
+        typedef int8_t cmptType;
+
+
+    // Member Constants
+
+        //- Dimensionality of space
+        static constexpr direction dim = 3;
+
+        //- Rank of int8_t is 0
+        static constexpr direction rank = 0;
+
+        //- Number of components in int8_t is 1
+        static constexpr direction nComponents = 1;
+
+
+    // Static Data Members
+
+        static const char* const typeName;
+        static const char* const componentNames[];
+        static const int8_t zero;
+        static const int8_t one;
+        static const int8_t min;
+        static const int8_t max;
+        static const int8_t rootMax;
+        static const int8_t rootMin;
+
+
+    // Constructors
+
+        //- Copy construct from primitive
+        explicit pTraits(int8_t val) noexcept
+        :
+            p_(val)
+        {}
+
+        //- Read construct from Istream
+        explicit pTraits(Istream& is);
+
+
+    // Member Functions
+
+        //- Return the value
+        operator int8_t() const noexcept { return p_; }
+
+        //- Access the value
+        operator int8_t&() noexcept { return p_; }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uint16/uint16.H b/src/OpenFOAM/primitives/ints/uint16/uint16.H
index 7a02b0db15..14b9b249fd 100644
--- a/src/OpenFOAM/primitives/ints/uint16/uint16.H
+++ b/src/OpenFOAM/primitives/ints/uint16/uint16.H
@@ -27,7 +27,7 @@ Primitive
     uint16_t
 
 Description
-    16bit unsigned integer. I/O is done via an int32.
+    16bit unsigned integer. I/O is done as an int32.
 
 SourceFiles
     uint16.C
@@ -38,6 +38,9 @@ SourceFiles
 #define Foam_primitives_uint16_H
 
 #include <cstdint>
+
+#include "direction.H"
+#include "pTraits.H"
 #include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,10 +48,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of uint16 value
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H
index ecb10c92ce..ba0e7e5887 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.H
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H
@@ -52,10 +52,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of uint32 value
@@ -120,6 +116,11 @@ inline bool read(const std::string& str, uint32_t& val)
 Istream& operator>>(Istream& is, uint32_t& val);
 Ostream& operator<<(Ostream& os, const uint32_t val);
 
+
+/*---------------------------------------------------------------------------*\
+                       Specialization pTraits<uint32_t>
+\*---------------------------------------------------------------------------*/
+
 //- Template specialization for pTraits<uint32_t>
 template<>
 class pTraits<uint32_t>
@@ -173,16 +174,10 @@ public:
     // Member Functions
 
         //- Return the value
-        operator uint32_t() const noexcept
-        {
-            return p_;
-        }
+        operator uint32_t() const noexcept { return p_; }
 
         //- Access the value
-        operator uint32_t&() noexcept
-        {
-            return p_;
-        }
+        operator uint32_t&() noexcept { return p_; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.H b/src/OpenFOAM/primitives/ints/uint64/uint64.H
index 90c48e793d..98e6346d6b 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.H
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.H
@@ -52,10 +52,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of uint64 value
@@ -129,6 +125,10 @@ Ostream& operator<<(Ostream& os, const uint64_t val);
 #endif
 
 
+/*---------------------------------------------------------------------------*\
+                       Specialization pTraits<uint64_t>
+\*---------------------------------------------------------------------------*/
+
 //- Template specialization for pTraits<uint64_t>
 template<>
 class pTraits<uint64_t>
@@ -182,16 +182,10 @@ public:
     // Member Functions
 
         //- Return the value
-        operator uint64_t() const noexcept
-        {
-            return p_;
-        }
+        operator uint64_t() const noexcept { return p_; }
 
         //- Access the value
-        operator uint64_t&() noexcept
-        {
-            return p_;
-        }
+        operator uint64_t&() noexcept { return p_; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ints/uint8/uint8.C b/src/OpenFOAM/primitives/ints/uint8/uint8.C
index 83501ca834..ad217c1572 100644
--- a/src/OpenFOAM/primitives/ints/uint8/uint8.C
+++ b/src/OpenFOAM/primitives/ints/uint8/uint8.C
@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "uint8.H"
+#include "IOstreams.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -48,4 +49,17 @@ Foam::pTraits<uint8_t>::pTraits(Istream& is)
 }
 
 
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+uint8_t Foam::readUint8(Istream& is)
+{
+    uint8_t val(0);
+    is >> val;
+
+    return val;
+}
+
+// IO operators are identical to direction, which is uint8_t
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uint8/uint8.H b/src/OpenFOAM/primitives/ints/uint8/uint8.H
index 759dcc76d0..b17d19f729 100644
--- a/src/OpenFOAM/primitives/ints/uint8/uint8.H
+++ b/src/OpenFOAM/primitives/ints/uint8/uint8.H
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     uint8.C
-    uint8IO.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -51,10 +50,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- A word representation of uint8 value
@@ -83,7 +78,9 @@ uint8_t readUint8(Istream& is);
 // IO operators are identical to direction, which is uint8_t
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+/*---------------------------------------------------------------------------*\
+                        Specialization pTraits<uint8_t>
+\*---------------------------------------------------------------------------*/
 
 //- Template specialization for pTraits<uint8_t>
 template<>
diff --git a/src/OpenFOAM/primitives/ints/uint8/uint8IO.C b/src/OpenFOAM/primitives/ints/uint8/uint8IO.C
deleted file mode 100644
index b81239fe15..0000000000
--- a/src/OpenFOAM/primitives/ints/uint8/uint8IO.C
+++ /dev/null
@@ -1,44 +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 "uint8.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-uint8_t Foam::readUint8(Istream& is)
-{
-    uint8_t val(0);
-    is >> val;
-
-    return val;
-}
-
-// IO operators are identical to direction, which is uint8_t
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/random/Random/Random.H b/src/OpenFOAM/primitives/random/Random/Random.H
index 98fbfe092c..8669379423 100644
--- a/src/OpenFOAM/primitives/random/Random/Random.H
+++ b/src/OpenFOAM/primitives/random/Random/Random.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Random_H
-#define Random_H
+#ifndef Foam_Random_H
+#define Foam_Random_H
 
 #include "Rand48.H"
 #include "label.H"
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
index 231efe2073..c2754bf2f8 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
@@ -47,8 +47,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 class labelRanges;
 Istream& operator>>(Istream& is, labelRanges& ranges);
 Ostream& operator<<(Ostream& is, const labelRanges& ranges);
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
index f105cba061..172b27fe0b 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
@@ -56,7 +56,6 @@ namespace Foam
 
 // Forward Declarations
 class scalarRange;
-class Ostream;
 template<class T> class MinMax;
 
 Ostream& operator<<(Ostream& os, const scalarRange& range);
diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
index 0dc19adaf3..d6f974b42e 100644
--- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
+++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef sliceRange_H
-#define sliceRange_H
+#ifndef Foam_sliceRange_H
+#define Foam_sliceRange_H
 
 #include "label.H"
 #include <iterator>
@@ -47,8 +47,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 template<class T> class List;
 template<class T, unsigned N> class FixedList;
 
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
index d9085f4de3..764a419f94 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransform.H
@@ -54,11 +54,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-class Istream;
-class Ostream;
-
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class spatialTransform;
 Istream& operator>>(Istream&, spatialTransform&);
 Ostream& operator<<(Ostream&, const spatialTransform&);
diff --git a/src/OpenFOAM/primitives/traits/contiguous.H b/src/OpenFOAM/primitives/traits/contiguous.H
index b42493436a..b0cde4607b 100644
--- a/src/OpenFOAM/primitives/traits/contiguous.H
+++ b/src/OpenFOAM/primitives/traits/contiguous.H
@@ -5,7 +5,6 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 OpenFOAM Foundation
     Copyright (C) 2018-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -62,8 +61,8 @@ Description
 #ifndef Foam_contiguous_H
 #define Foam_contiguous_H
 
-#include "scalarFwd.H"
 #include "labelFwd.H"
+#include "scalarFwd.H"
 #include <type_traits>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,26 +74,17 @@ namespace Foam
 
 // Base definition for (integral | floating-point) as contiguous
 template<class T>
-struct is_contiguous
-:
-    std::is_arithmetic<T>
-{};
+struct is_contiguous : std::is_arithmetic<T> {};
 
 
 // Base definition for 'label'
 template<class T>
-struct is_contiguous_label
-:
-    std::is_same<T, label>
-{};
+struct is_contiguous_label : std::is_same<T, label> {};
 
 
 // Base definition for 'scalar'
 template<class T>
-struct is_contiguous_scalar
-:
-    std::is_same<T, scalar>
-{};
+struct is_contiguous_scalar : std::is_same<T, scalar> {};
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/traits/one.H b/src/OpenFOAM/primitives/traits/one.H
index 966f86ceb1..eedd533011 100644
--- a/src/OpenFOAM/primitives/traits/one.H
+++ b/src/OpenFOAM/primitives/traits/one.H
@@ -51,7 +51,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class one;
 class Istream;
 class Ostream;
 
@@ -63,11 +62,11 @@ class one
 {
 public:
 
+    //- The value type
     typedef one value_type;
 
     // Forward Declarations
     class minus;
-    class null;
 
     //- Default construct
     constexpr one() noexcept {}
@@ -113,6 +112,7 @@ class one::minus
 {
 public:
 
+    //- The value type
     typedef minus value_type;
 
     //- Default construct
@@ -148,27 +148,6 @@ public:
 };
 
 
-/*---------------------------------------------------------------------------*\
-                          Class one::null Declaration
-\*---------------------------------------------------------------------------*/
-
-//- A Foam::one class with a null output adapter.
-class one::null
-:
-    public one
-{
-public:
-
-    typedef null value_type;
-
-    //- Default construct
-    constexpr null() noexcept {}
-
-    //- Construct from Istream consumes no content.
-    explicit constexpr null(Istream&) noexcept {}
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Global one (1)
@@ -188,12 +167,6 @@ inline constexpr Istream& operator>>(Istream& is, one::minus&) noexcept
     return is;
 }
 
-//- Write to Ostream emits no content.
-inline constexpr Ostream& operator<<(Ostream& os, const one::null&) noexcept
-{
-    return os;
-}
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/traits/pTraits.H b/src/OpenFOAM/primitives/traits/pTraits.H
index f49db8c1f1..d8e219647f 100644
--- a/src/OpenFOAM/primitives/traits/pTraits.H
+++ b/src/OpenFOAM/primitives/traits/pTraits.H
@@ -46,6 +46,7 @@ namespace Foam
 
 // Forward Declarations
 class Istream;
+class Ostream;
 
 /*---------------------------------------------------------------------------*\
                            Class pTraits Declaration
@@ -76,6 +77,14 @@ public:
 };
 
 
+/*---------------------------------------------------------------------------*\
+                          Class zero_one Declaration
+\*---------------------------------------------------------------------------*/
+
+//- Represents 0/1 range or concept. Used for tagged dispatch or clamping
+class zero_one {};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/traits/zero.H b/src/OpenFOAM/primitives/traits/zero.H
index 56681d1fc3..838aea7af9 100644
--- a/src/OpenFOAM/primitives/traits/zero.H
+++ b/src/OpenFOAM/primitives/traits/zero.H
@@ -52,8 +52,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class zero;
-class zero_one;
 class Istream;
 class Ostream;
 
@@ -65,6 +63,7 @@ class zero
 {
 public:
 
+    //- The value type
     typedef zero value_type;
 
     // Forward Declarations
@@ -133,24 +132,6 @@ public:
 };
 
 
-/*---------------------------------------------------------------------------*\
-                          Class zero_one Declaration
-\*---------------------------------------------------------------------------*/
-
-//- Represents 0/1 concept, eg for tagged dispatch
-class zero_one
-{
-public:
-    typedef zero_one value_type;
-
-    //- Default construct
-    constexpr zero_one() noexcept {}
-
-    //- Construct from Istream consumes no content.
-    explicit constexpr zero_one(Istream&) noexcept {}
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Global zero (0)
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.H b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
index e5b6dfae97..1d778a964d 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.H
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
@@ -49,7 +49,6 @@ Author
 #include "tmp.H"
 #include "autoPtr.H"
 #include "dimensionedTypes.H"
-#include "zero.H"
 #include "className.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
index 80b118a7e4..39b547745d 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H
@@ -110,7 +110,7 @@ public:
         gradcf = stabilise(gradcf, SMALL);
 
         scalar phict = 1 - 0.5*gradf/gradcf;
-        scalar limiter = clamp(phict/k_, 0, 1);
+        scalar limiter = clamp(phict/k_, zero_one{});
 
         return lerp(udWeight, cdWeight, limiter);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
index ad6e3ebe2a..1a852a2dd2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
@@ -52,10 +52,8 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class eddy;
-class Istream;
-class Ostream;
 
 bool operator==(const eddy& a, const eddy& b);
 bool operator!=(const eddy& a, const eddy& b);
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
index 1983b4fd68..d50feb2455 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
+++ b/src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H
@@ -40,7 +40,6 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
 #include "fvMatrix.H"
-#include "zero.H"
 #include "one.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index c6021a514d..9f4b4b3448 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -49,7 +49,6 @@ SourceFiles
 #include "tmp.H"
 #include "autoPtr.H"
 #include "dimensionedTypes.H"
-#include "zero.H"
 #include "className.H"
 #include "lduPrimitiveMeshAssembly.H"
 #include "lduMesh.H"
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
index 13bef2f37c..074affd714 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.H
@@ -49,7 +49,6 @@ SourceFiles
 #include "surfaceFieldsFwd.H"
 #include "primitiveFieldsFwd.H"
 #include "geometricOneField.H"
-#include "zero.H"
 #include "zeroField.H"
 #include "UPtrList.H"
 #include "HashSet.H"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
index 5996e45d4b..8babe7daaf 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
@@ -97,7 +97,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return clamp(phict/k_, 0, 1);
+        return clamp(phict/k_, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H
index 91d05ea146..12c2b8f41e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Minmod/Minmod.H
@@ -81,7 +81,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return clamp(r, 0, 1);
+        return clamp(r, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
index 2b3ef8f7da..8ad1a516ea 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
@@ -107,7 +107,7 @@ public:
             ((faceFlux - phiU)/stabilise(phiCD - phiU, SMALL) + k_);
 
         // Limit the limiter between upwind and central
-        return clamp(PLimiter, 0, 1);
+        return clamp(PLimiter, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
index 9378fd1a01..9bebf3f2fd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
@@ -141,7 +141,7 @@ public:
         }
 
         // Limit the limiter between linear and upwind
-        return clamp(limiter, 0, 1);
+        return clamp(limiter, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
index e8dcf7a6aa..000863bb4f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
@@ -143,7 +143,7 @@ public:
         }
 
         // Limit the limiter between linear and upwind
-        return clamp(limiter, 0, 1);
+        return clamp(limiter, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
index 043a0e5630..6de51de72e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
@@ -108,7 +108,7 @@ public:
         scalar limiter = 1 - k_*(dN - df)*(dP - df)/max(sqr(dN + dP), SMALL);
 
         // Limit the limiter between linear and upwind
-        return clamp(limiter, 0, 1);
+        return clamp(limiter, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
index d69562b2e5..0aa6b9c5a7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
@@ -110,7 +110,7 @@ public:
         scalar limiter = 1 - k_*(dN - df)*(dP - df)/max(sqr(dN + dP), SMALL);
 
         // Limit the limiter between linear and upwind
-        return clamp(limiter, 0, 1);
+        return clamp(limiter, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
index 159bcc695e..f9daec4d52 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
@@ -97,7 +97,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return clamp(twoByk_*r, 0, 1);
+        return clamp(twoByk_*r, zero_one{});
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index 80bd3add72..fd7f661afb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -36,7 +36,7 @@ Description
     face-based Courant number and the lower and upper Courant number limits
     supplied:
     \f[
-        weight = 1 - clamp((Co - Co1)/(Co2 - Co1), 0, 1)
+        weight = 1 - clamp((Co - Co1)/(Co2 - Co1), zero_one{})
     \f]
     where
     \vartable
diff --git a/src/functionObjects/field/extractEulerianParticles/eulerianParticle/eulerianParticle.H b/src/functionObjects/field/extractEulerianParticles/eulerianParticle/eulerianParticle.H
index cbc946a568..561262604f 100644
--- a/src/functionObjects/field/extractEulerianParticles/eulerianParticle/eulerianParticle.H
+++ b/src/functionObjects/field/extractEulerianParticles/eulerianParticle/eulerianParticle.H
@@ -49,16 +49,13 @@ SourceFiles
 
 namespace Foam
 {
-// Forward Declarations
-class Istream;
-class Ostream;
-
 namespace functionObjects
 {
+    // Forward Declarations
     class eulerianParticle;
 }
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 Istream& operator>>(Istream&, functionObjects::eulerianParticle&);
 Ostream& operator<<(Ostream&, const functionObjects::eulerianParticle&);
 
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index 4ad0ea958e..171a4eeb74 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -92,15 +92,13 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-class Istream;
-class Ostream;
+// Forward Declarations
 class objectRegistry;
 
 namespace functionObjects
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class fieldAverageItem;
 Istream& operator>>(Istream&, fieldAverageItem&);
 Ostream& operator<<(Ostream&, const fieldAverageItem&);
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index e4091007a8..44bfc81834 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -670,7 +670,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::processValues
             // Uniformity index
             const scalar ui = 1 - numer/(2*mag(mean*areaTotal) + ROOTVSMALL);
 
-            return clamp(ui, 0, 1);
+            return clamp(ui, zero_one{});
         }
 
         default:
@@ -756,7 +756,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::processValues
             // Uniformity index
             const scalar ui = 1 - numer/(2*mag(mean*areaTotal) + ROOTVSMALL);
 
-            return vector(clamp(ui, 0, 1), 0, 0);
+            return vector(clamp(ui, zero_one{}), 0, 0);
         }
 
         default:
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
index 541553c734..a09b2cc763 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
@@ -152,7 +152,7 @@ Description
     For option 6, the following relation is used:
 
     \f[
-        fCoWeight = clamp((Co - Co1)/(Co2 - Co1), 0, 1)
+        fCoWeight = clamp((Co - Co1)/(Co2 - Co1), zero_one{});
     \f]
 
     where
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 2154433865..cf55b450bc 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -147,7 +147,7 @@ void Foam::fv::solidificationMeltingSource::update(const volScalarField& Cp)
         scalar Cpc = Cp[celli];
         scalar alpha1New = alpha1_[celli] + relax_*Cpc*(Tc - Tmelt_)/L_;
 
-        alpha1_[celli] = clamp(alpha1New, 0, 1);
+        alpha1_[celli] = clamp(alpha1New, zero_one{});
         deltaT_[i] = Tc - Tmelt_;
     }
 
diff --git a/src/lagrangian/distributionModels/binned/binned.H b/src/lagrangian/distributionModels/binned/binned.H
index 20e36899ab..86a0fc13bb 100644
--- a/src/lagrangian/distributionModels/binned/binned.H
+++ b/src/lagrangian/distributionModels/binned/binned.H
@@ -95,16 +95,13 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-class Istream;
-class Ostream;
-
 namespace distributionModels
 {
+    // Forward Declarations
     class binned;
 }
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 Istream& operator>>(Istream&, distributionModels::binned&);
 Ostream& operator<<(Ostream&, const distributionModels::binned&);
 
diff --git a/src/lagrangian/distributionModels/general/general.H b/src/lagrangian/distributionModels/general/general.H
index e3f41e8b16..66e9e20d9e 100644
--- a/src/lagrangian/distributionModels/general/general.H
+++ b/src/lagrangian/distributionModels/general/general.H
@@ -106,17 +106,13 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of classes
-class Istream;
-class Ostream;
-
 namespace distributionModels
 {
+    // Forward Declarations
     class general;
 }
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 Istream& operator>>(Istream&, distributionModels::general&);
 Ostream& operator<<(Ostream&, const distributionModels::general&);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
index 5d4502bade..767d0bde65 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
@@ -84,7 +84,7 @@ Foam::forceSuSp Foam::DistortedSphereDragForce<CloudType>::calcCoupled
 ) const
 {
     // Limit the drop distortion to y=0 (sphere) and y=1 (disk)
-    const scalar y = clamp(p.y(), 0, 1);
+    const scalar y = clamp(p.y(), zero_one{});
 
     // (LMR:Eq. 10)
     return
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
index 8c3809b23e..df462de0dc 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
@@ -361,7 +361,7 @@ Foam::scalar Foam::SprayParcel<ParcelType>::chi
         }
     }
 
-    return clamp(chi, 0, 1);
+    return clamp(chi, zero_one{});
 }
 
 
diff --git a/src/lumpedPointMotion/movement/lumpedPointMovement.C b/src/lumpedPointMotion/movement/lumpedPointMovement.C
index 7f12b91abb..437397fd48 100644
--- a/src/lumpedPointMotion/movement/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/movement/lumpedPointMovement.C
@@ -257,7 +257,7 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
     }
 
     relax_ = dict.getOrDefault<scalar>("relax", 1);
-    relax_ = clamp(relax_, 0, 1);
+    relax_ = clamp(relax_, zero_one{});
 
     forcesDict_.merge(dict.subOrEmptyDict("forces"));
 
diff --git a/src/lumpedPointMotion/state/lumpedPointState.H b/src/lumpedPointMotion/state/lumpedPointState.H
index 68dbe37782..09b247fe6f 100644
--- a/src/lumpedPointMotion/state/lumpedPointState.H
+++ b/src/lumpedPointMotion/state/lumpedPointState.H
@@ -77,10 +77,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class Istream;
-class Ostream;
-
 /*---------------------------------------------------------------------------*\
                       Class lumpedPointState Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.H b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.H
index 6199468102..90f1aac352 100644
--- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.H
+++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptor.H
@@ -58,8 +58,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 class gradingDescriptor;
 class gradingDescriptors;
 
diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.H b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.H
index dbc8810a93..a9020031ab 100644
--- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.H
+++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.H
@@ -48,7 +48,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
 class gradingDescriptors;
 Istream& operator>>(Istream& is, gradingDescriptors& gd);
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/PointIntegrateData/PointIntegrateData.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/PointIntegrateData/PointIntegrateData.H
index afbccd3b24..89e1988041 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/PointIntegrateData/PointIntegrateData.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/PointIntegrateData/PointIntegrateData.H
@@ -37,14 +37,14 @@ SourceFiles
 #ifndef PointIntegrateData_H
 #define PointIntegrateData_H
 
+#include "UList.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 template<class DataType> class PointIntegrateData;
 
 template<class DataType>
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H
index 4ea497b8f9..7ba9b4add5 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H
@@ -38,11 +38,10 @@ SourceFiles
 #ifndef patchEdgeFaceInfo_H
 #define patchEdgeFaceInfo_H
 
-#include "point.H"
 #include "label.H"
 #include "scalar.H"
+#include "point.H"
 #include "tensor.H"
-#include "pTraits.H"
 #include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointData.H b/src/meshTools/algorithms/PointEdgeWave/PointData.H
index cc4a3d715f..9f27a1f7e1 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointData.H
+++ b/src/meshTools/algorithms/PointEdgeWave/PointData.H
@@ -48,8 +48,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 template<class DataType> class PointData;
 
 template<class DataType>
diff --git a/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H b/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H
index 230a228a2e..9a267c6ddb 100644
--- a/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H
@@ -41,11 +41,10 @@ SourceFiles
 #ifndef Foam_pointEdgePoint_H
 #define Foam_pointEdgePoint_H
 
-#include "point.H"
 #include "label.H"
 #include "scalar.H"
+#include "point.H"
 #include "tensor.H"
-#include "pTraits.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/edgeMesh/edgeMeshTools/edgeMeshTools.H b/src/meshTools/edgeMesh/edgeMeshTools/edgeMeshTools.H
index 04d9e1a127..237b084f43 100644
--- a/src/meshTools/edgeMesh/edgeMeshTools/edgeMeshTools.H
+++ b/src/meshTools/edgeMesh/edgeMeshTools/edgeMeshTools.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef edgeMeshTools_H
-#define edgeMeshTools_H
+#ifndef Foam_edgeMeshTools_H
+#define Foam_edgeMeshTools_H
 
 #include "tmp.H"
 #include "scalarField.H"
@@ -46,12 +46,12 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class edgeMesh;
 class extendedEdgeMesh;
 class extendedFeatureEdgeMesh;
 class triSurface;
 class Time;
-class Ostream;
 
 /*---------------------------------------------------------------------------*\
                       Namespace edgeMeshTools Declaration
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
index df41e3555b..9bdd167d89 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
@@ -614,7 +614,7 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
             scalar dmdt21 = dmdtNet[celli];
             scalar coeffs12Cell = coeffs12[celli];
 
-            scalar alpha1Limited = clamp(alpha1[celli], 0, 1);
+            scalar alpha1Limited = clamp(alpha1[celli], zero_one{});
 
             // exp.
             SuPhase1[celli] += coeffs1[celli]*dmdt21;
@@ -657,7 +657,7 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
             scalar dmdt12 = -dmdtNet[celli];
             scalar coeffs21Cell = -coeffs12[celli];
 
-            scalar alpha2Limited = clamp(alpha2[celli], 0, 1);
+            scalar alpha2Limited = clamp(alpha2[celli], zero_one{});
 
             // exp
             SuPhase2[celli] += coeffs2[celli]*dmdt12;
diff --git a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
index 7c119b4b85..010f0f39ad 100644
--- a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
+++ b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertia.H
@@ -57,15 +57,10 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of classes
-class Istream;
-class Ostream;
-
 namespace RBD
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class rigidBodyInertia;
 Istream& operator>>(Istream&, rigidBodyInertia&);
 Ostream& operator<<(Ostream&, const rigidBodyInertia&);
diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
index 876ab85dfe..eb0b66f737 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelState.H
@@ -47,15 +47,10 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of classes
-class Istream;
-class Ostream;
-
 namespace RBD
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 class rigidBodyModelState;
 Istream& operator>>(Istream&, rigidBodyModelState&);
 Ostream& operator<<(Ostream&, const rigidBodyModelState&);
diff --git a/src/sampling/surface/isoSurface/isoSurfaceParams.H b/src/sampling/surface/isoSurface/isoSurfaceParams.H
index df16e68a07..e371cd1f48 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceParams.H
+++ b/src/sampling/surface/isoSurface/isoSurfaceParams.H
@@ -56,8 +56,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef isoSurfaceParams_H
-#define isoSurfaceParams_H
+#ifndef Foam_isoSurfaceParams_H
+#define Foam_isoSurfaceParams_H
 
 #include "boundBox.H"
 #include "Enum.H"
@@ -69,7 +69,6 @@ namespace Foam
 
 // Forward Declarations
 class dictionary;
-class Ostream;
 
 /*---------------------------------------------------------------------------*\
                      Class isoSurfaceSelector Declaration
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index ee455f158a..3ccf20ba72 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -233,7 +233,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
         g_ = g.value();
     }
 
-    // scalar ramp = clamp((t.value() - 5)/10, 0, 1);
+    // scalar ramp = clamp((t.value() - 5)/10, zero_one{});
     scalar ramp = 1.0;
 
     motion_.update
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H
index 2194c43ec1..8889ed91cd 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H
@@ -54,8 +54,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Istream;
-class Ostream;
 class sixDoFRigidBodyMotionState;
 Istream& operator>>(Istream&, sixDoFRigidBodyMotionState&);
 Ostream& operator<<(Ostream&, const sixDoFRigidBodyMotionState&);
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 77f7da7c8f..87c7181ee6 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -76,8 +76,6 @@ namespace Foam
 class Time;
 class surfMesh;
 class polyBoundaryMesh;
-class Istream;
-class Ostream;
 
 template<class Face> class MeshedSurface;
 template<class Face> class MeshedSurfaceProxy;
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 7834a4fb4f..951921cfaa 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -64,8 +64,6 @@ namespace Foam
 
 // Forward Declarations
 class Time;
-class Istream;
-class Ostream;
 
 template<class Face> class MeshedSurface;
 template<class Face> class MeshedSurfaceProxy;
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
index c4168f0969..9db52d9592 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
@@ -89,7 +89,7 @@ Foam::scalar Foam::waveMakerPointPatchVectorField::timeCoeff
     const scalar t
 ) const
 {
-    return clamp(t/rampTime_, 0, 1);
+    return clamp(t/rampTime_, zero_one{});
 }
 
 
diff --git a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
index aac185602f..bfff32aef2 100644
--- a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
+++ b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
@@ -46,7 +46,7 @@ Foam::scalar Foam::waveModels::irregularWaveModel::timeCoeff
     const scalar t
 ) const
 {
-    return clamp(t/rampTime_, 0, 1);
+    return clamp(t/rampTime_, zero_one{});
 }
 
 

From e623e6a865d55e0dc481bc07bff81321cf162b1c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Feb 2023 18:25:33 +0100
Subject: [PATCH 106/348] STYLE: favour include word.H instead of string.H

- in many places the string.H include is redundant anyhow.
  May wish to change to foamString.H (or equiv) in the future
---
 applications/test/cplusplus1/Test-cpluplus1.C |  1 -
 applications/test/delete/Test-delete.C        |  2 +-
 applications/test/limits/Test-limits.C        |  2 +-
 applications/test/sizeof/Test-sizeof.C        |  1 -
 applications/test/string/Test-string.C        | 11 ++---
 applications/test/string2/Test-string2.C      | 12 ++---
 .../preProcessing/PDR/pdrFields/PDRpatchDef.H |  2 +-
 .../foamUpgradeCyclics/foamUpgradeCyclics.C   |  1 -
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  2 +-
 .../expressions/exprString/exprString.H       |  2 +-
 .../global/profiling/profilingInformation.H   | 46 +++++--------------
 .../global/profiling/profilingTrigger.H       |  2 +-
 .../ranges/scalarRange/scalarRange.C          |  2 +-
 .../primitives/strings/lists/stringList.H     |  6 +--
 .../primitives/strings/lists/wordList.H       |  4 +-
 .../strings/parsing/genericRagelLemonDriver.C |  2 +-
 .../primitives/strings/stringOps/stringOps.H  |  3 +-
 .../strings/stringOps/stringOpsEvaluate.H     |  4 +-
 src/fileFormats/gltf/foamGltfAccessor.H       |  2 +-
 .../vtk/output/foamVtkOutputOptions.H         |  2 +-
 src/meshTools/graph/curve.H                   |  5 +-
 src/meshTools/graph/graph.H                   |  2 -
 22 files changed, 42 insertions(+), 74 deletions(-)

diff --git a/applications/test/cplusplus1/Test-cpluplus1.C b/applications/test/cplusplus1/Test-cpluplus1.C
index 8b86ee33c8..a56c88a4ec 100644
--- a/applications/test/cplusplus1/Test-cpluplus1.C
+++ b/applications/test/cplusplus1/Test-cpluplus1.C
@@ -28,7 +28,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
 #include "macros.H"
 #include "IOstreams.H"
 #include "List.H"
diff --git a/applications/test/delete/Test-delete.C b/applications/test/delete/Test-delete.C
index 617a007b3f..8c50662407 100644
--- a/applications/test/delete/Test-delete.C
+++ b/applications/test/delete/Test-delete.C
@@ -29,7 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
+#include "word.H"
 #include "IOstreams.H"
 
 using namespace Foam;
diff --git a/applications/test/limits/Test-limits.C b/applications/test/limits/Test-limits.C
index 8e902b1bfc..5d0b64ece4 100644
--- a/applications/test/limits/Test-limits.C
+++ b/applications/test/limits/Test-limits.C
@@ -32,8 +32,8 @@ Description
 #include <limits>
 #include "int.H"
 #include "uint.H"
-#include "string.H"
 #include "scalar.H"
+#include "word.H"
 #include "IOstreams.H"
 
 using namespace Foam;
diff --git a/applications/test/sizeof/Test-sizeof.C b/applications/test/sizeof/Test-sizeof.C
index 13f0aac07a..b6235e2213 100644
--- a/applications/test/sizeof/Test-sizeof.C
+++ b/applications/test/sizeof/Test-sizeof.C
@@ -31,7 +31,6 @@ Description
 
 #include "bool.H"
 #include "Switch.H"
-#include "string.H"
 #include "dictionary.H"
 #include "zero.H"
 #include "IOstreams.H"
diff --git a/applications/test/string/Test-string.C b/applications/test/string/Test-string.C
index 11648ba523..587eb2e314 100644
--- a/applications/test/string/Test-string.C
+++ b/applications/test/string/Test-string.C
@@ -29,12 +29,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
-#include "stringOps.H"
-#include "dictionary.H"
-#include "IOstreams.H"
-#include "OSspecific.H"
-
+#include "fieldExprFwd.H"
 #include "int.H"
 #include "uint.H"
 #include "scalar.H"
@@ -42,6 +37,10 @@ Description
 #include "fileName.H"
 #include "stringList.H"
 #include "stringOps.H"
+#include "dictionary.H"
+#include "IOstreams.H"
+#include "OSspecific.H"
+
 
 using namespace Foam;
 
diff --git a/applications/test/string2/Test-string2.C b/applications/test/string2/Test-string2.C
index 9186bda26f..210b0ce5d4 100644
--- a/applications/test/string2/Test-string2.C
+++ b/applications/test/string2/Test-string2.C
@@ -28,12 +28,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
-#include "stringOps.H"
-#include "dictionary.H"
-#include "IOstreams.H"
-#include "OSspecific.H"
-
+#include "fieldExprFwd.H"
 #include "int.H"
 #include "uint.H"
 #include "scalar.H"
@@ -41,7 +36,10 @@ Description
 #include "fileName.H"
 #include "stringList.H"
 #include "stringOps.H"
-#include "fieldExprFwd.H"
+#include "dictionary.H"
+#include "IOstreams.H"
+#include "OSspecific.H"
+
 
 using namespace Foam;
 
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRpatchDef.H b/applications/utilities/preProcessing/PDR/pdrFields/PDRpatchDef.H
index 076786cd18..2a18487b03 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRpatchDef.H
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRpatchDef.H
@@ -38,7 +38,7 @@ SourceFiles
 #ifndef PDRpatchDef_H
 #define PDRpatchDef_H
 
-#include "string.H"
+#include "word.H"
 #include "scalar.H"
 #include "Enum.H"
 
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index 329bc82de4..f4fd3589a3 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -58,7 +58,6 @@ Usage
 #include "volFields.H"
 #include "pointFields.H"
 #include "surfaceFields.H"
-#include "string.H"
 
 using namespace Foam;
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index a51d68d33d..14ec039aa1 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -40,10 +40,10 @@ SourceFiles
 #ifndef Foam_UPstream_H
 #define Foam_UPstream_H
 
+#include "wordList.H"
 #include "labelList.H"
 #include "DynamicList.H"
 #include "HashTable.H"
-#include "string.H"
 #include "Enum.H"
 #include "ListOps.H"
 
diff --git a/src/OpenFOAM/expressions/exprString/exprString.H b/src/OpenFOAM/expressions/exprString/exprString.H
index 49957be0e2..34e114dbb2 100644
--- a/src/OpenFOAM/expressions/exprString/exprString.H
+++ b/src/OpenFOAM/expressions/exprString/exprString.H
@@ -43,7 +43,7 @@ SeeAlso
 #ifndef Foam_expressions_exprString_H
 #define Foam_expressions_exprString_H
 
-#include "string.H"
+#include "word.H"
 #include "dictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/profiling/profilingInformation.H b/src/OpenFOAM/global/profiling/profilingInformation.H
index 578e5fb1d0..deab20270d 100644
--- a/src/OpenFOAM/global/profiling/profilingInformation.H
+++ b/src/OpenFOAM/global/profiling/profilingInformation.H
@@ -38,9 +38,9 @@ SourceFiles
 #ifndef Foam_profilingInformation_H
 #define Foam_profilingInformation_H
 
-#include "label.H"
-#include "scalar.H"
-#include "string.H"
+#include "labelFwd.H"
+#include "scalarFwd.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -130,45 +130,21 @@ public:
 
     // Access
 
-        label id() const
-        {
-            return id_;
-        }
+        label id() const noexcept { return id_; }
 
-        const string& description() const
-        {
-            return description_;
-        }
+        const string& description() const noexcept { return description_; }
 
-        profilingInformation& parent() const
-        {
-            return *parent_;
-        }
+        profilingInformation& parent() const noexcept { return *parent_; }
 
-        label calls() const
-        {
-            return calls_;
-        }
+        label calls() const noexcept { return calls_; }
 
-        scalar totalTime() const
-        {
-            return totalTime_;
-        }
+        scalar totalTime() const noexcept { return totalTime_; }
 
-        scalar childTime() const
-        {
-            return childTime_;
-        }
+        scalar childTime() const noexcept { return childTime_; }
 
-        int maxMem() const
-        {
-            return maxMem_;
-        }
+        int maxMem() const noexcept { return maxMem_; }
 
-        bool active() const
-        {
-            return active_;
-        }
+        bool active() const noexcept { return active_; }
 
 
     // Edit
diff --git a/src/OpenFOAM/global/profiling/profilingTrigger.H b/src/OpenFOAM/global/profiling/profilingTrigger.H
index 236122d29b..639c6eac70 100644
--- a/src/OpenFOAM/global/profiling/profilingTrigger.H
+++ b/src/OpenFOAM/global/profiling/profilingTrigger.H
@@ -38,7 +38,7 @@ SourceFiles
 #ifndef Foam_profilingTrigger_H
 #define Foam_profilingTrigger_H
 
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C
index 07cd44a800..4ae5af193a 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C
@@ -26,10 +26,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "scalarRange.H"
-#include "string.H"
 #include "Switch.H"
 #include "MinMax.H"
 #include "error.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/strings/lists/stringList.H b/src/OpenFOAM/primitives/strings/lists/stringList.H
index c434f97bbf..0e7f3615c2 100644
--- a/src/OpenFOAM/primitives/strings/lists/stringList.H
+++ b/src/OpenFOAM/primitives/strings/lists/stringList.H
@@ -43,10 +43,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringList_H
-#define stringList_H
+#ifndef Foam_stringList_H
+#define Foam_stringList_H
 
-#include "string.H"
+#include "word.H"
 #include "List.H"
 #include "SubList.H"
 
diff --git a/src/OpenFOAM/primitives/strings/lists/wordList.H b/src/OpenFOAM/primitives/strings/lists/wordList.H
index 739ea57578..747260e55a 100644
--- a/src/OpenFOAM/primitives/strings/lists/wordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/wordList.H
@@ -43,8 +43,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wordList_H
-#define wordList_H
+#ifndef Foam_wordList_H
+#define Foam_wordList_H
 
 #include "word.H"
 #include "List.H"
diff --git a/src/OpenFOAM/primitives/strings/parsing/genericRagelLemonDriver.C b/src/OpenFOAM/primitives/strings/parsing/genericRagelLemonDriver.C
index fb858e0bc5..bf085bb8b8 100644
--- a/src/OpenFOAM/primitives/strings/parsing/genericRagelLemonDriver.C
+++ b/src/OpenFOAM/primitives/strings/parsing/genericRagelLemonDriver.C
@@ -26,8 +26,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "genericRagelLemonDriver.H"
-#include "string.H"
 #include "error.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
index 14f9c743ce..28fb6fb4d2 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
@@ -40,13 +40,12 @@ SourceFiles
 #define Foam_stringOps_H
 
 #include "scalar.H"
-#include "string.H"
 #include "SubStrings.H"
-#include "word.H"
 #include "dictionary.H"
 #include "HashTable.H"
 #include "stringOpsSort.H"
 #include "stringOpsEvaluate.H"
+#include "word.H"
 #include "wordRes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOpsEvaluate.H b/src/OpenFOAM/primitives/strings/stringOps/stringOpsEvaluate.H
index 2f87bae83a..b167767af6 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOpsEvaluate.H
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOpsEvaluate.H
@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringOpsEvaluate_H
-#define stringOpsEvaluate_H
+#ifndef Foam_stringOpsEvaluate_H
+#define Foam_stringOpsEvaluate_H
 
 #include "labelFwd.H"
 #include "string.H"
diff --git a/src/fileFormats/gltf/foamGltfAccessor.H b/src/fileFormats/gltf/foamGltfAccessor.H
index 76244c4586..66dbcf309c 100644
--- a/src/fileFormats/gltf/foamGltfAccessor.H
+++ b/src/fileFormats/gltf/foamGltfAccessor.H
@@ -44,7 +44,7 @@ SourceFiles
 #include "foamGltfBase.H"
 #include "Field.H"
 #include "label.H"
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/fileFormats/vtk/output/foamVtkOutputOptions.H b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
index 3fcc23d6eb..e9943c389a 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputOptions.H
+++ b/src/fileFormats/vtk/output/foamVtkOutputOptions.H
@@ -44,7 +44,7 @@ SourceFiles
 #define Foam_vtk_outputOptions_H
 
 #include "foamVtkOutput.H"
-#include "string.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/graph/curve.H b/src/meshTools/graph/curve.H
index 6d8940a24b..d50f01a42f 100644
--- a/src/meshTools/graph/curve.H
+++ b/src/meshTools/graph/curve.H
@@ -37,9 +37,10 @@ SourceFiles
 #ifndef Foam_curve_H
 #define Foam_curve_H
 
-#include "string.H"
-#include "primitiveFields.H"
 #include "autoPtr.H"
+#include "point.H"
+#include "primitiveFields.H"
+#include "word.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/graph/graph.H b/src/meshTools/graph/graph.H
index 839fbe1923..95f1e9addb 100644
--- a/src/meshTools/graph/graph.H
+++ b/src/meshTools/graph/graph.H
@@ -38,8 +38,6 @@ SourceFiles
 #ifndef Foam_graph_H
 #define Foam_graph_H
 
-#include "string.H"
-#include "point.H"
 #include "curve.H"
 #include "HashPtrTable.H"
 

From d51aa5a74d3ed66c8b54cd49170722ee8a166a8e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 23 Feb 2023 18:58:25 +0100
Subject: [PATCH 107/348] STYLE: merge EdgeMap definition into edgeHashes.H

STYLE: combine some list typedefs, add documentation comments

GIT: relocate some compat includes
---
 src/OpenFOAM/compat/EdgeMap.H                 | 10 +++
 .../{primitives => }/compat/HashFwd.H         |  0
 src/OpenFOAM/{primitives => }/compat/Swap.H   |  0
 .../{primitives => }/compat/doubleTensor.H    |  0
 .../{primitives => }/compat/doubleVector.H    |  0
 .../{primitives => }/compat/floatTensor.H     |  0
 .../{primitives => }/compat/floatVector.H     |  0
 src/OpenFOAM/{primitives => }/compat/nil.H    |  0
 src/OpenFOAM/compat/wordReList.H              | 10 +++
 .../compat/wordReListMatcher.H                |  0
 .../IndirectList/UIndirectList.H              |  4 +-
 src/OpenFOAM/db/IOstreams/token/tokenList.H   | 12 +---
 .../fields/Fields/boolField/boolIOField.H     | 11 +--
 .../diagTensorField/diagTensorFieldIOField.H  | 13 ++--
 .../diagTensorField/diagTensorIOField.H       | 11 +--
 .../Fields/labelField/labelFieldIOField.H     | 13 ++--
 .../fields/Fields/labelField/labelIOField.H   | 11 +--
 .../quaternionField/quaternionIOField.H       | 11 +--
 .../Fields/scalarField/scalarFieldIOField.H   | 13 ++--
 .../fields/Fields/scalarField/scalarIOField.H | 11 +--
 .../sphericalTensorFieldIOField.H             | 12 ++--
 .../sphericalTensorIOField.H                  | 11 +--
 .../symmTensorField/symmTensorFieldIOField.H  | 13 ++--
 .../symmTensorField/symmTensorIOField.H       | 11 +--
 .../Fields/tensorField/tensorFieldIOField.H   | 13 ++--
 .../fields/Fields/tensorField/tensorIOField.H | 11 +--
 .../fields/Fields/triadField/triadIOField.H   | 11 +--
 .../vector2DField/vector2DFieldIOField.H      | 13 ++--
 .../Fields/vector2DField/vector2DIOField.H    | 11 +--
 .../Fields/vectorField/vectorFieldIOField.H   | 13 ++--
 .../fields/Fields/vectorField/vectorIOField.H | 11 +--
 .../surface/geometricSurfacePatchList.H       | 21 ++----
 .../surface/surfZoneIdentifierList.H          | 21 ++----
 .../meshes/meshShapes/cell/cellIOList.H       | 13 ++--
 .../meshes/meshShapes/cell/cellIndList.H      | 15 +---
 .../meshes/meshShapes/cell/cellList.H         | 30 +-------
 .../meshes/meshShapes/cell/cellListFwd.H      | 13 ++--
 .../meshShapes/cellShape/cellShapeIOList.H    |  7 +-
 .../meshShapes/cellShape/cellShapeList.H      |  9 +--
 src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H | 72 -------------------
 .../meshes/meshShapes/edge/edgeHashes.H       | 53 ++++++++++----
 .../meshes/meshShapes/edge/edgeIOList.H       | 13 ++--
 .../meshes/meshShapes/edge/edgeIndList.H      | 15 +---
 .../meshes/meshShapes/edge/edgeList.H         | 38 +++-------
 .../meshes/meshShapes/face/faceIOList.H       | 13 ++--
 .../meshes/meshShapes/face/faceIndList.H      | 15 +---
 .../meshes/meshShapes/face/faceList.H         | 30 +-------
 .../meshes/meshShapes/face/faceListFwd.H      | 13 ++--
 .../meshes/meshShapes/tetCell/tetCellList.H   | 12 +---
 .../meshes/meshShapes/triFace/triFaceList.H   | 12 +---
 .../objectHit/pointIndexHitIOList.H           |  7 +-
 .../primitiveShapes/point/pointIndList.H      | 15 +---
 .../meshes/primitiveShapes/point/pointList.H  | 36 ++--------
 .../primitives/Scalar/lists/scalarIOList.H    | 11 +--
 .../primitives/Scalar/lists/scalarIndList.H   | 15 +---
 .../primitives/Scalar/lists/scalarList.H      | 36 ++--------
 .../Scalar/lists/scalarListIOList.H           | 13 ++--
 .../Tensor/lists/sphericalTensorList.H        | 22 ++----
 .../primitives/Tensor/lists/symmTensorList.H  | 21 ++----
 .../primitives/Tensor/lists/tensorList.H      | 21 ++----
 .../primitives/Vector/lists/vectorIOList.H    | 11 +--
 .../primitives/Vector/lists/vectorIndList.H   | 15 +---
 .../primitives/Vector/lists/vectorList.H      | 36 ++--------
 .../Vector/lists/vectorListIOList.H           | 13 ++--
 .../primitives/bools/lists/boolList.H         | 13 ++--
 .../primitives/chars/lists/charList.H         | 13 ++--
 .../primitives/ints/lists/labelIOList.H       |  7 +-
 .../primitives/ints/lists/labelIndList.H      | 16 +----
 .../primitives/ints/lists/labelList.H         | 17 ++---
 .../primitives/ints/lists/labelListIOList.H   |  9 +--
 .../primitives/strings/lists/fileNameList.H   | 28 ++------
 .../primitives/strings/lists/stringList.H     | 24 +------
 .../primitives/strings/lists/wordList.H       | 24 +------
 .../primitives/strings/lists/wordReList.H     | 58 ---------------
 .../primitives/strings/string/stringIOList.H  | 13 ++--
 .../primitives/strings/word/wordIOList.H      | 13 ++--
 .../primitives/strings/wordRes/wordRes.H      | 10 ++-
 src/OpenFOAM/primitives/tuples/labelPair.H    | 38 ++--------
 src/OpenFOAM/primitives/tuples/wordPair.H     | 37 ++--------
 .../polyMeshAdder/faceCoupleInfo.H            | 11 ++-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C |  5 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.H |  6 +-
 .../multiWorld/multiWorldConnectionsObject.H  |  2 +-
 src/surfMesh/surfZone/surfZoneList.H          | 19 ++---
 .../triSurface/patches/surfacePatchList.H     | 20 ++----
 85 files changed, 342 insertions(+), 988 deletions(-)
 create mode 100644 src/OpenFOAM/compat/EdgeMap.H
 rename src/OpenFOAM/{primitives => }/compat/HashFwd.H (100%)
 rename src/OpenFOAM/{primitives => }/compat/Swap.H (100%)
 rename src/OpenFOAM/{primitives => }/compat/doubleTensor.H (100%)
 rename src/OpenFOAM/{primitives => }/compat/doubleVector.H (100%)
 rename src/OpenFOAM/{primitives => }/compat/floatTensor.H (100%)
 rename src/OpenFOAM/{primitives => }/compat/floatVector.H (100%)
 rename src/OpenFOAM/{primitives => }/compat/nil.H (100%)
 create mode 100644 src/OpenFOAM/compat/wordReList.H
 rename src/OpenFOAM/{primitives => }/compat/wordReListMatcher.H (100%)
 delete mode 100644 src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
 delete mode 100644 src/OpenFOAM/primitives/strings/lists/wordReList.H

diff --git a/src/OpenFOAM/compat/EdgeMap.H b/src/OpenFOAM/compat/EdgeMap.H
new file mode 100644
index 0000000000..ef85e20fda
--- /dev/null
+++ b/src/OpenFOAM/compat/EdgeMap.H
@@ -0,0 +1,10 @@
+// Compatibility include. Contents merged with edgeHashes.H (FEB-2023)
+
+#ifndef FoamCompat_EdgeMap_H
+#define FoamCompat_EdgeMap_H
+
+#include "edgeHashes.H"
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/compat/HashFwd.H b/src/OpenFOAM/compat/HashFwd.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/HashFwd.H
rename to src/OpenFOAM/compat/HashFwd.H
diff --git a/src/OpenFOAM/primitives/compat/Swap.H b/src/OpenFOAM/compat/Swap.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/Swap.H
rename to src/OpenFOAM/compat/Swap.H
diff --git a/src/OpenFOAM/primitives/compat/doubleTensor.H b/src/OpenFOAM/compat/doubleTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/doubleTensor.H
rename to src/OpenFOAM/compat/doubleTensor.H
diff --git a/src/OpenFOAM/primitives/compat/doubleVector.H b/src/OpenFOAM/compat/doubleVector.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/doubleVector.H
rename to src/OpenFOAM/compat/doubleVector.H
diff --git a/src/OpenFOAM/primitives/compat/floatTensor.H b/src/OpenFOAM/compat/floatTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/floatTensor.H
rename to src/OpenFOAM/compat/floatTensor.H
diff --git a/src/OpenFOAM/primitives/compat/floatVector.H b/src/OpenFOAM/compat/floatVector.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/floatVector.H
rename to src/OpenFOAM/compat/floatVector.H
diff --git a/src/OpenFOAM/primitives/compat/nil.H b/src/OpenFOAM/compat/nil.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/nil.H
rename to src/OpenFOAM/compat/nil.H
diff --git a/src/OpenFOAM/compat/wordReList.H b/src/OpenFOAM/compat/wordReList.H
new file mode 100644
index 0000000000..df8f6c8690
--- /dev/null
+++ b/src/OpenFOAM/compat/wordReList.H
@@ -0,0 +1,10 @@
+// Compatibility include. For v2012 and earlier.
+
+#ifndef FoamCompat_wordReList_H
+#define FoamCompat_wordReList_H
+
+#include "wordRes.H"
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/compat/wordReListMatcher.H b/src/OpenFOAM/compat/wordReListMatcher.H
similarity index 100%
rename from src/OpenFOAM/primitives/compat/wordReListMatcher.H
rename to src/OpenFOAM/compat/wordReListMatcher.H
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H
index 33e286f573..3352a47e9a 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H
@@ -6,8 +6,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_UIndirectList_H
-#define Foam_UIndirectList_H
+#ifndef FoamCompat_UIndirectList_H
+#define FoamCompat_UIndirectList_H
 
 #include "IndirectList.H"
 
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenList.H b/src/OpenFOAM/db/IOstreams/token/tokenList.H
index 2566c91bfa..75d6083ba0 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenList.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::tokenList
-
-Description
-    List of tokens, used for a IOdictionary entry.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef tokenList_H
-#define tokenList_H
+#ifndef Foam_tokenList_H
+#define Foam_tokenList_H
 
 #include "token.H"
 #include "List.H"
@@ -41,8 +35,8 @@ Description
 
 namespace Foam
 {
+    //! List of token, used for dictionary primitive entry (for example)
     typedef List<token> tokenList;
-    typedef List<token::tokenType> tokenTypeList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/boolField/boolIOField.H b/src/OpenFOAM/fields/Fields/boolField/boolIOField.H
index a2d139560a..10eeb6719a 100644
--- a/src/OpenFOAM/fields/Fields/boolField/boolIOField.H
+++ b/src/OpenFOAM/fields/Fields/boolField/boolIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::boolIOField
-
-Description
-    A boolField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef boolIOField_H
-#define boolIOField_H
+#ifndef Foam_boolIOField_H
+#define Foam_boolIOField_H
 
 #include "boolField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of bool
     typedef IOField<bool> boolIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H
index 896bac8ab7..f157893377 100644
--- a/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::diagTensorFieldIOField
-
-Description
-    diagTensorFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef diagTensorFieldIOField_H
-#define diagTensorFieldIOField_H
+#ifndef Foam_diagTensorFieldIOField_H
+#define Foam_diagTensorFieldIOField_H
 
 #include "diagTensorField.H"
 #include "CompactIOField.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of diagTensorField
     typedef IOField<diagTensorField> diagTensorFieldIOField;
+
+    //! Compact IO for a Field of diagTensorField
     typedef CompactIOField<diagTensorField, diagTensor>
     diagTensorFieldCompactIOField;
 }
diff --git a/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorIOField.H b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorIOField.H
index 54efa8bcfd..b5dc691ce2 100644
--- a/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorIOField.H
+++ b/src/OpenFOAM/fields/Fields/diagTensorField/diagTensorIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::diagTensorIOField
-
-Description
-    diagTensorField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef diagTensorIOField_H
-#define diagTensorIOField_H
+#ifndef Foam_diagTensorIOField_H
+#define Foam_diagTensorIOField_H
 
 #include "diagTensorField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of diagTensor
     typedef IOField<diagTensor> diagTensorIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
index f556cd4fbf..a5263751a0 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelFieldIOField
-
-Description
-    labelFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef labelFieldIOField_H
-#define labelFieldIOField_H
+#ifndef Foam_labelFieldIOField_H
+#define Foam_labelFieldIOField_H
 
 #include "labelField.H"
 #include "IOField.H"
@@ -42,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of labelField
     typedef IOField<labelField> labelFieldIOField;
+
+    //! Compact IO for a Field of labelField
     typedef CompactIOField<labelField, label> labelFieldCompactIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelIOField.H b/src/OpenFOAM/fields/Fields/labelField/labelIOField.H
index 42dd2a1797..4f824373b4 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelIOField.H
+++ b/src/OpenFOAM/fields/Fields/labelField/labelIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelIOField
-
-Description
-    labelField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef labelIOField_H
-#define labelIOField_H
+#ifndef Foam_labelIOField_H
+#define Foam_labelIOField_H
 
 #include "primitiveFields.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of label
     typedef IOField<label> labelIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/quaternionField/quaternionIOField.H b/src/OpenFOAM/fields/Fields/quaternionField/quaternionIOField.H
index 27c3587d2e..4271c61c11 100644
--- a/src/OpenFOAM/fields/Fields/quaternionField/quaternionIOField.H
+++ b/src/OpenFOAM/fields/Fields/quaternionField/quaternionIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::quaternionIOField
-
-Description
-    quaternionField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef quaternionIOField_H
-#define quaternionIOField_H
+#ifndef Foam_quaternionIOField_H
+#define Foam_quaternionIOField_H
 
 #include "quaternionField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of quaternion
     typedef IOField<quaternion> quaternionIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
index 756ff43110..e20f984c81 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::scalarFieldIOField
-
-Description
-    scalarFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarFieldIOField_H
-#define scalarFieldIOField_H
+#ifndef Foam_scalarFieldIOField_H
+#define Foam_scalarFieldIOField_H
 
 #include "scalarField.H"
 #include "CompactIOField.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of scalarField
     typedef IOField<scalarField> scalarFieldIOField;
+
+    //! Compact IO for a Field of scalarField
     typedef CompactIOField<scalarField, scalar> scalarFieldCompactIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarIOField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarIOField.H
index 9e594c6e8e..a3a90362f5 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarIOField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::scalarIOField
-
-Description
-    scalarField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarIOField_H
-#define scalarIOField_H
+#ifndef Foam_scalarIOField_H
+#define Foam_scalarIOField_H
 
 #include "scalarField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of scalar
     typedef IOField<scalar> scalarIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H
index b7a9bd4699..c39e70d194 100644
--- a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::sphericalTensorFieldIOField
-
-Description
-    sphericalTensorFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef sphericalTensorFieldIOField_H
-#define sphericalTensorFieldIOField_H
+#ifndef Foam_sphericalTensorFieldIOField_H
+#define Foam_sphericalTensorFieldIOField_H
 
 #include "sphericalTensorField.H"
 #include "CompactIOField.H"
@@ -41,8 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of sphericalTensorField
     typedef IOField<sphericalTensorField> sphericalTensorFieldIOField;
 
+    //! Compact IO for a Field of sphericalTensorField
     typedef CompactIOField<sphericalTensorField, sphericalTensor>
     sphericalTensorFieldCompactIOField;
 }
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.H b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.H
index 31e780a7e5..81e6d1289f 100644
--- a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.H
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::sphericalTensorIOField
-
-Description
-    sphericalTensorField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef sphericalTensorIOField_H
-#define sphericalTensorIOField_H
+#ifndef Foam_sphericalTensorIOField_H
+#define Foam_sphericalTensorIOField_H
 
 #include "sphericalTensorField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of sphericalTensor
     typedef IOField<sphericalTensor> sphericalTensorIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H
index 2d078aa2a5..9b7d896cb3 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::symmTensorFieldIOField
-
-Description
-    symmTensorFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmTensorFieldIOField_H
-#define symmTensorFieldIOField_H
+#ifndef Foam_symmTensorFieldIOField_H
+#define Foam_symmTensorFieldIOField_H
 
 #include "symmTensorField.H"
 #include "CompactIOField.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of symmTensorField
     typedef IOField<symmTensorField> symmTensorFieldIOField;
+
+    //! Compact IO for a Field of symmTensorField
     typedef CompactIOField<symmTensorField, symmTensor>
     symmTensorFieldCompactIOField;
 }
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorIOField.H b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorIOField.H
index e61a43dc2c..ef9548424a 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorIOField.H
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::symmTensorIOField
-
-Description
-    symmTensorField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmTensorIOField_H
-#define symmTensorIOField_H
+#ifndef Foam_symmTensorIOField_H
+#define Foam_symmTensorIOField_H
 
 #include "symmTensorField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of symmTensor
     typedef IOField<symmTensor> symmTensorIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H b/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H
index 53c423174a..ce8fed13d7 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::tensorFieldIOField
-
-Description
-    tensorFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef tensorFieldIOField_H
-#define tensorFieldIOField_H
+#ifndef Foam_tensorFieldIOField_H
+#define Foam_tensorFieldIOField_H
 
 #include "tensorField.H"
 #include "CompactIOField.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of tensorField
     typedef IOField<tensorField> tensorFieldIOField;
+
+    //! Compact IO for a Field of tensorField
     typedef CompactIOField<tensorField, tensor> tensorFieldCompactIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorIOField.H b/src/OpenFOAM/fields/Fields/tensorField/tensorIOField.H
index ece28fc0fd..32b8ae0392 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorIOField.H
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::tensorIOField
-
-Description
-    tensorField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef tensorIOField_H
-#define tensorIOField_H
+#ifndef Foam_tensorIOField_H
+#define Foam_tensorIOField_H
 
 #include "tensorField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of tensor
     typedef IOField<tensor> tensorIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/triadField/triadIOField.H b/src/OpenFOAM/fields/Fields/triadField/triadIOField.H
index c36981cec3..94c87bdc7c 100644
--- a/src/OpenFOAM/fields/Fields/triadField/triadIOField.H
+++ b/src/OpenFOAM/fields/Fields/triadField/triadIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::triadIOField
-
-Description
-    triadField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef triadIOField_H
-#define triadIOField_H
+#ifndef Foam_triadIOField_H
+#define Foam_triadIOField_H
 
 #include "triadField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of triad
     typedef IOField<triad> triadIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H b/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H
index 76eaf2bf4d..b0d0054783 100644
--- a/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/vector2DField/vector2DFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vector2DFieldIOField
-
-Description
-    vector2DFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vector2DFieldIOField_H
-#define vector2DFieldIOField_H
+#ifndef Foam_vector2DFieldIOField_H
+#define Foam_vector2DFieldIOField_H
 
 #include "vector2DField.H"
 #include "CompactIOField.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of vector2DField
     typedef IOField<vector2DField> vector2DFieldIOField;
+
+    //! Compact IO for a Field of vector2DField
     typedef CompactIOField<vector2DField, vector2D> vector2DFieldCompactIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.H b/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.H
index f05632679d..e1d7dd93f8 100644
--- a/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.H
+++ b/src/OpenFOAM/fields/Fields/vector2DField/vector2DIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vector2DIOField
-
-Description
-    vector2DField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vector2DIOField_H
-#define vector2DIOField_H
+#ifndef Foam_vector2DIOField_H
+#define Foam_vector2DIOField_H
 
 #include "vector2DField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of vector2D
     typedef IOField<vector2D> vector2DIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.H b/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.H
index d0393f2e21..a370af612e 100644
--- a/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/vectorField/vectorFieldIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vectorFieldIOField
-
-Description
-    vectorFieldField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorFieldIOField_H
-#define vectorFieldIOField_H
+#ifndef Foam_vectorFieldIOField_H
+#define Foam_vectorFieldIOField_H
 
 #include "vectorField.H"
 #include "CompactIOField.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of vectorField
     typedef IOField<vectorField> vectorFieldIOField;
+
+    //! Compact IO for a Field of vectorField
     typedef CompactIOField<vectorField, vector> vectorFieldCompactIOField;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/vectorField/vectorIOField.H b/src/OpenFOAM/fields/Fields/vectorField/vectorIOField.H
index ee27ed011d..b70f4c4ccd 100644
--- a/src/OpenFOAM/fields/Fields/vectorField/vectorIOField.H
+++ b/src/OpenFOAM/fields/Fields/vectorField/vectorIOField.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vectorIOField
-
-Description
-    vectorField with IO.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorIOField_H
-#define vectorIOField_H
+#ifndef Foam_vectorIOField_H
+#define Foam_vectorIOField_H
 
 #include "vectorField.H"
 #include "IOField.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a Field of vector
     typedef IOField<vector> vectorIOField;
 }
 
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatchList.H b/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatchList.H
index c49c03a2ef..49958c5abb 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatchList.H
+++ b/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatchList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::geometricSurfacePatchList
-
-Description
-    A List of geometricSurfacePatch.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef geometricSurfacePatchList_H
-#define geometricSurfacePatchList_H
+#ifndef Foam_geometricSurfacePatchList_H
+#define Foam_geometricSurfacePatchList_H
 
 #include "geometricSurfacePatch.H"
 #include "List.H"
@@ -41,14 +35,9 @@ Description
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef List<geometricSurfacePatch> geometricSurfacePatchList;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    //! List of geometricSurfacePatch
+    typedef List<geometricSurfacePatch> geometricSurfacePatchList;
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifierList.H b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifierList.H
index a7da0c83a6..4945164206 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifierList.H
+++ b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifierList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::surfZoneIdentifierList
-
-Description
-    A List of surfZoneIdentifier.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfZoneIdentifierList_H
-#define surfZoneIdentifierList_H
+#ifndef Foam_surfZoneIdentifierList_H
+#define Foam_surfZoneIdentifierList_H
 
 #include "surfZoneIdentifier.H"
 #include "List.H"
@@ -41,14 +35,9 @@ Description
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef List<surfZoneIdentifier> surfZoneIdentifierList;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    //! List of surfZoneIdentifier
+    typedef List<surfZoneIdentifier> surfZoneIdentifierList;
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H
index 0de9601fde..0b38fd224d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::cellIOList
-
-Description
-    IOList of cells
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellIOList_H
-#define cellIOList_H
+#ifndef Foam_cellIOList_H
+#define Foam_cellIOList_H
 
 #include "cell.H"
 #include "CompactIOList.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of cell
     typedef IOList<cell> cellIOList;
+
+    //! Compact IO for a List of cell
     typedef CompactIOList<cell, label> cellCompactIOList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H b/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H
index 29b86927b2..8cd1b7de60 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::cellIndList
-
-Description
-    An IndirectList of cells.
-
-Typedef
-    Foam::cellUIndList
-
-Description
-    A UIndirectList of cells.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_cellIndList_H
@@ -48,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of cell
     typedef IndirectList<cell>  cellIndList;
+
+    //! UIndirectList of cell
     typedef UIndirectList<cell> cellUIndList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellList.H b/src/OpenFOAM/meshes/meshShapes/cell/cellList.H
index fcb498505c..d4918ae9af 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellList.H
@@ -23,38 +23,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::cellList
-
-Description
-    A List of cells.
-
-Typedef
-    Foam::cellUList
-
-Description
-    A UList of cells.
-
-Typedef
-    Foam::cellSubList
-
-Description
-    A SubList of cells.
-
-Typedef
-    Foam::cellListList
-
-Description
-    A List of cellList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellList_H
-#define cellList_H
+#ifndef Foam_cellList_H
+#define Foam_cellList_H
 
 #include "cell.H"
-#include "List.H"
-#include "SubList.H"
 #include "cellListFwd.H"
 
 #endif
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellListFwd.H b/src/OpenFOAM/meshes/meshShapes/cell/cellListFwd.H
index 29f0ce8ec2..6422c07ec4 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellListFwd.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellListFwd.H
@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellListFwd_H
-#define cellListFwd_H
+#ifndef Foam_cellListFwd_H
+#define Foam_cellListFwd_H
 
 #include "List.H"
 #include "SubList.H"
@@ -41,12 +41,13 @@ Description
 
 namespace Foam
 {
+    // Forward Declaration
     class cell;
 
-    typedef UList<cell> cellUList;
-    typedef List<cell> cellList;
-    typedef SubList<cell> cellSubList;
-    typedef List<cellList> cellListList;
+    typedef List<cell> cellList;            //!< List of cell
+    typedef SubList<cell> cellSubList;      //!< SubList of cell
+    typedef UList<cell> cellUList;          //!< UList of cell
+    typedef List<cellList> cellListList;    //!< List of cellList
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIOList.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIOList.H
index 2509c3197d..e0238de265 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIOList.H
@@ -23,12 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::cellShapeIOList
-
-Description
-    IOList of cellShapes
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_cellShapeIOList_H
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of cellShape
     typedef IOList<cellShape> cellShapeIOList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeList.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeList.H
index 87df3f697a..60776d9eeb 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeList.H
@@ -23,12 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::cellShapeList
-
-Description
-    List of cellShapes and PtrList of List of cellShape.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_cellShapeList_H
@@ -36,14 +30,13 @@ Description
 
 #include "cellShape.H"
 #include "List.H"
-#include "PtrList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    //! List of cellShape
     typedef List<cellShape> cellShapeList;
-    typedef PtrList<cellShapeList> cellShapeListList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
deleted file mode 100644
index 2667bdb1b9..0000000000
--- a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
+++ /dev/null
@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 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/>.
-
-Class
-    Foam::EdgeMap
-
-Description
-    Map from edge (expressed as its endpoints) to value.
-    For easier forward declaration it is currently implemented as a
-    separate class rather than a template alias.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef EdgeMap_H
-#define EdgeMap_H
-
-#include "edge.H"
-#include "HashTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class EdgeMap Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class T>
-class EdgeMap
-:
-    public HashTable<T, edge, Hash<edge>>
-{
-public:
-
-    //- Inherit constructors from HashTable
-    using HashTable<T, edge, Hash<edge>>::HashTable;
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H
index 903614c72b..b82e85ef4a 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H
@@ -5,7 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,34 +24,58 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::edgeHashSet
+Class
+    Foam::EdgeMap
 
 Description
-    A HashSet for an edge.
-    The hashing on an edge is commutative.
+    Map from edge (expressed as its endpoints) to value.
+    Hashing (and ==) on an edge is symmetric.
+
+Note
+    For easier forward declaration it is implemented as a separate class
+    rather than a template alias.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef edgeHashes_H
-#define edgeHashes_H
+#ifndef Foam_edgeHashes_H
+#define Foam_edgeHashes_H
 
 #include "edge.H"
-#include "EdgeMap.H"
 #include "HashSet.H"
+#include "HashTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    // Alternative:
-    // template<class T>
-    // using EdgeMap = HashTable<T, edge, Hash<edge>>;
 
-    //- A HashSet with edge for its key.
-    typedef HashSet<edge, Hash<edge>> edgeHashSet;
+// Typedefs
 
-}
+//! A HashSet with edge for its key. Hashing (and ==) on an edge is symmetric.
+typedef HashSet<edge, Hash<edge>> edgeHashSet;
+
+
+/*---------------------------------------------------------------------------*\
+                           Class EdgeMap Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T>
+class EdgeMap
+:
+    public HashTable<T, edge, Hash<edge>>
+{
+public:
+
+    // Constructors
+
+        //- Inherit constructors from HashTable
+        using HashTable<T, edge, Hash<edge>>::HashTable;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H
index 8f76c3dd7b..7c5cfe725f 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::edgeIOList
-
-Description
-    An IOList of edges
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef edgeIOList_H
-#define edgeIOList_H
+#ifndef Foam_edgeIOList_H
+#define Foam_edgeIOList_H
 
 #include "edge.H"
 #include "CompactIOList.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of edge
     typedef IOList<edge> edgeIOList;
+
+    //! Compact IO for a List of edge
     typedef CompactIOList<edge, label> edgeCompactIOList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H
index 0ad10c3252..40b8f30eeb 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::edgeIndList
-
-Description
-    An IndirectList of edges.
-
-Typedef
-    Foam::edgeUIndList
-
-Description
-    A UIndirectList of edges.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_edgeIndList_H
@@ -48,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of edge
     typedef IndirectList<edge>  edgeIndList;
+
+    //! UIndirectList of edge
     typedef UIndirectList<edge> edgeUIndList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeList.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeList.H
index c1e004ea49..745aa86d58 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeList.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeList.H
@@ -23,46 +23,24 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::edgeList
-
-Description
-    A List of edges.
-
-Typedef
-    Foam::edgeUList
-
-Description
-    A UList of edges.
-
-Typedef
-    Foam::edgeSubList
-
-Description
-    A SubList of edges.
-
-Typedef
-    Foam::edgeListList
-
-Description
-    A List of edgeList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef edgeList_H
-#define edgeList_H
+#ifndef Foam_edgeList_H
+#define Foam_edgeList_H
 
 #include "edge.H"
+#include "List.H"
 #include "SubList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef UList<edge> edgeUList;
-    typedef List<edge> edgeList;
-    typedef SubList<edge> edgeSubList;
-    typedef List<edgeList> edgeListList;
+    typedef List<edge> edgeList;            //!< List of edge
+    typedef SubList<edge> edgeSubList;      //!< SubList of edge
+    typedef UList<edge> edgeUList;          //!< UList of edge
+    typedef List<edgeList> edgeListList;    //!< List of edgeList
+
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H b/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H
index 51d08b73b4..e36e17323e 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::faceIOList
-
-Description
-    IOList of faces
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceIOList_H
-#define faceIOList_H
+#ifndef Foam_faceIOList_H
+#define Foam_faceIOList_H
 
 #include "face.H"
 #include "CompactIOList.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of face
     typedef IOList<face> faceIOList;
+
+    //! Compact IO for a List of face
     typedef CompactIOList<face, label> faceCompactIOList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H b/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H
index f885a58631..186da2ce50 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::faceIndList
-
-Description
-    An IndirectList of faces.
-
-Typedef
-    Foam::faceUIndList
-
-Description
-    A UIndirectList of faces.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_faceIndList_H
@@ -48,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of face.
     typedef IndirectList<face>  faceIndList;
+
+    //! UIndirectList of face.
     typedef UIndirectList<face> faceUIndList;
 }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceList.H b/src/OpenFOAM/meshes/meshShapes/face/faceList.H
index ba4517613e..83ca27b032 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceList.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceList.H
@@ -23,38 +23,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::faceList
-
-Description
-    A List of faces.
-
-Typedef
-    Foam::faceUList
-
-Description
-    A UList of faces.
-
-Typedef
-    Foam::faceSubList
-
-Description
-    A SubList of faces.
-
-Typedef
-    Foam::faceListList
-
-Description
-    A List of faceList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceList_H
-#define faceList_H
+#ifndef Foam_faceList_H
+#define Foam_faceList_H
 
 #include "face.H"
-#include "List.H"
-#include "SubList.H"
 #include "faceListFwd.H"
 
 #endif
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H b/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H
index c1ac06591b..9e77143cad 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H
@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceListFwd_H
-#define faceListFwd_H
+#ifndef Foam_faceListFwd_H
+#define Foam_faceListFwd_H
 
 #include "List.H"
 #include "SubList.H"
@@ -41,12 +41,13 @@ Description
 
 namespace Foam
 {
+    // Forward Declaration
     class face;
 
-    typedef UList<face> faceUList;
-    typedef List<face> faceList;
-    typedef SubList<face> faceSubList;
-    typedef List<faceList> faceListList;
+    typedef List<face> faceList;            //!< List of faces
+    typedef SubList<face> faceSubList;      //!< SubList of faces
+    typedef UList<face> faceUList;          //!< UList of faces
+    typedef List<faceList> faceListList;    //!< List of faceList
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellList.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellList.H
index 03f9d1d5af..4781adbe4d 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellList.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::tetCellList
-
-Description
-    list of tetCells
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef tetCellList_H
-#define tetCellList_H
+#ifndef Foam_tetCellList_H
+#define Foam_tetCellList_H
 
 #include "tetCell.H"
 #include "List.H"
@@ -41,7 +35,7 @@ Description
 
 namespace Foam
 {
-    typedef List<tetCell> tetCellList;
+    typedef List<tetCell> tetCellList;      //!< List of tetCell
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceList.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceList.H
index a5bc0967fc..f002a3ab9f 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceList.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::triFaceList
-
-Description
-    list of triFaces
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef triFaceList_H
-#define triFaceList_H
+#ifndef Foam_triFaceList_H
+#define Foam_triFaceList_H
 
 #include "triFace.H"
 #include "List.H"
@@ -41,7 +35,7 @@ Description
 
 namespace Foam
 {
-    typedef List<triFace> triFaceList;
+    typedef List<triFace> triFaceList;      //!< List of triFace
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointIndexHitIOList.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointIndexHitIOList.H
index 2891c5a15b..5024596f27 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointIndexHitIOList.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointIndexHitIOList.H
@@ -23,12 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::pointIndexHitIOList
-
-Description
-    IOList of pointIndexHits
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_pointIndexHitIOList_H
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of pointIndexHit
     typedef IOList<pointIndexHit> pointIndexHitIOList;
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H b/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H
index aa564e7f82..9ba50f6c23 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::pointIndList
-
-Description
-    An IndirectList of points.
-
-Typedef
-    Foam::pointUIndList
-
-Description
-    A UIndirectList of points.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_pointIndList_H
@@ -48,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of point
     typedef IndirectList<point>  pointIndList;
+
+    //! UIndirectList of point
     typedef UIndirectList<point> pointUIndList;
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H b/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H
index 840e655d0a..603f159fc9 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H
@@ -23,34 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::pointList
-
-Description
-    A List of points.
-
-Typedef
-    Foam::pointUList
-
-Description
-    A UList of points.
-
-Typedef
-    Foam::pointSubList
-
-Description
-    A SubList of points.
-
-Typedef
-    Foam::pointListList
-
-Description
-    A List of pointList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef pointList_H
-#define pointList_H
+#ifndef Foam_pointList_H
+#define Foam_pointList_H
 
 #include "point.H"
 #include "List.H"
@@ -60,10 +36,10 @@ Description
 
 namespace Foam
 {
-    typedef UList<point> pointUList;
-    typedef List<point> pointList;
-    typedef SubList<point> pointSubList;
-    typedef List<pointList> pointListList;
+    typedef List<point> pointList;          //!< List of point
+    typedef SubList<point> pointSubList;    //!< SubList of point
+    typedef UList<point> pointUList;        //!< UList of point
+    typedef List<pointList> pointListList;  //!< List of pointList
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H
index 7abd270c7c..3de82d9565 100644
--- a/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H
+++ b/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::scalarIOList
-
-Description
-    Scalar container classes
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarIOList_H
-#define scalarIOList_H
+#ifndef Foam_scalarIOList_H
+#define Foam_scalarIOList_H
 
 #include "scalar.H"
 #include "IOList.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of scalar
     typedef IOList<scalar> scalarIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H
index 5fa0b3c80c..19e6f9c9e2 100644
--- a/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H
+++ b/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::scalarIndList
-
-Description
-    An IndirectList of scalars.
-
-Typedef
-    Foam::scalarUIndList
-
-Description
-    A UIndirectList of scalars.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_scalarIndList_H
@@ -48,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of scalar
     typedef IndirectList<scalar>  scalarIndList;
+
+    //! UIndirectList of scalar
     typedef UIndirectList<scalar> scalarUIndList;
 }
 
diff --git a/src/OpenFOAM/primitives/Scalar/lists/scalarList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarList.H
index 53d23bc37b..1666ee422d 100644
--- a/src/OpenFOAM/primitives/Scalar/lists/scalarList.H
+++ b/src/OpenFOAM/primitives/Scalar/lists/scalarList.H
@@ -23,34 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::scalarUList
-
-Description
-    A UList of scalars.
-
-Typedef
-    Foam::scalarList
-
-Description
-    A List of scalars.
-
-Typedef
-    Foam::scalarSubList
-
-Description
-    A SubList of scalars.
-
-Typedef
-    Foam::scalarListList
-
-Description
-    A List of scalarList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarList_H
-#define scalarList_H
+#ifndef Foam_scalarList_H
+#define Foam_scalarList_H
 
 #include "scalar.H"
 #include "List.H"
@@ -60,10 +36,10 @@ Description
 
 namespace Foam
 {
-    typedef UList<scalar> scalarUList;
-    typedef List<scalar> scalarList;
-    typedef SubList<scalar> scalarSubList;
-    typedef List<scalarList> scalarListList;
+    typedef List<scalar> scalarList;            //!< List of scalar
+    typedef SubList<scalar> scalarSubList;      //!< SubList of scalar
+    typedef UList<scalar> scalarUList;          //!< UList of scalar
+    typedef List<scalarList> scalarListList;    //!< List of scalarList
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H
index 439c5d7956..30a5fdd309 100644
--- a/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H
+++ b/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::scalarListIOList
-
-Description
-    Scalar container classes
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarListIOList_H
-#define scalarListIOList_H
+#ifndef Foam_scalarListIOList_H
+#define Foam_scalarListIOList_H
 
 #include "scalarList.H"
 #include "CompactIOList.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of scalarList
     typedef IOList<scalarList> scalarListIOList;
+
+    //! Compact IO for a List of scalarList
     typedef CompactIOList<scalarList, scalar> scalarListCompactIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H b/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H
index b9e10e986b..a8d25997f6 100644
--- a/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H
+++ b/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H
@@ -23,22 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::sphericalTensorUList
-
-Description
-    A UList of sphericalTensors.
-
-Typedef
-    Foam::sphericalTensorList
-
-Description
-    A List of sphericalTensors.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef sphericalTensorList_H
-#define sphericalTensorList_H
+#ifndef Foam_sphericalTensorList_H
+#define Foam_sphericalTensorList_H
 
 #include "sphericalTensor.H"
 #include "List.H"
@@ -47,9 +35,11 @@ Description
 
 namespace Foam
 {
-    typedef UList<sphericalTensor> sphericalTensorUList;
-
+    //! List of sphericalTensor
     typedef List<sphericalTensor> sphericalTensorList;
+
+    //! UList of sphericalTensor
+    typedef UList<sphericalTensor> sphericalTensorUList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H b/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H
index 3b31b380a8..68242d6775 100644
--- a/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H
+++ b/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H
@@ -23,22 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::symmTensorUList
-
-Description
-    A UList of symmTensors.
-
-Typedef
-    Foam::symmTensorList
-
-Description
-    A List of symmTensors.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmTensorList_H
-#define symmTensorList_H
+#ifndef Foam_symmTensorList_H
+#define Foam_symmTensorList_H
 
 #include "symmTensor.H"
 #include "List.H"
@@ -47,9 +35,8 @@ Description
 
 namespace Foam
 {
-    typedef UList<symmTensor> symmTensorUList;
-
-    typedef List<symmTensor> symmTensorList;
+    typedef List<symmTensor> symmTensorList;    //!< List of symmTensor
+    typedef UList<symmTensor> symmTensorUList;  //!< UList of symmTensor
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Tensor/lists/tensorList.H b/src/OpenFOAM/primitives/Tensor/lists/tensorList.H
index 826562b64e..4c56a1ca14 100644
--- a/src/OpenFOAM/primitives/Tensor/lists/tensorList.H
+++ b/src/OpenFOAM/primitives/Tensor/lists/tensorList.H
@@ -23,22 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::tensorUList
-
-Description
-    A UList of tensors.
-
-Typedef
-    Foam::tensorList
-
-Description
-    A List of tensors.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef tensorList_H
-#define tensorList_H
+#ifndef Foam_tensorList_H
+#define Foam_tensorList_H
 
 #include "tensor.H"
 #include "List.H"
@@ -47,9 +35,8 @@ Description
 
 namespace Foam
 {
-    typedef UList<tensor> tensorUList;
-
-    typedef List<tensor> tensorList;
+    typedef List<tensor> tensorList;        //!< List of tensor
+    typedef UList<tensor> tensorUList;      //!< UList of tensor
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Vector/lists/vectorIOList.H b/src/OpenFOAM/primitives/Vector/lists/vectorIOList.H
index d64d984f31..7916d46327 100644
--- a/src/OpenFOAM/primitives/Vector/lists/vectorIOList.H
+++ b/src/OpenFOAM/primitives/Vector/lists/vectorIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vectorIOList
-
-Description
-    Vector container classes
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorIOList_H
-#define vectorIOList_H
+#ifndef Foam_vectorIOList_H
+#define Foam_vectorIOList_H
 
 #include "vector.H"
 #include "IOList.H"
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of vector
     typedef IOList<vector> vectorIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H b/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H
index 16e24a46b1..fec49c71a4 100644
--- a/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H
+++ b/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vectorIndList
-
-Description
-    An IndirectList of vectors.
-
-Typedef
-    Foam::vectorUIndList
-
-Description
-    A UIndirectList of vectors.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_vectorIndList_H
@@ -48,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of vector
     typedef IndirectList<vector>  vectorIndList;
+
+    //! UIndirectList of vector
     typedef UIndirectList<vector> vectorUIndList;
 }
 
diff --git a/src/OpenFOAM/primitives/Vector/lists/vectorList.H b/src/OpenFOAM/primitives/Vector/lists/vectorList.H
index 5dcdc26e04..122aa44fef 100644
--- a/src/OpenFOAM/primitives/Vector/lists/vectorList.H
+++ b/src/OpenFOAM/primitives/Vector/lists/vectorList.H
@@ -23,34 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vectorUList
-
-Description
-    A UList of vectors.
-
-Typedef
-    Foam::vectorList
-
-Description
-    A List of vectors.
-
-Typedef
-    Foam::vectorSubList
-
-Description
-    A SubList of vectors.
-
-Typedef
-    Foam::vectorListList
-
-Description
-    A List of vectorList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorList_H
-#define vectorList_H
+#ifndef Foam_vectorList_H
+#define Foam_vectorList_H
 
 #include "vector.H"
 #include "List.H"
@@ -60,10 +36,10 @@ Description
 
 namespace Foam
 {
-    typedef UList<vector> vectorUList;
-    typedef List<vector> vectorList;
-    typedef SubList<vector> vectorSubList;
-    typedef List<vectorList> vectorListList;
+    typedef List<vector> vectorList;            //!< List of vector
+    typedef SubList<vector> vectorSubList;      //!< SubList of vector
+    typedef UList<vector> vectorUList;          //!< UList of vector
+    typedef List<vectorList> vectorListList;    //!< List of vectorList
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H b/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H
index 146f05afab..9dd4fbc5d1 100644
--- a/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H
+++ b/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::vectorListIOList
-
-Description
-    Lists of vectors container class
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorListIOList_H
-#define vectorListIOList_H
+#ifndef Foam_vectorListIOList_H
+#define Foam_vectorListIOList_H
 
 #include "vectorList.H"
 #include "CompactIOList.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of vectorList
     typedef IOList<vectorList> vectorListIOList;
+
+    //! Compact IO for a List of vectorList
     typedef CompactIOList<vectorList, vector> vectorListCompactIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/bools/lists/boolList.H b/src/OpenFOAM/primitives/bools/lists/boolList.H
index 80129c7d5d..d01b3aaea9 100644
--- a/src/OpenFOAM/primitives/bools/lists/boolList.H
+++ b/src/OpenFOAM/primitives/bools/lists/boolList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::boolListList
-
-Description
-    A List of boolList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef boolList_H
-#define boolList_H
+#ifndef Foam_boolList_H
+#define Foam_boolList_H
 
 #include "bool.H"
 #include "List.H"
@@ -41,10 +35,11 @@ Description
 
 namespace Foam
 {
-    // boolUlist   = defined in UList.H
     // boolList    = defined in List.H
     // boolSubList = defined in SubList.H
+    // boolUlist   = defined in UList.H
 
+    //! List of boolList
     typedef List<List<bool>> boolListList;
 }
 
diff --git a/src/OpenFOAM/primitives/chars/lists/charList.H b/src/OpenFOAM/primitives/chars/lists/charList.H
index cc13e3fa69..9233bd7490 100644
--- a/src/OpenFOAM/primitives/chars/lists/charList.H
+++ b/src/OpenFOAM/primitives/chars/lists/charList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::charListList
-
-Description
-    A List of charList.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef charList_H
-#define charList_H
+#ifndef Foam_charList_H
+#define Foam_charList_H
 
 #include "char.H"
 #include "List.H"
@@ -42,10 +36,11 @@ Description
 
 namespace Foam
 {
-    // charUList   = defined in UList.H
     // charList    = defined in List.H
     // charSubList = defined in SubList.H
+    // charUList   = defined in UList.H
 
+    //! List of charList
     typedef List<charList> charListList;
 }
 
diff --git a/src/OpenFOAM/primitives/ints/lists/labelIOList.H b/src/OpenFOAM/primitives/ints/lists/labelIOList.H
index f406ac1ee9..62f5e39782 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelIOList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelIOList.H
@@ -23,12 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelIOList
-
-Description
-    Label container classes
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_labelIOList_H
@@ -41,6 +35,7 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of label
     typedef IOList<label> labelIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/ints/lists/labelIndList.H b/src/OpenFOAM/primitives/ints/lists/labelIndList.H
index da2bfb50a6..4794916a12 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelIndList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelIndList.H
@@ -23,18 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelIndList
-
-Description
-    A IndirectList of labels.
-
-Typedef
-    Foam::labelUIndList
-
-Description
-    An UIndirectList of labels.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_labelIndList_H
@@ -48,8 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IndirectList of label
     typedef IndirectList<label>  labelIndList;
-    // labelUIndList is defined in UIndirectList itself
+
+    // labelUIndList = defined in IndirectList.H
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/ints/lists/labelList.H b/src/OpenFOAM/primitives/ints/lists/labelList.H
index 7a38e83969..81aa1de8fd 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelList.H
@@ -24,18 +24,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelListList
-
-Description
-    A List of labelList.
-
-Typedef
-    Foam::labelListListList
-
-Description
-    A List of labelListList.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_labelList_H
@@ -49,11 +37,14 @@ Description
 
 namespace Foam
 {
-    // labelUList   = defined in UList.H
     // labelList    = defined in List.H
     // labelSubList = defined in SubList.H
+    // labelUList   = defined in UList.H
 
+    //! List of labelList
     typedef List<labelList> labelListList;
+
+    //! List of labelListList
     typedef List<labelListList> labelListListList;
 
 
diff --git a/src/OpenFOAM/primitives/ints/lists/labelListIOList.H b/src/OpenFOAM/primitives/ints/lists/labelListIOList.H
index 0a9b4868ff..e8f9180f23 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelListIOList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelListIOList.H
@@ -23,12 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelListIOList
-
-Description
-    Label container classes
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_labelListIOList_H
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of labelList
     typedef IOList<labelList> labelListIOList;
+
+    //! Compact IO for a List of labelList
     typedef CompactIOList<labelList, label> labelListCompactIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/strings/lists/fileNameList.H b/src/OpenFOAM/primitives/strings/lists/fileNameList.H
index d9c91b72da..3353f97801 100644
--- a/src/OpenFOAM/primitives/strings/lists/fileNameList.H
+++ b/src/OpenFOAM/primitives/strings/lists/fileNameList.H
@@ -23,28 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::fileNameUList
-
-Description
-    A UList of fileNames.
-
-Typedef
-    Foam::fileNameList
-
-Description
-    A List of fileNames.
-
-Typedef
-    Foam::fileNameSubList
-
-Description
-    A SubList of fileNames.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef fileNameList_H
-#define fileNameList_H
+#ifndef Foam_fileNameList_H
+#define Foam_fileNameList_H
 
 #include "fileName.H"
 #include "List.H"
@@ -54,9 +36,9 @@ Description
 
 namespace Foam
 {
-    typedef UList<fileName> fileNameUList;
-    typedef List<fileName> fileNameList;
-    typedef SubList<fileName> fileNameSubList;
+    typedef List<fileName> fileNameList;        //!< List of fileName
+    typedef SubList<fileName> fileNameSubList;  //!< SubList of fileName
+    typedef UList<fileName> fileNameUList;      //!< UList of fileName
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/lists/stringList.H b/src/OpenFOAM/primitives/strings/lists/stringList.H
index 0e7f3615c2..6359a8fe54 100644
--- a/src/OpenFOAM/primitives/strings/lists/stringList.H
+++ b/src/OpenFOAM/primitives/strings/lists/stringList.H
@@ -23,24 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::stringUList
-
-Description
-    A UList of strings.
-
-Typedef
-    Foam::stringList
-
-Description
-    A List of strings.
-
-Typedef
-    Foam::stringSubList
-
-Description
-    A SubList of strings.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_stringList_H
@@ -54,9 +36,9 @@ Description
 
 namespace Foam
 {
-    typedef UList<string> stringUList;
-    typedef List<string> stringList;
-    typedef SubList<string> stringSubList;
+    typedef List<string> stringList;        //!< List of string
+    typedef SubList<string> stringSubList;  //!< SubList of string
+    typedef UList<string> stringUList;      //!< UList of string
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/lists/wordList.H b/src/OpenFOAM/primitives/strings/lists/wordList.H
index 747260e55a..d0b34b39ef 100644
--- a/src/OpenFOAM/primitives/strings/lists/wordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/wordList.H
@@ -23,24 +23,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::wordUList
-
-Description
-    A UList of words.
-
-Typedef
-    Foam::wordList
-
-Description
-    A List of words.
-
-Typedef
-    Foam::wordSubList
-
-Description
-    A SubList of words.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Foam_wordList_H
@@ -54,9 +36,9 @@ Description
 
 namespace Foam
 {
-    typedef UList<word> wordUList;
-    typedef List<word> wordList;
-    typedef SubList<word> wordSubList;
+    typedef List<word> wordList;            //!< List of word
+    typedef SubList<word> wordSubList;      //!< SubList of word
+    typedef UList<word> wordUList;          //!< UList of word
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/lists/wordReList.H b/src/OpenFOAM/primitives/strings/lists/wordReList.H
deleted file mode 100644
index 6435a8271f..0000000000
--- a/src/OpenFOAM/primitives/strings/lists/wordReList.H
+++ /dev/null
@@ -1,58 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-Typedef
-    Foam::wordReUList
-
-Description
-    A UList of wordRe (word or regular expression)
-
-Typedef
-    Foam::wordReList
-
-Description
-    A List of wordRe (word or regular expression)
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_wordReList_H
-#define Foam_wordReList_H
-
-#include "wordRe.H"
-#include "List.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef UList<wordRe> wordReUList;
-    typedef List<wordRe> wordReList;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/strings/string/stringIOList.H b/src/OpenFOAM/primitives/strings/string/stringIOList.H
index 7ed7473a3d..b1f87ce0d7 100644
--- a/src/OpenFOAM/primitives/strings/string/stringIOList.H
+++ b/src/OpenFOAM/primitives/strings/string/stringIOList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::stringIOList
-
-Description
-    IO of a list of strings
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef stringIOList_H
-#define stringIOList_H
+#ifndef Foam_stringIOList_H
+#define Foam_stringIOList_H
 
 #include "stringList.H"
 #include "IOList.H"
@@ -41,7 +35,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of string
     typedef IOList<string> stringIOList;
+
+    //! IO for a List of stringList
     typedef IOList<stringList> stringListIOList;
 }
 
diff --git a/src/OpenFOAM/primitives/strings/word/wordIOList.H b/src/OpenFOAM/primitives/strings/word/wordIOList.H
index da723ffc69..fb56291848 100644
--- a/src/OpenFOAM/primitives/strings/word/wordIOList.H
+++ b/src/OpenFOAM/primitives/strings/word/wordIOList.H
@@ -24,16 +24,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::wordIOList
-
-Description
-    IO of a list of words
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef wordIOList_H
-#define wordIOList_H
+#ifndef Foam_wordIOList_H
+#define Foam_wordIOList_H
 
 #include "wordList.H"
 #include "IOList.H"
@@ -42,7 +36,10 @@ Description
 
 namespace Foam
 {
+    //! IO for a List of word
     typedef IOList<word> wordIOList;
+
+    //! IO for a List of wordList
     typedef IOList<wordList> wordListIOList;
 
     //- Print a List of wordList as a table
diff --git a/src/OpenFOAM/primitives/strings/wordRes/wordRes.H b/src/OpenFOAM/primitives/strings/wordRes/wordRes.H
index 4eb983f7e6..de7c5d56aa 100644
--- a/src/OpenFOAM/primitives/strings/wordRes/wordRes.H
+++ b/src/OpenFOAM/primitives/strings/wordRes/wordRes.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,13 +38,19 @@ SourceFiles
 #ifndef Foam_wordRes_H
 #define Foam_wordRes_H
 
-#include "wordReList.H"
+#include "wordRe.H"
+#include "List.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// List types
+typedef List<wordRe> wordReList;    //!< List of wordRe (word or regex)
+typedef UList<wordRe> wordReUList;  //!< UList of wordRe (word or regex)
+
+
 /*---------------------------------------------------------------------------*\
                            Class wordRes Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/primitives/tuples/labelPair.H b/src/OpenFOAM/primitives/tuples/labelPair.H
index 4559806088..2a4a4d0360 100644
--- a/src/OpenFOAM/primitives/tuples/labelPair.H
+++ b/src/OpenFOAM/primitives/tuples/labelPair.H
@@ -23,47 +23,23 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::labelPairPair
-
-Description
-    A pair of labelPairs.
-
-Typedef
-    Foam::labelPairList
-
-Description
-    List of labelPairs.
-
-Typedef
-    Foam::labelPairUList
-
-Description
-    UList of labelPairs.
-
-Typedef
-    Foam::labelPairSubList
-
-Description
-    A SubList of labelPairs.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef labelPair_H
-#define labelPair_H
+#ifndef Foam_labelPair_H
+#define Foam_labelPair_H
 
+#include "Pair.H"
 #include "List.H"
 #include "SubList.H"
-#include "Pair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef Pair<labelPair> labelPairPair;
-    typedef List<labelPair> labelPairList;
-    typedef UList<labelPair> labelPairUList;
-    typedef SubList<labelPair> labelPairSubList;
+    typedef Pair<labelPair> labelPairPair;      //!< Pair of labelPair
+    typedef List<labelPair> labelPairList;      //!< List of labelPair
+    typedef UList<labelPair> labelPairUList;    //!< UList of labelPair
+
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/tuples/wordPair.H b/src/OpenFOAM/primitives/tuples/wordPair.H
index 5110355bc0..59fe244c90 100644
--- a/src/OpenFOAM/primitives/tuples/wordPair.H
+++ b/src/OpenFOAM/primitives/tuples/wordPair.H
@@ -23,47 +23,22 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::wordPairPair
-
-Description
-    A pair of wordPairs.
-
-Typedef
-    Foam::wordPairList
-
-Description
-    List of wordPairs.
-
-Typedef
-    Foam::wordPairUList
-
-Description
-    UList of wordPairs.
-
-Typedef
-    Foam::wordPairSubList
-
-Description
-    A SubList of wordPairs.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef wordPair_H
-#define wordPair_H
+#ifndef Foam_wordPair_H
+#define Foam_wordPair_H
 
+#include "Pair.H"
 #include "List.H"
 #include "SubList.H"
-#include "Pair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef Pair<wordPair> wordPairPair;
-    typedef List<wordPair> wordPairList;
-    typedef UList<wordPair> wordPairUList;
-    typedef SubList<wordPair> wordPairSubList;
+    typedef Pair<wordPair> wordPairPair;        //!< Pair of wordPair
+    typedef List<wordPair> wordPairList;        //!< List of wordPair
+    typedef UList<wordPair> wordPairUList;      //!< UList of wordPair
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 721dd6b453..5424b736b2 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -136,6 +136,7 @@ SourceFiles
 #ifndef Foam_faceCoupleInfo_H
 #define Foam_faceCoupleInfo_H
 
+#include "edgeHashes.H"
 #include "pointField.H"
 #include "indirectPrimitivePatch.H"
 #include "primitivePatch.H"
@@ -145,8 +146,6 @@ SourceFiles
 namespace Foam
 {
 
-typedef HashTable<labelList, edge, Hash<edge>> edgeLookup;
-
 // Forward Declarations
 class face;
 class primitiveMesh;
@@ -204,7 +203,7 @@ class faceCoupleInfo
             //- For edges originating from splitting of edges:
             //  given the two endpoints of the unsplit edge give the list
             //  of inbetween vertices
-            edgeLookup cutEdgeToPoints_;
+            EdgeMap<labelList> cutEdgeToPoints_;
 
 
     // Private Member Functions
@@ -499,13 +498,11 @@ public:
                 return slaveToCutPoints_;
             }
 
-            //- From two cut points (original edge) to list of inserted
-            //  points
-            const edgeLookup& cutEdgeToPoints() const
+            //- From two cut points (original edge) to list of inserted points
+            const EdgeMap<labelList>& cutEdgeToPoints() const noexcept
             {
                 return cutEdgeToPoints_;
             }
-
  };
 
 
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 1a4d0e48c8..503475c616 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -400,7 +400,7 @@ Foam::labelList Foam::polyMeshAdder::getFaceOrder
 // edge the points introduced inbetween the endpoints.
 void Foam::polyMeshAdder::insertVertices
 (
-    const edgeLookup& cutEdgeToPoints,
+    const EdgeMap<labelList>& cutEdgeToPoints,
     const Map<label>& meshToMaster,
     const labelList& masterToCutPoints,
     const face& masterF,
@@ -764,7 +764,8 @@ void Foam::polyMeshAdder::mergePrimitives
     {
         // From two cut-points to labels of cut-points inbetween.
         // (in order: from e[0] to e[1]
-        const edgeLookup& cutEdgeToPoints = coupleInfo.cutEdgeToPoints();
+        const EdgeMap<labelList>& cutEdgeToPoints
+            = coupleInfo.cutEdgeToPoints();
 
         // Get map of master face (in mesh labels) that are in cut. These faces
         // do not need to be renumbered.
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index 2dc1253bc0..3182ad1801 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef polyMeshAdder_H
-#define polyMeshAdder_H
+#ifndef Foam_polyMeshAdder_H
+#define Foam_polyMeshAdder_H
 
 #include "autoPtr.H"
 #include "polyMesh.H"
@@ -120,7 +120,7 @@ class polyMeshAdder
         // edge the points introduced inbetween the endpoints.
         static void insertVertices
         (
-            const edgeLookup& cutEdgeToPoints,
+            const EdgeMap<labelList>& cutEdgeToPoints,
             const Map<label>& meshToMaster,
             const labelList& masterToCutPoints,
             const face& masterFace,
diff --git a/src/meshTools/multiWorld/multiWorldConnectionsObject.H b/src/meshTools/multiWorld/multiWorldConnectionsObject.H
index 76cf3f505a..d0c0bb7616 100644
--- a/src/meshTools/multiWorld/multiWorldConnectionsObject.H
+++ b/src/meshTools/multiWorld/multiWorldConnectionsObject.H
@@ -41,7 +41,7 @@ SourceFiles
 #define meshObjects_multiWorldConnections_H
 
 #include "MeshObject.H"
-#include "EdgeMap.H"
+#include "edgeHashes.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfZone/surfZoneList.H b/src/surfMesh/surfZone/surfZoneList.H
index c4346e9605..7442d2ff70 100644
--- a/src/surfMesh/surfZone/surfZoneList.H
+++ b/src/surfMesh/surfZone/surfZoneList.H
@@ -23,15 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::surfZoneList
-
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfZoneList_H
-#define surfZoneList_H
+#ifndef Foam_surfZoneList_H
+#define Foam_surfZoneList_H
 
 #include "surfZone.H"
 #include "List.H"
@@ -41,14 +36,8 @@ Description
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef List<surfZone>  surfZoneList;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    typedef List<surfZone> surfZoneList;    //!< List of surfZone
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/surfMesh/triSurface/patches/surfacePatchList.H b/src/surfMesh/triSurface/patches/surfacePatchList.H
index d25f2ede35..c9c9142434 100644
--- a/src/surfMesh/triSurface/patches/surfacePatchList.H
+++ b/src/surfMesh/triSurface/patches/surfacePatchList.H
@@ -23,16 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::surfacePatchList
-
-Description
-    A List of surfacePatch.
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfacePatchList_H
-#define surfacePatchList_H
+#ifndef Foam_surfacePatchList_H
+#define Foam_surfacePatchList_H
 
 #include "surfacePatch.H"
 #include "List.H"
@@ -41,14 +35,8 @@ Description
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef List<surfacePatch> surfacePatchList;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    typedef List<surfacePatch> surfacePatchList;  //!< List of surfacePatch
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From f0a196a90848866312154f1d90da2c54d3716237 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 24 Feb 2023 15:46:23 +0100
Subject: [PATCH 108/348] STYLE: include primitivePatch.H (instead of
 PrimitivePatch.H)

- further de-clutter in the future

ENH: PrimitivePatchInterpolation with unique_ptr for memory management
---
 .../backgroundMeshDecomposition.H             |   2 -
 .../automatic/automatic.H                     |   2 +-
 .../fieldFromFile/fieldFromFile.H             |   2 +-
 .../nonUniformField/nonUniformField.H         |   2 +-
 .../PrimitivePatchInterpolation.C             | 102 +++++++-----------
 .../PrimitivePatchInterpolation.H             |  10 +-
 .../primitivePatchInterpolation.H             |   2 +-
 .../primitiveMesh/PatchTools/PatchTools.H     |   4 +-
 .../PrimitivePatch/PrimitivePatch.H           |   7 +-
 .../primitivePatch/indirectPrimitivePatch.H   |   4 +-
 .../primitivePatch/primitivePatch.H           |   4 -
 .../vtk/output/foamVtkPatchWriter.H           |   2 +-
 src/dynamicMesh/boundaryMesh/bMesh.H          |   9 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.H   |   2 +-
 .../polyMeshAdder/faceCoupleInfo.H            |   2 -
 .../polyTopoChange/hexRef8/hexRef8.H          |   1 -
 .../enrichedPatch/enrichedPatch.H             |   1 -
 .../AMIInterpolation/findNearestMaskedOp.H    |   2 +-
 .../cyclicACMIPointPatchField.H               |   2 +-
 .../cyclicAMIPointPatchField.H                |   2 +-
 .../PatchEdgeFaceWave/PatchEdgeFaceWave.H     |   2 +-
 .../extendedEdgeMesh/extendedEdgeMesh.H       |   6 +-
 .../indexedOctree/treeDataPrimitivePatch.C    |  24 ++---
 src/meshTools/meshTools/meshTools.H           |   6 +-
 .../sensitivityBezierIncompressible.H         |   8 +-
 .../sensitivityBezierFIIncompressible.H       |   2 +-
 .../sensitivitySurfaceIncompressible.C        |   2 +-
 .../adjoint/parameterization/Bezier/Bezier.H  |   7 +-
 .../sampledPatchInternalFieldTemplates.C      |   2 +-
 src/surfMesh/MeshedSurface/MeshedSurface.H    |   7 +-
 src/surfMesh/polySurface/polySurface.H        |   2 +-
 src/surfMesh/surfMesh/surfMesh.H              |   2 +-
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.C   |   2 +-
 src/surfMesh/triSurface/triSurface.H          |   7 +-
 34 files changed, 102 insertions(+), 141 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 3a489a38ca..a0dd1bd11d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -68,9 +68,7 @@ SourceFiles
 #include "globalIndex.H"
 #include "treeBoundBox.H"
 #include "primitivePatch.H"
-#include "face.H"
 #include "labelList.H"
-#include "pointField.H"
 #include "indexedOctree.H"
 #include "treeDataPrimitivePatch.H"
 #include "volumeType.H"
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
index 3b8da3bbf0..df9922ba12 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
@@ -38,7 +38,7 @@ SourceFiles
 
 #include "cellSizeCalculationType.H"
 #include "triSurfaceFields.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
index 7fb636e2af..fe301e4262 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
@@ -38,7 +38,7 @@ SourceFiles
 
 #include "cellSizeCalculationType.H"
 #include "triSurfaceFields.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
index 13436971f6..0fedf3c683 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
@@ -38,7 +38,7 @@ SourceFiles
 #define nonUniformField_H
 
 #include "triSurfaceFields.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 #include "surfaceCellSizeFunction.H"
 #include "cellSizeCalculationType.H"
 
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index ccc578f7a1..3a1a5bc0db 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,19 +27,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PrimitivePatchInterpolation.H"
-#include "faceList.H"
-#include "demandDrivenData.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Patch>
-const scalarListList&
-PrimitivePatchInterpolation<Patch>::faceToPointWeights() const
+const Foam::scalarListList&
+Foam::PrimitivePatchInterpolation<Patch>::faceToPointWeights() const
 {
     if (!faceToPointWeightsPtr_)
     {
@@ -51,7 +44,7 @@ PrimitivePatchInterpolation<Patch>::faceToPointWeights() const
 
 
 template<class Patch>
-void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
+void Foam::PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
 {
     if (faceToPointWeightsPtr_)
     {
@@ -60,10 +53,10 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
             << abort(FatalError);
     }
 
-    const pointField& points = patch_.localPoints();
-    const List<typename Patch::face_type>& faces = patch_.localFaces();
+    const auto& points = patch_.localPoints();
+    const auto& faces = patch_.localFaces();
 
-    faceToPointWeightsPtr_ = new scalarListList(points.size());
+    faceToPointWeightsPtr_.reset(new scalarListList(points.size()));
     auto& weights = *faceToPointWeightsPtr_;
 
     // get reference to addressing
@@ -94,8 +87,8 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
 
 
 template<class Patch>
-const scalarList&
-PrimitivePatchInterpolation<Patch>::faceToEdgeWeights() const
+const Foam::scalarList&
+Foam::PrimitivePatchInterpolation<Patch>::faceToEdgeWeights() const
 {
     if (!faceToEdgeWeightsPtr_)
     {
@@ -107,7 +100,7 @@ PrimitivePatchInterpolation<Patch>::faceToEdgeWeights() const
 
 
 template<class Patch>
-void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
+void Foam::PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
 {
     if (faceToEdgeWeightsPtr_)
     {
@@ -116,12 +109,12 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
             << abort(FatalError);
     }
 
-    const pointField& points = patch_.localPoints();
-    const List<typename Patch::face_type>& faces = patch_.localFaces();
+    const auto& points = patch_.localPoints();
+    const auto& faces = patch_.localFaces();
     const edgeList& edges = patch_.edges();
     const labelListList& edgeFaces = patch_.edgeFaces();
 
-    faceToEdgeWeightsPtr_ = new scalarList(patch_.nInternalEdges());
+    faceToEdgeWeightsPtr_.reset(new scalarList(patch_.nInternalEdges()));
     auto& weights = *faceToEdgeWeightsPtr_;
 
     forAll(weights, edgei)
@@ -142,17 +135,20 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
 
 
 template<class Patch>
-void PrimitivePatchInterpolation<Patch>::clearWeights()
+void Foam::PrimitivePatchInterpolation<Patch>::clearWeights()
 {
-    deleteDemandDrivenData(faceToPointWeightsPtr_);
-    deleteDemandDrivenData(faceToEdgeWeightsPtr_);
+    faceToPointWeightsPtr_.reset(nullptr);
+    faceToEdgeWeightsPtr_.reset(nullptr);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Patch>
-PrimitivePatchInterpolation<Patch>::PrimitivePatchInterpolation(const Patch& p)
+Foam::PrimitivePatchInterpolation<Patch>::PrimitivePatchInterpolation
+(
+    const Patch& p
+)
 :
     patch_(p),
     faceToPointWeightsPtr_(nullptr),
@@ -160,20 +156,12 @@ PrimitivePatchInterpolation<Patch>::PrimitivePatchInterpolation(const Patch& p)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class Patch>
-PrimitivePatchInterpolation<Patch>::~PrimitivePatchInterpolation()
-{
-    clearWeights();
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
+Foam::tmp<Foam::Field<Type>>
+Foam::PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 (
     const Field<Type>& ff
 ) const
@@ -187,15 +175,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type>> tresult
-    (
-        new Field<Type>
-        (
-            patch_.nPoints(), Zero
-        )
-    );
-
-    Field<Type>& result = tresult.ref();
+    auto tresult = tmp<Field<Type>>::New(patch_.nPoints(), Zero);
+    auto& result = tresult.ref();
 
     const labelListList& pointFaces = patch_.pointFaces();
     const scalarListList& weights = faceToPointWeights();
@@ -217,7 +198,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
+Foam::tmp<Foam::Field<Type>>
+Foam::PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 (
     const tmp<Field<Type>>& tff
 ) const
@@ -230,7 +212,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
+Foam::tmp<Foam::Field<Type>>
+Foam::PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 (
     const Field<Type>& pf
 ) const
@@ -243,18 +226,10 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type>> tresult
-    (
-        new Field<Type>
-        (
-            patch_.size(),
-            Zero
-        )
-    );
+    auto tresult = tmp<Field<Type>>::New(patch_.size(), Zero);
+    auto& result = tresult.ref();
 
-    Field<Type>& result = tresult.ref();
-
-    const List<typename Patch::face_type>& localFaces = patch_.localFaces();
+    const auto& localFaces = patch_.localFaces();
 
     forAll(result, facei)
     {
@@ -274,7 +249,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
+Foam::tmp<Foam::Field<Type>>
+Foam::PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 (
     const tmp<Field<Type>>& tpf
 ) const
@@ -287,7 +263,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
+Foam::tmp<Foam::Field<Type>>
+Foam::PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 (
     const Field<Type>& pf
 ) const
@@ -327,7 +304,8 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
+Foam::tmp<Foam::Field<Type>>
+Foam::PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 (
     const tmp<Field<Type>>& tpf
 ) const
@@ -339,7 +317,7 @@ tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 
 
 template<class Patch>
-bool PrimitivePatchInterpolation<Patch>::movePoints()
+bool Foam::PrimitivePatchInterpolation<Patch>::movePoints()
 {
     clearWeights();
 
@@ -347,8 +325,4 @@ bool PrimitivePatchInterpolation<Patch>::movePoints()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index 22f9b65335..c952be4c9b 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -39,6 +39,7 @@ SourceFiles
 #define PrimitivePatchInterpolation_H
 
 #include "scalarList.H"
+#include "faceList.H"
 #include "Field.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,6 +47,9 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
+template<class Patch> class PrimitivePatchInterpolation;
+
 /*---------------------------------------------------------------------------*\
                   Class PrimitivePatchInterpolation Declaration
 \*---------------------------------------------------------------------------*/
@@ -62,10 +66,10 @@ class PrimitivePatchInterpolation
     // Demand-driven data
 
         //- Face-to-point weights
-        mutable scalarListList* faceToPointWeightsPtr_;
+        mutable std::unique_ptr<scalarListList> faceToPointWeightsPtr_;
 
         //- Face-to-edge weights
-        mutable scalarList* faceToEdgeWeightsPtr_;
+        mutable std::unique_ptr<scalarList> faceToEdgeWeightsPtr_;
 
 
     // Private Member Functions
@@ -105,7 +109,7 @@ public:
 
 
     //- Destructor
-    ~PrimitivePatchInterpolation();
+    ~PrimitivePatchInterpolation() = default;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
index 93f26a1922..266f251eba 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/primitivePatchInterpolation.H
@@ -35,8 +35,8 @@ Description
 #ifndef primitivePatchInterpolation_H
 #define primitivePatchInterpolation_H
 
-#include "PrimitivePatchInterpolation.H"
 #include "primitivePatch.H"
+#include "PrimitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
index 0a96cfb0cd..56fbd59a90 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
@@ -48,9 +48,9 @@ SourceFiles
 #ifndef Foam_PatchTools_H
 #define Foam_PatchTools_H
 
-#include "PrimitivePatch.H"
-#include "globalIndex.H"
 #include "autoPtr.H"
+#include "globalIndex.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 3355bacdde..0c83b4c273 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -57,9 +57,11 @@ SourceFiles
 #include "boolList.H"
 #include "labelList.H"
 #include "edgeList.H"
-#include "point.H"
+#include "face.H"
+#include "pointField.H"
 #include "intersection.H"
 #include "HashSet.H"
+#include "SubList.H"
 #include "objectHit.H"
 #include "PrimitivePatchBase.H"
 
@@ -69,8 +71,9 @@ namespace Foam
 {
 
 // Forward Declarations
-class face;
 template<class T> class Map;
+template<class FaceList, class PointField> class PrimitivePatch;
+
 
 /*---------------------------------------------------------------------------*\
                            Class PrimitivePatch Declaration
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H
index 4de24fb4b2..ee1b9d9906 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/indirectPrimitivePatch.H
@@ -43,10 +43,8 @@ Description
 #ifndef Foam_indirectPrimitivePatch_H
 #define Foam_indirectPrimitivePatch_H
 
-#include "PrimitivePatch.H"
-#include "face.H"
+#include "primitivePatch.H"
 #include "IndirectList.H"
-#include "pointField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H
index 9fda6d684f..f6279b5990 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/primitivePatch.H
@@ -48,10 +48,6 @@ Description
 #define Foam_primitivePatch_H
 
 #include "PrimitivePatch.H"
-#include "face.H"
-#include "SubList.H"
-#include "List.H"
-#include "pointField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index b6e5297706..429c212b1c 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -53,7 +53,7 @@ SourceFiles
 #include "foamVtkPatchMeshWriter.H"
 #include "volFields.H"
 #include "pointFields.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/boundaryMesh/bMesh.H b/src/dynamicMesh/boundaryMesh/bMesh.H
index a41a250204..5aab8f0915 100644
--- a/src/dynamicMesh/boundaryMesh/bMesh.H
+++ b/src/dynamicMesh/boundaryMesh/bMesh.H
@@ -33,13 +33,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef bMesh_H
-#define bMesh_H
+#ifndef Foam_bMesh_H
+#define Foam_bMesh_H
 
-#include "PrimitivePatch.H"
-#include "face.H"
-#include "List.H"
-#include "pointField.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index 0b20ef4100..a7367be57b 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -43,7 +43,7 @@ SourceFiles
 #include "boundaryPatch.H"
 #include "className.H"
 #include "polyPatch.H"
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "PtrList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 5424b736b2..2e2df56b3d 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -137,7 +137,6 @@ SourceFiles
 #define Foam_faceCoupleInfo_H
 
 #include "edgeHashes.H"
-#include "pointField.H"
 #include "indirectPrimitivePatch.H"
 #include "primitivePatch.H"
 
@@ -147,7 +146,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class face;
 class primitiveMesh;
 class polyPatch;
 class polyMesh;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 681ef62f0d..d82f7b4fef 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -39,7 +39,6 @@ SourceFiles
 #define hexRef8_H
 
 #include "labelIOList.H"
-#include "face.H"
 #include "HashSet.H"
 #include "DynamicList.H"
 #include "primitivePatch.H"
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
index bec45a2d29..2689d449f8 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
@@ -55,7 +55,6 @@ SourceFiles
 #define Foam_enrichedPatch_H
 
 #include "Map.H"
-#include "point.H"
 #include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/findNearestMaskedOp.H b/src/meshTools/AMIInterpolation/AMIInterpolation/findNearestMaskedOp.H
index 2290021efb..3d66906b7b 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/findNearestMaskedOp.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/findNearestMaskedOp.H
@@ -43,7 +43,7 @@ public:
 
             if (!excludeIndices_.found(index))
             {
-                const typename PatchType::FaceType& f = patch[index];
+                const auto& f = patch[index];
 
                 pointHit nearHit = f.nearestPoint(sample, points);
                 scalar distSqr = sqr(nearHit.distance());
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
index fa2d54f387..17755d5295 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
@@ -40,7 +40,7 @@ SourceFiles
 
 #include "coupledPointPatchField.H"
 #include "cyclicACMIPointPatch.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
index 78a8148c09..5840a30269 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
@@ -40,7 +40,7 @@ SourceFiles
 
 #include "coupledPointPatchField.H"
 #include "cyclicAMIPointPatch.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
index e96c54e1ef..0a59fb7ac8 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
@@ -42,7 +42,7 @@ SourceFiles
 
 #include "bitSet.H"
 #include "scalarField.H"
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "vectorTensorTransform.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index f495b8e8f6..254b48969b 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -56,14 +56,14 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef extendedEdgeMesh_H
-#define extendedEdgeMesh_H
+#ifndef Foam_extendedEdgeMesh_H
+#define Foam_extendedEdgeMesh_H
 
 #include "edgeMesh.H"
 #include "indexedOctree.H"
 #include "treeDataEdge.H"
 #include "treeDataPoint.H"
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 74d7a76448..7cafbe5dc3 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -199,9 +199,9 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
             << " nearest face:" << facei;
     }
 
-    const typename PatchType::face_type& localF = patch_.localFaces()[facei];
-    const typename PatchType::face_type& f = patch_[facei];
-    const pointField& points = patch_.points();
+    const auto& localF = patch_.localFaces()[facei];
+    const auto& f = patch_[facei];
+    const auto& points = patch_.points();
 
     // Retest to classify where on face info is. Note: could be improved. We
     // already have point.
@@ -412,8 +412,8 @@ bool Foam::treeDataPrimitivePatch<PatchType>::overlaps
 
     // 2. Check if one or more face points inside
 
-    const pointField& points = patch_.points();
-    const typename PatchType::face_type& f = patch_[index];
+    const auto& points = patch_.points();
+    const auto& f = patch_[index];
 
     if (f.size() == 3)
     {
@@ -469,8 +469,8 @@ bool Foam::treeDataPrimitivePatch<PatchType>::overlaps
         return false;
     }
 
-    const pointField& points = patch_.points();
-    const face& f = patch_[index];
+    const auto& points = patch_.points();
+    const auto& f = patch_[index];
 
     pointHit nearHit = f.nearestPoint(centre, points);
 
@@ -498,11 +498,11 @@ void Foam::treeDataPrimitivePatch<PatchType>::findNearest
     point& nearestPoint
 ) const
 {
-    const pointField& points = patch_.points();
+    const auto& points = patch_.points();
 
     for (const label index : indices)
     {
-        const typename PatchType::face_type& f = patch_[index];
+        const auto& f = patch_[index];
 
         const pointHit nearHit = f.nearestPoint(sample, points);
         const scalar distSqr = sqr(nearHit.distance());
@@ -606,7 +606,7 @@ bool Foam::treeDataPrimitivePatch<PatchType>::findSelfIntersectOp::operator()
     const treeDataPrimitivePatch<PatchType>& shape = tree_.shapes();
     const PatchType& patch = shape.patch();
 
-    const typename PatchType::face_type& f = patch.localFaces()[index];
+    const auto& f = patch.localFaces()[index];
     const edge& e = patch.edges()[edgeID_];
 
     if (!f.found(e[0]) && !f.found(e[1]))
@@ -631,8 +631,8 @@ bool Foam::treeDataPrimitivePatch<PatchType>::findIntersection
     const treeDataPrimitivePatch<PatchType>& shape = tree.shapes();
     const PatchType& patch = shape.patch();
 
-    const pointField& points = patch.points();
-    const typename PatchType::face_type& f = patch[index];
+    const auto& points = patch.points();
+    const auto& f = patch[index];
 
     // Do quick rejection test
     if (shape.cacheBb_)
diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H
index fd5996864d..007d3b519d 100644
--- a/src/meshTools/meshTools/meshTools.H
+++ b/src/meshTools/meshTools/meshTools.H
@@ -34,14 +34,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef meshTools_H
-#define meshTools_H
+#ifndef Foam_meshTools_H
+#define Foam_meshTools_H
 
 #include "label.H"
 #include "vector.H"
 #include "triad.H"
 #include "labelList.H"
-#include "pointField.H"
 #include "faceList.H"
 #include "cellList.H"
 #include "primitivePatch.H"
@@ -51,6 +50,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class polyMesh;
 class primitiveMesh;
 class treeBoundBox;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H
index c31b3ff5ed..0422edadeb 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H
@@ -25,7 +25,6 @@ License
     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::incompressible::sensitivityBezier
 
@@ -37,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef sensitivityBezierIncompressible_H
-#define sensitivityBezierIncompressible_H
+#ifndef Foam_sensitivityBezierIncompressible_H
+#define Foam_sensitivityBezierIncompressible_H
 
 #include "primitiveFieldsFwd.H"
 #include "volFieldsFwd.H"
@@ -46,8 +45,7 @@ SourceFiles
 #include "surfaceFieldsFwd.H"
 #include "volPointInterpolation.H"
 #include "SIBaseIncompressible.H"
-#include "PrimitivePatchInterpolation.H"
-#include "PrimitivePatch.H"
+#include "primitivePatchInterpolation.H"
 #include "deltaBoundary.H"
 #include "Bezier.H"
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H
index 9f83d24fb5..56df11726d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H
@@ -46,7 +46,7 @@ SourceFiles
 #include "surfaceFieldsFwd.H"
 #include "volPointInterpolation.H"
 #include "FIBaseIncompressible.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 #include "deltaBoundary.H"
 #include "Bezier.H"
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
index 5914db0798..8844079cfd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -29,7 +29,7 @@ License
 
 #include "sensitivitySurfaceIncompressible.H"
 #include "incompressibleAdjointSolver.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 #include "syncTools.H"
 #include "addToRunTimeSelectionTable.H"
 #include "faMatrices.H"
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H b/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H
index 00470e7616..3d3896ac22 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H
@@ -36,16 +36,15 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Bezier_H
-#define Bezier_H
+#ifndef Foam_Bezier_H
+#define Foam_Bezier_H
 
 #include "primitiveFieldsFwd.H"
 #include "volFieldsFwd.H"
 #include "pointFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
 #include "volPointInterpolation.H"
-#include "PrimitivePatchInterpolation.H"
-#include "PrimitivePatch.H"
+#include "primitivePatchInterpolation.H"
 #include "deltaBoundary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index 97943c9abe..4d5e5d2d40 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -28,7 +28,7 @@ License
 
 #include "sampledPatchInternalField.H"
 #include "interpolationCellPoint.H"
-#include "PrimitivePatchInterpolation.H"
+#include "primitivePatchInterpolation.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 87c7181ee6..8f7214257e 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -52,12 +52,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef MeshedSurface_H
-#define MeshedSurface_H
+#ifndef Foam_MeshedSurface_H
+#define Foam_MeshedSurface_H
 
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "PatchTools.H"
-#include "pointField.H"
 #include "face.H"
 #include "labelledTri.H"
 #include "bitSet.H"
diff --git a/src/surfMesh/polySurface/polySurface.H b/src/surfMesh/polySurface/polySurface.H
index 2a23c6fe0f..3256c2ec68 100644
--- a/src/surfMesh/polySurface/polySurface.H
+++ b/src/surfMesh/polySurface/polySurface.H
@@ -42,7 +42,7 @@ SourceFiles
 #define Foam_polySurface_H
 
 #include "objectRegistry.H"
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "meshedSurf.H"
 #include "polySurfaceFieldsFwd.H"
 
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index e324a1ebaf..078126c098 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -43,7 +43,7 @@ SourceFiles
 
 #include "surfaceRegistry.H"
 #include "MeshedSurfaceIOAllocator.H"
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "surfZoneIOList.H"
 #include "surfFieldsFwd.H"
 
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 46a401ba08..6e84873870 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -28,7 +28,7 @@ License
 
 #include "AC3DsurfaceFormat.H"
 #include "StringStream.H"
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "faceTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/triSurface/triSurface.H b/src/surfMesh/triSurface/triSurface.H
index 899d76ecd9..f8f0b4519f 100644
--- a/src/surfMesh/triSurface/triSurface.H
+++ b/src/surfMesh/triSurface/triSurface.H
@@ -38,12 +38,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef triSurface_H
-#define triSurface_H
+#ifndef Foam_triSurface_H
+#define Foam_triSurface_H
 
-#include "PrimitivePatch.H"
+#include "primitivePatch.H"
 #include "PatchTools.H"
-#include "pointField.H"
 #include "labelledTri.H"
 #include "boolList.H"
 #include "bitSet.H"

From 28b492bd54b163bb2904dbaf21d92a78b02d499e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 24 Feb 2023 11:20:39 +0100
Subject: [PATCH 109/348] ENH: unroll loops for complexVector functions

STYLE: prefer STL naming real(), imag() instead of Re(), Im()
---
 applications/test/complex/Test-complex.C      |  20 ++
 .../test/matrices/Matrix/Test-Matrix.C        |  12 +-
 .../fields/Fields/complex/complexField.C      | 173 +++++++++-----
 .../fields/Fields/complex/complexField.H      |  77 +++++--
 .../fields/Fields/complex/complexFields.H     |   4 +-
 .../Fields/complex/complexVectorField.C       | 216 +++++++++++++-----
 .../Fields/complex/complexVectorField.H       |  91 ++++++--
 .../matrices/EigenMatrix/EigenMatrix.C        |  16 +-
 .../primitives/Vector/complex/complexVector.C |   3 -
 .../primitives/Vector/complex/complexVector.H |   4 +-
 .../Vector/complex/complexVectorI.H           |  15 ++
 src/OpenFOAM/primitives/complex/complex.H     |  36 +--
 src/OpenFOAM/primitives/complex/complexI.H    |   6 +
 .../energySpectrum/energySpectrum.C           |   2 +-
 src/randomProcesses/fft/calcEk.C              |   2 +-
 src/randomProcesses/fft/fft.C                 |  18 +-
 src/randomProcesses/turbulence/turbGen.C      |   7 +-
 17 files changed, 498 insertions(+), 204 deletions(-)

diff --git a/applications/test/complex/Test-complex.C b/applications/test/complex/Test-complex.C
index 7e76b09324..e8940e07a7 100644
--- a/applications/test/complex/Test-complex.C
+++ b/applications/test/complex/Test-complex.C
@@ -145,6 +145,8 @@ int main(int argc, char *argv[])
 
         complexField cmplx(4);
 
+        zip(cmplx, reals, zero{});
+        zip(cmplx, 1, imags);
         zip(cmplx, reals, imags);
         Info<< nl
             << "zip " << reals << nl
@@ -360,6 +362,24 @@ int main(int argc, char *argv[])
     // MinMax fails since there is no less comparison operator
     // Info<< "min/max = " << MinMax<complex>(fld1) << nl;
 
+
+    // Cross-product
+    {
+        const vector vec(1, 2, 3);
+        const vector realValue(4, 5, 6);
+        const vector imagValue(7, 8, 9);
+
+        complexVector cmplxVec(zip(realValue, imagValue));
+
+        Info<< "complexVector: " << cmplxVec << nl;
+        Info<< "cross: " << (vec ^ cmplxVec) << nl;
+
+        Info<< "cross real: " << (vec ^ realValue) << nl
+            << "cross imag: " << (vec ^ imagValue) << nl
+            << "cross     : "
+            << zip((vec ^ realValue), (vec ^ imagValue)) << nl;
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/test/matrices/Matrix/Test-Matrix.C b/applications/test/matrices/Matrix/Test-Matrix.C
index 73d23b5fce..4c87f07897 100644
--- a/applications/test/matrices/Matrix/Test-Matrix.C
+++ b/applications/test/matrices/Matrix/Test-Matrix.C
@@ -468,13 +468,13 @@ int main(int argc, char *argv[])
 
                 for (auto& val : A)
                 {
-                    val.Re() = rndGen.GaussNormal<scalar>();
-                    val.Im() = rndGen.GaussNormal<scalar>();
+                    val.real(rndGen.GaussNormal<scalar>());
+                    val.imag(rndGen.GaussNormal<scalar>());
                 }
                 for (auto& val : B)
                 {
-                    val.Re() = rndGen.GaussNormal<scalar>();
-                    val.Im() = rndGen.GaussNormal<scalar>();
+                    val.real(rndGen.GaussNormal<scalar>());
+                    val.imag(rndGen.GaussNormal<scalar>());
                 }
 
                 Info<< nl << "# (A.T()).T() = A:" << nl;
@@ -893,8 +893,8 @@ int main(int argc, char *argv[])
 
             for (auto& val : A)
             {
-                val.Re() = rndGen.GaussNormal<scalar>();
-                val.Im() = rndGen.GaussNormal<scalar>();
+                val.real(rndGen.GaussNormal<scalar>());
+                val.imag(rndGen.GaussNormal<scalar>());
             }
 
             Info<< "# SquareMatrix<complex>.symmetric():" << nl
diff --git a/src/OpenFOAM/fields/Fields/complex/complexField.C b/src/OpenFOAM/fields/Fields/complex/complexField.C
index f24fafbf65..e2c08e889d 100644
--- a/src/OpenFOAM/fields/Fields/complex/complexField.C
+++ b/src/OpenFOAM/fields/Fields/complex/complexField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,27 +46,80 @@ namespace Foam
 void Foam::zip
 (
     complexField& result,
-    const UList<scalar>& re,
-    const UList<scalar>& im
+    const UList<scalar>& realValues,
+    const UList<scalar>& imagValues
 )
 {
     const label len = result.size();
 
     #ifdef FULLDEBUG
-    if (len != re.size() || len != im.size())
+    if (len != realValues.size() || len != imagValues.size())
     {
         FatalErrorInFunction
             << "Components sizes do not match: " << len << " ("
-            << re.size() << ' ' << im.size() << ')'
-            << nl
+            << realValues.size() << ' ' << imagValues.size() << ')' << nl
             << abort(FatalError);
     }
     #endif
 
     for (label i=0; i < len; ++i)
     {
-        result[i].Re() = re[i];
-        result[i].Im() = im[i];
+        result[i].real(realValues[i]);
+        result[i].imag(imagValues[i]);
+    }
+}
+
+
+void Foam::zip
+(
+    complexField& result,
+    const UList<scalar>& realValues,
+    const scalar imagValue
+)
+{
+    const label len = result.size();
+
+    #ifdef FULLDEBUG
+    if (len != realValues.size())
+    {
+        FatalErrorInFunction
+            << "Components sizes do not match: " << len
+            << " != " << realValues.size() << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    for (label i=0; i < len; ++i)
+    {
+        result[i].real(realValues[i]);
+        result[i].imag(imagValue);
+    }
+}
+
+
+void Foam::zip
+(
+    complexField& result,
+    const scalar realValue,
+    const UList<scalar>& imagValues
+)
+{
+    const label len = result.size();
+
+    #ifdef FULLDEBUG
+    if (len != imagValues.size())
+    {
+        FatalErrorInFunction
+            << "Components sizes do not match: " << len
+            << " != " << imagValues.size() << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    for (label i=0; i < len; ++i)
+    {
+        result[i].real(realValue);
+        result[i].imag(imagValues[i]);
     }
 }
 
@@ -74,27 +127,26 @@ void Foam::zip
 void Foam::unzip
 (
     const UList<complex>& input,
-    scalarField& re,
-    scalarField& im
+    scalarField& realValues,
+    scalarField& imagValues
 )
 {
     const label len = input.size();
 
     #ifdef FULLDEBUG
-    if (len != re.size() || len != im.size())
+    if (len != realValues.size() || len != imagValues.size())
     {
         FatalErrorInFunction
             << "Components sizes do not match: " << len << " ("
-            << re.size() << ' ' << im.size() << ')'
-            << nl
+            << realValues.size() << ' ' << imagValues.size() << ')' << nl
             << abort(FatalError);
     }
     #endif
 
     for (label i=0; i < len; ++i)
     {
-        re[i] = input[i].Re();
-        im[i] = input[i].Im();
+        realValues[i] = input[i].real();
+        imagValues[i] = input[i].imag();
     }
 }
 
@@ -103,82 +155,91 @@ void Foam::unzip
 
 Foam::complexField Foam::ComplexField
 (
-    const UList<scalar>& re,
-    const UList<scalar>& im
+    const UList<scalar>& realValues,
+    const UList<scalar>& imagValues
 )
 {
-    complexField result(re.size());
+    complexField result(realValues.size());
 
-    Foam::zip(result, re, im);
+    Foam::zip(result, realValues, imagValues);
 
     return result;
 }
 
 
-Foam::complexField Foam::ReComplexField(const UList<scalar>& re)
+Foam::complexField Foam::ComplexField
+(
+    const UList<scalar>& realValues,
+    const scalar imagValue
+)
 {
-    complexField cf(re.size());
+    complexField result(realValues.size());
 
-    forAll(cf, i)
-    {
-        cf[i].Re() = re[i];
-        cf[i].Im() = Zero;
-    }
+    Foam::zip(result, realValues, imagValue);
 
-    return cf;
+    return result;
 }
 
 
-Foam::complexField Foam::ImComplexField(const UList<scalar>& im)
+Foam::complexField Foam::ComplexField
+(
+    const scalar realValue,
+    const UList<scalar>& imagValues
+)
 {
-    complexField cf(im.size());
+    complexField result(imagValues.size());
 
-    forAll(cf, i)
-    {
-        cf[i].Re() = Zero;
-        cf[i].Im() = im[i];
-    }
+    Foam::zip(result, realValue, imagValues);
 
-    return cf;
+    return result;
 }
 
 
-Foam::scalarField Foam::ReImSum(const UList<complex>& cf)
+Foam::scalarField Foam::ReImSum(const UList<complex>& cmplx)
 {
-    scalarField sf(cf.size());
+    scalarField result(cmplx.size());
 
-    forAll(sf, i)
-    {
-        sf[i] = cf[i].Re() + cf[i].Im();
-    }
+    std::transform
+    (
+        cmplx.cbegin(),
+        cmplx.cend(),
+        result.begin(),
+        [](const complex& c) { return c.cmptSum(); }
+    );
 
-    return sf;
+    return result;
 }
 
 
-Foam::scalarField Foam::Re(const UList<complex>& cf)
+Foam::scalarField Foam::Re(const UList<complex>& cmplx)
 {
-    scalarField sf(cf.size());
+    scalarField result(cmplx.size());
 
-    forAll(sf, i)
-    {
-        sf[i] = cf[i].Re();
-    }
+    std::transform
+    (
+        cmplx.cbegin(),
+        cmplx.cend(),
+        result.begin(),
+        [](const complex& c) { return c.real(); }
+    );
 
-    return sf;
+    return result;
 }
 
 
-Foam::scalarField Foam::Im(const UList<complex>& cf)
+Foam::scalarField Foam::Im(const UList<complex>& cmplx)
 {
-    scalarField sf(cf.size());
+    scalarField result(cmplx.size());
 
-    forAll(sf, i)
-    {
-        sf[i] = cf[i].Im();
-    }
+    std::transform
+    (
+        cmplx.cbegin(),
+        cmplx.cend(),
+        result.begin(),
+        [](const complex& c) { return c.imag(); }
+    );
 
-    return sf;
+    return result;
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/complex/complexField.H b/src/OpenFOAM/fields/Fields/complex/complexField.H
index 70a2d44e90..8de655acae 100644
--- a/src/OpenFOAM/fields/Fields/complex/complexField.H
+++ b/src/OpenFOAM/fields/Fields/complex/complexField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef complexField_H
-#define complexField_H
+#ifndef Foam_complexField_H
+#define Foam_complexField_H
 
 #include "complex.H"
 #include "scalarField.H"
@@ -53,46 +53,87 @@ namespace Foam
 
 typedef Field<complex> complexField;
 
+
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-//- Zip together complex field from components
+//- Zip together complex field from real/imag components
 void zip
 (
     complexField& result,
-    const UList<scalar>& re,
-    const UList<scalar>& im
+    const UList<scalar>& realValues,
+    const UList<scalar>& imagValues
+);
+
+//- Zip together complex field from real components and constant imag component
+void zip
+(
+    complexField& result,
+    const UList<scalar>& realValues,
+    const scalar imagValue
+);
+
+//- Zip together complex field from constant real component and imag components
+void zip
+(
+    complexField& result,
+    const scalar realValue,
+    const UList<scalar>& imagValues
 );
 
 //- Unzip complex field into components
 void unzip
 (
     const UList<complex>& input,
-    scalarField& re,
-    scalarField& im
+    scalarField& realValues,
+    scalarField& imagValues
 );
 
 
-//- Zip up two lists of values into a list of complex
+//- Create complex field by zipping two lists of real/imag values
 complexField ComplexField
 (
-    const UList<scalar>& re,
-    const UList<scalar>& im
+    const UList<scalar>& realValues,
+    const UList<scalar>& imagValues
 );
 
-//- Create complex field from a list of real (using imag == 0)
-complexField ReComplexField(const UList<scalar>& re);
+//- Create complex field by zipping a list of real components
+//- and a constant imag component
+complexField ComplexField
+(
+    const UList<scalar>& realValues,
+    const scalar imagValue
+);
+
+//- Create complex field by zipping a constant real component
+//- and a list of imag components
+complexField ComplexField
+(
+    const scalar realValue,
+    const UList<scalar>& imagValues
+);
 
-//- Create complex field from a list of imag (using real == 0)
-complexField ImComplexField(const UList<scalar>& im);
 
 //- Extract real component
-scalarField Re(const UList<complex>& cf);
+scalarField Re(const UList<complex>& cmplx);
 
 //- Extract imag component
-scalarField Im(const UList<complex>& cf);
+scalarField Im(const UList<complex>& cmplx);
 
 //- Sum real and imag components
-scalarField ReImSum(const UList<complex>& cf);
+scalarField ReImSum(const UList<complex>& cmplx);
+
+
+//- Create complex field from a list of real (using imag == 0)
+inline complexField ReComplexField(const UList<scalar>& realValues)
+{
+    return ComplexField(realValues, scalar(0));
+}
+
+//- Create complex field from a list of imag (using real == 0)
+inline complexField ImComplexField(const UList<scalar>& imagValues)
+{
+    return ComplexField(scalar(0), imagValues);
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/complex/complexFields.H b/src/OpenFOAM/fields/Fields/complex/complexFields.H
index 4a9ac3f25d..0eabcaf2bc 100644
--- a/src/OpenFOAM/fields/Fields/complex/complexFields.H
+++ b/src/OpenFOAM/fields/Fields/complex/complexFields.H
@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef complexFields_H
-#define complexFields_H
+#ifndef Foam_complexFields_H
+#define Foam_complexFields_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/complex/complexVectorField.C b/src/OpenFOAM/fields/Fields/complex/complexVectorField.C
index 99ce5ae544..dfbc2a0874 100644
--- a/src/OpenFOAM/fields/Fields/complex/complexVectorField.C
+++ b/src/OpenFOAM/fields/Fields/complex/complexVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,117 +40,209 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-Foam::complexVectorField Foam::ComplexField
+void Foam::zip
 (
-    const UList<vector>& re,
-    const UList<vector>& im
+    complexVectorField& result,
+    const UList<vector>& realValues,
+    const UList<vector>& imagValues
 )
 {
-    complexVectorField cvf(re.size());
+    const label len = result.size();
 
-    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    #ifdef FULLDEBUG
+    if (len != realValues.size() || len != imagValues.size())
     {
-        forAll(cvf, i)
-        {
-            cvf[i].component(cmpt).Re() = re[i].component(cmpt);
-            cvf[i].component(cmpt).Im() = im[i].component(cmpt);
-        }
+        FatalErrorInFunction
+            << "Components sizes do not match: " << len << " ("
+            << realValues.size() << ' ' << imagValues.size() << ')' << nl
+            << abort(FatalError);
     }
+    #endif
 
-    return cvf;
+    for (label i=0; i < len; ++i)
+    {
+        result[i] = Foam::zip(realValues[i], imagValues[i]);
+    }
 }
 
 
-Foam::complexVectorField Foam::ReComplexField(const UList<vector>& re)
+void Foam::zip
+(
+    complexVectorField& result,
+    const UList<vector>& realValues,
+    const vector& imagValue
+)
 {
-    complexVectorField cvf(re.size());
+    const label len = result.size();
 
-    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    #ifdef FULLDEBUG
+    if (len != realValues.size())
     {
-        forAll(cvf, i)
-        {
-            cvf[i].component(cmpt).Re() = re[i].component(cmpt);
-            cvf[i].component(cmpt).Im() = 0.0;
-        }
+        FatalErrorInFunction
+            << "Components sizes do not match: " << len << " != "
+            << realValues.size() << nl
+            << abort(FatalError);
     }
+    #endif
 
-    return cvf;
+    for (label i=0; i < len; ++i)
+    {
+        result[i] = Foam::zip(realValues[i], imagValue);
+    }
 }
 
 
-Foam::complexVectorField Foam::ImComplexField(const UList<vector>& im)
+void Foam::zip
+(
+    complexVectorField& result,
+    const vector& realValue,
+    const UList<vector>& imagValues
+)
 {
-    complexVectorField cvf(im.size());
+    const label len = result.size();
 
-    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
+    #ifdef FULLDEBUG
+    if (len != imagValues.size())
     {
-        forAll(cvf, i)
-        {
-            cvf[i].component(cmpt).Re() = 0.0;
-            cvf[i].component(cmpt).Im() = im[i].component(cmpt);
-        }
+        FatalErrorInFunction
+            << "Components sizes do not match: " << len << " != "
+            << imagValues.size() << nl
+            << abort(FatalError);
     }
+    #endif
 
-    return cvf;
+    for (label i=0; i < len; ++i)
+    {
+        result[i] = Foam::zip(realValue, imagValues[i]);
+    }
 }
 
 
-Foam::vectorField Foam::ReImSum(const UList<complexVector>& cvf)
+Foam::complexVectorField Foam::ComplexField
+(
+    const UList<vector>& realValues,
+    const UList<vector>& imagValues
+)
 {
-    vectorField vf(cvf.size());
+    complexVectorField result(realValues.size());
 
-    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
-    {
-        forAll(cvf, i)
-        {
-            vf[i].component(cmpt) =
-                cvf[i].component(cmpt).Re() + cvf[i].component(cmpt).Im();
-        }
-    }
+    Foam::zip(result, realValues, imagValues);
 
-    return vf;
+    return result;
 }
 
 
-Foam::vectorField Foam::Re(const UList<complexVector>& cvf)
+Foam::complexVectorField Foam::ComplexField
+(
+    const UList<vector>& realValues,
+    const vector& imagValue
+)
 {
-    vectorField vf(cvf.size());
+    complexVectorField result(realValues.size());
 
-    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
-    {
-        forAll(cvf, i)
-        {
-            vf[i].component(cmpt) = cvf[i].component(cmpt).Re();
-        }
-    }
+    Foam::zip(result, realValues, imagValue);
 
-    return vf;
+    return result;
 }
 
 
-Foam::vectorField Foam::Im(const UList<complexVector>& cvf)
+Foam::complexVectorField Foam::ComplexField
+(
+    const vector& realValue,
+    const UList<vector>& imagValues
+)
 {
-    vectorField vf(cvf.size());
+    complexVectorField result(imagValues.size());
 
-    for (direction cmpt=0; cmpt<vector::nComponents; ++cmpt)
-    {
-        forAll(cvf, i)
+    Foam::zip(result, realValue, imagValues);
+
+    return result;
+}
+
+
+Foam::vectorField Foam::ReImSum(const UList<complexVector>& cmplx)
+{
+    vectorField result(cmplx.size());
+
+    std::transform
+    (
+        cmplx.cbegin(),
+        cmplx.cend(),
+        result.begin(),
+        [](const complexVector& c)
         {
-            vf[i].component(cmpt) = cvf[i].component(cmpt).Im();
+            return vector(c.x().cmptSum(), c.y().cmptSum(), c.z().cmptSum());
         }
-    }
+    );
 
-    return vf;
+    return result;
+}
+
+
+Foam::vectorField Foam::Re(const UList<complexVector>& cmplx)
+{
+    vectorField result(cmplx.size());
+
+    std::transform
+    (
+        cmplx.cbegin(),
+        cmplx.cend(),
+        result.begin(),
+        [](const complexVector& c)
+        {
+            return vector(c.x().real(), c.y().real(), c.z().real());
+        }
+    );
+
+    return result;
+}
+
+
+Foam::vectorField Foam::Im(const UList<complexVector>& cmplx)
+{
+    vectorField result(cmplx.size());
+
+    std::transform
+    (
+        cmplx.cbegin(),
+        cmplx.cend(),
+        result.begin(),
+        [](const complexVector& c)
+        {
+            return vector(c.x().imag(), c.y().imag(), c.z().imag());
+        }
+    );
+
+    return result;
 }
 
 
 Foam::complexVectorField Foam::operator^
 (
-    const UList<vector>& vf,
-    const UList<complexVector>& cvf
+    const UList<vector>& vec,
+    const UList<complexVector>& cmplx
 )
 {
-    return ComplexField(vf^Re(cvf), vf^Im(cvf));
+    const label len = cmplx.size();
+
+    #ifdef FULLDEBUG
+    if (len != vec.size())
+    {
+        FatalErrorInFunction
+            << "Parameter sizes do not match: " << vec.size()
+            << " != " << len << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    complexVectorField result(len);
+
+    for (label i=0; i < len; ++i)
+    {
+        result[i] = (vec[i] ^ cmplx[i]);
+    }
+
+    return result;
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/complex/complexVectorField.H b/src/OpenFOAM/fields/Fields/complex/complexVectorField.H
index 15b8978581..ab8e33215e 100644
--- a/src/OpenFOAM/fields/Fields/complex/complexVectorField.H
+++ b/src/OpenFOAM/fields/Fields/complex/complexVectorField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef complexVectorField_H
-#define complexVectorField_H
+#ifndef Foam_complexVectorField_H
+#define Foam_complexVectorField_H
 
 #include "complex.H"
 #include "complexVector.H"
@@ -51,33 +51,92 @@ namespace Foam
 
 typedef Field<complexVector> complexVectorField;
 
-//- Zip up two lists of values into a list of complex
-complexVectorField ComplexField
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+//- Zip together complex vector field from real/imag components
+void zip
 (
-    const UList<vector>& re,
-    const UList<vector>& im
+    complexVectorField& result,
+    const UList<vector>& realValues,
+    const UList<vector>& imagValues
 );
 
 
-//- Create complex field from a list of real (using imag == 0)
-complexVectorField ReComplexField(const UList<vector>& re);
+//- Zip together complex vector field from real components
+//- and constant imag component
+void zip
+(
+    complexVectorField& result,
+    const UList<vector>& realValues,
+    const vector& imagValue
+);
+
+
+//- Zip together complex vector field from constant real component
+//- and imag components
+void zip
+(
+    complexVectorField& result,
+    const vector& realValue,
+    const UList<vector>& imagValues
+);
+
+
+//- Create complexVector field by zipping two lists of real/imag values
+complexVectorField ComplexField
+(
+    const UList<vector>& realValues,
+    const UList<vector>& imagValues
+);
+
+//- Create complexVector field by zipping a list of real components
+//- and a constant imag component
+complexVectorField ComplexField
+(
+    const UList<vector>& realValues,
+    const vector& imagValue
+);
+
+//- Create complexVector field by zipping a constant real component
+//- and a list of imag components
+complexVectorField ComplexField
+(
+    const vector& realValue,
+    const UList<vector>& imagValues
+);
 
-//- Create complex field from a list of imag (using real == 0)
-complexVectorField ImComplexField(const UList<vector>& im);
 
 //- Extract real component
-vectorField Re(const UList<complexVector>& cvf);
+vectorField Re(const UList<complexVector>& cmplx);
 
 //- Extract imag component
-vectorField Im(const UList<complexVector>& cvf);
+vectorField Im(const UList<complexVector>& cmplx);
 
 //- Sum real and imag components
-vectorField ReImSum(const UList<complexVector>& cvf);
+vectorField ReImSum(const UList<complexVector>& cmplx);
 
+
+//- Create complexVector field from a list of real (using imag == 0)
+inline complexVectorField ReComplexField(const UList<vector>& realValues)
+{
+    return ComplexField(realValues, vector::zero);
+}
+
+//- Create complexVector field from a list of imag (using real == 0)
+inline complexVectorField ImComplexField(const UList<vector>& imagValues)
+{
+    return ComplexField(vector::zero, imagValues);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Cross-product
 complexVectorField operator^
 (
-    const UList<vector>& vf,
-    const UList<complexVector>& cvf
+    const UList<vector>& vec,
+    const UList<complexVector>& cmplx
 );
 
 
diff --git a/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.C b/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.C
index 30ddb10c36..30f28d7210 100644
--- a/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.C
+++ b/src/OpenFOAM/matrices/EigenMatrix/EigenMatrix.C
@@ -873,8 +873,8 @@ void Foam::EigenMatrix<cmptType>::realSchur()
                 complex cDiv = complex(0.0, -H_[n - 1][n])
                         /complex(H_[n - 1][n-1]-p, q);
 
-                H_[n - 1][n - 1] = cDiv.Re();
-                H_[n - 1][n] = cDiv.Im();
+                H_[n - 1][n - 1] = cDiv.real();
+                H_[n - 1][n] = cDiv.imag();
             }
 
             H_[n][n - 1] = Zero;
@@ -907,8 +907,8 @@ void Foam::EigenMatrix<cmptType>::realSchur()
                     if (EValsIm_[i] == 0)
                     {
                         complex cDiv = complex(-ra, -sa)/complex(w, q);
-                        H_[i][n - 1] = cDiv.Re();
-                        H_[i][n] = cDiv.Im();
+                        H_[i][n - 1] = cDiv.real();
+                        H_[i][n] = cDiv.imag();
                     }
                     else
                     {
@@ -930,8 +930,8 @@ void Foam::EigenMatrix<cmptType>::realSchur()
                                 complex(x*r - z*ra + q*sa, x*s - z*sa - q*ra)
                                     /complex(vr, vi);
 
-                        H_[i][n - 1] = cDiv.Re();
-                        H_[i][n] = cDiv.Im();
+                        H_[i][n - 1] = cDiv.real();
+                        H_[i][n] = cDiv.imag();
 
                         if (mag(x) > (mag(z) + mag(q)))
                         {
@@ -946,8 +946,8 @@ void Foam::EigenMatrix<cmptType>::realSchur()
                             complex cDiv = complex(-r - y*H_[i][n - 1], -s
                                     - y*H_[i][n])/complex(z, q);
 
-                            H_[i + 1][n - 1] = cDiv.Re();
-                            H_[i + 1][n] = cDiv.Im();
+                            H_[i + 1][n - 1] = cDiv.real();
+                            H_[i + 1][n] = cDiv.imag();
                         }
                     }
 
diff --git a/src/OpenFOAM/primitives/Vector/complex/complexVector.C b/src/OpenFOAM/primitives/Vector/complex/complexVector.C
index b1838bd1b5..819b54b40c 100644
--- a/src/OpenFOAM/primitives/Vector/complex/complexVector.C
+++ b/src/OpenFOAM/primitives/Vector/complex/complexVector.C
@@ -24,9 +24,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Vector of complex numbers.
-
 \*---------------------------------------------------------------------------*/
 
 #include "complexVector.H"
diff --git a/src/OpenFOAM/primitives/Vector/complex/complexVector.H b/src/OpenFOAM/primitives/Vector/complex/complexVector.H
index fbba707ef4..7016b19109 100644
--- a/src/OpenFOAM/primitives/Vector/complex/complexVector.H
+++ b/src/OpenFOAM/primitives/Vector/complex/complexVector.H
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef complexVector_H
-#define complexVector_H
+#ifndef Foam_complexVector_H
+#define Foam_complexVector_H
 
 #include "complex.H"
 #include "vector.H"
diff --git a/src/OpenFOAM/primitives/Vector/complex/complexVectorI.H b/src/OpenFOAM/primitives/Vector/complex/complexVectorI.H
index fbd0a76926..bf01a86b67 100644
--- a/src/OpenFOAM/primitives/Vector/complex/complexVectorI.H
+++ b/src/OpenFOAM/primitives/Vector/complex/complexVectorI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +31,20 @@ License
 namespace Foam
 {
 
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+//- Zip together complexVector from real/imag vectors
+inline complexVector zip(const vector& realValue, const vector& imagValue)
+{
+    return complexVector
+    (
+        complex(realValue.x(), imagValue.x()),
+        complex(realValue.y(), imagValue.y()),
+        complex(realValue.z(), imagValue.z())
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 inline complexVector operator*(const complex& v1, const complexVector& v2)
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index 6fa4bc5bf0..cc54994d23 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -138,24 +138,6 @@ public:
         void imag(scalar val) noexcept { im = val; }
 
 
-    // Access
-
-        //- Real part of complex number
-        scalar Re() const noexcept { return re; }
-
-        //- Imaginary part of complex number
-        scalar Im() const noexcept { return im; }
-
-
-    // Edit
-
-        //- Real part of complex number
-        scalar& Re() noexcept { return re; }
-
-        //- Imaginary part of complex number
-        scalar& Im() noexcept { return im; }
-
-
     // Methods
 
         //- Complex conjugate
@@ -168,6 +150,9 @@ public:
         //- The L2-norm squared of complex
         inline scalar magSqr() const;
 
+        //- The sum of real/imag components
+        inline scalar cmptSum() const noexcept;
+
 
     // Member Operators
 
@@ -219,6 +204,21 @@ public:
         friend complex operator/(const complex& c1, const complex& c2);
         friend complex operator/(const complex& c, const scalar s);
         friend complex operator/(const scalar s, const complex& c);
+
+
+    // Housekeeping
+
+        //- Get real part of complex number. Same as real()
+        scalar Re() const noexcept { return re; }
+
+        //- Get imaginary part of complex number. Same as imag()
+        scalar Im() const noexcept { return im; }
+
+        //- Non-const access to real part. Prefer real() setter method
+        scalar& Re() noexcept { return re; }
+
+        //- Non-const access to imaginary part. Prefer imag() setter method
+        scalar& Im() noexcept { return im; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H
index cfb57ae2ff..ceda93cb89 100644
--- a/src/OpenFOAM/primitives/complex/complexI.H
+++ b/src/OpenFOAM/primitives/complex/complexI.H
@@ -90,6 +90,12 @@ inline Foam::scalar Foam::complex::magSqr() const
 }
 
 
+inline Foam::scalar Foam::complex::cmptSum() const noexcept
+{
+    return (re + im);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 inline void Foam::complex::operator=(const Foam::zero)
diff --git a/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.C b/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.C
index 8e1d24af70..0a8a159b28 100644
--- a/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.C
+++ b/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.C
@@ -73,7 +73,7 @@ void Foam::functionObjects::energySpectrum::calcAndWriteSpectrum
     (
         fft::forwardTransform
         (
-            ReComplexField(U),
+            ComplexField(U, vector::zero),
             List<int>({N.x(), N.y(), N.z()})
         )
        /scalar(cmptProduct(N))
diff --git a/src/randomProcesses/fft/calcEk.C b/src/randomProcesses/fft/calcEk.C
index ebc234cfb2..5baf01cb47 100644
--- a/src/randomProcesses/fft/calcEk.C
+++ b/src/randomProcesses/fft/calcEk.C
@@ -41,7 +41,7 @@ graph calcEk
     (
         fft::forwardTransform
         (
-            ReComplexField(U.primitiveField()),
+            ComplexField(U.primitiveField(), vector::zero),
             K.nn()
         )*recRootN,
         K
diff --git a/src/randomProcesses/fft/fft.C b/src/randomProcesses/fft/fft.C
index 8d483b6031..27c4dc5299 100644
--- a/src/randomProcesses/fft/fft.C
+++ b/src/randomProcesses/fft/fft.C
@@ -47,7 +47,7 @@ void Foam::fft::fftRenumberRecurse
         // We've worked out the renumbering scheme. Now copy
         // the components across
 
-        data[l1] = complex(renumData[l2].Re(), renumData[l2].Im());
+        data[l1] = renumData[l2];
     }
     else
     {
@@ -150,12 +150,12 @@ Foam::fft::realTransform1D(const scalarField& field)
     auto tresult = tmp<complexField>::New(nBy2 + 1);
     auto& result = tresult.ref();
 
-    result[0].Re() = out[0];
-    result[nBy2].Re() = out[nBy2];
+    result[0].real(out[0]);
+    result[nBy2].real(out[nBy2]);
     for (label i = 1; i < nBy2; ++i)
     {
-        result[i].Re() = out[i];
-        result[i].Im() = out[n - i];
+        result[i].real(out[i]);
+        result[i].imag(out[n - i]);
     }
 
     fftw_destroy_plan(plan);
@@ -198,8 +198,8 @@ void Foam::fft::transform
 
     forAll(field, i)
     {
-        inPtr[i][0] = field[i].Re();
-        inPtr[i][1] = field[i].Im();
+        inPtr[i][0] = field[i].real();
+        inPtr[i][1] = field[i].imag();
     }
 
     // Create the plan
@@ -220,8 +220,8 @@ void Foam::fft::transform
 
     forAll(field, i)
     {
-        field[i].Re() = outPtr[i][0];
-        field[i].Im() = outPtr[i][1];
+        field[i].real(outPtr[i][0]);
+        field[i].imag(outPtr[i][1]);
     }
 
     fftw_destroy_plan(plan);
diff --git a/src/randomProcesses/turbulence/turbGen.C b/src/randomProcesses/turbulence/turbGen.C
index 23b119f87a..dd50dea39a 100644
--- a/src/randomProcesses/turbulence/turbGen.C
+++ b/src/randomProcesses/turbulence/turbGen.C
@@ -74,8 +74,11 @@ Foam::vectorField Foam::turbGen::U()
     (
         fft::reverseTransform
         (
-            ComplexField(cos(constant::mathematical::twoPi*rndPhases)*s,
-            sin(constant::mathematical::twoPi*rndPhases)*s),
+            ComplexField
+            (
+                cos(constant::mathematical::twoPi*rndPhases)*s,
+                sin(constant::mathematical::twoPi*rndPhases)*s
+            ),
             K.nn()
         )*recRootN
     );

From cdcbd05587d9082c5c5644e81c640555c0ea8efa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 23 Feb 2023 14:38:19 +0100
Subject: [PATCH 110/348] COMP: resolve clamp() float/double ambiguity (SPDP
 compilation)

- pass by value instead of reference, add functional casts in some
  places. Can still rely on integer promotions though.

  OK:   clamp(value, 2, 20)   ==> (float, int, int)
  OK:   clamp(value, scalar(2), scalar(20))  ==> (float, float, float)
  NOK:  clamp(value, 2.0, 20) ==> (float, double, int)
---
 applications/test/minMax2/Make/options                   | 9 ++-------
 applications/test/minMax2/Test-minMax2.C                 | 2 +-
 src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C       | 4 ++--
 src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H | 2 +-
 src/OpenFOAM/primitives/Scalar/Scalar.H                  | 2 +-
 src/OpenFOAM/primitives/Scalar/doubleFloat.H             | 6 +++---
 src/OpenFOAM/primitives/ints/int/int.H                   | 6 +++---
 src/OpenFOAM/primitives/ints/uint/uint.H                 | 6 +++---
 .../turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C       | 2 +-
 src/combustionModels/EDC/EDC.C                           | 9 ++++++---
 .../activeBaffleVelocityFvPatchVectorField.C             | 2 +-
 ...activePressureForceBaffleVelocityFvPatchVectorField.C | 2 +-
 .../surfaceInterpolation/limitedSchemes/SFCD/SFCD.H      | 2 +-
 .../limitedSchemes/filteredLinear/filteredLinear.H       | 2 +-
 .../optimisation/lineSearch/lineSearch/lineSearch.C      | 3 ++-
 15 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/applications/test/minMax2/Make/options b/applications/test/minMax2/Make/options
index d27c95d033..18e6fe47af 100644
--- a/applications/test/minMax2/Make/options
+++ b/applications/test/minMax2/Make/options
@@ -1,7 +1,2 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/minMax2/Test-minMax2.C b/applications/test/minMax2/Test-minMax2.C
index ec02d21d3d..e228f0dce2 100644
--- a/applications/test/minMax2/Test-minMax2.C
+++ b/applications/test/minMax2/Test-minMax2.C
@@ -28,7 +28,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "fvCFD.H"
+#include "argList.H"
 #include "Time.H"
 #include "BitOps.H"
 #include "HashOps.H"
diff --git a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
index 04be67825b..529d009cbc 100644
--- a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
+++ b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
@@ -100,8 +100,8 @@ void Foam::adaptiveSolver::solve
     // If the error is small increase the step-size
     if (err > pow(maxScale_/safeScale_, -1.0/alphaInc_))
     {
-        dxTry =
-            clamp(safeScale_*pow(err, -alphaInc_), minScale_, maxScale_)*dx;
+        scalar scale = safeScale_*pow(err, -alphaInc_);
+        dxTry = clamp(scale, minScale_, maxScale_)*dx;
     }
     else
     {
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index 212cdcdc3b..21d63cd4c9 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -334,7 +334,7 @@ inline Foam::scalar Foam::triangle<Point, PointRef>::circumRadius() const
     }
 
     const scalar a = (d1 + d2)*(d2 + d3)*(d3 + d1) / denom;
-    return 0.5*Foam::sqrt(clamp(a, 0, GREAT));
+    return 0.5*Foam::sqrt(clamp(a, scalar(0), scalar(GREAT)));
 }
 
 
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 4fe5c81b66..ffc7d71c64 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -302,7 +302,7 @@ inline Scalar clamp(const Scalar val, const Foam::zero_one)
 
 
 // Fast implementation, and with scalar promotion of upper/lower limits
-inline Scalar clamp(const Scalar& val, const Scalar& lower, const Scalar& upper)
+inline Scalar clamp(const Scalar val, const Scalar lower, const Scalar upper)
 {
     return (val < lower) ? lower : (upper < val) ? upper : val;
 }
diff --git a/src/OpenFOAM/primitives/Scalar/doubleFloat.H b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
index 5117199c8c..b4f8b74d46 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleFloat.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
@@ -41,12 +41,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define MAXMINPOW(retType, type1, type2)                \
+#define MAXMINPOW(RetType, Type1, Type2)                \
                                                         \
-MAXMIN(retType, type1, type2)                           \
+MAXMIN(RetType, Type1, Type2)                           \
                                                         \
 /*! \brief Raise base to the power expon */             \
-inline double pow(const type1 base, const type2 expon)  \
+inline double pow(const Type1 base, const Type2 expon)  \
 {                                                       \
     return ::pow(double(base), double(expon));          \
 }
diff --git a/src/OpenFOAM/primitives/ints/int/int.H b/src/OpenFOAM/primitives/ints/int/int.H
index 48900d3c8c..9e9af9d59b 100644
--- a/src/OpenFOAM/primitives/ints/int/int.H
+++ b/src/OpenFOAM/primitives/ints/int/int.H
@@ -47,16 +47,16 @@ SourceFiles
 namespace Foam
 {
 
-#define MAXMIN(retType, type1, type2)                                          \
+#define MAXMIN(RetType, Type1, Type2)                                          \
                                                                                \
 /*! \brief Floating/integral min. Use stdFoam::min() to preserve references */ \
-inline retType min(const type1 s1, const type2 s2)                             \
+inline RetType min(const Type1 s1, const Type2 s2)                             \
 {                                                                              \
     return (s1 < s2) ? s1 : s2;                                                \
 }                                                                              \
                                                                                \
 /*! \brief Floating integral max. Use stdFoam::max() to preserve references */ \
-inline retType max(const type1 s1, const type2 s2)                             \
+inline RetType max(const Type1 s1, const Type2 s2)                             \
 {                                                                              \
     return (s2 < s1) ? s1 : s2;                                                \
 }
diff --git a/src/OpenFOAM/primitives/ints/uint/uint.H b/src/OpenFOAM/primitives/ints/uint/uint.H
index 01e5090771..ec00595e3a 100644
--- a/src/OpenFOAM/primitives/ints/uint/uint.H
+++ b/src/OpenFOAM/primitives/ints/uint/uint.H
@@ -48,16 +48,16 @@ SourceFiles
 namespace Foam
 {
 
-#define MAXMIN(retType, type1, type2)                                          \
+#define MAXMIN(RetType, Type1, Type2)                                          \
                                                                                \
 /*! \brief Floating/integral min. Use stdFoam::min() to preserve references */ \
-inline retType min(const type1 s1, const type2 s2)                             \
+inline RetType min(const Type1 s1, const Type2 s2)                             \
 {                                                                              \
     return (s1 < s2) ? s1 : s2;                                                \
 }                                                                              \
                                                                                \
 /*! \brief Floating/integral max. Use stdFoam::max() to preserve references */ \
-inline retType max(const type1 s1, const type2 s2)                             \
+inline RetType max(const Type1 s1, const Type2 s2)                             \
 {                                                                              \
     return (s2 < s1) ? s1 : s2;                                                \
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
index d78511df8d..b691180936 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C
@@ -310,7 +310,7 @@ tmp<volScalarField::Internal> kOmegaSSTLM<BasicTurbulenceModel>::ReThetat0
             }
 
             lambda = sqr(thetat)/nu[celli]*dUsds[celli];
-            lambda = clamp(lambda, -0.1, 0.1);
+            lambda = clamp(lambda, scalar(-0.1), scalar(0.1));
 
             lambdaErr = mag(lambda - lambda0);
 
diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C
index 66ac5e9780..434a8f87ec 100644
--- a/src/combustionModels/EDC/EDC.C
+++ b/src/combustionModels/EDC/EDC.C
@@ -108,14 +108,17 @@ void Foam::combustionModels::EDC<ReactionThermo>::correct()
             {
                 const scalar nu = mu[i]/(rho[i] + SMALL);
 
-                const scalar Da =
-                    clamp(sqrt(nu/(epsilon[i] + SMALL))/tc[i], 1e-10, 10);
+                const scalar Da = clamp
+                (
+                    sqrt(nu/(epsilon[i] + SMALL))/tc[i],
+                    scalar(1e-10), scalar(10)
+                );
 
                 const scalar ReT = sqr(k[i])/(nu*epsilon[i] + SMALL);
                 const scalar CtauI = min(C1_/(Da*sqrt(ReT + 1)), 2.1377);
 
                 const scalar CgammaI =
-                    clamp(C2_*sqrt(Da*(ReT + 1)), 0.4082, 5);
+                    clamp(C2_*sqrt(Da*(ReT + 1)), scalar(0.4082), scalar(5));
 
                 const scalar gammaL =
                     CgammaI*pow025(nu*epsilon[i]/(sqr(k[i]) + SMALL));
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 7de63c424d..a72d3fcb42 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -259,7 +259,7 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
                 *(orientation_*sign(forceDiff))
             );
 
-        openFraction_ = clamp(openFraction_, 1e-6, 1 - 1e-6);
+        openFraction_ = clamp(openFraction_, scalar(1e-6), scalar(1 - 1e-6));
 
         Info<< "openFraction = " << openFraction_ << endl;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index c69104703d..a7fb3a6047 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -310,7 +310,7 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
 
             baffleActivated_ = true;
         }
-        openFraction_ = clamp(openFraction_, 1e-6, 1 - 1e-6);
+        openFraction_ = clamp(openFraction_, scalar(1e-6), scalar(1 - 1e-6));
 
         if (Pstream::master())
         {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H
index a9298c1214..5daeb2c955 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/SFCD/SFCD.H
@@ -82,7 +82,7 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        scalar limitPhict = clamp(phict, 0, 0.5);
+        scalar limitPhict = clamp(phict, scalar(0), scalar(0.5));
         return limitPhict/(1 - limitPhict);
     }
 };
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
index d7ee786056..ff607e7867 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
@@ -93,7 +93,7 @@ public:
            /(max(mag(dcP), mag(dcN)) + SMALL);
 
         // Limit the limiter between linear and 20% upwind
-        return clamp(limiter, 0.8, 1);
+        return clamp(limiter, scalar(0.8), scalar(1));
     }
 };
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
index ef4a26bfee..3334a96dd0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
@@ -167,7 +167,8 @@ void Foam::lineSearch::reset()
         // step_ = 2*(oldMeritValue_-prevMeritValue_)/directionalDeriv_;
         // Interpolate in order to get same improvement with the previous
         // optimisation cycle
-        step_ = clamp(step_*prevMeritDeriv_/directionalDeriv_, minStep_, 1);
+        step_ =
+            clamp(step_*prevMeritDeriv_/directionalDeriv_, minStep_, scalar(1));
         Info<< "\n------- Computing initial step-------" << endl;
         Info<< "old dphi(0) "  << prevMeritDeriv_ << endl;
         Info<< "dphi(0) "      << directionalDeriv_ << endl;

From b33b26ad34a929825056ba4b40177664b765cd59 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 23 Feb 2023 15:50:43 +0100
Subject: [PATCH 111/348] STYLE: replace zero::null usage with zero

- the null output adapter was previously used for the HashTables API
  when HashSet actually stored key/value. Now that the node only
  contains the key, having suppressed output is redundant, as is the
  zero::null class (reduces clutter)

STYLE: replace one::minus dispatch in extendedEdgeMesh

GIT: remove Foam::nil typedef (deprecated since May-2017)
---
 applications/test/HashSet/Test-hashSet.C      |  8 +--
 src/OpenFOAM/compat/nil.H                     | 19 ------
 .../containers/HashTables/HashSet/HashSet.H   |  4 +-
 .../HashTables/HashTable/HashTable.H          |  2 +-
 .../HashTables/HashTable/HashTableDetail.H    | 16 ++---
 src/OpenFOAM/meshes/primitiveShapes/cut/cut.H | 24 ++++----
 .../primitives/nullObject/nullObject.H        |  2 +-
 src/OpenFOAM/primitives/traits/one.H          | 58 +------------------
 src/OpenFOAM/primitives/traits/zero.C         |  4 +-
 src/OpenFOAM/primitives/traits/zero.H         | 38 ++----------
 .../extendedEdgeMesh/extendedEdgeMesh.C       |  8 +--
 .../extendedEdgeMesh/extendedEdgeMesh.H       |  4 +-
 12 files changed, 43 insertions(+), 144 deletions(-)
 delete mode 100644 src/OpenFOAM/compat/nil.H

diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C
index b4bdd07cab..3416abbe68 100644
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,11 +25,11 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
+    Some simple HashSet tests
 
 \*---------------------------------------------------------------------------*/
 
 #include "hashedWordList.H"
-#include "nil.H"
 #include "HashOps.H"
 #include "HashSet.H"
 #include "Map.H"
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
         { "value3", 3 }
     });
 
-    HashTable<nil> tableB;
+    HashTable<Foam::zero> tableB;
     tableB.emplace("value4");
     tableB.emplace("value5");
     tableB.emplace("value6");
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
     Info<< wordHashSet(setA) << endl;
     Info<< "create from HashTable<T>: ";
     Info<< wordHashSet(tableA) << endl;
-    Info<< "create from HashTable<nil>: ";
+    Info<< "create from HashTable<zero>: ";
     Info<< wordHashSet(tableB) << endl;
 
     Info<< "create from Map<label>: ";
diff --git a/src/OpenFOAM/compat/nil.H b/src/OpenFOAM/compat/nil.H
deleted file mode 100644
index 6caa04dbc8..0000000000
--- a/src/OpenFOAM/compat/nil.H
+++ /dev/null
@@ -1,19 +0,0 @@
-// Compatibility include. Superseded (MAY-2017) by Foam::zero::null
-
-#ifndef FoamCompat_nil_H
-#define FoamCompat_nil_H
-
-#include "zero.H"
-
-namespace Foam
-{
-
-//- Superseded (MAY-2017) by Foam::zero::null
-//  \deprecated(2017-05) - use Foam::zero::null instead
-typedef zero::null nil;
-
-}
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 2288d57ead..cf659ecbaa 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -93,7 +93,7 @@ typedef HashSet<label, Hash<label>> labelHashSet;
 template<class Key, class Hash=Foam::Hash<Key>>
 class HashSet
 :
-    public HashTable<zero::null, Key, Hash>
+    public HashTable<Foam::zero, Key, Hash>
 {
     // Private Member Functions
 
@@ -113,7 +113,7 @@ public:
     typedef HashSet<Key, Hash> this_type;
 
     //- The template instance used for the parent HashTable
-    typedef HashTable<zero::null, Key, Hash> parent_type;
+    typedef HashTable<Foam::zero, Key, Hash> parent_type;
 
     //- An iterator, returning reference to the key
     using iterator = typename parent_type::key_iterator;
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 7209f093a6..4becd58ebe 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -132,7 +132,7 @@ public:
         //- with an additional linked-list entry for hash collisions
         typedef typename std::conditional
         <
-            std::is_same<zero::null, typename std::remove_cv<T>::type>::value,
+            std::is_same<Foam::zero, typename std::remove_cv<T>::type>::value,
             Detail::HashTableSingle<Key>,
             Detail::HashTablePair<Key, T>
         >::type node_type;
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableDetail.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableDetail.H
index dadd621297..82b1b884b0 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableDetail.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableDetail.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -217,7 +217,7 @@ struct HashTableSingle
         typedef K key_type;
 
         //- Type of content (no content: placeholder)
-        typedef Foam::zero::null mapped_type;
+        typedef Foam::zero mapped_type;
 
         //- Content storage type to the entry
         typedef key_type value_type;
@@ -271,22 +271,22 @@ struct HashTableSingle
             return key_;
         }
 
-        //- Const access to the (dummy) mapped value
+        //- Const access to the (dummy) mapped value (for API only)
         const mapped_type& cval() const noexcept
         {
-            return Foam::zero::null::dummy;
+            return Foam::zero::dummy;
         }
 
-        //- Const access to the (dummy) mapped value
+        //- Const access to the (dummy) mapped value (for API only)
         const mapped_type& val() const noexcept
         {
-            return Foam::zero::null::dummy;
+            return Foam::zero::dummy;
         }
 
-        //- Non-const access to the (dummy) mapped value
+        //- Non-const access to the (dummy) mapped value (for API only)
         mapped_type& val() noexcept
         {
-            return Foam::zero::null::dummy;
+            return Foam::zero::dummy;
         }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/cut/cut.H b/src/OpenFOAM/meshes/primitiveShapes/cut/cut.H
index f9a9ba6293..7b606c87ea 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/cut/cut.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/cut/cut.H
@@ -90,7 +90,7 @@ public:
 
 class noOp
 :
-    public uniformOp<zero::null>
+    public uniformOp<Foam::zero>
 {
 public:
 
@@ -106,9 +106,9 @@ public:
         noOp() = default;
 
         //- Construct from base
-        noOp(const uniformOp<zero::null>& op)
+        noOp(const uniformOp<Foam::zero>& op)
         :
-            uniformOp<zero::null>(op)
+            uniformOp<Foam::zero>(op)
         {}
 
 
@@ -135,7 +135,7 @@ public:
 
 class areaOp
 :
-    public uniformOp<zero::null>
+    public uniformOp<Foam::zero>
 {
 public:
 
@@ -151,9 +151,9 @@ public:
         areaOp() = default;
 
         //- Construct from base
-        areaOp(const uniformOp<zero::null>& op)
+        areaOp(const uniformOp<Foam::zero>& op)
         :
-            uniformOp<zero::null>(op)
+            uniformOp<Foam::zero>(op)
         {}
 
 
@@ -179,7 +179,7 @@ public:
 
 class volumeOp
 :
-    public uniformOp<zero::null>
+    public uniformOp<Foam::zero>
 {
 public:
 
@@ -195,9 +195,9 @@ public:
         volumeOp() = default;
 
         //- Construct from base
-        volumeOp(const uniformOp<zero::null>& op)
+        volumeOp(const uniformOp<Foam::zero>& op)
         :
-            uniformOp<zero::null>(op)
+            uniformOp<Foam::zero>(op)
         {}
 
 
@@ -310,7 +310,7 @@ public:
 template<unsigned N>
 class listOp
 :
-    public uniformOp<zero::null>
+    public uniformOp<Foam::zero>
 {
 public:
 
@@ -350,9 +350,9 @@ public:
         listOp() = default;
 
         //- Construct from base
-        listOp(const uniformOp<zero::null>& op)
+        listOp(const uniformOp<Foam::zero>& op)
         :
-            uniformOp<zero::null>(op)
+            uniformOp<Foam::zero>(op)
         {}
 
 
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index 70c96e1444..8d3793f50c 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -141,7 +141,7 @@ public:
 
         //- Swallow assignment (cf, std::ignore)
         template<class T>
-        const NullObject& operator=(const T&) const
+        const NullObject& operator=(const T&) const noexcept
         {
             return *this;
         }
diff --git a/src/OpenFOAM/primitives/traits/one.H b/src/OpenFOAM/primitives/traits/one.H
index eedd533011..d14d91fc88 100644
--- a/src/OpenFOAM/primitives/traits/one.H
+++ b/src/OpenFOAM/primitives/traits/one.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,9 +65,6 @@ public:
     //- The value type
     typedef one value_type;
 
-    // Forward Declarations
-    class minus;
-
     //- Default construct
     constexpr one() noexcept {}
 
@@ -101,53 +98,6 @@ public:
 };
 
 
-/*---------------------------------------------------------------------------*\
-                         Class one::minus Declaration
-\*---------------------------------------------------------------------------*/
-
-//- A class representing the concept of -1.
-//  \note this class must never be derived from Foam::one, since this could
-//  potentially mask its behaviour.
-class one::minus
-{
-public:
-
-    //- The value type
-    typedef minus value_type;
-
-    //- Default construct
-    constexpr minus() noexcept {}
-
-    //- Construct from Istream consumes no content.
-    explicit constexpr minus(Istream&) noexcept {}
-
-
-    //- Return -1 for label
-    constexpr operator label() const noexcept
-    {
-        return -1;
-    }
-
-    //- Return -1 for float
-    constexpr operator float() const noexcept
-    {
-        return -1;
-    }
-
-    //- Return -1 for double
-    constexpr operator double() const noexcept
-    {
-        return -1;
-    }
-
-    //- Component-wise or element-wise access returns minus one
-    one::minus operator[](const label) const noexcept
-    {
-        return one::minus{};
-    }
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Global one (1)
@@ -161,12 +111,6 @@ inline constexpr Istream& operator>>(Istream& is, one&) noexcept
     return is;
 }
 
-//- Read from Istream consumes no content.
-inline constexpr Istream& operator>>(Istream& is, one::minus&) noexcept
-{
-    return is;
-}
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/traits/zero.C b/src/OpenFOAM/primitives/traits/zero.C
index b7c98c4280..0d7e134580 100644
--- a/src/OpenFOAM/primitives/traits/zero.C
+++ b/src/OpenFOAM/primitives/traits/zero.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ Note
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-Foam::zero::null Foam::zero::null::dummy;
+Foam::zero Foam::zero::dummy;
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/traits/zero.H b/src/OpenFOAM/primitives/traits/zero.H
index 838aea7af9..bc0828165d 100644
--- a/src/OpenFOAM/primitives/traits/zero.H
+++ b/src/OpenFOAM/primitives/traits/zero.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,8 +66,8 @@ public:
     //- The value type
     typedef zero value_type;
 
-    // Forward Declarations
-    class null;
+    //- A static instance, when modifiable reference is required by an API
+    static zero dummy;
 
     //- Default construct
     constexpr zero() noexcept {}
@@ -105,30 +105,10 @@ public:
     {
         return zero{};
     }
-};
 
-
-/*---------------------------------------------------------------------------*\
-                         Class zero::null Declaration
-\*---------------------------------------------------------------------------*/
-
-//- A zero class with a null output adapter.
-class zero::null
-:
-    public zero
-{
-public:
-
-    typedef null value_type;
-
-    //- A static zero::null for dereferencing as a dummy element
-    static null dummy;
-
-    //- Default construct
-    constexpr null() noexcept {}
-
-    //- Construct from Istream consumes no content.
-    explicit constexpr null(Istream&) noexcept {}
+    // FUTURE?: Swallow assignment (as per std::ignore)
+    // template<class T>
+    // constexpr const zero& operator=(const T&) const { return *this; }
 };
 
 
@@ -145,12 +125,6 @@ inline constexpr Istream& operator>>(Istream& is, zero&) noexcept
     return is;
 }
 
-//- Write to Ostream emits no content
-inline constexpr Ostream& operator<<(Ostream& os, const zero::null&) noexcept
-{
-    return os;
-}
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index 4a224af40d..f65587e9f7 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -400,7 +400,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh()
 {}
 
 
-Foam::extendedEdgeMesh::extendedEdgeMesh(class one::minus)
+Foam::extendedEdgeMesh::extendedEdgeMesh(std::nullptr_t)
 :
     edgeMesh(),
     concaveStart_(-1),
@@ -486,7 +486,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
     const boolList& surfBaffleRegions
 )
 :
-    extendedEdgeMesh(one::minus{})
+    extendedEdgeMesh(nullptr)
 {
     // Extract and reorder the data from surfaceFeatures
     const triSurface& surf = sFeat.surface();
@@ -549,7 +549,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh
     const labelUList& featurePoints
 )
 :
-    extendedEdgeMesh(one::minus{})
+    extendedEdgeMesh(nullptr)
 {
     sortPointsAndEdges
     (
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 254b48969b..02ec08b26e 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -205,7 +205,7 @@ protected:
     // Protected Constructors
 
         //- Construct null, initializing start indices with -1
-        explicit extendedEdgeMesh(class one::minus);
+        explicit extendedEdgeMesh(std::nullptr_t);
 
 
     // Protected Member Functions

From 117173aaba58bea24b0a4afcf87ad884b23e4610 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 24 Feb 2023 18:48:12 +0100
Subject: [PATCH 112/348] ENH: use min/max instead of first/last for int/slice
 ranges

- consistent with MinMax tuple etc.
- cull unused before(), after() methods
---
 .../test/labelRanges/Test-labelRanges.C       |  4 +-
 .../test/sliceRange/Test-sliceRange.C         |  8 +--
 .../predicates/scalar/scalarPredicates.C      |  8 +--
 .../predicates/scalar/scalarPredicates.H      | 16 ++---
 .../predicates/scalar/scalarPredicatesI.H     | 24 +++-----
 .../primitives/ranges/IntRange/IntRange.H     | 26 ++++----
 .../primitives/ranges/IntRange/IntRanges.C    | 59 +++++++++----------
 .../primitives/ranges/labelRange/labelRange.C | 26 ++++----
 .../primitives/ranges/labelRange/labelRange.H | 12 +---
 .../ranges/labelRange/labelRanges.C           | 54 ++++++++---------
 .../ranges/scalarRange/scalarRange.H          | 21 ++++---
 .../ranges/scalarRange/scalarRangeI.H         | 32 ++--------
 .../ranges/scalarRange/scalarRanges.H         |  8 +--
 .../ranges/scalarRange/scalarRangesI.H        | 12 +---
 .../primitives/ranges/sliceRange/sliceRange.H | 45 +++++---------
 15 files changed, 142 insertions(+), 213 deletions(-)

diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index fc3b7050c6..55202c1b49 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -37,9 +37,7 @@ using namespace Foam;
 
 void printInfo(const labelRange& range)
 {
-    Info<< "first   " << range.first() << nl
-        << "last    " << range.last() << nl
-        << "min     " << range.min() << nl
+    Info<< "min     " << range.min() << nl
         << "max     " << range.max() << nl
         << "end     " << range.end_value() << nl
         << "begin/end " << *range.cbegin() << ' ' << *range.cend() << nl;
diff --git a/applications/test/sliceRange/Test-sliceRange.C b/applications/test/sliceRange/Test-sliceRange.C
index 7a0c0abc61..b3f4f8df8b 100644
--- a/applications/test/sliceRange/Test-sliceRange.C
+++ b/applications/test/sliceRange/Test-sliceRange.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,10 +47,10 @@ void printInfo(const sliceCoeffs& coeffs)
 
     Info<< nl
         << "coeffs: " << coeffs << nl
-        << "range: " << range << nl
-        << "first: " << range.first() << nl
+        << "range:  " << range << nl
+        << "min:    " << range.min() << nl
         << "*begin  " << *range.begin() << nl
-        << "last:  " << range.last() << nl
+        << "max:    " << range.max() << nl
         << "*end    " << *range.end() << nl
         << "values: " << flatOutput(range.labels()) << nl;
 
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C
index ea82157989..dd6501ac7a 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -109,7 +109,7 @@ namespace Foam
     {
         for (const auto& entry : entries)
         {
-            if (!Foam::predicates::scalars::opNames.found(get0(entry)))
+            if (!Foam::predicates::scalars::opNames.contains(get0(entry)))
             {
                 return true;
             }
@@ -135,7 +135,7 @@ namespace Foam
 
         for (const auto& entry : entries)
         {
-            if (!Foam::predicates::scalars::opNames.found(get0(entry)))
+            if (!Foam::predicates::scalars::opNames.contains(get0(entry)))
             {
                 badIndices.insert(idx);
             }
@@ -150,7 +150,7 @@ namespace Foam
         idx = 0;
         for (const auto& entry : entries)
         {
-            const bool bad = badIndices.found(idx);
+            const bool bad = badIndices.contains(idx);
             ++idx;
 
             if (bad)
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
index 3107efe1c4..cc6cabda09 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicates.H
@@ -282,31 +282,31 @@ public:
         //  \return position in list or -1 if not found.
         label rfind(const scalar value, label pos = -1) const;
 
-        //- True if the value matches in the list.
+        //- Matches \em any condition in the list after the offset position.
         //  Linear search from start pos until the end of the list.
         //  Any occurrences before the start pos are ignored.
-        //  \return true if found.
+        //
+        //  \return True if the value matches any condition in the (sub)list.
         inline bool contains(const scalar value, label pos = 0) const;
 
-        //- Match \em any condition in the list.
+        //- Matches \em any condition in the list.
         //
         //  \return True if the value matches any condition in the list.
         inline bool match(const scalar value) const;
 
-        //- Match \em any condition in the list.
+        //- Matches \em any condition in the list.
         //
         //  \return True if the value matches any condition in the list.
         inline bool matchAny(const scalar value) const;
 
-        //- Match \em all conditions in the list.
+        //- Matches \em all conditions in the list.
         //
         //  \return True if the value matches all conditions in the list.
         inline bool matchAll(const scalar value) const;
 
         //- Extract list indices for all matches.
         //
-        //  \return The locations (indices) in the input list where match()
-        //      is true
+        //  \return The locations (indices) of the predicates that match
         inline labelList matching(const scalar value) const;
 
         //- Extract list indices for all matches.
@@ -325,7 +325,7 @@ public:
     // Member Operators
 
         //- Identical to contains(), match(), for use as a predicate.
-        inline bool operator()(const scalar value) const;
+        bool operator()(const scalar value) const { return matchAny(value); }
 
 
     // Housekeeping
diff --git a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
index 3f6fcf4b9e..09b0d10443 100644
--- a/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
+++ b/src/OpenFOAM/primitives/predicates/scalar/scalarPredicatesI.H
@@ -72,15 +72,15 @@ inline bool Foam::predicates::scalars::contains
 
 inline bool Foam::predicates::scalars::match(const scalar value) const
 {
-    return this->matchAny(value);
+    return matchAny(value);
 }
 
 
 inline bool Foam::predicates::scalars::matchAny(const scalar value) const
 {
-    for (const unary& test : *this)
+    for (const unary& pred : *this)
     {
-        if (test(value))
+        if (pred(value))
         {
             return true;
         }
@@ -92,9 +92,9 @@ inline bool Foam::predicates::scalars::matchAny(const scalar value) const
 
 inline bool Foam::predicates::scalars::matchAll(const scalar value) const
 {
-    for (const unary& test : *this)
+    for (const unary& pred : *this)
     {
-        if (!test(value))
+        if (!pred(value))
         {
             return false;
         }
@@ -112,9 +112,9 @@ inline Foam::labelList Foam::predicates::scalars::matching
     labelList indices(this->size());
 
     label i = 0, count = 0;
-    for (const unary& test : *this)
+    for (const unary& pred : *this)
     {
-        if (test(value))
+        if (pred(value))
         {
             indices[count] = i;
             ++count;
@@ -140,7 +140,7 @@ inline Foam::labelList Foam::predicates::scalars::matching
     label count = 0;
     for (label i=0; i < len; ++i)
     {
-        if (match(input[i]) ? !invert : invert)
+        if (matchAny(input[i]) ? !invert : invert)
         {
             indices[count] = i;
             ++count;
@@ -152,12 +152,4 @@ inline Foam::labelList Foam::predicates::scalars::matching
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-inline bool Foam::predicates::scalars::operator()(const scalar value) const
-{
-    return this->found(value);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H b/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H
index 28502905b4..9f1eeddaa1 100644
--- a/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H
+++ b/src/OpenFOAM/primitives/ranges/IntRange/IntRange.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -172,19 +172,13 @@ public:
         //- Non-const access to start of the range
         IntType& start() noexcept { return start_; }
 
-        //- The (inclusive) lower value of the range. Same as start()
-        IntType first() const noexcept { return start_; }
-
-        //- The (inclusive) upper value of the range
-        IntType last() const noexcept { return (start_ + (size_ - 1)); }
-
         //- The (inclusive) lower value of the range,
-        //- same as first(), start(), begin_value()
-        IntType min() const noexcept { return start(); }
+        //- same as start(), begin_value()
+        IntType min() const noexcept { return start_; }
 
         //- The (inclusive) upper value of the range,
-        //- same as last(), rbegin_value()
-        IntType max() const noexcept { return last(); }
+        //- same as rbegin_value(). Ill-defined for an empty range
+        IntType max() const noexcept { return (start_ + (size_ - 1)); }
 
 
     // Edit
@@ -252,13 +246,13 @@ public:
 
     // Iterator ranges
 
-        //- The value at the beginning of the range - same as first(), start()
+        //- The value at the beginning of the range - same as min(), start()
         inline IntType begin_value() const noexcept;
 
         //- The value 1 beyond the end of the range.
         inline IntType end_value() const noexcept;
 
-        //- The last value of the range.
+        //- The max value of the range.
         inline IntType rbegin_value() const noexcept;
 
         //- The value 1 before the begin of range
@@ -563,7 +557,7 @@ inline constexpr bool operator==
     const IntRange<IntType>& b
 ) noexcept
 {
-    return (a.first() == b.first() && a.size() == b.size());
+    return (a.start() == b.start() && a.size() == b.size());
 }
 
 
@@ -578,10 +572,10 @@ inline constexpr bool operator<
 {
     return
     (
-        a.first() < b.first()
+        a.start() < b.start()
      ||
         (
-            !(b.first() < a.first())
+            !(b.start() < a.start())
          && a.size() < b.size()
         )
     );
diff --git a/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C b/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C
index eb67f57372..0b69add7d6 100644
--- a/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C
+++ b/src/OpenFOAM/primitives/ranges/IntRange/IntRanges.C
@@ -36,42 +36,41 @@ License
 namespace Foam
 {
 
-    template<class T>
-    inline static List<label> makeIdentity(const IntRange<T>& range)
+template<class T>
+inline static List<label> makeIdentity(const IntRange<T>& range)
+{
+    if (range.size() < 1)
     {
-        if (range.size() < 0)
-        {
-            // Skip this check?
-            return List<label>();
-        }
-
-        List<label> result(range.size());
-        std::iota(result.begin(), result.end(), range.start());
-
-        return result;
+        return List<label>();
     }
 
-    template<class T>
-    inline static Istream& input(Istream& is, IntRange<T>& range)
-    {
-        is.readBegin("IntRange");
-        is >> range.start() >> range.size();
-        is.readEnd("IntRange");
+    List<label> result(range.size());
+    std::iota(result.begin(), result.end(), range.start());
 
-        is.check(FUNCTION_NAME);
-        return is;
-    }
+    return result;
+}
 
-    template<class T>
-    inline static Ostream& output(Ostream& os, const IntRange<T>& range)
-    {
-        os  << token::BEGIN_LIST
-            << range.start() << token::SPACE << range.size()
-            << token::END_LIST;
+template<class T>
+inline static Istream& input(Istream& is, IntRange<T>& range)
+{
+    is.readBegin("IntRange");
+    is >> range.start() >> range.size();
+    is.readEnd("IntRange");
 
-        os.check(FUNCTION_NAME);
-        return os;
-    }
+    is.check(FUNCTION_NAME);
+    return is;
+}
+
+template<class T>
+inline static Ostream& output(Ostream& os, const IntRange<T>& range)
+{
+    os  << token::BEGIN_LIST
+        << range.start() << token::SPACE << range.size()
+        << token::END_LIST;
+
+    os.check(FUNCTION_NAME);
+    return os;
+}
 
 } // End namespace Foam
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
index 6e2ee7efc1..383acb5a53 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,13 +103,13 @@ bool Foam::labelRange::overlaps(const labelRange& range, bool touches) const
      &&
         (
             (
-                range.first() >= this->first()
-             && range.first() <= this->last() + extra
+                range.min() >= this->min()
+             && range.min() <= this->max() + extra
             )
          ||
             (
-                this->first() >= range.first()
-             && this->first() <= range.last() + extra
+                this->min() >= range.min()
+             && this->min() <= range.max() + extra
             )
         )
     );
@@ -128,8 +128,8 @@ Foam::labelRange Foam::labelRange::join(const labelRange& range) const
         return range;
     }
 
-    const label lower = Foam::min(this->first(), range.first());
-    const label upper = Foam::max(this->last(),  range.last());
+    const label lower = Foam::min(this->min(), range.min());
+    const label upper = Foam::max(this->max(), range.max());
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
@@ -143,8 +143,8 @@ Foam::labelRange Foam::labelRange::join(const labelRange& range) const
 
 Foam::labelRange Foam::labelRange::subset(const labelRange& range) const
 {
-    const label lower = Foam::max(this->first(), range.first());
-    const label upper = Foam::min(this->last(),  range.last());
+    const label lower = Foam::max(this->min(), range.min());
+    const label upper = Foam::min(this->max(), range.max());
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
@@ -164,8 +164,8 @@ Foam::labelRange Foam::labelRange::subset
     const label size
 ) const
 {
-    const label lower = Foam::max(this->start(), start);
-    const label upper = Foam::min(this->last(),  start+Foam::max(0,size-1));
+    const label lower = Foam::max(this->min(), start);
+    const label upper = Foam::min(this->max(), start+Foam::max(0,size-1));
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
@@ -181,8 +181,8 @@ Foam::labelRange Foam::labelRange::subset
 
 Foam::labelRange Foam::labelRange::subset0(const label size) const
 {
-    const label lower = Foam::max(this->start(), 0);
-    const label upper = Foam::min(this->last(),  Foam::max(0,size-1));
+    const label lower = Foam::max(this->min(), 0);
+    const label upper = Foam::min(this->max(), Foam::max(0,size-1));
     const label total = upper+1 - lower;
     // last = start+size-1
     // size = last+1-start
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
index dd398d89ca..c162839034 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
@@ -109,14 +109,7 @@ public:
 
     // Member Functions
 
-    // Access
-
-        //- The value before the start of the range
-        label before() const noexcept { return rend_value(); }
-
-        //- The value after the last element in the range
-        //  This is identical to the value of cend()
-        label after() const noexcept { return end_value(); }
+    // Edit
 
         //- Adjust the start to avoid negative indices.
         //  The size is decreased accordingly, but will never become negative.
@@ -124,9 +117,6 @@ public:
         //  adjusting (-20, 15) becomes (0,0)
         void adjust() noexcept;
 
-
-    // Edit
-
         //- Reset start and length, no checks
         using IntRange<label>::reset;
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
index a29c86f00e..d74800ca86 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,19 +34,19 @@ License
 namespace Foam
 {
 
-    // Print range for debugging purposes
-    static Ostream& printRange(Ostream& os, const labelRange& range)
+// Print range for debugging purposes
+static Ostream& printRange(Ostream& os, const labelRange& range)
+{
+    if (range.empty())
     {
-        if (range.empty())
-        {
-            os  << "empty";
-        }
-        else
-        {
-            os  << range << " = " << range.first() << ":" << range.last();
-        }
-        return os;
+        os  << "empty";
     }
+    else
+    {
+        os  << range << " = " << range.min() << ':' << range.max();
+    }
+    return os;
+}
 
 } // End namespace Foam
 
@@ -141,7 +141,7 @@ bool Foam::labelRanges::add(const labelRange& range)
     }
     else if (this->empty())
     {
-        this->append(range);
+        this->push_back(range);
         return true;
     }
 
@@ -187,7 +187,7 @@ bool Foam::labelRanges::add(const labelRange& range)
 
 
     // not found: simply append
-    this->append(range);
+    this->push_back(range);
 
     return true;
 }
@@ -207,9 +207,9 @@ bool Foam::labelRanges::remove(const labelRange& range)
     {
         labelRange& currRange = list[elemi];
 
-        if (range.first() > currRange.first())
+        if (range.min() > currRange.min())
         {
-            if (range.last() < currRange.last())
+            if (range.max() < currRange.max())
             {
                 // Removal of range fragments of currRange
 
@@ -221,14 +221,14 @@ bool Foam::labelRanges::remove(const labelRange& range)
                 }
 
                 // left-hand-side fragment: insert before current range
-                label lower = currRange.first();
-                label upper = range.first() - 1;
+                label lower = currRange.min();
+                label upper = range.min() - 1;
 
                 labelRange fragment(lower, upper - lower + 1);
 
                 // right-hand-side fragment
-                lower = range.last() + 1;
-                upper = currRange.last();
+                lower = range.max() + 1;
+                upper = currRange.max();
 
                 currRange.reset(lower, upper - lower + 1);
                 currRange.clampSize();
@@ -247,7 +247,7 @@ bool Foam::labelRanges::remove(const labelRange& range)
                 // thus we are done
                 break;
             }
-            else if (range.first() <= currRange.last())
+            else if (range.min() <= currRange.max())
             {
                 // keep left-hand-side, remove right-hand-side
 
@@ -258,8 +258,8 @@ bool Foam::labelRanges::remove(const labelRange& range)
                     printRange(Info, currRange) << endl;
                 }
 
-                const label lower = currRange.first();
-                const label upper = range.first() - 1;
+                const label lower = currRange.min();
+                const label upper = range.min() - 1;
 
                 currRange.reset(lower, upper - lower + 1);
                 currRange.clampSize();
@@ -272,9 +272,9 @@ bool Foam::labelRanges::remove(const labelRange& range)
                 }
             }
         }
-        else if (range.first() <= currRange.first())
+        else if (range.min() <= currRange.min())
         {
-            if (range.last() >= currRange.first())
+            if (range.max() >= currRange.min())
             {
                 // remove left-hand-side, keep right-hand-side
 
@@ -285,8 +285,8 @@ bool Foam::labelRanges::remove(const labelRange& range)
                     printRange(Info, currRange) << endl;
                 }
 
-                const label lower = range.last() + 1;
-                const label upper = currRange.last();
+                const label lower = range.max() + 1;
+                const label upper = currRange.max();
 
                 currRange.reset(lower, upper - lower + 1);
                 currRange.clampSize();
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
index 172b27fe0b..068ce0a224 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
@@ -67,7 +67,7 @@ Ostream& operator<<(Ostream& os, const scalarRange& range);
 
 class scalarRange
 {
-    //- Enumeration defining type of range test to use
+    //- The type of range test to use
     enum testType
     {
         NONE = 0,   //!< Empty or invalid (inverse) range. Never matches.
@@ -188,17 +188,15 @@ public:
         //- True if range is non-empty.
         inline bool good() const noexcept;
 
-        //- True if range is non-empty.
-        bool valid() const noexcept { return good(); }
-
         //- True if the range bounds represent a single value.
         inline bool single() const noexcept;
 
         //- The min value of the range.
-        inline scalar min() const noexcept;
+        scalar min() const noexcept { return min_; }
 
         //- The max value of the range.
-        inline scalar max() const noexcept;
+        scalar max() const noexcept { return max_; }
+
 
         //- A representative (average) value for the range.
         //  For GE, LE bounds it is the min/max value, respectively.
@@ -208,14 +206,13 @@ public:
         inline bool contains(const scalar val) const;
 
         //- True if the value is matched by the condition
-        inline bool match(const scalar val) const;
+        bool match(const scalar value) const { return contains(value); }
 
 
     // Member Operators
 
         //- For use as a predicate, same as contains(), match()
-        bool operator()(const scalar val) const { return match(val); }
-
+        bool operator()(const scalar value) const { return contains(value); }
 
         inline constexpr bool operator==(const scalarRange& rhs) const noexcept;
         inline constexpr bool operator!=(const scalarRange& rhs) const noexcept;
@@ -225,6 +222,12 @@ public:
 
         //- Print information about the range.
         friend Ostream& operator<<(Ostream& os, const scalarRange& range);
+
+
+    // Housekeeping
+
+        //- Same as good() or !empty()
+        bool valid() const noexcept { return good(); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H
index 71e538d61b..071e0a83c6 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangeI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ inline Foam::scalarRange::scalarRange
 :
     scalarRange(scalarRange::GE_LE, minVal, maxVal)
 {
-    if (minVal > maxVal)
+    if (maxVal < minVal)
     {
         clear();  // Inverted - explicitly mark as such
     }
@@ -147,18 +147,6 @@ inline bool Foam::scalarRange::single() const noexcept
 }
 
 
-inline Foam::scalar Foam::scalarRange::min() const noexcept
-{
-    return min_;
-}
-
-
-inline Foam::scalar Foam::scalarRange::max() const noexcept
-{
-    return max_;
-}
-
-
 inline Foam::scalar Foam::scalarRange::value() const
 {
     switch (type_)
@@ -183,12 +171,6 @@ inline Foam::scalar Foam::scalarRange::value() const
 
 
 inline bool Foam::scalarRange::contains(const scalar val) const
-{
-    return match(val);
-}
-
-
-inline bool Foam::scalarRange::match(const scalar val) const
 {
     switch (type_)
     {
@@ -207,20 +189,14 @@ inline bool Foam::scalarRange::match(const scalar val) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 inline constexpr bool
-Foam::scalarRange::operator==
-(
-    const scalarRange& rhs
-) const noexcept
+Foam::scalarRange::operator==(const scalarRange& rhs) const noexcept
 {
     return (type_ == rhs.type_ && min_ == rhs.min_ && max_ == rhs.max_);
 }
 
 
 inline constexpr bool
-Foam::scalarRange::operator!=
-(
-    const scalarRange& rhs
-) const noexcept
+Foam::scalarRange::operator!=(const scalarRange& rhs) const noexcept
 {
     return !(*this == rhs);
 }
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
index 5bf25a8881..15845bd523 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
@@ -88,17 +88,17 @@ public:
 
     // Member Functions
 
-        //- True if the value is matched by any of the sub-ranges
+        //- True if the value is contained by any of the sub-ranges
         inline bool contains(const scalar value) const;
 
         //- True if the value is matched by any of the sub-ranges
-        inline bool match(const scalar value) const;
+        bool match(const scalar value) const { return contains(value); }
 
 
     // Member Operators
 
-        //- For use as a predicate, same as contains(), match()
-        bool operator()(const scalar value) const { return match(value); }
+        //- For use as a predicate, same as contains()
+        bool operator()(const scalar value) const { return contains(value); }
 };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H
index 493bd9bc47..4375c1d7cd 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRangesI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,17 +35,11 @@ inline Foam::scalarRanges::scalarRanges(const std::string& str, bool report)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::scalarRanges::contains(const scalar value) const
-{
-    return match(value);
-}
-
-
-inline bool Foam::scalarRanges::match(const scalar value) const
+inline bool Foam::scalarRanges::contains(const scalar val) const
 {
     for (const scalarRange& range : *this)
     {
-        if (range.match(value))
+        if (range.contains(val))
         {
             return true;
         }
diff --git a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
index d6f974b42e..4be517b0e2 100644
--- a/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
+++ b/src/OpenFOAM/primitives/ranges/sliceRange/sliceRange.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -110,41 +110,24 @@ public:
 
     // Access
 
-        //- The first/start value in the range (inclusive)
-        constexpr label start() const noexcept
-        {
-            return start_;
-        }
+        //- The start value in the range
+        constexpr label start() const noexcept { return start_; }
 
         //- The size of the range
-        constexpr label size() const noexcept
-        {
-            return size_;
-        }
+        constexpr label size() const noexcept { return size_; }
 
         //- The stride for the range
-        constexpr label stride() const noexcept
-        {
-            return stride_;
-        }
+        constexpr label stride() const noexcept { return stride_; }
 
         //- True if range is empty (zero-sized)
-        bool empty() const noexcept
-        {
-            return !size_;
-        }
+        bool empty() const noexcept { return !size_; }
 
-        //- The first/start value in the range (inclusive)
-        constexpr label first() const noexcept
-        {
-            return start_;
-        }
+        //- The (inclusive) lower value of the range.
+        constexpr label min() const noexcept { return start_; }
 
-        //- The (inclusive) upper value of the range
-        label last() const noexcept
-        {
-            return start_ + (size_-1) * stride_;
-        }
+        //- The (inclusive) upper value of the range.
+        //- Ill-defined for an empty range
+        label max() const noexcept { return start_ + (size_-1) * stride_; }
 
         //- Return list of labels corresponding to the slice
         List<label> labels() const;
@@ -490,7 +473,7 @@ inline constexpr bool operator==
 {
     return
     (
-        a.first() == b.first()
+        a.start() == b.start()
      && a.size() == b.size()
      && a.stride() == b.stride()
     );
@@ -508,10 +491,10 @@ inline constexpr bool operator<
 {
     return
     (
-        a.first() < b.first()
+        a.start() < b.start()
      ||
         (
-            !(b.first() < a.first())
+            !(b.start() < a.start())
          &&
             (
                 a.size() < b.size()

From 0fc2c817e1400725afe41ca5594271a65ce77815 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 24 Feb 2023 18:48:12 +0100
Subject: [PATCH 113/348] STYLE: emplace_back/push_back instead of append in
 tree algorithms

---
 src/OpenFOAM/algorithms/AABBTree/AABBTree.C   | 24 +++++++++----------
 .../dynamicIndexedOctree.C                    | 21 +++++++---------
 .../algorithms/indexedOctree/indexedOctree.C  | 10 ++++----
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/OpenFOAM/algorithms/AABBTree/AABBTree.C b/src/OpenFOAM/algorithms/AABBTree/AABBTree.C
index 8bbac68837..b6aad91f74 100644
--- a/src/OpenFOAM/algorithms/AABBTree/AABBTree.C
+++ b/src/OpenFOAM/algorithms/AABBTree/AABBTree.C
@@ -116,7 +116,7 @@ void Foam::AABBTree<Type>::createBoxes
             {
                 if (isUsedPoint.set(pointI))
                 {
-                    component.append(points[pointI][maxDir]);
+                    component.push_back(points[pointI][maxDir]);
                 }
             }
         }
@@ -167,12 +167,12 @@ void Foam::AABBTree<Type>::createBoxes
         // if it crosses the bin boundaries
         if (addMin)
         {
-            minBinObjectIDs.append(objI);
+            minBinObjectIDs.push_back(objI);
             minBb.add(points, obj);
         }
         if (addMax)
         {
-            maxBinObjectIDs.append(objI);
+            maxBinObjectIDs.push_back(objI);
             maxBb.add(points, obj);
         }
     }
@@ -209,13 +209,13 @@ void Foam::AABBTree<Type>::createBoxes
     {
         // New leaf
         minI = nodes.size();
-        nodes.append(labelPair(-1, -1));
+        nodes.emplace_back(-1, -1);
     }
     else
     {
         // Update existing leaf
         minI = -addressing.size() - 1;
-        addressing.append(minBinObjectIDs);
+        addressing.push_back(minBinObjectIDs);
     }
 
     label maxI;
@@ -223,13 +223,13 @@ void Foam::AABBTree<Type>::createBoxes
     {
         // New leaf
         maxI = nodes.size();
-        nodes.append(labelPair(-1, -1));
+        nodes.emplace_back(-1, -1);
     }
     else
     {
         // Update existing leaf
         maxI = -addressing.size() - 1;
-        addressing.append(maxBinObjectIDs);
+        addressing.push_back(maxBinObjectIDs);
     }
 
     nodes(nodeI) = labelPair(minI, maxI);
@@ -308,7 +308,7 @@ Foam::AABBTree<Type>::AABBTree
     DynamicList<labelPair> nodes(maxLevel);
     DynamicList<labelList> addr(maxLevel);
 
-    nodes.append(labelPair(-1, -1));
+    nodes.emplace_back(-1, -1);
     treeBoundBox topBb(points);
     topBb.inflate(0.01);
 
@@ -356,13 +356,13 @@ Foam::AABBTree<Type>::AABBTree
     {
         if (nodes[nodeI].first() < 0)
         {
-            boundBoxes.append(bbs[nodeI].first());
-            addressing.append(addr[-(nodes[nodeI].first() + 1)]);
+            boundBoxes.push_back(bbs[nodeI].first());
+            addressing.push_back(addr[-(nodes[nodeI].first() + 1)]);
         }
         if (nodes[nodeI].second() < 0)
         {
-            boundBoxes.append(bbs[nodeI].second());
-            addressing.append(addr[-(nodes[nodeI].second() + 1)]);
+            boundBoxes.push_back(bbs[nodeI].second());
+            addressing.push_back(addr[-(nodes[nodeI].second() + 1)]);
         }
     }
 
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index db767a72d1..f60afd763f 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -56,7 +56,7 @@ void Foam::dynamicIndexedOctree<Type>::divide
         {
             if (shapes_.overlaps(index, subBbs))
             {
-                contains.append(index);
+                contains.push_back(index);
             }
         }
     }
@@ -117,7 +117,7 @@ Foam::dynamicIndexedOctree<Type>::divide
             {
                 // Append to contents
                 contentIndex = contents_.size();
-                contents_.append(std::move(subIndices));
+                contents_.push_back(std::move(subIndices));
             }
 
             nod.subNodes_[octant] = contentPlusOctant(contentIndex, octant);
@@ -136,7 +136,7 @@ Foam::dynamicIndexedOctree<Type>::divide
 
         const label newNodeId = nodes_.size();
 
-        nodes_.append(nod);
+        nodes_.push_back(nod);
 
         nodes_[parentNodeIndex].subNodes_[octantToBeDivided]
             = nodePlusOctant(newNodeId, octantToBeDivided);
@@ -2463,13 +2463,12 @@ bool Foam::dynamicIndexedOctree<Type>::insert(label startIndex, label endIndex)
 
     if (nodes_.empty())
     {
-        contents_.append(DynamicList<label>(1));
-        contents_[0].append(0);
+        contents_.emplace_back(1).push_back(0);
 
         // Create topnode.
         node topNode = divide(bb_, 0, -1, 0);
 
-        nodes_.append(topNode);
+        nodes_.push_back(topNode);
 
         startIndex++;
     }
@@ -2528,7 +2527,7 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
             {
                 const label contentI = getContent(subNodeLabel);
 
-                contents_[contentI].append(index);
+                contents_[contentI].push_back(index);
 
                 recursiveSubDivision
                 (
@@ -2548,11 +2547,9 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
 
             if (shapes().overlaps(index, subBb))
             {
-                label sz = contents_.size();
+                const label sz = contents_.size();
 
-                contents_.append(DynamicList<label>(1));
-
-                contents_[sz].append(index);
+                contents_.emplace_back(1).push_back(index);
 
                 nodes_[nodIndex].subNodes_[octant]
                     = contentPlusOctant(sz, octant);
@@ -2635,7 +2632,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
 
                     if (oldIndex != index)
                     {
-                        newContent.append(oldIndex);
+                        newContent.push_back(oldIndex);
                     }
                 }
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 30f0f2d679..b75d9dfbf5 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -55,7 +55,7 @@ void Foam::indexedOctree<Type>::divide
         {
             if (shapes_.overlaps(index, subBbs))
             {
-                contains.append(index);
+                contains.push_back(index);
             }
         }
 
@@ -117,7 +117,7 @@ Foam::indexedOctree<Type>::divide
             {
                 // Append to contents
                 contentIndex = contents.size();
-                contents.append(std::move(subIndices));
+                contents.push_back(std::move(subIndices));
             }
 
             nod.subNodes_[octant] = contentPlusOctant(contentIndex, octant);
@@ -171,7 +171,7 @@ void Foam::indexedOctree<Type>::splitNodes
                     node subNode(divide(bb, contents, contentI));
                     subNode.parent_ = nodeI;
                     label sz = nodes.size();
-                    nodes.append(subNode);
+                    nodes.push_back(subNode);
                     nodes[nodeI].subNodes_[octant] = nodePlusOctant(sz, octant);
                 }
             }
@@ -2172,11 +2172,11 @@ Foam::indexedOctree<Type>::indexedOctree
     // Start off with one node with all shapes in it.
     DynamicList<node> nodes(label(shapes.size() / maxLeafRatio));
     DynamicList<labelList> contents(label(shapes.size() / maxLeafRatio));
-    contents.append(identity(shapes.size()));
+    contents.push_back(identity(shapes.size()));
 
     // Create topnode.
     node topNode(divide(bb, contents, 0));
-    nodes.append(topNode);
+    nodes.push_back(topNode);
 
 
     // Now have all contents at level 1. Create levels by splitting levels

From 00f499d71430481f4364e944aeb8434615fb5dc3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 27 Feb 2023 13:01:08 +0100
Subject: [PATCH 114/348] ENH: more noexcept methods for edge, avoid some
 intermediates

STYLE: document edge parameters as 'vertex' (not point)

- edge is also used for graph edges or connection edges etc.
---
 src/OpenFOAM/meshes/meshShapes/edge/edge.H    | 105 ++++++++++--------
 src/OpenFOAM/meshes/meshShapes/edge/edgeI.H   |  58 +++++-----
 src/OpenFOAM/meshes/meshShapes/face/face.C    |  12 +-
 src/OpenFOAM/meshes/meshShapes/face/face.H    |  24 ++--
 src/OpenFOAM/meshes/meshShapes/face/faceI.H   |   4 +-
 .../meshes/meshShapes/face/faceIntersection.C |   7 +-
 .../meshes/meshShapes/triFace/triFace.H       |  28 ++---
 .../meshes/meshShapes/triFace/triFaceI.H      |   4 +-
 8 files changed, 125 insertions(+), 117 deletions(-)

diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index 5557ce4045..c479af2217 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -28,13 +28,13 @@ Class
     Foam::edge
 
 Description
-    An edge is a list of two point labels. The functionality it provides
-    supports the discretisation on a 2-D flat mesh.
+    An edge is a list of two vertex labels.
+    This can correspond to a directed graph edge or an edge on a mesh.
 
     The edge is implemented as a Pair/FixedList of labels.
     As well as geometrically relevant methods, it also provides methods
     similar to HashSet for additional convenience.
-    Valid point labels are always non-negative (since they correspond to
+    Valid vertex labels are always non-negative (eg, since they correspond to
     addressing within the mesh). The value '-1' is used to tag invalid
     point labels that correspond conceptually to open 'slots', which
     can be filled with a HashSet-like functionality.
@@ -69,30 +69,31 @@ public:
 
     // Static Data Members
 
+        //- The typeName ("edge")
         static const char* const typeName;
 
 
     // Constructors
 
-        //- Default construct, with invalid point labels (-1)
+        //- Default construct, with invalid vertex labels (-1)
         inline edge();
 
-        //- Construct from two point labels
+        //- Construct from two vertex labels
         inline edge(const label from, const label to);
 
-        //- Construct from pair of point labels
+        //- Construct from pair of vertex labels
         inline edge(const labelPair& pair);
 
-        //- Construct from list of point labels
+        //- Construct from list of vertex labels
         inline edge(const FixedList<label, 2>& list);
 
-        //- Construct from two point labels, sorted with first less-than second
+        //- Construct from two vertex labels, sorted with first less-than second
         inline edge(const label from, const label to, const bool doSort);
 
         //- Construct from list, sorted with first less-than second
         inline edge(const FixedList<label, 2>& list, const bool doSort);
 
-        //- Copy construct from a subset of point labels
+        //- Copy construct from a subset of vertex labels
         inline edge
         (
             const UList<label>& list,
@@ -133,53 +134,50 @@ public:
 
 
         //- Return reverse edge as copy.
-        //  No special handling of negative point labels.
+        //  No special handling of negative vertex labels.
         inline edge reverseEdge() const;
 
 
     // Queries
 
-        //- Return the smallest point label used by the edge
-        //  No special handling of negative point labels.
-        inline label minVertex() const;
+        //- Return the smallest vertex label used by the edge
+        //  No special handling of negative vertex labels.
+        inline label minVertex() const noexcept;
 
-        //- Return the largest point label used by the edge
-        //  No special handling of negative point labels.
-        inline label maxVertex() const;
+        //- Return the largest vertex label used by the edge
+        //  No special handling of negative vertex labels.
+        inline label maxVertex() const noexcept;
 
         //- True if the vertices are unique and non-negative.
         inline bool good() const noexcept;
 
-        //- True if the vertices are unique and non-negative.
-        bool valid() const noexcept { return good(); }
+        //- Return true if the vertex label is contained in the edge.
+        //  Always false for a negative vertex label.
+        inline bool contains(const label vertex) const noexcept;
 
-        //- Return true if the point label is contained in the edge.
-        //  Always false for a negative label.
-        inline bool contains(const label pointLabel) const;
-
-        //- Return local index (0,1) of point label in edge -1 on failure
-        //  Always return -1 for a negative label.
-        inline label which(const label pointLabel) const;
+        //- Return local index (0,1) of vertex label in edge -1 on failure
+        //  Always return -1 for a negative vertex label.
+        inline label which(const label vertex) const;
 
         //- True if the edge has at least one vertex in common with other
         inline bool connected(const edge& other) const;
 
         //- Return vertex common with other edge or -1 on failure
-        //  Negative point labels are never considered common between edges.
+        //  Negative vertex labels are never considered common between edges.
         inline label commonVertex(const edge& other) const;
 
-        //- Given the point label for one vertex, return the other one.
-        //  No special treatment for negative point labels.
-        inline label otherVertex(const label pointLabel) const;
+        //- Given one vertex label, return the other one.
+        //  No special treatment for negative vertex labels.
+        inline label otherVertex(const label vertex) const;
 
         //- Do the edges share a common vertex index?
-        //  Negative point labels never connect.
+        //  Negative vertex labels never connect.
         bool connects(const edge& other) const { return connected(other); }
 
 
     // Editing
 
-        //- 'Collapse' edge by marking duplicate point labels as '-1',
+        //- 'Collapse' edge by marking duplicate vertex labels as '-1',
         //- the lower vertex is retained.
         //  Return the effective size after collapsing.
         inline label collapse();
@@ -187,21 +185,22 @@ public:
 
     // Hash-like Functions
 
-        //- Return the number of unique, valid (non -1) point labels.
+        //- Return the number of unique, valid (non -1) vertex labels.
         //  Similar to a HashTable::size().
         inline label count() const;
 
-        //- Return true if edge has no valid point labels.
-        inline bool empty() const;
+        //- Return true if edge has no valid vertex labels.
+        inline bool empty() const noexcept;
 
-        //- 'Clears' edge by setting both ends to invalid point labels.
+        //- 'Clears' edge by setting both ends to invalid vertex labels.
         inline void clear();
 
 
-        //- Fill any open slot with the index if it did not previously exist.
-        //  Returns true on success. A negative label never inserts.
+        //- Fill any open slot with the vertex label
+        //- (if not previously contained in the edge).
+        //  Returns true on success. A negative vertex label never inserts.
         //  Similar to a HashTable::insert().
-        inline bool insert(const label index);
+        inline bool insert(const label vertex);
 
         //- Insert values, using begin/end iterators.
         template<class InputIterator>
@@ -227,10 +226,11 @@ public:
         inline label insert(const labelUList& list);
 
 
-        //- Remove an existing index from the edge and set its location to '-1'.
-        //  Returns the number of changes. A negative label never removes.
+        //- Remove an existing vertex from the edge and set its location
+        //- to '-1'. A negative vertex label never removes.
+        //  Returns the number of changes.
         //  Similar to a HashTable::erase().
-        inline label erase(const label index);
+        inline label erase(const label vertex);
 
         //- Remove values, using begin/end iterators.
         template<class InputIterator>
@@ -253,26 +253,30 @@ public:
     // Geometric Functions
 
         //- Return centre point (centroid) of the edge.
-        //  No special handling of negative point labels.
+        //  No special handling of negative vertex labels.
         inline point centre(const UList<point>& pts) const;
 
-        //- Return the vector (end - start)
-        //  No special handling of negative point labels.
+        //- Return the vector (from first to second).
+        //  No special handling of negative vertex labels.
         inline vector vec(const UList<point>& pts) const;
 
-        //- Return the unit vector (end - start)
-        //  No special handling of negative point labels.
+        //- Return the unit vector (from first to second).
+        //  No special handling of negative vertex labels.
         inline vector unitVec(const UList<point>& pts) const;
 
-        //- Return scalar magnitude of the edge.
-        //  No special handling of negative point labels.
+        //- The length (L2-norm) of the edge vector.
+        //  No special handling of negative vertex labels.
         inline scalar mag(const UList<point>& pts) const;
 
+        //- The length (L2-norm) squared of the edge vector.
+        //  No special handling of negative vertex labels.
+        inline scalar magSqr(const UList<point>& pts) const;
+
         //- The enclosing (bounding) box for the edge
         inline Pair<point> box(const UList<point>& pts) const;
 
         //- Return edge line
-        //  No special handling of negative point labels.
+        //  No special handling of negative vertex labels.
         inline linePointRef line(const UList<point>& pts) const;
 
 
@@ -327,6 +331,9 @@ public:
         //- Same as contains()
         bool found(label vertex) const { return contains(vertex); }
 
+        //- Same as good()
+        bool valid() const noexcept { return good(); }
+
         //- Deprecated(2021-04) hashing functor. Use hasher()
         // \deprecated(2021-04) - use hasher() functor
         template<class Unused=bool>
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
index 879a413de1..a3b6c7f4e3 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
@@ -92,15 +92,15 @@ inline Foam::edge::edge(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::edge::minVertex() const
+inline Foam::label Foam::edge::minVertex() const noexcept
 {
     return (first() < second() ? first() : second());
 }
 
 
-inline Foam::label Foam::edge::maxVertex() const
+inline Foam::label Foam::edge::maxVertex() const noexcept
 {
-    return (first() > second() ? first() : second());
+    return (second() < first() ? first() : second());
 }
 
 
@@ -110,27 +110,27 @@ inline bool Foam::edge::good() const noexcept
 }
 
 
-inline bool Foam::edge::contains(const label pointLabel) const
+inline bool Foam::edge::contains(const label vertex) const noexcept
 {
     // -1: always false
     return
     (
-        pointLabel >= 0
-     && (pointLabel == first() || pointLabel == second())
+        vertex >= 0
+     && (vertex == first() || vertex == second())
     );
 }
 
 
-inline Foam::label Foam::edge::which(const label pointLabel) const
+inline Foam::label Foam::edge::which(const label vertex) const
 {
     // -1: always false
-    if (pointLabel >= 0)
+    if (vertex >= 0)
     {
-        if (pointLabel == first())
+        if (vertex == first())
         {
             return 0;
         }
-        if (pointLabel == second())
+        if (vertex == second())
         {
             return 1;
         }
@@ -162,13 +162,13 @@ inline Foam::label Foam::edge::commonVertex(const edge& other) const
 }
 
 
-inline Foam::label Foam::edge::otherVertex(const label pointLabel) const
+inline Foam::label Foam::edge::otherVertex(const label vertex) const
 {
-    if (pointLabel == first())
+    if (vertex == first())
     {
         return second();
     }
-    if (pointLabel == second())
+    if (vertex == second())
     {
         return first();
     }
@@ -228,35 +228,35 @@ inline Foam::label Foam::edge::count() const
 }
 
 
-inline bool Foam::edge::empty() const
+inline bool Foam::edge::empty() const noexcept
 {
     return (first() < 0 && second() < 0);
 }
 
 
-inline bool Foam::edge::insert(const label index)
+inline bool Foam::edge::insert(const label vertex)
 {
-    if (index < 0)
+    if (vertex < 0)
     {
-        // Cannot insert invalid point labels (use direct assignment for that)
+        // Cannot insert invalid vertex labels (use direct assignment for that)
         return false;
     }
 
     if (first() < 0)
     {
         // Store at first, if not duplicate of second
-        if (index != second())
+        if (vertex != second())
         {
-            first() = index;
+            first() = vertex;
             return true;
         }
     }
     else if (second() < 0)
     {
         // Store at second, if not duplicate of first
-        if (index != first())
+        if (vertex != first())
         {
-            second() = index;
+            second() = vertex;
             return true;
         }
     }
@@ -308,23 +308,23 @@ inline Foam::label Foam::edge::insert(const labelUList& list)
 }
 
 
-inline Foam::label Foam::edge::erase(const label index)
+inline Foam::label Foam::edge::erase(const label vertex)
 {
-    if (index < 0)
+    if (vertex < 0)
     {
         // Can never remove invalid point labels!
         return 0;
     }
 
     label n = 0;
-    if (index == first())
+    if (vertex == first())
     {
         first() = -1;
         ++n;
     }
 
     // Automatically handle duplicates, which should not have been there anyhow
-    if (index == second())
+    if (vertex == second())
     {
         second() = -1;
         ++n;
@@ -426,7 +426,13 @@ inline Foam::vector Foam::edge::unitVec(const UList<point>& pts) const
 
 inline Foam::scalar Foam::edge::mag(const UList<point>& pts) const
 {
-    return ::Foam::mag(vec(pts));
+    return pts[first()].dist(pts[second()]);
+}
+
+
+inline Foam::scalar Foam::edge::magSqr(const UList<point>& pts) const
+{
+    return pts[first()].distSqr(pts[second()]);
 }
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index bf646864a7..4e4d745a63 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -776,8 +776,8 @@ Foam::edgeList Foam::face::edges() const
     edgeList theEdges(nVerts);
 
     // Last edge closes the polygon
-    theEdges.last().first() = verts.last();
-    theEdges.last().second() = verts[0];
+    theEdges.back().first() = verts.back();
+    theEdges.back().second() = verts.front();
 
     for (label verti = 0; verti < nVerts - 1; ++verti)
     {
@@ -797,8 +797,8 @@ Foam::edgeList Foam::face::rcEdges() const
     edgeList theEdges(nVerts);
 
     // First edge closes the polygon
-    theEdges.first().first() = verts[0];
-    theEdges.first().second() = verts.last();
+    theEdges.front().first() = verts.front();
+    theEdges.front().second() = verts.back();
 
     for (label verti = 1; verti < nVerts; ++verti)
     {
@@ -878,12 +878,12 @@ Foam::label Foam::face::longestEdge(const UList<point>& pts) const
 
     // Last edge closes the polygon. Use it to initialize loop
     label longest = nVerts - 1;
-    scalar longestLen = Foam::edge(verts.first(), verts.last()).mag(pts);
+    scalar longestLen = pts[verts.front()].distSqr(pts[verts.back()]);
 
     // Examine other edges
     for (label edgei = 0; edgei < nVerts - 1; ++edgei)
     {
-        scalar edgeLen = Foam::edge(verts[edgei], verts[edgei + 1]).mag(pts);
+        scalar edgeLen = pts[verts[edgei]].distSqr(pts[verts[edgei+1]]);
 
         if (longestLen < edgeLen)
         {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 3257afc7f6..96167660c0 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -136,26 +136,26 @@ public:
         //- Default construct
         constexpr face() noexcept = default;
 
-        //- Construct given size, with invalid point labels (-1)
+        //- Construct given size, with invalid vertex labels (-1)
         inline explicit face(const label sz);
 
-        //- Copy construct from list of point labels
+        //- Copy construct from list of vertex labels
         inline explicit face(const labelUList& list);
 
-        //- Move construct from list of point labels
+        //- Move construct from list of vertex labels
         inline explicit face(labelList&& list);
 
-        //- Copy construct from an initializer list of point labels
+        //- Copy construct from an initializer list of vertex labels
         inline explicit face(std::initializer_list<label> list);
 
-        //- Copy construct from list of point labels
+        //- Copy construct from list of vertex labels
         template<unsigned N>
         inline explicit face(const FixedList<label, N>& list);
 
-        //- Copy construct from subset of point labels
+        //- Copy construct from subset of vertex labels
         inline face(const labelUList& list, const labelUList& indices);
 
-        //- Copy construct from subset of point labels
+        //- Copy construct from subset of vertex labels
         template<unsigned N>
         inline face(const labelUList& list, const FixedList<label, N>& indices);
 
@@ -168,12 +168,12 @@ public:
 
     // Member Functions
 
-        //- Collapse face by removing duplicate point labels
+        //- Collapse face by removing duplicate vertex labels
         //  \return the collapsed size
         label collapse();
 
         //- Flip the face in-place.
-        //  The starting points of the original and flipped face are identical.
+        //  The starting vertex of the original and flipped face are identical.
         void flip();
 
         //- Return the points corresponding to this face
@@ -211,15 +211,15 @@ public:
         inline Pair<point> box(const UList<point>& pts) const;
 
         //- Return face with reverse direction
-        //  The starting points of the original and reverse face are identical.
+        //  The starting vertex of the original and reverse face are identical.
         face reverseFace() const;
 
 
         // Navigation through face vertices
 
-        //- Find local index on face for the point label, same as find()
+        //- Find local vertex on face for the vertex label, same as find()
         //  \return position in face (0,1,2,...) or -1 if not found.
-        inline label which(const label pointLabel) const;
+        inline label which(const label vertex) const;
 
         //- The vertex on face - identical to operator[], but with naming
         //- similar to nextLabel(), prevLabel()
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index fee4a2049c..c54c33f3cd 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -175,9 +175,9 @@ inline Foam::vector Foam::face::rcEdge
 }
 
 
-inline Foam::label Foam::face::which(const label pointLabel) const
+inline Foam::label Foam::face::which(const label vertex) const
 {
-    return labelList::find(pointLabel);
+    return labelList::find(vertex);
 }
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
index 624a319e7e..1213813dcf 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
@@ -107,12 +107,7 @@ Foam::pointHit Foam::face::ray
 
                 // Miss distance is the distance between the plane intersection
                 // point and the nearest point of the triangle
-                scalar missDist =
-                    Foam::mag
-                    (
-                        p + curHit.distance()*n
-                      - curHit.point()
-                    );
+                scalar missDist = curHit.point().dist(p + curHit.distance()*n);
 
                 if (missDist < nearestMissDist)
                 {
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 9fbe3e4905..c3753be895 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -84,19 +84,19 @@ public:
 
     // Constructors
 
-        //- Default construct, with invalid point labels (-1)
+        //- Default construct, with invalid vertex labels (-1)
         inline triFace();
 
-        //- Construct from three point labels
+        //- Construct from three vertex labels
         inline triFace(const label p0, const label p1, const label p2) noexcept;
 
-        //- Construct from an initializer list of three point labels
+        //- Construct from an initializer list of three vertex labels
         inline explicit triFace(std::initializer_list<label> list);
 
-        //- Copy construct from a list of three point labels.
+        //- Copy construct from a list of three  vertex labels.
         inline explicit triFace(const labelUList& list);
 
-        //- Copy construct from a subset of point labels
+        //- Copy construct from a subset of vertex labels
         inline triFace
         (
             const labelUList& list,
@@ -135,20 +135,17 @@ public:
         //- True if vertices are unique and non-negative.
         inline bool good() const noexcept;
 
-        //- True if vertices are unique and non-negative.
-        bool valid() const noexcept { return good(); }
-
 
     // Other
 
-        //- 'Collapse' face by marking duplicate point labels.
-        //  Duplicates point labels are marked with '-1'
+        //- 'Collapse' face by marking duplicate vertex labels.
+        //  Duplicates vertex labels are marked with '-1'
         //  (the lower vertex is retained).
         //  Return the collapsed size.
         inline label collapse();
 
         //- Flip the face in-place.
-        //  The starting points of the original and flipped face are identical.
+        //  The starting vertex of the original and flipped face are identical.
         inline void flip();
 
         //- Return the points corresponding to this face
@@ -191,12 +188,12 @@ public:
         inline label nTriangles() const noexcept;
 
         //- Return face with reverse direction
-        //  The starting points of the original and reverse face are identical.
+        //  The starting vertex of the original and reverse face are identical.
         inline triFace reverseFace() const;
 
-        //- Find local index on face for the point label, same as find()
+        //- Find local vertex on face for the vertex label, same as find()
         //  \return position in face (0,1,2) or -1 if not found.
-        inline label which(const label pointLabel) const;
+        inline label which(const label vertex) const;
 
         //- Next vertex on face
         inline label nextLabel(const label i) const;
@@ -378,6 +375,9 @@ public:
 
     // Housekeeping
 
+        //- Same as good()
+        bool valid() const noexcept { return good(); }
+
         //- Identical to edge()
         Foam::edge faceEdge(label edgei) const { return this->edge(edgei); }
 };
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index ea0698f070..d839354690 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -221,9 +221,9 @@ inline Foam::triFace Foam::triFace::reverseFace() const
 }
 
 
-inline Foam::label Foam::triFace::which(const label pointLabel) const
+inline Foam::label Foam::triFace::which(const label vertex) const
 {
-    return FixedList<label, 3>::find(pointLabel);
+    return FixedList<label, 3>::find(vertex);
 }
 
 

From 0ab0ecb5418c68f1d2fea781033df5fbc5dc1021 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 27 Feb 2023 15:33:03 +0100
Subject: [PATCH 115/348] ENH: change refCount (internal) from count() to
 use_count()

- allows unambiguous of count() for other classes.
  Naming as per std::shared_ptr.

STYLE: qualify use_count() and unique() methods with the refCount base

- clearer/consistent meaning
---
 applications/test/tmp/Test-tmp.C         |  2 +-
 src/OpenFOAM/db/IOstreams/token/tokenI.H |  2 +-
 src/OpenFOAM/memory/refCount/refCount.H  |  4 ++--
 src/OpenFOAM/memory/tmp/tmpI.H           | 18 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/applications/test/tmp/Test-tmp.C b/applications/test/tmp/Test-tmp.C
index cd9e708344..215459ddae 100644
--- a/applications/test/tmp/Test-tmp.C
+++ b/applications/test/tmp/Test-tmp.C
@@ -41,7 +41,7 @@ void printInfo(const tmp<T>& item, const bool verbose = false)
         << " movable:" << Switch(item.movable());
     if (item)
     {
-        Info<< " refCount:" << item->count();
+        Info<< " refCount:" << item->use_count();
     }
 
     Info<< " move-constructible:"
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index fe1a535565..ccea31ef4f 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -276,7 +276,7 @@ inline void Foam::token::reset()
 
         case tokenType::COMPOUND:
         {
-            if (data_.compoundPtr->unique())
+            if (data_.compoundPtr->refCount::unique())
             {
                 delete data_.compoundPtr;
             }
diff --git a/src/OpenFOAM/memory/refCount/refCount.H b/src/OpenFOAM/memory/refCount/refCount.H
index 58ef0d0aa8..5df795b3e9 100644
--- a/src/OpenFOAM/memory/refCount/refCount.H
+++ b/src/OpenFOAM/memory/refCount/refCount.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,7 +72,7 @@ public:
     // Member Functions
 
         //- Return the current reference count
-        int count() const noexcept
+        int use_count() const noexcept
         {
             return count_;
         }
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index e753f5090c..191b44a67f 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,9 +34,9 @@ License
 template<class T>
 inline void Foam::tmp<T>::incrCount()
 {
-    ptr_->operator++();
+    ptr_->refCount::operator++();
 
-    if (ptr_->count() > 1)
+    if (ptr_->refCount::use_count() > 1)
     {
         FatalErrorInFunction
             << "Attempt to create more than 2 tmp's referring to the same"
@@ -79,7 +79,7 @@ inline Foam::tmp<T>::tmp(T* p)
     ptr_(p),
     type_(PTR)
 {
-    if (ptr_ && !ptr_->unique())
+    if (ptr_ && !ptr_->refCount::unique())
     {
         FatalErrorInFunction
             << "Attempted construction of a "
@@ -195,7 +195,7 @@ inline Foam::tmp<T>::~tmp() noexcept
 template<class T>
 inline bool Foam::tmp<T>::movable() const noexcept
 {
-    return (is_pointer() && ptr_ && ptr_->unique());
+    return (is_pointer() && ptr_ && ptr_->refCount::unique());
 }
 
 
@@ -246,7 +246,7 @@ inline T* Foam::tmp<T>::ptr() const
 
     if (is_pointer())
     {
-        if (!ptr_->unique())
+        if (!ptr_->refCount::unique())
         {
             FatalErrorInFunction
                 << "Attempt to acquire pointer to object referred to"
@@ -271,13 +271,13 @@ inline void Foam::tmp<T>::clear() const noexcept
 {
     if (is_pointer() && ptr_)
     {
-        if (ptr_->unique())
+        if (ptr_->refCount::unique())
         {
             delete ptr_;
         }
         else
         {
-            ptr_->operator--();
+            ptr_->refCount::operator--();
         }
         ptr_ = nullptr;
     }
@@ -479,7 +479,7 @@ inline void Foam::tmp<T>::operator=(T* p)
             << this->typeName()
             << abort(FatalError);
     }
-    else if (!p->unique())
+    else if (!p->refCount::unique())
     {
         FatalErrorInFunction
             << "Attempted assignment of a "

From 72d2ff8249cde91157ad40a3b5d56800c6eb2900 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Feb 2023 11:12:13 +0100
Subject: [PATCH 116/348] ENH: PtrList detail level iteration of null/non-null
 entries (#2702)

- naming as per bitSet (ie, find_first, find_next) that work with list
  indices.
- relocate bounds checked access into detail. Add at() accessor
---
 .../PtrLists/PtrDynList/PtrDynList.H          |  6 +-
 .../containers/PtrLists/PtrList/PtrList.H     |  8 +-
 .../PtrLists/PtrListDetail/PtrListDetail.C    | 54 +++++++++---
 .../PtrLists/PtrListDetail/PtrListDetail.H    | 47 ++++++++--
 .../PtrLists/PtrListDetail/PtrListDetailI.H   | 18 +++-
 .../PtrLists/PtrListOps/PtrListOpsTemplates.C |  7 +-
 .../containers/PtrLists/UPtrList/UPtrList.H   | 46 ++++++----
 .../containers/PtrLists/UPtrList/UPtrListI.H  | 85 ++++++++++++-------
 8 files changed, 188 insertions(+), 83 deletions(-)

diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index 8a7573645e..f0850dd8c7 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -109,9 +109,6 @@ public:
         //- Alter the addressed list size.
         inline void resize(const label newLen);
 
-        //- Same as resize()
-        void setSize(const label n) { this->resize(n); }
-
         //- Clear the addressed list, i.e. set the size to zero.
         //  Allocated size does not change
         inline void clear();
@@ -235,6 +232,9 @@ public:
             return this->set(i, std::move(ptr));
         }
 
+        //- Same as resize()
+        void setSize(const label n) { this->resize(n); }
+
         //- Move append an element to the end of the list
         void append(autoPtr<T>& ptr) { this->push_back(std::move(ptr)); }
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index f59cfaff26..6d1ffb1677 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -146,9 +146,6 @@ public:
         //  New entries are initialized to nullptr, removed entries are deleted
         void resize(const label newLen);
 
-        //- Same as resize()
-        void setSize(const label newLen) { this->resize(newLen); }
-
         //- Construct and append an element to the end of the list,
         //- return reference to the new list element
         template<class... Args>
@@ -213,7 +210,7 @@ public:
         inline void operator=(PtrList<T>&& list);
 
 
-    // IOstream operator
+    // IOstream Operators
 
         //- Read from Istream, discarding contents of existing list
         friend Istream& operator>> <T>(Istream& is, PtrList<T>& list);
@@ -227,6 +224,9 @@ public:
             return this->set(i, std::move(ptr));
         }
 
+        //- Same as resize()
+        void setSize(const label newLen) { this->resize(newLen); }
+
         //- Move append an element to the end of the list
         void append(autoPtr<T>& ptr) { this->push_back(std::move(ptr)); }
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C
index d236b19b78..0f75b2fb63 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C
+++ b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,38 +30,66 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
-Foam::label Foam::Detail::PtrListDetail<T>::count() const
+Foam::label Foam::Detail::PtrListDetail<T>::count() const noexcept
 {
-    label ngood = 0;
+    label n = 0;
 
     for (const T* ptr : *this)
     {
         if (ptr)
         {
-            ++ngood;
+            ++n;
         }
     }
 
-    return ngood;
+    return n;
 }
 
 
 template<class T>
-Foam::label Foam::Detail::PtrListDetail<T>::findNull() const
+Foam::label Foam::Detail::PtrListDetail<T>::find_first() const
 {
-    // Same as  List<T*>::find(nullptr);
-    // except perhaps without pointer ambiguities...
+    return this->find_next(-1);
+}
 
-    label idx = 0;
 
-    for (const T* ptr : *this)
+template<class T>
+Foam::label Foam::Detail::PtrListDetail<T>::find_first_not() const
+{
+    return this->find_next_not(-1);
+}
+
+
+template<class T>
+Foam::label Foam::Detail::PtrListDetail<T>::find_next(label pos) const
+{
+    const label len = this->size();
+
+    // Start search after the given position (input of -1 is also valid)
+    for (++pos; pos < len; ++pos)
     {
-        if (!ptr)
+        if ((*this)[pos])
         {
-            return idx;
+            return pos;
         }
+    }
 
-        ++idx;
+    return -1;
+}
+
+
+template<class T>
+Foam::label Foam::Detail::PtrListDetail<T>::find_next_not(label pos) const
+{
+    const label len = this->size();
+
+    // Start search after the given position (input of -1 is also valid)
+    for (++pos; pos < len; ++pos)
+    {
+        if (!(*this)[pos])
+        {
+            return pos;
+        }
     }
 
     return -1;
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.H b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.H
index 70b4637c3b..fb23acfbab 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetail.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,19 +89,51 @@ public:
 
     // Member Functions
 
-        //- Return the count of non-nullptr entries
-        label count() const;
+        //- Return const pointer to element or nullptr for out-of-range access.
+        inline const T* get(const label i) const;
 
-        //- Locate the first null entry, -1 if there are none (or empty list)
-        label findNull() const;
+        //- Return pointer to element or nullptr for out-of-range access.
+        inline T* get(const label i);
+
+        //- Return the number of non-null entries
+        label count() const noexcept;
 
         //- FatalError if any null exists in the list
         inline void checkNonNull() const;
 
-        //- Assign all pointers to nullptr, without deleting.
+        //- Locate the first entry that is non-null.
+        //  \return the location or -1 if there are no bits set.
+        //
+        //  \note Method name as per bitSet
+        label find_first() const;
+
+        //- Locate the first entry that is null, -1 if there are none (or empty list)
+        //  \return the location or -1 if the list is empty or all entries
+        //  are non-null.
+        //
+        //  \note Method name as per bitSet, symmetry with find_first()
+        label find_first_not() const;
+
+        //- Locate the next non-null entry, starting one beyond the specified
+        //- position
+        //  \return the location or -1 if remaining entries are null.
+        //
+        //  \note Method name as per bitSet
+        label find_next(label pos) const;
+
+        //- Locate the next null entry, starting one beyond the specified
+        //- position
+        //  \return the location or -1 if remaining entries are non-null.
+        //
+        //  \note Method name as per bitSet
+        label find_next_not(label pos) const;
+
+        //- Reassign all pointers to nullptr, without deleting.
+        //- Does not affect the list size.
         void setNull();
 
-        //- Delete the allocated entries, but retain the list size.
+        //- Delete allocated entries and reassign to nullptr.
+        //- Does not affect the list size.
         void free();
 
         //- Make a copy by cloning each of the list pointers.
@@ -140,6 +172,7 @@ public:
         void resize_nocopy(const label) = delete;
 };
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Detail
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetailI.H b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetailI.H
index 7b5425c1f4..3f27da0125 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetailI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrListDetail/PtrListDetailI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -84,6 +84,20 @@ inline Foam::Detail::PtrListDetail<T>::PtrListDetail
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline const T* Foam::Detail::PtrListDetail<T>::get(const label i) const
+{
+    return (i >= 0 && i < this->size()) ? (*this)[i] : nullptr;
+}
+
+
+template<class T>
+inline T* Foam::Detail::PtrListDetail<T>::get(const label i)
+{
+    return (i >= 0 && i < this->size()) ? (*this)[i] : nullptr;
+}
+
+
 template<class T>
 inline void Foam::Detail::PtrListDetail<T>::setAddressableSize
 (
@@ -112,7 +126,7 @@ inline void Foam::Detail::PtrListDetail<T>::resize(const label newLen)
 template<class T>
 inline void Foam::Detail::PtrListDetail<T>::checkNonNull() const
 {
-    const label idx = this->findNull();
+    const label idx = this->find_first_not();
 
     if (idx >= 0)
     {
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C b/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C
index 85d6fedf70..430d47fa33 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C
+++ b/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C
@@ -134,12 +134,9 @@ Foam::List<Foam::word> Foam::PtrListOps::names
     {
         const T* ptr = list.get(i);
 
-        if (bool(ptr))
+        if (bool(ptr) && matcher(ptr->name()))
         {
-            if (matcher(ptr->name()))
-            {
-                output[count++] = (ptr->name());
-            }
+            output[count++] = (ptr->name());
         }
     }
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index fc6eb9eb23..675fd2a18c 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -83,6 +83,9 @@ protected:
         //- Adjust addressable size
         inline void setAddressableSize(const label n) noexcept;
 
+        //- The next non-null entry after the specified position
+        inline label find_next(label pos) const;
+
 
     // Constructors
 
@@ -214,9 +217,12 @@ public:
         //- True if the list is empty (ie, size() is zero)
         inline bool empty() const noexcept;
 
-        //- The number of elements in the list
+        //- The number of entries in the list
         inline label size() const noexcept;
 
+        //- The number of non-null entries in the list
+        inline label size_nonNull() const noexcept;
+
         //- Reference to the first element of the list
         inline T& front();
 
@@ -247,7 +253,7 @@ public:
         //- Return const pointer to element (can be nullptr),
         //- or nullptr for out-of-range access (ie, \em with bounds checking).
         //  The return value can be tested as a bool.
-        inline const T* set(const label i) const;
+        const T* set(const label i) const { return this->get(i); }
 
 
     // Edit
@@ -259,9 +265,6 @@ public:
         //  New entries are initialized to nullptr.
         inline void resize(const label newLen);
 
-        //- Alias for resize()
-        void setSize(const label n) { this->resize(n); }
-
         //- Squeeze out nullptr entries in the list of pointers after which
         //- any null pointers will be at the end of the list
         //  \return the number of non-null entries
@@ -304,13 +307,23 @@ public:
         //- Check and raise FatalError if any nullptr exists in the list
         inline void checkNonNull() const;
 
+        //- Return const reference to the element at given position.
+        //- FatalError for bounds problem or nullptr.
+        inline const T& at(const label i) const;
+
+        //- Return reference to the element at given position.
+        //- FatalError for bounds problem or nullptr.
+        inline T& at(const label i);
+
 
     // Member Operators
 
-        //- Return const reference to the element
+        //- Return const reference to the element at given position.
+        //- FatalError for bounds problem or nullptr. Same as at().
         inline const T& operator[](const label i) const;
 
-        //- Return reference to the element
+        //- Return reference to the element at given position.
+        //- FatalError for bounds problem or nullptr. Same as at().
         inline T& operator[](const label i);
 
         //- Deprecated(2022-09) - same as get()
@@ -325,6 +338,12 @@ public:
         inline void operator=(UPtrList<T>&& list);
 
 
+    // IOstream Operators
+
+        //- Write UPtrList to Ostream
+        friend Ostream& operator<< <T>(Ostream& os, const UPtrList<T>& list);
+
+
     // Iterators
 
         //- Random-access iterator with non-const access
@@ -471,18 +490,11 @@ public:
         inline const_iterator end() const noexcept;
 
 
-    // IOstream operator
-
-        //- Write UPtrList to Ostream
-        friend Ostream& operator<< <T>
-        (
-            Ostream& os,
-            const UPtrList<T>& list
-        );
-
-
     // Housekeeping
 
+        //- Alias for resize()
+        void setSize(const label n) { this->resize(n); }
+
         //- Reference to the first element of the list
         //FOAM_DEPRECATED_FOR(2022-10, "front()")
         T& first() { return front(); }
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index 652ebd872a..d646b572cc 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,6 +35,13 @@ inline void Foam::UPtrList<T>::setAddressableSize(const label n) noexcept
 }
 
 
+template<class T>
+inline Foam::label Foam::UPtrList<T>::find_next(label pos) const
+{
+    return ptrs_.find_next(pos);
+}
+
+
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T>
@@ -116,31 +123,65 @@ inline Foam::label Foam::UPtrList<T>::size() const noexcept
 }
 
 
+template<class T>
+inline Foam::label Foam::UPtrList<T>::size_nonNull() const noexcept
+{
+    return ptrs_.count();
+}
+
+
 template<class T>
 inline const T* Foam::UPtrList<T>::test(const label i) const
 {
-    return (i >= 0 && i < ptrs_.size()) ? ptrs_[i] : nullptr;
+    return ptrs_.get(i);
 }
 
 
 template<class T>
 inline const T* Foam::UPtrList<T>::get(const label i) const
 {
-    return (i >= 0 && i < ptrs_.size()) ? ptrs_[i] : nullptr;
+    return ptrs_.get(i);
 }
 
 
 template<class T>
 inline T* Foam::UPtrList<T>::get(const label i)
 {
-    return (i >= 0 && i < ptrs_.size()) ? ptrs_[i] : nullptr;
+    return ptrs_.get(i);
 }
 
 
 template<class T>
-inline const T* Foam::UPtrList<T>::set(const label i) const
+inline const T& Foam::UPtrList<T>::at(const label i) const
 {
-    return (i >= 0 && i < ptrs_.size()) ? ptrs_[i] : nullptr;
+    const T* ptr = ptrs_.get(i);
+
+    if (!ptr)
+    {
+        FatalErrorInFunction
+            << "Cannot dereference nullptr at index " << i
+            << " in range [0," << size() << ")\n"
+            << abort(FatalError);
+    }
+
+    return *ptr;
+}
+
+
+template<class T>
+inline T& Foam::UPtrList<T>::at(const label i)
+{
+    T* ptr = ptrs_.get(i);
+
+    if (!ptr)
+    {
+        FatalErrorInFunction
+            << "Cannot dereference nullptr at index " << i
+            << " in range [0," << size() << ")\n"
+            << abort(FatalError);
+    }
+
+    return *ptr;
 }
 
 
@@ -181,28 +222,28 @@ inline void Foam::UPtrList<T>::transfer(UPtrList<T>& list)
 template<class T>
 inline T& Foam::UPtrList<T>::front()
 {
-    return this->operator[](0);
+    return this->at(0);
 }
 
 
 template<class T>
 inline const T& Foam::UPtrList<T>::front() const
 {
-    return this->operator[](0);
+    return this->at(0);
 }
 
 
 template<class T>
 inline T& Foam::UPtrList<T>::back()
 {
-    return this->operator[](this->size()-1);
+    return this->at(this->size()-1);
 }
 
 
 template<class T>
 inline const T& Foam::UPtrList<T>::back() const
 {
-    return this->operator[](this->size()-1);
+    return this->at(this->size()-1);
 }
 
 
@@ -240,34 +281,14 @@ inline void Foam::UPtrList<T>::checkNonNull() const
 template<class T>
 inline const T& Foam::UPtrList<T>::operator[](const label i) const
 {
-    const T* ptr = ptrs_[i];
-
-    if (!ptr)
-    {
-        FatalErrorInFunction
-            << "Cannot dereference nullptr at index " << i
-            << " in range [0," << size() << ")\n"
-            << abort(FatalError);
-    }
-
-    return *ptr;
+    return this->at(i);
 }
 
 
 template<class T>
 inline T& Foam::UPtrList<T>::operator[](const label i)
 {
-    T* ptr = ptrs_[i];
-
-    if (!ptr)
-    {
-        FatalErrorInFunction
-            << "Cannot dereference nullptr at index " << i
-            << " in range [0," << size() << ")\n"
-            << abort(FatalError);
-    }
-
-    return *ptr;
+    return this->at(i);
 }
 
 

From afee861af99e32bbf4c9f7502890abc01a350d57 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Feb 2023 11:12:13 +0100
Subject: [PATCH 117/348] DEFEATURE: remove PtrList random access iterators
 (#2702)

- random access was unused.
  Retaining it would impede reimplementing iterators to only iterate
  across non-null items.
---
 applications/test/PtrList/Test-PtrList.C      |   2 +
 .../containers/PtrLists/UPtrList/UPtrList.H   |  58 +----
 .../containers/PtrLists/UPtrList/UPtrListI.H  | 202 ------------------
 3 files changed, 10 insertions(+), 252 deletions(-)

diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index e6821e38d1..1ac282622a 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -562,6 +562,7 @@ int main(int argc, char *argv[])
         << "ulist2: " << ulist2 << nl;
 
     // Test iterator random access
+    #if (OPENFOAM <= 2212)
     {
         auto iter1 = ulist1.begin();
         auto iter2 = iter1 + 3;
@@ -576,6 +577,7 @@ int main(int argc, char *argv[])
         Info<< "*"  << (*iter1).value() << nl;
         Info<< "()" << iter1().value() << nl;
     }
+    #endif
 
     PtrList<plane> planes;
     planes.emplace_back(vector::one, vector::one);
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index 675fd2a18c..8be5fc8855 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -106,10 +106,10 @@ public:
         //- A const reference to the value_type
         typedef const T& const_reference;
 
-        //- Random-access iterator with non-const access
+        //- Forward iterator with non-const access
         class iterator;
 
-        //- Random-access iterator with const access
+        //- Forward iterator with const access
         class const_iterator;
 
 
@@ -346,7 +346,7 @@ public:
 
     // Iterators
 
-        //- Random-access iterator with non-const access
+        //- Forward iterator with non-const access
         class iterator
         {
             // Pointer to parent
@@ -354,7 +354,7 @@ public:
 
         public:
 
-            using iterator_category = std::random_access_iterator_tag;
+            using iterator_category = std::forward_iterator_tag;
             using value_type = T;
             using difference_type = label;
             using pointer = T*;
@@ -374,37 +374,16 @@ public:
             inline pointer operator->() const;
             inline reference operator*() const;
 
-            reference operator()() const { return this->operator*(); }
-            inline reference operator[](difference_type n) const;
-
-            // Forward iteration
+            // Forward Iteration
             inline iterator& operator++() noexcept;
             inline iterator operator++(int) noexcept;
 
-            inline iterator& operator--() noexcept;
-            inline iterator operator--(int) noexcept;
-
-            // Random-access
-            inline iterator& operator+=(difference_type n) noexcept;
-            inline iterator& operator-=(difference_type n) noexcept;
-            inline iterator operator+(difference_type n) const noexcept;
-            inline iterator operator-(difference_type n) const noexcept;
-
-            inline difference_type operator-(const iterator& iter)
-            const noexcept;
-
             inline bool operator==(const iterator& iter) const noexcept;
             inline bool operator!=(const iterator& iter) const noexcept;
-
-            inline bool operator<(const iterator& iter) const noexcept;
-            inline bool operator>(const iterator& iter) const noexcept;
-
-            inline bool operator<=(const iterator& iter) const noexcept;
-            inline bool operator>=(const iterator& iter) const noexcept;
         };
 
 
-        //- Random-access iterator with const access
+        //- Forward iterator with const access
         class const_iterator
         {
             // Pointer to parent
@@ -412,7 +391,7 @@ public:
 
         public:
 
-            using iterator_category = std::random_access_iterator_tag;
+            using iterator_category = std::forward_iterator_tag;
             using value_type = const T;
             using difference_type = label;
             using pointer = const T*;
@@ -434,33 +413,12 @@ public:
             inline pointer operator->() const;
             inline reference operator*() const;
 
-            reference operator()() const { return this->operator*(); }
-            inline reference operator[](difference_type n) const;
-
-            // Forward iteration
+            // Forward Iteration
             inline const_iterator& operator++() noexcept;
             inline const_iterator operator++(int) noexcept;
 
-            inline const_iterator& operator--() noexcept;
-            inline const_iterator operator--(int) noexcept;
-
-            // Random-access
-            inline const_iterator& operator+=(difference_type n) noexcept;
-            inline const_iterator& operator-=(difference_type n) noexcept;
-            inline const_iterator operator+(difference_type n) const noexcept;
-            inline const_iterator operator-(difference_type n) const noexcept;
-
-            inline difference_type operator-(const const_iterator& iter)
-            const noexcept;
-
             inline bool operator==(const const_iterator& iter) const noexcept;
             inline bool operator!=(const const_iterator& iter) const noexcept;
-
-            inline bool operator<(const const_iterator& iter) const noexcept;
-            inline bool operator>(const const_iterator& iter) const noexcept;
-
-            inline bool operator<=(const const_iterator& iter) const noexcept;
-            inline bool operator>=(const const_iterator& iter) const noexcept;
         };
 
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index d646b572cc..eacbe831d0 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -316,12 +316,6 @@ inline T& Foam::UPtrList<T>::iterator::operator*() const
 }
 
 
-template<class T>
-inline T& Foam::UPtrList<T>::iterator::operator[](label n) const
-{
-    return **(ptr_ + n);
-}
-
 template<class T>
 inline typename Foam::UPtrList<T>::iterator&
 Foam::UPtrList<T>::iterator::operator++() noexcept
@@ -341,68 +335,6 @@ Foam::UPtrList<T>::iterator::operator++(int) noexcept
 }
 
 
-template<class T>
-inline typename Foam::UPtrList<T>::iterator&
-Foam::UPtrList<T>::iterator::operator--() noexcept
-{
-    --ptr_;
-    return *this;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::iterator
-Foam::UPtrList<T>::iterator::operator--(int) noexcept
-{
-    iterator iter(*this);
-    --ptr_;
-    return iter;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::iterator&
-Foam::UPtrList<T>::iterator::operator+=(label n) noexcept
-{
-    ptr_ += n;
-    return *this;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::iterator&
-Foam::UPtrList<T>::iterator::operator-=(label n) noexcept
-{
-    ptr_ -= n;
-    return *this;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::iterator
-Foam::UPtrList<T>::iterator::operator+(label n) const noexcept
-{
-    return iterator(ptr_ + n);
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::iterator
-Foam::UPtrList<T>::iterator::operator-(label n) const noexcept
-{
-    return iterator(ptr_ - n);
-}
-
-
-template<class T>
-inline Foam::label
-Foam::UPtrList<T>::iterator::
-operator-(const iterator& iter) const noexcept
-{
-    return (ptr_ - iter.ptr_);
-}
-
-
 template<class T>
 inline bool Foam::UPtrList<T>::iterator::
 operator==(const iterator& iter) const noexcept
@@ -419,38 +351,6 @@ operator!=(const iterator& iter) const noexcept
 }
 
 
-template<class T>
-inline bool Foam::UPtrList<T>::iterator::
-operator<(const iterator& iter) const noexcept
-{
-    return ptr_ < iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::iterator::
-operator>(const iterator& iter) const noexcept
-{
-    return ptr_ > iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::iterator::
-operator<=(const iterator& iter) const noexcept
-{
-    return ptr_ <= iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::iterator::
-operator>=(const iterator& iter) const noexcept
-{
-    return ptr_ >= iter.ptr_;
-}
-
-
 // * * * * * * * * * * * * * * * const_iterator  * * * * * * * * * * * * * * //
 
 template<class T>
@@ -483,14 +383,6 @@ inline const T& Foam::UPtrList<T>::const_iterator::operator*() const
 }
 
 
-template<class T>
-inline const T&
-Foam::UPtrList<T>::const_iterator::operator[](label n) const
-{
-    return **(ptr_ + n);
-}
-
-
 template<class T>
 inline typename Foam::UPtrList<T>::const_iterator&
 Foam::UPtrList<T>::const_iterator::operator++() noexcept
@@ -510,68 +402,6 @@ Foam::UPtrList<T>::const_iterator::operator++(int) noexcept
 }
 
 
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator&
-Foam::UPtrList<T>::const_iterator::operator--() noexcept
-{
-    --ptr_;
-    return *this;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::const_iterator::operator--(int) noexcept
-{
-    const_iterator iter(*this);
-    --ptr_;
-    return iter;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator&
-Foam::UPtrList<T>::const_iterator::operator+=(label n) noexcept
-{
-    ptr_ += n;
-    return *this;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator&
-Foam::UPtrList<T>::const_iterator::operator-=(label n) noexcept
-{
-    ptr_ -= n;
-    return *this;
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::const_iterator::operator+(label n) const noexcept
-{
-    return const_iterator(ptr_ + n);
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::const_iterator::operator-(label n) const noexcept
-{
-    return const_iterator(ptr_ - n);
-}
-
-
-template<class T>
-inline Foam::label
-Foam::UPtrList<T>::const_iterator::
-operator-(const const_iterator& iter) const noexcept
-{
-    return (ptr_ - iter.ptr_);
-}
-
-
 template<class T>
 inline bool Foam::UPtrList<T>::const_iterator::
 operator==(const const_iterator& iter) const noexcept
@@ -588,38 +418,6 @@ operator!=(const const_iterator& iter) const noexcept
 }
 
 
-template<class T>
-inline bool Foam::UPtrList<T>::const_iterator::
-operator<(const const_iterator& iter) const noexcept
-{
-    return ptr_ < iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::const_iterator::
-operator>(const const_iterator& iter) const noexcept
-{
-    return ptr_ > iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::const_iterator::
-operator<=(const const_iterator& iter) const noexcept
-{
-    return ptr_ <= iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::const_iterator::
-operator>=(const const_iterator& iter) const noexcept
-{
-    return ptr_ >= iter.ptr_;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>

From 9729617ae393a6773082daff6cb987c179e6675c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Feb 2023 11:12:13 +0100
Subject: [PATCH 118/348] ENH: PtrList iterate over non-null entries (#2702)

- the iterator/const_iterator now skip any nullptr entries,
  which enables the following code to work even if the PtrList
  contains nullptr:

  for (const auto& intf : interfaces)
  {
      // Do something
      ...
  }

- this is a change in behaviour compared to OpenFOAM-v2212 and earlier,
  but is non-breaking:
  * Lists without null entries will traverse exactly as before.
  * Lists with null entries will now traverse correctly without
    provoking a FatalError.
---
 applications/test/PtrList/Test-PtrList.C      |  30 +-
 .../containers/PtrLists/UPtrList/UPtrList.H   | 270 ++++++++++++++----
 .../containers/PtrLists/UPtrList/UPtrListI.H  | 184 ++++++------
 3 files changed, 326 insertions(+), 158 deletions(-)

diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index 1ac282622a..5125a2309f 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -268,10 +268,7 @@ Ostream& report
 
 int main(int argc, char *argv[])
 {
-    PtrList<Scalar> list1(10);
-    PtrList<Scalar> list2(15);
-    PtrList<Scalar> listApp;
-
+    #if 0
     {
         DLPtrList<Scalar> llist1;
         llist1.push_front(new Scalar(100));
@@ -301,8 +298,10 @@ int main(int argc, char *argv[])
                 << "for-: " << it << endl;
         }
     }
+    #endif
 
     // Same but as SLPtrList
+    #if 0
     {
         SLPtrList<Scalar> llist1;
         llist1.push_front(new Scalar(100));
@@ -318,18 +317,23 @@ int main(int argc, char *argv[])
         PtrList<Scalar> list1b(llist1);
         Info<< list1b << endl;
     }
+    #endif
+
+    PtrList<Scalar> list1(10);
 
     forAll(list1, i)
     {
         list1.set(i, new Scalar(1.3*i));
     }
 
+    PtrList<Scalar> list2(15);
     Info<< "Emplace set " << list2.size() << " values" << nl;
     forAll(list2, i)
     {
         list2.emplace(i, (10 + 1.3*i));
     }
 
+    PtrList<Scalar> listApp;
     for (label i = 0; i < 5; ++i)
     {
         listApp.emplace_back(1.3*i);
@@ -375,6 +379,24 @@ int main(int argc, char *argv[])
         list1.set(i, nullptr);
     }
 
+    {
+        Info<< "range-for of list (" << list1.count() << '/'
+            << list1.size() << ") non-null entries" << nl
+            << "(" << nl;
+        for (const auto& item : list1)
+        {
+            Info<< "    " << item << nl;
+        }
+        Info<< ")" << nl;
+    }
+    {
+        Info<< "iterate on non-null:" << endl;
+        forAllConstIters(list1, iter)
+        {
+            Info<< "    " << iter.key() << " : " << iter.val() << nl;
+        }
+    }
+
     Info<< "release some items:" << endl;
 
     for (label i = -2; i < 5; i++)
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index 8be5fc8855..0dd1967be3 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,41 @@ Class
 Description
     A list of pointers to objects of type \<T\>, without allocation/deallocation
     management of the pointers - this is to be done elsewhere.
-    The operator[] returns a reference to the object, not the pointer.
+    The operator[] returns a reference to the object (not the pointer).
+
+    The iterators are similar to bitSet in that they skip nullptr entries,
+    and also return a value (like the list operator[] does).
+
+    When traversing lists, it possible to test the validity directly:
+    \code
+    forAll(interfaces, i)
+    {
+        if (interfaces.test(i))
+        {
+            // Interface is set, do something
+            const auto& intf = interfaces[i];
+            ...
+        }
+    }
+    \endcode
+    The lists can also be traversed with a for-range
+    (in OpenFOAM-v2212 and earlier this would have failed on nullptr entries):
+    \code
+    for (const auto& intf : interfaces)
+    {
+        // Do something
+        ...
+    }
+    \endcode
+
+    It is also possible to traverse with non-null entries
+    and use key/val access (like HashTable naming):
+    \code
+    forAllConstIters(interfaces, iter)
+    {
+        Info<< "entry " << iter.key() << " : " << iter.val() << nl;
+    }
+    \endcode
 
 Note
     The class definition is such that it contains a list of pointers, but
@@ -221,7 +255,7 @@ public:
         inline label size() const noexcept;
 
         //- The number of non-null entries in the list
-        inline label size_nonNull() const noexcept;
+        inline label count() const noexcept;
 
         //- Reference to the first element of the list
         inline T& front();
@@ -344,81 +378,209 @@ public:
         friend Ostream& operator<< <T>(Ostream& os, const UPtrList<T>& list);
 
 
-    // Iterators
+protected:
 
-        //- Forward iterator with non-const access
-        class iterator
+    // Iterators and helpers
+
+        //- Internally used base for iterator and const_iterator
+        template<bool Const> class Iterator;
+
+        //- Allow iterator access to internals
+        friend class Iterator<true>;
+
+        //- Allow iterator access to internals
+        friend class Iterator<false>;
+
+
+        //- The iterator base for UPtrList (internal use only).
+        //  Iterates non-nullptr entries.
+
+        template<bool Const>
+        class Iterator
         {
-            // Pointer to parent
-            T** ptr_;
+        public:
+
+        // Typedefs
+
+            //- The list container type
+            using list_type = typename std::conditional
+            <
+                Const,
+                const UPtrList<T>,
+                UPtrList<T>
+            >::type;
+
+
+        protected:
+
+        // Protected Data
+
+            //- The parent being iterated
+            //  Uses pointer for default copy/assignment
+            list_type* list_;
+
+            //- The position within the list
+            label pos_;
+
+            // Friendship with UPtrList, for begin constructor
+            friend class UPtrList;
+
+
+        // Protected Constructors
+
+            //- Default construct. Also the same as the end iterator
+            inline constexpr Iterator() noexcept;
+
+            //- Construct begin iterator
+            inline explicit Iterator(list_type* list);
+
+
+        // Protected Member Functions
+
+            //- Increment to the next non-null position
+            inline void increment();
+
+            //- Permit explicit cast to the other (const/non-const) iterator
+            template<bool Any>
+            explicit operator const Iterator<Any>&() const
+            {
+                return *reinterpret_cast<const Iterator<Any>*>(this);
+            }
+
 
         public:
 
-            using iterator_category = std::forward_iterator_tag;
-            using value_type = T;
-            using difference_type = label;
+        // Member Functions/Operators
+
+            //- True if iterator points to a non-null entry
+            bool good() const noexcept { return (list_ && pos_ >= 0); }
+
+            //- The iterator position/index within the list
+            label key() const noexcept { return pos_; }
+
+            //- Compare hash-entry element pointers.
+            //  Independent of const/non-const access
+            template<bool Any>
+            bool operator==(const Iterator<Any>& iter) const noexcept
+            {
+                return (pos_ == iter.pos_);
+            }
+
+            template<bool Any>
+            bool operator!=(const Iterator<Any>& iter) const noexcept
+            {
+                return (pos_ != iter.pos_);
+            }
+        };
+
+
+public:
+
+    // Iterators
+
+        //- Forward iterator with non-const access
+        class iterator : public Iterator<false>
+        {
+        public:
+            // using iterator_category = std::forward_iterator_tag;
+            // using difference_type = label;
             using pointer = T*;
             using reference = T&;
-            friend class const_iterator;
 
-            //- Construct for a given entry
-            inline iterator(T** ptr) noexcept;
 
-            // Member Functions
+        // Constructors
 
-            //- Return pointer, can be nullptr.
-            pointer get() const { return *ptr_; }
+            //- Default construct - an end iterator
+            constexpr iterator() noexcept = default;
 
-            // Member Operators
+            //- Copy construct from similar access type
+            explicit iterator(const Iterator<false>& iter)
+            :
+                Iterator<false>(iter)
+            {}
 
-            inline pointer operator->() const;
-            inline reference operator*() const;
 
-            // Forward Iteration
-            inline iterator& operator++() noexcept;
-            inline iterator operator++(int) noexcept;
+        // Member Functions/Operators
 
-            inline bool operator==(const iterator& iter) const noexcept;
-            inline bool operator!=(const iterator& iter) const noexcept;
+            //- Pointer to the referenced object (failsafe)
+            inline pointer get() const;
+
+            //- Reference to the object
+            inline reference val() const;
+
+            //- Pointer to the referenced object
+            pointer operator->() const { return this->get(); }
+
+            //- Reference to the object
+            reference operator*() const { return this->val(); }
+
+            //- Legacy call operator: reference to the object
+            reference operator()() const { return this->val(); }
+
+            //- Move to the next non-nullptr entry
+            inline iterator& operator++();
+            inline iterator operator++(int);
         };
 
 
         //- Forward iterator with const access
-        class const_iterator
+        class const_iterator : public Iterator<true>
         {
-            // Pointer to parent
-            const T* const* ptr_;
-
         public:
-
-            using iterator_category = std::forward_iterator_tag;
-            using value_type = const T;
-            using difference_type = label;
+            // using iterator_category = std::forward_iterator_tag;
+            // using difference_type = label;
             using pointer = const T*;
             using reference = const T&;
 
-            //- Construct for a given entry
-            inline const_iterator(const T* const* ptr) noexcept;
 
-            //- Copy construct from non-const iterator
-            inline const_iterator(const iterator& iter) noexcept;
+        // Generated Methods
 
-            // Member Functions
+            //- Default construct (end iterator)
+            const_iterator() = default;
 
-            //- Return pointer, can be nullptr.
-            pointer get() const { return *ptr_; }
+            //- Copy construct
+            const_iterator(const const_iterator&) = default;
 
-            // Member Operators
+            //- Copy assignment
+            const_iterator& operator=(const const_iterator&) = default;
 
-            inline pointer operator->() const;
-            inline reference operator*() const;
 
-            // Forward Iteration
-            inline const_iterator& operator++() noexcept;
-            inline const_iterator operator++(int) noexcept;
+        // Constructors
 
-            inline bool operator==(const const_iterator& iter) const noexcept;
-            inline bool operator!=(const const_iterator& iter) const noexcept;
+            //- Copy construct from any access type
+            template<bool Any>
+            const_iterator(const Iterator<Any>& iter)
+            :
+                Iterator<true>(static_cast<const Iterator<Any>&>(iter))
+            {}
+
+            //- Implicit conversion from dissimilar access type
+            const_iterator(const iterator& iter)
+            :
+                const_iterator(reinterpret_cast<const const_iterator&>(iter))
+            {}
+
+
+        // Member Functions/Operators
+
+            //- Pointer to the referenced object (failsafe)
+            inline pointer get() const;
+
+            //- Reference to the object
+            inline reference val() const;
+
+            //- Pointer to the referenced object
+            pointer operator->() const { return this->get(); }
+
+            //- Reference to the object
+            reference operator*() const { return this->val(); }
+
+            //- Legacy call operator: reference to the object
+            reference operator()() const { return this->val(); }
+
+            //- Move to the next non-nullptr entry
+            inline const_iterator& operator++();
+            inline const_iterator operator++(int);
         };
 
 
@@ -429,20 +591,20 @@ public:
         T** end_ptr() noexcept { return ptrs_.end(); }
 
 
-        //- Return an iterator to begin of UPtrList traversal
-        inline iterator begin() noexcept;
+        //- Return iterator to begin traversal of non-nullptr entries.
+        inline iterator begin();
 
         //- Return iterator beyond end of UPtrList traversal
         inline iterator end() noexcept;
 
-        //- Return const_iterator to begin of UPtrList traversal
-        inline const_iterator cbegin() const noexcept;
+        //- Return const_iterator to begin traversal of non-nullptr entries.
+        inline const_iterator cbegin() const;
 
         //- Return const_iterator beyond end of UPtrList traversal
         inline const_iterator cend() const noexcept;
 
-        //- Return const_iterator to begin of UPtrList traversal
-        inline const_iterator begin() const noexcept;
+        //- Return const_iterator to begin traversal of non-nullptr entries.
+        inline const_iterator begin() const;
 
         //- Return const_iterator beyond end of UPtrList traversal
         inline const_iterator end() const noexcept;
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index eacbe831d0..9180af1668 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -124,7 +124,7 @@ inline Foam::label Foam::UPtrList<T>::size() const noexcept
 
 
 template<class T>
-inline Foam::label Foam::UPtrList<T>::size_nonNull() const noexcept
+inline Foam::label Foam::UPtrList<T>::count() const noexcept
 {
     return ptrs_.count();
 }
@@ -292,139 +292,139 @@ inline T& Foam::UPtrList<T>::operator[](const label i)
 }
 
 
-// * * * * * * * * * * * * * * * * iterator  * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * iterator base * * * * * * * * * * * * * * * //
 
 template<class T>
-inline Foam::UPtrList<T>::iterator::
-iterator(T** ptr) noexcept
+template<bool Const>
+inline constexpr
+Foam::UPtrList<T>::Iterator<Const>::Iterator() noexcept
 :
-    ptr_(ptr)
+    list_(nullptr),
+    pos_(-1)
 {}
 
 
 template<class T>
-inline T* Foam::UPtrList<T>::iterator::operator->() const
+template<bool Const>
+inline Foam::UPtrList<T>::Iterator<Const>::Iterator
+(
+    list_type* list
+)
+:
+    list_(list),
+    pos_(-1)
 {
-    return *ptr_;
+    if (list_)
+    {
+        pos_ = list_->find_next(-1);
+    }
 }
 
 
 template<class T>
-inline T& Foam::UPtrList<T>::iterator::operator*() const
+template<bool Const>
+inline void Foam::UPtrList<T>::Iterator<Const>::increment()
 {
-    return **ptr_;
+    //TDB: extra safety?  if (iter.good())
+    {
+        pos_ = list_->find_next(pos_);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * STL iterator  * * * * * * * * * * * * * * //
+
+template<class T>
+inline T* Foam::UPtrList<T>::iterator::get() const
+{
+    return this->good() ? this->list_->get(this->pos_) : nullptr;
+}
+
+
+template<class T>
+inline T& Foam::UPtrList<T>::iterator::val() const
+{
+    return this->list_->at(this->pos_);
 }
 
 
 template<class T>
 inline typename Foam::UPtrList<T>::iterator&
-Foam::UPtrList<T>::iterator::operator++() noexcept
+Foam::UPtrList<T>::iterator::operator++()
 {
-    ++ptr_;
+    this->increment();
     return *this;
 }
 
 
 template<class T>
 inline typename Foam::UPtrList<T>::iterator
-Foam::UPtrList<T>::iterator::operator++(int) noexcept
+Foam::UPtrList<T>::iterator::operator++(int)
 {
     iterator iter(*this);
-    ++ptr_;
+    this->increment();
     return iter;
 }
 
 
+// * * * * * * * * * * * * * * * STL const_iterator  * * * * * * * * * * * * //
+
 template<class T>
-inline bool Foam::UPtrList<T>::iterator::
-operator==(const iterator& iter) const noexcept
+inline const T* Foam::UPtrList<T>::const_iterator::get() const
 {
-    return ptr_ == iter.ptr_;
+    return this->good() ? this->list_->get(this->pos_) : nullptr;
 }
 
 
 template<class T>
-inline bool Foam::UPtrList<T>::iterator::
-operator!=(const iterator& iter) const noexcept
+inline const T& Foam::UPtrList<T>::const_iterator::val() const
 {
-    return ptr_ != iter.ptr_;
-}
-
-
-// * * * * * * * * * * * * * * * const_iterator  * * * * * * * * * * * * * * //
-
-template<class T>
-inline Foam::UPtrList<T>::const_iterator::
-const_iterator(const T* const* ptr) noexcept
-:
-    ptr_(ptr)
-{}
-
-
-template<class T>
-inline Foam::UPtrList<T>::const_iterator::
-const_iterator(const iterator& iter) noexcept
-:
-    ptr_(iter.ptr_)
-{}
-
-
-template<class T>
-inline const T* Foam::UPtrList<T>::const_iterator::operator->() const
-{
-    return *ptr_;
-}
-
-
-template<class T>
-inline const T& Foam::UPtrList<T>::const_iterator::operator*() const
-{
-    return **ptr_;
+    return this->list_->at(this->pos_);
 }
 
 
 template<class T>
 inline typename Foam::UPtrList<T>::const_iterator&
-Foam::UPtrList<T>::const_iterator::operator++() noexcept
+Foam::UPtrList<T>::const_iterator::operator++()
 {
-    ++ptr_;
+    this->increment();
     return *this;
 }
 
 
 template<class T>
 inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::const_iterator::operator++(int) noexcept
+Foam::UPtrList<T>::const_iterator::operator++(int)
 {
     const_iterator iter(*this);
-    ++ptr_;
+    this->increment();
     return iter;
 }
 
 
-template<class T>
-inline bool Foam::UPtrList<T>::const_iterator::
-operator==(const const_iterator& iter) const noexcept
-{
-    return ptr_ == iter.ptr_;
-}
-
-
-template<class T>
-inline bool Foam::UPtrList<T>::const_iterator::
-operator!=(const const_iterator& iter) const noexcept
-{
-    return ptr_ != iter.ptr_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class T>
 inline typename Foam::UPtrList<T>::iterator
-Foam::UPtrList<T>::begin() noexcept
+Foam::UPtrList<T>::begin()
 {
-    return ptrs_.begin();
+    return iterator(Iterator<false>(this));
+}
+
+
+template<class T>
+inline typename Foam::UPtrList<T>::const_iterator
+Foam::UPtrList<T>::begin() const
+{
+    return const_iterator(Iterator<true>(this));
+}
+
+
+template<class T>
+inline typename Foam::UPtrList<T>::const_iterator
+Foam::UPtrList<T>::cbegin() const
+{
+    return const_iterator(Iterator<true>(this));
 }
 
 
@@ -432,31 +432,7 @@ template<class T>
 inline typename Foam::UPtrList<T>::iterator
 Foam::UPtrList<T>::end() noexcept
 {
-    return ptrs_.end();
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::cbegin() const noexcept
-{
-    return ptrs_.cbegin();
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::cend() const noexcept
-{
-    return ptrs_.cend();
-}
-
-
-template<class T>
-inline typename Foam::UPtrList<T>::const_iterator
-Foam::UPtrList<T>::begin() const noexcept
-{
-    return ptrs_.begin();
+    return iterator();
 }
 
 
@@ -464,7 +440,15 @@ template<class T>
 inline typename Foam::UPtrList<T>::const_iterator
 Foam::UPtrList<T>::end() const noexcept
 {
-    return ptrs_.end();
+    return UPtrList<T>::const_iterator();
+}
+
+
+template<class T>
+inline typename Foam::UPtrList<T>::const_iterator
+Foam::UPtrList<T>::cend() const noexcept
+{
+    return UPtrList<T>::const_iterator();
 }
 
 

From 790a5c26f9458af8a194c3d86bf05f62581b8711 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 27 Feb 2023 18:18:36 +0100
Subject: [PATCH 119/348] ENH: range-for and updated accessors in primitiveMesh

STYLE: split off primitiveMesh::calcCellPoints internal

- for easier reworking (#2715)
---
 .../meshes/primitiveMesh/primitiveMesh.H      | 20 ++----
 .../primitiveMesh/primitiveMeshCellCells.C    | 10 ++-
 .../primitiveMesh/primitiveMeshCellEdges.C    | 10 ++-
 .../primitiveMesh/primitiveMeshCellPoints.C   | 59 ++++++++++++------
 .../primitiveMesh/primitiveMeshEdgeCells.C    | 49 ++++-----------
 .../primitiveMesh/primitiveMeshEdgeFaces.C    | 10 +--
 .../meshes/primitiveMesh/primitiveMeshEdges.C | 62 +++++++++++--------
 .../primitiveMesh/primitiveMeshPointCells.C   | 32 ++++------
 .../primitiveMesh/primitiveMeshPointFaces.C   |  1 -
 .../primitiveMesh/primitiveMeshPointPoints.C  |  7 ++-
 10 files changed, 128 insertions(+), 132 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 944cdb5367..edec71812b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -206,6 +206,9 @@ class primitiveMesh
             //- Calculate edge list
             void calcCellEdges() const;
 
+            //- Calculate cell-point addressing
+            void calcCellPoints() const;
+
             //- Calculate point-point addressing
             void calcPointPoints() const;
 
@@ -214,20 +217,7 @@ class primitiveMesh
             //  Create and destroy as a set, using clearOutEdges()
             void calcEdges(const bool doFaceEdges) const;
             void clearOutEdges();
-            //- Helper: return (after optional creation) edge between two points
-            static label getEdge
-            (
-                List<DynamicList<label>>&,
-                DynamicList<edge>&,
-                const label,
-                const label
-            );
-            //- For on-the-fly addressing calculation
-            static label findFirstCommonElementFromSortedLists
-            (
-                const labelList&,
-                const labelList&
-            );
+
 
 protected:
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index 9f483574e9..a1924d6388 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +28,6 @@ License
 
 #include "primitiveMesh.H"
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::primitiveMesh::calcCellCells() const
@@ -128,19 +128,17 @@ const Foam::labelList& Foam::primitiveMesh::cellCells
 
         storage.clear();
 
-        forAll(cFaces, i)
+        for (const label facei : cFaces)
         {
-            label facei = cFaces[i];
-
             if (facei < nInternalFaces())
             {
                 if (own[facei] == celli)
                 {
-                    storage.append(nei[facei]);
+                    storage.push_back(nei[facei]);
                 }
                 else
                 {
-                    storage.append(own[facei]);
+                    storage.push_back(own[facei]);
                 }
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index 7788c1388f..53489382e5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -81,7 +81,10 @@ void Foam::primitiveMesh::calcCellEdges() const
             for (const label edgei : curEdges)
             {
                 // Add the edge
-                curCellEdges.appendUniq(edgei);
+                if (!curCellEdges.contains(edgei))
+                {
+                    curCellEdges.push_back(edgei);
+                }
             }
         }
 
@@ -94,7 +97,10 @@ void Foam::primitiveMesh::calcCellEdges() const
             for (const label edgei : curEdges)
             {
                 // Add the edge
-                curCellEdges.appendUniq(edgei);
+                if (!curCellEdges.contains(edgei))
+                {
+                    curCellEdges.push_back(edgei);
+                }
             }
         }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
index 0e78e3e496..f400f68948 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
@@ -27,31 +27,52 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "primitiveMesh.H"
+#include "cell.H"
+#include "bitSet.H"
 #include "ListOps.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::primitiveMesh::calcCellPoints() const
+{
+    if (debug)
+    {
+        Pout<< "primitiveMesh::cellCellPoints() : "
+            << "calculating cellPoints" << endl;
+
+        if (debug == -1)
+        {
+            // For checking calls:abort so we can quickly hunt down
+            // origin of call
+            FatalErrorInFunction
+                << abort(FatalError);
+        }
+    }
+
+    // It is an error to attempt to recalculate cellPoints
+    // if the pointer is already set
+    if (cpPtr_)
+    {
+        FatalErrorInFunction
+            << "cellPoints already calculated"
+            << abort(FatalError);
+    }
+    else
+    {
+        // Invert pointCells
+        cpPtr_ = new labelListList(nCells());
+        invertManyToMany(nCells(), pointCells(), *cpPtr_);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::labelListList& Foam::primitiveMesh::cellPoints() const
 {
     if (!cpPtr_)
     {
-        if (debug)
-        {
-            Pout<< "primitiveMesh::cellPoints() : "
-                << "calculating cellPoints" << endl;
-
-            if (debug == -1)
-            {
-                // For checking calls:abort so we can quickly hunt down
-                // origin of call
-                FatalErrorInFunction
-                    << abort(FatalError);
-            }
-        }
-
-        // Invert pointCells
-        cpPtr_ = new labelListList(nCells());
-        invertManyToMany(nCells(), pointCells(), *cpPtr_);
+        calcCellPoints();
     }
 
     return *cpPtr_;
@@ -81,14 +102,14 @@ const Foam::labelList& Foam::primitiveMesh::cellPoints
     }
 
     storage.clear();
-    if (set.size() > storage.capacity())
+    if (storage.capacity() < set.size())
     {
         storage.setCapacity(set.size());
     }
 
     for (const label pointi : set)
     {
-        storage.append(pointi);
+        storage.push_back(pointi);
     }
 
     return storage;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
index dd429b8eff..b4719c206b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +29,6 @@ License
 #include "primitiveMesh.H"
 #include "ListOps.H"
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::labelListList& Foam::primitiveMesh::edgeCells() const
@@ -58,13 +58,13 @@ const Foam::labelListList& Foam::primitiveMesh::edgeCells() const
 
 const Foam::labelList& Foam::primitiveMesh::edgeCells
 (
-    const label edgeI,
+    const label edgei,
     DynamicList<label>& storage
 ) const
 {
     if (hasEdgeCells())
     {
-        return edgeCells()[edgeI];
+        return edgeCells()[edgei];
     }
     else
     {
@@ -73,50 +73,27 @@ const Foam::labelList& Foam::primitiveMesh::edgeCells
 
         // Construct edgeFaces
         DynamicList<label> eFacesStorage;
-        const labelList& eFaces = edgeFaces(edgeI, eFacesStorage);
+        const labelList& eFaces = edgeFaces(edgei, eFacesStorage);
 
         storage.clear();
 
         // Do quadratic insertion.
-        forAll(eFaces, i)
+        for (const label facei : eFaces)
         {
-            label facei = eFaces[i];
-
             {
-                label ownCelli = own[facei];
-
-                // Check if not already in storage
-                forAll(storage, j)
+                // Owner cell
+                if (!storage.contains(own[facei]))
                 {
-                    if (storage[j] == ownCelli)
-                    {
-                        ownCelli = -1;
-                        break;
-                    }
-                }
-
-                if (ownCelli != -1)
-                {
-                    storage.append(ownCelli);
+                    storage.push_back(own[facei]);
                 }
             }
 
             if (isInternalFace(facei))
             {
-                label neiCelli = nei[facei];
-
-                forAll(storage, j)
+                // Neighbour cell
+                if (!storage.contains(nei[facei]))
                 {
-                    if (storage[j] == neiCelli)
-                    {
-                        neiCelli = -1;
-                        break;
-                    }
-                }
-
-                if (neiCelli != -1)
-                {
-                    storage.append(neiCelli);
+                    storage.push_back(nei[facei]);
                 }
             }
         }
@@ -126,9 +103,9 @@ const Foam::labelList& Foam::primitiveMesh::edgeCells
 }
 
 
-const Foam::labelList& Foam::primitiveMesh::edgeCells(const label edgeI) const
+const Foam::labelList& Foam::primitiveMesh::edgeCells(const label edgei) const
 {
-    return edgeCells(edgeI, labels_);
+    return edgeCells(edgei, labels_);
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
index a7e84341cf..61e79c2778 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
@@ -59,20 +59,20 @@ const Foam::labelListList& Foam::primitiveMesh::edgeFaces() const
 
 const Foam::labelList& Foam::primitiveMesh::edgeFaces
 (
-    const label edgeI,
+    const label edgei,
     DynamicList<label>& storage
 ) const
 {
     if (hasEdgeFaces())
     {
-        return edgeFaces()[edgeI];
+        return edgeFaces()[edgei];
     }
     else
     {
         // Use the fact that pointFaces are sorted in incrementing edge order
         // (since they get constructed by inverting the faces which walks
         //  in increasing face order)
-        const edge& e = edges()[edgeI];
+        const edge& e = edges()[edgei];
         const labelList& pFaces0 = pointFaces()[e[0]];
         const labelList& pFaces1 = pointFaces()[e[1]];
 
@@ -123,9 +123,9 @@ const Foam::labelList& Foam::primitiveMesh::edgeFaces
 }
 
 
-const Foam::labelList& Foam::primitiveMesh::edgeFaces(const label edgeI) const
+const Foam::labelList& Foam::primitiveMesh::edgeFaces(const label edgei) const
 {
-    return edgeFaces(edgeI, labels_);
+    return edgeFaces(edgei, labels_);
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index a919c74285..1d5ad4aac6 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,9 +32,13 @@ License
 #include "SortableList.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
-Foam::label Foam::primitiveMesh::getEdge
+namespace Foam
+{
+
+// Helper: return (after optional creation) edge between two points
+static label getEdge
 (
     List<DynamicList<label>>& pe,
     DynamicList<edge>& es,
@@ -44,40 +48,40 @@ Foam::label Foam::primitiveMesh::getEdge
 )
 {
     // Find connection between pointi and nextPointi
-    forAll(pe[pointi], ppI)
+    for (const label edgei : pe[pointi])
     {
-        label eI = pe[pointi][ppI];
-
-        const edge& e = es[eI];
-
-        if (e.start() == nextPointi || e.end() == nextPointi)
+        if (edgei < es.size() && es[edgei].contains(nextPointi))
         {
-            return eI;
+            return edgei;
         }
     }
 
     // Make new edge.
-    label edgeI = es.size();
-    pe[pointi].append(edgeI);
+    const label edgei = es.size();
+    pe[pointi].push_back(edgei);
 
     if (nextPointi != pointi)
     {
         // Very occasionally (e.g. blockMesh) a face can have duplicate
         // vertices. Make sure we register pointEdges only once.
-        pe[nextPointi].append(edgeI);
+        pe[nextPointi].push_back(edgei);
     }
 
     if (pointi < nextPointi)
     {
-        es.append(edge(pointi, nextPointi));
+        es.emplace_back(pointi, nextPointi);
     }
     else
     {
-        es.append(edge(nextPointi, pointi));
+        es.emplace_back(nextPointi, pointi);
     }
-    return edgeI;
+    return edgei;
 }
 
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
 {
@@ -463,16 +467,22 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
 }
 
 
-Foam::label Foam::primitiveMesh::findFirstCommonElementFromSortedLists
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Helper: for on-the-fly addressing calculation
+static label findFirstCommonElementFromSortedLists
 (
-    const labelList& list1,
-    const labelList& list2
+    const labelUList& list1,
+    const labelUList& list2
 )
 {
     label result = -1;
 
-    labelList::const_iterator iter1 = list1.begin();
-    labelList::const_iterator iter2 = list2.begin();
+    auto iter1 = list1.begin();
+    auto iter2 = list2.begin();
 
     while (iter1 != list1.end() && iter2 != list2.end())
     {
@@ -499,6 +509,8 @@ Foam::label Foam::primitiveMesh::findFirstCommonElementFromSortedLists
     return result;
 }
 
+} // End namespace Foam
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -601,14 +613,14 @@ const Foam::labelList& Foam::primitiveMesh::faceEdges
     const face& f = faces()[facei];
 
     storage.clear();
-    if (f.size() > storage.capacity())
+    if (storage.capacity() < f.size())
     {
         storage.setCapacity(f.size());
     }
 
     forAll(f, fp)
     {
-        storage.append
+        storage.push_back
         (
             findFirstCommonElementFromSortedLists
             (
@@ -650,14 +662,14 @@ const Foam::labelList& Foam::primitiveMesh::cellEdges
     }
 
     storage.clear();
-    if (set.size() > storage.capacity())
+    if (storage.capacity() < set.size())
     {
         storage.setCapacity(set.size());
     }
 
     for (const label edgei : set)
     {
-        storage.append(edgei);
+        storage.push_back(edgei);
     }
 
     return storage;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index 9ae851fb45..853e02d6ce 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -27,6 +27,8 @@ License
 
 #include "primitiveMesh.H"
 #include "cell.H"
+#include "bitSet.H"
+#include "ListOps.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -136,36 +138,28 @@ const Foam::labelList& Foam::primitiveMesh::pointCells
 
         storage.clear();
 
-        forAll(pFaces, i)
+        for (const label facei : pFaces)
         {
-            const label facei = pFaces[i];
+            // Owner cell
+            storage.push_back(own[facei]);
 
-            // Append owner
-            storage.append(own[facei]);
-
-            // Append neighbour
+            // Neighbour cell
             if (facei < nInternalFaces())
             {
-                storage.append(nei[facei]);
+                storage.push_back(nei[facei]);
             }
         }
 
         // Filter duplicates
         if (storage.size() > 1)
         {
-            sort(storage);
+            std::sort(storage.begin(), storage.end());
 
-            label n = 1;
-            for (label i = 1; i < storage.size(); i++)
-            {
-                if (storage[i-1] != storage[i])
-                {
-                    storage[n++] = storage[i];
-                }
-            }
+            auto last = std::unique(storage.begin(), storage.end());
 
-            // truncate addressed list
-            storage.setSize(n);
+            const label newLen = label(last - storage.begin());
+
+            storage.resize(newLen);
         }
 
         return storage;
@@ -179,6 +173,4 @@ const Foam::labelList& Foam::primitiveMesh::pointCells(const label pointi) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
index 1298f63134..00b4723ab7 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
@@ -28,7 +28,6 @@ License
 #include "primitiveMesh.H"
 #include "ListOps.H"
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::labelListList& Foam::primitiveMesh::pointFaces() const
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index 7f99f9dd05..8cc5aa9222 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -118,14 +119,14 @@ const Foam::labelList& Foam::primitiveMesh::pointPoints
 
         storage.clear();
 
-        if (pEdges.size() > storage.capacity())
+        if (storage.capacity() < pEdges.size())
         {
             storage.setCapacity(pEdges.size());
         }
 
-        forAll(pEdges, i)
+        for (const label edgei : pEdges)
         {
-            storage.append(edges[pEdges[i]].otherVertex(pointi));
+            storage.push_back(edges[edgei].otherVertex(pointi));
         }
 
         return storage;

From f75af788c1b9e927af15eb17b9a14d6d98178dcb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 28 Feb 2023 11:17:59 +0100
Subject: [PATCH 120/348] ENH: add factory method readContents to IO containers

- useful when regular contents are to be read via an IOobject and
  returned.

  Eg,  dictionary propsDict(IOdictionary::readContents(dictIO));
  vs.  dictionary propsDict(static_cast<dictionary&&>(IOdictionary(dictIO)));

  Commonly these would have simply been constructed directly as the
  IO container:

  eg,  IOdictionary propsDict(dictIO);

  However, that style may not ensure proper move semantics for return
  types.

  Now,
  =====
      labelList decomp(labelIOList::readContents(io));
      ... something
      return decomp;
  =====

  Previously,
  =====
      labelIOList decomp(io);

      // Hope for the best...
      return decomp;

      // Or be explicit and ensure elision occurs...
      return labelList(std::move(static_cast<labelList&>(decomp)));
  =====

  Note:
       labelList list(labelIOList(io));

       looks like a good idea, but generally fails to compile
---
 applications/test/Function1/Test-Function1.C  |  6 +++++-
 src/OpenFOAM/db/IOobject/IOobject.H           |  7 +++++++
 src/OpenFOAM/db/IOobject/IOobjectI.H          | 18 +++++++++++++++---
 src/OpenFOAM/db/IOobject/IOobjectTemplates.C  |  2 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.C   | 19 ++++++++++++++++++-
 src/OpenFOAM/db/IOobjects/IOField/IOField.H   |  8 +++++++-
 src/OpenFOAM/db/IOobjects/IOList/IOList.C     | 19 ++++++++++++++++++-
 src/OpenFOAM/db/IOobjects/IOList/IOList.H     |  8 +++++++-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.C       | 19 ++++++++++++++++++-
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.H       |  8 +++++++-
 .../db/IOobjects/IOPtrList/IOPtrList.C        | 19 ++++++++++++++++++-
 .../db/IOobjects/IOPtrList/IOPtrList.H        | 12 +++++++++---
 .../db/IOobjects/IOdictionary/IOdictionary.C  | 18 +++++++++++++++++-
 .../db/IOobjects/IOdictionary/IOdictionary.H  | 12 +++++++++---
 .../IOobjects/IOdictionary/baseIOdictionary.H |  4 ++--
 .../IOdictionary/localIOdictionary.C          | 18 +++++++++++++++++-
 .../IOdictionary/localIOdictionary.H          | 12 +++++++++---
 .../IOdictionary/unwatchedIOdictionary.H      |  4 ++--
 .../db/IOobjects/rawIOField/rawIOField.C      | 19 ++++++++++++++++++-
 .../db/IOobjects/rawIOField/rawIOField.H      |  8 +++++++-
 20 files changed, 211 insertions(+), 29 deletions(-)

diff --git a/applications/test/Function1/Test-Function1.C b/applications/test/Function1/Test-Function1.C
index 3d27af7649..951786ad71 100644
--- a/applications/test/Function1/Test-Function1.C
+++ b/applications/test/Function1/Test-Function1.C
@@ -109,7 +109,11 @@ int main(int argc, char *argv[])
     {
         #include "setConstantRunTimeDictionaryIO.H"
 
-        IOdictionary propsDict(dictIO);
+        #if (OPENFOAM > 2212)
+        dictionary propsDict(IOdictionary::readContents(dictIO));
+        #else
+        dictionary propsDict(static_cast<dictionary&&>(IOdictionary(dictIO)));
+        #endif
 
         const scalarField xvals(propsDict.lookup("x"));
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 5f088ae206..016032a180 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -434,6 +434,13 @@ public:
             IOobjectOption::writeOption wOpt
         );
 
+        //- Copy construct, resetting register option
+        inline IOobject
+        (
+            const IOobject& io,
+            IOobjectOption::registerOption regOpt
+        );
+
 
         //- Clone
         autoPtr<IOobject> clone() const
diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H
index 41a410fc2e..eed345e0d2 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectI.H
+++ b/src/OpenFOAM/db/IOobject/IOobjectI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -145,8 +145,20 @@ inline Foam::IOobject::IOobject
 :
     IOobject(io)
 {
-    readOpt(rOpt);
-    writeOpt(wOpt);
+    IOobjectOption::readOpt(rOpt);
+    IOobjectOption::writeOpt(wOpt);
+}
+
+
+inline Foam::IOobject::IOobject
+(
+    const IOobject& io,
+    IOobjectOption::registerOption regOpt
+)
+:
+    IOobject(io)
+{
+    IOobjectOption::registerObject(regOpt);
 }
 
 
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
index 2c95206a1d..444d219dc5 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -93,7 +93,7 @@ void Foam::IOobject::warnNoRereading() const
     {
         WarningInFunction
             << Type::typeName << ' ' << name()
-            << " constructed with IOobject::MUST_READ_IF_MODIFIED but "
+            << " constructed with MUST_READ_IF_MODIFIED but "
             << Type::typeName << " does not support automatic rereading."
             << endl;
     }
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index fd24992488..516971f8c0 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -180,6 +180,23 @@ Foam::IOFieldRef<Type>::IOFieldRef
 {}
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Field<Type> Foam::IOField<Type>::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    IOField<Type> reader(rio);
+
+    return Field<Type>(std::move(static_cast<Field<Type>&>(reader)));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index e7ac808430..bb6bff2584 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -98,6 +98,12 @@ public:
         IOField(const IOobject& io, const tmp<Field<Type>>& tfld);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject will not be registered
+        static Field<Type> readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~IOField() = default;
 
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index bb29720f1c..59c6b63a8e 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -126,6 +126,23 @@ Foam::IOListRef<T>::IOListRef
 {}
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class T>
+Foam::List<T> Foam::IOList<T>::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    IOList<T> reader(rio);
+
+    return List<T>(std::move(static_cast<List<T>&>(reader)));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index d22d73e7c5..d621655476 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -92,6 +92,12 @@ public:
         IOList(const IOobject& io, List<T>&& content);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject is never registered
+        static List<T> readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~IOList() = default;
 
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index 253d9960a2..702aebd322 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -94,6 +94,23 @@ Foam::IOMap<T>::IOMap(const IOobject& io, Map<T>&& content)
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class T>
+Foam::Map<T> Foam::IOMap<T>::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    IOMap<T> reader(rio);
+
+    return Map<T>(std::move(static_cast<Map<T>&>(reader)));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index ea226239c8..637c302a24 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,6 +89,12 @@ public:
         IOMap(const IOobject&, Map<T>&& content);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject will not be registered
+        static Map<T> readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~IOMap() = default;
 
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index cc46681dbf..48efa21d5e 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,6 +116,23 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, PtrList<T>&& content)
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class T>
+Foam::PtrList<T> Foam::IOPtrList<T>::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    IOPtrList<T> reader(rio);
+
+    return PtrList<T>(std::move(static_cast<PtrList<T>&>(reader)));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index aa829d34a5..a838177aa9 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOPtrList_H
-#define IOPtrList_H
+#ifndef Foam_IOPtrList_H
+#define Foam_IOPtrList_H
 
 #include "PtrList.H"
 #include "regIOobject.H"
@@ -84,6 +84,12 @@ public:
         IOPtrList(const IOobject& io, PtrList<T>&& content);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject will not be registered
+        static PtrList<T> readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~IOPtrList() = default;
 
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index 009dddadc9..83834881ec 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,4 +91,20 @@ Foam::IOdictionary::IOdictionary
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::dictionary Foam::IOdictionary::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    IOdictionary reader(rio);
+
+    return dictionary(std::move(static_cast<dictionary&>(reader)));
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
index 2ba3eb2513..a10a3e2527 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOdictionary_H
-#define IOdictionary_H
+#ifndef Foam_IOdictionary_H
+#define Foam_IOdictionary_H
 
 #include "baseIOdictionary.H"
 
@@ -87,6 +87,12 @@ public:
         IOdictionary(const IOobject& io, Istream& is);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject will not be registered
+        static dictionary readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~IOdictionary() = default;
 
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
index 943c1cd475..4615703727 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/baseIOdictionary.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef baseIOdictionary_H
-#define baseIOdictionary_H
+#ifndef Foam_baseIOdictionary_H
+#define Foam_baseIOdictionary_H
 
 #include "dictionary.H"
 #include "regIOobject.H"
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C
index 759ea26ce8..bd45e100c7 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -88,4 +88,20 @@ Foam::localIOdictionary::localIOdictionary
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::dictionary Foam::localIOdictionary::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    localIOdictionary reader(rio);
+
+    return dictionary(std::move(static_cast<dictionary&>(reader)));
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H
index d2e0321393..e151f258fc 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/localIOdictionary.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef localIOdictionary_H
-#define localIOdictionary_H
+#ifndef Foam_localIOdictionary_H
+#define Foam_localIOdictionary_H
 
 #include "baseIOdictionary.H"
 
@@ -84,6 +84,12 @@ public:
         localIOdictionary(const IOobject& io, Istream& is);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject will not be registered
+        static dictionary readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~localIOdictionary() = default;
 
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H
index b38f5cf165..549666a027 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef unwatchedIOdictionary_H
-#define unwatchedIOdictionary_H
+#ifndef Foam_unwatchedIOdictionary_H
+#define Foam_unwatchedIOdictionary_H
 
 #include "baseIOdictionary.H"
 
diff --git a/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.C b/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.C
index 35f6283f74..69f4d1772b 100644
--- a/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.C
+++ b/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -188,6 +188,23 @@ Foam::rawIOField<Type>::rawIOField
 {}
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Field<Type> Foam::rawIOField<Type>::readContents(const IOobject& io)
+{
+    IOobject rio(io, IOobjectOption::NO_REGISTER);
+    if (rio.readOpt() == IOobjectOption::MUST_READ_IF_MODIFIED)
+    {
+        rio.readOpt(IOobjectOption::MUST_READ);
+    }
+
+    rawIOField<Type> reader(rio);
+
+    return Field<Type>(std::move(static_cast<Field<Type>&>(reader)));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.H b/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.H
index 3dfc3d0c6d..eaf5a9e934 100644
--- a/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.H
+++ b/src/OpenFOAM/db/IOobjects/rawIOField/rawIOField.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -99,6 +99,12 @@ public:
         rawIOField(const IOobject& io, const bool readAverage);
 
 
+    // Factory Methods
+
+        //- Read and return contents. The IOobject will not be registered
+        static Field<Type> readContents(const IOobject& io);
+
+
     //- Destructor
     virtual ~rawIOField() = default;
 

From d3867a2d347e4f100416aff74fc47290642f763f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 2 Mar 2023 12:30:30 +0100
Subject: [PATCH 121/348] SUBMODULE: minor updates for external-solver

---
 modules/external-solver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/external-solver b/modules/external-solver
index 36260ba796..94874d0d60 160000
--- a/modules/external-solver
+++ b/modules/external-solver
@@ -1 +1 @@
-Subproject commit 36260ba79687fcfe4ddb70965a3ec42c19e4bcf2
+Subproject commit 94874d0d60764047ee513d90edf8adaea767ed0a

From 99bf27cbee4af3c59cacd9e5993801f01ce455a5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 2 Mar 2023 12:55:25 +0100
Subject: [PATCH 122/348] STYLE: use PstreamBuffers allProcs() addressing in
 zoneDistribute

STYLE: more generous handling of procIDs on non-master (globalIndex)
---
 .../parallel/globalIndex/globalIndex.C        |  2 +-
 .../parallel/globalIndex/globalIndex.H        |  4 ++-
 .../parallel/globalIndex/globalIndexI.H       | 26 +++++++-------
 .../globalIndex/globalIndexTemplates.C        | 34 ++++++++++++-------
 .../fvMesh/zoneDistribute/zoneDistribute.C    |  8 +++--
 .../fvMesh/zoneDistribute/zoneDistributeI.H   | 10 +++---
 6 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndex.C b/src/OpenFOAM/parallel/globalIndex/globalIndex.C
index e4cfd48ae6..c74a5b356a 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndex.C
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndex.C
@@ -214,7 +214,7 @@ void Foam::globalIndex::reset
             // Non-parallel branch: use localSize on-proc, zero elsewhere
 
             localLens.resize(len, Zero);
-            localLens[Pstream::myProcNo(comm)] = localSize;
+            localLens[UPstream::myProcNo(comm)] = localSize;
         }
 
         reset(localLens, true);  // checkOverflow = true
diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndex.H b/src/OpenFOAM/parallel/globalIndex/globalIndex.H
index 0437ade234..49934718d4 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndex.H
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndex.H
@@ -519,7 +519,9 @@ public:
         {
             List<Type> allData;
             gather(offsets, comm, procIDs, fld, allData, tag, ct);
-            if (Pstream::myProcNo(comm) == procIDs[0])
+
+            const int masterProci = procIDs.size() ? procIDs[0] : 0;
+            if (UPstream::myProcNo(comm) == masterProci)
             {
                 fld.transfer(allData);
             }
diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndexI.H b/src/OpenFOAM/parallel/globalIndex/globalIndexI.H
index 8c49925c61..edf45f5cb8 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndexI.H
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndexI.H
@@ -137,14 +137,14 @@ inline Foam::globalIndex::globalIndex
 
 inline bool Foam::globalIndex::empty() const
 {
-    return offsets_.empty() || offsets_.last() == 0;
+    return offsets_.empty() || offsets_.back() == 0;
 }
 
 
 inline Foam::label Foam::globalIndex::totalSize() const
 {
     const label len = (offsets_.size() - 1);
-    return (len < 1) ? static_cast<label>(0) : offsets_[len];
+    return (len < 1) ? 0 : offsets_[len];
 }
 
 
@@ -163,7 +163,7 @@ inline Foam::labelList Foam::globalIndex::sizes() const
 inline Foam::label Foam::globalIndex::nProcs() const noexcept
 {
     const label len = (offsets_.size() - 1);
-    return (len < 1) ? static_cast<label>(0) : len;
+    return (len < 1) ? 0 : len;
 }
 
 
@@ -219,7 +219,7 @@ inline Foam::label Foam::globalIndex::localStart(const label proci) const
 
 inline Foam::label Foam::globalIndex::localStart() const
 {
-    return localStart(Pstream::myProcNo());
+    return localStart(UPstream::myProcNo());
 }
 
 
@@ -231,7 +231,7 @@ inline Foam::label Foam::globalIndex::localSize(const label proci) const
 
 inline Foam::label Foam::globalIndex::localSize() const
 {
-    return localSize(Pstream::myProcNo());
+    return localSize(UPstream::myProcNo());
 }
 
 
@@ -244,7 +244,7 @@ inline Foam::label Foam::globalIndex::maxSize() const
 
 inline Foam::label Foam::globalIndex::maxNonLocalSize() const
 {
-    return maxNonLocalSize(Pstream::myProcNo());
+    return maxNonLocalSize(UPstream::myProcNo());
 }
 
 
@@ -256,7 +256,7 @@ inline Foam::labelRange Foam::globalIndex::range(const label proci) const
 
 inline Foam::labelRange Foam::globalIndex::range() const
 {
-    return range(Pstream::myProcNo());
+    return range(UPstream::myProcNo());
 }
 
 
@@ -268,7 +268,7 @@ inline bool Foam::globalIndex::isLocal(const label proci, const label i) const
 
 inline bool Foam::globalIndex::isLocal(const label i) const
 {
-    return isLocal(Pstream::myProcNo(), i);
+    return isLocal(UPstream::myProcNo(), i);
 }
 
 
@@ -284,7 +284,7 @@ inline Foam::label Foam::globalIndex::toGlobal
 
 inline Foam::label Foam::globalIndex::toGlobal(const label i) const
 {
-    return toGlobal(Pstream::myProcNo(), i);
+    return toGlobal(UPstream::myProcNo(), i);
 }
 
 
@@ -306,7 +306,7 @@ inline Foam::labelList Foam::globalIndex::toGlobal
     const labelUList& labels
 ) const
 {
-    return toGlobal(Pstream::myProcNo(), labels);
+    return toGlobal(UPstream::myProcNo(), labels);
 }
 
 
@@ -327,7 +327,7 @@ inline void Foam::globalIndex::inplaceToGlobal
 
 inline void Foam::globalIndex::inplaceToGlobal(labelUList& labels) const
 {
-    inplaceToGlobal(Pstream::myProcNo(), labels);
+    inplaceToGlobal(UPstream::myProcNo(), labels);
 }
 
 
@@ -349,7 +349,7 @@ Foam::globalIndex::toLocal(const label proci, const label i) const
 
 inline Foam::label Foam::globalIndex::toLocal(const label i) const
 {
-    return toLocal(Pstream::myProcNo(), i);
+    return toLocal(UPstream::myProcNo(), i);
 }
 
 
@@ -363,7 +363,7 @@ inline Foam::label Foam::globalIndex::whichProcID(const label i) const
             << abort(FatalError);
     }
 
-    const label proci(Pstream::myProcNo());
+    const int proci = UPstream::myProcNo();
 
     return isLocal(proci, i) ? proci : findLower(offsets_, i+1);
 }
diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C b/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
index c069603602..19f4db5be8 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
@@ -91,7 +91,9 @@ void Foam::globalIndex::gatherValues
 
     const label startOfRequests = UPstream::nRequests();
 
-    if (UPstream::myProcNo(comm) == procIDs[0])
+    const int masterProci = procIDs.size() ? procIDs[0] : 0;
+
+    if (UPstream::myProcNo(comm) == masterProci)
     {
         allValues.resize_nocopy(procIDs.size());
         allValues[0] = localValue;
@@ -126,7 +128,7 @@ void Foam::globalIndex::gatherValues
             UOPstream::write
             (
                 commsType,
-                procIDs[0],
+                masterProci,
                 reinterpret_cast<const char*>(&localValue),
                 sizeof(Type),
                 tag,
@@ -135,7 +137,7 @@ void Foam::globalIndex::gatherValues
         }
         else
         {
-            OPstream toMaster(commsType, procIDs[0], 0, tag, comm);
+            OPstream toMaster(commsType, masterProci, 0, tag, comm);
             toMaster << localValue;
         }
     }
@@ -176,9 +178,11 @@ void Foam::globalIndex::gather
 
     const label startOfRequests = UPstream::nRequests();
 
-    if (Pstream::myProcNo(comm) == procIDs[0])
+    const int masterProci = procIDs.size() ? procIDs[0] : 0;
+
+    if (UPstream::myProcNo(comm) == masterProci)
     {
-        allFld.resize_nocopy(off.last());  // == totalSize()
+        allFld.resize_nocopy(off.back());  // == totalSize()
 
         // Assign my local data - respect offset information
         // so that we can request 0 entries to be copied.
@@ -226,7 +230,7 @@ void Foam::globalIndex::gather
             UOPstream::write
             (
                 commsType,
-                procIDs[0],
+                masterProci,
                 fld.cdata_bytes(),
                 fld.size_bytes(),
                 tag,
@@ -235,7 +239,7 @@ void Foam::globalIndex::gather
         }
         else
         {
-            OPstream toMaster(commsType, procIDs[0], 0, tag, comm);
+            OPstream toMaster(commsType, masterProci, 0, tag, comm);
             toMaster << fld;
         }
     }
@@ -294,9 +298,11 @@ void Foam::globalIndex::gather
 
     const label startOfRequests = UPstream::nRequests();
 
-    if (Pstream::myProcNo(comm) == procIDs[0])
+    const int masterProci = procIDs.size() ? procIDs[0] : 0;
+
+    if (UPstream::myProcNo(comm) == masterProci)
     {
-        allFld.resize_nocopy(off.last());  // == totalSize()
+        allFld.resize_nocopy(off.back());  // == totalSize()
 
         // Assign my local data - respect offset information
         // so that we can request 0 entries to be copied
@@ -331,7 +337,7 @@ void Foam::globalIndex::gather
         }
         else
         {
-            OPstream toMaster(commsType, procIDs[0], 0, tag, comm);
+            OPstream toMaster(commsType, masterProci, 0, tag, comm);
             toMaster << fld;
         }
     }
@@ -877,7 +883,9 @@ void Foam::globalIndex::scatter
 
     const label startOfRequests = UPstream::nRequests();
 
-    if (Pstream::myProcNo(comm) == procIDs[0])
+    const int masterProci = procIDs.size() ? procIDs[0] : 0;
+
+    if (UPstream::myProcNo(comm) == masterProci)
     {
         for (label i = 1; i < procIDs.size(); ++i)
         {
@@ -929,7 +937,7 @@ void Foam::globalIndex::scatter
             UIPstream::read
             (
                 commsType,
-                procIDs[0],
+                masterProci,
                 fld.data_bytes(),
                 fld.size_bytes(),
                 tag,
@@ -938,7 +946,7 @@ void Foam::globalIndex::scatter
         }
         else
         {
-            IPstream fromMaster(commsType, procIDs[0], 0, tag, comm);
+            IPstream fromMaster(commsType, masterProci, 0, tag, comm);
             fromMaster >> fld;
         }
     }
diff --git a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C
index c2064396d5..aae092a6d0 100644
--- a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C
+++ b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistribute.C
@@ -114,13 +114,15 @@ void Foam::zoneDistribute::setUpCommforZone
 
         pBufs_.clear();
 
-        for (const int proci : UPstream::allProcs())
+        for (const int proci : pBufs_.allProcs())
         {
-            if (proci != UPstream::myProcNo() && !needed[proci].empty())
+            const auto& indices = needed[proci];
+
+            if (proci != UPstream::myProcNo() && !indices.empty())
             {
                 // Serialize as List
                 UOPstream toProc(proci, pBufs_);
-                toProc << needed[proci].sortedToc();
+                toProc << indices.sortedToc();
             }
         }
 
diff --git a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H
index 32261eee49..9be368d10f 100644
--- a/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H
+++ b/src/finiteVolume/fvMesh/zoneDistribute/zoneDistributeI.H
@@ -175,14 +175,16 @@ Foam::Map<Type> Foam::zoneDistribute::getDatafromOtherProc
 
         pBufs_.clear();
 
-        for (const int proci : UPstream::allProcs())
+        for (const int proci : pBufs_.allProcs())
         {
-            if (proci != UPstream::myProcNo() && !send_[proci].empty())
+            const auto& indices = send_[proci];
+
+            if (proci != UPstream::myProcNo() && !indices.empty())
             {
                 // Serialize as Map
-                Map<Type> sendValues(2*send_[proci].size());
+                Map<Type> sendValues(2*indices.size());
 
-                for (const label sendIdx : send_[proci])
+                for (const label sendIdx : indices)
                 {
                     sendValues.insert
                     (

From 82c0b360c69a82f85362701a7e0c865a7105b0ed Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 2 Mar 2023 11:46:35 +0100
Subject: [PATCH 123/348] ENH: support run-time PstreamBuffers algorithm
 selection (advanced option)

- this helps isolate selection of PEX vs NBX, for potential migration
  to a hybrid PEX
---
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H  |  14 +-
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 210 ++++++++++++------
 .../db/IOstreams/Pstreams/PstreamBuffers.H    |  86 +++----
 .../db/IOstreams/Pstreams/PstreamExchange.C   |  85 ++++---
 src/OpenFOAM/global/argList/argList.C         |   2 +
 5 files changed, 240 insertions(+), 157 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index cb17c2fc81..1f49f7234c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -470,8 +470,7 @@ public:
 
     // Exchange
 
-        //- Helper: exchange sizes of sendBufs for specified
-        //- set of send/receive processes.
+        //- Helper: exchange sizes of sendBufs for specified send/recv ranks
         template<class Container>
         static void exchangeSizes
         (
@@ -483,6 +482,17 @@ public:
             const label comm = UPstream::worldComm
         );
 
+        //- Helper: exchange sizes of sendBufs for specified neighbour ranks
+        template<class Container>
+        static void exchangeSizes
+        (
+            const labelUList& neighProcs,
+            const Container& sendBufs,
+            labelList& sizes,
+            const label tag = UPstream::msgType(),
+            const label comm = UPstream::worldComm
+        );
+
         //- Helper: exchange sizes of sendBufs.
         //- The sendBufs is the data per processor (in the communicator).
         //  Returns sizes of sendBufs on the sending processor.
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index 90a17969a5..c8de9f243e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -28,6 +28,30 @@ License
 
 #include "PstreamBuffers.H"
 #include "bitSet.H"
+#include "debug.H"
+#include "registerSwitch.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+int Foam::PstreamBuffers::algorithm
+(
+    // Not really the most creative name...
+    Foam::debug::optimisationSwitch("pbufs.algorithm", -1)
+);
+registerOptSwitch
+(
+    "pbufs.algorithm",
+    int,
+    Foam::PstreamBuffers::algorithm
+);
+
+
+// Simple enumerations
+// -------------------
+static constexpr int algorithm_PEX_allToAll = -1;  // OpenFOAM 2212 and earlier
+//static constexpr int algorithm_PEX_hybrid = 0;   // New default?
+static constexpr int algorithm_full_NBX = 1;       // Experimental
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -43,9 +67,58 @@ void Foam::PstreamBuffers::finalExchange
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
-        // Dense storage uses all-to-all
-        Pstream::exchangeSizes(sendBuffers_, recvSizes, comm_);
+        if
+        (
+            wait
+         && (algorithm >= algorithm_full_NBX)
+         && (UPstream::maxCommsSize <= 0)
+        )
+        {
+            // NBX algorithm (nonblocking exchange)
+            // - when requested and waiting, no data chunking etc
 
+            PstreamDetail::exchangeConsensus<DynamicList<char>, char>
+            (
+                sendBuffers_,
+                recvBuffers_,
+                recvSizes,
+                (tag_ + 271828),  // some unique tag?
+                comm_,
+                wait
+            );
+
+            return;
+        }
+
+
+        // PEX algorithm with two different flavours of exchanging sizes
+
+        // Assemble the send sizes (cf. Pstream::exchangeSizes)
+        labelList sendSizes(nProcs_);
+        forAll(sendBuffers_, proci)
+        {
+            sendSizes[proci] = sendBuffers_[proci].size();
+        }
+        recvSizes.resize_nocopy(nProcs_);
+
+        if (algorithm == algorithm_PEX_allToAll)
+        {
+            // PEX stage 1: exchange sizes (all-to-all)
+            UPstream::allToAll(sendSizes, recvSizes, comm_);
+        }
+        else
+        {
+            // PEX stage 1: exchange sizes (non-blocking consensus)
+            UPstream::allToAllConsensus
+            (
+                sendSizes,
+                recvSizes,
+                (tag_ + 314159),  // some unique tag?
+                comm_
+            );
+        }
+
+        // PEX stage 2: point-to-point data exchange
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuffers_,
@@ -73,6 +146,30 @@ void Foam::PstreamBuffers::finalExchange
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
+        // Preparation. Temporarily abuse recvSizes as logic to clear
+        // send buffers that are not in the neighbourhood connection
+        {
+            recvSizes.resize_nocopy(nProcs_);
+            recvSizes = 0;
+
+            // Preserve self-send, even if not described by neighbourhood
+            recvSizes[UPstream::myProcNo(comm_)] = 1;
+
+            for (const label proci : sendProcs)
+            {
+                recvSizes[proci] = 1;  // Connected
+            }
+
+            for (label proci=0; proci < nProcs_; ++proci)
+            {
+                if (!recvSizes[proci])  // Not connected
+                {
+                    sendBuffers_[proci].clear();
+                }
+            }
+        }
+
+        // PEX stage 1: exchange sizes (limited neighbourhood)
         Pstream::exchangeSizes
         (
             sendProcs,
@@ -83,6 +180,7 @@ void Foam::PstreamBuffers::finalExchange
             comm_
         );
 
+        // PEX stage 2: point-to-point data exchange
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuffers_,
@@ -96,11 +194,10 @@ void Foam::PstreamBuffers::finalExchange
 }
 
 
-void Foam::PstreamBuffers::finalExchangeGatherScatter
+void Foam::PstreamBuffers::finalGatherScatter
 (
     const bool isGather,
     const bool wait,
-    const bool needSizes,
     labelList& recvSizes
 )
 {
@@ -133,6 +230,12 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
+        // Use PEX algorithm
+        // - for a non-sparse gather/scatter, it is presumed that
+        // MPI_Gather/MPI_Scatter will be the most efficient way to
+        // communicate the sizes.
+
+        // PEX stage 1: exchange sizes (gather or scatter)
         if (isGather)
         {
             // gather mode (all-to-one): master [0] <- everyone
@@ -166,7 +269,7 @@ void Foam::PstreamBuffers::finalExchangeGatherScatter
             recvSizes[0] = myRecv;
         }
 
-
+        // PEX stage 2: point-to-point data exchange
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuffers_,
@@ -378,7 +481,7 @@ Foam::label Foam::PstreamBuffers::recvDataCount(const label proci) const
 
 Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 {
-    labelList counts(recvPositions_.size(), Zero);
+    labelList counts(nProcs_, Zero);
 
     if (finishedSendsCalled_)
     {
@@ -404,17 +507,20 @@ Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 }
 
 
-Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount(const label proci) const
+Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount
+(
+    const label excludeProci
+) const
 {
     label maxLen = 0;
 
     if (finishedSendsCalled_)
     {
-        forAll(recvBuffers_, idx)
+        forAll(recvBuffers_, proci)
         {
-            const label len(recvBuffers_[idx].size() - recvPositions_[idx]);
-            if (idx != proci)
+            if (excludeProci != proci)
             {
+                label len(recvBuffers_[proci].size() - recvPositions_[proci]);
                 maxLen = max(maxLen, len);
             }
         }
@@ -494,6 +600,9 @@ void Foam::PstreamBuffers::finishedSends
     const bool wait
 )
 {
+    // Resize for copying back
+    recvSizes.resize_nocopy(sendBuffers_.size());
+
     finalExchange(wait, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
@@ -510,39 +619,25 @@ void Foam::PstreamBuffers::finishedSends
 }
 
 
-void Foam::PstreamBuffers::finishedSends
+void Foam::PstreamBuffers::finishedNeighbourSends
 (
-    const labelUList& sendProcs,
-    const labelUList& recvProcs,
-    const bool wait
-)
-{
-    labelList recvSizes;
-    finalExchange(sendProcs, recvProcs, wait, recvSizes);
-}
-
-
-void Foam::PstreamBuffers::finishedSends
-(
-    const labelUList& sendProcs,
-    const labelUList& recvProcs,
+    const labelUList& neighProcs,
     labelList& recvSizes,
     const bool wait
 )
 {
-    finalExchange(sendProcs, recvProcs, wait, recvSizes);
+    finalExchange(neighProcs, neighProcs, wait, recvSizes);
+}
 
-    if (commsType_ != UPstream::commsTypes::nonBlocking)
-    {
-        FatalErrorInFunction
-            << "Obtaining sizes not supported in "
-            << UPstream::commsTypeNames[commsType_] << endl
-            << " since transfers already in progress. Use non-blocking instead."
-            << exit(FatalError);
 
-        // Note: maybe possible only if using different tag from write started
-        // by ~UOPstream. Needs some work.
-    }
+void Foam::PstreamBuffers::finishedNeighbourSends
+(
+    const labelUList& neighProcs,
+    const bool wait
+)
+{
+    labelList recvSizes;
+    finalExchange(neighProcs, neighProcs, wait, recvSizes);
 }
 
 
@@ -562,10 +657,8 @@ bool Foam::PstreamBuffers::finishedSends
     }
 
     // Update send connections
-    // - reasonable to assume there are no self-sends on UPstream::myProcNo
     forAll(sendBuffers_, proci)
     {
-        // ie, sendDataCount(proci) != 0
         if (sendConnections.set(proci, !sendBuffers_[proci].empty()))
         {
             // The state changed
@@ -577,22 +670,20 @@ bool Foam::PstreamBuffers::finishedSends
 
     if (changed)
     {
-        // Create send/recv topology
+        // Update send/recv topology
+        labelList recvSizes;
+        finishedSends(recvSizes, wait);  // eg, using all-to-all
 
         // The send ranks
         sendProcs.clear();
         forAll(sendBuffers_, proci)
         {
-            // ie, sendDataCount(proci) != 0
             if (!sendBuffers_[proci].empty())
             {
                 sendProcs.push_back(proci);
             }
         }
 
-        labelList recvSizes;
-        finishedSends(recvSizes, wait);  // All-to-all
-
         // The recv ranks
         recvProcs.clear();
         forAll(recvSizes, proci)
@@ -606,46 +697,25 @@ bool Foam::PstreamBuffers::finishedSends
     else
     {
         // Use existing send/recv ranks
-
-        finishedSends(sendProcs, recvProcs, wait);
+        labelList recvSizes;
+        finalExchange(sendProcs, recvProcs, wait, recvSizes);
     }
 
     return changed;
 }
 
 
-void Foam::PstreamBuffers::finishedNeighbourSends
-(
-    const labelUList& neighProcs,
-    labelList& recvSizes,
-    const bool wait
-)
-{
-    finishedSends(neighProcs, neighProcs, recvSizes, wait);
-}
-
-
-void Foam::PstreamBuffers::finishedNeighbourSends
-(
-    const labelUList& neighProcs,
-    const bool wait
-)
-{
-    finishedSends(neighProcs, neighProcs, wait);
-}
-
-
 void Foam::PstreamBuffers::finishedGathers(const bool wait)
 {
     labelList recvSizes;
-    finalExchangeGatherScatter(true, wait, false, recvSizes);
+    finalGatherScatter(true, wait, recvSizes);
 }
 
 
 void Foam::PstreamBuffers::finishedScatters(const bool wait)
 {
     labelList recvSizes;
-    finalExchangeGatherScatter(false, wait, false, recvSizes);
+    finalGatherScatter(false, wait, recvSizes);
 }
 
 
@@ -655,7 +725,7 @@ void Foam::PstreamBuffers::finishedGathers
     const bool wait
 )
 {
-    finalExchangeGatherScatter(true, wait, true, recvSizes);
+    finalGatherScatter(true, wait, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -677,7 +747,7 @@ void Foam::PstreamBuffers::finishedScatters
     const bool wait
 )
 {
-    finalExchangeGatherScatter(false, wait, true, recvSizes);
+    finalGatherScatter(false, wait, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 05efab023b..68a3c81d32 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -164,7 +164,7 @@ class PstreamBuffers
         );
 
         //- Mark sends as done.
-        //  Only exchange sizes using the sendProcs/recvProcs subset
+        //  Only exchange sizes using the neighbour ranks
         //  (nonBlocking comms).
         void finalExchange
         (
@@ -175,11 +175,10 @@ class PstreamBuffers
         );
 
         //- For all-to-one or one-to-all
-        void finalExchangeGatherScatter
+        void finalGatherScatter
         (
             const bool isGather,
             const bool wait,
-            const bool needSizes,   // If recvSizes needed or scratch
             labelList& recvSizes
         );
 
@@ -202,6 +201,12 @@ class PstreamBuffers
 
 public:
 
+    // Static Data
+
+        //- Preferred exchange algorithm (may change or be removed in future)
+        static int algorithm;
+
+
     // Constructors
 
         //- Construct given communication type (default: nonBlocking), message
@@ -340,7 +345,7 @@ public:
 
         //- Maximum receive size, excluding the specified processor rank
         //- Must call finishedSends() or other finished.. method first!
-        label maxNonLocalRecvCount(const label proci) const;
+        label maxNonLocalRecvCount(const label excludeProci) const;
 
         //- Number of unconsumed receive bytes for the specified processor.
         //- Must call finishedSends() or other finished.. method first!
@@ -397,60 +402,6 @@ public:
 
     // Functions with restricted neighbours
 
-        //- Mark sends as done using subset of send/recv ranks
-        //- to exchange data on.
-        //
-        //  Non-blocking mode: populates receive buffers.
-        //  \param sendProcs ranks used for sends
-        //  \param recvProcs ranks used for recvs
-        //  \param wait wait for requests to complete (in nonBlocking mode)
-        //
-        //  \warning currently only valid for nonBlocking comms.
-        void finishedSends
-        (
-            const labelUList& sendProcs,
-            const labelUList& recvProcs,
-            const bool wait = true
-        );
-
-        //- Mark sends as done using subset of send/recv ranks
-        //- to exchange data on. Recovers the sizes (bytes) received.
-        //
-        //  Non-blocking mode: populates receive buffers.
-        //
-        //  \param sendProcs ranks used for sends
-        //  \param recvProcs ranks used for recvs
-        //  \param[out] recvSizes the sizes (bytes) received
-        //  \param wait wait for requests to complete (in nonBlocking mode)
-        //
-        //  \warning currently only valid for nonBlocking comms.
-        void finishedSends
-        (
-            const labelUList& sendProcs,
-            const labelUList& recvProcs,
-            labelList& recvSizes,
-            const bool wait = true
-        );
-
-        //- A caching version that uses a limited send/recv connectivity.
-        //
-        //  Non-blocking mode: populates receive buffers.
-        //  \param sendConnections on/off for sending ranks
-        //  \param sendProcs ranks used for sends
-        //  \param recvProcs ranks used for recvs
-        //  \param wait wait for requests to complete (in nonBlocking mode)
-        //
-        //  \return True if the send/recv connectivity changed
-        //
-        //  \warning currently only valid for nonBlocking comms.
-        bool finishedSends
-        (
-            bitSet& sendConnections,
-            DynamicList<label>& sendProcs,
-            DynamicList<label>& recvProcs,
-            const bool wait = true
-        );
-
         //- Mark sends as done using subset of send/recv ranks
         //- and recover the sizes (bytes) received.
         //
@@ -484,6 +435,25 @@ public:
             const bool wait = true
         );
 
+        //- A caching version that uses a limited send/recv connectivity.
+        //
+        //  Non-blocking mode: populates receive buffers.
+        //  \param sendConnections on/off for sending ranks
+        //  \param sendProcs ranks used for sends
+        //  \param recvProcs ranks used for recvs
+        //  \param wait wait for requests to complete (in nonBlocking mode)
+        //
+        //  \return True if the send/recv connectivity changed
+        //
+        //  \warning currently only valid for nonBlocking comms.
+        bool finishedSends
+        (
+            bitSet& sendConnections,
+            DynamicList<label>& sendProcs,
+            DynamicList<label>& recvProcs,
+            const bool wait = true
+        );
+
 
     // Gather/scatter modes
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index f98d47334c..6c590d76d8 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -746,58 +746,89 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
-    //const label myProci = UPstream::myProcNo(comm);
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProcs = UPstream::nProcs(comm);
 
-    if (sendBufs.size() != UPstream::nProcs(comm))
+    if (sendBufs.size() != numProcs)
     {
         FatalErrorInFunction
             << "Size of container " << sendBufs.size()
-            << " does not equal the number of processors "
-            << UPstream::nProcs(comm)
+            << " does not equal the number of processors " << numProcs
             << Foam::abort(FatalError);
     }
 
-    labelList sendSizes(sendProcs.size());
-    forAll(sendProcs, i)
+    labelList sendSizes(numProcs);
+    for (label proci = 0; proci < numProcs; ++proci)
     {
-        sendSizes[i] = sendBufs[sendProcs[i]].size();
+        sendSizes[proci] = sendBufs[proci].size();
     }
 
-    recvSizes.resize_nocopy(sendBufs.size());
+    recvSizes.resize_nocopy(numProcs);
     recvSizes = 0;  // Ensure non-received entries are properly zeroed
 
+    // Preserve self-send, even if not described by neighbourhood
+    recvSizes[myProci] = sendSizes[myProci];
+
     const label startOfRequests = UPstream::nRequests();
 
     for (const label proci : recvProcs)
     {
-        UIPstream::read
-        (
-            UPstream::commsTypes::nonBlocking,
-            proci,
-            reinterpret_cast<char*>(&recvSizes[proci]),
-            sizeof(label),
-            tag,
-            comm
-        );
+        if (proci != myProci)
+        {
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                proci,
+                reinterpret_cast<char*>(&recvSizes[proci]),
+                sizeof(label),
+                tag,
+                comm
+            );
+        }
     }
 
-    forAll(sendProcs, i)
+    for (const label proci : sendProcs)
     {
-        UOPstream::write
-        (
-            UPstream::commsTypes::nonBlocking,
-            sendProcs[i],
-            reinterpret_cast<char*>(&sendSizes[i]),
-            sizeof(label),
-            tag,
-            comm
-        );
+        if (proci != myProci)
+        {
+            UOPstream::write
+            (
+                UPstream::commsTypes::nonBlocking,
+                proci,
+                reinterpret_cast<char*>(&sendSizes[proci]),
+                sizeof(label),
+                tag,
+                comm
+            );
+        }
     }
 
     UPstream::waitRequests(startOfRequests);
 }
 
 
+template<class Container>
+void Foam::Pstream::exchangeSizes
+(
+    const labelUList& neighProcs,
+    const Container& sendBufs,
+    labelList& recvSizes,
+    const label tag,
+    const label comm
+)
+{
+    Pstream::exchangeSizes<Container>
+    (
+        neighProcs,  // send
+        neighProcs,  // recv
+        sendBufs,
+        recvSizes,
+        tag,
+        comm
+    );
+}
+
+
 // Sparse sending
 template<class Container>
 void Foam::Pstream::exchangeSizes
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 9c5f09ddfa..2d53e33490 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1720,6 +1720,8 @@ void Foam::argList::parse
                 << "    nProcsSimpleSum    : " << Pstream::nProcsSimpleSum << nl
                 << "    nonBlockingExchange: "
                 << Pstream::nProcsNonblockingExchange << nl
+                << "    exchange algorithm : "
+                << PstreamBuffers::algorithm << nl
                 << "    commsType          : "
                 << Pstream::commsTypeNames[Pstream::defaultCommsType] << nl
                 << "    polling iterations : " << Pstream::nPollProcInterfaces

From 4284d02c996e2f9c281e1fe806063a7552332ac4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 2 Mar 2023 17:17:32 +0100
Subject: [PATCH 124/348] CONFIG: accept -decompose-dict=xyz for Run functions
 and mpirunDebug

- interpret as '-decomposeParDict xyz' for simpler scripting:
  A empty value ("") as well as "none" or "false" values are ignored.

  Eg,
      unset decompDict
      if some_condition; then decompDict=decomposeParDict-12; fi

      runParallel -decompose-dict=$decompDict ...

ENH: more generous when scanning decomposeParDict for numberOfSubdomains

- assume file is in system/ directory if not otherwise found
---
 bin/mpirunDebug        |  35 +++++++----
 bin/tools/RunFunctions | 128 +++++++++++++++++++++++++++--------------
 2 files changed, 108 insertions(+), 55 deletions(-)

diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index 1e901b25aa..695c0fae5e 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2015 OpenFOAM Foundation
-#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#     Copyright (C) 2017-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -45,6 +45,7 @@ options:
   -local        Same as -spawn=1
   -remote       Same as -spawn=2
   -clean        Remove old processor*.{log,sh} files, mpirun.schema etc
+  -decompose-dict=<file>   Specific decomposeParDict name
   -help         Print the usage
 
 Invoke mpirun with separate per-processor log files or running in
@@ -111,7 +112,7 @@ Linux)
 esac
 
 unset appName appArgs nProcs
-unset method spawn optClean
+unset method spawn optClean optValue
 optConfirm=true
 
 decompDict="system/decomposeParDict"
@@ -126,7 +127,7 @@ do
     then
         knownOption=true  # Assume success
         case "$1" in
-        '') ;;  # ignore junk
+        ('') ;;  # Ignore junk
 
         -clean)     optClean=true ;;
         -yes)       unset optConfirm ;;
@@ -173,14 +174,25 @@ do
             shift
             ;;
 
+        (-decompose-dict=*)
+            optValue="${1#*=}"
+            case "$optValue" in
+            ('' | none | false) ;;  ## Ignore
+            (*)
+                decompDict="$optValue"
+                appArgs="${appArgs}${appArgs:+ }-decomposeParDict '$decompDict'"
+                ;;
+            esac
+            ;;
+
         -decomposeParDict)
             # Grab values and add to args immediately
             decompDict="$2"
-            appArgs="${appArgs}${appArgs:+ }$1 '$2'"
             shift
+            appArgs="${appArgs}${appArgs:+ }-decomposeParDict '$decompDict'"
             ;;
 
-        *)
+        (*)
             knownOption=false  # Fallthrough to regular processing
             ;;
         esac
@@ -192,23 +204,24 @@ do
         fi
     fi
 
+    # Processing application arguments
     case "$1" in
-    -help* | --help*) usage ;;
-    '') ;;  # ignore junk
+    (-help* | --help*) usage ;;
+    ('') ;;  ## Ignore junk
 
-    -np)
+    (-np)
         nProcs="$2"
         shift
         ;;
 
-    -decomposeParDict)
+    (-decomposeParDict)
         # Grab values and add to args immediately
         decompDict="$2"
-        appArgs="${appArgs}${appArgs:+ }$1 '$2'"
+        appArgs="${appArgs}${appArgs:+ }-decomposeParDict '$decompDict'"
         shift
         ;;
 
-    *)
+    (*)
         if [ -z "$appName" ]
         then
             appName="$1"
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 5ef1c3c23a..f8482f63f2 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2015-2022 OpenCFD Ltd.
+#     Copyright (C) 2015-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -180,6 +180,16 @@ getNumberOfProcessors()
 {
     local dict="${1:-system/decomposeParDict}"
 
+    case "$dict" in
+    (system/*)  # Already qualified
+        ;;
+    (*)
+        # If it does not exist, assume it refers to location in system/
+        [ -f "$dict" ] || dict="system/$dict"
+        ;;
+    esac
+
+
     # Re-use positional parameters for automatic whitespace elimination
     set -- $(foamDictionary -entry numberOfSubdomains -value "$dict" 2>/dev/null)
 
@@ -223,7 +233,7 @@ getApplication()
 #
 runApplication()
 {
-    local appName appRun logFile logMode
+    local appName appRun optValue logFile logMode
 
     # Any additional parsed arguments (eg, decomposeParDict)
     local appArgs
@@ -232,25 +242,39 @@ runApplication()
     while [ "$#" -gt 0 ] && [ -z "$appRun" ]
     do
         case "$1" in
-            -a | -append)
-                logMode=append
-                ;;
-            -o | -overwrite)
-                logMode=overwrite
-                ;;
-            -s | -suffix)
-                logFile=".$2"
-                shift
-                ;;
-            -decomposeParDict)
-                appArgs="$appArgs $1 $2"
-                shift
-                ;;
-            '')
-                ;;
-            *)
-                appRun="$1"
-                ;;
+        ('') ;;  # Ignore junk
+
+        (-a | -append)
+            logMode=append
+            ;;
+        (-o | -overwrite)
+            logMode=overwrite
+            ;;
+        (-s | -suffix)
+            logFile=".$2"
+            shift
+            ;;
+
+        (-decompose-dict=*)
+            optValue="${1#*=}"
+            case "$optValue" in
+            ('' | none | false) ;;  ## Ignore
+            (*) appArgs="$appArgs -decomposeParDict $optValue" ;;
+            esac
+            ;;
+
+        (-decomposeParDict)
+            optValue="$2"
+            shift
+            case "$optValue" in
+            ('' | none | false) ;; ## Ignore
+            (*) appArgs="$appArgs -decomposeParDict $optValue" ;;
+            esac
+            ;;
+
+        (*)
+            appRun="$1"
+            ;;
         esac
         shift
     done
@@ -280,7 +304,7 @@ runApplication()
 #
 runParallel()
 {
-    local appName appRun logFile logMode nProcs
+    local appName appRun optValue logFile logMode nProcs
 
     # Any additional parsed arguments (eg, decomposeParDict)
     local appArgs="-parallel"
@@ -295,30 +319,46 @@ runParallel()
     while [ "$#" -gt 0 ] && [ -z "$appRun" ]
     do
         case "$1" in
-            -a | -append)
-                logMode=append
+        ('') ;;  # Ignore junk
+
+        (-a | -append)
+            logMode=append
+            ;;
+        (-o | -overwrite)
+            logMode=overwrite
+            ;;
+        (-s | -suffix)
+            logFile=".$2"
+            shift
+            ;;
+        (-n | -np)
+            nProcs="$2"
+            shift
+            ;;
+        (-decompose-dict=*)
+            optValue="${1#*=}"
+            case "$optValue" in
+            ('' | none | false) ;;  ## Ignore
+            (*)
+                appArgs="$appArgs -decomposeParDict $optValue"
+                nProcs="$(getNumberOfProcessors "$optValue")"
                 ;;
-            -o | -overwrite)
-                logMode=overwrite
-                ;;
-            -s | -suffix)
-                logFile=".$2"
-                shift
-                ;;
-            -n | -np)
-                nProcs="$2"
-                shift
-                ;;
-            -decomposeParDict)
-                appArgs="$appArgs $1 $2"
-                nProcs=$(getNumberOfProcessors "$2")
-                shift
-                ;;
-            '')
-                ;;
-            *)
-                appRun="$1"
+            esac
+            ;;
+        (-decomposeParDict)
+            optValue="$2"
+            shift
+            case "$optValue" in
+            ('' | none | false) ;;  ## Ignore
+            (*)
+                appArgs="$appArgs -decomposeParDict $optValue"
+                nProcs="$(getNumberOfProcessors "$optValue")"
                 ;;
+            esac
+            ;;
+         (*)
+            appRun="$1"
+            ;;
         esac
         shift
     done

From d5c0852de164886e52d06949414b52cfe85f1ea1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Mar 2023 20:52:11 +0100
Subject: [PATCH 125/348] ENH: improve diagnostic fields for checkFaMesh
 -write-vtk

ENH: support VTK output of procIDs for point data for some writers

TUT: areaWrite for drippingChair
---
 .../finiteArea/checkFaMesh/faMeshWriteVTK.H   | 19 +++++++++-----
 src/fileFormats/vtk/file/foamVtkFileWriter.C  | 18 +++++++++----
 src/fileFormats/vtk/file/foamVtkFileWriter.H  | 15 ++++++++---
 src/fileFormats/vtk/file/foamVtkFileWriterI.H | 14 ++++++++++-
 src/fileFormats/vtk/write/foamVtkLineWriter.C |  6 ++++-
 src/fileFormats/vtk/write/foamVtkLineWriter.H |  6 ++---
 .../vtk/write/foamVtkSurfaceWriter.C          |  6 ++++-
 .../vtk/write/foamVtkSurfaceWriter.H          |  6 ++---
 .../writers/vtk/foamVtkCoordSetWriter.H       |  5 ++--
 .../vtk/patch/foamVtkGenericPatchWriter.H     |  6 ++++-
 .../output/vtk/patch/foamVtkPatchMeshWriter.C |  6 ++++-
 .../output/vtk/patch/foamVtkPatchMeshWriter.H |  6 ++---
 .../kinematicParcelFoam/drippingChair/Allrun  | 25 +++++++++++++------
 .../drippingChair/Allrun-serial               | 15 +++++++----
 .../drippingChair/system/areaWrite            | 25 +++++++++++++++++++
 .../drippingChair/system/controlDict          |  5 ++++
 .../drippingChair/system/decomposeParDict-6   | 21 ++++++++++++++++
 .../drippingChair/system/decomposeParDict-7   | 21 ++++++++++++++++
 18 files changed, 182 insertions(+), 43 deletions(-)
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/areaWrite
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-6
 create mode 100644 tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-7

diff --git a/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H b/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H
index 5a138055d1..04b7bcfa61 100644
--- a/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H
+++ b/applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -76,9 +76,9 @@ Description
     writer.beginCellData(4);
     writer.writeProcIDs();
     {
-        // Use primitive patch order
         Field<scalar> fld
         (
+            // Use primitive patch order
             faMeshTools::flattenEdgeField(aMesh.magLe(), true)
         );
         writer.write("magLe", fld);
@@ -93,11 +93,17 @@ Description
 }
 
 {
+    const Field<vector> edgeCentres
+    (
+        // Use primitive patch order
+        faMeshTools::flattenEdgeField(aMesh.edgeCentres(), true)
+    );
+
     // finiteArea - edgeCentres
     // (no other convenient way to display vectors on the edges)
     vtk::lineWriter writer
     (
-        aMesh.edgeCentres(),
+        edgeCentres,
         edgeList::null(),
         // vtk::formatType::INLINE_ASCII,
         fileName
@@ -109,19 +115,20 @@ Description
     writer.writeGeometry();
 
     // PointData
-    writer.beginPointData(4);
+    writer.beginPointData(3);
+    writer.writeProcIDs();  // Unfortunately cannot threshold on points
     {
-        // Use primitive patch order
         Field<vector> fld
         (
+            // Use primitive patch order
             faMeshTools::flattenEdgeField(aMesh.Le(), true)
         );
         writer.write("Le", fld);
     }
     {
-        // Use primitive patch order
         Field<vector> fld
         (
+            // Use primitive patch order
             faMeshTools::flattenEdgeField(aMesh.edgeAreaNormals(), true)
         );
         writer.write("normal", fld);
diff --git a/src/fileFormats/vtk/file/foamVtkFileWriter.C b/src/fileFormats/vtk/file/foamVtkFileWriter.C
index 123a69e321..c1bdd88e85 100644
--- a/src/fileFormats/vtk/file/foamVtkFileWriter.C
+++ b/src/fileFormats/vtk/file/foamVtkFileWriter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,11 +76,11 @@ Foam::Ostream& Foam::vtk::fileWriter::reportBadState
 Foam::Ostream& Foam::vtk::fileWriter::reportBadState
 (
     Ostream& os,
-    outputState expected,
+    outputState expected1,
     outputState expected2
 ) const
 {
-    reportBadState(os, expected)
+    reportBadState(os, expected1)
         << " or (" << stateNames[expected2] << ')';
     return os;
 }
@@ -554,10 +554,18 @@ bool Foam::vtk::fileWriter::writeProcIDs(const label nValues)
     {
         ++nCellData_;
     }
+    else if (isState(outputState::POINT_DATA))
+    {
+        ++nPointData_;
+    }
     else
     {
-        reportBadState(FatalErrorInFunction, outputState::CELL_DATA)
-            << " for procID field" << nl << endl
+        reportBadState
+        (
+            FatalErrorInFunction,
+            outputState::CELL_DATA,
+            outputState::POINT_DATA
+        )   << " for procID field" << nl << endl
             << exit(FatalError);
 
         return false;
diff --git a/src/fileFormats/vtk/file/foamVtkFileWriter.H b/src/fileFormats/vtk/file/foamVtkFileWriter.H
index 98f4793950..abf068a42f 100644
--- a/src/fileFormats/vtk/file/foamVtkFileWriter.H
+++ b/src/fileFormats/vtk/file/foamVtkFileWriter.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,7 +201,8 @@ protected:
             const UList<Type>& field
         );
 
-        //- Write nValues of processor ids as CellData (no-op in serial)
+        //- Write nValues of processor ids as CellData or PointData
+        //- (no-op in serial)
         bool writeProcIDs(const label nValues);
 
 
@@ -305,10 +306,16 @@ public:
         //  \return True if the state changed
         virtual bool beginPointData(label nFields = 0) = 0;
 
-        //- Return the number of CellData written for the Piece thus far.
+        //- True if output state corresponds to CELL_DATA
+        inline bool isCellData() const noexcept;
+
+        //- True if output state corresponds to POINT_DATA
+        inline bool isPointData() const noexcept;
+
+        //- The number of CellData written for the Piece thus far.
         inline label nCellData() const noexcept;
 
-        //- Return the number of PointData written for the Piece thus far.
+        //- The number of PointData written for the Piece thus far.
         inline label nPointData() const noexcept;
 
 
diff --git a/src/fileFormats/vtk/file/foamVtkFileWriterI.H b/src/fileFormats/vtk/file/foamVtkFileWriterI.H
index b9cbfd677c..f1fb48f580 100644
--- a/src/fileFormats/vtk/file/foamVtkFileWriterI.H
+++ b/src/fileFormats/vtk/file/foamVtkFileWriterI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,4 +107,16 @@ inline Foam::label Foam::vtk::fileWriter::nPointData() const noexcept
 }
 
 
+inline bool Foam::vtk::fileWriter::isCellData() const noexcept
+{
+    return (outputState::CELL_DATA == state_);
+}
+
+
+inline bool Foam::vtk::fileWriter::isPointData() const noexcept
+{
+    return (outputState::POINT_DATA == state_);
+}
+
+
 // ************************************************************************* //
diff --git a/src/fileFormats/vtk/write/foamVtkLineWriter.C b/src/fileFormats/vtk/write/foamVtkLineWriter.C
index a5f42b5ad9..3fa9019665 100644
--- a/src/fileFormats/vtk/write/foamVtkLineWriter.C
+++ b/src/fileFormats/vtk/write/foamVtkLineWriter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,6 +131,10 @@ void Foam::vtk::lineWriter::piece
 
 bool Foam::vtk::lineWriter::writeProcIDs()
 {
+    if (this->isPointData())
+    {
+        return vtk::fileWriter::writeProcIDs(nLocalPoints_);
+    }
     return vtk::fileWriter::writeProcIDs(nLocalLines_);
 }
 
diff --git a/src/fileFormats/vtk/write/foamVtkLineWriter.H b/src/fileFormats/vtk/write/foamVtkLineWriter.H
index 36245558f2..48d971287a 100644
--- a/src/fileFormats/vtk/write/foamVtkLineWriter.H
+++ b/src/fileFormats/vtk/write/foamVtkLineWriter.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,8 +155,8 @@ public:
         void piece(const pointField& points, const edgeList& edges);
 
 
-        //- Write processor ids for each line as CellData
-        //- (no-op in serial)
+        //- Write processor ids for each line as CellData or for each point
+        //- as PointData, depending on isPointData() state. No-op in serial.
         bool writeProcIDs();
 
         //- Write a uniform field of Cell (Line) or Point values
diff --git a/src/fileFormats/vtk/write/foamVtkSurfaceWriter.C b/src/fileFormats/vtk/write/foamVtkSurfaceWriter.C
index 7b07cace36..4b42c38809 100644
--- a/src/fileFormats/vtk/write/foamVtkSurfaceWriter.C
+++ b/src/fileFormats/vtk/write/foamVtkSurfaceWriter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,6 +131,10 @@ void Foam::vtk::surfaceWriter::piece
 
 bool Foam::vtk::surfaceWriter::writeProcIDs()
 {
+    if (this->isPointData())
+    {
+        return vtk::fileWriter::writeProcIDs(nLocalPoints_);
+    }
     return vtk::fileWriter::writeProcIDs(nLocalPolys_);
 }
 
diff --git a/src/fileFormats/vtk/write/foamVtkSurfaceWriter.H b/src/fileFormats/vtk/write/foamVtkSurfaceWriter.H
index 0a9d2ccdf3..38fcdcf09c 100644
--- a/src/fileFormats/vtk/write/foamVtkSurfaceWriter.H
+++ b/src/fileFormats/vtk/write/foamVtkSurfaceWriter.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,8 +155,8 @@ public:
         void piece(const pointField& points, const faceList& faces);
 
 
-        //- Write processor ids for each poly as CellData
-        //- (no-op in serial)
+        //- Write processor ids for each poly as CellData or for each point
+        //- as PointData, depending on isPointData() state. No-op in serial.
         bool writeProcIDs();
 
         //- Write a uniform field of Cell (Poly) or Point values
diff --git a/src/meshTools/coordSet/writers/vtk/foamVtkCoordSetWriter.H b/src/meshTools/coordSet/writers/vtk/foamVtkCoordSetWriter.H
index 8963ce6adc..5f965e5727 100644
--- a/src/meshTools/coordSet/writers/vtk/foamVtkCoordSetWriter.H
+++ b/src/meshTools/coordSet/writers/vtk/foamVtkCoordSetWriter.H
@@ -201,8 +201,9 @@ public:
         void piece(const UPtrList<const pointField>& points);
 
 
-        //- Write processor ids for each line as CellData
-        //- (no-op in serial)
+        //- Write processor ids for each line as CellData or for each point
+        //- as PointData, depending on isPointData() state. No-op in serial.
+        //  Not implemented.
         bool writeProcIDs();
 
 
diff --git a/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.H b/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.H
index 8dabdc2772..e2db80c63f 100644
--- a/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.H
+++ b/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -159,6 +159,10 @@ public:
         //- Write processor ids for each poly as CellData
         bool writeProcIDs()
         {
+            if (this->isPointData())
+            {
+                return vtk::fileWriter::writeProcIDs(nLocalPoints_);
+            }
             return vtk::polyWriter::writeProcIDs(nLocalPolys_);
         }
 };
diff --git a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.C b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.C
index f12762e7d4..fce8474d65 100644
--- a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.C
+++ b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -585,6 +585,10 @@ void Foam::vtk::patchMeshWriter::writePatchIDs()
 
 bool Foam::vtk::patchMeshWriter::writeProcIDs()
 {
+    if (this->isPointData())
+    {
+        return vtk::fileWriter::writeProcIDs(nLocalPoints_);
+    }
     return vtk::fileWriter::writeProcIDs(nLocalPolys_);
 }
 
diff --git a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H
index 75cae3ffab..de259f740d 100644
--- a/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H
+++ b/src/meshTools/output/vtk/patch/foamVtkPatchMeshWriter.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -209,8 +209,8 @@ public:
         //  Must be called within the CELL_DATA state.
         void writePatchIDs();
 
-        //- Write processor ids as CellData. This is no-op in serial.
-        //  Must be called within the CELL_DATA state.
+        //- Write processor ids for each line as CellData or for each point
+        //- as PointData, depending on isPointData() state. No-op in serial.
         bool writeProcIDs();
 
         //- Write processor neighbour ids as CellData. This is no-op in serial.
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun
index d5c14d149d..fb94a6e0b0 100755
--- a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun
@@ -3,19 +3,30 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+unset decompDict
+# decompDict=system/decomposeParDict-6
+# decompDict=system/decomposeParDict-7
+
 runApplication blockMesh
 
 runApplication makeFaMesh
 
-runApplication decomposePar
+runApplication -decompose-dict="$decompDict" decomposePar
 
-# For the processor partitioning
-runParallel -s finiteVolume foamToVTK -name VTK-parallel -time 0 \
-    -no-finite-area -no-internal -no-lagrangian -no-fields -with-ids
+# For ids and processor partitioning
+runParallel -s volume -decompose-dict="$decompDict" \
+    foamToVTK -name VTK-parallel -time 0 \
+    -no-finite-area -no-internal -no-lagrangian -no-fields -with-ids \
+    -patches filmWalls
 
-runParallel $(getApplication)
+runParallel -decompose-dict="$decompDict" $(getApplication)
 
-runParallel -s finiteArea foamToVTK -name VTK-parallel \
-    -no-boundary -no-internal -no-lagrangian
+if false
+then
+    # Not usually needed - uses areaWrite
+    runParallel -s area -decompose-dict="$decompDict" \
+        foamToVTK -name VTK-parallel \
+        -no-boundary -no-internal -no-lagrangian -with-ids
+fi
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial
index 7e8c9929a1..083597c8e8 100755
--- a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/Allrun-serial
@@ -7,13 +7,18 @@ runApplication blockMesh
 
 runApplication makeFaMesh
 
-# For the cell ids etc
-runApplication -s finiteVolume.serial foamToVTK -name VTK-serial -time 0 \
-    -no-finite-area -no-internal -no-lagrangian -no-fields -with-ids
+# For ids and processor partitioning
+runApplication -s volume.serial foamToVTK -name VTK-serial -time 0 \
+    -no-finite-area -no-internal -no-lagrangian -no-fields -with-ids \
+    -patches filmWalls
 
 runApplication $(getApplication)
 
-runApplication -s finiteArea.serial foamToVTK -name VTK-serial \
-    -no-boundary -no-internal -no-lagrangian
+if false
+then
+    # Not usually needed - uses areaWrite
+    runApplication -s area.serial foamToVTK -name VTK-serial \
+        -no-boundary -no-internal -no-lagrangian
+fi
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/areaWrite b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/areaWrite
new file mode 100644
index 0000000000..3efb160c88
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/areaWrite
@@ -0,0 +1,25 @@
+// -*- C++ -*-
+// Use the areaWrite function object
+
+areaWrite
+{
+    type    areaWrite;
+    libs    (utilityFunctionObjects);
+    log     true;
+
+    writeControl    writeTime;
+    writeInterval   1;
+
+    // Fields to output (words or regex)
+    fields  (Uf_film hf_film pf_film);
+
+    surfaceFormat ensight;
+
+    formatOptions
+    {
+        default { format binary; }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict
index 90570e4629..1127a202e5 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/controlDict
@@ -52,5 +52,10 @@ regionFaMaxCo   1;
 
 maxDeltaT       0.1;
 
+functions
+{
+    #include "areaWrite"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-6 b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-6
new file mode 100644
index 0000000000..34b03d9320
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-6
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 6;
+
+method          scotch;
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-7 b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-7
new file mode 100644
index 0000000000..2e873a3493
--- /dev/null
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/decomposeParDict-7
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 7;
+
+method          scotch;
+
+// ************************************************************************* //

From 4dff2bfad11f89028c25e77008c1467a5256cd5d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Mar 2023 12:15:47 +0100
Subject: [PATCH 126/348] STYLE: PtrList emplace_set for symmetry with
 HashPtrTable method naming

---
 .../containers/PtrLists/PtrList/PtrList.H        |  4 ++++
 .../containers/PtrLists/PtrList/PtrListI.H       | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 6d1ffb1677..80374047f0 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -173,6 +173,10 @@ public:
         //- (discard old element at that location).
         //- Return reference to the new list element.
         template<class... Args>
+        inline T& emplace_set(const label i, Args&&... args);
+
+        //- Same as emplace_set()
+        template<class... Args>
         inline T& emplace(const label i, Args&&... args);
 
         //- Set element to given pointer and return old element (can be null)
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
index 921c4bed09..150b2825af 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
@@ -172,11 +172,17 @@ inline void Foam::PtrList<T>::push_back(PtrList<T>&& other)
 
 template<class T>
 template<class... Args>
-inline T& Foam::PtrList<T>::emplace
-(
-    const label i,
-    Args&&... args
-)
+inline T& Foam::PtrList<T>::emplace_set(const label i, Args&&... args)
+{
+    T* ptr = new T(std::forward<Args>(args)...);
+    (void)this->set(i, ptr);
+    return *ptr;
+}
+
+
+template<class T>
+template<class... Args>
+inline T& Foam::PtrList<T>::emplace(const label i, Args&&... args)
 {
     T* ptr = new T(std::forward<Args>(args)...);
     (void)this->set(i, ptr);

From 820f93c3b4cde81fe4c99366577bc4e655b38878 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Mar 2023 12:27:44 +0100
Subject: [PATCH 127/348] ENH: simplify box mesh construction (PDRblockMesh)

ENH: construct or reset boundBox from zero_one for a 0-1 unit cube

ENH: add some testing timings (for !596 and #2715)
---
 applications/test/boundBox2/Test-boundBox2.C  |   2 +-
 .../test/polyMeshGeom-speed1/Make/files       |   3 +
 .../test/polyMeshGeom-speed1/Make/options     |   5 +
 .../Test-polyMeshGeom-speed1.C                | 804 ++++++++++++++++++
 .../Test-triangleIntersection.C               |   3 +-
 src/OpenFOAM/meshes/boundBox/boundBox.H       |   8 +-
 src/OpenFOAM/meshes/boundBox/boundBoxI.H      |  16 +-
 src/OpenFOAM/meshes/ijkMesh/ijkAddressing.H   |   4 +-
 src/OpenFOAM/meshes/ijkMesh/ijkMesh.H         |   4 +-
 .../meshes/treeBoundBox/treeBoundBox.H        |   5 +-
 .../meshes/treeBoundBox/treeBoundBoxI.H       |   8 +-
 src/mesh/blockMesh/PDRblockMesh/PDRblock.C    |  72 +-
 src/mesh/blockMesh/PDRblockMesh/PDRblock.H    |  24 +-
 .../PDRblockMesh/PDRblockBlockMesh.C          |   8 +-
 src/mesh/blockMesh/PDRblockMesh/PDRblockI.H   |  43 +-
 .../blockMesh/PDRblockMesh/PDRblockLocation.C |  25 +-
 16 files changed, 960 insertions(+), 74 deletions(-)
 create mode 100644 applications/test/polyMeshGeom-speed1/Make/files
 create mode 100644 applications/test/polyMeshGeom-speed1/Make/options
 create mode 100644 applications/test/polyMeshGeom-speed1/Test-polyMeshGeom-speed1.C

diff --git a/applications/test/boundBox2/Test-boundBox2.C b/applications/test/boundBox2/Test-boundBox2.C
index 3c88e70d51..4d929dd7a4 100644
--- a/applications/test/boundBox2/Test-boundBox2.C
+++ b/applications/test/boundBox2/Test-boundBox2.C
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
 
-    treeBoundBox bb(cube(0, 1));
+    treeBoundBox bb(zero_one{});
     treeBoundBox sub(cube(0.1, 0.8));
 
     Info<< nl
diff --git a/applications/test/polyMeshGeom-speed1/Make/files b/applications/test/polyMeshGeom-speed1/Make/files
new file mode 100644
index 0000000000..e6c64cc479
--- /dev/null
+++ b/applications/test/polyMeshGeom-speed1/Make/files
@@ -0,0 +1,3 @@
+Test-polyMeshGeom-speed1.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-polyMeshGeom-speed1
diff --git a/applications/test/polyMeshGeom-speed1/Make/options b/applications/test/polyMeshGeom-speed1/Make/options
new file mode 100644
index 0000000000..b4f99e5295
--- /dev/null
+++ b/applications/test/polyMeshGeom-speed1/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/mesh/blockMesh/lnInclude
+
+EXE_LIBS = \
+    -lblockMesh
diff --git a/applications/test/polyMeshGeom-speed1/Test-polyMeshGeom-speed1.C b/applications/test/polyMeshGeom-speed1/Test-polyMeshGeom-speed1.C
new file mode 100644
index 0000000000..4c268797dd
--- /dev/null
+++ b/applications/test/polyMeshGeom-speed1/Test-polyMeshGeom-speed1.C
@@ -0,0 +1,804 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Description
+    Simple timing tests for some polyMesh primitives
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "clockTime.H"
+#include "Time.H"
+#include "PDRblock.H"
+#include "polyMesh.H"
+#include "ListOps.H"
+
+using namespace Foam;
+
+void printAlloc(const polyMesh& mesh)
+{
+    Info<< "memory"
+        << " hasCellPoints:" << mesh.hasCellPoints()
+        << " hasPointCells:" << mesh.hasPointCells() << endl;
+}
+
+
+void printInfo(const polyMesh& mesh)
+{
+    Info<< "polyMesh"
+        << " nPoints:" << mesh.nPoints()
+        << " nInternalFaces:" << mesh.nInternalFaces()
+        << " nFaces:" << mesh.nFaces()
+        << " nCells:" << mesh.nCells() << endl;
+}
+
+
+// How point cells are calculated in OpenFOAM-v2212 and earlier
+autoPtr<labelListList> pointCells_2212(const polyMesh& mesh)
+{
+    const cellList& cf = mesh.cells();
+
+    // Count number of cells per point
+
+    labelList npc(mesh.nPoints(), Zero);
+
+    forAll(cf, celli)
+    {
+        const labelList curPoints = cf[celli].labels(mesh.faces());
+
+        for (const label pointi : curPoints)
+        {
+            ++npc[pointi];
+        }
+    }
+
+
+    // Size and fill cells per point
+
+    auto pcPtr_ = autoPtr<labelListList>::New(npc.size());
+    labelListList& pointCellAddr = *pcPtr_;
+
+    forAll(pointCellAddr, pointi)
+    {
+        pointCellAddr[pointi].setSize(npc[pointi]);
+        npc[pointi] = 0;
+    }
+
+
+    forAll(cf, celli)
+    {
+        const labelList curPoints = cf[celli].labels(mesh.faces());
+
+        for (const label pointi : curPoints)
+        {
+            pointCellAddr[pointi][npc[pointi]++] = celli;
+        }
+    }
+
+    return pcPtr_;
+}
+
+
+// Line cell::labels but with persistent storage
+void cell_labels
+(
+    const cell& cFaces,
+    const faceUList& meshFaces,
+    DynamicList<label>& pointLabels
+)
+{
+    // const labelList& cFaces = *this;
+
+    label nVerts = 0;
+    for (const label facei : cFaces)
+    {
+        nVerts += meshFaces[facei].size();
+    }
+
+    // pointLabels.clear();
+    pointLabels.expandStorage();
+
+    // The first face has no duplicates, can copy in values
+    const labelList& firstFace = meshFaces[cFaces[0]];
+
+    std::copy(firstFace.cbegin(), firstFace.cend(), pointLabels.begin());
+
+    // Now already contains some vertices
+    nVerts = firstFace.size();
+
+    // For the rest of the faces. For each vertex, check if the point is
+    // already inserted (up to nVerts, which now carries the number of real
+    // points. If not, add it at the end of the list.
+
+    for (label facei = 1; facei < cFaces.size(); ++facei)
+    {
+        for (const label curPoint : meshFaces[cFaces[facei]])
+        {
+            bool pointFound = false;
+
+            for (label checki = 0; checki < nVerts; ++checki)
+            {
+                if (curPoint == pointLabels[checki])
+                {
+                    pointFound = true;
+                    break;
+                }
+            }
+
+            if (!pointFound)
+            {
+                pointLabels[nVerts] = curPoint;
+                ++nVerts;
+            }
+        }
+    }
+
+    pointLabels.resize(nVerts);
+}
+
+
+
+// Like OpenFOAM-v2212, but with cell::labels unrolled to avoid allocations
+autoPtr<labelListList> pointCells_2212mod(const polyMesh& mesh)
+{
+    const cellList& cf = mesh.cells();
+
+    // Vertex labels for the current cell
+    DynamicList<label> vertices(256);
+
+    // Count number of cells per point
+
+    labelList npc(mesh.nPoints(), Zero);
+
+    for (const cell& c : cf)
+    {
+        cell_labels(c, mesh.faces(), vertices);
+
+        for (const label pointi : vertices)
+        {
+            ++npc[pointi];
+        }
+    }
+
+
+    // Size and fill cells per point
+
+    auto pcPtr_ = autoPtr<labelListList>::New(npc.size());
+    labelListList& pointCellAddr = *pcPtr_;
+
+    forAll(pointCellAddr, pointi)
+    {
+        pointCellAddr[pointi].resize(npc[pointi]);
+        npc[pointi] = 0;
+    }
+
+
+    forAll(cf, celli)
+    {
+        cell_labels(cf[celli], mesh.faces(), vertices);
+
+        for (const label pointi : vertices)
+        {
+            pointCellAddr[pointi][npc[pointi]++] = celli;
+        }
+    }
+
+    return pcPtr_;
+}
+
+
+// How cells points are calculated in OpenFOAM-v2212 and earlier
+autoPtr<labelListList> cellPoints_2212(const polyMesh& mesh)
+{
+    autoPtr<labelListList> pointCells = pointCells_2212(mesh);
+
+    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
+
+    invertManyToMany(mesh.nCells(), pointCells(), *cpPtr_);
+
+    return cpPtr_;
+}
+
+
+// Calculate with bitSet tracking and avoid cells::labels
+autoPtr<labelListList> pointCells_bitSet(const polyMesh& mesh)
+{
+    // Calculate point-cell topology
+
+    const cellList& cellLst = mesh.cells();
+    const faceList& faceLst = mesh.faces();
+
+    // For tracking (only use each point id once)
+    bitSet usedPoints(mesh.nPoints());
+
+    // Vertex labels for the current cell
+    DynamicList<label> vertices(256);
+
+    const label loopLen = mesh.nCells();
+
+    // Step 1: count number of cells per point
+
+    labelList pointCount(mesh.nPoints(), Zero);
+
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        usedPoints.unset(vertices);
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                // Only once for each point id
+                if (usedPoints.set(pointi))
+                {
+                    vertices.push_back(pointi);
+                    ++pointCount[pointi];
+                }
+            }
+        }
+    }
+
+
+    // Step 2: set sizing, reset counters
+
+    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
+    auto& pointCellAddr = *pcPtr_;
+
+    forAll(pointCellAddr, pointi)
+    {
+        pointCellAddr[pointi].resize_nocopy(pointCount[pointi]);
+        pointCount[pointi] = 0;
+    }
+
+
+    // Step 3: fill in values. Logic as per step 1
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        usedPoints.unset(vertices);
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                // Only once for each point id
+                if (usedPoints.set(pointi))
+                {
+                    vertices.push_back(pointi);
+                    pointCellAddr[pointi][pointCount[pointi]++] = celli;
+                }
+            }
+        }
+    }
+
+    return pcPtr_;
+}
+
+
+// Calculate with bitSet tracking and avoid cells::labels
+autoPtr<labelListList> cellPoints_bitSet(const polyMesh& mesh)
+{
+    // Calculate cell-point topology
+
+    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
+    auto& cellPointAddr = *cpPtr_;
+
+    const cellList& cellLst = mesh.cells();
+    const faceList& faceLst = mesh.faces();
+
+    // For tracking (only use each point id once)
+    bitSet usedPoints(mesh.nPoints());
+
+    // Vertex labels for the current cell
+    DynamicList<label> vertices(256);
+
+    const label loopLen = mesh.nCells();
+
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        usedPoints.unset(vertices);
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                // Only once for each point id
+                if (usedPoints.set(pointi))
+                {
+                    vertices.push_back(pointi);
+                }
+            }
+        }
+
+        cellPointAddr[celli] = vertices;  // unsorted
+    }
+
+    return cpPtr_;
+}
+
+
+// Calculate with linear lookup and avoid cells::labels
+autoPtr<labelListList> pointCells_linear(const polyMesh& mesh)
+{
+    // Calculate point-cell topology
+
+    const cellList& cellLst = mesh.cells();
+    const faceList& faceLst = mesh.faces();
+
+    // Vertex labels for the current cell
+    DynamicList<label> vertices(256);
+
+    const label loopLen = mesh.nCells();
+
+    // Step 1: count number of cells per point
+
+    labelList pointCount(mesh.nPoints(), Zero);
+
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                // Only once for each point id
+                if (!vertices.contains(pointi))
+                {
+                    vertices.push_back(pointi);
+                    ++pointCount[pointi];
+                }
+            }
+        }
+    }
+
+
+    // Step 2: set sizing, reset counters
+
+    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
+    auto& pointCellAddr = *pcPtr_;
+
+    forAll(pointCellAddr, pointi)
+    {
+        pointCellAddr[pointi].resize_nocopy(pointCount[pointi]);
+        pointCount[pointi] = 0;
+    }
+
+
+    // Step 3: fill in values. Logic as per step 1
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                // Only once for each point id
+                if (!vertices.contains(pointi))
+                {
+                    vertices.push_back(pointi);
+                    pointCellAddr[pointi][pointCount[pointi]++] = celli;
+                }
+            }
+        }
+    }
+
+    return pcPtr_;
+}
+
+
+// Calculate with linear lookup and avoid cells::labels
+autoPtr<labelListList> cellPoints_linear(const polyMesh& mesh)
+{
+    // Calculate cell-point topology
+
+    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
+    auto& cellPointAddr = *cpPtr_;
+
+    const cellList& cellLst = mesh.cells();
+    const faceList& faceLst = mesh.faces();
+
+    // Vertex labels for the current cell
+    DynamicList<label> vertices(256);
+
+    const label loopLen = mesh.nCells();
+
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                // Only once for each point id
+                if (!vertices.contains(pointi))
+                {
+                    vertices.push_back(pointi);
+                }
+            }
+        }
+
+        cellPointAddr[celli] = vertices;  // unsorted
+    }
+
+    return cpPtr_;
+}
+
+
+// Calculate point-cell from point-face information
+autoPtr<labelListList> pointCells_faces(const polyMesh& mesh)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+    const labelListList& pFaces = mesh.pointFaces();
+
+    const label loopLen = mesh.nPoints();
+
+    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
+    auto& pointCellAddr = *pcPtr_;
+
+    DynamicList<label> storage(256);
+
+    for (label pointi = 0; pointi < loopLen; ++pointi)
+    {
+        // Clear any previous contents
+        storage.clear();
+
+        for (const label facei : pFaces[pointi])
+        {
+            // Owner cell
+            storage.push_back(own[facei]);
+
+            // Neighbour cell
+            if (facei < mesh.nInternalFaces())
+            {
+                storage.push_back(nei[facei]);
+            }
+        }
+
+        // Sort + unique to eliminate duplicates
+        std::sort(storage.begin(), storage.end());
+        auto last = std::unique(storage.begin(), storage.end());
+        storage.resize(label(last - storage.begin()));
+
+        pointCellAddr[pointi] = storage;
+    }
+
+    return pcPtr_;
+}
+
+// Calculate point-cell from point-face information
+autoPtr<labelListList> pointCells_bitSet_faces(const polyMesh& mesh)
+{
+    const labelList& own = mesh.faceOwner();
+    const labelList& nei = mesh.faceNeighbour();
+    const labelListList& pFaces = mesh.pointFaces();
+
+    const label loopLen = mesh.nPoints();
+
+    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
+    auto& pointCellAddr = *pcPtr_;
+
+    // For tracking (only use each cell id once)
+    bitSet usedCells(mesh.nCells());
+
+    DynamicList<label> storage(256);
+
+    for (label pointi = 0; pointi < loopLen; ++pointi)
+    {
+        // Clear any previous contents
+        usedCells.unset(storage);
+        storage.clear();
+
+        for (const label facei : pFaces[pointi])
+        {
+            // Owner cell - only once
+            if (usedCells.set(own[facei]))
+            {
+                storage.push_back(own[facei]);
+            }
+
+            // Neighbour cell
+            if (facei < mesh.nInternalFaces() && usedCells.set(nei[facei]))
+            {
+                storage.push_back(nei[facei]);
+            }
+        }
+
+        pointCellAddr[pointi] = storage;
+    }
+
+    return pcPtr_;
+}
+
+
+// Calculate point-cell from cell-point information
+autoPtr<labelListList> pointCells_bitSet_alon(const polyMesh& mesh)
+{
+    autoPtr<labelListList> cellPoints = cellPoints_bitSet(mesh);
+
+    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
+
+    invertManyToMany(mesh.nPoints(), cellPoints(), *pcPtr_);
+
+    return pcPtr_;
+}
+
+
+// Eliminate duplicates with sort+unique
+autoPtr<labelListList> cellPoints_sorted(const polyMesh& mesh)
+{
+    // Calculate cell-point topology
+
+    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
+    auto& cellPointAddr = *cpPtr_;
+
+    const cellList& cellLst = mesh.cells();
+    const faceList& faceLst = mesh.faces();
+
+    // Vertex labels for the current cell
+    DynamicList<label> vertices(256);
+
+    const label loopLen = mesh.nCells();
+
+    for (label celli = 0; celli < loopLen; ++celli)
+    {
+        // Clear any previous contents
+        vertices.clear();
+
+        for (const label facei : cellLst[celli])
+        {
+            for (const label pointi : faceLst[facei])
+            {
+                vertices.push_back(pointi);
+            }
+        }
+
+        // Sort + unique to eliminate duplicates
+        std::sort(vertices.begin(), vertices.end());
+        auto last = std::unique(vertices.begin(), vertices.end());
+        vertices.resize(label(last - vertices.begin()));
+
+        cellPointAddr[celli] = vertices;
+    }
+
+    return cpPtr_;
+}
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+    argList::noFunctionObjects();
+    argList::addOption("nCells", "number", "The number of cells");
+
+    #include "setRootCase.H"
+
+    const scalar cellCount(args.getOrDefault<scalar>("nCells", 1000));
+
+    const label nDivs(::round(::cbrt(cellCount)));
+
+    PDRblock blkMesh(boundBox(zero_one{}), labelVector::uniform(nDivs));
+
+    autoPtr<Time> dummyTimePtr(Time::New());
+
+    Info<< "Requested " << cellCount
+        << " cells, blockMesh with " << blkMesh.nCells() << " cells" << nl;
+
+    autoPtr<polyMesh> meshPtr = blkMesh.innerMesh
+    (
+        IOobject
+        (
+            "Testing",
+            dummyTimePtr->system(),
+            *dummyTimePtr,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
+        )
+    );
+
+    auto& mesh = meshPtr();
+
+    printInfo(mesh);
+    printAlloc(mesh);
+
+    clockTime timing;
+
+    // pointCells
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) mesh.pointCells();
+        Info<< "pointCells (builtin): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    // cellPoints
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) mesh.cellPoints();
+        Info<< "cellPoints (builtin): " << timing.elapsedTime() << " s" << nl;
+    }
+    Info<< nl;
+
+
+    // pointCells
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_2212(mesh);
+        Info<< "pointCells (2212): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_2212mod(mesh);
+        Info<< "pointCells (2212mod): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_bitSet(mesh);
+        Info<< "pointCells (bitSet): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_linear(mesh);
+        Info<< "pointCells (linear): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_faces(mesh);
+        Info<< "pointCells (faces): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_bitSet_faces(mesh);
+        Info<< "pointCells (bitSet faces): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) pointCells_bitSet_alon(mesh);
+        Info<< "pointCells (bitSet alon): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    // cellPoints
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) cellPoints_2212(mesh);
+        Info<< "cellPoints (2212): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) cellPoints_bitSet(mesh);
+        Info<< "cellPoints (bitSet): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) cellPoints_linear(mesh);
+        Info<< "cellPoints (linear): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) cellPoints_sorted(mesh);
+        Info<< "cellPoints (sorted): " << timing.elapsedTime() << " s" << nl;
+    }
+
+
+    // With precalculated values
+    {
+        mesh.clearOut();
+        const auto& cp = mesh.cellPoints();
+        timing.resetTime();
+
+        auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
+
+        invertManyToMany(mesh.nPoints(), cp, *pcPtr_);
+
+        Info<< "pointCells (from cached cellPoints): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    // With precalculated values
+    {
+        mesh.clearOut();
+        (void)mesh.pointFaces();
+        timing.resetTime();
+
+        (void) pointCells_bitSet_faces(mesh);
+
+        Info<< "pointCells (bitSet from cached pointFaces): " << timing.elapsedTime() << " s" << nl;
+    }
+
+
+    // With precalculated values
+    {
+        mesh.clearOut();
+        const auto& pc = mesh.pointCells();
+        timing.resetTime();
+
+        auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
+
+        invertManyToMany(mesh.nCells(), pc, *cpPtr_);
+
+        Info<< "cellPoints (from cached pointCells): " << timing.elapsedTime() << " s" << nl;
+    }
+
+
+    // Re-measure timings
+    Info<< nl;
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) mesh.pointCells();
+        Info<< "pointCells (builtin): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    {
+        mesh.clearOut();
+        timing.resetTime();
+        (void) mesh.cellPoints();
+        Info<< "cellPoints (builtin): " << timing.elapsedTime() << " s" << nl;
+    }
+
+    Info<< "\nEnd\n" << nl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/triangleIntersection/Test-triangleIntersection.C b/applications/test/triangleIntersection/Test-triangleIntersection.C
index 1aca11601c..6573ec1b3e 100644
--- a/applications/test/triangleIntersection/Test-triangleIntersection.C
+++ b/applications/test/triangleIntersection/Test-triangleIntersection.C
@@ -88,8 +88,7 @@ int main(int argc, char *argv[])
     // Info<<"tree-bb faces: " << treeBoundBox::faces << nl
     //     <<"tree-bb edges: " << treeBoundBox::edges << endl;
 
-    treeBoundBox bb;
-    bb = cube(0, 1);
+    treeBoundBox bb(zero_one{});
 
     triPoints tri;
     tri.a() = point(-0.1, 0.5, 0.5);
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H
index 1373c5d754..554c93285c 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -163,6 +163,9 @@ public:
         //- Construct a bounding box containing a single initial point
         inline explicit boundBox(const point& p);
 
+        //- Construct a 0/1 unit bounding box
+        inline explicit boundBox(const Foam::zero_one);
+
         //- Construct from bound box min/max points
         inline boundBox(const point& min, const point& max);
 
@@ -291,6 +294,9 @@ public:
             //- Reset to an inverted box
             inline void reset();
 
+            //- Reset to a 0/1 unit bounding box
+            inline void reset(const Foam::zero_one);
+
             //- Reset min/max to be identical to the specified point
             inline void reset(const point& pt);
 
diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxI.H b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
index 94bd1ca6f7..4b900ae1c5 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxI.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -112,6 +112,13 @@ inline Foam::boundBox::boundBox()
 {}
 
 
+inline Foam::boundBox::boundBox(const Foam::zero_one)
+:
+    min_(point::zero),
+    max_(point::one)
+{}
+
+
 inline Foam::boundBox::boundBox(const point& p)
 :
     min_(p),
@@ -299,6 +306,13 @@ inline void Foam::boundBox::reset()
 }
 
 
+inline void Foam::boundBox::reset(const Foam::zero_one)
+{
+    min_ = point::zero;
+    max_ = point::one;
+}
+
+
 inline void Foam::boundBox::reset(const point& pt)
 {
     min_ = pt;
diff --git a/src/OpenFOAM/meshes/ijkMesh/ijkAddressing.H b/src/OpenFOAM/meshes/ijkMesh/ijkAddressing.H
index dacef4869a..1409d3b967 100644
--- a/src/OpenFOAM/meshes/ijkMesh/ijkAddressing.H
+++ b/src/OpenFOAM/meshes/ijkMesh/ijkAddressing.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ijkAddressing_H
-#define ijkAddressing_H
+#ifndef Foam_ijkAddressing_H
+#define Foam_ijkAddressing_H
 
 #include "labelVector.H"
 #include "vector.H"
diff --git a/src/OpenFOAM/meshes/ijkMesh/ijkMesh.H b/src/OpenFOAM/meshes/ijkMesh/ijkMesh.H
index 8da2879a20..dc73b1fee0 100644
--- a/src/OpenFOAM/meshes/ijkMesh/ijkMesh.H
+++ b/src/OpenFOAM/meshes/ijkMesh/ijkMesh.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ijkMesh_H
-#define ijkMesh_H
+#ifndef Foam_ijkMesh_H
+#define Foam_ijkMesh_H
 
 #include "ijkAddressing.H"
 
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
index 5b7315b3bf..a30a872250 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,6 +201,9 @@ public:
 
     // Constructors
 
+        //- Construct a 0/1 unit bounding box
+        inline explicit treeBoundBox(const Foam::zero_one);
+
         //- Construct a bounding box containing a single initial point
         inline explicit treeBoundBox(const point& p);
 
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
index 1db71c74bd..08bff3acfa 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +31,12 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+inline Foam::treeBoundBox::treeBoundBox(const Foam::zero_one)
+:
+    boundBox(zero_one{})
+{}
+
+
 inline Foam::treeBoundBox::treeBoundBox(const point& p)
 :
     boundBox(p)
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblock.C b/src/mesh/blockMesh/PDRblockMesh/PDRblock.C
index c1b6f3b6f0..5e27e50075 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblock.C
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblock.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,6 +114,22 @@ const Foam::PDRblock& Foam::PDRblock::null()
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void Foam::PDRblock::addDefaultPatches()
+{
+    // Default boundaries with patchi == shapeFacei
+    patches_.resize(6);
+    for (label patchi=0; patchi < 6; ++patchi)
+    {
+        boundaryEntry& bentry = patches_.emplace_set(patchi);
+
+        bentry.name_ = "patch" + Foam::name(patchi);
+        bentry.type_ = "patch";
+        bentry.size_ = 0;
+        bentry.faces_ = labelList(one{}, patchi);
+    }
+}
+
+
 void Foam::PDRblock::adjustSizes()
 {
     // Adjust i-j-k addressing
@@ -438,9 +454,7 @@ void Foam::PDRblock::readBoundary(const dictionary& dict)
 
         // Save information for later access during mesh creation.
 
-        patches_.set(patchi, new boundaryEntry());
-
-        boundaryEntry& bentry = patches_[patchi];
+        boundaryEntry& bentry = patches_.emplace_set(patchi);
 
         bentry.name_ = patchName;
         bentry.type_ = patchType;
@@ -462,9 +476,7 @@ void Foam::PDRblock::readBoundary(const dictionary& dict)
 
     if (missed.size())
     {
-        patches_.append(new boundaryEntry());
-
-        boundaryEntry& bentry = patches_.last();
+        boundaryEntry& bentry = patches_.emplace_back();
 
         bentry.name_ = "defaultFaces";
         bentry.type_ = emptyPolyPatch::typeName;
@@ -523,24 +535,20 @@ Foam::PDRblock::PDRblock
 :
     PDRblock(dictionary::null, false)
 {
-    // Default boundaries with patchi == shapeFacei
-    patches_.resize(6);
-    for (label patchi=0; patchi < 6; ++patchi)
-    {
-        patches_.set(patchi, new boundaryEntry());
-
-        boundaryEntry& bentry = patches_[patchi];
-
-        bentry.name_ = "patch" + Foam::name(patchi);
-        bentry.type_ = "patch";
-        bentry.size_ = 0;
-        bentry.faces_ = labelList(one{}, patchi);
-    }
-
+    addDefaultPatches();
     reset(xgrid, ygrid, zgrid);
 }
 
 
+Foam::PDRblock::PDRblock(const boundBox& box, const labelVector& nCells)
+:
+    PDRblock(dictionary::null, false)
+{
+    addDefaultPatches();
+    reset(box, nCells);
+}
+
+
 Foam::PDRblock::PDRblock(const dictionary& dict, bool verboseOutput)
 :
     ijkMesh(),
@@ -631,6 +639,28 @@ void Foam::PDRblock::reset
 }
 
 
+void Foam::PDRblock::reset(const boundBox& box, const labelVector& nCells)
+{
+    grid_.x().reset(box.min().x(), box.max().x(), nCells.x());
+    grid_.y().reset(box.min().y(), box.max().y(), nCells.y());
+    grid_.z().reset(box.min().z(), box.max().z(), nCells.z());
+
+    adjustSizes();
+
+    // Adjust boundaries
+    for (boundaryEntry& bentry : patches_)
+    {
+        bentry.size_ = 0;
+
+        // Count patch faces
+        for (const label shapeFacei : bentry.faces_)
+        {
+            bentry.size_ += nBoundaryFaces(shapeFacei);
+        }
+    }
+}
+
+
 bool Foam::PDRblock::findCell(const point& pt, labelVector& pos) const
 {
     // Out-of-bounds is handled explicitly, for efficiency and consistency,
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblock.H b/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
index d9cffa0131..a9096929f8 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblock.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,8 +65,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PDRblock_H
-#define PDRblock_H
+#ifndef Foam_PDRblock_H
+#define Foam_PDRblock_H
 
 #include "ijkMesh.H"
 #include "boundBox.H"
@@ -122,6 +122,9 @@ public:
         {
         public:
 
+            //- Reset with min/max range and number of divisions
+            void reset(const scalar low, const scalar upp, const label nCells);
+
             //- The location list is valid if it contains 2 or more points
             inline bool valid() const;
 
@@ -338,6 +341,9 @@ private:
             const UList<scalar>& pts
         );
 
+        //- Add zero-sized patches with default naming/types
+        void addDefaultPatches();
+
         //- Adjust sizing for updated grid points
         void adjustSizes();
 
@@ -440,6 +446,9 @@ public:
             const UList<scalar>& zgrid
         );
 
+        //- Construct from cube with specified griding
+        PDRblock(const boundBox& box, const labelVector& nCells);
+
         //- Construct from dictionary
         explicit PDRblock(const dictionary& dict, bool verboseOutput=false);
 
@@ -457,11 +466,14 @@ public:
             const UList<scalar>& zgrid
         );
 
+        //- Reset cube and mesh i-j-k sizing
+        void reset(const boundBox& box, const labelVector& nCells);
+
 
     // Access
 
         //- The grid point locations in the i,j,k (x,y,z) directions.
-        inline const Vector<location>& grid() const;
+        const Vector<location>& grid() const noexcept { return grid_; }
 
         //- Equivalent edge grading descriptors in (x,y,z) directions.
         Vector<gradingDescriptors> grading() const;
@@ -476,10 +488,10 @@ public:
         using ijkMesh::sizes;
 
         //- The mesh bounding box
-        inline const boundBox& bounds() const;
+        const boundBox& bounds() const noexcept { return bounds_; }
 
         //- The min/max edge length
-        inline const scalarMinMax& edgeLimits() const;
+        const scalarMinMax& edgeLimits() const noexcept { return edgeLimits_; }
 
         //- Cell size in x-direction at i position.
         inline scalar dx(const label i) const;
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C b/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C
index 5d8032a66e..13f4d8bba5 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C
@@ -252,7 +252,7 @@ Foam::Ostream& Foam::PDRblock::blockMeshDict
                 *dummyTimePtr,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false  // no register
+                IOobject::NO_REGISTER
             )
         );
 
@@ -375,7 +375,7 @@ Foam::Ostream& Foam::PDRblock::blockMeshDict
                 *dummyTimePtr,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false  // do not register
+                IOobject::NO_REGISTER
             );
 
             searchableSphere sphere(io, radialCentre, radialSizes);
@@ -796,7 +796,7 @@ void Foam::PDRblock::writeBlockMeshDict(const IOobject& io) const
             io.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false  // no register
+            IOobject::NO_REGISTER
         )
     );
 
@@ -831,7 +831,7 @@ Foam::PDRblock::createBlockMesh(const IOobject& io) const
             io.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false  // no register
+            IOobject::NO_REGISTER
         ),
         blockMeshDict()
     );
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H b/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H
index d05c279dd6..22dc919fe1 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblockI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,31 +48,31 @@ inline Foam::label Foam::PDRblock::location::nPoints() const
 
 inline bool Foam::PDRblock::location::contains(const scalar p) const
 {
-    return (scalarList::size() > 1 && first() <= p && p <= last());
+    return (scalarList::size() > 1 && front() <= p && p <= back());
 }
 
 
 inline const Foam::scalar& Foam::PDRblock::location::min() const
 {
-    return scalarList::empty() ? pTraits<scalar>::rootMax : first();
+    return scalarList::empty() ? pTraits<scalar>::rootMax : front();
 }
 
 
 inline const Foam::scalar& Foam::PDRblock::location::max() const
 {
-    return scalarList::empty() ? pTraits<scalar>::rootMin : last();
+    return scalarList::empty() ? pTraits<scalar>::rootMin : back();
 }
 
 
 inline Foam::scalar Foam::PDRblock::location::centre() const
 {
-    return scalarList::empty() ? 0 : (0.5*first() + 0.5*last());
+    return scalarList::empty() ? 0 : (0.5*front() + 0.5*back());
 }
 
 
 inline Foam::scalar Foam::PDRblock::location::length() const
 {
-    return scalarList::empty() ? 0 : mag(last() - first());
+    return scalarList::empty() ? 0 : mag(back() - front());
 }
 
 
@@ -107,12 +107,12 @@ inline Foam::scalar Foam::PDRblock::location::C(const label i) const
         #endif
 
         // "Halo" centre [-1] == x0 - 1/2 (x1 - x0)
-        return first() - 0.5*(operator[](1) - first());
+        return front() - 0.5*(operator[](1) - front());
     }
     else if (i > 1 && i == scalarList::size()-1)
     {
         // "Halo" centre [nCells] == xN + 1/2 (xN - xN1)
-        return last() + 0.5*(last() - operator[](scalarList::size()-2));
+        return back() + 0.5*(back() - operator[](scalarList::size()-2));
     }
 
     #ifdef FULLDEBUG
@@ -128,13 +128,13 @@ Foam::PDRblock::location::clip(const scalar& val) const
 {
     if (scalarList::size())
     {
-        if (val < first())
+        if (val < front())
         {
-            return first();
+            return front();
         }
-        else if (last() < val)
+        else if (back() < val)
         {
-            return last();
+            return back();
         }
     }
 
@@ -144,25 +144,6 @@ Foam::PDRblock::location::clip(const scalar& val) const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const Foam::Vector<Foam::PDRblock::location>&
-Foam::PDRblock::grid() const
-{
-    return grid_;
-}
-
-
-inline const Foam::scalarMinMax& Foam::PDRblock::edgeLimits() const
-{
-    return edgeLimits_;
-}
-
-
-inline const Foam::boundBox& Foam::PDRblock::bounds() const
-{
-    return bounds_;
-}
-
-
 inline Foam::scalar Foam::PDRblock::dx(const label i) const
 {
     return grid_.x().width(i);
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C b/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C
index 05138a4c2a..b5eb724462 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblockLocation.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -260,6 +260,29 @@ void Foam::PDRblock::gridControl::writeDict
 }
 
 
+void Foam::PDRblock::location::reset
+(
+    const scalar low,
+    const scalar upp,
+    const label nCells
+)
+{
+    scalarList& grid = *this;
+
+    grid.resize_nocopy(nCells+1);
+
+    grid.front() = low;
+    grid.back() = upp;
+
+    const scalar span = (upp - low);
+
+    for (label pointi = 1; pointi < nCells; ++pointi)
+    {
+        grid[pointi] = low + (pointi*span)/nCells;
+    }
+}
+
+
 Foam::scalarMinMax Foam::PDRblock::location::edgeLimits() const
 {
     scalarMinMax limits;

From 074749a72261e014dfffc903574ea1d378903b2a Mon Sep 17 00:00:00 2001
From: Mark OLESEN <mark.olesen@esi-group.com>
Date: Fri, 3 Mar 2023 16:36:54 +0000
Subject: [PATCH 128/348] ENH: improved point-cell and cell-point topology
 methods (#2715)

---
 .../primitiveMesh/primitiveMeshCellPoints.C   |  44 +++++-
 .../primitiveMesh/primitiveMeshPointCells.C   | 130 ++++++++++++++----
 2 files changed, 145 insertions(+), 29 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
index f400f68948..7adcae2cc6 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ License
 #include "primitiveMesh.H"
 #include "cell.H"
 #include "bitSet.H"
+#include "DynamicList.H"
 #include "ListOps.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -57,12 +58,51 @@ void Foam::primitiveMesh::calcCellPoints() const
             << "cellPoints already calculated"
             << abort(FatalError);
     }
-    else
+    else if (hasPointCells())
     {
         // Invert pointCells
         cpPtr_ = new labelListList(nCells());
         invertManyToMany(nCells(), pointCells(), *cpPtr_);
     }
+    else
+    {
+        // Calculate cell-point topology
+
+        cpPtr_ = new labelListList(nCells());
+        auto& cellPointAddr = *cpPtr_;
+
+        const cellList& cellLst = cells();
+        const faceList& faceLst = faces();
+
+        // Tracking (only use each point id once)
+        bitSet usedPoints(nPoints());
+
+        // Vertex labels for the current cell
+        DynamicList<label> currPoints(256);
+
+        const label loopLen = nCells();
+
+        for (label celli = 0; celli < loopLen; ++celli)
+        {
+            // Clear any previous contents
+            usedPoints.unset(currPoints);
+            currPoints.clear();
+
+            for (const label facei : cellLst[celli])
+            {
+                for (const label pointi : faceLst[facei])
+                {
+                    // Only once for each point id
+                    if (usedPoints.set(pointi))
+                    {
+                        currPoints.push_back(pointi);
+                    }
+                }
+            }
+
+            cellPointAddr[celli] = currPoints;  // NB: unsorted
+        }
+    }
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index 853e02d6ce..a93d23360c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,14 +29,13 @@ License
 #include "primitiveMesh.H"
 #include "cell.H"
 #include "bitSet.H"
+#include "DynamicList.H"
 #include "ListOps.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::primitiveMesh::calcPointCells() const
 {
-    // Loop through cells and mark up points
-
     if (debug)
     {
         Pout<< "primitiveMesh::calcPointCells() : "
@@ -59,48 +59,128 @@ void Foam::primitiveMesh::calcPointCells() const
             << "pointCells already calculated"
             << abort(FatalError);
     }
+    else if (hasCellPoints())
+    {
+        // Invert cellPoints
+        pcPtr_ = new labelListList(nPoints());
+        invertManyToMany(nPoints(), cellPoints(), *pcPtr_);
+    }
+    else if (hasPointFaces())
+    {
+        // Calculate point-cell from point-face information
+
+        const labelList& own = faceOwner();
+        const labelList& nei = faceNeighbour();
+        const labelListList& pFaces = pointFaces();
+
+        // Tracking (only use each cell id once)
+        bitSet usedCells(nCells());
+
+        // Cell ids for the point currently being processed
+        DynamicList<label> currCells(256);
+
+        const label loopLen = nPoints();
+
+        pcPtr_ = new labelListList(nPoints());
+        auto& pointCellAddr = *pcPtr_;
+
+        for (label pointi = 0; pointi < loopLen; ++pointi)
+        {
+            // Clear any previous contents
+            usedCells.unset(currCells);
+            currCells.clear();
+
+            for (const label facei : pFaces[pointi])
+            {
+                // Owner cell - only allow one occurance
+                if (usedCells.set(own[facei]))
+                {
+                    currCells.push_back(own[facei]);
+                }
+
+                // Neighbour cell - only allow one occurance
+                if (facei < nInternalFaces())
+                {
+                    if (usedCells.set(nei[facei]))
+                    {
+                        currCells.push_back(nei[facei]);
+                    }
+                }
+            }
+
+            pointCellAddr[pointi] = currCells;  // NB: unsorted
+        }
+    }
     else
     {
-        const cellList& cf = cells();
+        // Calculate point-cell topology
 
-        // Count number of cells per point
+        const cellList& cellLst = cells();
+        const faceList& faceLst = faces();
 
-        labelList npc(nPoints(), Zero);
+        // Tracking (only use each point id once)
+        bitSet usedPoints(nPoints());
 
-        forAll(cf, celli)
+        // Which of usedPoints needs to be unset [faster]
+        DynamicList<label> currPoints(256);
+
+        const label loopLen = nCells();
+
+        // Step 1: count number of cells per point
+
+        labelList pointCount(nPoints(), Zero);
+
+        for (label celli = 0; celli < loopLen; ++celli)
         {
-            const labelList curPoints = cf[celli].labels(faces());
+            // Clear any previous contents
+            usedPoints.unset(currPoints);
+            currPoints.clear();
 
-            forAll(curPoints, pointi)
+            for (const label facei : cellLst[celli])
             {
-                label ptI = curPoints[pointi];
-
-                npc[ptI]++;
+                for (const label pointi : faceLst[facei])
+                {
+                    // Only once for each point id
+                    if (usedPoints.set(pointi))
+                    {
+                        currPoints.push_back(pointi);  // Needed for cleanup
+                        ++pointCount[pointi];
+                    }
+                }
             }
         }
 
 
-        // Size and fill cells per point
+        // Step 2: set sizing, reset counters
 
-        pcPtr_ = new labelListList(npc.size());
-        labelListList& pointCellAddr = *pcPtr_;
+        pcPtr_ = new labelListList(nPoints());
+        auto& pointCellAddr = *pcPtr_;
 
         forAll(pointCellAddr, pointi)
         {
-            pointCellAddr[pointi].setSize(npc[pointi]);
+            pointCellAddr[pointi].resize_nocopy(pointCount[pointi]);
+            pointCount[pointi] = 0;
         }
-        npc = 0;
 
 
-        forAll(cf, celli)
+        // Step 3: fill in values. Logic as per step 1
+        for (label celli = 0; celli < loopLen; ++celli)
         {
-            const labelList curPoints = cf[celli].labels(faces());
+            // Clear any previous contents
+            usedPoints.unset(currPoints);
+            currPoints.clear();
 
-            forAll(curPoints, pointi)
+            for (const label facei : cellLst[celli])
             {
-                label ptI = curPoints[pointi];
-
-                pointCellAddr[ptI][npc[ptI]++] = celli;
+                for (const label pointi : faceLst[facei])
+                {
+                    // Only once for each point id
+                    if (usedPoints.set(pointi))
+                    {
+                        currPoints.push_back(pointi);  // Needed for cleanup
+                        pointCellAddr[pointi][pointCount[pointi]++] = celli;
+                    }
+                }
             }
         }
     }
@@ -154,12 +234,8 @@ const Foam::labelList& Foam::primitiveMesh::pointCells
         if (storage.size() > 1)
         {
             std::sort(storage.begin(), storage.end());
-
             auto last = std::unique(storage.begin(), storage.end());
-
-            const label newLen = label(last - storage.begin());
-
-            storage.resize(newLen);
+            storage.resize(label(last - storage.begin()));
         }
 
         return storage;

From 94df19a93a49fdb2812d230e5dc5fb830223500e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Mar 2023 18:12:29 +0100
Subject: [PATCH 129/348] ENH: add finiteArea outletInlet patch type

STYLE: use readValueEntry and Field assign to simplify code
---
 src/finiteArea/Make/files                     |   1 +
 .../inletOutlet/inletOutletFaPatchField.C     |  19 +-
 .../inletOutlet/inletOutletFaPatchField.H     |  66 +++---
 .../inletOutlet/inletOutletFaPatchFields.C    |  12 +-
 .../outletInlet/outletInletFaPatchField.C     | 139 +++++++++++++
 .../outletInlet/outletInletFaPatchField.H     | 190 ++++++++++++++++++
 .../outletInlet/outletInletFaPatchFields.C    |  41 ++++
 .../outletInlet/outletInletFaPatchFields.H    |  50 +++++
 .../inletOutlet/inletOutletFvPatchField.C     |  11 +-
 .../inletOutlet/inletOutletFvPatchField.H     |   6 +-
 .../outletInlet/outletInletFvPatchField.C     |  11 +-
 .../outletInlet/outletInletFvPatchField.H     |   6 +-
 12 files changed, 483 insertions(+), 69 deletions(-)
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.H

diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index 3743ff8522..a929066eed 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -62,6 +62,7 @@ $(constraintFaPatchFields)/symmetry/symmetryFaPatchFields.C
 derivedFaPatchFields = $(faPatchFields)/derived
 $(derivedFaPatchFields)/fixedValueOutflow/fixedValueOutflowFaPatchFields.C
 $(derivedFaPatchFields)/inletOutlet/inletOutletFaPatchFields.C
+$(derivedFaPatchFields)/outletInlet/outletInletFaPatchFields.C
 $(derivedFaPatchFields)/slip/slipFaPatchFields.C
 $(derivedFaPatchFields)/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
 $(derivedFaPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index 9c9749be92..001faa1012 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -40,8 +40,8 @@ Foam::inletOutletFaPatchField<Type>::inletOutletFaPatchField
     mixedFaPatchField<Type>(p, iF),
     phiName_("phi")
 {
-    this->refValue() = pTraits<Type>::zero;
-    this->refGrad() = pTraits<Type>::zero;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -71,21 +71,16 @@ Foam::inletOutletFaPatchField<Type>::inletOutletFaPatchField
     mixedFaPatchField<Type>(p, iF),
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
-    this->refValue() = Field<Type>("inletValue", dict, p.size());
+    faPatchFieldBase::readDict(dict);
 
-    if (dict.found("value"))
-    {
-        faPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    this->refValue().assign("inletValue", dict, p.size());
+
+    if (!this->readValueEntry(dict))
     {
         faPatchField<Type>::operator=(this->refValue());
     }
 
-    this->refGrad() = pTraits<Type>::zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H
index 669b0b5078..85e2c34108 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H
@@ -27,19 +27,52 @@ License
 Class
     Foam::inletOutletFaPatchField
 
-Description
+Group
+    grpOutletBoundaryConditions
 
-Author
-    Zeljko Tukovic, FMENA
-    Hrvoje Jasak, Wikki Ltd.
+Description
+    This boundary condition provides a generic outflow condition, with
+    specified inflow for the case of return flow.
+
+Usage
+    \table
+        Property     | Description             | Required    | Default value
+        phi          | Flux field name         | no          | phi
+        inletValue   | Inlet value for reverse flow | yes    |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            inletOutlet;
+        phi             phi;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    \endverbatim
+
+    The mode of operation is determined by the sign of the flux across the
+    patch edges.
+
+
+Note
+    Sign conventions:
+    - Positive flux (out of domain): apply zero-gradient condition
+    - Negative flux (into domain): apply the "inletValue" fixed-value
+
+See also
+    Foam::mixedFaPatchField
+    Foam::zeroGradientFaPatchField
+    Foam::outletInletFaPatchField
 
 SourceFiles
     inletOutletFaPatchField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef inletOutletFaPatchField_H
-#define inletOutletFaPatchField_H
+#ifndef Foam_inletOutletFaPatchField_H
+#define Foam_inletOutletFaPatchField_H
 
 #include "mixedFaPatchField.H"
 
@@ -57,11 +90,11 @@ class inletOutletFaPatchField
 :
     public mixedFaPatchField<Type>
 {
-
 protected:
 
-    // Protected data
+    // Protected Data
 
+        //- Name of flux field
         word phiName_;
 
 
@@ -136,22 +169,7 @@ public:
     virtual ~inletOutletFaPatchField() = default;
 
 
-    // Member functions
-
-        // Access
-
-            //- Return the name of phi
-            const word& phiName() const
-            {
-                return phiName_;
-            }
-
-            //- Return reference to the name of phi to allow adjustment
-            word& phiName()
-            {
-                return phiName_;
-            }
-
+    // Member Functions
 
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.C
index 8e775f4376..73132add95 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchFields.C
@@ -30,17 +30,11 @@ License
 #include "inletOutletFaPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeFaPatchFields(inletOutlet);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeFaPatchFields(inletOutlet);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C
new file mode 100644
index 0000000000..be919d76fb
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "outletInletFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    mixedFaPatchField<Type>(p, iF),
+    phiName_("phi")
+{
+    this->refValue() = *this;
+    this->refGrad() = Zero;
+    this->valueFraction() = 0.0;
+}
+
+
+template<class Type>
+Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
+(
+    const outletInletFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    mixedFaPatchField<Type>(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_)
+{}
+
+
+template<class Type>
+Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFaPatchField<Type>(p, iF),
+    phiName_(dict.getOrDefault<word>("phi", "phi"))
+{
+    faPatchFieldBase::readDict(dict);
+
+    this->refValue().assign("outletValue", dict, p.size());
+
+    if (!this->readValueEntry(dict))
+    {
+        faPatchField<Type>::operator=(this->refValue());
+    }
+
+    this->refGrad() = Zero;
+    this->valueFraction() = 0.0;
+}
+
+
+template<class Type>
+Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
+(
+    const outletInletFaPatchField<Type>& ptf
+)
+:
+    mixedFaPatchField<Type>(ptf),
+    phiName_(ptf.phiName_)
+{}
+
+
+template<class Type>
+Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
+(
+    const outletInletFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    mixedFaPatchField<Type>(ptf, iF),
+    phiName_(ptf.phiName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::outletInletFaPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const Field<scalar>& phip =
+        this->patch().template lookupPatchField<edgeScalarField>(phiName_);
+
+    this->valueFraction() = pos0(phip);
+
+    mixedFaPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::outletInletFaPatchField<Type>::write(Ostream& os) const
+{
+    faPatchField<Type>::write(os);
+    os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
+    this->refValue().writeEntry("outletValue", os);
+    faPatchField<Type>::writeValueEntry(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H
new file mode 100644
index 0000000000..47ba41fba7
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::outletInletFaPatchField
+
+Group
+    grpInletBoundaryConditions
+
+Description
+    This boundary condition provides a generic inflow condition, with
+    specified outflow for the case of reverse flow.
+
+Usage
+    \table
+        Property     | Description             | Required    | Default value
+        phi          | Flux field name         | no          | phi
+        outletValue  | Outlet value for reverse flow | yes   |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            outletInlet;
+        phi             phi;
+        outletValue     uniform 0;
+        value           uniform 0;
+    }
+    \endverbatim
+
+    The mode of operation is determined by the sign of the flux across the
+    patch edges.
+
+Note
+    Sign conventions:
+    - Positive flux (out of domain): apply the "outletValue" fixed-value
+    - Negative flux (into domain): apply zero-gradient condition
+
+See also
+    Foam::mixedFaPatchField
+    Foam::zeroGradientFaPatchField
+    Foam::inletOutletFaPatchField
+
+SourceFiles
+    outletInletFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_outletInletFaPatchField_H
+#define Foam_outletInletFaPatchField_H
+
+#include "mixedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class outletInletFaPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class outletInletFaPatchField
+:
+    public mixedFaPatchField<Type>
+{
+protected:
+
+    // Protected Data
+
+        //- Name of flux field
+        word phiName_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("outletInlet");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        outletInletFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        outletInletFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given outletInletFaPatchField onto a new patch
+        outletInletFaPatchField
+        (
+            const outletInletFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        outletInletFaPatchField
+        (
+            const outletInletFaPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new outletInletFaPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        outletInletFaPatchField
+        (
+            const outletInletFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new outletInletFaPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "outletInletFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.C
new file mode 100644
index 0000000000..95741aeeea
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.C
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "areaFields.H"
+#include "edgeFields.H"
+#include "outletInletFaPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaPatchFields(outletInlet);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.H
new file mode 100644
index 0000000000..66a88dbfbe
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_outletInletFaPatchFields_H
+#define Foam_outletInletFaPatchFields_H
+
+#include "outletInletFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(outletInlet);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 459620bf6b..c926569410 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -73,16 +73,9 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 {
     fvPatchFieldBase::readDict(dict);
 
-    this->refValue() = Field<Type>("inletValue", dict, p.size());
+    this->refValue().assign("inletValue", dict, p.size());
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<Type>::operator=(this->refValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index a1d1e522a4..0462c6bc0e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -57,7 +57,7 @@ Usage
 Note
     Sign conventions:
     - Positive flux (out of domain): apply zero-gradient condition
-    - Negative flux (into of domain): apply the "inletValue" fixed-value
+    - Negative flux (into domain): apply the "inletValue" fixed-value
 
 See also
     Foam::mixedFvPatchField
@@ -69,8 +69,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef inletOutletFvPatchField_H
-#define inletOutletFvPatchField_H
+#ifndef Foam_inletOutletFvPatchField_H
+#define Foam_inletOutletFvPatchField_H
 
 #include "mixedFvPatchField.H"
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 8c621154a3..37455d8f86 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -73,16 +73,9 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 {
     fvPatchFieldBase::readDict(dict);
 
-    this->refValue() = Field<Type>("outletValue", dict, p.size());
+    this->refValue().assign("outletValue", dict, p.size());
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<Type>::operator=(this->refValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
index 3da5df5604..1d192b571b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
@@ -57,7 +57,7 @@ Usage
 Note
     Sign conventions:
     - Positive flux (out of domain): apply the "outletValue" fixed-value
-    - Negative flux (into of domain): apply zero-gradient condition
+    - Negative flux (into domain): apply zero-gradient condition
 
 See also
     Foam::mixedFvPatchField
@@ -69,8 +69,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef outletInletFvPatchField_H
-#define outletInletFvPatchField_H
+#ifndef Foam_outletInletFvPatchField_H
+#define Foam_outletInletFvPatchField_H
 
 #include "mixedFvPatchField.H"
 

From 7e9b5dbc78293eeb852e126246c2e792586c4a6d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 3 Mar 2023 20:55:10 +0100
Subject: [PATCH 130/348] TUT: adjust height limiter and outflow BC for
 drippingChair

---
 .../lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film | 7 +++++--
 .../kinematicParcelFoam/drippingChair/system/faOptions     | 2 +-
 .../kinematicParcelFoam/drippingChair/system/faSolution    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film
index 188fdf3d86..88e88d1b1f 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/0/Uf_film
@@ -30,8 +30,11 @@ boundaryField
 
     bottom
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        // zeroGradient is probably enough
+        type            inletOutlet;
+        phi             phif_film;
+        value           $internalField;
+        inletValue      uniform (0 0 0);
     }
 
     frontAndBack
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions
index 1b5496e093..51c50f73d1 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faOptions
@@ -34,7 +34,7 @@ limitHeight1
     region      velocityFilmShell;
     h           hf_film;
     selectionMode all;
-    max         0.001;
+    max         0.005;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution
index 7c7a368e42..a0420a40f7 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution
+++ b/tutorials/lagrangian/kinematicParcelFoam/drippingChair/system/faSolution
@@ -43,8 +43,8 @@ PIMPLE
 
 relaxationFactors
 {
-    hf_Film    1;
-    Uf_Film    1;
+    hf_film    1;
+    Uf_film    1;
 }
 
 

From 063227baed03236cd97cbc32d10de84e7840f50e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 30 Jan 2023 17:03:01 +0100
Subject: [PATCH 131/348] ENH: support readOption handling for patch fields
 (base level)

- constructing with valueRequired as a bool is still supported,
  but now also support more refined requirements
  (eg, NO_READ, MUST_READ, LAZY_READ)

- continue with LAZY_READ for finite-area fields
---
 .../basic/value/valuePointPatchField.C        | 18 ++------
 .../basic/value/valuePointPatchField.H        | 21 ++++++++-
 .../basic/mixed/mixedFaPatchField.C           | 43 +++++++++++--------
 .../basic/mixed/mixedFaPatchField.H           |  6 ++-
 .../faPatchFields/faPatchField/faPatchField.C | 13 ++----
 .../faPatchFields/faPatchField/faPatchField.H |  8 ++--
 .../faePatchField/faePatchField.C             | 12 ++----
 .../faePatchField/faePatchField.H             |  7 ++-
 .../basic/mixed/mixedFvPatchField.C           | 20 ++++++---
 .../basic/mixed/mixedFvPatchField.H           |  6 ++-
 .../fvPatchFields/fvPatchField/fvPatchField.C | 19 +-------
 .../fvPatchFields/fvPatchField/fvPatchField.H | 21 ++++++++-
 .../fvsPatchField/fvsPatchField.C             | 19 +-------
 .../fvsPatchField/fvsPatchField.H             | 21 ++++++++-
 14 files changed, 129 insertions(+), 105 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index e47b18e14a..5bbad239ef 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -84,29 +84,17 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     pointPatchField<Type>(p, iF, dict),
     Field<Type>(p.size())
 {
-    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-    if (hasValue)
-    {
-        Field<Type>::assign(*hasValue, p.size());
-    }
-    else if (!valueRequired)
+    if (!readValueEntry(dict, requireValue))
     {
+        // Not read (eg, optional and missing): define zero
         Field<Type>::operator=(Zero);
     }
-    else
-    {
-        FatalIOErrorInFunction(dict)
-            << "Essential entry 'value' missing on patch "
-            << p.name() << endl
-            << exit(FatalIOError);
-    }
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index f49bce09a0..c551a4ed93 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -101,10 +101,27 @@ public:
         (
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
-            const dictionary&,
-            const bool valueRequired=true
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Construct, forwarding to readOption variant
+        valuePointPatchField
+        (
+            const pointPatch& p,
+            const DimensionedField<Type, pointMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            valuePointPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping given patch field onto a new patch
         valuePointPatchField
         (
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index b1216ad42f..3b3dab4735 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -95,6 +95,32 @@ Foam::mixedFaPatchField<Type>::mixedFaPatchField
 {}
 
 
+template<class Type>
+Foam::mixedFaPatchField<Type>::mixedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict,
+    IOobjectOption::readOption requireMixed
+)
+:
+    // The "value" entry is not required
+    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    refValue_(p.size()),
+    refGrad_(p.size()),
+    valueFraction_(p.size())
+{
+    if (!readMixedEntries(dict, requireMixed))
+    {
+        // Not read (eg, optional and missing): no evaluate possible/need
+        return;
+    }
+
+    // Could also check/clamp fraction to 0-1 range
+    evaluate();
+}
+
+
 template<class Type>
 Foam::mixedFaPatchField<Type>::mixedFaPatchField
 (
@@ -111,23 +137,6 @@ Foam::mixedFaPatchField<Type>::mixedFaPatchField
 {}
 
 
-template<class Type>
-Foam::mixedFaPatchField<Type>::mixedFaPatchField
-(
-    const faPatch& p,
-    const DimensionedField<Type, areaMesh>& iF,
-    const dictionary& dict
-)
-:
-    faPatchField<Type>(p, iF),
-    refValue_("refValue", dict, p.size()),
-    refGrad_("refGradient", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size())
-{
-    evaluate();
-}
-
-
 template<class Type>
 Foam::mixedFaPatchField<Type>::mixedFaPatchField
 (
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
index e635690c1f..1acf6eaf0b 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
@@ -79,7 +79,6 @@ class mixedFaPatchField
         //- Fraction (0-1) of value used for boundary condition
         scalarField valueFraction_;
 
-
 protected:
 
         //- Read the "refValue", "refGradient" and "valueFraction" entries
@@ -115,7 +114,10 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&
+            const dictionary&,
+            //! The "refValue", "refGradient", "valueFraction" entries
+            //! (default: mandatory)
+            IOobjectOption::readOption requireMixed = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given mixedFaPatchField onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index 8f04bb6514..c1ba7ffb4f 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -114,23 +114,16 @@ Foam::faPatchField<Type>::faPatchField
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     faPatchFieldBase(p, dict),
     Field<Type>(p.size()),
     internalField_(iF)
 {
-    /// if (valueRequired) - not yet needed. Already a lazy evaluation
-
-    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-    if (hasValue)
-    {
-        Field<Type>::assign(*hasValue, p.size());
-    }
-    else
+    if (!readValueEntry(dict, requireValue))
     {
+        // Not read (eg, optional and missing): define zero
         Field<Type>::operator=(Zero);
     }
 }
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index 7025ed2b63..e34d725005 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -297,13 +297,15 @@ public:
             Field<Type>&& pfld
         );
 
-        //- Construct from patch, internal field and dictionary
+        //- Construct from patch, internal field and dictionary.
+        //  \note older versions have always treated "value" as optional
         faPatchField
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&,
-            const bool valueRequired=true
+            const dictionary& dict,
+            //! The "value" entry (default: optional)
+            IOobjectOption::readOption requireValue = IOobjectOption::LAZY_READ
         );
 
         //- Construct by mapping the given faPatchField onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
index 26cfa178c9..45c84aae51 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
@@ -112,21 +112,17 @@ Foam::faePatchField<Type>::faePatchField
 (
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption requireValue
 )
 :
     faePatchFieldBase(p, dict),
     Field<Type>(p.size()),
     internalField_(iF)
 {
-    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-    if (hasValue)
-    {
-        Field<Type>::assign(*hasValue, p.size());
-    }
-    else
+    if (!readValueEntry(dict, requireValue))
     {
+        // Not read (eg, optional and missing): define zero
         Field<Type>::operator=(Zero);
     }
 }
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index 69c355333c..297eeacc37 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -259,11 +259,14 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  \note older versions have always treated "value" as optional
         faePatchField
         (
             const faPatch&,
             const DimensionedField<Type, edgeMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption requireValue = IOobjectOption::LAZY_READ
         );
 
         //- Construct by mapping the given faePatchField onto a new patch
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 4be6c72ed6..e8f4c61efb 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -101,16 +101,24 @@ Foam::mixedFvPatchField<Type>::mixedFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption requireMixed
 )
 :
-    fvPatchField<Type>(p, iF, dict, false),
-    refValue_("refValue", dict, p.size()),
-    refGrad_("refGradient", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size()),
+    // The "value" entry is not required
+    fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    refValue_(p.size()),
+    refGrad_(p.size()),
+    valueFraction_(p.size()),
     source_(p.size(), Zero)
 {
-    // Could also check/clip fraction to 0-1 range
+    if (!readMixedEntries(dict, requireMixed))
+    {
+        // Not read (eg, optional and missing): no evaluate possible/need
+        return;
+    }
+
+    // Could also check/clamp fraction to 0-1 range
     evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index 3181d45b9c..87c2f8b5c3 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -103,7 +103,6 @@ class mixedFvPatchField
         //- Source field
         Field<Type> source_;
 
-
 protected:
 
         //- Read the 'refValue', 'refGradient' and 'valueFraction' entries
@@ -139,7 +138,10 @@ public:
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
-            const dictionary&
+            const dictionary&,
+            //! The "refValue", "refGradient", "valueFraction" entries
+            //! (default: mandatory)
+            IOobjectOption::readOption requireMixed = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given mixedFvPatchField onto a new patch
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index d8d50701e8..5803bce2d3 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -144,29 +144,14 @@ Foam::fvPatchField<Type>::fvPatchField
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     fvPatchFieldBase(p, dict),
     Field<Type>(p.size()),
     internalField_(iF)
 {
-    if (valueRequired)
-    {
-        const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-        if (hasValue)
-        {
-            Field<Type>::assign(*hasValue, p.size());
-        }
-        else
-        {
-            FatalIOErrorInFunction(dict)
-                << "Essential entry 'value' missing on patch "
-                << p.name() << endl
-                << exit(FatalIOError);
-        }
-    }
+    readValueEntry(dict, requireValue);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index cf86b37bd7..cf4627449c 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -351,10 +351,27 @@ public:
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
-            const dictionary&,
-            const bool valueRequired=true
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Construct, forwarding to readOption variant
+        fvPatchField
+        (
+            const fvPatch& p,
+            const DimensionedField<Type, volMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            fvPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping the given fvPatchField onto a new patch
         fvPatchField
         (
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 8997ac61fc..579c35a7b3 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -116,29 +116,14 @@ Foam::fvsPatchField<Type>::fvsPatchField
     const fvPatch& p,
     const DimensionedField<Type, surfaceMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     fvsPatchFieldBase(p, dict),
     Field<Type>(p.size()),
     internalField_(iF)
 {
-    if (valueRequired)
-    {
-        const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-        if (hasValue)
-        {
-            Field<Type>::assign(*hasValue, p.size());
-        }
-        else
-        {
-            FatalIOErrorInFunction(dict)
-                << "Essential entry 'value' missing on patch "
-                << p.name() << endl
-                << exit(FatalIOError);
-        }
-    }
+    readValueEntry(dict, requireValue);
 }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 3527c89dfb..b722f5d24d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -258,10 +258,27 @@ public:
         (
             const fvPatch&,
             const DimensionedField<Type, surfaceMesh>&,
-            const dictionary&,
-            const bool valueRequired=true
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Construct, forwarding to readOption variant
+        fvsPatchField
+        (
+            const fvPatch& p,
+            const DimensionedField<Type, surfaceMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            fvsPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping the given fvsPatchField onto a new patch
         fvsPatchField
         (

From 42dba36832ef920ec5d7df5e8d51aaa5c343d95f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 2 Jan 2023 09:33:00 +0100
Subject: [PATCH 132/348] ENH: consistent handling of "value" for faePatchField

- base level now explicity equivalent to LAZY_READ with overriding as
  required

- clearer documentation for reading of "value" for faPatchField
---
 .../basicSymmetry/basicSymmetryFaPatchField.H |  4 +-
 .../basic/calculated/calculatedFaPatchField.C | 33 +++++++-------
 .../basic/calculated/calculatedFaPatchField.H | 10 +++--
 .../basic/coupled/coupledFaPatchField.C       |  5 ++-
 .../basic/coupled/coupledFaPatchField.H       | 11 ++---
 .../fixedGradient/fixedGradientFaPatchField.C |  3 +-
 .../fixedGradient/fixedGradientFaPatchField.H | 23 +++++-----
 .../basic/fixedValue/fixedValueFaPatchField.C |  6 +--
 .../basic/fixedValue/fixedValueFaPatchField.H | 10 +++--
 .../basic/mixed/mixedFaPatchField.C           |  3 +-
 .../basic/mixed/mixedFaPatchField.H           |  5 ++-
 .../basic/transform/transformFaPatchField.C   |  2 +-
 .../basic/transform/transformFaPatchField.H   |  3 +-
 .../zeroGradient/zeroGradientFaPatchField.C   |  7 +--
 .../constraint/cyclic/cyclicFaPatchField.C    | 10 +++--
 .../constraint/cyclic/cyclicFaPatchField.H    |  6 ++-
 .../constraint/empty/emptyFaPatchField.C      | 15 +++----
 .../processor/processorFaPatchField.C         |  8 +++-
 .../symmetry/symmetryFaPatchField.H           |  6 +--
 .../constraint/wedge/wedgeFaPatchField.H      |  6 +--
 .../clampedPlate/clampedPlateFaPatchField.C   | 13 +++---
 .../clampedPlate/clampedPlateFaPatchField.H   |  8 ++--
 .../edgeNormalFixedValueFaPatchVectorField.C  | 44 +++++++++++++------
 .../edgeNormalFixedValueFaPatchVectorField.H  | 17 ++++---
 .../fixedValueOutflowFaPatchField.H           |  2 +-
 .../inletOutlet/inletOutletFaPatchField.C     |  8 ++--
 .../derived/slip/slipFaPatchField.C           |  2 +-
 .../derived/slip/slipFaPatchField.H           |  7 +--
 ...timeVaryingUniformFixedValueFaPatchField.C |  3 +-
 .../calculated/calculatedFaePatchField.C      |  8 ++--
 .../calculated/calculatedFaePatchField.H      |  6 ++-
 .../basic/coupled/coupledFaePatchField.C      |  5 ++-
 .../basic/coupled/coupledFaePatchField.H      |  4 +-
 .../fixedValue/fixedValueFaePatchField.C      |  6 ++-
 .../fixedValue/fixedValueFaePatchField.H      |  6 ++-
 .../constraint/empty/emptyFaePatchField.C     | 15 +++----
 .../processor/processorFaePatchField.C        |  2 +-
 .../symmetry/symmetryFaePatchField.C          |  2 +-
 .../symmetry/symmetryFaePatchField.H          |  1 +
 39 files changed, 193 insertions(+), 142 deletions(-)

diff --git a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
index f16b52a621..8e29f1b3bf 100644
--- a/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
@@ -71,6 +71,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: NO_READ
         basicSymmetryFaPatchField
         (
             const faPatch&,
@@ -78,7 +79,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given basicSymmetryFaPatchField onto a new patch
+        //- Construct by mapping given basicSymmetryFaPatchField
+        //- onto a new patch
         basicSymmetryFaPatchField
         (
             const basicSymmetryFaPatchField<Type>&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
index f266ca1457..7e9ddfa6b1 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ const Foam::word& Foam::faPatchField<Type>::calculatedType()
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
 Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
@@ -51,6 +51,19 @@ Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
 {}
 
 
+template<class Type>
+Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
+)
+:
+    faPatchField<Type>(p, iF, dict, valueRequired)
+{}
+
+
 template<class Type>
 Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
 (
@@ -64,18 +77,6 @@ Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
 {}
 
 
-template<class Type>
-Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
-(
-    const faPatch& p,
-    const DimensionedField<Type, areaMesh>& iF,
-    const dictionary& dict
-)
-:
-    faPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
-{}
-
-
 template<class Type>
 Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
 (
@@ -98,10 +99,10 @@ Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
 
 
 template<class Type>
-template<class Type2>
+template<class AnyType>
 Foam::tmp<Foam::faPatchField<Type>> Foam::faPatchField<Type>::NewCalculatedType
 (
-    const faPatchField<Type2>& pf
+    const faPatchField<AnyType>& pf
 )
 {
     auto* patchTypeCtor = patchConstructorTable(pf.patch().type());
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
index e800cb7a0c..a6d93302e9 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedFaPatchField_H
-#define calculatedFaPatchField_H
+#ifndef Foam_calculatedFaPatchField_H
+#define Foam_calculatedFaPatchField_H
 
 #include "faPatchField.H"
 
@@ -56,7 +57,6 @@ class calculatedFaPatchField
 :
     public faPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -77,7 +77,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "value" entry (default: optional)
+            IOobjectOption::readOption valueRequired = IOobjectOption::LAZY_READ
         );
 
         //- Construct by mapping given patch field onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
index 8ac312d804..321c607100 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
@@ -73,11 +73,12 @@ Foam::coupledFaPatchField<Type>::coupledFaPatchField
 (
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
 )
 :
     lduInterfaceField(refCast<const lduInterface>(p, dict)),
-    faPatchField<Type>(p, iF, dict)
+    faPatchField<Type>(p, iF, dict, valueRequired)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
index 8a861d4549..57416d3c44 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef coupledFaPatchField_H
-#define coupledFaPatchField_H
+#ifndef Foam_coupledFaPatchField_H
+#define Foam_coupledFaPatchField_H
 
 #include "lduInterfaceField.H"
 #include "faPatchField.H"
@@ -60,7 +60,6 @@ class coupledFaPatchField
     public lduInterfaceField,
     public faPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -89,7 +88,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given coupledFaPatchField onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
index e8f6af1c07..88c2bde870 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fixedGradientFaPatchField.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -63,7 +64,7 @@ Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
     const dictionary& dict
 )
 :
-    faPatchField<Type>(p, iF),
+    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     gradient_("gradient", dict, p.size())
 {
     evaluate();
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
index a7c959c76b..0c38a45a41 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
@@ -129,20 +129,19 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Return defining fields
+        //- The reference gradient at boundary
+        virtual Field<Type>& gradient() noexcept
+        {
+            return gradient_;
+        }
 
-            //- Return gradient at boundary
-            virtual Field<Type>& gradient()
-            {
-                return gradient_;
-            }
-
-            virtual const Field<Type>& gradient() const
-            {
-                return gradient_;
-            }
+        //- The reference gradient at boundary
+        virtual const Field<Type>& gradient() const noexcept
+        {
+            return gradient_;
+        }
 
 
         // Mapping functions
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
index 9b786c0c8c..28c18cd859 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
@@ -45,10 +45,11 @@ Foam::fixedValueFaPatchField<Type>::fixedValueFaPatchField
 (
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
 )
 :
-    faPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    faPatchField<Type>(p, iF, dict, valueRequired)
 {}
 
 
@@ -137,5 +138,4 @@ void Foam::fixedValueFaPatchField<Type>::write(Ostream& os) const
 }
 
 
-
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
index a0ead76291..3788cc1058 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValueFaPatchField_H
-#define fixedValueFaPatchField_H
+#ifndef Foam_fixedValueFaPatchField_H
+#define Foam_fixedValueFaPatchField_H
 
 #include "faPatchField.H"
 
@@ -56,7 +57,6 @@ class fixedValueFaPatchField
 :
     public faPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -77,7 +77,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&
+            const dictionary&,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given fixedValue patch field
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index 3b3dab4735..36defc1d88 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -188,8 +188,7 @@ void Foam::mixedFaPatchField<Type>::rmap
 {
     faPatchField<Type>::rmap(ptf, addr);
 
-    const mixedFaPatchField<Type>& mptf =
-        refCast<const mixedFaPatchField<Type>>(ptf);
+    const auto& mptf = refCast<const mixedFaPatchField<Type>>(ptf);
 
     refValue_.rmap(mptf.refValue_, addr);
     refGrad_.rmap(mptf.refGrad_, addr);
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
index 1acf6eaf0b..c64af5442f 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
@@ -234,7 +234,8 @@ public:
             //- Evaluate the patch field
             virtual void evaluate
             (
-                const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+                const Pstream::commsTypes commsType =
+                    Pstream::commsTypes::blocking
             );
 
             //- Return the matrix diagonal coefficients corresponding to the
@@ -264,7 +265,7 @@ public:
         virtual void write(Ostream&) const;
 
 
-    // Member operators
+    // Member Operators
 
         virtual void operator=(const UList<Type>&) {}
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.C
index cd270f9325..a5da3c9ef6 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.C
@@ -62,7 +62,7 @@ Foam::transformFaPatchField<Type>::transformFaPatchField
     const dictionary& dict
 )
 :
-    faPatchField<Type>(p, iF, dict)
+    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
index cfc991aba1..7915ed2fc1 100644
--- a/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H
@@ -73,7 +73,8 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct from patch, internal field and dictionary
+        //- Construct from patch, internal field and dictionary.
+        //  The "value" entry: NO_READ
         transformFaPatchField
         (
             const faPatch&,
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
index 862d37c85a..1465c0a8c3 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
@@ -68,12 +68,13 @@ Foam::zeroGradientFaPatchField<Type>::zeroGradientFaPatchField
 (
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
-    const dictionary&
+    const dictionary& dict
 )
 :
-    faPatchField<Type>(p, iF)
+    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    faPatchField<Type>::operator=(this->patchInternalField());
+    // Set to the internal field
+    faPatchField<Type>::patchInternalField(*this);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
index be981c5518..e27ad11d7a 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
@@ -72,10 +72,11 @@ Foam::cyclicFaPatchField<Type>::cyclicFaPatchField
 (
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
 )
 :
-    coupledFaPatchField<Type>(p, iF, dict),
+    coupledFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     cyclicPatch_(refCast<const cyclicFaPatch>(p, dict))
 {
     if (!isA<cyclicFaPatch>(p))
@@ -89,7 +90,10 @@ Foam::cyclicFaPatchField<Type>::cyclicFaPatchField
             << exit(FatalIOError);
     }
 
-    this->evaluate(Pstream::commsTypes::blocking);
+    if (IOobjectOption::isReadRequired(valueRequired))
+    {
+        this->evaluate(Pstream::commsTypes::blocking);
+    }
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
index f30eae96fe..b81064f795 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
@@ -62,7 +62,7 @@ class cyclicFaPatchField
     virtual public cyclicLduInterfaceField,
     public coupledFaPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the cyclic patch
         const cyclicFaPatch& cyclicPatch_;
@@ -98,7 +98,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! Evaluate (default: mandatory)
+            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping given cyclicFaPatchField onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C
index d2ee6e7e14..b7cc020fe8 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C
@@ -38,7 +38,7 @@ Foam::emptyFaPatchField<Type>::emptyFaPatchField
     const DimensionedField<Type, areaMesh>& iF
 )
 :
-    faPatchField<Type>(p, iF, Field<Type>(0))
+    faPatchField<Type>(p, iF, Field<Type>())
 {}
 
 
@@ -51,7 +51,7 @@ Foam::emptyFaPatchField<Type>::emptyFaPatchField
     const faPatchFieldMapper&
 )
 :
-    faPatchField<Type>(p, iF, Field<Type>(0))
+    faPatchField<Type>(p, iF, Field<Type>())
 {
     if (!isType<emptyFaPatch>(p))
     {
@@ -74,7 +74,7 @@ Foam::emptyFaPatchField<Type>::emptyFaPatchField
     const dictionary& dict
 )
 :
-    faPatchField<Type>(p, iF, Field<Type>(0))
+    faPatchField<Type>(p, iF, Field<Type>())
 {
     if (!isA<emptyFaPatch>(p))
     {
@@ -95,12 +95,7 @@ Foam::emptyFaPatchField<Type>::emptyFaPatchField
     const emptyFaPatchField<Type>& ptf
 )
 :
-    faPatchField<Type>
-    (
-        ptf.patch(),
-        ptf.internalField(),
-        Field<Type>(0)
-    )
+    faPatchField<Type>(ptf.patch(), ptf.internalField(), Field<Type>())
 {}
 
 
@@ -111,7 +106,7 @@ Foam::emptyFaPatchField<Type>::emptyFaPatchField
     const DimensionedField<Type, areaMesh>& iF
 )
 :
-    faPatchField<Type>(ptf.patch(), iF, Field<Type>(0))
+    faPatchField<Type>(ptf.patch(), iF, Field<Type>())
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index a1b1c1eb2e..d65ea2637d 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -101,7 +101,7 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
     const dictionary& dict
 )
 :
-    coupledFaPatchField<Type>(p, iF, dict),
+    coupledFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     procPatch_(refCast<const processorFaPatch>(p, dict)),
     sendRequest_(-1),
     recvRequest_(-1)
@@ -116,6 +116,12 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
             << " in file " << this->internalField().objectPath()
             << exit(FatalIOError);
     }
+
+    // Use 'value' supplied, or set to internal field
+    if (!this->readValueEntry(dict))
+    {
+        faPatchField<Type>::patchInternalField(*this);
+    }
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.H
index b128b40989..7233d56e89 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef symmetryFaPatchField_H
-#define symmetryFaPatchField_H
+#ifndef Foam_symmetryFaPatchField_H
+#define Foam_symmetryFaPatchField_H
 
 #include "basicSymmetryFaPatchField.H"
 #include "symmetryFaPatch.H"
@@ -58,7 +58,6 @@ class symmetryFaPatchField
 :
     public basicSymmetryFaPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -75,6 +74,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: NO_READ
         symmetryFaPatchField
         (
             const faPatch&,
diff --git a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchField.H
index eb3e1c30f3..f1933ec1ab 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchField.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wedgeFaPatchField_H
-#define wedgeFaPatchField_H
+#ifndef Foam_wedgeFaPatchField_H
+#define Foam_wedgeFaPatchField_H
 
 #include "transformFaPatchField.H"
 #include "wedgeFaPatch.H"
@@ -58,7 +58,6 @@ class wedgeFaPatchField
 :
     public transformFaPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -75,6 +74,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: NO_READ
         wedgeFaPatchField
         (
             const faPatch&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
index d6fb84c4ed..77fde57095 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
@@ -56,7 +56,7 @@ clampedPlateFaPatchField<Type>::clampedPlateFaPatchField
     const dictionary& dict
 )
 :
-    faPatchField<Type>(p, iF)
+    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
     faPatchField<Type>::operator=(this->patchInternalField());
 }
@@ -113,14 +113,13 @@ void clampedPlateFaPatchField<scalar>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    Field<scalar>::operator=(pTraits<scalar>::zero);
+    Field<scalar>::operator=(Zero);
 
-    const labelUList& edgeFaces = this->patch().edgeFaces();
-    forAll(edgeFaces, edgeID)
+    auto& iF = const_cast<Field<scalar>&>(this->primitiveField());
+
+    for (const label facei : this->patch().edgeFaces())
     {
-        label faceID = edgeFaces[edgeID];
-        const_cast<Field<scalar>&>(this->primitiveField())[faceID] =
-            pTraits<scalar>::zero;
+        iF[facei] = Zero;
     }
 
     faPatchField<scalar>::evaluate();
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
index acce423a43..de365d612c 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
@@ -27,7 +27,7 @@ Class
     Foam::clampedPlateFaPatchField
 
 Description
-    This BC provides a clamped BC. It sets zero fixe value and zeroGradient.
+    This BC provides a clamped BC. It sets zero fixed value and zeroGradient.
 
 Usage
     Example of the boundary condition specification:
@@ -91,6 +91,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: NO_READ
         clampedPlateFaPatchField
         (
             const faPatch&,
@@ -143,9 +144,8 @@ public:
         }
 
 
-     //- Destructor
-    virtual ~clampedPlateFaPatchField()
-    {}
+    //- Destructor
+    virtual ~clampedPlateFaPatchField() = default;
 
 
     // Member Functions
diff --git a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
index 541dd89b0f..15b6fc9583 100644
--- a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
@@ -40,7 +40,20 @@ edgeNormalFixedValueFaPatchVectorField
 )
 :
     fixedValueFaPatchVectorField(p, iF),
-    refValue_(p.size(), 0)
+    refValue_(p.size(), Zero)
+{}
+
+
+Foam::edgeNormalFixedValueFaPatchVectorField::
+edgeNormalFixedValueFaPatchVectorField
+(
+    const faPatch& p,
+    const DimensionedField<vector, areaMesh>& iF,
+    const scalar refValue
+)
+:
+    fixedValueFaPatchVectorField(p, iF),
+    refValue_(p.size(), refValue)
 {}
 
 
@@ -66,9 +79,13 @@ edgeNormalFixedValueFaPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFaPatchVectorField(p, iF, dict),
+    fixedValueFaPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     refValue_("refValue", dict, p.size())
-{}
+{
+    tmp<vectorField> tvalues(refValue_*patch().edgeNormals());
+
+    faPatchVectorField::operator=(tvalues);
+}
 
 
 Foam::edgeNormalFixedValueFaPatchVectorField::
@@ -128,7 +145,10 @@ void Foam::edgeNormalFixedValueFaPatchVectorField::updateCoeffs()
         return;
     }
 
-    operator==(refValue_*patch().edgeNormals());
+    tmp<vectorField> tvalues(refValue_*patch().edgeNormals());
+
+    faPatchVectorField::operator=(tvalues);
+    faPatchVectorField::updateCoeffs();
 }
 
 
@@ -139,18 +159,16 @@ void Foam::edgeNormalFixedValueFaPatchVectorField::write(Ostream& os) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-makeFaPatchTypeField
-(
-    faPatchVectorField,
-    edgeNormalFixedValueFaPatchVectorField
-);
-
-} // End namespace Foam
+    makeFaPatchTypeField
+    (
+        faPatchVectorField,
+        edgeNormalFixedValueFaPatchVectorField
+    );
+}
 
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.H b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.H
index 08c9eed5a3..dd4718cd35 100644
--- a/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.H
@@ -60,9 +60,9 @@ class edgeNormalFixedValueFaPatchVectorField
 :
     public fixedValueFaPatchVectorField
 {
-    // Private data
+    // Private Data
 
-        //- Surface-normal velocity value
+        //- Edge-normal velocity value
         scalarField refValue_;
 
 
@@ -81,6 +81,14 @@ public:
             const DimensionedField<vector, areaMesh>&
         );
 
+        //- Construct from patch, internal field and reference value
+        edgeNormalFixedValueFaPatchVectorField
+        (
+            const faPatch&,
+            const DimensionedField<vector, areaMesh>&,
+            const scalar refValue
+        );
+
         //- Construct from patch, internal field and dictionary
         edgeNormalFixedValueFaPatchVectorField
         (
@@ -89,9 +97,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given
-        //  edgeNormalFixedValueFaPatchVectorField
-        //  onto a new patch
+        //- Construct by mapping given edgeNormalFixedValueFaPatchVectorField
+        //- onto a new patch
         edgeNormalFixedValueFaPatchVectorField
         (
             const edgeNormalFixedValueFaPatchVectorField&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
index ffbf7b22ba..cc90c9ddf0 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
@@ -56,7 +56,6 @@ class fixedValueOutflowFaPatchField
 :
     public faPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -73,6 +72,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: MUST_READ
         fixedValueOutflowFaPatchField
         (
             const faPatch&,
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index 001faa1012..cf626198f4 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,11 +68,11 @@ Foam::inletOutletFaPatchField<Type>::inletOutletFaPatchField
     const dictionary& dict
 )
 :
-    mixedFaPatchField<Type>(p, iF),
+    // No reading of refValue, refGradient, valueFraction entries
+    mixedFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
-    faPatchFieldBase::readDict(dict);
-
+    // Require inletValue (MUST_READ)
     this->refValue().assign("inletValue", dict, p.size());
 
     if (!this->readValueEntry(dict))
diff --git a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.C
index 4d9708aad7..a6e2e3fc1b 100644
--- a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.C
@@ -36,7 +36,7 @@ Foam::slipFaPatchField<Type>::slipFaPatchField
     const DimensionedField<Type, areaMesh>& iF
 )
 :
-   basicSymmetryFaPatchField<Type>(p, iF)
+    basicSymmetryFaPatchField<Type>(p, iF)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.H
index b245e636c5..f140258de0 100644
--- a/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef slipFaPatchField_H
-#define slipFaPatchField_H
+#ifndef Foam_slipFaPatchField_H
+#define Foam_slipFaPatchField_H
 
 #include "basicSymmetryFaPatchField.H"
 
@@ -58,7 +58,6 @@ class slipFaPatchField
 :
     public basicSymmetryFaPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -75,6 +74,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: NO_READ
         slipFaPatchField
         (
             const faPatch&,
@@ -125,6 +125,7 @@ public:
             );
         }
 
+
     //- Destructor
     virtual ~slipFaPatchField() = default;
 };
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
index 2abee7d91c..7629080fa8 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +53,7 @@ timeVaryingUniformFixedValueFaPatchField
     const dictionary& dict
 )
 :
-    fixedValueFaPatchField<Type>(p, iF),
+    fixedValueFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     timeSeries_(dict)
 {
    if (dict.found("value"))
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
index d27fa0bfa6..181683faa7 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,7 @@ const Foam::word& Foam::faePatchField<Type>::calculatedType()
     return Foam::calculatedFaePatchField<Type>::typeName;
 }
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -68,10 +69,11 @@ Foam::calculatedFaePatchField<Type>::calculatedFaePatchField
 (
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
 )
 :
-    faePatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    faePatchField<Type>(p, iF, dict, valueRequired)
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
index f2343d1f3f..61d3b13a64 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,7 +77,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, edgeMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping given patch field onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
index 0e8f5ef63e..5cd1efeef7 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
@@ -70,10 +70,11 @@ Foam::coupledFaePatchField<Type>::coupledFaePatchField
 (
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
 )
 :
-    faePatchField<Type>(p, iF, dict)
+    faePatchField<Type>(p, iF, dict, valueRequired)
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
index a92fb3f175..f119f21e85 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
@@ -86,7 +86,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, edgeMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "value" entry (default: optional)
+            IOobjectOption::readOption valueRequired = IOobjectOption::LAZY_READ
         );
 
         //- Construct by mapping the given coupledFaePatchField onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
index 0455efdbcf..d6e9b19c99 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,10 +46,11 @@ Foam::fixedValueFaePatchField<Type>::fixedValueFaePatchField
 (
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption valueRequired
 )
 :
-    faePatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    faePatchField<Type>(p, iF, dict, valueRequired)
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
index 7d36b4d063..beb7d4c751 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,7 +77,9 @@ public:
         (
             const faPatch&,
             const DimensionedField<Type, edgeMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "value" entry (default: mandatory)
+            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given fixedValue patch field
diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C
index 4a282b0b8b..3032a855ed 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.C
@@ -37,7 +37,7 @@ Foam::emptyFaePatchField<Type>::emptyFaePatchField
     const DimensionedField<Type, edgeMesh>& iF
 )
 :
-    faePatchField<Type>(p, iF, Field<Type>(0))
+    faePatchField<Type>(p, iF, Field<Type>())
 {}
 
 
@@ -50,7 +50,7 @@ Foam::emptyFaePatchField<Type>::emptyFaePatchField
     const faPatchFieldMapper&
 )
 :
-    faePatchField<Type>(p, iF, Field<Type>(0))
+    faePatchField<Type>(p, iF, Field<Type>())
 {
     if (!isType<emptyFaPatch>(this->patch()))
     {
@@ -72,7 +72,7 @@ Foam::emptyFaePatchField<Type>::emptyFaePatchField
     const dictionary& dict
 )
 :
-    faePatchField<Type>(p, iF, Field<Type>(0))
+    faePatchField<Type>(p, iF, Field<Type>())
 {
     if (!isType<emptyFaPatch>(p))
     {
@@ -90,12 +90,7 @@ Foam::emptyFaePatchField<Type>::emptyFaePatchField
     const emptyFaePatchField<Type>& ptf
 )
 :
-    faePatchField<Type>
-    (
-        ptf.patch(),
-        ptf.internalField(),
-        Field<Type>(0)
-    )
+    faePatchField<Type>(ptf.patch(), ptf.internalField(), Field<Type>())
 {}
 
 
@@ -106,7 +101,7 @@ Foam::emptyFaePatchField<Type>::emptyFaePatchField
     const DimensionedField<Type, edgeMesh>& iF
 )
 :
-    faePatchField<Type>(ptf.patch(), iF, Field<Type>(0))
+    faePatchField<Type>(ptf.patch(), iF, Field<Type>())
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
index d39e63eb25..4a08f1158d 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchField.C
@@ -86,7 +86,7 @@ Foam::processorFaePatchField<Type>::processorFaePatchField
     const dictionary& dict
 )
 :
-    coupledFaePatchField<Type>(p, iF, dict),
+    coupledFaePatchField<Type>(p, iF, dict, IOobjectOption::LAZY_READ),
     procPatch_(refCast<const processorFaPatch>(p, dict))
 {
     if (!isType<processorFaPatch>(p))
diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.C b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.C
index 0745e30443..7c80e088d4 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.C
@@ -71,7 +71,7 @@ Foam::symmetryFaePatchField<Type>::symmetryFaePatchField
     const dictionary& dict
 )
 :
-    faePatchField<Type>(p, iF, dict)
+    faePatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
     if (!isType<symmetryFaPatch>(p))
     {
diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
index ff0d676a29..f2f80db21a 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchField.H
@@ -75,6 +75,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
+        //  The "value" entry: NO_READ
         symmetryFaePatchField
         (
             const faPatch&,

From b17422ef1a01cadd61f1cff00cd5b790482aeae2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 15 Feb 2023 15:49:06 +0100
Subject: [PATCH 133/348] ENH: use readValueEntry, readMixedEntries for simpler
 program control

---
 .../T/smoluchowskiJumpTFvPatchScalarField.C   |  9 +-----
 .../BCs/U/maxwellSlipUFvPatchVectorField.C    | 15 ++++------
 ...woPhaseRadCoupledMixedFvPatchScalarField.C |  8 ++---
 .../fixedValue/fixedValuePointPatchField.C    |  5 ++--
 .../fixedValue/fixedValuePointPatchField.H    | 24 ++++++++++++---
 .../codedFixedValuePointPatchField.C          | 13 ++++----
 .../codedFixedValuePointPatchField.H          |  9 +++---
 .../pointPatchField/pointPatchFieldBase.C     |  2 +-
 .../fixedShearStressFvPatchVectorField.C      |  2 +-
 .../porousBafflePressureFvPatchField.C        |  9 +-----
 ...entHeatFluxTemperatureFvPatchScalarField.C | 12 ++++----
 .../freeSurfacePressureFvPatchScalarField.C   | 11 ++-----
 .../fixedValueOutflowFaPatchField.C           |  2 +-
 ...timeVaryingUniformFixedValueFaPatchField.C | 12 +++-----
 .../basic/calculated/calculatedFvPatchField.C |  4 +--
 .../basic/calculated/calculatedFvPatchField.H | 23 ++++++++++++--
 .../basic/coupled/coupledFvPatchField.C       |  5 ++--
 .../basic/coupled/coupledFvPatchField.H       | 25 ++++++++++++----
 .../extrapolatedCalculatedFvPatchField.C      |  3 +-
 .../extrapolatedCalculatedFvPatchField.H      |  5 ++--
 .../fixedGradient/fixedGradientFvPatchField.C |  2 +-
 .../basic/fixedValue/fixedValueFvPatchField.C |  5 ++--
 .../basic/fixedValue/fixedValueFvPatchField.H | 24 ++++++++++++---
 .../basic/transform/transformFvPatchField.C   |  2 +-
 .../zeroGradient/zeroGradientFvPatchField.C   |  2 +-
 .../constraint/cyclic/cyclicFvPatchField.C    |  2 +-
 .../cyclicACMI/cyclicACMIFvPatchField.C       |  7 +++--
 .../cyclicAMI/cyclicAMIFvPatchField.C         |  7 +++--
 .../processor/processorFvPatchField.C         |  6 ++--
 .../activeBaffleVelocityFvPatchVectorField.C  |  2 +-
 ...ureForceBaffleVelocityFvPatchVectorField.C |  2 +-
 .../derived/advective/advectiveFvPatchField.C | 10 ++-----
 .../codedFixedValueFvPatchField.C             |  7 +++--
 .../codedFixedValueFvPatchField.H             |  4 +--
 ...lectrostaticDepositionFvPatchScalarField.C | 25 +++-------------
 .../derived/fan/fanFvPatchField.C             |  9 +-----
 .../fixedFluxPressureFvPatchScalarField.C     | 14 ++++-----
 .../derived/fixedJump/fixedJumpFvPatchField.C | 16 ++--------
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.C   | 11 ++-----
 .../fixedMeanOutletInletFvPatchField.C        |  5 +---
 .../fixedProfile/fixedProfileFvPatchField.C   |  2 +-
 .../flowRateInletVelocityFvPatchVectorField.C | 13 ++------
 ...flowRateOutletVelocityFvPatchVectorField.C | 13 ++------
 .../freestream/freestreamFvPatchField.C       | 25 ++++++----------
 .../freestreamPressureFvPatchScalarField.C    |  9 +-----
 .../freestreamVelocityFvPatchVectorField.C    |  9 +-----
 ...OutletTotalTemperatureFvPatchScalarField.C | 10 ++-----
 .../mappedMixed/mappedMixedFvPatchField.C     | 13 +++-----
 ...FlowRateOutletVelocityFvPatchVectorField.C | 30 ++++++++-----------
 ...FlowRateOutletVelocityFvPatchVectorField.H |  6 ++--
 .../outletMappedUniformInletFvPatchField.C    |  9 +-----
 ...utletPhaseMeanVelocityFvPatchVectorField.C |  9 +-----
 .../partialSlip/partialSlipFvPatchField.C     |  5 +---
 ...aseHydrostaticPressureFvPatchScalarField.C |  9 +-----
 ...ableAlphaTotalPressureFvPatchScalarField.C |  9 +-----
 .../prghPressureFvPatchScalarField.C          | 11 ++-----
 .../prghTotalPressureFvPatchScalarField.C     | 11 ++-----
 .../rotatingWallVelocityFvPatchVectorField.C  | 11 ++-----
 .../scaledFixedValueFvPatchField.C            |  2 +-
 .../supersonicFreestreamFvPatchVectorField.C  |  9 +-----
 ...urfaceNormalFixedValueFvPatchVectorField.C |  2 +-
 .../syringePressureFvPatchScalarField.C       |  2 +-
 .../timeVaryingMappedFixedValueFvPatchField.C |  8 ++---
 .../totalPressureFvPatchScalarField.C         | 11 ++-----
 .../totalTemperatureFvPatchScalarField.C      | 11 ++-----
 ...ranslatingWallVelocityFvPatchVectorField.C |  2 +-
 .../turbulentInletFvPatchField.C              | 11 ++-----
 ...ityHydrostaticPressureFvPatchScalarField.C | 11 ++-----
 .../uniformFixedGradientFvPatchField.C        |  2 +-
 .../uniformFixedValueFvPatchField.C           | 11 ++-----
 .../uniformInletOutletFvPatchField.C          |  9 +-----
 .../uniformJump/uniformJumpFvPatchField.C     |  9 +-----
 .../uniformJumpAMIFvPatchField.C              |  6 +---
 ...niformNormalFixedValueFvPatchVectorField.C | 11 ++-----
 .../uniformTotalPressureFvPatchScalarField.C  | 11 ++-----
 .../variableHeightFlowRateFvPatchField.C      |  9 +-----
 .../fvPatchFields/fvPatchField/fvPatchField.H |  1 +
 .../fvPatchField/fvPatchFieldBase.C           |  2 +-
 .../calculated/calculatedFvsPatchField.C      |  4 +--
 .../fixedValue/fixedValueFvsPatchField.C      |  2 +-
 .../fvsPatchField/fvsPatchFieldBase.C         |  2 +-
 ...oupledTemperatureMixedFvPatchScalarField.C | 15 ++--------
 ...meVaryingMappedFixedValuePointPatchField.C |  9 +-----
 .../waveDisplacementPointPatchVectorField.C   |  2 +-
 .../uniformFixedValuePointPatchField.C        | 13 ++------
 .../adjointOutletFluxFvPatchField.C           |  9 ++----
 .../oversetPolyPatch/oversetFvPatchField.C    | 12 ++------
 ...imeVaryingMassSorptionFvPatchScalarField.C |  9 +-----
 .../velocityFilmShellFvPatchVectorField.C     |  7 ++---
 .../vibrationShellFvPatchScalarField.C        |  7 ++---
 ...sRadiativeCoupledMixedFvPatchScalarField.C |  7 ++---
 ...allHeatFluxTemperatureFvPatchScalarField.C |  9 ++----
 ...fixedIncidentRadiationFvPatchScalarField.C | 11 +++----
 ...emperatureCoupledMixedFvPatchScalarField.C |  8 ++---
 .../thermalBaffle1DFvPatchScalarField.C       |  9 ++----
 ...RateAdvectiveDiffusiveFvPatchScalarField.C |  9 +-----
 ...tureCoupledBaffleMixedFvPatchScalarField.C |  7 ++---
 ...eratureRadCoupledMixedFvPatchScalarField.C |  7 ++---
 .../sorptionWallFunctionFvPatchScalarField.C  | 12 ++++----
 .../wallHeatTransferFvPatchScalarField.C      |  9 +-----
 .../energyJump/energyJumpFvPatchScalarField.C |  9 +-----
 .../energyJumpAMIFvPatchScalarField.C         |  9 +-----
 .../MarshakRadiationFvPatchScalarField.C      | 18 ++++-------
 ...iationFixedTemperatureFvPatchScalarField.C |  9 ++----
 ...iffusiveRadiationMixedFvPatchScalarField.C | 11 ++-----
 ...veViewFactorFixedValueFvPatchScalarField.C | 12 ++------
 ...iffusiveRadiationMixedFvPatchScalarField.C | 17 ++++-------
 .../enthalpySorptionFvPatchScalarField.C      |  9 +-----
 .../speciesSorptionFvPatchScalarField.C       |  9 +-----
 ...haContactAngleTwoPhaseFvPatchScalarField.C | 10 ++++---
 .../alphaFixedPressureFvPatchScalarField.C    |  9 +-----
 111 files changed, 328 insertions(+), 677 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index ff83ae3616..1445e56940 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -103,14 +103,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
             << exit(FatalIOError);
     }
 
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(patchInternalField());
     }
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 112be32386..b36732e120 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -105,18 +105,15 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
             << exit(FatalIOError);
     }
 
-    if (dict.found("value"))
+    if (this->readValueEntry(dict))
     {
-        fvPatchField<vector>::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
+        const auto* hasRefValue = dict.findEntry("refValue", keyType::LITERAL);
+        const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
 
-        if (dict.found("refValue") && dict.found("valueFraction"))
+        if (hasRefValue && hasFrac)
         {
-            this->refValue() = vectorField("refValue", dict, p.size());
-            this->valueFraction() =
-                scalarField("valueFraction", dict, p.size());
+            this->refValue().assign(*hasRefValue, p.size());
+            this->valueFraction().assign(*hasFrac, p.size());
         }
         else
         {
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
index b8243c017b..53213bca8b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
@@ -243,14 +243,12 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
             << exit(FatalError);
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 
-    if (dict.found("refValue"))
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
+
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
index 95f87f9e74..3a7cbedfc0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,10 +48,10 @@ Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    valuePointPatchField<Type>(p, iF, dict, valueRequired)
+    valuePointPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index ed53c84404..9c7c53a45e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValuePointPatchField_H
-#define fixedValuePointPatchField_H
+#ifndef Foam_fixedValuePointPatchField_H
+#define Foam_fixedValuePointPatchField_H
 
 #include "valuePointPatchField.H"
 
@@ -53,7 +54,6 @@ class fixedValuePointPatchField
 :
     public valuePointPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -75,9 +75,25 @@ public:
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
             const dictionary&,
-            const bool valueRequired=true
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Compatibility. Prefer with readOption
+        fixedValuePointPatchField
+        (
+            const pointPatch& p,
+            const DimensionedField<Type, pointMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            fixedValuePointPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping given patch field onto a new patch
         fixedValuePointPatchField
         (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index af6f43bd5a..0defd8cd73 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -161,11 +161,11 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
-    const dictionary& dict,
-    const bool valueRequired
+    const dictionary& dict
 )
 :
-    parent_bctype(p, iF, dict, false),
+    // The 'value' is optional (handled below)
+    parent_bctype(p, iF, dict, IOobjectOption::NO_READ),
     codedBase(),
     dict_
     (
@@ -186,10 +186,7 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
 {
     updateLibrary(name_);
 
-    // Note: 'value' is used even with valueRequired = false ! This is
-    // inconsistent with fixedValueFvPatchField behaviour.
-
-    if (!dict.found("value")) // Q: check for valueRequired?
+    if (!this->readValueEntry(dict))
     {
         // Evaluate to assign a value
         this->evaluate(Pstream::commsTypes::blocking);
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index 6d79944f12..13b956627f 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -100,8 +100,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef codedFixedValuePointPatchField_H
-#define codedFixedValuePointPatchField_H
+#ifndef Foam_codedFixedValuePointPatchField_H
+#define Foam_codedFixedValuePointPatchField_H
 
 #include "fixedValuePointPatchFields.H"
 #include "codedBase.H"
@@ -187,8 +187,7 @@ public:
         (
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
-            const dictionary&,
-            const bool valueRequired=true
+            const dictionary&
         );
 
         //- Construct by mapping given codedFixedValuePointPatchField
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C
index 3c6db48140..3b4613866a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 286eba0bbf..744eb7df3e 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -53,7 +53,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, dict, false),
+    fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     tau0_(dict.getOrDefault<vector>("tau", Zero))
 {
     fvPatchField<vector>::operator=(patchInternalField());
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index 0f9ee0997a..da66b10349 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -67,14 +67,7 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
 {
     if (valueRequired)
     {
-        if (dict.found("value"))
-        {
-            fvPatchField<scalar>::operator=
-            (
-                Field<scalar>("value", dict, p.size())
-            );
-        }
-        else
+        if (!this->readValueEntry(dict))
         {
             this->evaluate(Pstream::commsTypes::blocking);
         }
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index de95132cd0..cedb9bdc9a 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -92,7 +92,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchScalarField(p, iF),
+    fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
     heatSource_
     (
         heatSourceTypeNames.getOrDefault
@@ -106,13 +106,11 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     Cp0_(Function1<scalar>::New("Cp0", dict, &db())),
     q_(PatchFunction1<scalar>::New(p.patch(), "q", dict))
 {
-    if (dict.found("value") && dict.found("gradient"))
+    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (hasGrad && this->readValueEntry(dict))
     {
-        fvPatchField<scalar>::operator =
-            (
-                Field<scalar>("value", dict, p.size())
-            );
-        gradient() = Field<scalar>("gradient", dict, p.size());
+        gradient().assign(*hasGrad, p.size());
     }
     else
     {
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
index e6fdb5558d..727ffac8db 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
@@ -56,17 +56,10 @@ freeSurfacePressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     pa_("pa", dict, p.size())
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(pa_);
     }
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
index e254e255b4..3b04c3fbbd 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.C
@@ -48,7 +48,7 @@ Foam::fixedValueOutflowFaPatchField<Type>::fixedValueOutflowFaPatchField
     const dictionary& dict
 )
 :
-    faPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    faPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
index 7629080fa8..b181cab888 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
@@ -56,14 +56,10 @@ timeVaryingUniformFixedValueFaPatchField
     fixedValueFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     timeSeries_(dict)
 {
-   if (dict.found("value"))
-   {
-       faPatchField<Type>::operator==(Field<Type>("value", dict, p.size()));
-   }
-   else
-   {
-       updateCoeffs();
-   }
+    if (!this->readValueEntry(dict))
+    {
+        updateCoeffs();
+    }
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index f9ecc13974..e0720407f6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -57,10 +57,10 @@ Foam::calculatedFvPatchField<Type>::calculatedFvPatchField
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    fvPatchField<Type>(p, iF, dict, valueRequired)
+    fvPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index 075edc9345..a97ccbdd6c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,8 +50,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedFvPatchField_H
-#define calculatedFvPatchField_H
+#ifndef Foam_calculatedFvPatchField_H
+#define Foam_calculatedFvPatchField_H
 
 #include "fvPatchField.H"
 
@@ -90,9 +91,25 @@ public:
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const dictionary&,
-            const bool valueRequired=true
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Compatibility (prefer with readOption)
+        calculatedFvPatchField
+        (
+            const fvPatch& p,
+            const DimensionedField<Type, volMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            calculatedFvPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping given patch field onto a new patch
         calculatedFvPatchField
         (
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 389b562632..5fb74b5480 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,11 +75,11 @@ Foam::coupledFvPatchField<Type>::coupledFvPatchField
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     LduInterfaceField<Type>(refCast<const lduInterface>(p, dict)),
-    fvPatchField<Type>(p, iF, dict, valueRequired)
+    fvPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 968768fb5f..1a3a9cb9ba 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef coupledFvPatchField_H
-#define coupledFvPatchField_H
+#ifndef Foam_coupledFvPatchField_H
+#define Foam_coupledFvPatchField_H
 
 #include "LduInterfaceField.H"
 #include "fvPatchField.H"
@@ -60,7 +60,6 @@ class coupledFvPatchField
     public LduInterfaceField<Type>,
     public fvPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -90,9 +89,25 @@ public:
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const dictionary&,
-            const bool valueRequired=true
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Compatibility (prefer with readOption)
+        coupledFvPatchField
+        (
+            const fvPatch& p,
+            const DimensionedField<Type, volMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            coupledFvPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping the given coupledFvPatchField onto a new patch
         coupledFvPatchField
         (
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
index a5e741a8dc..b6c0fa45a3 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +52,7 @@ extrapolatedCalculatedFvPatchField
     const dictionary& dict
 )
 :
-    calculatedFvPatchField<Type>(p, iF, dict, false)
+    calculatedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
     evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
index 3429c1bbf4..6ca1a44557 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -49,8 +49,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef extrapolatedCalculatedFvPatchField_H
-#define extrapolatedCalculatedFvPatchField_H
+#ifndef Foam_extrapolatedCalculatedFvPatchField_H
+#define Foam_extrapolatedCalculatedFvPatchField_H
 
 #include "calculatedFvPatchField.H"
 
@@ -68,7 +68,6 @@ class extrapolatedCalculatedFvPatchField
 :
     public calculatedFvPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index e2c278c277..22af67b072 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -50,7 +50,7 @@ Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
     const dictionary& dict
 )
 :
-    fvPatchField<Type>(p, iF, dict, false),
+    fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     gradient_("gradient", dict, p.size())
 {
     evaluate();
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index f022f059db..dd3731399d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,10 +59,10 @@ Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    fvPatchField<Type>(p, iF, dict, valueRequired)
+    fvPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index 13f7092153..3643d82925 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,8 +54,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedValueFvPatchField_H
-#define fixedValueFvPatchField_H
+#ifndef Foam_fixedValueFvPatchField_H
+#define Foam_fixedValueFvPatchField_H
 
 #include "fvPatchField.H"
 
@@ -72,7 +73,6 @@ class fixedValueFvPatchField
 :
     public fvPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -102,9 +102,25 @@ public:
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const dictionary&,
-            const bool valueRequired=true
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
+        //- Compatibility (prefer with readOption)
+        fixedValueFvPatchField
+        (
+            const fvPatch& p,
+            const DimensionedField<Type, volMesh>& iF,
+            const dictionary& dict,
+            const bool valueReqd
+        )
+        :
+            fixedValueFvPatchField
+            (
+                p, iF, dict,
+                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
+            )
+        {}
+
         //- Construct by mapping the given fixedValue patch field
         //- onto a new patch
         fixedValueFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
index 86b73d0302..ed48ae1f97 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
@@ -63,7 +63,7 @@ Foam::transformFvPatchField<Type>::transformFvPatchField
     const dictionary& dict
 )
 :
-    fvPatchField<Type>(p, iF, dict, false)
+    fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index 7cbadacb8f..b7ee3544fe 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -59,7 +59,7 @@ Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
     const dictionary& dict
 )
 :
-    fvPatchField<Type>(p, iF, dict, false)
+    fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
     fvPatchField<Type>::operator=(this->patchInternalField());
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 242828f5de..631665f914 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -54,7 +54,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
     const bool valueRequired
 )
 :
-    coupledFvPatchField<Type>(p, iF, dict, false), // Pass no valueRequired
+    coupledFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     cyclicPatch_(refCast<const cyclicFvPatch>(p, dict))
 {
     if (!isA<cyclicFvPatch>(p))
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index 80ffb25e5c..799007022d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
 )
 :
     cyclicACMILduInterfaceField(),
-    coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
+    coupledFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p, dict))
 {
     if (!isA<cyclicACMIFvPatch>(p))
@@ -68,7 +68,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
             << exit(FatalIOError);
     }
 
-    if (!dict.found("value") && this->coupled())
+    // Use 'value' supplied, or set to coupled field
+    if (!this->readValueEntry(dict) && this->coupled())
     {
         // Extra check: make sure that the non-overlap patch is before
         // this so it has actually been read - evaluate will crash otherwise
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 462335d418..7cbf4c5d53 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
 )
 :
     cyclicAMILduInterfaceField(),
-    coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
+    coupledFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p, dict))
 {
     if (!isA<cyclicAMIFvPatch>(p))
@@ -68,7 +68,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
             << exit(FatalIOError);
     }
 
-    if (!dict.found("value"))
+    // Use 'value' supplied, or set to coupled or internal field
+    if (!this->readValueEntry(dict))
     {
         if (this->coupled())
         {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 4657035d56..eaa4786d12 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -70,7 +70,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     const dictionary& dict
 )
 :
-    coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
+    coupledFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     procPatch_(refCast<const processorFvPatch>(p, dict)),
     sendRequest_(-1),
     recvRequest_(-1)
@@ -86,8 +86,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
             << exit(FatalIOError);
     }
 
-    // If the value is not supplied set to the internal field
-    if (!dict.found("value"))
+    // Use 'value' supplied, or set to internal field
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<Type>::operator=(this->patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index a72d3fcb42..8722e4b16e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -88,7 +88,7 @@ activeBaffleVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, dict, false),
+    fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     pName_(dict.getOrDefault<word>("p", "p")),
     cyclicPatchName_(dict.lookup("cyclicPatch")),
     cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index a7fb3a6047..983e4f83c0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -94,7 +94,7 @@ activePressureForceBaffleVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, dict, false),
+    fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     pName_(dict.getOrDefault<word>("p", "p")),
     cyclicPatchName_(dict.lookup("cyclicPatch")),
     cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 7090d4f49d..7e989ae29c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -88,14 +88,8 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     fieldInf_(Zero),
     lInf_(-GREAT)
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    // Use 'value' supplied, or set to internal field
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<Type>::operator=(this->patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index e247e42d98..59228d43b1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -164,7 +164,8 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
     const dictionary& dict
 )
 :
-    parent_bctype(p, iF, dict, dict.found("value")),  // Note: optional 'value'
+    // The 'value' is optional
+    parent_bctype(p, iF, dict, IOobjectOption::NO_READ),
     codedBase(),
     dict_
     (
@@ -185,7 +186,7 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
 {
     updateLibrary(name_);
 
-    if (!dict.found("value"))
+    if (!this->readValueEntry(dict))
     {
         // Assign dummy value to get redirectPatchField not fail
         this->operator==(this->patchInternalField());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
index 19201b6b43..a6a7be105c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
@@ -102,8 +102,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef codedFixedValueFvPatchField_H
-#define codedFixedValueFvPatchField_H
+#ifndef Foam_codedFixedValueFvPatchField_H
+#define Foam_codedFixedValueFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
 #include "codedBase.H"
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index 3a7ccee838..e4ee7dbcf1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -172,20 +172,10 @@ electrostaticDepositionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     h_("h", dict, p.size()),
-    qcum_
-    (
-        dict.found("qCumulative")
-      ? scalarField("qCumulative", dict, p.size())
-      : scalarField(p.size(), 0)
-    ),
-    Vfilm_
-    (
-        dict.found("Vfilm")
-      ? scalarField("Vfilm", dict, p.size())
-      : scalarField(p.size(), 0)
-    ),
+    qcum_("qCumulative", dict, p.size(), IOobjectOption::LAZY_READ),
+    Vfilm_("Vfilm", dict, p.size(), IOobjectOption::LAZY_READ),
     Ceffptr_
     (
         PatchFunction1<scalar>::New(p.patch(), "CoulombicEfficiency", dict)
@@ -216,14 +206,7 @@ electrostaticDepositionFvPatchScalarField
     timei_(-1),
     master_(-1)
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchScalarField::operator=(patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index 4a5c541943..39b7394feb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -87,14 +87,7 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
         this->jumpTable_ = Function1<Type>::New("jumpTable", dict, &this->db());
     }
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index c50dea362f..32a98f9f11 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -52,23 +52,21 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchScalarField(p, iF),
+    fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
     curTimeIndex_(-1)
 {
     fvPatchFieldBase::readDict(dict);
 
-    if (dict.found("value") && dict.found("gradient"))
+    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (hasGrad && this->readValueEntry(dict))
     {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-        gradient() = scalarField("gradient", dict, p.size());
+        gradient().assign(*hasGrad, p.size());
     }
     else
     {
         fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
+        gradient() = Zero;
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index e938771640..e55831b999 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -84,25 +84,15 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
     {
         if (valueRequired)
         {
-            jump_ = Field<Type>("jump", dict, p.size());
+            jump_.assign("jump", dict, p.size(), IOobjectOption::MUST_READ);
         }
 
-        if (dict.found("jump0"))
-        {
-            jump0_ = Field<Type>("jump0", dict, p.size());
-        }
+        jump0_.assign("jump0", dict, p.size(), IOobjectOption::LAZY_READ);
     }
 
     if (valueRequired)
     {
-        if (dict.found("value"))
-        {
-            fvPatchField<Type>::operator=
-            (
-                Field<Type>("value", dict, p.size())
-            );
-        }
-        else
+        if (!this->readValueEntry(dict))
         {
             this->evaluate(Pstream::commsTypes::blocking);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index b34710df2f..b3efdea596 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -68,17 +68,10 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 {
     if (this->cyclicAMIPatch().owner())
     {
-        jump_ = Field<Type>("jump", dict, p.size());
+        jump_.assign("jump", dict, p.size(), IOobjectOption::MUST_READ);
     }
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
index 98b4a3af5b..ff40e480f1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
@@ -57,10 +57,7 @@ Foam::fixedMeanOutletInletFvPatchField<Type>::fixedMeanOutletInletFvPatchField
 {
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
-    fvPatchField<Type>::operator=
-    (
-        Field<Type>("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
     this->refValue() = *this;
     this->refGrad() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index d9237a2403..d35a4ea197 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -67,7 +67,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<Type>(p, iF, dict, false),
+    fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     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 60e974ab55..156ce0376b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -58,7 +58,7 @@ flowRateInletVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<vector>(p, iF, dict, false),
+    fixedValueFvPatchField<vector>(p, iF, dict, IOobjectOption::NO_READ),
     flowRate_(nullptr),
     rhoName_("rho"),
     rhoInlet_(dict.getOrDefault<scalar>("rhoInlet", -VGREAT)),
@@ -90,15 +90,8 @@ flowRateInletVelocityFvPatchVectorField
             << exit(FatalIOError);
     }
 
-    // Value field require if mass based
-    if (dict.found("value"))
-    {
-        fvPatchField<vector>::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    // Value field required if mass based
+    if (!this->readValueEntry(dict))
     {
         evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index a13f174803..045f59e00f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -56,7 +56,7 @@ flowRateOutletVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<vector>(p, iF, dict, false),
+    fixedValueFvPatchField<vector>(p, iF, dict, IOobjectOption::NO_READ),
     flowRate_(nullptr),
     rhoName_("rho"),
     rhoOutlet_(dict.getOrDefault<scalar>("rhoOutlet", -VGREAT)),
@@ -84,15 +84,8 @@ flowRateOutletVelocityFvPatchVectorField
             << exit(FatalIOError);
     }
 
-    // Value field require if mass based
-    if (dict.found("value"))
-    {
-        fvPatchField<vector>::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    // Value field required if mass based
+    if (!this->readValueEntry(dict))
     {
         evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 437e18eadf..28f6fe0d48 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -57,19 +57,15 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
-    if (dict.found("freestreamValue"))
+    if
+    (
+        freestreamValue().assign
+        (
+            "freestreamValue", dict, p.size(), IOobjectOption::LAZY_READ
+        )
+    )
     {
-        freestreamValue() =
-            Field<Type>("freestreamValue", dict, p.size());
-
-        if (dict.found("value"))
-        {
-            fvPatchField<Type>::operator=
-            (
-                Field<Type>("value", dict, p.size())
-            );
-        }
-        else
+        if (!this->readValueEntry(dict))
         {
             fvPatchField<Type>::operator=(freestreamValue());
         }
@@ -82,10 +78,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 
         // Force user to supply an initial value
         // - we do not know if the supplied BC has all dependencies available
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index 148b18ad74..aafa59a625 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -57,14 +57,7 @@ freestreamPressureFvPatchScalarField
 {
     freestreamValue() = scalarField("freestreamValue", dict, p.size());
 
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchScalarField::operator=(freestreamValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
index 7953ad230d..3a147e9886 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
@@ -51,14 +51,7 @@ Foam::freestreamVelocityFvPatchVectorField::freestreamVelocityFvPatchVectorField
 {
     freestreamValue() = vectorField("freestreamValue", dict, p.size());
 
-    if (dict.found("value"))
-    {
-        fvPatchVectorField::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchVectorField::operator=(freestreamValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 4e25428a0b..fad888ad73 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -89,14 +89,8 @@ inletOutletTotalTemperatureFvPatchScalarField
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
     this->refValue() = Zero;
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(T0_);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C
index 216ca035fe..da6886a505 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C
@@ -61,7 +61,8 @@ Foam::mappedMixedFvPatchField<Type>::mappedMixedFvPatchField
     const dictionary& dict
 )
 :
-    mixedFvPatchField<Type>(p, iF, dict),
+    // Reading of mixed entries handled later...
+    mixedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     mappedPatchFieldBase<Type>
     (
         mappedFixedValueFvPatchField<Type>::mapper(p, iF),
@@ -70,17 +71,11 @@ Foam::mappedMixedFvPatchField<Type>::mappedMixedFvPatchField
     ),
     weightFieldName_(dict.getOrDefault<word>("weightField", word::null))
 {
-    mixedFvPatchField<Type>::operator=
-    (
-        Field<Type>("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        this->refValue() = Field<Type>("refValue", dict, p.size());
-        this->refGrad() = Field<Type>("refGradient", dict, p.size());
-        this->valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
index e1806f21b7..2b895940b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
@@ -42,8 +42,8 @@ matchedFlowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(p, iF),
     inletPatchName_(),
-    volumetric_(false),
-    rhoName_("rho")
+    rhoName_("rho"),
+    volumetric_(false)
 {}
 
 
@@ -55,8 +55,9 @@ matchedFlowRateOutletVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<vector>(p, iF, dict, false),
+    fixedValueFvPatchField<vector>(p, iF, dict, IOobjectOption::NO_READ),
     inletPatchName_(dict.get<word>("inletPatch")),
+    rhoName_(),
     volumetric_(dict.getOrDefault("volumetric", true))
 {
     if (volumetric_)
@@ -68,15 +69,8 @@ matchedFlowRateOutletVelocityFvPatchVectorField
         rhoName_ = dict.getOrDefault<word>("rho", "rho");
     }
 
-    // Value field require if mass based
-    if (dict.found("value"))
-    {
-        fvPatchField<vector>::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    // Value field required if mass based
+    if (!this->readValueEntry(dict))
     {
         evaluate(Pstream::commsTypes::blocking);
     }
@@ -94,8 +88,8 @@ matchedFlowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     inletPatchName_(ptf.inletPatchName_),
-    volumetric_(ptf.volumetric_),
-    rhoName_(ptf.rhoName_)
+    rhoName_(ptf.rhoName_),
+    volumetric_(ptf.volumetric_)
 {}
 
 
@@ -107,8 +101,8 @@ matchedFlowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(ptf),
     inletPatchName_(ptf.inletPatchName_),
-    volumetric_(ptf.volumetric_),
-    rhoName_(ptf.rhoName_)
+    rhoName_(ptf.rhoName_),
+    volumetric_(ptf.volumetric_)
 {}
 
 
@@ -121,8 +115,8 @@ matchedFlowRateOutletVelocityFvPatchVectorField
 :
     fixedValueFvPatchField<vector>(ptf, iF),
     inletPatchName_(ptf.inletPatchName_),
-    volumetric_(ptf.volumetric_),
-    rhoName_(ptf.rhoName_)
+    rhoName_(ptf.rhoName_),
+    volumetric_(ptf.volumetric_)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H
index 25f7c69759..e1af7fb531 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H
@@ -82,12 +82,12 @@ class matchedFlowRateOutletVelocityFvPatchVectorField
         //- Inlet patch name from which the corresponding flow rate is obtained
         word inletPatchName_;
 
-        //- Is volumetric?
-        bool volumetric_;
-
         //- Name of the density field used to normalize the mass flux
         word rhoName_;
 
+        //- Is volumetric?
+        bool volumetric_;
+
 
     // Private member functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 32ea26c9fa..7a16714c53 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -168,14 +168,7 @@ outletMappedUniformInletFvPatchField
     }
 
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<Type>::operator=(this->patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 7f92fff288..44b8b317d3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -84,14 +84,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
     refGrad() = Zero;
     valueFraction() = 0.0;
 
-    if (dict.found("value"))
-    {
-        fvPatchVectorField::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchVectorField::operator=(patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 0d343a904a..cfb77c5732 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -77,10 +77,7 @@ Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
     fvPatchFieldBase::readDict(dict);
 
     // Backwards compatibility - leave refValue as zero unless specified
-    if (dict.found("refValue"))
-    {
-        refValue_ = Field<Type>("refValue", dict, p.size());
-    }
+    refValue_.assign("refValue", dict, p.size(), IOobjectOption::LAZY_READ);
 
     evaluate();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index d3ddb15c90..aa4c193faf 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -72,14 +72,7 @@ phaseHydrostaticPressureFvPatchScalarField
 
     this->refValue() = pRefValue_;
 
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchScalarField::operator=(this->refValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
index ecd795af13..0297702665 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPermeableAlphaTotalPressure/prghPermeableAlphaTotalPressureFvPatchScalarField.C
@@ -75,14 +75,7 @@ prghPermeableAlphaTotalPressureFvPatchScalarField
     refGrad() = 0.0;
     valueFraction() = 0.0;
 
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            Field<scalar>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(refValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
index 9baf21bbba..25eac32758 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C
@@ -55,18 +55,11 @@ prghPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
     p_("p", dict, p.size())
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(p_);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
index 4e442c6c4e..1b7d3129bf 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
@@ -56,20 +56,13 @@ Foam::prghTotalPressureFvPatchScalarField::prghTotalPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     UName_(dict.getOrDefault<word>("U", "U")),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
     p0_("p0", dict, p.size())
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(p0_);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 91dfeebc25..095c96367f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -55,19 +55,12 @@ rotatingWallVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<vector>(p, iF, dict, false),
+    fixedValueFvPatchField<vector>(p, iF, dict, IOobjectOption::NO_READ),
     origin_(dict.lookup("origin")),
     axis_(dict.lookup("axis")),
     omega_(Function1<scalar>::New("omega", dict, &db()))
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<vector>::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         // Evaluate the wall velocity
         updateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.C
index bd12deb83d..c1e24474e5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.C
@@ -52,7 +52,7 @@ Foam::scaledFixedValueFvPatchField<Type>::scaledFixedValueFvPatchField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<Type>(p, iF, dict, false),
+    fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     scalePtr_(PatchFunction1<scalar>::New(p.patch(), "scale", dict)),
     refValuePtr_(fvPatchField<Type>::New(p, iF, dict.subDict("refValue")))
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 7c62b6b298..ec336b2354 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -74,14 +74,7 @@ supersonicFreestreamFvPatchVectorField
 {
     fvPatchFieldBase::readDict(dict);
 
-    if (dict.found("value"))
-    {
-        fvPatchField<vector>::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<vector>::operator=(patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index 15208df805..581aa9baac 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -54,7 +54,7 @@ surfaceNormalFixedValueFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, dict, false),
+    fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     refValue_("refValue", dict, p.size()),
     ramp_(Function1<scalar>::NewIfPresent("ramp", dict, word::null, &db()))
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index f484255a08..622f4a41c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -53,7 +53,7 @@ Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     Ap_(dict.get<scalar>("Ap")),
     Sp_(dict.get<scalar>("Sp")),
     VsI_(dict.get<scalar>("VsI")),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 184252a32c..8491516dab 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -53,7 +53,7 @@ timeVaryingMappedFixedValueFvPatchField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<Type>(p, iF, dict, false),
+    fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     uniformValue_
     (
         new PatchFunction1Types::MappedFile<Type>
@@ -66,11 +66,7 @@ timeVaryingMappedFixedValueFvPatchField
         )
     )
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator==(Field<Type>("value", dict, p.size()));
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         // Note: we use evaluate() here to trigger updateCoeffs followed
         //       by re-setting of fvatchfield::updated_ flag. This is
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index 0bf923b69a..168a67ef39 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -58,7 +58,7 @@ Foam::totalPressureFvPatchScalarField::totalPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     UName_(dict.getOrDefault<word>("U", "U")),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
@@ -66,14 +66,7 @@ Foam::totalPressureFvPatchScalarField::totalPressureFvPatchScalarField
     gamma_(psiName_ != "none" ? dict.get<scalar>("gamma") : 1),
     p0_("p0", dict, p.size())
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(p0_);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index b9cabaefc5..011adaac1f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -73,21 +73,14 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     UName_(dict.getOrDefault<word>("U", "U")),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     psiName_(dict.getOrDefault<word>("psi", "thermo:psi")),
     gamma_(dict.get<scalar>("gamma")),
     T0_("T0", dict, p.size())
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(T0_);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index 8071d987a0..1d95ac3add 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -52,7 +52,7 @@ translatingWallVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<vector>(p, iF, dict, false),
+    fixedValueFvPatchField<vector>(p, iF, dict, IOobjectOption::NO_READ),
     U_(Function1<vector>::New("U", dict, &db()))
 {
     // Evaluate the wall velocity
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 8b12da4d1b..1e4b44e756 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -53,21 +53,14 @@ Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<Type>(p, iF, dict, false),
+    fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     ranGen_(label(0)),
     fluctuationScale_(dict.get<Type>("fluctuationScale")),
     referenceField_("referenceField", dict, p.size()),
     alpha_(dict.getOrDefault<scalar>("alpha", 0.1)),
     curTimeIndex_(-1)
 {
-    if (dict.found("value"))
-    {
-        fixedValueFvPatchField<Type>::operator==
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fixedValueFvPatchField<Type>::operator==(referenceField_);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index f691d7252f..39f71250f3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -56,19 +56,12 @@ uniformDensityHydrostaticPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     rho_(dict.get<scalar>("rho")),
     pRefValue_(dict.get<scalar>("pRefValue")),
     pRefPoint_(dict.lookup("pRefPoint"))
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         evaluate();
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index f57aa6488c..9be8715829 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -63,7 +63,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchField<Type>(p, iF),
+    fixedGradientFvPatchField<Type>(p, iF),  // Bypass dictionary constructor
     uniformGradient_
     (
         PatchFunction1<Type>::New(p.patch(), "uniformGradient", dict)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 106737b8e7..fd74ce7f42 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -63,17 +63,10 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<Type>(p, iF, dict, false),
+    fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     uniformValue_(PatchFunction1<Type>::New(p.patch(), "uniformValue", dict))
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate();
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 3a54b9ce6e..34d5e05db7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -66,14 +66,7 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
     this->refValue() =
         uniformInletValue_->value(this->db().time().timeOutputValue());
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<Type>::operator=(this->refValue());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index fe33dd32c5..1f117d268c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -75,14 +75,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
             jumpTable_ = Function1<Type>::New("jumpTable", dict, &this->db());
         }
 
-        if (dict.found("value"))
-        {
-            fvPatchField<Type>::operator=
-            (
-                Field<Type>("value", dict, p.size())
-            );
-        }
-        else
+        if (!this->readValueEntry(dict))
         {
             this->evaluate(Pstream::commsTypes::blocking);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
index 45ed242bfe..c0bf9569a7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
@@ -72,11 +72,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
         jumpTable_ = Function1<Type>::New("jumpTable", dict, &this->db());
     }
 
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=(Field<Type>("value", dict, p.size()));
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
index 0125ba01b7..51b927a815 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
@@ -53,18 +53,11 @@ uniformNormalFixedValueFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, dict, false),
+    fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     uniformValue_(PatchFunction1<scalar>::New(p.patch(), "uniformValue", dict)),
     ramp_(Function1<scalar>::NewIfPresent("ramp", dict, word::null, &db()))
 {
-    if (dict.found("value"))
-    {
-        fvPatchVectorField::operator=
-        (
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate();
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 833c5e819b..2fa29dc4c0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -59,7 +59,7 @@ uniformTotalPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     UName_(dict.getOrDefault<word>("U", "U")),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
@@ -67,14 +67,7 @@ uniformTotalPressureFvPatchScalarField
     gamma_(psiName_ != "none" ? dict.get<scalar>("gamma") : 1),
     p0_(Function1<scalar>::New("p0", dict, &db()))
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         const scalar t = this->db().time().timeOutputValue();
         fvPatchScalarField::operator==(p0_->value(t));
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index 308999acab..c7609a9053 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -84,14 +84,7 @@ Foam::variableHeightFlowRateFvPatchScalarField
     fvPatchFieldBase::readDict(dict);
     this->refValue() = 0.0;
 
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchScalarField::operator=(this->patchInternalField());
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index cf4627449c..c6ab641d39 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -122,6 +122,7 @@ protected:
             manipulatedMatrix_ = state;
         }
 
+
 public:
 
     //- Debug switch to disallow the use of generic fvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C
index 1adbf72d62..4ff14aac3e 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldBase.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index 210db114ac..35f82e8b04 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,7 +58,7 @@ Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index 885f295690..d884e73356 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -48,7 +48,7 @@ Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
     const dictionary& dict
 )
 :
-    fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+    fvsPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C
index 5375772156..a55787fce0 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldBase.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index a6552c8df6..7e4af42bf4 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -149,27 +149,16 @@ externalCoupledTemperatureMixedFvPatchScalarField
         Tref_ = Function1<scalar>::New("Tref", dict, &db());
     }
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Initialise same way as mixed
-        this->refValue() = scalarField("refValue", dict, p.size());
-        this->refGrad() = scalarField("refGradient", dict, p.size());
-        this->valueFraction() = scalarField("valueFraction", dict, p.size());
-
         evaluate();
     }
     else
     {
         // For convenience: initialise as fixedValue with either read value
         // or extrapolated value
-        if (dict.found("value"))
-        {
-            fvPatchField<scalar>::operator=
-            (
-                scalarField("value", dict, p.size())
-            );
-        }
-        else
+        if (!this->readValueEntry(dict))
         {
             fvPatchField<scalar>::operator=(this->patchInternalField());
         }
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index c24a6b764e..c9618353cc 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -101,14 +101,7 @@ timeVaryingMappedFixedValuePointPatchField
         fieldTableName_
     );
 
-    if (dict.found("value"))
-    {
-        fixedValuePointPatchField<Type>::operator==
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         // Note: use evaluate to do updateCoeffs followed by a reset
         //       of the pointPatchField::updated_ flag. This is
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index ba83666650..cc7a6666e4 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -127,7 +127,7 @@ void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
     os.writeEntry("amplitude", amplitude_);
     os.writeEntry("omega", omega_);
     os.writeEntry("waveNumber", waveNumber_);
-    this->writeValueEntry( os);
+    this->writeValueEntry(os);
 }
 
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
index 19d0053cf2..46f9180ee2 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,7 +73,7 @@ uniformFixedValuePointPatchField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchField<Type>(p, iF, dict, false),
+    fixedValuePointPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     uniformValue_
     (
         PatchFunction1<Type>::New
@@ -85,14 +85,7 @@ uniformFixedValuePointPatchField
         )
     )
 {
-    if (dict.found("value"))
-    {
-        fixedValuePointPatchField<Type>::operator==
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate();
     }
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
index 1f296db56b..d3a77d93ea 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchField.C
@@ -65,13 +65,8 @@ Foam::adjointOutletFluxFvPatchField<Type>::adjointOutletFluxFvPatchField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchField<Type>(p, iF)
-{
-    fvPatchField<Type>::operator=
-    (
-        Field<Type>("value", dict, p.size())
-    );
-}
+    fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::MUST_READ)
+{}
 
 
 template<class Type>
diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index bec48bb7e3..9f27a7a248 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -83,7 +83,7 @@ Foam::oversetFvPatchField<Type>::oversetFvPatchField
     const dictionary& dict
 )
 :
-    coupledFvPatchField<Type>(p, iF, dict, false),
+    coupledFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     oversetPatch_(refCast<const oversetFvPatch>(p, dict)),
     setHoleCellValue_(dict.getOrDefault("setHoleCellValue", false)),
     fluxCorrection_
@@ -110,14 +110,8 @@ Foam::oversetFvPatchField<Type>::oversetFvPatchField
     fringeFaces_(),
     zoneId_(dict.getOrDefault<label>("zone", -1))
 {
-    if (dict.found("value"))
-    {
-        Field<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
+    // Use 'value' supplied, or set to internal field
+    if (!this->readValueEntry(dict))
     {
         Field<Type>::operator=(this->patchInternalField());
     }
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
index 166a9a9e0e..9c2ccd71b3 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
@@ -85,14 +85,7 @@ timeVaryingMassSorptionFvPatchScalarField
     max_(dict.getCheck<scalar>("max", scalarMinMax::ge(0))),
     kdes_(dict.getCheckOrDefault<scalar>("kdes", 0, scalarMinMax::ge(0)))
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(Zero);
     }
diff --git a/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.C b/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.C
index c5c8ace431..37f864463e 100644
--- a/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.C
+++ b/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.C
@@ -102,14 +102,11 @@ velocityFilmShellFvPatchVectorField::velocityFilmShellFvPatchVectorField
     curTimeIndex_(-1),
     zeroWallVelocity_(dict.getOrDefault<bool>("zeroWallVelocity", true))
 {
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = vectorField("refValue", dict, p.size());
-        refGrad() = vectorField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.C b/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.C
index 508bdbfa96..460539ed54 100644
--- a/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.C
+++ b/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.C
@@ -96,14 +96,11 @@ vibrationShellFvPatchScalarField::vibrationShellFvPatchScalarField
         )
     )
 {
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index 0f26223b0f..c121f24042 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -178,14 +178,11 @@ filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
             << exit(FatalError);
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index a409459da4..9b186b78d0 100644
--- a/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -136,8 +136,6 @@ externalWallHeatFluxTemperatureFvPatchScalarField
         }
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-
     if (qrName_ != "none")
     {
         if (dict.found("qrPrevious"))
@@ -150,12 +148,11 @@ externalWallHeatFluxTemperatureFvPatchScalarField
         }
     }
 
-    if (dict.found("refValue"))
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
+
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
index 16e7f55cd5..177f94c3d6 100644
--- a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019,2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,14 +73,15 @@ fixedIncidentRadiationFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchScalarField(p, iF),
+    fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
     temperatureCoupledBase(patch(), dict),
     qrIncident_("qrIncident", dict, p.size())
 {
-    if (dict.found("value") && dict.found("gradient"))
+    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (hasGrad && this->readValueEntry(dict))
     {
-        fvPatchField<scalar>::operator=(Field<scalar>("value", dict, p.size()));
-        gradient() = Field<scalar>("gradient", dict, p.size());
+        gradient().assign(*hasGrad, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 2661d4ba2e..ab879eda9b 100644
--- a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -248,7 +248,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
             << exit(FatalIOError);
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
     if (massModeTypeNames_.readIfPresent("mode", dict, mode_))
     {
@@ -315,13 +315,9 @@ humidityTemperatureCoupledMixedFvPatchScalarField
     }
 
 
-
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 053d10cf06..b1f38b15cc 100644
--- a/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -100,7 +100,7 @@ thermalBaffle1DFvPatchScalarField
     TName_("T"),
     baffleActivated_(dict.getOrDefault("baffleActivated", true)),
     thickness_(),
-    qs_(p.size(), 0),
+    qs_(p.size(), Zero),
     solidDict_(dict),
     solidPtr_(),
     qrPrevious_(p.size(), Zero),
@@ -110,7 +110,7 @@ thermalBaffle1DFvPatchScalarField
     ),
     qrName_(dict.getOrDefault<word>("qr", "none"))
 {
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
     if (dict.found("thickness"))
     {
@@ -127,12 +127,9 @@ thermalBaffle1DFvPatchScalarField
         qrPrevious_ = scalarField("qrPrevious", dict, p.size());
     }
 
-    if (dict.found("refValue") && baffleActivated_)
+    if (baffleActivated_ && this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index c898f212d2..e65ce1728a 100644
--- a/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -71,14 +71,7 @@ totalFlowRateAdvectiveDiffusiveFvPatchScalarField
     refGrad() = 0.0;
     valueFraction() = 0.0;
 
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            Field<scalar>("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(refValue());
     }
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index cba676c86c..e23e941453 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -143,14 +143,11 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
     );
 
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 9794da70ff..ced3437922 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -191,14 +191,11 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         );
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
         // Full restart
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
index 0c5a302f14..a3ce1f2b72 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
@@ -274,7 +274,7 @@ sorptionWallFunctionFvPatchScalarField::sorptionWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchScalarField(p, iF),
+    fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
     wallFunctionBlenders(dict, blenderType::STEPWISE, scalar(2)),
     laminar_(dict.getOrDefault<bool>("laminar", false)),
     kAbsPtr_(PatchFunction1<scalar>::New(p.patch(), "kAbs", dict)),
@@ -303,13 +303,11 @@ sorptionWallFunctionFvPatchScalarField::sorptionWallFunctionFvPatchScalarField
             << exit(FatalIOError);
     }
 
-    if (dict.found("value") && dict.found("gradient"))
+    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (hasGrad && this->readValueEntry(dict))
     {
-        fvPatchField<scalar>::operator =
-            (
-                Field<scalar>("value", dict, p.size())
-            );
-        gradient() = Field<scalar>("gradient", dict, p.size());
+        gradient().assign(*hasGrad, p.size());
     }
     else
     {
diff --git a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index 0dd64ccb0e..d8862abdad 100644
--- a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -77,14 +77,7 @@ Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
     refGrad() = 0.0;
     valueFraction() = 0.0;
 
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         evaluate();
     }
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
index 8f3f0de5ac..c7bf081805 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
@@ -64,14 +64,7 @@ Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField
 :
     fixedJumpFvPatchField<scalar>(p, iF)
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
index 4e85bb0a00..8a55c2152d 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
@@ -64,14 +64,7 @@ Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField
 :
     fixedJumpAMIFvPatchField<scalar>(p, iF)
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
index 7fce1ae957..141aa4b5f8 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
@@ -46,8 +46,8 @@ MarshakRadiationFvPatchScalarField
     mixedFvPatchScalarField(p, iF),
     TName_("T")
 {
-    refValue() = 0.0;
-    refGrad() = 0.0;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -77,20 +77,14 @@ MarshakRadiationFvPatchScalarField
     mixedFvPatchScalarField(p, iF),
     TName_(dict.getOrDefault<word>("T", "T"))
 {
-    if (dict.found("value"))
+    if (!this->readValueEntry(dict))
     {
-        refValue() = scalarField("value", dict, p.size());
-    }
-    else
-    {
-        refValue() = 0.0;
+        fvPatchScalarField::operator=(Zero);
     }
 
-    // zero gradient
-    refGrad() = 0.0;
-
+    refValue() = *this;
+    refGrad() = Zero;  // zero gradient
     valueFraction() = 1.0;
-
     fvPatchScalarField::operator=(refValue());
 }
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
index 6cd7f1e5e8..8fe2f6bf45 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
@@ -46,8 +46,8 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
     mixedFvPatchScalarField(p, iF),
     Trad_(p.size())
 {
-    refValue() = 0.0;
-    refGrad() = 0.0;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -79,10 +79,7 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
 {
     // refValue updated on each call to updateCoeffs()
     refValue() = 4.0*constant::physicoChemical::sigma.value()*pow4(Trad_);
-
-    // zero gradient
-    refGrad() = 0.0;
-
+    refGrad() = Zero;  // zero gradient
     valueFraction() = 1.0;
 
     fvPatchScalarField::operator=(refValue());
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index 3257b4de80..ccf1d365ad 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -88,15 +88,10 @@ greyDiffusiveRadiationMixedFvPatchScalarField
     qRadExt_(dict.getOrDefault<scalar>("qRadExt", 0)),
     qRadExtDir_(dict.getOrDefault<vector>("qRadExtDir", Zero))
 {
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
+        // Full restart
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
     else
     {
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index f0548c186a..764b071fe9 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -72,17 +72,9 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF, dict, false),
     qro_("qro", dict, p.size())
 {
-    if (dict.found("value"))
+    if (!this->readValueEntry(dict))
     {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-
-    }
-    else
-    {
-         fvPatchScalarField::operator=(0.0);
+         fvPatchScalarField::operator=(Zero);
     }
 }
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index 9ead8ee5c8..0c4c68caf3 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -77,22 +77,17 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField
     const dictionary& dict
 )
 :
-    mixedFvPatchScalarField(p, iF)
+    mixedFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ)
 {
-    if (dict.found("refValue"))
+    if (this->readMixedEntries(dict))
     {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-        refValue() = scalarField("refValue", dict, p.size());
-        refGrad() = scalarField("refGradient", dict, p.size());
-        valueFraction() = scalarField("valueFraction", dict, p.size());
+        // Full restart
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
     else
     {
-        refValue() = 0.0;
-        refGrad() = 0.0;
+        refValue() = Zero;
+        refGrad() = Zero;
         valueFraction() = 1.0;
 
         fvPatchScalarField::operator=(refValue());
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
index 8762e82676..9cf248c50d 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
@@ -103,14 +103,7 @@ Foam::enthalpySorptionFvPatchScalarField::enthalpySorptionFvPatchScalarField
         }
     }
 
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(Zero);
     }
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
index 68eb91f02d..efbce74bae 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
@@ -187,14 +187,7 @@ Foam::speciesSorptionFvPatchScalarField::speciesSorptionFvPatchScalarField
       : scalarField(p.size(), 0)
     )
 {
-    if (dict.found("value"))
-    {
-        fvPatchScalarField::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(Zero);
     }
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 401b53ab91..9cc864c752 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -67,19 +67,21 @@ alphaContactAngleTwoPhaseFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchScalarField(p, iF),
+    fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
     limit_(limitControlNames_.get("limit", dict))
 {
-    if (dict.found("gradient"))
+    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (hasGrad)
     {
-        gradient() = scalarField("gradient", dict, p.size());
+        gradient().assign(*hasGrad, p.size());
         fixedGradientFvPatchScalarField::updateCoeffs();
         fixedGradientFvPatchScalarField::evaluate();
     }
     else
     {
         fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
+        gradient() = Zero;
     }
 }
 
diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index 55709d97ef..71b2a02c5d 100644
--- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -72,14 +72,7 @@ alphaFixedPressureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF, dict, false),
     p_("p", dict, p.size())
 {
-    if (dict.found("value"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         fvPatchField<scalar>::operator=(p_);
     }

From 26400d75340e364a69ef2b5c4322552f039879fe Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 17:09:17 +0100
Subject: [PATCH 134/348] ENH: add finite-area extrapolatedCalculated BC

---
 src/finiteArea/Make/files                     |   1 +
 .../extrapolatedCalculatedFaPatchField.C      | 117 +++++++++++++
 .../extrapolatedCalculatedFaPatchField.H      | 163 ++++++++++++++++++
 .../extrapolatedCalculatedFaPatchFields.C     |  46 +++++
 .../extrapolatedCalculatedFaPatchFields.H     |  50 ++++++
 .../extrapolatedCalculatedFvPatchField.C      |   2 +-
 6 files changed, 378 insertions(+), 1 deletion(-)
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.H

diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index a929066eed..768b2c45fa 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -44,6 +44,7 @@ $(faPatchFields)/faPatchField/faPatchFields.C
 basicFaPatchFields = $(faPatchFields)/basic
 $(basicFaPatchFields)/basicSymmetry/basicSymmetryFaPatchFields.C
 $(basicFaPatchFields)/calculated/calculatedFaPatchFields.C
+$(basicFaPatchFields)/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.C
 $(basicFaPatchFields)/coupled/coupledFaPatchFields.C
 $(basicFaPatchFields)/zeroGradient/zeroGradientFaPatchFields.C
 $(basicFaPatchFields)/fixedValue/fixedValueFaPatchFields.C
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
new file mode 100644
index 0000000000..0b2b6ad6e0
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2023 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 "extrapolatedCalculatedFaPatchField.H"
+#include "faPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::extrapolatedCalculatedFaPatchField<Type>::
+extrapolatedCalculatedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    calculatedFaPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFaPatchField<Type>::
+extrapolatedCalculatedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    calculatedFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
+{
+    calculatedFaPatchField<Type>::operator==(this->patchInternalField());
+}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFaPatchField<Type>::
+extrapolatedCalculatedFaPatchField
+(
+    const extrapolatedCalculatedFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    calculatedFaPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFaPatchField<Type>::
+extrapolatedCalculatedFaPatchField
+(
+    const extrapolatedCalculatedFaPatchField<Type>& ptf
+)
+:
+    calculatedFaPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+Foam::extrapolatedCalculatedFaPatchField<Type>::
+extrapolatedCalculatedFaPatchField
+(
+    const extrapolatedCalculatedFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    calculatedFaPatchField<Type>(ptf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::extrapolatedCalculatedFaPatchField<Type>::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (!this->updated())
+    {
+        this->updateCoeffs();
+    }
+
+    // Set to the internal field
+    faPatchField<Type>::patchInternalField(*this);
+    calculatedFaPatchField<Type>::evaluate();
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
new file mode 100644
index 0000000000..e0f2c6e635
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2016 OpenFOAM Foundation
+    Copyright (C) 2023 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::extrapolatedCalculatedFaPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition applies a zero-gradient condition from the patch
+    internal field onto the patch faces when \c evaluated but may also be
+    assigned.  \c snGrad returns the patch gradient evaluated from the current
+    internal and patch field values rather than returning zero.
+
+Usage
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            extrapolatedCalculated;
+    }
+    \endverbatim
+
+SourceFiles
+    extrapolatedCalculatedFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_extrapolatedCalculatedFaPatchField_H
+#define Foam_extrapolatedCalculatedFaPatchField_H
+
+#include "calculatedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class extrapolatedCalculatedFaPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class extrapolatedCalculatedFaPatchField
+:
+    public calculatedFaPatchField<Type>
+{
+public:
+
+    //- Runtime type information
+    TypeName("extrapolatedCalculated");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        extrapolatedCalculatedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        extrapolatedCalculatedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given patchField onto a new patch
+        extrapolatedCalculatedFaPatchField
+        (
+            const extrapolatedCalculatedFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        extrapolatedCalculatedFaPatchField
+        (
+            const extrapolatedCalculatedFaPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new extrapolatedCalculatedFaPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        extrapolatedCalculatedFaPatchField
+        (
+            const extrapolatedCalculatedFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new extrapolatedCalculatedFaPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Evaluate the patch field
+        virtual void evaluate
+        (
+            const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "extrapolatedCalculatedFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.C b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.C
new file mode 100644
index 0000000000..5fa89f9b34
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "extrapolatedCalculatedFaPatchFields.H"
+#include "faPatchFields.H"
+#include "areaFaMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makeFaPatchFields(extrapolatedCalculated);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.H b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.H
new file mode 100644
index 0000000000..2a9916c6ec
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_extrapolatedCalculatedFaPatchFields_H
+#define Foam_extrapolatedCalculatedFaPatchFields_H
+
+#include "extrapolatedCalculatedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(extrapolatedCalculated);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
index b6c0fa45a3..105e23c4f8 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
@@ -54,7 +54,7 @@ extrapolatedCalculatedFvPatchField
 :
     calculatedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    evaluate();
+    calculatedFvPatchField<Type>::operator==(this->patchInternalField());
 }
 
 

From b519a8e12821efd56f213125f25f8736ac4c6571 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 17:09:17 +0100
Subject: [PATCH 135/348] ENH: add finite-area uniformFixedValue

- deprecate timeVaryingUniformFixed (now redundant)
---
 src/finiteArea/Make/files                     |   1 +
 ...timeVaryingUniformFixedValueFaPatchField.C |   4 +
 .../uniformFixedValueFaPatchField.C           | 163 +++++++++++++++
 .../uniformFixedValueFaPatchField.H           | 189 ++++++++++++++++++
 .../uniformFixedValueFaPatchFields.C          |  40 ++++
 .../uniformFixedValueFaPatchFields.H          |  50 +++++
 .../uniformFixedValueFvPatchField.C           |  22 +-
 .../uniformFixedValueFvPatchField.H           |  10 +-
 .../uniformFixedValueFvPatchFields.C          |  12 +-
 .../uniformFixedValueFvPatchFields.H          |   5 +-
 ...niformNormalFixedValueFvPatchVectorField.C |  20 +-
 ...niformNormalFixedValueFvPatchVectorField.H |   9 +-
 .../uniformFixedValuePointPatchField.C        |  20 +-
 .../uniformFixedValuePointPatchField.H        |  36 ++--
 .../uniformFixedValuePointPatchFields.C       |  12 +-
 .../uniformFixedValuePointPatchFields.H       |   5 +-
 16 files changed, 511 insertions(+), 87 deletions(-)
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H

diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index 768b2c45fa..ea3eb312b9 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -67,6 +67,7 @@ $(derivedFaPatchFields)/outletInlet/outletInletFaPatchFields.C
 $(derivedFaPatchFields)/slip/slipFaPatchFields.C
 $(derivedFaPatchFields)/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
 $(derivedFaPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
+$(derivedFaPatchFields)/uniformFixedValue/uniformFixedValueFaPatchFields.C
 $(derivedFaPatchFields)/clampedPlate/clampedPlateFaPatchFields.C
 
 faePatchFields = fields/faePatchFields
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
index b181cab888..3aeb93c440 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
@@ -60,6 +60,10 @@ timeVaryingUniformFixedValueFaPatchField
     {
         updateCoeffs();
     }
+
+    DeprecatedInFunction(2212)
+        << "Use uniformFixedValue instead." << nl
+        << "    This boundary condition will be removed in the future" << endl;
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
new file mode 100644
index 0000000000..a02dd23823
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformFixedValueFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    fixedValueFaPatchField<Type>(p, iF),
+    refValueFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Field<Type>& fld
+)
+:
+    fixedValueFaPatchField<Type>(p, iF, fld),
+    refValueFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    refValueFunc_
+    (
+        Function1<Type>::New
+        (
+            /* p.patch(), */
+            "uniformValue",
+            dict
+        )
+    )
+{
+    if (this->readValueEntry(dict))
+    {
+        // Full restart
+    }
+    else
+    {
+        this->evaluate();
+    }
+}
+
+
+template<class Type>
+Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
+(
+    const uniformFixedValueFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    fixedValueFaPatchField<Type>(p, iF),   // Don't map
+    refValueFunc_(ptf.refValueFunc_.clone(/*p.patch()*/))
+{
+    if (mapper.direct() && !mapper.hasUnmapped())
+    {
+        // Use mapping instead of re-evaluation
+        this->map(ptf, mapper);
+    }
+    else
+    {
+        // Evaluate since value not mapped
+        this->evaluate();
+    }
+}
+
+
+template<class Type>
+Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
+(
+    const uniformFixedValueFaPatchField<Type>& ptf
+)
+:
+    fixedValueFaPatchField<Type>(ptf),
+    refValueFunc_(ptf.refValueFunc_.clone(/*this->patch().patch()*/))
+{}
+
+
+template<class Type>
+Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
+(
+    const uniformFixedValueFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    fixedValueFaPatchField<Type>(ptf, iF),
+    refValueFunc_(ptf.refValueFunc_.clone(/*this->patch().patch()*/))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformFixedValueFaPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const scalar t = this->db().time().timeOutputValue();
+    faPatchField<Type>::operator==(refValueFunc_->value(t));
+    fixedValueFaPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::uniformFixedValueFaPatchField<Type>::write(Ostream& os) const
+{
+    faPatchField<Type>::write(os);
+    if (refValueFunc_)
+    {
+        refValueFunc_->writeData(os);
+    }
+    faPatchField<Type>::writeValueEntry(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H
new file mode 100644
index 0000000000..7761219779
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::uniformFixedValueFaPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition provides a uniform fixed value condition.
+
+Usage
+    \table
+        Property     | Description                  | Required | Default
+        uniformValue | uniform value                | yes |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            uniformFixedValue;
+        uniformValue    constant 0.2;
+    }
+    \endverbatim
+
+Note
+    The uniformValue entry is a Function1 type,
+    able to describe time varying functions.
+    The example above gives the usage for supplying a constant value.
+
+See also
+    Foam::Function1Types
+    Foam::fixedValueFaPatchField
+
+SourceFiles
+    uniformFixedValueFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformFixedValueFaPatchField_H
+#define Foam_uniformFixedValueFaPatchField_H
+
+#include "fixedValueFaPatchField.H"
+#include "Function1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class uniformFixedValueFaPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class uniformFixedValueFaPatchField
+:
+    public fixedValueFaPatchField<Type>
+{
+    // Private Data
+
+        //- Function providing the value
+        autoPtr<Function1<Type>> refValueFunc_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformFixedValue");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        uniformFixedValueFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        uniformFixedValueFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Field<Type>& fld
+        );
+
+        //- Construct from patch, internal field and dictionary
+        uniformFixedValueFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping onto a new patch
+        uniformFixedValueFaPatchField
+        (
+            const uniformFixedValueFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        uniformFixedValueFaPatchField
+        (
+            const uniformFixedValueFaPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new uniformFixedValueFaPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        uniformFixedValueFaPatchField
+        (
+            const uniformFixedValueFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new uniformFixedValueFaPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "uniformFixedValueFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C
new file mode 100644
index 0000000000..8bacac29af
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformFixedValueFaPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "areaFields.H"
+#include "edgeFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaPatchFields(uniformFixedValue);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H
new file mode 100644
index 0000000000..a4cd5cf48f
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformFixedValueFaPatchFields_H
+#define Foam_uniformFixedValueFaPatchFields_H
+
+#include "uniformFixedValueFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(uniformFixedValue);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index fd74ce7f42..6f75c96bec 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -38,7 +38,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),
-    uniformValue_(nullptr)
+    refValueFunc_(nullptr)
 {}
 
 
@@ -51,7 +51,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, fld),
-    uniformValue_(nullptr)
+    refValueFunc_(nullptr)
 {}
 
 
@@ -64,7 +64,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
-    uniformValue_(PatchFunction1<Type>::New(p.patch(), "uniformValue", dict))
+    refValueFunc_(PatchFunction1<Type>::New(p.patch(), "uniformValue", dict))
 {
     if (!this->readValueEntry(dict))
     {
@@ -83,7 +83,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF),   // Don't map
-    uniformValue_(ptf.uniformValue_.clone(p.patch()))
+    refValueFunc_(ptf.refValueFunc_.clone(p.patch()))
 {
     if (mapper.direct() && !mapper.hasUnmapped())
     {
@@ -105,7 +105,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    uniformValue_(ptf.uniformValue_.clone(this->patch().patch()))
+    refValueFunc_(ptf.refValueFunc_.clone(this->patch().patch()))
 {}
 
 
@@ -117,7 +117,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    uniformValue_(ptf.uniformValue_.clone(this->patch().patch()))
+    refValueFunc_(ptf.refValueFunc_.clone(this->patch().patch()))
 {}
 
 
@@ -130,9 +130,9 @@ void Foam::uniformFixedValueFvPatchField<Type>::autoMap
 )
 {
     fixedValueFvPatchField<Type>::autoMap(mapper);
-    uniformValue_().autoMap(mapper);
+    refValueFunc_().autoMap(mapper);
 
-    if (uniformValue_().constant())
+    if (refValueFunc_().constant())
     {
         // If mapper is not dependent on time we're ok to evaluate
         this->evaluate();
@@ -152,7 +152,7 @@ void Foam::uniformFixedValueFvPatchField<Type>::rmap
     const uniformFixedValueFvPatchField& tiptf =
         refCast<const uniformFixedValueFvPatchField>(ptf);
 
-    uniformValue_().rmap(tiptf.uniformValue_(), addr);
+    refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
 }
 
 
@@ -165,7 +165,7 @@ void Foam::uniformFixedValueFvPatchField<Type>::updateCoeffs()
     }
 
     const scalar t = this->db().time().timeOutputValue();
-    fvPatchField<Type>::operator==(uniformValue_->value(t));
+    fvPatchField<Type>::operator==(refValueFunc_->value(t));
     fixedValueFvPatchField<Type>::updateCoeffs();
 }
 
@@ -174,7 +174,7 @@ template<class Type>
 void Foam::uniformFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    uniformValue_->writeData(os);
+    refValueFunc_->writeData(os);
     fvPatchField<Type>::writeValueEntry(os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index 440b5ca30e..f36be7f976 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -62,8 +62,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniformFixedValueFvPatchField_H
-#define uniformFixedValueFvPatchField_H
+#ifndef Foam_uniformFixedValueFvPatchField_H
+#define Foam_uniformFixedValueFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
 #include "PatchFunction1.H"
@@ -84,8 +84,8 @@ class uniformFixedValueFvPatchField
 {
     // Private Data
 
-        //- Value
-        autoPtr<PatchFunction1<Type>> uniformValue_;
+        //- Function providing the value
+        autoPtr<PatchFunction1<Type>> refValueFunc_;
 
 
 public:
@@ -163,7 +163,7 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
         // Mapping functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C
index 82926df0c3..10bb316d17 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C
@@ -29,17 +29,11 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(uniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makePatchFields(uniformFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H
index 31621ec18f..761395c42e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H
@@ -25,11 +25,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniformFixedValueFvPatchFields_H
-#define uniformFixedValueFvPatchFields_H
+#ifndef Foam_uniformFixedValueFvPatchFields_H
+#define Foam_uniformFixedValueFvPatchFields_H
 
 #include "uniformFixedValueFvPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
index 51b927a815..e2753c5e9b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
@@ -40,7 +40,7 @@ uniformNormalFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    uniformValue_(nullptr),
+    refValueFunc_(nullptr),
     ramp_(nullptr)
 {}
 
@@ -54,7 +54,7 @@ uniformNormalFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
-    uniformValue_(PatchFunction1<scalar>::New(p.patch(), "uniformValue", dict)),
+    refValueFunc_(PatchFunction1<scalar>::New(p.patch(), "uniformValue", dict)),
     ramp_(Function1<scalar>::NewIfPresent("ramp", dict, word::null, &db()))
 {
     if (!this->readValueEntry(dict))
@@ -74,7 +74,7 @@ uniformNormalFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),   // Don't map
-    uniformValue_(ptf.uniformValue_.clone(p.patch())),
+    refValueFunc_(ptf.refValueFunc_.clone(p.patch())),
     ramp_(ptf.ramp_.clone())
 {
     if (mapper.direct() && !mapper.hasUnmapped())
@@ -97,7 +97,7 @@ uniformNormalFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(ptf),
-    uniformValue_(ptf.uniformValue_.clone(this->patch().patch())),
+    refValueFunc_(ptf.refValueFunc_.clone(this->patch().patch())),
     ramp_(ptf.ramp_.clone())
 {}
 
@@ -110,7 +110,7 @@ uniformNormalFixedValueFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(ptf, iF),
-    uniformValue_(ptf.uniformValue_.clone(this->patch().patch())),
+    refValueFunc_(ptf.refValueFunc_.clone(this->patch().patch())),
     ramp_(ptf.ramp_.clone())
 {}
 
@@ -123,9 +123,9 @@ void Foam::uniformNormalFixedValueFvPatchVectorField::autoMap
 )
 {
     fixedValueFvPatchVectorField::autoMap(mapper);
-    uniformValue_().autoMap(mapper);
+    refValueFunc_().autoMap(mapper);
 
-    if (uniformValue_().constant())
+    if (refValueFunc_().constant())
     {
         // If mapper is not dependent on time we're ok to evaluate
         this->evaluate();
@@ -144,7 +144,7 @@ void Foam::uniformNormalFixedValueFvPatchVectorField::rmap
     const uniformNormalFixedValueFvPatchVectorField& tiptf =
         refCast<const uniformNormalFixedValueFvPatchVectorField>(ptf);
 
-    uniformValue_().rmap(tiptf.uniformValue_(), addr);
+    refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
 }
 
 
@@ -157,7 +157,7 @@ void Foam::uniformNormalFixedValueFvPatchVectorField::updateCoeffs()
 
     const scalar t = this->db().time().timeOutputValue();
 
-    tmp<vectorField> tvalues(uniformValue_->value(t)*patch().nf());
+    tmp<vectorField> tvalues(refValueFunc_->value(t)*patch().nf());
 
     if (ramp_)
     {
@@ -172,7 +172,7 @@ void Foam::uniformNormalFixedValueFvPatchVectorField::updateCoeffs()
 void Foam::uniformNormalFixedValueFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchField<vector>::write(os);
-    uniformValue_->writeData(os);
+    refValueFunc_->writeData(os);
     if (ramp_)
     {
         ramp_->writeData(os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.H
index 0ca1c5f20a..2600e37a0c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.H
@@ -64,8 +64,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniformNormalFixedValueFvPatchVectorField_H
-#define uniformNormalFixedValueFvPatchVectorField_H
+#ifndef Foam_uniformNormalFixedValueFvPatchVectorField_H
+#define Foam_uniformNormalFixedValueFvPatchVectorField_H
 
 #include "fvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
@@ -86,9 +86,10 @@ class uniformNormalFixedValueFvPatchVectorField
 {
     // Private Data
 
-        autoPtr<PatchFunction1<scalar>> uniformValue_;
+        //- Function providing the value
+        autoPtr<PatchFunction1<scalar>> refValueFunc_;
 
-        //- Optional time ramping
+        //- Optional ramping
         autoPtr<Function1<scalar>> ramp_;
 
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
index 46f9180ee2..5708eab900 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -60,7 +60,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(p, iF),
-    uniformValue_()
+    refValueFunc_(nullptr)
 {}
 
 
@@ -74,7 +74,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
-    uniformValue_
+    refValueFunc_
     (
         PatchFunction1<Type>::New
         (
@@ -103,7 +103,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(ptf, p, iF, mapper),
-    uniformValue_(ptf.uniformValue_.clone(this->getPatch(p)))
+    refValueFunc_(ptf.refValueFunc_.clone(this->getPatch(p)))
 {
     if (mapper.direct() && !mapper.hasUnmapped())
     {
@@ -126,7 +126,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(ptf),
-    uniformValue_(ptf.uniformValue_.clone(this->getPatch(this->patch())))
+    refValueFunc_(ptf.refValueFunc_.clone(this->getPatch(this->patch())))
 {}
 
 
@@ -139,7 +139,7 @@ uniformFixedValuePointPatchField
 )
 :
     fixedValuePointPatchField<Type>(ptf, iF),
-    uniformValue_(ptf.uniformValue_.clone(this->getPatch(this->patch())))
+    refValueFunc_(ptf.refValueFunc_.clone(this->getPatch(this->patch())))
 {}
 
 
@@ -152,9 +152,9 @@ void Foam::uniformFixedValuePointPatchField<Type>::autoMap
 )
 {
     fixedValuePointPatchField<Type>::autoMap(mapper);
-    uniformValue_().autoMap(mapper);
+    refValueFunc_().autoMap(mapper);
 
-    if (uniformValue_().constant())
+    if (refValueFunc_().constant())
     {
         // If mapper is not dependent on time we're ok to evaluate
         this->evaluate();
@@ -174,7 +174,7 @@ void Foam::uniformFixedValuePointPatchField<Type>::rmap
     const uniformFixedValuePointPatchField& tiptf =
         refCast<const uniformFixedValuePointPatchField>(ptf);
 
-    uniformValue_().rmap(tiptf.uniformValue_(), addr);
+    refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
 }
 
 
@@ -186,7 +186,7 @@ void Foam::uniformFixedValuePointPatchField<Type>::updateCoeffs()
         return;
     }
     const scalar t = this->db().time().timeOutputValue();
-    fixedValuePointPatchField<Type>::operator==(uniformValue_->value(t));
+    fixedValuePointPatchField<Type>::operator==(refValueFunc_->value(t));
     fixedValuePointPatchField<Type>::updateCoeffs();
 }
 
@@ -197,7 +197,7 @@ write(Ostream& os) const
 {
     // Note: write value
     fixedValuePointPatchField<Type>::write(os);
-    uniformValue_->writeData(os);
+    refValueFunc_->writeData(os);
 }
 
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
index cdf99837c4..3a4ce68d21 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -39,17 +39,17 @@ Description
     }
     \endverbatim
 
-    The uniformValue entry is a Function1 type, able to describe time
-    varying functions.  The example above gives the usage for supplying a
-    constant value.
+    The uniformValue entry is a PatchFunction1 type,
+    able to describe time and spatial varying functions.
+    The example above gives the usage for supplying a constant value.
 
 SourceFiles
     uniformFixedValuePointPatchField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniformFixedValuePointPatchField_H
-#define uniformFixedValuePointPatchField_H
+#ifndef Foam_uniformFixedValuePointPatchField_H
+#define Foam_uniformFixedValuePointPatchField_H
 
 #include "fixedValuePointPatchField.H"
 #include "PatchFunction1.H"
@@ -59,10 +59,8 @@ SourceFiles
 namespace Foam
 {
 
-class polyPatch;
-
 /*---------------------------------------------------------------------------*\
-          Class uniformFixedValuePointPatchField Declaration
+              Class uniformFixedValuePointPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -70,16 +68,17 @@ class uniformFixedValuePointPatchField
 :
     public fixedValuePointPatchField<Type>
 {
+    // Private Data
+
+        //- Function providing the value
+        autoPtr<PatchFunction1<Type>> refValueFunc_;
+
+
     // Private Member Functions
 
         static const polyPatch& getPatch(const pointPatch&);
 
 
-    // Private data
-
-        autoPtr<PatchFunction1<Type>> uniformValue_;
-
-
 public:
 
     //- Runtime type information
@@ -155,16 +154,7 @@ public:
         }
 
 
-    // Member functions
-
-        // Access
-
-            //- Return the uniform value
-            const Function1<Type>& uniformValue() const
-            {
-                return uniformValue_;
-            }
-
+    // Member Functions
 
         // Mapping functions
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
index 8f173f4f5e..0595cf7294 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
@@ -29,17 +29,11 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePointPatchFields(uniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makePointPatchFields(uniformFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
index 8e9553450c..de229bc32f 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
@@ -33,11 +33,10 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniformFixedValuePointPatchFields_H
-#define uniformFixedValuePointPatchFields_H
+#ifndef Foam_uniformFixedValuePointPatchFields_H
+#define Foam_uniformFixedValuePointPatchFields_H
 
 #include "uniformFixedValuePointPatchField.H"
-#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 06df44a58870f66dd44a77f70a6f81ae496e7f91 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 9 Mar 2023 09:38:47 +0000
Subject: [PATCH 136/348] COMP: protect against null tmp field (freestream BC)

---
 .../freestream/freestreamFvPatchField.C       | 12 ++++-----
 .../freestream/freestreamFvPatchField.H       | 27 +++++++------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 28f6fe0d48..2e0d93fea8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -38,7 +38,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 )
 :
     inletOutletFvPatchField<Type>(p, iF),
-    freestreamBCPtr_()
+    freestreamBCPtr_(nullptr)
 {}
 
 
@@ -51,7 +51,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 )
 :
     inletOutletFvPatchField<Type>(p, iF),
-    freestreamBCPtr_()
+    freestreamBCPtr_(nullptr)
 {
     fvPatchFieldBase::readDict(dict);
 
@@ -93,7 +93,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 )
 :
     inletOutletFvPatchField<Type>(ptf, p, iF, mapper),
-    freestreamBCPtr_()
+    freestreamBCPtr_(nullptr)
 {
     if (ptf.freestreamBCPtr_)
     {
@@ -110,7 +110,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 )
 :
     inletOutletFvPatchField<Type>(ptf),
-    freestreamBCPtr_()
+    freestreamBCPtr_(nullptr)
 {
     if (ptf.freestreamBCPtr_)
     {
@@ -127,7 +127,7 @@ Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
 )
 :
     inletOutletFvPatchField<Type>(ptf, iF),
-    freestreamBCPtr_()
+    freestreamBCPtr_(nullptr)
 {
     if (ptf.freestreamBCPtr_)
     {
@@ -160,7 +160,7 @@ void Foam::freestreamFvPatchField<Type>::rmap
 
     const auto& fsptf = refCast<const freestreamFvPatchField<Type>>(ptf);
 
-    if (fsptf.freestreamBCPtr_)
+    if (freestreamBCPtr_ && fsptf.freestreamBCPtr_)
     {
         freestreamBCPtr_->rmap(fsptf.freestreamBCPtr_(), addr);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
index 2eae6f72c8..7a86c6db2e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
@@ -83,8 +83,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef freestreamFvPatchField_H
-#define freestreamFvPatchField_H
+#ifndef Foam_freestreamFvPatchField_H
+#define Foam_freestreamFvPatchField_H
 
 #include "inletOutletFvPatchField.H"
 
@@ -102,7 +102,7 @@ class freestreamFvPatchField
 :
     public inletOutletFvPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- BC to supply the freestream value
         tmp<fvPatchField<Type>> freestreamBCPtr_;
@@ -175,7 +175,13 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
+
+    // Access
+
+        const Field<Type>& freestreamValue() const { return this->refValue(); }
+        Field<Type>& freestreamValue() { return this->refValue(); }
+
 
         // Mapping functions
 
@@ -193,19 +199,6 @@ public:
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 
-        // Return defining fields
-
-            const Field<Type>& freestreamValue() const
-            {
-                return this->refValue();
-            }
-
-            Field<Type>& freestreamValue()
-            {
-                return this->refValue();
-            }
-
-
         //- Write
         virtual void write(Ostream&) const;
 };

From 20566a87f5967cfdde753bae4bc21de5c8720c52 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 9 Mar 2023 12:57:41 +0000
Subject: [PATCH 137/348] ENH: provide getter/setter interface to standard
 communicators

- similar to UPstream::parRun(), the setter returns the previous value.

  The accessors are prefixed with 'comm':
  Eg, commGlobal(), commWarn(), commWorld(), commSelf().
  This distinguishes them from any existing variables (eg, worldComm)
  and arguably more similar to MPI_COMM_WORLD etc...

  If demand-driven communicators are added in the future, the function
  call syntax can help encapsulate that.

  Previously:

      const label oldWarnComm = UPstream::warnComm;
      const label oldWorldComm = UPstream::worldComm;
      UPstream::warnComm = myComm;
      UPstream::worldComm = myComm;
      ...

      UPstream::warnComm = oldWarnComm;
      UPstream::worldComm = oldWorldComm;

  Now:
      const label oldWarnComm = UPstream::commWarn(myComm);
      const label oldWorldComm = UPstream::commWorld(myComm);
      ...

      UPstream::commWarn(oldWarnComm);
      UPstream::commWorld(oldWorldComm);

STYLE: check (warnComm >= 0) instead of (warnComm != -1)
---
 .../test/parallel-comm0/Test-parallel-comm0.C | 34 ++++-----
 .../test/parallel-comm1/Test-parallel-comm1.C |  8 +--
 .../test/parallel-comm2/Test-parallel-comm2.C | 30 ++++----
 .../db/IOstreams/Pstreams/PstreamReduceOps.H  |  2 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 34 ++++++++-
 src/OpenFOAM/db/error/messageStream.C         |  2 +-
 .../polyMesh/globalMeshData/globalMeshData.C  |  8 +--
 src/Pstream/mpi/UIPstreamRead.C               |  2 +-
 src/Pstream/mpi/UOPstreamWrite.C              |  2 +-
 src/Pstream/mpi/UPstreamBroadcast.C           |  2 +-
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 20 +++---
 .../utilities/syncObjects/syncObjects.C       | 10 +--
 .../mappedPolyPatch/mappedPatchBase.C         | 37 +++++-----
 .../mappedPatchBaseTemplates.C                | 71 ++++++++++---------
 .../multiWorld/multiWorldConnectionsObject.C  | 21 +++---
 15 files changed, 155 insertions(+), 128 deletions(-)

diff --git a/applications/test/parallel-comm0/Test-parallel-comm0.C b/applications/test/parallel-comm0/Test-parallel-comm0.C
index dc6fdb064f..3abb70d6ba 100644
--- a/applications/test/parallel-comm0/Test-parallel-comm0.C
+++ b/applications/test/parallel-comm0/Test-parallel-comm0.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,7 @@ void printInfo(const label comm)
         << " sub:" << UPstream::subProcs(comm) << nl;
 
 
-    if (UPstream::selfComm == comm)
+    if (UPstream::commSelf() == comm)
     {
         Pout<< "self all:" << UPstream::allProcs(comm)
             << " sub:" << UPstream::subProcs(comm) << nl;
@@ -86,32 +86,32 @@ int main(int argc, char *argv[])
         << "nProcs = " << UPstream::nProcs()
         << " with " << UPstream::nComms() << " predefined comm(s)" << nl;
 
-    Info<< "worldComm : ";
-    printInfo(UPstream::worldComm);
+    Info<< "comm-world : ";
+    printInfo(UPstream::commWorld());
 
-    Info<< "selfComm  : ";
-    printInfo(UPstream::selfComm);
+    Info<< "comm-self  : ";
+    printInfo(UPstream::commSelf());
 
     Info<< nl;
 
     // Reductions (using MPI intrinsics)
     {
-        label val = Pstream::myProcNo(UPstream::worldComm);
+        label val = Pstream::myProcNo(UPstream::commWorld());
 
         label worldVal = returnReduce
         (
             val,
             sumOp<label>(),
-            Pstream::msgType(),
-            UPstream::worldComm
+            UPstream::msgType(),
+            UPstream::commWorld()
         );
 
         label selfVal = returnReduce
         (
             val,
             sumOp<label>(),
-            Pstream::msgType(),
-            UPstream::selfComm
+            UPstream::msgType(),
+            UPstream::commSelf()
         );
 
         Pout<< "value " << val
@@ -123,8 +123,8 @@ int main(int argc, char *argv[])
     {
         Pair<label> val
         (
-            Pstream::myProcNo(UPstream::worldComm),
-            Pstream::myProcNo(UPstream::worldComm)
+            Pstream::myProcNo(UPstream::commWorld()),
+            Pstream::myProcNo(UPstream::commWorld())
         );
 
         Pair<label> worldVal = val;
@@ -133,8 +133,8 @@ int main(int argc, char *argv[])
         (
             worldVal,
             minFirstEqOp<label>(),
-            Pstream::msgType(),
-            UPstream::worldComm
+            UPstream::msgType(),
+            UPstream::commWorld()
         );
 
         Pair<label> selfVal = val;
@@ -143,8 +143,8 @@ int main(int argc, char *argv[])
         (
             worldVal,
             minFirstEqOp<label>(),
-            Pstream::msgType(),
-            UPstream::selfComm
+            UPstream::msgType(),
+            UPstream::commSelf()
         );
 
         Pout<< "value " << val
diff --git a/applications/test/parallel-comm1/Test-parallel-comm1.C b/applications/test/parallel-comm1/Test-parallel-comm1.C
index 635841d6fd..bc856e781c 100644
--- a/applications/test/parallel-comm1/Test-parallel-comm1.C
+++ b/applications/test/parallel-comm1/Test-parallel-comm1.C
@@ -150,11 +150,7 @@ int main(int argc, char *argv[])
     Pout<< "localValue      :" << localValue << endl;
 
 
-    label comm = Pstream::allocateCommunicator
-    (
-        UPstream::worldComm,
-        top
-    );
+    label comm = UPstream::allocateCommunicator(UPstream::worldComm, top);
 
     Pout<< "allocated comm  :" << comm << endl;
     Pout<< "comm myproc     :" << Pstream::myProcNo(comm)
@@ -173,7 +169,7 @@ int main(int argc, char *argv[])
         Pout<< "sum             :" << sum << endl;
     }
 
-    Pstream::freeCommunicator(comm);
+    UPstream::freeCommunicator(comm);
 
 
     Pout<< "End\n" << endl;
diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index a397c9908e..ce77d5b38c 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -88,12 +88,12 @@ int main(int argc, char *argv[])
 
     //- Process IDs within a given communicator
     Info<< "procIDs: "
-        << flatOutput(UPstream::procID(UPstream::worldComm)) << endl;
+        << flatOutput(UPstream::procID(UPstream::commWorld())) << endl;
 
-    rankInfo(UPstream::worldComm);
+    rankInfo(UPstream::commWorld());
     Pout<< endl;
 
-    const int myProci = UPstream::myProcNo(UPstream::worldComm);
+    const int myProci = UPstream::myProcNo(UPstream::commWorld());
     int localRanki = myProci;
 
     labelList subRanks;
@@ -101,9 +101,9 @@ int main(int argc, char *argv[])
 
     #if 1
     // With first ranks
-    subRanks = identity(UPstream::nProcs(UPstream::worldComm) / 2);
+    subRanks = identity(UPstream::nProcs(UPstream::commWorld()) / 2);
 
-    newComm.reset(UPstream::worldComm, subRanks);
+    newComm.reset(UPstream::commWorld(), subRanks);
     localRanki = UPstream::myProcNo(newComm);
 
     Pout.prefix() =
@@ -120,14 +120,14 @@ int main(int argc, char *argv[])
 
     #if 1
     // With every other rank
-    subRanks = identity(UPstream::nProcs(UPstream::worldComm));
+    subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
 
     for (label& val : subRanks)
     {
         if (val % 2) val = -1;
     }
 
-    newComm.reset(UPstream::worldComm, subRanks);
+    newComm.reset(UPstream::commWorld(), subRanks);
     localRanki = UPstream::myProcNo(newComm);
 
     Pout.prefix() =
@@ -165,19 +165,19 @@ int main(int argc, char *argv[])
     }
     if (Pstream::parRun() && args.found("host-comm"))
     {
-        // Host communicator, based on the current worldComm
+        // Host communicator, based on the current world communicator
         // Use hostname
         // Lowest rank per hostname is the IO rank
 
-        label numprocs = UPstream::nProcs(UPstream::globalComm);
+        label numprocs = UPstream::nProcs(UPstream::commGlobal());
 
         stringList hosts(numprocs);
-        hosts[Pstream::myProcNo(UPstream::globalComm)] = hostName();
+        hosts[Pstream::myProcNo(UPstream::commGlobal())] = hostName();
 
         labelList hostIDs_;
 
         // Compact
-        if (Pstream::master(UPstream::globalComm))
+        if (Pstream::master(UPstream::commGlobal()))
         {
             DynamicList<word> hostNames(numprocs);
             hostIDs_.resize_nocopy(numprocs);
@@ -196,10 +196,10 @@ int main(int argc, char *argv[])
             }
         }
 
-        Pstream::broadcasts(UPstream::globalComm, hostIDs_);
+        Pstream::broadcasts(UPstream::commGlobal(), hostIDs_);
 
         const label myHostId =
-            hostIDs_[Pstream::myProcNo(UPstream::globalComm)];
+            hostIDs_[Pstream::myProcNo(UPstream::commGlobal())];
 
         DynamicList<label> subRanks;
         forAll(hostIDs_, proci)
@@ -210,11 +210,11 @@ int main(int argc, char *argv[])
             }
         }
 
-        // Allocate new communicator with globalComm as its parent
+        // Allocate new communicator with global communicator as its parent
         const label hostComm =
             UPstream::allocateCommunicator
             (
-                UPstream::globalComm,  // parent
+                UPstream::commGlobal(),
                 subRanks,
                 true
             );
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index e047d399bb..0bcf41e9ca 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -58,7 +58,7 @@ void reduce
     const label comm
 )
 {
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         Pout<< "** reducing:" << value << " with comm:" << comm << endl;
         error::printStack(Pout);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 14ec039aa1..81b04bc120 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -284,24 +284,52 @@ public:
 
     // Standard Communicators
 
-        //- Default world communicator (all processors).
+        //- Communicator for all ranks.
         //- May differ from globalComm if local worlds are in use
         static label worldComm;
 
         //- Debugging: warn for use of any communicator differing from warnComm
         static label warnComm;
 
-        //- Communicator for all processors, irrespective of any local worlds
+        //- Communicator for all ranks, irrespective of any local worlds
         static constexpr label globalComm = 0;
 
         //- A communicator within the current rank only
         static constexpr label selfComm = 1;
 
+        //- Communicator for all ranks, irrespective of any local worlds
+        static constexpr label commGlobal() noexcept { return 0; }
+
+        //- Communicator within the current rank only
+        static constexpr label commSelf() noexcept { return 1; }
+
+        //- Communicator for all ranks (respecting any local worlds)
+        static label commWorld() noexcept { return worldComm; }
+
+        //- Alter value of world communicator
+        //  \returns the previous value
+        static label commWorld(const label communicator) noexcept
+        {
+            label old(worldComm);
+            worldComm = communicator;
+            return old;
+        }
+
+        //- Alter communicator debugging setting.
+        //- Warns for use of any communicator differing from specified.
+        //  \returns the previous warn communicator
+        static label commWarn(const label communicator) noexcept
+        {
+            label old(warnComm);
+            warnComm = communicator;
+            return old;
+        }
+
         //- Number of currently defined communicators
         static label nComms() noexcept { return parentComm_.size(); }
 
         //- True if communicator appears to be user-allocated
-        static bool isUserComm(label communicator) noexcept
+        static bool isUserComm(const label communicator) noexcept
         {
             return (communicator > worldComm && communicator > selfComm);
         }
diff --git a/src/OpenFOAM/db/error/messageStream.C b/src/OpenFOAM/db/error/messageStream.C
index 55d3db1b22..0953f53d75 100644
--- a/src/OpenFOAM/db/error/messageStream.C
+++ b/src/OpenFOAM/db/error/messageStream.C
@@ -143,7 +143,7 @@ Foam::OSstream& Foam::messageStream::stream(OSstream* alternative)
 
 Foam::OSstream& Foam::messageStream::masterStream(const label communicator)
 {
-    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
     {
         Pout<< "** messageStream with comm:" << communicator << endl;
         error::printStack(Pout);
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index f48ba801e3..b65115d7c7 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -2721,8 +2721,7 @@ void Foam::globalMeshData::updateMesh()
         identity(UPstream::nProcs(UPstream::worldComm)),
         true
     );
-    const label oldWarnComm = UPstream::warnComm;
-    UPstream::warnComm = comm;
+    const label oldWarnComm = UPstream::commWarn(comm);
 
 
     // Total number of faces.
@@ -2760,8 +2759,9 @@ void Foam::globalMeshData::updateMesh()
         comm
     );
 
+    // Restore communicator settings
     UPstream::freeCommunicator(comm);
-    UPstream::warnComm = oldWarnComm;
+    UPstream::commWarn(oldWarnComm);
 
     if (debug)
     {
diff --git a/src/Pstream/mpi/UIPstreamRead.C b/src/Pstream/mpi/UIPstreamRead.C
index e2ecbc0da8..e7bb303da0 100644
--- a/src/Pstream/mpi/UIPstreamRead.C
+++ b/src/Pstream/mpi/UIPstreamRead.C
@@ -114,7 +114,7 @@ Foam::label Foam::UIPstream::read
             << " commsType:" << UPstream::commsTypeNames[commsType]
             << Foam::endl;
     }
-    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
     {
         Pout<< "UIPstream::read : starting read from:" << fromProcNo
             << " tag:" << tag << " comm:" << communicator
diff --git a/src/Pstream/mpi/UOPstreamWrite.C b/src/Pstream/mpi/UOPstreamWrite.C
index 5982e99cae..a971799ac9 100644
--- a/src/Pstream/mpi/UOPstreamWrite.C
+++ b/src/Pstream/mpi/UOPstreamWrite.C
@@ -68,7 +68,7 @@ bool Foam::UOPstream::write
             << " commType:" << UPstream::commsTypeNames[commsType]
             << Foam::endl;
     }
-    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
     {
         Pout<< "UOPstream::write : starting write to:" << toProcNo
             << " tag:" << tag
diff --git a/src/Pstream/mpi/UPstreamBroadcast.C b/src/Pstream/mpi/UPstreamBroadcast.C
index af061bd76c..f5044970c7 100644
--- a/src/Pstream/mpi/UPstreamBroadcast.C
+++ b/src/Pstream/mpi/UPstreamBroadcast.C
@@ -54,7 +54,7 @@ bool Foam::UPstream::broadcast
             << " size:" << label(bufSize)
             << Foam::endl;
     }
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         Pout<< "UPstream::broadcast : root:" << rootProcNo
             << " comm:" << comm
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 92fe2b6852..b93f9d447b 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -78,7 +78,7 @@ void Foam::PstreamDetail::reduce0
         return;
     }
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         Pout<< "** reducing:";
         if (count == 1)
@@ -135,7 +135,7 @@ void Foam::PstreamDetail::allReduce
 
     const bool immediate = (req || requestID);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -246,7 +246,7 @@ void Foam::PstreamDetail::allToAll
 
     const label numProc = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -383,7 +383,7 @@ void Foam::PstreamDetail::allToAllv
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -531,7 +531,7 @@ void Foam::PstreamDetail::allToAllConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         Pout<< "** non-blocking consensus Alltoall (list):";
         Pout<< " numProc:" << numProc
@@ -717,7 +717,7 @@ void Foam::PstreamDetail::allToAllConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         Pout<< "** non-blocking consensus Alltoall (map):";
         Pout<< " numProc:" << numProc
@@ -911,7 +911,7 @@ void Foam::PstreamDetail::gather
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -1037,7 +1037,7 @@ void Foam::PstreamDetail::scatter
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -1165,7 +1165,7 @@ void Foam::PstreamDetail::gatherv
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -1317,7 +1317,7 @@ void Foam::PstreamDetail::scatterv
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
diff --git a/src/functionObjects/utilities/syncObjects/syncObjects.C b/src/functionObjects/utilities/syncObjects/syncObjects.C
index 06776eae3b..cd5b2c2a64 100644
--- a/src/functionObjects/utilities/syncObjects/syncObjects.C
+++ b/src/functionObjects/utilities/syncObjects/syncObjects.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,8 +80,7 @@ void Foam::functionObjects::syncObjects::sync()
         return;
     }
 
-    const label oldWarnComm = UPstream::warnComm;
-    UPstream::warnComm = 0;
+    const label oldWarnComm = UPstream::commWarn(UPstream::commGlobal());
 
 
     // Send my data to all other processors
@@ -90,7 +89,7 @@ void Foam::functionObjects::syncObjects::sync()
     // Note provision of explicit all-world communicator
     PstreamBuffers pBufs
     (
-        UPstream::globalComm,
+        UPstream::commGlobal(),
         UPstream::commsTypes::nonBlocking
     );
 
@@ -164,7 +163,8 @@ void Foam::functionObjects::syncObjects::sync()
     //    Pout<< type() << " : after synchronisation:" << allDict << endl;
     //}
 
-    UPstream::warnComm = oldWarnComm;
+    // Restore communicator settings
+    UPstream::commWarn(oldWarnComm);
 }
 
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 7c1ed9f155..92421c80f5 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -133,7 +133,7 @@ Foam::label Foam::mappedPatchBase::getWorldCommunicator() const
 {
     if (sameWorld())
     {
-        return UPstream::worldComm;
+        return UPstream::commWorld();
     }
 
     const Time& runTime = patch_.boundaryMesh().mesh().time();
@@ -187,8 +187,7 @@ void Foam::mappedPatchBase::collectSamples
     const label myRank = Pstream::myProcNo(myComm);
     const label nProcs = Pstream::nProcs(myComm);
 
-    const label oldWarnComm(Pstream::warnComm);
-    Pstream::warnComm = myComm;
+    const label oldWarnComm = UPstream::commWarn(myComm);
 
     if (debug & 2)
     {
@@ -265,7 +264,8 @@ void Foam::mappedPatchBase::collectSamples
         }
     }
 
-    Pstream::warnComm = oldWarnComm;
+    // Restore communicator settings
+    UPstream::commWarn(oldWarnComm);
 }
 
 
@@ -591,8 +591,7 @@ void Foam::mappedPatchBase::findSamples
     const label myRank = Pstream::myProcNo(myComm);
     const label nProcs = Pstream::nProcs(myComm);
 
-    const label oldWarnComm(Pstream::warnComm);
-    Pstream::warnComm = myComm;
+    const label oldWarnComm = UPstream::commWarn(myComm);
 
     wordList samplePatches(nProcs);
     {
@@ -711,7 +710,8 @@ void Foam::mappedPatchBase::findSamples
         }
     }
 
-    Pstream::warnComm = oldWarnComm;
+    // Return communicator settings
+    UPstream::commWarn(oldWarnComm);
 }
 
 
@@ -1105,9 +1105,6 @@ void Foam::mappedPatchBase::calcAMI() const
     // Pre-calculate surface (if any)
     const auto& surf = surfPtr();
 
-    const label oldWorldComm(Pstream::worldComm);
-    const label oldWarnComm(Pstream::warnComm);
-
     // Check if running locally
     if (sampleWorld_.empty() || sameWorld())
     {
@@ -1143,13 +1140,14 @@ void Foam::mappedPatchBase::calcAMI() const
         // weights.
 
         // Change to use inter-world communicator
-        Pstream::worldComm = myComm;
-        Pstream::warnComm = Pstream::worldComm;
+        const label oldWarnComm = UPstream::commWarn(myComm);
+        const label oldWorldComm = UPstream::commWorld(myComm);
 
         AMIPtr_->calculate(patch_, nbrPatch0, surf);
 
-        Pstream::warnComm = oldWarnComm;
-        Pstream::worldComm = oldWorldComm;
+        // Restore communicator settings
+        UPstream::commWarn(oldWarnComm);
+        UPstream::commWorld(oldWorldComm);
     }
     else
     {
@@ -1162,8 +1160,8 @@ void Foam::mappedPatchBase::calcAMI() const
         );
 
         // Change to use inter-world communicator
-        Pstream::worldComm = myComm;
-        Pstream::warnComm = Pstream::worldComm;
+        const label oldWarnComm = UPstream::commWarn(myComm);
+        const label oldWorldComm = UPstream::commWorld(myComm);
 
         if (masterWorld())
         {
@@ -1182,8 +1180,9 @@ void Foam::mappedPatchBase::calcAMI() const
         // Now the AMI addressing/weights will be from src side (on masterWorld
         // processors) to tgt side (on other processors)
 
-        Pstream::warnComm = oldWarnComm;
-        Pstream::worldComm = oldWorldComm;
+        // Restore communicator settings
+        UPstream::commWarn(oldWarnComm);
+        UPstream::commWorld(oldWorldComm);
     }
 }
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
index 7e93773202..e4ee68ab43 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,17 +30,14 @@ template<class Type>
 void Foam::mappedPatchBase::distribute(List<Type>& lst) const
 {
     const label myComm = getCommunicator();  // Get or create
-    const label oldWarnComm(Pstream::warnComm);
 
     switch (mode_)
     {
         case NEARESTPATCHFACEAMI:
         {
-            const label oldWorldComm(Pstream::worldComm);
             const auto& interp = AMI();
-
-            Pstream::warnComm = myComm;
-            Pstream::worldComm = myComm;
+            const label oldWarnComm = UPstream::commWarn(myComm);
+            const label oldWorldComm = UPstream::commWorld(myComm);
 
             if (sameWorld())
             {
@@ -87,17 +84,20 @@ void Foam::mappedPatchBase::distribute(List<Type>& lst) const
                     lst = tmasterFld;
                 }
             }
-            Pstream::worldComm = oldWorldComm;
-            Pstream::warnComm = oldWarnComm;
+
+            // Restore communicator settings
+            UPstream::commWarn(oldWarnComm);
+            UPstream::commWorld(oldWorldComm);
             break;
         }
         default:
         {
             const auto& m = map();
+            const label oldWarnComm = UPstream::commWarn(m.comm());
 
-            Pstream::warnComm = m.comm();
             m.distribute(lst);
-            Pstream::warnComm = oldWarnComm;
+
+            UPstream::commWarn(oldWarnComm);
         }
     }
 }
@@ -111,19 +111,19 @@ void Foam::mappedPatchBase::distribute
 ) const
 {
     const label myComm = getCommunicator();  // Get or create
-    const label oldWarnComm(Pstream::warnComm);
 
     switch (mode_)
     {
         case NEARESTPATCHFACEAMI:
         {
-            const label oldWorldComm(Pstream::worldComm);
             const auto& interp = AMI();
-            Pstream::warnComm = myComm;
-            Pstream::worldComm = myComm;
+            const label oldWarnComm = UPstream::commWarn(myComm);
+            const label oldWorldComm = UPstream::commWorld(myComm);
+
             lst = interp.interpolateToSource(Field<Type>(std::move(lst)), cop);
-            Pstream::worldComm = oldWorldComm;
-            Pstream::warnComm = oldWarnComm;
+
+            UPstream::commWarn(oldWarnComm);
+            UPstream::commWorld(oldWorldComm);
             break;
         }
         default:
@@ -132,7 +132,7 @@ void Foam::mappedPatchBase::distribute
             (void)patch_.boundaryMesh().mesh().tetBasePtIs();
             const auto& m = map();
 
-            Pstream::warnComm = myComm;
+            const label oldWarnComm = UPstream::commWarn(myComm);
             mapDistributeBase::distribute
             (
                 Pstream::defaultCommsType,
@@ -149,7 +149,7 @@ void Foam::mappedPatchBase::distribute
                 UPstream::msgType(),
                 myComm
             );
-            Pstream::warnComm = oldWarnComm;
+            UPstream::commWarn(oldWarnComm);
         }
     }
 }
@@ -159,19 +159,19 @@ template<class Type>
 void Foam::mappedPatchBase::reverseDistribute(List<Type>& lst) const
 {
     const label myComm = getCommunicator();  // Get or create
-    const label oldWarnComm(Pstream::warnComm);
 
     switch (mode_)
     {
         case NEARESTPATCHFACEAMI:
         {
-            const label oldWorldComm(Pstream::worldComm);
             const auto& interp = AMI();
-            Pstream::warnComm = myComm;
-            Pstream::worldComm = myComm;
+            const label oldWarnComm = UPstream::commWarn(myComm);
+            const label oldWorldComm = UPstream::commWorld(myComm);
+
             lst = interp.interpolateToTarget(Field<Type>(std::move(lst)));
-            Pstream::worldComm = oldWorldComm;
-            Pstream::warnComm = oldWarnComm;
+
+            UPstream::commWarn(oldWarnComm);
+            UPstream::commWorld(oldWorldComm);
             break;
         }
         default:
@@ -180,9 +180,9 @@ void Foam::mappedPatchBase::reverseDistribute(List<Type>& lst) const
             (void)patch_.boundaryMesh().mesh().tetBasePtIs();
             const auto& m = map();
 
-            Pstream::warnComm = m.comm();
+            const label oldWarnComm = UPstream::commWarn(m.comm());
             m.reverseDistribute(sampleSize(), lst);
-            Pstream::warnComm = oldWarnComm;
+            UPstream::commWarn(oldWarnComm);
             break;
         }
     }
@@ -197,19 +197,19 @@ void Foam::mappedPatchBase::reverseDistribute
 ) const
 {
     const label myComm = getCommunicator();  // Get or create
-    const label oldWarnComm(Pstream::warnComm);
 
     switch (mode_)
     {
         case NEARESTPATCHFACEAMI:
         {
-            const label oldWorldComm(Pstream::worldComm);
             const auto& interp = AMI();
-            Pstream::warnComm = myComm;
-            Pstream::worldComm = myComm;
+            const label oldWarnComm = UPstream::commWarn(myComm);
+            const label oldWorldComm = UPstream::commWorld(myComm);
+
             lst = interp.interpolateToTarget(Field<Type>(std::move(lst)), cop);
-            Pstream::worldComm = oldWorldComm;
-            Pstream::warnComm = oldWarnComm;
+
+            UPstream::commWarn(oldWarnComm);
+            UPstream::commWorld(oldWorldComm);
             break;
         }
         default:
@@ -217,7 +217,9 @@ void Foam::mappedPatchBase::reverseDistribute
             (void)patch_.boundaryMesh().mesh().tetBasePtIs();
             const auto& m = map();
             const label cSize = sampleSize();
-            Pstream::warnComm = myComm;
+
+            const label oldWarnComm = UPstream::commWarn(myComm);
+
             mapDistributeBase::distribute
             (
                 Pstream::defaultCommsType,
@@ -234,7 +236,8 @@ void Foam::mappedPatchBase::reverseDistribute
                 UPstream::msgType(),
                 myComm
             );
-            Pstream::warnComm = oldWarnComm;
+
+            UPstream::commWarn(oldWarnComm);
             break;
         }
     }
diff --git a/src/meshTools/multiWorld/multiWorldConnectionsObject.C b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
index 43e736228b..8b752d289a 100644
--- a/src/meshTools/multiWorld/multiWorldConnectionsObject.C
+++ b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -162,7 +162,8 @@ Foam::label Foam::multiWorldConnections::createCommunicator(const edge& worlds)
     }
 
     // Allocate new communicator with global world
-    comm = UPstream::allocateCommunicator(UPstream::globalComm, subRanks, true);
+    comm =
+        UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks, true);
 
     if (debug & 2)
     {
@@ -234,10 +235,8 @@ void Foam::multiWorldConnections::createComms()
 
 
     // Use MPI_COMM_WORLD
-    const label oldWorldComm(UPstream::worldComm);
-    const label oldWarnComm(UPstream::warnComm);
-    UPstream::worldComm = UPstream::globalComm;
-    UPstream::warnComm = UPstream::worldComm;
+    const label oldWarnComm = UPstream::commWarn(UPstream::commGlobal());
+    const label oldWorldComm = UPstream::commWorld(UPstream::commGlobal());
 
     if (Pstream::parRun())
     {
@@ -258,8 +257,9 @@ void Foam::multiWorldConnections::createComms()
 
     if (brokenConnections)
     {
-        Pstream::warnComm = oldWarnComm;
-        Pstream::worldComm = oldWorldComm;
+        // Restore communicator settings
+        UPstream::commWarn(oldWarnComm);
+        UPstream::commWorld(oldWorldComm);
 
         FatalErrorInFunction
             << "Has " << brokenConnections
@@ -286,8 +286,9 @@ void Foam::multiWorldConnections::createComms()
             }
         }
 
-        Pstream::warnComm = oldWarnComm;
-        Pstream::worldComm = oldWorldComm;
+        // Restore communicator settings
+        UPstream::commWarn(oldWarnComm);
+        UPstream::commWorld(oldWorldComm);
     }
 
     if (debug)

From 25bc7d65f78f59de0f12018136498e6f9fc6e41b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Mar 2023 13:44:46 +0000
Subject: [PATCH 138/348] STYLE: prefer REGISTER/NO_REGISTER instead of
 true/false for IOobject

- self-documenting
---
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.C |  2 +-
 .../combustion/chemFoam/createBaseFields.H    |  6 +-
 .../heatTransfer/thermoFoam/createFields.H    |  2 +-
 .../createMeshesPostProcess.H                 |  4 +-
 .../liquidPropertiesSurfaceTension.C          |  2 +-
 .../laserDTRM/laserDTRM.C                     |  2 +-
 .../localDensityAbsorptionEmission.C          |  6 +-
 ...temperaturePhaseChangeTwoPhaseMixtureNew.C |  2 +-
 .../interFoam/interMixingFoam/alphaEqn.H      |  2 +-
 .../phaseChangeTwoPhaseMixtureNew.C           |  2 +-
 .../test/CompactIOList/Test-CompactIOList.C   |  8 +--
 .../test/PatchFunction1/Test-PatchFunction1.C |  4 +-
 .../Test-checkDecomposePar.C                  |  2 +-
 .../Test-decomposedBlockData.C                |  2 +-
 .../Test-fvSolutionCombine.C                  |  2 +-
 .../Test-mapDistributePolyMesh.C              |  2 +-
 .../searchableSphere/Test-searchableSphere.C  |  2 +-
 .../Test-surfaceMeshConvert.C                 |  2 +-
 .../makeFaMesh/findMeshDefinitionDict.H       |  2 +-
 .../conversion/ccm/foamToCcm/getTimeIndex.H   |  2 +-
 .../conversion/foamToFireMesh/getTimeIndex.H  |  2 +-
 .../conversion/foamToStarMesh/getTimeIndex.H  |  2 +-
 .../conversion/foamToSurface/getTimeIndex.H   |  2 +-
 .../generation/PDRblockMesh/PDRblockMesh.C    |  2 +-
 .../generation/blockMesh/findBlockMeshDict.H  |  2 +-
 .../extrude/extrudeMesh/extrudeMesh.C         |  4 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C | 18 +++---
 .../extrude2DMesh/extrude2DMeshApp.C          |  4 +-
 .../backgroundMeshDecomposition.C             |  2 +-
 .../cellShapeControlMesh.C                    |  4 +-
 .../fileControl/fileControl.C                 | 24 ++------
 .../conformalVoronoiMeshIO.C                  | 10 ++--
 .../foamyHexMeshBackgroundMesh.C              |  4 +-
 .../foamyHexMeshSurfaceSimplify.C             |  4 +-
 .../foamyHexMeshSurfaceSimplify_non_octree.C  |  4 +-
 .../foamyMesh/foamyQuadMesh/foamyQuadMesh.C   |  2 +-
 .../mesh/manipulation/checkMesh/writeFields.C | 60 +++++++++----------
 .../manipulation/flattenMesh/flattenMesh.C    |  2 +-
 .../mesh/manipulation/mirrorMesh/mirrorMesh.C |  2 +-
 .../manipulation/renumberMesh/renumberMesh.C  | 12 ++--
 .../mesh/manipulation/rotateMesh/rotateMesh.C |  2 +-
 .../splitMeshRegions/splitMeshRegions.C       | 14 ++---
 .../transformPoints/transformPoints.C         |  2 +-
 .../foamFormatConvert/foamFormatConvert.C     |  4 +-
 .../foamFormatConvert/writeMeshObject.H       |  6 +-
 .../helpBoundary/helpBoundaryTemplates.C      |  2 +-
 .../decomposePar/decomposePar.C               | 12 ++--
 .../decomposePar/domainDecomposition.C        | 10 ++--
 .../decomposePar/domainDecompositionDryRun.C  |  2 +-
 .../domainDecompositionDryRunWrite.C          |  2 +-
 .../decomposePar/domainDecompositionWrite.C   |  2 +-
 .../reconstructPar/reconstructPar.C           |  8 +--
 .../reconstructParMesh/reconstructParMesh.C   |  8 +--
 .../parLagrangianDistributorTemplates.C       | 10 ++--
 .../redistributePar/redistributePar.C         |  8 +--
 .../foamToEnsight/checkMeshMoving.H           |  2 +-
 .../foamToEnsight/getTimeIndex.H              |  2 +-
 .../dataConversion/foamToEnsight/readFields.C |  2 +-
 .../dataConversion/foamToGMV/moveMesh.H       |  2 +-
 .../profilingSummary/profilingSummary.C       |  2 +-
 .../temporalInterpolate/temporalInterpolate.C |  2 +-
 .../cumulativeDisplacement/createFields.H     |  2 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   |  6 +-
 .../changeDictionary/changeDictionary.C       |  4 +-
 .../createZeroDirectory/boundaryInfo.C        |  5 +-
 .../createZeroDirectory/solverTemplate.C      |  2 +-
 .../faceAgglomerate/faceAgglomerate.C         |  2 +-
 .../foamUpgradeCyclics/foamUpgradeCyclics.C   |  6 +-
 .../mapFields/MapLagrangianFields.H           |  6 +-
 .../preProcessing/mapFields/mapFields.C       |  4 +-
 .../mapFieldsPar/MapLagrangianFields.H        |  6 +-
 .../preProcessing/mapFieldsPar/mapFieldsPar.C |  2 +-
 .../preProcessing/mdInitialise/mdInitialise.C |  2 +-
 .../writeMorpherCPs/writeMorpherCPs.C         |  6 +-
 .../setExprBoundaryFields.C                   |  2 +-
 .../setExprFields/setExprFields.C             |  2 +-
 .../setTurbulenceFields/setTurbulenceFields.C |  4 +-
 .../viewFactorsGen/viewFactorsGen.C           |  6 +-
 .../surfaceBooleanFeatures.C                  |  2 +-
 .../surfaceFeatureExtract.C                   |  4 +-
 .../surfaceMeshConvert/surfaceMeshConvert.C   |  2 +-
 .../surfaceMeshExport/surfaceMeshExport.C     |  2 +-
 .../surfaceMeshImport/surfaceMeshImport.C     |  2 +-
 .../equilibriumCO/equilibriumCO.C             |  3 +-
 src/OpenFOAM/db/regIOobject/regIOobject.H     |  2 +-
 .../turbulenceModels/LES/LESModel/LESModel.C  |  4 +-
 .../turbulenceModels/RAS/RASModel/RASModel.C  |  4 +-
 .../RAS/kEpsilonPhitF/kEpsilonPhitF.C         |  2 +-
 .../TurbulenceModel/TurbulenceModel.C         |  4 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |  2 +-
 ...UTabulatedWallFunctionFvPatchScalarField.C |  4 +-
 .../omegaWallFunctionFvPatchScalarField.C     |  2 +-
 .../eddyViscosity/eddyViscosity.C             |  2 +-
 .../turbulenceModels/laminar/Stokes/Stokes.C  |  2 +-
 .../laminar/laminarModel/laminarModel.C       | 14 ++---
 .../turbulenceModels/RAS/kL/kL.C              |  4 +-
 src/combustionModels/EDC/EDC.C                |  2 +-
 .../combustionModelTemplates.C                |  2 +-
 .../diffusionMulticomponent.C                 |  6 +-
 src/combustionModels/laminar/laminar.C        |  2 +-
 .../noCombustion/noCombustion.C               |  2 +-
 src/conversion/ccm/reader/ccmReader.C         |  2 +-
 src/conversion/ccm/reader/ccmReaderAux.C      | 10 ++--
 src/conversion/ccm/writer/ccmWriterMesh.C     |  4 +-
 src/conversion/ccm/writer/ccmWriterSolution.C |  4 +-
 src/conversion/common/reader/meshReaderAux.C  |  8 +--
 src/conversion/common/tables/boundaryRegion.C |  4 +-
 src/conversion/common/tables/cellTable.C      |  4 +-
 src/conversion/starcd/STARCDMeshWriter.C      |  2 +-
 .../dynamicFvMesh/dynamicFvMesh.C             |  4 +-
 .../dynamicFvMesh/dynamicFvMeshNew.C          |  2 +-
 .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C |  4 +-
 .../dynamicMotionSolverListFvMesh.C           | 12 ++--
 .../dynamicMultiMotionSolverFvMesh.C          |  2 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 12 ++--
 .../simplifiedDynamicFvMesh.C                 |  2 +-
 .../multiDirRefinement/multiDirRefinement.C   |  6 +-
 .../motionSmoother/motionSmootherAlgo.C       |  2 +-
 .../motionSmootherAlgoTemplates.C             |  2 +-
 .../componentDisplacementMotionSolver.C       |  4 +-
 .../displacementInterpolationMotionSolver.C   |  2 +-
 .../displacementLayeredMotionMotionSolver.C   |  4 +-
 .../points0/points0MotionSolver.C             |  4 +-
 ...yMotionDisplacementPointPatchVectorField.C |  2 +-
 .../polyMeshFilter/polyMeshFilter.C           |  2 +-
 .../polyTopoChange/hexRef8/hexRef8.C          |  2 +-
 .../engineMesh/engineMesh/engineMeshNew.C     |  2 +-
 src/engine/engineTime/engineTime/engineTime.C |  2 +-
 .../edgeInterpolation/edgeInterpolation.C     | 10 ++--
 .../general/SRF/SRFModel/SRFModel/SRFModel.C  |  2 +-
 .../SRF/SRFModel/SRFModel/SRFModelNew.C       |  4 +-
 .../general/fvOptions/fvOptionListTemplates.C |  4 +-
 .../expressions/base/fvExprDriverI.H          |  2 +-
 ...lectrostaticDepositionFvPatchScalarField.C |  2 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  2 +-
 .../CrankNicolsonDdtScheme.C                  |  2 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  2 +-
 .../backwardDdtScheme/backwardDdtScheme.C     |  2 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C |  2 +-
 .../steadyStateDdtScheme.C                    |  2 +-
 .../invDistLeastSquaresVectors.C              |  4 +-
 .../leastSquaresGrad/leastSquaresVectors.C    |  4 +-
 .../unweightedLeastSquaresVectors.C           |  4 +-
 .../limitedSnGrad/limitedSnGrad.C             |  4 +-
 .../solvers/MULES/CMULESTemplates.C           |  4 +-
 .../fvMatrices/solvers/MULES/MULESTemplates.C |  4 +-
 .../extendedCellToFaceStencilTemplates.C      |  2 +-
 ...extendedUpwindCellToFaceStencilTemplates.C |  2 +-
 .../basic/basicFvGeometryScheme.C             |  8 +--
 src/finiteVolume/fvMesh/fvMesh.C              | 12 ++--
 .../fvMesh/fvMeshTools/fvMeshTools.C          |  8 +--
 .../fvMesh/fvMeshTools/fvMeshToolsProcAddr.C  |  4 +-
 .../constraint/cyclicACMI/cyclicACMIFvPatch.C |  2 +-
 .../columnFvMesh/columnFvMesh.C               |  4 +-
 .../columnFvMesh/columnFvMeshTemplates.C      |  2 +-
 .../advectionDiffusionPatchDistMethod.C       |  2 +-
 .../directionalMeshWavePatchDistMethod.C      |  2 +-
 .../limitedSchemes/blended/blended.H          |  4 +-
 .../limitedSchemes/upwind/upwind.H            |  2 +-
 .../schemes/cubic/cubic.H                     |  2 +-
 .../schemes/linearUpwind/linearUpwind.C       |  4 +-
 .../schemes/linearUpwind/linearUpwindV.C      |  2 +-
 .../schemes/midPoint/midPoint.H               |  2 +-
 .../skewCorrected/skewCorrectionVectors.C     |  2 +-
 .../field/DMD/DMDModels/derived/STDMD/STDMD.C |  4 +-
 .../DMDModels/derived/STDMD/STDMDTemplates.C  |  4 +-
 src/functionObjects/field/age/age.C           |  4 +-
 .../fieldCoordinateSystemTransform.C          |  4 +-
 src/functionObjects/field/pressure/pressure.C |  2 +-
 .../resolutionIndexModel.C                    |  2 +-
 .../field/writeCellCentres/writeCellCentres.C |  4 +-
 .../field/writeCellVolumes/writeCellVolumes.C |  2 +-
 .../lagrangian/cloudInfo/cloudInfo.C          |  2 +-
 .../lagrangian/dataCloud/dataCloud.C          |  2 +-
 .../lagrangian/vtkCloud/vtkCloud.C            |  2 +-
 .../electricPotential/electricPotential.C     | 10 ++--
 .../solvers/energyTransport/energyTransport.C |  8 +--
 .../utilities/solverInfo/solverInfo.C         |  2 +-
 .../writeDictionary/writeDictionary.C         |  2 +-
 .../inverseVolume/inverseVolumeDiffusivity.C  |  2 +-
 ...polatedDisplacementPointPatchVectorField.C |  2 +-
 .../jouleHeatingSource/jouleHeatingSource.C   |  2 +-
 .../Templates/KinematicCloud/KinematicCloud.C |  8 +--
 .../KinematicCloud/KinematicCloudI.H          |  8 +--
 .../Templates/ReactingCloud/ReactingCloud.C   |  2 +-
 .../Templates/ReactingCloud/ReactingCloudI.H  |  8 +--
 .../Templates/ThermoCloud/ThermoCloud.C       | 10 ++--
 .../Templates/ThermoCloud/ThermoCloudI.H      |  6 +-
 .../MPPIC/AveragingMethods/Basic/Basic.C      |  2 +-
 .../cloudAbsorptionEmission.C                 |  6 +-
 .../scatter/cloudScatter/cloudScatter.C       |  2 +-
 .../mdTools/createAutoCorrelationFunctions.H  |  2 +-
 .../molecule/moleculeCloud/moleculeCloud.C    |  2 +-
 .../potential/potential/potential.C           |  4 +-
 .../blockMesh/blockMesh/blockMeshTopology.C   |  2 +-
 .../displacementMotionSolverMeshMover.C       |  4 +-
 .../medialAxisMeshMover.C                     |  8 +--
 .../meshRefinement/meshRefinement.C           |  8 +--
 .../meshRefinement/meshRefinementBaffles.C    |  4 +-
 .../meshRefinement/meshRefinementBlock.C      | 13 ++--
 .../refinementFeatures/refinementFeatures.C   |  4 +-
 .../snappyHexMeshDriver/snappyLayerDriver.C   | 12 ++--
 .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C | 10 ++--
 .../edgeFormats/edgeMesh/edgeMeshFormat.C     |  4 +-
 .../edgeMesh/edgeFormats/vtk/VTKedgeFormat.C  |  2 +-
 .../extendedEdgeMesh/extendedEdgeMeshFormat.C |  2 +-
 .../mappedPolyPatch/mappedPatchBaseI.H        |  4 +-
 .../searchableExtrudedCircle.C                |  2 +-
 .../cellSources/fieldToCell/fieldToCell.C     |  4 +-
 .../faceSources/holeToFace/holeToFace.C       |  8 +--
 src/meshTools/topoSet/topoSets/topoBitSet.C   |  4 +-
 src/meshTools/topoSet/topoSets/topoBoolSet.C  |  4 +-
 .../displacementMethod/displacementMethod.C   |  2 +-
 .../displacementMethoddisplacementLaplacian.C |  6 +-
 ...displacementMethodelasticityMotionSolver.C |  6 +-
 .../displacementMethodlaplacianMotionSolver.C |  6 +-
 .../displacementMethodvelocityLaplacian.C     |  6 +-
 .../linearUpwindNormal/linearUpwindNormal.C   |  2 +-
 .../adjointEikonalSolverIncompressible.C      |  2 +-
 .../lineSearch/lineSearch/lineSearch.C        |  2 +-
 .../optMeshMovementBezier.C                   |  2 +-
 ...ntVolumetricBSplinesExternalMotionSolver.C |  2 +-
 .../optimisationManager/optimisationManager.C |  4 +-
 .../shapeOptimisationIncompressible.C         |  2 +-
 .../fromFile/fromFile.C                       |  2 +-
 .../volBSplinesBase/volBSplinesBase.C         |  2 +-
 .../variablesSet/variablesSetTemplates.C      |  4 +-
 .../adjointRASModel/adjointRASModel.C         |  4 +-
 .../adjointTurbulenceModel.C                  |  4 +-
 .../RAS/RASModelVariables/RASModelVariables.C |  4 +-
 .../cellCellStencil/cellCellStencil.C         |  2 +-
 .../cellCellStencilTemplates.C                |  2 +-
 .../cellVolumeWeightCellCellStencil.C         |  4 +-
 .../inverseDistanceCellCellStencil.C          |  4 +-
 src/overset/oversetFvMesh/oversetFvMeshBase.C | 10 ++--
 .../oversetFvMeshBaseTemplates.C              |  2 +-
 .../decompose/decompose/decompositionModel.C  |  2 +-
 .../decompose/dimFieldDecomposerTemplates.C   |  2 +-
 .../decompose/fvFieldDecomposerTemplates.C    |  2 +-
 .../lagrangianFieldDecomposerTemplates.C      |  4 +-
 .../decompose/pointFieldDecomposerTemplates.C |  2 +-
 .../manualDecomp/manualDecomp.C               | 27 +++++----
 .../faDecompose/faMeshDecomposition.C         |  6 +-
 .../faReconstruct/faMeshReconstructor.C       |  2 +-
 .../reconstruct/reconstruct/processorMeshes.C |  2 +-
 .../dragModels/interface/interface.C          |  2 +-
 .../multiphaseSystem/multiphaseSystemNew.C    |  4 +-
 .../BlendedInterfacialModel.C                 |  4 +-
 .../multiphaseSystem/multiphaseSystemNew.C    |  4 +-
 .../Schaeffer/SchaefferFrictionalStress.C     |  4 +-
 .../twoPhaseSystem/twoPhaseSystemNew.C        |  4 +-
 .../JohnsonJacksonSchaefferFrictionalStress.C |  2 +-
 .../Schaeffer/SchaefferFrictionalStress.C     |  2 +-
 .../BlendedInterfacialModel.C                 | 10 ++--
 .../constantDiameter/constantDiameter.C       |  2 +-
 .../liftModels/noLift/noLift.C                |  6 +-
 .../noTurbulentDispersion.C                   |  2 +-
 .../constantVirtualMassCoefficient.C          |  2 +-
 .../noWallLubrication/noWallLubrication.C     |  4 +-
 .../KirchhoffShell/KirchhoffShell.C           |  2 +-
 .../thermalShell/thermalShell.C               |  6 +-
 .../pyrolysisModel/pyrolysisModelNew.C        |  2 +-
 .../functionObjects/filmFlux/filmFlux.C       |  2 +-
 .../kinematicSingleLayer.C                    | 10 ++--
 .../surfaceFilmModels/noFilm/noFilm.C         |  6 +-
 .../contactAngleForce/contactAngleForce.C     |  2 +-
 .../constantHeatTransfer.C                    |  2 +-
 .../waxSolventEvaporation.C                   |  4 +-
 .../surfaceFilmModel/surfaceFilmModelNew.C    |  2 +-
 .../thermoSingleLayer/thermoSingleLayer.C     | 10 ++--
 .../thermalBaffleModels/noThermo/noThermo.C   |  2 +-
 .../thermalBaffle/thermalBaffle.C             |  2 +-
 .../thermalBaffleModelNew.C                   |  4 +-
 .../manualRenumber/manualRenumber.C           | 30 +++++-----
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.C |  6 +-
 .../rigidBodyMeshMotionSolver.C               |  4 +-
 src/sampling/probes/probesTemplates.C         |  2 +-
 .../sampledSet/sampledSets/sampledSetsImpl.C  |  2 +-
 .../triSurfaceMeshPointSet.C                  |  2 +-
 .../isoSurface/sampledIsoSurface.C            |  2 +-
 .../sampledCuttingPlane/sampledCuttingPlane.C |  4 +-
 .../sampledMeshedSurface.C                    |  2 +-
 .../sampledSurface/sampledSurfaceTemplates.C  |  2 +-
 .../sampledThresholdCellFaces.C               |  2 +-
 .../surface/cutting/cuttingPlaneCuts.C        |  2 +-
 .../surface/cutting/cuttingSurfaceCuts.C      |  4 +-
 .../surface/distanceSurface/distanceSurface.C |  4 +-
 .../surface/isoSurface/isoSurfaceCell.C       |  2 +-
 .../surface/isoSurface/isoSurfacePoint.C      |  4 +-
 .../isoSurface/isoSurfacePointTemplates.C     |  2 +-
 .../surface/isoSurface/isoSurfaceTopo.C       |  2 +-
 .../sixDoFRigidBodyMotionSolver.C             |  6 +-
 src/surfMesh/MeshedSurface/MeshedSurface.C    |  2 +-
 .../MeshedSurfaceProxy/MeshedSurfaceProxy.C   |  6 +-
 src/surfMesh/surfMesh/surfMeshIO.C            |  8 +--
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     |  2 +-
 .../writers/debug/debugSurfaceWriter.C        |  6 +-
 .../basic/basicThermo/basicThermoTemplates.C  |  8 +--
 .../basic/heThermo/heThermo.C                 | 16 ++---
 .../StandardChemistryModel.C                  |  4 +-
 .../TDACChemistryModel/TDACChemistryModel.C   |  2 +-
 .../basicChemistryModelTemplates.C            |  2 +-
 .../laminarFlameSpeed/Gulders/Gulders.C       |  4 +-
 .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C |  4 +-
 .../RaviPetersen/RaviPetersen.C               |  4 +-
 .../laminarFlameSpeed/constant/constant.C     |  2 +-
 .../laminarFlameSpeed/laminarFlameSpeedNew.C  |  2 +-
 .../createIncompressibleRadiationModel.H      |  2 +-
 .../radiation/radiationModels/P1/P1.C         |  2 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.C       |  4 +-
 .../radiationModel/radiationModelNew.C        |  4 +-
 .../solarLoad/faceShading/faceShading.C       |  2 +-
 .../radiationModels/solarLoad/solarLoad.C     |  4 +-
 .../radiationModels/viewFactor/viewFactor.C   | 20 +++----
 .../absorptionEmissionModel.C                 | 12 ++--
 .../constantAbsorptionEmission.C              |  6 +-
 .../boundaryRadiationProperties.C             |  2 +-
 .../constantScatter/constantScatter.C         |  2 +-
 .../scatterModel/noScatter/noScatter.C        |  2 +-
 .../psiuReactionThermo/heheuPsiThermo.C       | 10 ++--
 .../basicSolidChemistryModelNew.C             |  6 +-
 .../pyrolysisChemistryModel.C                 |  6 +-
 .../solidChemistryModel/solidChemistryModel.C |  2 +-
 .../linearValveFvMesh/linearValveFvMesh.C     |  6 +-
 .../linearValveLayersFvMesh.C                 |  6 +-
 .../mixerFvMesh/mixerFvMesh.C                 |  6 +-
 .../movingConeTopoFvMesh.C                    |  6 +-
 .../rawTopoChangerFvMeshTemplates.C           |  2 +-
 .../constant/constantSurfaceTension.C         |  2 +-
 .../temperatureDependentSurfaceTension.C      |  2 +-
 src/waveModels/waveModel/waveModelNew.C       |  2 +-
 .../makePerturbation/makePerturbation.C       |  2 +-
 .../laminar/sloshing2D/makeWave/makeWave.C    |  2 +-
 333 files changed, 706 insertions(+), 740 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
index 857f071c1d..084ffc1aef 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@@ -109,7 +109,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(Nv.dimensions(), Zero)
diff --git a/applications/solvers/combustion/chemFoam/createBaseFields.H b/applications/solvers/combustion/chemFoam/createBaseFields.H
index 80dea2584b..9431d042d2 100644
--- a/applications/solvers/combustion/chemFoam/createBaseFields.H
+++ b/applications/solvers/combustion/chemFoam/createBaseFields.H
@@ -12,7 +12,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar("Ydefault", dimless, 1)
@@ -29,7 +29,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar("p", dimPressure, p0)
@@ -46,7 +46,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar("T", dimTemperature, T0)
diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H
index 7c0a8b2c95..7b12c48794 100644
--- a/applications/solvers/heatTransfer/thermoFoam/createFields.H
+++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H
@@ -44,7 +44,7 @@ IOobject turbulencePropertiesHeader
     mesh,
     IOobject::MUST_READ_IF_MODIFIED,
     IOobject::NO_WRITE,
-    false
+    IOobject::NO_REGISTER
 );
 
 if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(false))
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H b/applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H
index 6dabcba73b..0d5bb1c7ee 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createMeshesPostProcess.H
@@ -9,7 +9,7 @@ IOobject io
     mesh,
     IOobject::READ_IF_PRESENT,
     IOobject::NO_WRITE,
-    false
+    IOobject::NO_REGISTER
 );
 
 if (io.typeHeaderOk<IOdictionary>())
@@ -32,4 +32,4 @@ if (io.typeHeaderOk<IOdictionary>())
     );
 }
 
-
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
index 78a9e7ce45..f2f259dbc5 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
@@ -84,7 +84,7 @@ Foam::surfaceTensionModels::liquidProperties::sigma() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimSigma
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
index 422b4d364d..f27015326b 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
@@ -724,7 +724,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::laserDTRM::Rp() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimPower/dimVolume/pow4(dimTemperature), Zero)
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/localDensityAbsorptionEmission/localDensityAbsorptionEmission.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/localDensityAbsorptionEmission/localDensityAbsorptionEmission.C
index 98a663e22e..11225dc2a1 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/localDensityAbsorptionEmission/localDensityAbsorptionEmission.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/localDensityAbsorptionEmission/localDensityAbsorptionEmission.C
@@ -97,7 +97,7 @@ Foam::radiation::localDensityAbsorptionEmission::aCont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(inv(dimLength), Zero)
@@ -130,7 +130,7 @@ Foam::radiation::localDensityAbsorptionEmission::eCont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(inv(dimLength), Zero)
@@ -163,7 +163,7 @@ Foam::radiation::localDensityAbsorptionEmission::ECont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C
index 0de3d22ae3..686dce38ef 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C
@@ -46,7 +46,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
index 9c1017e617..36c7aa00fe 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
@@ -30,7 +30,7 @@
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimless,
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
index db6564ffa1..46801b5053 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
@@ -48,7 +48,7 @@ Foam::phaseChangeTwoPhaseMixture::New
             U.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/test/CompactIOList/Test-CompactIOList.C b/applications/test/CompactIOList/Test-CompactIOList.C
index 66d5b8dd7e..0db36f346c 100644
--- a/applications/test/CompactIOList/Test-CompactIOList.C
+++ b/applications/test/CompactIOList/Test-CompactIOList.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             size
         );
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             size
         );
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/test/PatchFunction1/Test-PatchFunction1.C b/applications/test/PatchFunction1/Test-PatchFunction1.C
index 33343e7608..72ab0692a7 100644
--- a/applications/test/PatchFunction1/Test-PatchFunction1.C
+++ b/applications/test/PatchFunction1/Test-PatchFunction1.C
@@ -92,8 +92,8 @@ int main(int argc, char *argv[])
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedVector(Zero)
diff --git a/applications/test/checkDecomposePar/Test-checkDecomposePar.C b/applications/test/checkDecomposePar/Test-checkDecomposePar.C
index 5cc6bb2311..d616b013c7 100644
--- a/applications/test/checkDecomposePar/Test-checkDecomposePar.C
+++ b/applications/test/checkDecomposePar/Test-checkDecomposePar.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/test/decomposedBlockData/Test-decomposedBlockData.C b/applications/test/decomposedBlockData/Test-decomposedBlockData.C
index 81d62397cd..42df38b775 100644
--- a/applications/test/decomposedBlockData/Test-decomposedBlockData.C
+++ b/applications/test/decomposedBlockData/Test-decomposedBlockData.C
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
index 9a3e8b1810..ded4fe6062 100644
--- a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
+++ b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
index 554dbce72b..ea17c1a878 100644
--- a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
+++ b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/test/searchableSphere/Test-searchableSphere.C b/applications/test/searchableSphere/Test-searchableSphere.C
index ae76fd437f..672319706b 100644
--- a/applications/test/searchableSphere/Test-searchableSphere.C
+++ b/applications/test/searchableSphere/Test-searchableSphere.C
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
         *dummyTimePtr,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false  // do not register
+        IOobject::NO_REGISTER
     );
 
     Info<< "Testing searchable sphere" << endl;
diff --git a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index ecfead0f7e..fe7781ebeb 100644
--- a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -510,7 +510,7 @@ int main(int argc, char *argv[])
                     runTime,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 std::move(surf)
             );
diff --git a/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H b/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H
index a5697ea69e..956b3e3bf7 100644
--- a/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H
+++ b/applications/utilities/finiteArea/makeFaMesh/findMeshDefinitionDict.H
@@ -74,7 +74,7 @@ autoPtr<IOdictionary> meshDictPtr;
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false,  // no registerObject
+        IOobject::NO_REGISTER,
         true    // is globalObject
     );
 
diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H b/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H
index b8cb089b4b..a0c0283461 100644
--- a/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H
@@ -16,7 +16,7 @@
             runTime,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (io.typeHeaderOk<IOdictionary>(true))
diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H
index 8d6660c96e..aff8a90269 100644
--- a/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H
@@ -16,7 +16,7 @@
             runTime,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (io.typeHeaderOk<IOdictionary>(true))
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
index 8d6660c96e..aff8a90269 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/getTimeIndex.H
@@ -16,7 +16,7 @@
             runTime,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (io.typeHeaderOk<IOdictionary>(true))
diff --git a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
index 8d6660c96e..aff8a90269 100644
--- a/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
+++ b/applications/utilities/mesh/conversion/foamToSurface/getTimeIndex.H
@@ -16,7 +16,7 @@
             runTime,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (io.typeHeaderOk<IOdictionary>(true))
diff --git a/applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C b/applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C
index 75fbbe7016..f6907cad1c 100644
--- a/applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C
+++ b/applications/utilities/mesh/generation/PDRblockMesh/PDRblockMesh.C
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
                 runTime,            // registry
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false  // Do not register
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H b/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H
index 43f4ffecb6..5dab776091 100644
--- a/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H
+++ b/applications/utilities/mesh/generation/blockMesh/findBlockMeshDict.H
@@ -73,7 +73,7 @@ autoPtr<IOdictionary> meshDictPtr;
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (!meshDictIO.typeHeaderOk<IOdictionary>(true))
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 7ea12e1f2a..05e0748824 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -679,7 +679,7 @@ int main(int argc, char *argv[])
                         runTimeExtruded,        //mesh,
                         IOobject::READ_IF_PRESENT,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     )
                 )
             );
@@ -774,7 +774,7 @@ int main(int argc, char *argv[])
                 runTimeExtruded,
                 IOobject::READ_IF_PRESENT,  // Read fv* if present
                 IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh
         );
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 154cc796cb..320a1127f0 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -1272,7 +1272,7 @@ void extrudeGeometricProperties
             regionMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         regionMesh.nFaces()
     );
@@ -1356,7 +1356,7 @@ void extrudeGeometricProperties
             regionMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         regionMesh.nCells()
     );
@@ -2389,10 +2389,10 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
-        Zero,
-        false
+        Foam::zero{},
+        false  // syncPar
     );
 
     // Add the new patches
@@ -2559,7 +2559,7 @@ int main(int argc, char *argv[])
             regionMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         extruder.cellToFaceMap()
     );
@@ -2575,7 +2575,7 @@ int main(int argc, char *argv[])
             regionMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         extruder.faceToFaceMap()
     );
@@ -2592,7 +2592,7 @@ int main(int argc, char *argv[])
             regionMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         extruder.faceToEdgeMap()
     );
@@ -2609,7 +2609,7 @@ int main(int argc, char *argv[])
             regionMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         extruder.pointToPointMap()
     );
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 7b235d8c48..a469731d12 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
             runTimeExtruded,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
                 runTimeExtruded,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             std::move(poly2DMesh.points()),
             std::move(poly2DMesh.faces()),
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 3589c67ba8..d2e9024d75 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -726,7 +726,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
             runTime_,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
     meshCutter_
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index ab7bf54aad..3df705a82c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -387,7 +387,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             );
 
             if (io.typeHeaderOk<pointScalarField>(true))
@@ -404,7 +404,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
                         mesh.time(),
                         IOobject::MUST_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     )
                 );
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
index 93381d0b3e..08f8cb4046 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
@@ -176,55 +176,43 @@ void Foam::fileControl::initialVertices
 {
     Info<< "    Reading points from file     : " << pointsFile_ << endl;
 
-    pointIOField pointsTmp
+    pts = pointIOField::readContents
     (
         IOobject
         (
             pointsFile_,
             runTime_.constant(),
             runTime_,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
+            IOobject::MUST_READ
         )
     );
 
-    pts.transfer(pointsTmp);
-
     Info<< "    Reading sizes from file      : " << sizesFile_ << endl;
 
-    scalarIOField sizesTmp
+    sizes = scalarIOField::readContents
     (
         IOobject
         (
             sizesFile_,
             runTime_.constant(),
             runTime_,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
+            IOobject::MUST_READ
         )
     );
 
-    sizes.transfer(sizesTmp);
-
     Info<< "    Reading alignments from file : " << alignmentsFile_ << endl;
 
-    triadIOField alignmentsTmp
+    alignments = triadIOField::readContents
     (
         IOobject
         (
             alignmentsFile_,
             runTime_.constant(),
             runTime_,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
+            IOobject::MUST_READ
         )
     );
 
-    alignments.transfer(alignmentsTmp);
-
     if ((pts.size() != sizes.size()) || (pts.size() != alignments.size()))
     {
         FatalErrorInFunction
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 150262b2aa..02de7ee380 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -299,8 +299,8 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //                "tetDualMesh"/polyMesh::meshSubDir,
 //                runTime_,
 //                IOobject::NO_READ,
-//                IOobject::AUTO_WRITE,
-//                false
+//                IOobject::NO_WRITE,
+//                IOobject::NO_REGISTER
 //            ),
 //            labelUIndList
 //            (
@@ -346,8 +346,8 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //                    "tetDualMesh"/polyMesh::meshSubDir,
 //                    runTime_,
 //                    IOobject::NO_READ,
-//                    IOobject::AUTO_WRITE,
-//                    false
+//                    IOobject::NO_WRITE,
+//                    IOobject::NO_REGISTER
 //                ),
 //                points
 //            );
@@ -605,7 +605,7 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
                 runTime_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             patchNames,
             patchDicts
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index add0d3c80f..b17e8c7c26 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -603,7 +603,7 @@ int main(int argc, char *argv[])
                 fvm.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvm,
             dimensionedScalar(dimLength, Zero)
@@ -668,7 +668,7 @@ int main(int argc, char *argv[])
                 fvm.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pointMesh::New(fvm),
             dimensionedScalar(dimLength, Zero)
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
index 2a355d70c1..05ab5e6714 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
@@ -619,8 +619,8 @@ int main(int argc, char *argv[])
                 "triSurface",
                 runTime,            // registry
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             s
         );
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
index 442c83c700..e8f565ba51 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
@@ -327,8 +327,8 @@ int main(int argc, char *argv[])
                 "triSurface",
                 runTime,            // registry
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             s
         );
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index cc27297870..861db5e472 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         std::move(poly2DMesh.points()),
         std::move(poly2DMesh.faces()),
diff --git a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
index 94dccc6712..690fba9c5e 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
@@ -134,8 +134,8 @@ void writeSurfaceField
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
@@ -193,8 +193,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -227,8 +227,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -279,8 +279,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -316,8 +316,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -351,8 +351,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -386,8 +386,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -416,8 +416,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -445,8 +445,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimVolume, Zero),
@@ -476,8 +476,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -511,8 +511,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar("minTetVolume", dimless, GREAT),
@@ -577,8 +577,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar("minPyrVolume", dimless, GREAT),
@@ -650,8 +650,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -701,8 +701,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(scalar(-1)),
@@ -740,8 +740,8 @@ void Foam::writeFields
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(scalar(-1)),
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 7e1ded5c6b..c9fe1967d8 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index 978cb86662..126a03e2a9 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index e15c5f84fb..48c28c3ce3 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -73,7 +73,7 @@ tmp<volScalarField> createScalarField
 (
     const fvMesh& mesh,
     const word& name,
-    const labelList& elems
+    const labelUList& elems
 )
 {
     tmp<volScalarField> tfld
@@ -87,7 +87,7 @@ tmp<volScalarField> createScalarField
                 mesh,
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -1343,7 +1343,7 @@ int main(int argc, char *argv[])
                 mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
         refData.updateMesh(map());
@@ -1387,7 +1387,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 map().cellMap()
             ).write();
@@ -1402,7 +1402,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 map().faceMap()
             ).write();
@@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 map().pointMap()
             ).write();
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index d2e53138ea..19405995ef 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index f902ff600f..13667b2a23 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -913,7 +913,7 @@ void createAndWriteRegion
             newMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         map().pointMap()
     );
@@ -932,7 +932,7 @@ void createAndWriteRegion
             newMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         newMesh().nFaces()
     );
@@ -970,7 +970,7 @@ void createAndWriteRegion
             newMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         map().cellMap()
     );
@@ -989,7 +989,7 @@ void createAndWriteRegion
             newMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         labelList(nNewPatches, -1)
     );
@@ -1409,7 +1409,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             cellRegion
         );
@@ -1429,7 +1429,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
@@ -1716,7 +1716,7 @@ int main(int argc, char *argv[])
                 mesh,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh
         );
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 0e96f21c30..05335a7f32 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -414,7 +414,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index d45307c33e..45734f1ef5 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -106,7 +106,7 @@ bool writeZones
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     bool writeOk = false;
@@ -214,7 +214,7 @@ bool writeOptionalMeshObject
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     bool writeOk = false;
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H b/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
index cff97e5454..7dffa76576 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
+++ b/applications/utilities/miscellaneous/foamFormatConvert/writeMeshObject.H
@@ -31,8 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeMeshObject_H
-#define writeMeshObject_H
+#ifndef Foam_writeMeshObject_H
+#define Foam_writeMeshObject_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,7 +59,7 @@ inline bool writeMeshObject
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     bool writeOk = false;
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
index 9e2faa1794..9a51d225f7 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
@@ -94,7 +94,7 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensioned<Type>(dimless, Zero)
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index f8bdc64af5..8916b01f6f 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -189,7 +189,7 @@ autoPtr<labelIOList> procAddressing
             procMesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false  // do not register
+            IOobject::NO_REGISTER
         )
     );
 }
@@ -505,7 +505,7 @@ int main(int argc, char *argv[])
                     runTime,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 decompDictFile,
                 args.getOrDefault<label>("domains", 0),
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
                         runTime,
                         IOobject::MUST_READ,
                         IOobject::NO_WRITE,
-                        false       // do not register
+                        IOobject::NO_REGISTER
                     ),
                     decompDictFile
                 )
@@ -653,7 +653,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             decompDictFile
         );
@@ -683,7 +683,7 @@ int main(int argc, char *argv[])
                         mesh,
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     procIds
                 );
@@ -816,7 +816,7 @@ int main(int argc, char *argv[])
                         mesh,
                         IOobject::READ_IF_PRESENT,
                         IOobject::NO_WRITE,
-                        false  // not registered
+                        IOobject::NO_REGISTER
                     );
 
                     if (io.typeHeaderOk<faBoundaryMesh>(true))
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 5efad485c8..5a72003470 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -91,7 +91,7 @@ Foam::domainDecomposition::domainDecomposition
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
       : nullptr
@@ -221,7 +221,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             *this,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -767,7 +767,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
                     procMesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 std::move(procPoints)
             );
@@ -831,7 +831,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
                 procMesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             baseMeshData,
             procCellAddressing_[proci],
@@ -907,7 +907,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             procMesh.thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false  // not registered
+            IOobject::NO_REGISTER
         );
 
         // pointProcAddressing
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRun.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRun.C
index 060ad804e8..c80f791515 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRun.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRun.C
@@ -153,7 +153,7 @@ void Foam::domainDecompositionDryRun::execute
 //                mesh_,
 //                IOobject::NO_READ,
 //                IOobject::NO_WRITE,
-//                false
+//                IOobject::NO_REGISTER
 //            ),
 //            std::move(cellToProc)
 //        );
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
index e7b4ad0d7d..3d0cae7c28 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
@@ -48,7 +48,7 @@ void Foam::domainDecompositionDryRun::writeVolField
             this->mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh(),
         dimensionedScalar("cellDist", dimless, -1),
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
index 81cf5088e2..8b432d5032 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
@@ -49,7 +49,7 @@ void Foam::domainDecomposition::writeVolField
             this->mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh(),
         dimensionedScalar("cellDist", dimless, -1),
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index da63e26e21..2ab54d02bd 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -780,7 +780,7 @@ int main(int argc, char *argv[])
                                 procMesh,
                                 IOobject::READ_IF_PRESENT,
                                 IOobject::NO_WRITE,
-                                false
+                                IOobject::NO_REGISTER
                             )
                         )
                     );
@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
                         mesh,
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     cellMaps,
                     pointMaps,
@@ -853,7 +853,7 @@ int main(int argc, char *argv[])
                                 procMesh,
                                 IOobject::READ_IF_PRESENT,
                                 IOobject::NO_WRITE,
-                                false
+                                IOobject::NO_REGISTER
                             )
                         )
                     );
@@ -895,7 +895,7 @@ int main(int argc, char *argv[])
                         mesh,
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     cellMaps,
                     pointMaps,
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 8a680c3dd9..9223893474 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -353,7 +353,7 @@ boundBox procBounds
                 procDb,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -382,7 +382,7 @@ void writeDistribution
             masterMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         masterMesh.nCells()
     );
@@ -418,7 +418,7 @@ void writeDistribution
                 masterMesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             masterMesh,
             dimensionedScalar("cellDist", dimless, -1),
@@ -498,7 +498,7 @@ void writeMaps
         procMesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false                       // Do not register
+        IOobject::NO_REGISTER
     );
 
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
index 401456f0d6..6bfb38094c 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
@@ -114,7 +114,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFields
                 srcMesh_,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             label(0)
         );
@@ -130,7 +130,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFields
             tgtMesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (field.size())
@@ -218,7 +218,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFieldFields
                 srcMesh_,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             label(0)
         );
@@ -235,7 +235,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFieldFields
             tgtMesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (field.size())
@@ -363,7 +363,7 @@ Foam::label Foam::parLagrangianDistributor::distributeStoredFields
             tgtMesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (field.size())
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 0ce18f312e..5f960cf1a4 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -397,7 +397,7 @@ void writeDecomposition
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         decomp
     );
@@ -415,7 +415,7 @@ void writeDecomposition
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false                   // do not register
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(name, dimless, -1),
@@ -891,7 +891,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         hexRef8Data refData(io);
@@ -2592,7 +2592,7 @@ int main(int argc, char *argv[])
                             areaProcMeshPtr->thisDb(),
                             IOobject::NO_READ,
                             IOobject::NO_WRITE,
-                            false
+                            IOobject::NO_REGISTER
                         ),
                         faDistMap
                     ).write();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
index cbd5f35cd4..a1d4550002 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
@@ -49,7 +49,7 @@ if (timeDirs.size() > 1)
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false  // no register
+                    IOobject::NO_REGISTER
                 ).typeHeaderOk<pointIOField>(true, false)
             )
             {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/getTimeIndex.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/getTimeIndex.H
index f27848bf92..5fa3c329c1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/getTimeIndex.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/getTimeIndex.H
@@ -42,7 +42,7 @@ label timeIndex = 0;
             runTime,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false   // no register
+            IOobject::NO_REGISTER
         );
 
         if (io.typeHeaderOk<IOdictionary>(true, false))
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.C
index 6977d8bf58..a9e92f80ad 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.C
@@ -55,7 +55,7 @@ Foam::label Foam::checkData
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false  // no register
+                    IOobject::NO_REGISTER
                 ).typeHeaderOk<volScalarField>(false, false);
 
             if (!good)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
index 11f692b684..b9eeb6f341 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H
@@ -7,7 +7,7 @@
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false  // no register
+        IOobject::NO_REGISTER
     );
 
     if (io.typeHeaderOk<pointIOField>(true, false))
diff --git a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
index c2d0a56a37..da3e60947a 100644
--- a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
+++ b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false, // no register
+                IOobject::NO_REGISTER,
                 true   // global-like
             )
         );
diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
index be8f32bced..3fcff80021 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
@@ -169,7 +169,7 @@ void fieldInterpolator::interpolate()
                         objects_[fieldName]->db(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     fieldName,
                     selectedTimeNames,
diff --git a/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/createFields.H b/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/createFields.H
index 0fee3dd334..759fbf29bc 100644
--- a/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/createFields.H
+++ b/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/createFields.H
@@ -10,7 +10,7 @@
                 mesh,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
     );
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index c072c06826..06b6275fa8 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -84,7 +84,7 @@ void blendField
         mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (fieldHeader.typeHeaderOk<volScalarField>(true))
@@ -122,7 +122,7 @@ void calcOmegaField
         mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (omegaHeader.typeHeaderOk<volScalarField>(true))
@@ -159,7 +159,7 @@ void setField
         mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (fldHeader.typeHeaderOk<volScalarField>(true))
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index c1aaf562c2..bf9ba8911a 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -548,7 +548,7 @@ int main(int argc, char *argv[])
                 mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
         const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
@@ -672,7 +672,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::MUST_READ_IF_MODIFIED,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 );
 
                 if (fieldHeader.typeHeaderOk<localIOdictionary>(false))
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
index c9a11c870a..3be107a0da 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
@@ -59,7 +59,7 @@ Foam::IOPtrList<Foam::entry> Foam::boundaryInfo::readBoundaryDict
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -75,8 +75,7 @@ Foam::IOPtrList<Foam::entry> Foam::boundaryInfo::readBoundaryDict
         if (!procPatch)
         {
             label nFaces = dict.get<label>("nFaces");
-            reduce(nFaces, sumOp<label>());
-            if (nFaces == 0)
+            if (returnReduceAnd(nFaces == 0))
             {
                 addPatch = false;
             }
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
index 2d8a64cd20..a49c975bae 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
@@ -108,7 +108,7 @@ Foam::dictionary Foam::solverTemplate::readFluidFieldTemplates
                     runTime,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 )
             );
 
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index bf18cdaae8..0ea21872f4 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         boundary.size()
     );
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index f4fd3589a3..f1c9fca80a 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -287,7 +287,7 @@ void rewriteField
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
     const_cast<word&>(IOdictionary::typeName) = oldTypeName;
@@ -455,7 +455,7 @@ int main(int argc, char *argv[])
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (io.typeHeaderOk<IOPtrList<entry>>(false))
@@ -489,7 +489,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (io.typeHeaderOk<IOPtrList<entry>>(false))
diff --git a/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
index 285f80f411..d62f4256a8 100644
--- a/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
@@ -82,7 +82,7 @@ void MapLagrangianFields
                     meshTarget,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 addParticles.size()
             );
@@ -121,7 +121,7 @@ void MapLagrangianFields
                     meshTarget,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 addParticles.size()
             );
@@ -159,7 +159,7 @@ void MapLagrangianFields
                     meshTarget,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 addParticles.size()
             );
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 8b5b24dd29..ef9ff31580 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -67,7 +67,7 @@ int readNumProcs
                     runTime,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false // do not register
+                    IOobject::NO_REGISTER
                 ),
                 args.getOrDefault<fileName>(optionName, "")
             )
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
                 runTimeTarget,
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
index 18cba7b9ec..7f142c0221 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
@@ -81,7 +81,7 @@ void MapLagrangianFields
                     meshTarget,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 addParticles.size()
             );
@@ -123,7 +123,7 @@ void MapLagrangianFields
                     meshTarget,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 min(fieldSource.size(), addParticles.size()) // handle 0 size
             );
@@ -172,7 +172,7 @@ void MapLagrangianFields
                     meshTarget,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 min(fieldSource.size(), addParticles.size()) // handle 0 size
             );
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
index cb610d4549..09c61e1f1b 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
                 runTimeTarget,
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
index 57d8196344..573e002931 100644
--- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
+++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/applications/utilities/preProcessing/optimisation/writeMorpherCPs/writeMorpherCPs.C b/applications/utilities/preProcessing/optimisation/writeMorpherCPs/writeMorpherCPs.C
index 27bbec71d7..905915f859 100644
--- a/applications/utilities/preProcessing/optimisation/writeMorpherCPs/writeMorpherCPs.C
+++ b/applications/utilities/preProcessing/optimisation/writeMorpherCPs/writeMorpherCPs.C
@@ -47,16 +47,14 @@ int main(int argc, char *argv[])
 
     const dictionary NURBSdict
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 mesh.time().constant(),
                 mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).subDict("volumetricBSplinesMotionSolverCoeffs")
     );
diff --git a/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFields.C b/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFields.C
index 588cc1e453..74355c2df8 100644
--- a/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFields.C
+++ b/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFields.C
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
                 mesh.thisDb(),
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             );
 
             const bool headOk = fieldHeader.typeHeaderOk<IOdictionary>(false);
diff --git a/applications/utilities/preProcessing/setExprFields/setExprFields.C b/applications/utilities/preProcessing/setExprFields/setExprFields.C
index 2d493cd022..9704b34ab0 100644
--- a/applications/utilities/preProcessing/setExprFields/setExprFields.C
+++ b/applications/utilities/preProcessing/setExprFields/setExprFields.C
@@ -163,7 +163,7 @@ bool setField
                 mesh.thisDb(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false  // No register
+                IOobject::NO_REGISTER
             ),
             mesh
         );
diff --git a/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C b/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
index 71d945503a..b274677ed6 100644
--- a/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
+++ b/applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C
@@ -148,7 +148,7 @@ IOobject createIOobject
             mesh,
             rOpt,
             IOobject::NO_WRITE,
-            false // do not register
+            IOobject::NO_REGISTER
         );
 }
 
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false  // do not register
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimless, scalar(1)),
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index 69fad1c6d1..c8b74c6b42 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -480,7 +480,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -824,7 +824,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         nCoarseFaces
     );
@@ -1273,7 +1273,7 @@ int main(int argc, char *argv[])
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         std::move(globalFaceFaces)
     );
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index e44dfd6fcb..5cc5d909e5 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1811,7 +1811,7 @@ int main(int argc, char *argv[])
                 runTime,                    // registry
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             feMesh.points(),
             feMesh.edges()
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 6b70328df7..f7c45eddcf 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -639,8 +639,8 @@ int main(int argc, char *argv[])
                     "triSurface",
                     runTime,                    // registry
                     IOobject::NO_READ,
-                    IOobject::AUTO_WRITE,
-                    false
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
                 feMesh.points(),
                 feMesh.edges()
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index a76ab2af02..3b81e3545a 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             args.getOrDefault<fileName>("dict", "")
         );
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index cc9b33e51e..260ae19217 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             args.getOrDefault<fileName>("dict", "")
         );
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 702b49b5a4..03cb91a96e 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             args.getOrDefault<fileName>("dict", "")
         );
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 5816495b30..cb555bcca6 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -81,12 +81,11 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
 
-
     const scalar P = 1e5;
     const scalar T = 3000.0;
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index f7060a5e7b..bdd4d9ec25 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -147,7 +147,7 @@ public:
         regIOobject(const regIOobject& rio, bool registerCopy);
 
         //- Copy construct with new name, transferring registry registration
-        //- to the copy f registerCopy is true
+        //- to the copy if registerCopy is true
         regIOobject(const word& newName, const regIOobject&, bool registerCopy);
 
         //- Copy construct with new IO parameters
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 1608a5682a..45373c6c60 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -147,9 +147,9 @@ Foam::LESModel<BasicTurbulenceModel>::New
             IOobject::groupName(propertiesName, alphaRhoPhi.group()),
             U.time().constant(),
             U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index 43b5745d88..661f65ebba 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -129,9 +129,9 @@ Foam::RASModel<BasicTurbulenceModel>::New
             IOobject::groupName(propertiesName, alphaRhoPhi.group()),
             U.time().constant(),
             U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C
index 54add60652..c3169d640a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C
@@ -304,7 +304,7 @@ kEpsilonPhitF<BasicTurbulenceModel>::kEpsilonPhitF
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(dimTime, Zero)
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
index 8400b981c8..d28a9500d6 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
@@ -95,9 +95,9 @@ Foam::TurbulenceModel<Alpha, Rho, BasicTurbulenceModel, TransportModel>::New
             IOobject::groupName(propertiesName, alphaRhoPhi.group()),
             U.time().constant(),
             U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index ebe1493312..724c4c2ceb 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -91,7 +91,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights()
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false // do not register
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimless, Zero)
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index 5281d8159f..bdea7962c8 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -115,7 +115,7 @@ nutUTabulatedWallFunctionFvPatchScalarField
             patch().boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         false
     )
@@ -156,7 +156,7 @@ nutUTabulatedWallFunctionFvPatchScalarField
             patch().boundaryMesh().mesh(),
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         true
     )
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index d38f1632c5..e4c67849be 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -91,7 +91,7 @@ void Foam::omegaWallFunctionFvPatchScalarField::createAveragingWeights()
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false // do not register
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimless, Zero)
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
index 3986871cfb..ad74cdb688 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@@ -114,7 +114,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
                 this->mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             ((2.0/3.0)*I)*tk() - (nut_)*dev(twoSymm(fvc::grad(this->U_))),
             patchFieldTypes
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
index 04b0a8f683..0e42398ef3 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C
@@ -98,7 +98,7 @@ Stokes<BasicTurbulenceModel>::nut() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(dimViscosity, Zero)
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
index 3e9eba5d0f..22e7af0fbc 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
@@ -100,9 +100,9 @@ Foam::laminarModel<BasicTurbulenceModel>::New
             IOobject::groupName(propertiesName, alphaRhoPhi.group()),
             U.time().constant(),
             U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
@@ -198,7 +198,7 @@ Foam::laminarModel<BasicTurbulenceModel>::nut() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(dimViscosity, Zero)
@@ -258,7 +258,7 @@ Foam::laminarModel<BasicTurbulenceModel>::k() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(sqr(this->U_.dimensions()), Zero)
@@ -279,7 +279,7 @@ Foam::laminarModel<BasicTurbulenceModel>::epsilon() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(sqr(this->U_.dimensions())/dimTime, Zero)
@@ -300,7 +300,7 @@ Foam::laminarModel<BasicTurbulenceModel>::omega() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(dimless/dimTime, Zero)
@@ -321,7 +321,7 @@ Foam::laminarModel<BasicTurbulenceModel>::R() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero)
diff --git a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C
index 0b06f04c14..5f9222a233 100644
--- a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C
+++ b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C
@@ -89,7 +89,7 @@ tmp<volScalarField> kL<BasicTurbulenceModel>::epsilonCanopy() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(sqr(dimLength)/pow3(dimTime), Zero)
@@ -136,7 +136,7 @@ tmp<volScalarField> kL<BasicTurbulenceModel>::canopyHeight() const
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensionedScalar(dimLength, Zero)
diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C
index 434a8f87ec..5d22a9f137 100644
--- a/src/combustionModels/EDC/EDC.C
+++ b/src/combustionModels/EDC/EDC.C
@@ -204,7 +204,7 @@ Foam::combustionModels::EDC<ReactionThermo>::Qdot() const
                 this->mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/combustionModels/combustionModel/combustionModelTemplates.C b/src/combustionModels/combustionModel/combustionModelTemplates.C
index a7b2c3737f..6c896b45b9 100644
--- a/src/combustionModels/combustionModel/combustionModelTemplates.C
+++ b/src/combustionModels/combustionModel/combustionModelTemplates.C
@@ -43,7 +43,7 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
         thermo.db(),
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     word combModelName("none");
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
index 0ef1a6861e..f14d2ec546 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
@@ -67,7 +67,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::init()
                     this->mesh_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 this->mesh_,
                 dimensionedScalar(dimMass/dimTime/dimVolume, Zero),
@@ -205,7 +205,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::correct()
                         this->mesh_,
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     this->mesh_,
                     dimensionedScalar(dimMass/dimTime/dimVolume, Zero),
@@ -406,7 +406,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::Qdot() const
                 this->mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar(dimEnergy/dimTime/dimVolume, Zero),
diff --git a/src/combustionModels/laminar/laminar.C b/src/combustionModels/laminar/laminar.C
index 50d724fdd2..50f5681643 100644
--- a/src/combustionModels/laminar/laminar.C
+++ b/src/combustionModels/laminar/laminar.C
@@ -154,7 +154,7 @@ Foam::combustionModels::laminar<ReactionThermo>::Qdot() const
                 this->mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C
index ca210872a4..e123b2f2dd 100644
--- a/src/combustionModels/noCombustion/noCombustion.C
+++ b/src/combustionModels/noCombustion/noCombustion.C
@@ -87,7 +87,7 @@ Foam::combustionModels::noCombustion<ReactionThermo>::Qdot() const
             this->mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh(),
         dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/conversion/ccm/reader/ccmReader.C b/src/conversion/ccm/reader/ccmReader.C
index 2cb8e4f47a..fa95289c9e 100644
--- a/src/conversion/ccm/reader/ccmReader.C
+++ b/src/conversion/ccm/reader/ccmReader.C
@@ -608,7 +608,7 @@ bool Foam::ccm::reader::remapMeshInfo
                 registry,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
     }
diff --git a/src/conversion/ccm/reader/ccmReaderAux.C b/src/conversion/ccm/reader/ccmReaderAux.C
index 6e996963f3..3e119be25c 100644
--- a/src/conversion/ccm/reader/ccmReaderAux.C
+++ b/src/conversion/ccm/reader/ccmReaderAux.C
@@ -123,8 +123,8 @@ void Foam::ccm::reader::writeInterfaces
             polyMesh::meshSubDir,
             registry,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         )
     );
 
@@ -150,7 +150,7 @@ void Foam::ccm::reader::writeMeshLabelList
 ) const
 {
     // Write constant/polyMesh/propertyName
-    IOList<label> ioObj
+    IOListRef<label> ioObj
     (
         IOobject
         (
@@ -159,8 +159,8 @@ void Foam::ccm::reader::writeMeshLabelList
             polyMesh::meshSubDir,
             registry,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         ),
         list
     );
diff --git a/src/conversion/ccm/writer/ccmWriterMesh.C b/src/conversion/ccm/writer/ccmWriterMesh.C
index f66b822712..83fcfafd11 100644
--- a/src/conversion/ccm/writer/ccmWriterMesh.C
+++ b/src/conversion/ccm/writer/ccmWriterMesh.C
@@ -509,7 +509,7 @@ void Foam::ccm::writer::writeCells
             mesh_,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -667,7 +667,7 @@ void Foam::ccm::writer::writeInterfaces
             mesh_,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/conversion/ccm/writer/ccmWriterSolution.C b/src/conversion/ccm/writer/ccmWriterSolution.C
index a64e470592..c6755d145e 100644
--- a/src/conversion/ccm/writer/ccmWriterSolution.C
+++ b/src/conversion/ccm/writer/ccmWriterSolution.C
@@ -153,7 +153,7 @@ void Foam::ccm::writer::writeSolution
                 mesh_,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
     }
@@ -372,7 +372,7 @@ void Foam::ccm::writer::writeSolution
                 runTime,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             );
 
             if (io.typeHeaderOk<IOdictionary>(true))
diff --git a/src/conversion/common/reader/meshReaderAux.C b/src/conversion/common/reader/meshReaderAux.C
index e81e14149a..d4b4d5f426 100644
--- a/src/conversion/common/reader/meshReaderAux.C
+++ b/src/conversion/common/reader/meshReaderAux.C
@@ -88,7 +88,7 @@ void Foam::meshReader::writeInterfaces(const objectRegistry& registry) const
             registry,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -113,7 +113,7 @@ void Foam::meshReader::writeMeshLabelList
 ) const
 {
     // write constant/polyMesh/propertyName
-    IOList<label> ioObj
+    IOListRef<label> ioObj
     (
         IOobject
         (
@@ -122,8 +122,8 @@ void Foam::meshReader::writeMeshLabelList
             polyMesh::meshSubDir,
             registry,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         ),
         list
     );
diff --git a/src/conversion/common/tables/boundaryRegion.C b/src/conversion/common/tables/boundaryRegion.C
index 002203ecb5..4cfe6b70d2 100644
--- a/src/conversion/common/tables/boundaryRegion.C
+++ b/src/conversion/common/tables/boundaryRegion.C
@@ -184,7 +184,7 @@ void Foam::boundaryRegion::readDict
             registry,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -216,7 +216,7 @@ void Foam::boundaryRegion::writeDict
             registry,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/conversion/common/tables/cellTable.C b/src/conversion/common/tables/cellTable.C
index 607d253970..3ec2971c96 100644
--- a/src/conversion/common/tables/cellTable.C
+++ b/src/conversion/common/tables/cellTable.C
@@ -327,7 +327,7 @@ void Foam::cellTable::readDict
             registry,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -360,7 +360,7 @@ void Foam::cellTable::writeDict
             registry,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/conversion/starcd/STARCDMeshWriter.C b/src/conversion/starcd/STARCDMeshWriter.C
index 4cef740c90..aa3c05004b 100644
--- a/src/conversion/starcd/STARCDMeshWriter.C
+++ b/src/conversion/starcd/STARCDMeshWriter.C
@@ -63,7 +63,7 @@ void Foam::fileFormats::STARCDMeshWriter::getCellTable()
             mesh_,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
index 5b5a6dd2ea..dd564ffb3e 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.C
@@ -48,9 +48,9 @@ void Foam::dynamicFvMesh::readDict()
         "dynamicMeshDict",
         thisDb().time().constant(),
         thisDb(),
-        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false // Do not register
+        IOobject::NO_REGISTER
     );
 
     if (dictHeader.typeHeaderOk<IOdictionary>(false, false))
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
index 3564381129..397735c757 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
         io.db(),
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE,
-        false // Do not register
+        IOobject::NO_REGISTER
     );
 
     if (dictHeader.typeHeaderOk<IOdictionary>(true))
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
index 90f4cd729c..16c7b1d674 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -59,9 +59,9 @@ Foam::dynamicInkJetFvMesh::dynamicInkJetFvMesh
                 "dynamicMeshDict",
                 io.time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         ).optionalSubDict(typeName + "Coeffs")
     ),
diff --git a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
index d1f09660cc..7fe1a4168c 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
@@ -88,19 +88,21 @@ bool Foam::dynamicMotionSolverListFvMesh::init
         *this,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     IOdictionary dict(ioDict);
 
     label i = 0;
-    if (dict.found("solvers"))
+
+    const auto* dictptr = dict.findDict("solvers");
+    if (dictptr)
     {
-        const dictionary& solvertDict = dict.subDict("solvers");
+        const dictionary& solverDict = *dictptr;
 
-        motionSolvers_.setSize(solvertDict.size());
+        motionSolvers_.setSize(solverDict.size());
 
-        for (const entry& dEntry : solvertDict)
+        for (const entry& dEntry : solverDict)
         {
             if (dEntry.isDict())
             {
diff --git a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
index b1ab185e16..f6517d3249 100644
--- a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
@@ -84,7 +84,7 @@ bool Foam::dynamicMultiMotionSolverFvMesh::init(const bool doInit)
             *this,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
     const dictionary& dynamicMeshCoeffs = dynDict.subDict(typeName + "Coeffs");
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index d0f0d3ad7f..5d5ad7e906 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -174,9 +174,9 @@ void Foam::dynamicRefineFvMesh::readDict()
                 "dynamicMeshDict",
                 time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         ).optionalSubDict(typeName + "Coeffs")
     );
@@ -1293,9 +1293,9 @@ bool Foam::dynamicRefineFvMesh::updateTopology()
                 "dynamicMeshDict",
                 time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         ).optionalSubDict(typeName + "Coeffs")
     );
@@ -1509,8 +1509,8 @@ bool Foam::dynamicRefineFvMesh::writeObject
                 time().timeName(),
                 *this,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimensionedScalar(dimless, Zero)
diff --git a/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C b/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C
index c7db30f8af..3de89f4374 100644
--- a/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C
+++ b/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C
@@ -55,7 +55,7 @@ Foam::simplifiedMeshes::simplifiedDynamicFvMeshBase::New
         io.db(),
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (dictHeader.typeHeaderOk<IOdictionary>(true))
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index 42a5446c5a..94b23d800e 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -254,10 +254,10 @@ void Foam::multiDirRefinement::refineHex8
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
-            List<refinementHistory::splitCell8>(0),
-            labelList(0),
+            List<refinementHistory::splitCell8>(),
+            labelList(),
             false
         )                                   // refinement history
     );
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index 7356791427..ddb61551d5 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -789,7 +789,7 @@ Foam::tmp<Foam::pointField> Foam::motionSmootherAlgo::curPoints() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         scale_*displacement_,
         actualPatchFieldTypes,
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index 496bf281d1..98f45bf5be 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -153,7 +153,7 @@ Foam::motionSmootherAlgo::avg
             fld.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         fld.mesh(),
         dimensioned<Type>(fld.dimensions(), Zero)
diff --git a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
index e82844508a..76ea901109 100644
--- a/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C
@@ -91,7 +91,7 @@ Foam::componentDisplacementMotionSolver::componentDisplacementMotionSolver
                 mesh,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         ).component(cmpt_)
     ),
@@ -124,7 +124,7 @@ Foam::componentDisplacementMotionSolver::componentDisplacementMotionSolver
                         mesh,
                         IOobject::MUST_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     )
                 )
             << exit(FatalError);
diff --git a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index 3814271ecf..dbd93a73fb 100644
--- a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -104,7 +104,7 @@ void Foam::displacementInterpolationMotionSolver::calcInterpolation()
                 mesh(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index d714ffa5f9..fefa520f88 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -345,7 +345,7 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
                     mesh(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 pointDisplacement_  // to inherit the boundary conditions
             )
@@ -438,7 +438,7 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
                 mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pointMesh::New(mesh()),
             dimensionedScalar(dimLength, Zero)
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index 7671c6ae6a..f79067ef29 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -56,7 +56,7 @@ Foam::IOobject Foam::points0MotionSolver::points0IO(const polyMesh& mesh)
         mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     // If points0 are located in constant directory, verify their existence
@@ -111,7 +111,7 @@ Foam::points0MotionSolver::points0MotionSolver
                         mesh,
                         IOobject::MUST_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     )
                 )
             << exit(FatalError);
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index 43ac06e52f..e2c2ce7f8e 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -148,7 +148,7 @@ solidBodyMotionDisplacementPointPatchVectorField::localPoints0() const
                 this->db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index b0e057b3a5..3d8a01bcb5 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -82,7 +82,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::polyMeshFilter::copyMesh(const fvMesh& mesh)
             mesh.time(),
             IOobject::READ_IF_PRESENT,  // read fv* if present
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         true // parallel sync
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index e1986b0962..2a361e6bbd 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -3049,7 +3049,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
     //            fMesh,
     //            IOobject::NO_READ,
     //            IOobject::NO_WRITE,
-    //            false
+    //            IOobject::NO_REGISTER
     //        ),
     //        fMesh,
     //        dimensionedScalar(dimless, Zero)
diff --git a/src/engine/engineMesh/engineMesh/engineMeshNew.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C
index 9cb427c8da..e37d2138a0 100644
--- a/src/engine/engineMesh/engineMesh/engineMeshNew.C
+++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C
@@ -42,7 +42,7 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New(const IOobject& io)
             io.db(),
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/engine/engineTime/engineTime/engineTime.C b/src/engine/engineTime/engineTime/engineTime.C
index 7d5da7f16d..51dcf7cb4f 100644
--- a/src/engine/engineTime/engineTime/engineTime.C
+++ b/src/engine/engineTime/engineTime/engineTime.C
@@ -66,7 +66,7 @@ Foam::engineTime::engineTime
             *this,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     )
 {}
diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
index 0e5f0b25f5..be58b30325 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
+++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C
@@ -209,7 +209,7 @@ void Foam::edgeInterpolation::makeLPN() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimLength
@@ -290,7 +290,7 @@ void Foam::edgeInterpolation::makeWeights() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimensionedScalar(dimless, 1)
@@ -370,7 +370,7 @@ void Foam::edgeInterpolation::makeDeltaCoeffs() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimensionedScalar(dimless/dimLength, SMALL)
@@ -464,7 +464,7 @@ void Foam::edgeInterpolation::makeCorrectionVectors() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimless
@@ -571,7 +571,7 @@ void Foam::edgeInterpolation::makeSkewCorrectionVectors() const
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimensionedVector(dimless, Zero)
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index 95f1d94890..11009e6039 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -216,7 +216,7 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             Usrf
         )
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
index c476c65b05..12f711ef29 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
@@ -42,9 +42,9 @@ Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
             "SRFProperties",
             Urel.time().constant(),
             Urel.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
index 374cc5ab25..c8b4ccbc23 100644
--- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
@@ -267,10 +267,10 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fv::optionList::operator()
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
-        dimensionedScalar("one", dimless, 1.0)
+        dimensionedScalar("one", dimless, scalar(1))
     );
 
     return this->operator()(alpha, one, field, field.name());
diff --git a/src/finiteVolume/expressions/base/fvExprDriverI.H b/src/finiteVolume/expressions/base/fvExprDriverI.H
index 949f58f1e9..d9a0cf0ff6 100644
--- a/src/finiteVolume/expressions/base/fvExprDriverI.H
+++ b/src/finiteVolume/expressions/base/fvExprDriverI.H
@@ -157,7 +157,7 @@ Foam::expressions::fvExprDriver::readAndRegister
             meshRef.thisDb(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false  // Unregistered
+            IOobject::NO_REGISTER
         ),
         meshRef
     );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index e4ee7dbcf1..9786b53ace 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -112,7 +112,7 @@ void Foam::electrostaticDepositionFvPatchScalarField::writeFilmFields() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false // do not register
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimLength)
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index eff7207c0a..b01c194353 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -835,7 +835,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::meshPhi
                 mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh(),
             dimensionedScalar(dimVolume/dimTime, Zero)
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 207245e9d2..a7ec7a31af 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -1630,7 +1630,7 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
                 mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             coef_(meshPhi0)*mesh().phi() - offCentre_(meshPhi0())
         )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 38ac5d0412..ecf7d1955f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -840,7 +840,7 @@ tmp<surfaceScalarField> SLTSDdtScheme<Type>::meshPhi
                 mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh(),
             dimensionedScalar(dimVolume/dimTime, Zero)
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index e470ec87c8..3b2e28a08a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -983,7 +983,7 @@ tmp<surfaceScalarField> backwardDdtScheme<Type>::meshPhi
                 mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             coefftn_0*mesh().phi() - coefft0_00*mesh().phi().oldTime()
         )
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index bf3979fc21..df63268dd1 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -599,7 +599,7 @@ tmp<surfaceScalarField> localEulerDdtScheme<Type>::meshPhi
                 mesh().thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh(),
             dimensionedScalar(dimVolume/dimTime, Zero)
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 33fb99b030..a970206248 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -383,7 +383,7 @@ tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
             mesh().thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimensionedScalar(dimVolume/dimTime, Zero)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
index 0e395adc1d..5bfe9a515f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless/dimLength, Zero)
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless/dimLength, Zero)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 7701e8d3a4..40dfc42445 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless/dimLength, Zero)
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless/dimLength, Zero)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
index 328916c924..20c8bf5406 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless/dimLength, Zero)
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless/dimLength, Zero)
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
index addf8e45e6..d19f4dddb6 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
@@ -103,9 +103,9 @@ limitedSnGrad<Type>::correction
                     vf.mesh().thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
-                fvc::cellReduce(limiter, minEqOp<scalar>(), scalar(1.0))
+                fvc::cellReduce(limiter, minEqOp<scalar>(), scalar(1))
             );
             Info<< "Writing limiter field to " << volLimiter.objectPath()
                 << endl;
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index 5daaddf683..070e9b557b 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -271,7 +271,7 @@ void Foam::MULES::limiterCorr
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimless,
@@ -602,7 +602,7 @@ void Foam::MULES::limitCorr
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimless,
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 388e0a4a43..30ad56a9d3 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -265,7 +265,7 @@ void Foam::MULES::limiter
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimless,
@@ -622,7 +622,7 @@ void Foam::MULES::limit
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimless,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
index e2444ce783..a4de446398 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
@@ -109,7 +109,7 @@ Foam::extendedCellToFaceStencil::weightedSum
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensioned<Type>(fld.dimensions(), Zero)
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
index a5be65dc67..82b73a5805 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
@@ -58,7 +58,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensioned<Type>(fld.dimensions(), Zero)
diff --git a/src/finiteVolume/fvMesh/fvGeometryScheme/basic/basicFvGeometryScheme.C b/src/finiteVolume/fvMesh/fvGeometryScheme/basic/basicFvGeometryScheme.C
index 58da31adbe..867b38a287 100644
--- a/src/finiteVolume/fvMesh/fvGeometryScheme/basic/basicFvGeometryScheme.C
+++ b/src/finiteVolume/fvMesh/fvGeometryScheme/basic/basicFvGeometryScheme.C
@@ -87,7 +87,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::basicFvGeometryScheme::weights() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false // Do not register
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimless
@@ -171,7 +171,7 @@ Foam::basicFvGeometryScheme::deltaCoeffs() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false // Do not register
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimless/dimLength
@@ -230,7 +230,7 @@ Foam::basicFvGeometryScheme::nonOrthDeltaCoeffs() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false // Do not register
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimless/dimLength
@@ -314,7 +314,7 @@ Foam::basicFvGeometryScheme::nonOrthCorrectionVectors() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false // Do not register
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimless
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 655b870a50..9d1765ad0d 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -193,7 +193,7 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
                     *this,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 *this,
                 dimVolume
@@ -302,7 +302,7 @@ bool Foam::fvMesh::init(const bool doInit)
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this
         );
@@ -327,7 +327,7 @@ bool Foam::fvMesh::init(const bool doInit)
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this
         );
@@ -346,7 +346,7 @@ bool Foam::fvMesh::init(const bool doInit)
                     *this,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 V()
             );
@@ -914,7 +914,7 @@ void Foam::fvMesh::movePoints(const pointField& p)
                 *this,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this,
             dimensionedScalar(dimVolume/dimTime, Zero)
@@ -1021,7 +1021,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
                 *this,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             *this,
             dimensionedScalar(dimVolume/dimTime, Zero)
diff --git a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C
index d42c207e20..a537c114bb 100644
--- a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C
+++ b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C
@@ -498,7 +498,7 @@ Foam::fvMeshTools::newMesh
                 io.db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -766,7 +766,7 @@ Foam::fvMeshTools::loadOrCreateMesh
                 io.db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -1077,7 +1077,7 @@ void Foam::fvMeshTools::createDummyFvMeshFiles
             mesh.thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (!io.typeHeaderOk<IOdictionary>(false))
@@ -1103,7 +1103,7 @@ void Foam::fvMeshTools::createDummyFvMeshFiles
             mesh.thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         if (!io.typeHeaderOk<IOdictionary>(false))
diff --git a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C
index 7f05a8329c..637ab073a2 100644
--- a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C
+++ b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C
@@ -231,7 +231,7 @@ Foam::fvMeshTools::readProcAddressing
         mesh.thisDb(),
         IOobject::READ_IF_PRESENT,
         IOobject::NO_WRITE,
-        false  // no register
+        IOobject::NO_REGISTER
     );
 
     //if (ioAddr.typeHeaderOk<labelIOList>(true))
@@ -323,7 +323,7 @@ void Foam::fvMeshTools::writeProcAddressing
         mesh.thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false  // no register
+        IOobject::NO_REGISTER
     );
 
     // cellProcAddressing (polyMesh)
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
index 8ddab7a43e..9fd6d217f9 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
@@ -157,7 +157,7 @@ Foam::cyclicACMIFvPatch::cyclicACMIFvPatch
             boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dimensionedScalar("time", dimTime, -GREAT)
     )
diff --git a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C
index 7a242f9525..6b8ec3cc44 100644
--- a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C
+++ b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C
@@ -68,7 +68,7 @@ bool Foam::simplifiedMeshes::columnFvMeshInfo::setPatchEntries
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     const wordHashSet constraintPatches(polyPatch::constraintTypes());
@@ -213,7 +213,7 @@ void Foam::simplifiedMeshes::columnFvMeshInfo::initialise(const Time& runTime)
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         scalar dxi = 0;
diff --git a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMeshTemplates.C b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMeshTemplates.C
index e7dc1fc3cb..b65d76a62f 100644
--- a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMeshTemplates.C
+++ b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMeshTemplates.C
@@ -46,7 +46,7 @@ void Foam::simplifiedMeshes::columnFvMeshInfo::initialiseZone
                 zoneType.mesh(),
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             zoneType.mesh()
         ).names()
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
index 4a78d65e05..283cbb4331 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
@@ -108,7 +108,7 @@ bool Foam::patchDistMethods::advectionDiffusion::correct
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless, Zero),
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
index 5c66476d89..45d36c44ee 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
@@ -78,7 +78,7 @@ bool Foam::patchDistMethods::directionalMeshWave::correct(volScalarField& y)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless, Zero),
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
index e99bf4889c..ae2adf9892 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/blended/blended.H
@@ -142,7 +142,7 @@ public:
                         this->mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     this->mesh(),
                     dimensionedScalar
@@ -172,7 +172,7 @@ public:
                         this->mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     this->mesh(),
                     dimensionedScalar
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
index 3831b19ccd..f390bd62b0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
@@ -124,7 +124,7 @@ public:
                     this->mesh().thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 this->mesh(),
                 dimensionedScalar(dimless, Zero)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index 6bfab29ab2..8346b6927b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -142,7 +142,7 @@ public:
                         mesh,
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     surfaceInterpolationScheme<Type>::interpolate(vf, kSc, -kSc)
                 )
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
index 26aba7f1f3..7848088c17 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C
@@ -50,7 +50,7 @@ Foam::linearUpwind<Type>::correction
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensioned<Type>(vf.name(), vf.dimensions(), Zero)
@@ -161,7 +161,7 @@ Foam::linearUpwind<Foam::vector>::correction
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensioned<vector>(vf.name(), vf.dimensions(), Zero)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 193bb90561..48439fe740 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -52,7 +52,7 @@ Foam::linearUpwindV<Type>::correction
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensioned<Type>(vf.dimensions(), Zero)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
index 18d413df10..8bfb0360dc 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/midPoint/midPoint.H
@@ -114,7 +114,7 @@ public:
                         this->mesh().thisDb(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     this->mesh(),
                     dimensionedScalar("0.5", dimless, 0.5)
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index ac76afffea..673f7d9e97 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -52,7 +52,7 @@ Foam::skewCorrectionVectors::skewCorrectionVectors(const fvMesh& mesh)
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimless
diff --git a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
index f80669e29b..b733b036d8 100644
--- a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
+++ b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
@@ -521,7 +521,7 @@ void Foam::DMDModels::STDMD::amplitudes()
             mesh_,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -977,7 +977,7 @@ bool Foam::DMDModels::STDMD::initialise(const RMatrix& z)
                     mesh_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 nSnap
             );
diff --git a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMDTemplates.C b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMDTemplates.C
index 7a68139c34..1804741bbd 100644
--- a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMDTemplates.C
+++ b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMDTemplates.C
@@ -121,7 +121,7 @@ bool Foam::DMDModels::STDMD::calcModes()
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensioned<Type>(dimless, Zero),
@@ -138,7 +138,7 @@ bool Foam::DMDModels::STDMD::calcModes()
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensioned<Type>(dimless, Zero),
diff --git a/src/functionObjects/field/age/age.C b/src/functionObjects/field/age/age.C
index 2f9dfccb2c..4da8f127bc 100644
--- a/src/functionObjects/field/age/age.C
+++ b/src/functionObjects/field/age/age.C
@@ -161,10 +161,10 @@ bool Foam::functionObjects::age::execute()
             mesh_,
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
-        dimensionedScalar(dimTime, 0),
+        dimensionedScalar(dimTime, Zero),
         patchTypes()
     );
     volScalarField& age = tage.ref();
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index 1520e204b8..3406d1edb4 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -105,7 +105,7 @@ Foam::functionObjects::fieldCoordinateSystemTransform::srotTensor() const
                     mesh_.objectRegistry::db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false // no register
+                    IOobject::NO_REGISTER
                 ),
                 mesh_,
                 dimless,
@@ -150,7 +150,7 @@ Foam::functionObjects::fieldCoordinateSystemTransform::vrotTensor() const
                     mesh_.objectRegistry::db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false // no register
+                    IOobject::NO_REGISTER
                 ),
                 mesh_,
                 dimless,
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index f254c3815d..1ae36dff36 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -140,7 +140,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::rhoScale
                 p.mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             p,
             fvPatchField<scalar>::calculatedType()
diff --git a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
index 0255a9b58c..b4e4610989 100644
--- a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
+++ b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
@@ -54,7 +54,7 @@ Foam::tmp<Foam::volScalarField> Foam::resolutionIndexModel::V() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimVolume,
diff --git a/src/functionObjects/field/writeCellCentres/writeCellCentres.C b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
index 313a92d2cd..6ab11c3956 100644
--- a/src/functionObjects/field/writeCellCentres/writeCellCentres.C
+++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
@@ -82,7 +82,7 @@ bool Foam::functionObjects::writeCellCentres::write()
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_.C(),
         calculatedFvPatchScalarField::typeName
@@ -105,7 +105,7 @@ bool Foam::functionObjects::writeCellCentres::write()
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_.C().component(i)
         );
diff --git a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
index f4e5301ffa..3575033041 100644
--- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
+++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
@@ -82,7 +82,7 @@ bool Foam::functionObjects::writeCellVolumes::write()
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(mesh_.V().dimensions(), Zero),
diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
index ae81784e44..8881185f94 100644
--- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
+++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C
@@ -173,7 +173,7 @@ bool Foam::functionObjects::cloudInfo::performAction(unsigned request)
                     obr_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 )
             );
 
diff --git a/src/functionObjects/lagrangian/dataCloud/dataCloud.C b/src/functionObjects/lagrangian/dataCloud/dataCloud.C
index d176ab13df..e34be5bc70 100644
--- a/src/functionObjects/lagrangian/dataCloud/dataCloud.C
+++ b/src/functionObjects/lagrangian/dataCloud/dataCloud.C
@@ -67,7 +67,7 @@ bool Foam::functionObjects::dataCloud::writeCloud
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
index 108f3cc22d..08557fd401 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
@@ -116,7 +116,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index e0a37bd0cb..0118ee1705 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -79,7 +79,7 @@ Foam::functionObjects::electricPotential::sigma() const
         mesh_.time(),
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (phases_.size())
@@ -126,7 +126,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
         mesh_.time(),
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (phases_.size())
@@ -356,7 +356,7 @@ bool Foam::functionObjects::electricPotential::write()
                 mesh_.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             -fvc::grad(eV),
             calculatedFvPatchField<vector>::typeName
@@ -379,7 +379,7 @@ bool Foam::functionObjects::electricPotential::write()
                 mesh_.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             -tsigma*fvc::grad(eV),
             calculatedFvPatchField<vector>::typeName
@@ -402,7 +402,7 @@ bool Foam::functionObjects::electricPotential::write()
                 mesh_.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvc::div(tepsilonm*E),
             calculatedFvPatchField<scalar>::typeName
diff --git a/src/functionObjects/solvers/energyTransport/energyTransport.C b/src/functionObjects/solvers/energyTransport/energyTransport.C
index 3335c6994d..4df38d094a 100644
--- a/src/functionObjects/solvers/energyTransport/energyTransport.C
+++ b/src/functionObjects/solvers/energyTransport/energyTransport.C
@@ -121,7 +121,7 @@ Foam::functionObjects::energyTransport::rho() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         rho_
@@ -158,7 +158,7 @@ Foam::functionObjects::energyTransport::Cp() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         Cp_
@@ -189,7 +189,7 @@ Foam::functionObjects::energyTransport::kappa() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         kappa_
@@ -232,7 +232,7 @@ Foam::functionObjects::energyTransport::energyTransport
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimEnergy/dimTemperature/dimVolume, Zero)
diff --git a/src/functionObjects/utilities/solverInfo/solverInfo.C b/src/functionObjects/utilities/solverInfo/solverInfo.C
index 8808cfa560..60f0863aeb 100644
--- a/src/functionObjects/utilities/solverInfo/solverInfo.C
+++ b/src/functionObjects/utilities/solverInfo/solverInfo.C
@@ -213,7 +213,7 @@ bool Foam::functionObjects::solverInfo::write()
                     mesh_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 mesh_,
                 dimensionedScalar(dimless, Zero),
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
index 7cc951ed54..bf4cb3443f 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
@@ -97,7 +97,7 @@ bool Foam::functionObjects::writeDictionary::tryDirectory
         obr_,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (dictIO.typeHeaderOk<IOdictionary>(true))
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
index dac42d4d5a..4fdccec098 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
@@ -80,7 +80,7 @@ void Foam::inverseVolumeDiffusivity::correct()
             mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh(),
         dimless,
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index 8bdfdd3ef7..da4a2e1b33 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -135,7 +135,7 @@ void uniformInterpolatedDisplacementPointPatchVectorField::updateCoeffs()
                 pMesh(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             );
             if (io.typeHeaderOk<pointVectorField>(false))
             {
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index a57a0d8aa1..a548662098 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -64,7 +64,7 @@ Foam::fv::jouleHeatingSource::transformSigma
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedSymmTensor(sigmaLocal.dimensions(), Zero),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index db2132bf0a..c5e44c1d72 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -528,7 +528,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             c.UTrans_()
         )
@@ -544,7 +544,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             c.UCoeff_()
         )
@@ -574,7 +574,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
     outputProperties_
@@ -587,7 +587,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
     solution_(mesh),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index b3e903aa94..48bc7d5acc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -529,7 +529,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimTime, Zero),
@@ -567,7 +567,7 @@ Foam::KinematicCloud<CloudType>::theta() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
@@ -605,7 +605,7 @@ Foam::KinematicCloud<CloudType>::alpha() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
@@ -641,7 +641,7 @@ Foam::KinematicCloud<CloudType>::rhoEff() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimDensity, Zero)
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index f50cdf9c43..1062223379 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -177,7 +177,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
                     this->db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 c.rhoTrans_[i]
             )
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 0959710473..ef82d05462 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -122,7 +122,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
                         this->db(),
                         IOobject::NO_READ,
                         IOobject::NO_WRITE,
-                        false
+                        IOobject::NO_REGISTER
                     ),
                     this->mesh(),
                     dimensionedScalar(dimMass/dimTime/dimVolume, Zero)
@@ -170,7 +170,7 @@ Foam::ReactingCloud<CloudType>::Srho(const label i) const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar
@@ -205,7 +205,7 @@ Foam::ReactingCloud<CloudType>::Srho() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar
@@ -247,7 +247,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
                     this->db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 this->mesh(),
                 dimensionedScalar(dimMass/dimTime/dimVolume, Zero)
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 8eacefd6aa..9f232d96c2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -240,7 +240,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             c.hsTrans()
         )
@@ -256,7 +256,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             c.hsCoeff()
         )
@@ -275,7 +275,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
                     this->db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 c.radAreaP()
             )
@@ -292,7 +292,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
                     this->db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 c.radT4()
             )
@@ -309,7 +309,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
                     this->db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 c.radAreaPT4()
             )
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index dac71f356e..e0dbbb8b58 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -274,7 +274,7 @@ inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::Ep() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
@@ -310,7 +310,7 @@ inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::ap() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar(dimless/dimLength, Zero)
@@ -347,7 +347,7 @@ Foam::ThermoCloud<CloudType>::sigmap() const
                 this->db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar(dimless/dimLength, Zero)
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
index 63d7c4fffe..fd36a47760 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
@@ -76,7 +76,7 @@ void Foam::AveragingMethods::Basic<Type>::updateGrad()
             this->mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->mesh_,
         dimensioned<Type>(dimless, Zero),
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index 562a44fbdd..4dc91ac10e 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -83,7 +83,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
@@ -116,7 +116,7 @@ Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimless/dimLength, Zero)
@@ -138,7 +138,7 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index 5b8c69d920..1a530c91fd 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -83,7 +83,7 @@ Foam::radiation::cloudScatter::sigmaEff() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
index 3a33c6182d..7d956a5442 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
@@ -36,7 +36,7 @@ IOdictionary mdTransportProperitesDict
         mesh,
         IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     )
 );
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 8571efe9f1..9052b14a65 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -58,7 +58,7 @@ void Foam::moleculeCloud::buildConstProps()
             mesh_,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index f62987ca79..ff0725f6ca 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -131,7 +131,7 @@ void Foam::potential::potential::readPotentialDict()
                 mesh_,
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
     );
@@ -258,7 +258,7 @@ void Foam::potential::potential::readMdInitialiseDict
             mesh_,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index c264e96701..84ba7b5881 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -554,7 +554,7 @@ Foam::blockMesh::createTopology
             meshDescription.time(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pointField(vertices_),   // Use a copy of vertices
         getBlockShapes(),
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
index d8a3798964..070d73e2c7 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
@@ -133,7 +133,7 @@ Foam::displacementMotionSolverMeshMover::displacementMotionSolverMeshMover
                     pointDisplacement.db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 dict
             ),
@@ -147,7 +147,7 @@ Foam::displacementMotionSolverMeshMover::displacementMotionSolverMeshMover
                     pointDisplacement.db(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 pointDisplacement.mesh()().points()
             )
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index d462e162d0..7db914643c 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -1293,7 +1293,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
             pointDisplacement.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pMesh(),
         dimensionedVector(dimLength, Zero)
@@ -1307,7 +1307,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
             pointDisplacement.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pMesh(),
         dimensionedScalar(dimless, Zero)
@@ -1321,7 +1321,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
             pointDisplacement.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pMesh(),
         dimensionedScalar(dimLength, Zero)
@@ -1335,7 +1335,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
             pointDisplacement.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pMesh(),
         dimensionedVector(dimLength, Zero)
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index b6f279b490..f945f0f369 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1718,7 +1718,7 @@ Foam::meshRefinement::meshRefinement
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         labelList(mesh_.nFaces(), -1)
     ),
@@ -3590,8 +3590,8 @@ void Foam::meshRefinement::dumpRefinementLevel() const
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
@@ -3621,7 +3621,7 @@ void Foam::meshRefinement::dumpRefinementLevel() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pMesh,
             dimensionedScalar(dimless, Zero)
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 2f31191ab6..57946636c1 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -3571,8 +3571,8 @@ void Foam::meshRefinement::zonify
                 timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
index c1141c9e4a..f385d8000a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBlock.C
@@ -431,7 +431,7 @@ void Foam::meshRefinement::growSet
 //                mesh_,
 //                IOobject::NO_READ,
 //                IOobject::NO_WRITE,
-//                false
+//                IOobject::NO_REGISTER
 //            ),
 //            mesh_,
 //            dimensionedScalar
@@ -741,7 +741,7 @@ Foam::label Foam::meshRefinement::markProximityRefinementWave
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar
@@ -893,15 +893,10 @@ Foam::label Foam::meshRefinement::markProximityRefinementWave
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
-            dimensionedScalar
-            (
-                "zero",
-                dimensionSet(0, 1, 0, 0, 0),
-                0.0
-            )
+            dimensionedScalar(dimLength, Zero)
         );
         distance.field() = smallGapDistance;
         distance.correctBoundaryConditions();
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index ce8eb29cfb..4522e3e3a2 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -68,7 +68,7 @@ void Foam::refinementFeatures::read
             io.time(),                          // registry
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         );
 
         const fileName fName(typeFilePath<extendedFeatureEdgeMesh>(extFeatObj));
@@ -102,7 +102,7 @@ void Foam::refinementFeatures::read
                 io.time(),                          // registry
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             );
 
             const fileName fName(typeFilePath<featureEdgeMesh>(featObj));
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 6297c58f2f..235591b6c0 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -3246,8 +3246,8 @@ bool Foam::snappyLayerDriver::writeLayerData
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
-                    IOobject::AUTO_WRITE,
-                    false
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
                 mesh,
                 dimensionedScalar(dimless, Zero),
@@ -3286,8 +3286,8 @@ bool Foam::snappyLayerDriver::writeLayerData
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
-                    IOobject::AUTO_WRITE,
-                    false
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
                 mesh,
                 dimensionedScalar(dimless, Zero),
@@ -3314,8 +3314,8 @@ bool Foam::snappyLayerDriver::writeLayerData
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
-                    IOobject::AUTO_WRITE,
-                    false
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
                 mesh,
                 dimensionedScalar(dimless, Zero),
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
index c0af94ad08..49d2cb4231 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
@@ -575,7 +575,7 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
             boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dimensionedScalar("time", dimTime, -GREAT)
     ),
@@ -613,7 +613,7 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
             boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dimensionedScalar("time", dimTime, -GREAT)
     ),
@@ -655,7 +655,7 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
             boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dimensionedScalar("time", dimTime, -GREAT)
     ),
@@ -694,7 +694,7 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
             boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dimensionedScalar("time", dimTime, -GREAT)
     ),
@@ -739,7 +739,7 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
             boundaryMesh().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         dimensionedScalar("time", dimTime, -GREAT)
     ),
diff --git a/src/meshTools/edgeMesh/edgeFormats/edgeMesh/edgeMeshFormat.C b/src/meshTools/edgeMesh/edgeFormats/edgeMesh/edgeMeshFormat.C
index 2f7c3625d0..1979081570 100644
--- a/src/meshTools/edgeMesh/edgeFormats/edgeMesh/edgeMeshFormat.C
+++ b/src/meshTools/edgeMesh/edgeFormats/edgeMesh/edgeMeshFormat.C
@@ -64,7 +64,7 @@ bool Foam::fileFormats::edgeMeshFormat::read
         *dummyTimePtr,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (!io.typeHeaderOk<featureEdgeMesh>(false))
@@ -156,7 +156,7 @@ void Foam::fileFormats::edgeMeshFormat::write
         *dummyTimePtr,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
     io.note() = "written " + clock::dateTime();
 
diff --git a/src/meshTools/edgeMesh/edgeFormats/vtk/VTKedgeFormat.C b/src/meshTools/edgeMesh/edgeFormats/vtk/VTKedgeFormat.C
index dee4aec216..eee6927bb9 100644
--- a/src/meshTools/edgeMesh/edgeFormats/vtk/VTKedgeFormat.C
+++ b/src/meshTools/edgeMesh/edgeFormats/vtk/VTKedgeFormat.C
@@ -69,7 +69,7 @@ bool Foam::fileFormats::VTKedgeFormat::read
             *dummyTimePtr,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormat.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormat.C
index 23afe387c4..f33e32215b 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormat.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormat.C
@@ -62,7 +62,7 @@ bool Foam::fileFormats::extendedEdgeMeshFormat::read
         *dummyTimePtr,
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (!io.typeHeaderOk<extendedFeatureEdgeMesh>(false))
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index e671f9948d..f84ed8e4b6 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@@ -213,7 +213,7 @@ Foam::mappedPatchBase::updateSampleMeshTime() const
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 )
             );
     }
@@ -239,7 +239,7 @@ Foam::mappedPatchBase::updateMeshTime() const
                     mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 )
             );
     }
diff --git a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
index 46b3ea18e7..1e89d921c3 100644
--- a/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
+++ b/src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C
@@ -77,7 +77,7 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle
                 io.time(),                          // registry
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ).objectPath()
         )
     ),
diff --git a/src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.C
index 9d6377369c..16e273f665 100644
--- a/src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/topoSet/cellSources/fieldToCell/fieldToCell.C
@@ -186,8 +186,8 @@ void Foam::fieldToCell::applyToSet
         mesh().time().timeName(),
         mesh(),
         IOobject::MUST_READ,
-        IOobject::AUTO_WRITE,
-        false
+        IOobject::NO_WRITE,
+        IOobject::NO_REGISTER
     );
 
     // Note: should check for volScalarField but that introduces dependency
diff --git a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
index 45f028653f..a6d5640c1d 100644
--- a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
+++ b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
@@ -220,10 +220,10 @@ Foam::topoSetSource::addToUsageTable Foam::holeToFace::usage_
 //            fvm,
 //            IOobject::NO_READ,
 //            IOobject::NO_WRITE,
-//            false
+//            IOobject::NO_REGISTER
 //        ),
 //        fvm,
-//        dimensionedScalar("zero", dimless, scalar(0))
+//        dimensionedScalar(dimless, Zero)
 //    );
 //    forAll(labelFld, i)
 //    {
@@ -257,10 +257,10 @@ Foam::topoSetSource::addToUsageTable Foam::holeToFace::usage_
 //            fvm,
 //            IOobject::NO_READ,
 //            IOobject::NO_WRITE,
-//            false
+//            IOobject::NO_REGISTER
 //        ),
 //        fvm,
-//        dimensionedScalar("zero", dimless, scalar(0))
+//        dimensionedScalar(dimless, Zero)
 //    );
 //    for (label i = 0; i < mesh_.nInternalFaces(); i++)
 //    {
diff --git a/src/meshTools/topoSet/topoSets/topoBitSet.C b/src/meshTools/topoSet/topoSets/topoBitSet.C
index b814960212..56676ee943 100644
--- a/src/meshTools/topoSet/topoSets/topoBitSet.C
+++ b/src/meshTools/topoSet/topoSets/topoBitSet.C
@@ -124,9 +124,9 @@ Foam::topoBitSet::topoBitSet
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
-        0  // zero-sized (unallocated) labelHashSet
+        label(0)  // zero-sized (unallocated) labelHashSet
     ),
     selected_()
 {}
diff --git a/src/meshTools/topoSet/topoSets/topoBoolSet.C b/src/meshTools/topoSet/topoSets/topoBoolSet.C
index 77753f55cf..35268ec969 100644
--- a/src/meshTools/topoSet/topoSets/topoBoolSet.C
+++ b/src/meshTools/topoSet/topoSets/topoBoolSet.C
@@ -133,9 +133,9 @@ Foam::topoBoolSet::topoBoolSet
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
-        0  // zero-sized (unallocated) labelHashSet
+        label(0)  // zero-sized (unallocated) labelHashSet
     ),
     selected_()
 {}
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
index 298fcd4f67..d0da1a7211 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.C
@@ -72,7 +72,7 @@ Foam::autoPtr<Foam::displacementMethod> Foam::displacementMethod::New
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
     word solverType(dynamicMeshDict.get<word>("solver"));
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.C
index b454b84c5d..a3ab2291f8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.C
@@ -89,16 +89,14 @@ displacementMethoddisplacementLaplacian::displacementMethoddisplacementLaplacian
     */
     resetFields_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 mesh.time().constant(),
                 mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).subDict("displacementLaplacianCoeffs").getOrDefault<bool>
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.C
index 1362ffb7f4..f26dc3b132 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.C
@@ -78,16 +78,14 @@ displacementMethodelasticityMotionSolver
     */
     resetFields_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 mesh.time().constant(),
                 mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).subDict("elasticityMotionSolverCoeffs").getOrDefault<bool>
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.C
index 1b0a71920d..873aff3d79 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.C
@@ -77,16 +77,14 @@ displacementMethodlaplacianMotionSolver::displacementMethodlaplacianMotionSolver
     */
     resetFields_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 mesh.time().constant(),
                 mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).subDict("laplacianMotionSolverCoeffs").getOrDefault<bool>
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.C
index 9c0cdcdb7f..c72518a4d7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.C
@@ -84,16 +84,14 @@ displacementMethodvelocityLaplacian::displacementMethodvelocityLaplacian
     */
     resetFields_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 mesh.time().constant(),
                 mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).subDict("velocityLaplacianCoeffs").getOrDefault<bool>
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
index ddfedb03f4..86f201430f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
+++ b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
@@ -52,7 +52,7 @@ Foam::linearUpwindNormal<Type>::correction
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensioned<Type>(vf.dimensions(), Zero)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
index 41348f1bf6..85ad4b6d32 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
@@ -89,7 +89,7 @@ tmp<surfaceScalarField> adjointEikonalSolver::computeYPhi()
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedVector(dimless, Zero),
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
index 3334a96dd0..0701dae6eb 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.C
@@ -62,7 +62,7 @@ Foam::lineSearch::lineSearch(const dictionary& dict, const Time& time)
             time,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
     directionalDeriv_(Zero),
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C
index 001e950b18..11c0e38448 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C
@@ -108,7 +108,7 @@ Foam::optMeshMovementBezier::optMeshMovementBezier
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pointMesh::New(mesh),
         dimensionedVector(dimless, Zero)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C
index 46eeadedea..cdde7b1a57 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C
@@ -126,7 +126,7 @@ optMeshMovementVolumetricBSplinesExternalMotionSolver
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pointMesh::New(mesh),
         dimensionedVector(dimless, Zero)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C
index a4b111fffd..caae3b7b09 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.C
@@ -162,9 +162,9 @@ Foam::autoPtr<Foam::optimisationManager> Foam::optimisationManager::New
             "optimisationDict",
             mesh.time().system(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
index 31def83c64..7a71d5ea6b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
@@ -73,7 +73,7 @@ void shapeOptimisation::updateDesignVariables(scalarField& correction)
                     mesh_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 mesh_.points()
             );
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/controlPointsDefinition/fromFile/fromFile.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/controlPointsDefinition/fromFile/fromFile.C
index 7400a87359..2dcb5dc417 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/controlPointsDefinition/fromFile/fromFile.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/controlPointsDefinition/fromFile/fromFile.C
@@ -63,7 +63,7 @@ void Foam::fromFile::computeControlPoints()
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C
index c73b7835ad..c5515ba843 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C
@@ -60,7 +60,7 @@ volBSplinesBase::volBSplinesBase
                 mesh,
                 IOobject::MUST_READ_IF_MODIFIED,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         ).subDict("volumetricBSplinesMotionSolverCoeffs")
     );
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
index 1210020825..92bc073275 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
@@ -58,7 +58,7 @@ GeometricField<Type, PatchField, GeoMesh>* variablesSet::allocateNamedField
             io.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         fieldType::typeName
     );
@@ -313,7 +313,7 @@ void variablesSet::renameTurbulenceField
         mesh,
         IOobject::MUST_READ,
         IOobject::AUTO_WRITE,
-        false // Do not register
+        IOobject::NO_REGISTER
     );
 
     if (headerCustomName.typeHeaderOk<VolFieldType>(true))
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
index de37b7e926..f9e1d85bf9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointRASModel/adjointRASModel.C
@@ -175,9 +175,9 @@ autoPtr<adjointRASModel> adjointRASModel::New
             "adjointRASProperties",
             primalVars.U().time().constant(),
             primalVars.U().db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C
index 8b56a910ef..6056adf1bd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C
@@ -90,9 +90,9 @@ autoPtr<adjointTurbulenceModel> adjointTurbulenceModel::New
                 "turbulenceProperties",
                 primalVars.U().time().constant(),
                 primalVars.U().db(),
-                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false // Do not register
+                IOobject::NO_REGISTER
             )
         ).get<word>("simulationType")
     );
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
index d41edb2842..5816590841 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
@@ -255,9 +255,9 @@ autoPtr<RASModelVariables> RASModelVariables::New
             turbulenceModel::propertiesName,
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
index 7a92b12bb1..b41f93a8e6 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
@@ -138,7 +138,7 @@ const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
                 mesh,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh
         );
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
index deee6f06c1..f0834d5dba 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
@@ -167,7 +167,7 @@ Foam::cellCellStencil::createField
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index 96a9247d78..f678ec9e25 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -530,7 +530,7 @@ Foam::cellCellStencils::cellVolumeWeight::cellVolumeWeight
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
@@ -566,7 +566,7 @@ Foam::cellCellStencils::cellVolumeWeight::cellVolumeWeight
         mesh_,
         IOobject::READ_IF_PRESENT,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
     if (io.typeHeaderOk<volScalarField>(true))
     {
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index aef5b8d6ab..1f49f27ff8 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -1732,7 +1732,7 @@ Foam::cellCellStencils::inverseDistance::inverseDistance
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
@@ -1762,7 +1762,7 @@ Foam::cellCellStencils::inverseDistance::inverseDistance
         mesh_,
         IOobject::READ_IF_PRESENT,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
     if (io.typeHeaderOk<volScalarField>(true))
     {
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.C b/src/overset/oversetFvMesh/oversetFvMeshBase.C
index ade7d4fe2e..3832a282ac 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.C
@@ -441,7 +441,7 @@ void Foam::oversetFvMeshBase::writeAgglomeration
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
@@ -496,7 +496,7 @@ void Foam::oversetFvMeshBase::writeAgglomeration
                     mesh_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 mesh_,
                 dimensionedScalar(dimless, Zero)
@@ -652,7 +652,7 @@ bool Foam::oversetFvMeshBase::writeObject
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
@@ -676,7 +676,7 @@ bool Foam::oversetFvMeshBase::writeObject
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
@@ -716,7 +716,7 @@ bool Foam::oversetFvMeshBase::writeObject
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar("minOne", dimless, scalar(-1)),
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C b/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C
index c387f26308..4805fec67e 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C
@@ -755,7 +755,7 @@ Foam::SolverPerformance<Type> Foam::oversetFvMeshBase::solveOverset
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
diff --git a/src/parallel/decompose/decompose/decompositionModel.C b/src/parallel/decompose/decompose/decompositionModel.C
index d18b4422dd..074e83c6f2 100644
--- a/src/parallel/decompose/decompose/decompositionModel.C
+++ b/src/parallel/decompose/decompose/decompositionModel.C
@@ -67,7 +67,7 @@ Foam::decompositionModel::decompositionModel
                 mesh.thisDb(),
                 (fallback ? IOobject::READ_IF_PRESENT : IOobject::MUST_READ),
                 IOobject::NO_WRITE,
-                false,  //io.registerObject(),
+                IOobject::NO_REGISTER,
                 true    //io.globalObject()
             ),
             decompDictFile
diff --git a/src/parallel/decompose/decompose/dimFieldDecomposerTemplates.C b/src/parallel/decompose/decompose/dimFieldDecomposerTemplates.C
index 4f7c736975..de5e73cc7f 100644
--- a/src/parallel/decompose/decompose/dimFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/dimFieldDecomposerTemplates.C
@@ -51,7 +51,7 @@ Foam::dimFieldDecomposer::decomposeField
                 procMesh_.thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             procMesh_,
             field.dimensions(),
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
index b9d93c6b9a..b845b0c38f 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
@@ -58,7 +58,7 @@ Foam::fvFieldDecomposer::decomposeField
                 procMesh_.thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             procMesh_,
             field.dimensions(),
diff --git a/src/parallel/decompose/decompose/lagrangianFieldDecomposerTemplates.C b/src/parallel/decompose/decompose/lagrangianFieldDecomposerTemplates.C
index 7cfd54cdd0..1a08a181e0 100644
--- a/src/parallel/decompose/decompose/lagrangianFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/lagrangianFieldDecomposerTemplates.C
@@ -50,7 +50,7 @@ Foam::lagrangianFieldDecomposer::decomposeField
             procMesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         // Mapping internal field values
         Field<Type>(field, particleIndices_)
@@ -77,7 +77,7 @@ Foam::lagrangianFieldDecomposer::decomposeFieldField
             procMesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         // Mapping internal field values
         Field<Field<Type>>(field, particleIndices_)
diff --git a/src/parallel/decompose/decompose/pointFieldDecomposerTemplates.C b/src/parallel/decompose/decompose/pointFieldDecomposerTemplates.C
index 5fa9e405b0..b42fbc1a21 100644
--- a/src/parallel/decompose/decompose/pointFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/pointFieldDecomposerTemplates.C
@@ -86,7 +86,7 @@ Foam::pointFieldDecomposer::decomposeField
                 procMesh_.thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             procMesh_,
             field.dimensions(),
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
index 39af4983cd..0c02723cd5 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
@@ -69,16 +69,17 @@ Foam::labelList Foam::manualDecomp::decompose
     const scalarField& pointWeights
 ) const
 {
-    labelIOList finalDecomp
+    labelList finalDecomp
     (
-        IOobject
+        labelIOList::readContents
         (
-            dataFile_,
-            mesh.facesInstance(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject
+            (
+                dataFile_,
+                mesh.facesInstance(),
+                mesh.thisDb(),
+                IOobject::MUST_READ
+            )
         )
     );
 
@@ -95,21 +96,21 @@ Foam::labelList Foam::manualDecomp::decompose
             << exit(FatalError);
     }
 
-    const label minVal = min(finalDecomp);
-    const label maxVal = max(finalDecomp);
 
-    if (minVal < 0 || maxVal >= nDomains_)
+    const MinMax<label> range = minMax(finalDecomp);
+
+    if (range.min() < 0 || range.max() >= nDomains_)
     {
         FatalErrorInFunction
             << "According to the decomposition, cells assigned to "
             << "impossible processor numbers.  Min processor = "
-            << minVal << " Max processor = " << maxVal
+            << range.min() << " Max processor = " << range.max()
             << ".\n" << "Manual decomposition data read from file "
             << dataFile_ << "." << endl
             << exit(FatalError);
     }
 
-    return std::move(finalDecomp);
+    return finalDecomp;
 }
 
 
diff --git a/src/parallel/decompose/faDecompose/faMeshDecomposition.C b/src/parallel/decompose/faDecompose/faMeshDecomposition.C
index ae96a5bc63..3ab6a59f60 100644
--- a/src/parallel/decompose/faDecompose/faMeshDecomposition.C
+++ b/src/parallel/decompose/faDecompose/faMeshDecomposition.C
@@ -74,7 +74,7 @@ void Foam::faMeshDecomposition::distributeFaces()
             procFvMesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false  // not registered
+            IOobject::NO_REGISTER
         );
 
 
@@ -256,7 +256,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
             procFvMesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false  // not registered
+            IOobject::NO_REGISTER
         );
 
 
@@ -1326,7 +1326,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
             procMesh.thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false  // not registered
+            IOobject::NO_REGISTER
         );
 
         // pointProcAddressing
diff --git a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
index 5e88cac729..14f834ec56 100644
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@@ -672,7 +672,7 @@ void Foam::faMeshReconstructor::writeAddressing(const word& timeName) const
         procMesh_.thisDb(),
         IOobject::NO_READ,
         IOobject::NO_WRITE,
-        false  // not registered
+        IOobject::NO_REGISTER
     );
 
     // boundaryProcAddressing
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index ff4c104dc7..06fa7cf83e 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -195,7 +195,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
                     meshes_[proci].thisDb(),
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false  // not registered
+                    IOobject::NO_REGISTER
                 )
             )
         );
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
index 24f6c4afb2..4f4e171057 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
@@ -79,7 +79,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseEuler::dragModels::interface::K
             Ur.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         Ur.mesh(),
         dimensionedScalar(dimDensity/dimTime, Zero)
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
index 191af99c2e..e18913a5c4 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
@@ -42,9 +42,9 @@ Foam::multiphaseInter::multiphaseSystem::New
             phasePropertiesName,
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index 92175160ba..1ecb0a60cf 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -136,10 +136,10 @@ Foam::BlendedInterfacialModel<ModelType>::evaluate
                 phase1_.mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             phase1_.mesh(),
-            dimensioned<Type>("zero", dims, Zero)
+            dimensioned<Type>(dims, Zero)
         )
     );
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
index 3baa96c41a..bb7a2bf8b8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
@@ -42,9 +42,9 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
             propertiesName,
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index c1851d54a2..b0aac1aa02 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -131,10 +131,10 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
                 phase.mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             phase.mesh(),
-            dimensionedScalar(dimensionSet(0, 2, -1, 0, 0))
+            dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
         )
     );
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
index a5a759abf3..b97587a0bf 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
@@ -43,9 +43,9 @@ Foam::twoPhaseSystem::New
             propertiesName,
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index 4d7c1adafb..170d0d4df3 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -141,7 +141,7 @@ JohnsonJacksonSchaeffer::nu
                 phase.mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             phase.mesh(),
             dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index cf14452f2e..c621651753 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -131,7 +131,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
                 phase.mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             phase.mesh(),
             dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index 89033668c5..c9f207655d 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -151,7 +151,7 @@ Foam::BlendedInterfacialModel<modelType>::K() const
                 pair_.phase1().mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pair_.phase1().mesh(),
             dimensionedScalar(modelType::dimK, Zero)
@@ -219,7 +219,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
                 pair_.phase1().mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pair_.phase1().mesh(),
             dimensionedScalar(modelType::dimK, Zero)
@@ -280,7 +280,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
             pair_.phase1().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pair_.phase1().mesh(),
         dimensioned<Type>(modelType::dimF, Zero)
@@ -345,7 +345,7 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
             pair_.phase1().mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pair_.phase1().mesh(),
         dimensionedScalar(modelType::dimF*dimArea, Zero)
@@ -408,7 +408,7 @@ Foam::BlendedInterfacialModel<modelType>::D() const
                 pair_.phase1().mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pair_.phase1().mesh(),
             dimensionedScalar(modelType::dimD, Zero)
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
index cc3026fac3..c6f0a03f7b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -80,7 +80,7 @@ Foam::tmp<Foam::volScalarField> Foam::diameterModels::constant::d() const
                 phase_.U().mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             phase_.U().mesh(),
             d_
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
index c3bfe74874..2b540ed3fa 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
@@ -74,7 +74,7 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::noLift::Cl() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimless, Zero)
@@ -95,7 +95,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedVector(dimF, Zero)
@@ -116,7 +116,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::liftModels::noLift::Ff() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimF*dimArea, Zero)
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 83e7f5628d..2d3180152d 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -81,7 +81,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::D() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedScalar(dimD, Zero)
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 5436d22970..0c8a3bff33 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -86,7 +86,7 @@ Foam::virtualMassModels::constantVirtualMassCoefficient::Cvm() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             Cvm_
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 5f61de5d47..4eb415f7e4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -80,7 +80,7 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedVector(dimF, Zero)
@@ -102,7 +102,7 @@ Foam::wallLubricationModels::noWallLubrication::F() const
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensionedVector(dimF, Zero)
diff --git a/src/regionFaModels/KirchhoffShell/KirchhoffShell.C b/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
index 675f82f8de..fa9a645c98 100644
--- a/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
+++ b/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
@@ -293,7 +293,7 @@ const tmp<areaScalarField> KirchhoffShell::rho() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             regionMesh(),
             dimensionedScalar("rho", dimDensity, solid().rho()),
diff --git a/src/regionFaModels/thermalShell/thermalShell.C b/src/regionFaModels/thermalShell/thermalShell.C
index 065a1d0463..9d7fe5855d 100644
--- a/src/regionFaModels/thermalShell/thermalShell.C
+++ b/src/regionFaModels/thermalShell/thermalShell.C
@@ -195,7 +195,7 @@ const tmp<areaScalarField> thermalShell::Cp() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             regionMesh(),
             dimensionedScalar(dimEnergy/dimTemperature/dimMass, thermo_.Cp()),
@@ -218,7 +218,7 @@ const tmp<areaScalarField> thermalShell::rho() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             regionMesh(),
             dimensionedScalar(dimDensity, thermo_.rho()),
@@ -241,7 +241,7 @@ const tmp<areaScalarField> thermalShell::kappa() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             regionMesh(),
             dimensionedScalar
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
index 2becf98f13..74b3a36f70 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
@@ -56,7 +56,7 @@ autoPtr<pyrolysisModel> pyrolysisModel::New
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C b/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
index 73ff001d85..0cc9c2005b 100644
--- a/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
+++ b/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
@@ -125,7 +125,7 @@ bool Foam::functionObjects::filmFlux::execute()
             filmMesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         filmMesh,
         dimensionedScalar(dimLength, Zero),
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 3e624c271e..09763a0dbc 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -807,8 +807,8 @@ kinematicSingleLayer::kinematicSingleLayer
                 time().timeName(),
                 regionMesh(),
                 IOobject::READ_IF_PRESENT,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             fvc::flux(deltaRho_*U_)
         );
@@ -1093,7 +1093,7 @@ tmp<volScalarField::Internal> kinematicSingleLayer::Srho() const
             primaryMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         primaryMesh(),
         dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
@@ -1115,7 +1115,7 @@ tmp<volScalarField::Internal> kinematicSingleLayer::Srho
             primaryMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         primaryMesh(),
         dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
@@ -1134,7 +1134,7 @@ tmp<volScalarField::Internal> kinematicSingleLayer::Sh() const
             primaryMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         primaryMesh(),
         dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
index 9f539dc6ae..7cad81cd1e 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
@@ -83,7 +83,7 @@ tmp<volScalarField::Internal> noFilm::Srho() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
@@ -102,7 +102,7 @@ tmp<volScalarField::Internal> noFilm::Srho(const label i) const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
@@ -121,7 +121,7 @@ tmp<volScalarField::Internal> noFilm::Sh() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
index 3e81f8d3bb..e88d983f08 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
@@ -80,7 +80,7 @@ void contactAngleForce::initialise()
                 filmModel_.regionMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             filmModel_.regionMesh(),
             dimensionedScalar("y", dimLength, GREAT)
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
index 6f80ef6fef..d36ad75b81 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
@@ -87,7 +87,7 @@ tmp<volScalarField> constantHeatTransfer::h() const
                 filmModel_.regionMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             filmModel_.regionMesh(),
             dimensionedScalar
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
index 737382070c..6a6e342a12 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
@@ -196,7 +196,7 @@ void waxSolventEvaporation::correctModel
             film.regionMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         film.regionMesh(),
         dimensionedScalar(dimDensity*dimVelocity, Zero)
@@ -211,7 +211,7 @@ void waxSolventEvaporation::correctModel
             film.regionMesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         film.regionMesh(),
         dimensionedScalar(dimDensity*dimVelocity, Zero)
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
index 9227b5d3b5..9ae308f554 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
@@ -56,7 +56,7 @@ autoPtr<surfaceFilmModel> surfaceFilmModel::New
         mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false // Do not register
+        IOobject::NO_REGISTER
     );
 
     if (io.typeHeaderOk<IOdictionary>())
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 79d805c38b..b792aa807e 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -550,8 +550,8 @@ thermoSingleLayer::thermoSingleLayer
                 time().timeName(),
                 regionMesh(),
                 IOobject::READ_IF_PRESENT,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             fvc::flux(deltaRho_*U_)
         );
@@ -716,7 +716,7 @@ tmp<volScalarField::Internal> thermoSingleLayer::Srho() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             primaryMesh(),
             dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
@@ -768,7 +768,7 @@ tmp<volScalarField::Internal> thermoSingleLayer::Srho
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             primaryMesh(),
             dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
@@ -818,7 +818,7 @@ tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             primaryMesh(),
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/regionModels/thermalBaffleModels/noThermo/noThermo.C b/src/regionModels/thermalBaffleModels/noThermo/noThermo.C
index af7668052b..755c3a4e4e 100644
--- a/src/regionModels/thermalBaffleModels/noThermo/noThermo.C
+++ b/src/regionModels/thermalBaffleModels/noThermo/noThermo.C
@@ -104,7 +104,7 @@ const tmp<volScalarField> noThermo::Cp() const
                 primaryMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             primaryMesh(),
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index 131aed9b48..777b3fced8 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -83,7 +83,7 @@ void thermalBaffle::solveEnergy()
                 regionMesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             regionMesh(),
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
index e0df412934..3733b92004 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
@@ -48,9 +48,9 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New(const fvMesh& mesh)
             "thermalBaffleProperties",
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
index c537d7fa53..bce6268cef 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
@@ -66,16 +66,17 @@ Foam::labelList Foam::manualRenumber::renumber
     const pointField& points
 ) const
 {
-    labelIOList newToOld
+    labelList newToOld
     (
-        IOobject
+        labelIOList::readContents
         (
-            dataFile_,
-            mesh.facesInstance(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE,
-            false
+            IOobject
+            (
+                dataFile_,
+                mesh.facesInstance(),
+                mesh.thisDb(),
+                IOobject::MUST_READ
+            )
         )
     );
 
@@ -104,7 +105,7 @@ Foam::labelList Foam::manualRenumber::renumber
                 << "Renumbering is not one-to-one. Index "
                 << i << " maps onto original cell " << origCelli
                 << ".\n" << "Manual renumbering data read from file "
-                << dataFile_ << "." << endl
+                << dataFile_ << nl
                 << exit(FatalError);
         }
 
@@ -115,16 +116,15 @@ Foam::labelList Foam::manualRenumber::renumber
         else
         {
             FatalErrorInFunction
-                << "Renumbering is not one-to-one. Both index "
-                << oldToNew[origCelli]
-                << " and " << i << " map onto " << origCelli
-                << ".\n" << "Manual renumbering data read from file "
-                << dataFile_ << "." << endl
+                << "Renumbering is not one-to-one. Index " << i << " and "
+                << oldToNew[origCelli] << " map onto " << origCelli << nl
+                << "Manual renumbering data read from file "
+                << dataFile_ << nl
                 << exit(FatalError);
         }
     }
 
-    return std::move(newToOld);
+    return newToOld;
 }
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 79d9c5d1fa..cc52b3237e 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -75,7 +75,7 @@ Foam::rigidBodyMeshMotion::bodyMesh::bodyMesh
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pointMesh::New(mesh),
         dimensionedScalar(dimless, Zero)
@@ -111,7 +111,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
                 mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
       : coeffDict()
@@ -408,7 +408,7 @@ bool Foam::rigidBodyMeshMotion::writeObject
             mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index c11c53b9d6..3544dd2723 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -95,7 +95,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
                 mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
       : coeffDict()
@@ -295,7 +295,7 @@ bool Foam::rigidBodyMeshMotionSolver::writeObject
             mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index 72c44fc914..0d40107fb5 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -83,7 +83,7 @@ Foam::probes::getOrLoadField(const word& fieldName) const
                     mesh_,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 mesh_
             )
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C b/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C
index f444300ad3..a4f8a4a004 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C
@@ -53,7 +53,7 @@ Foam::sampledSets::getOrLoadField(const word& fieldName) const
                     mesh_,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 mesh_
             )
diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
index 9e7975f40d..ea5c5343e6 100644
--- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
+++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
@@ -147,7 +147,7 @@ Foam::triSurfaceMeshPointSet::triSurfaceMeshPointSet
                 mesh.time(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             dictionary::null
         ).points();
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 8b92f7a6e2..787201a8cc 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -91,7 +91,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
                 fvm,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             );
 
             if (vfHeader.typeHeaderOk<volScalarField>(true))
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index 2623b11235..79f74e001f 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -471,7 +471,7 @@ void Foam::sampledCuttingPlane::createGeometry()
                 mesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimLength, Zero)
@@ -494,7 +494,7 @@ void Foam::sampledCuttingPlane::createGeometry()
                 mesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pointMesh::New(mesh),
             dimensionedScalar(dimLength, Zero)
diff --git a/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C b/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C
index cf0977332b..2cce5342e2 100644
--- a/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C
+++ b/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C
@@ -88,7 +88,7 @@ inline static IOobject selectReadIO(const word& name, const Time& runTime)
         runTime,                // registry
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false   // no register
+        IOobject::NO_REGISTER
     );
 }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index a9225a204a..0495196b1d 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -142,7 +142,7 @@ Foam::sampledSurface::pointAverage
             pfld.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh,
         dimensioned<Type>(dimless, Zero)
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
index b1d6fe1e7f..90486ebaba 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
@@ -98,7 +98,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
                 fvm,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvm
         );
diff --git a/src/sampling/surface/cutting/cuttingPlaneCuts.C b/src/sampling/surface/cutting/cuttingPlaneCuts.C
index b5e5997167..5f5d119e68 100644
--- a/src/sampling/surface/cutting/cuttingPlaneCuts.C
+++ b/src/sampling/surface/cutting/cuttingPlaneCuts.C
@@ -173,7 +173,7 @@ Foam::label Foam::cuttingPlane::calcCellCuts
                 fvmesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvmesh,
             dimensionedScalar(dimless, Zero)
diff --git a/src/sampling/surface/cutting/cuttingSurfaceCuts.C b/src/sampling/surface/cutting/cuttingSurfaceCuts.C
index 697ee9a77b..3c8744f686 100644
--- a/src/sampling/surface/cutting/cuttingSurfaceCuts.C
+++ b/src/sampling/surface/cutting/cuttingSurfaceCuts.C
@@ -108,7 +108,7 @@ void Foam::cuttingSurface::calcCellCuts
                 fvm.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvm,
             dimensionedScalar(dimless, Zero)
@@ -131,7 +131,7 @@ void Foam::cuttingSurface::calcCellCuts
                 fvm.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pointMesh::New(fvm),
             dimensionedScalar(dimLength, Zero)
diff --git a/src/sampling/surface/distanceSurface/distanceSurface.C b/src/sampling/surface/distanceSurface/distanceSurface.C
index 31cca66329..c8f1fa18c5 100644
--- a/src/sampling/surface/distanceSurface/distanceSurface.C
+++ b/src/sampling/surface/distanceSurface/distanceSurface.C
@@ -433,7 +433,7 @@ void Foam::distanceSurface::createGeometry()
                 fvmesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvmesh,
             dimensionedScalar(dimLength, GREAT)
@@ -676,7 +676,7 @@ void Foam::distanceSurface::createGeometry()
                 fvmesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pointMesh::New(fvmesh),
             dimensionedScalar(dimLength, Zero)
diff --git a/src/sampling/surface/isoSurface/isoSurfaceCell.C b/src/sampling/surface/isoSurface/isoSurfaceCell.C
index b0700f97d0..06a7725304 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/surface/isoSurface/isoSurfaceCell.C
@@ -1199,7 +1199,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
                 fvmesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvmesh,
             dimensionedScalar(dimless, Zero)
diff --git a/src/sampling/surface/isoSurface/isoSurfacePoint.C b/src/sampling/surface/isoSurface/isoSurfacePoint.C
index 0eaa1c1e71..8592162eae 100644
--- a/src/sampling/surface/isoSurface/isoSurfacePoint.C
+++ b/src/sampling/surface/isoSurface/isoSurfacePoint.C
@@ -1366,7 +1366,7 @@ Foam::isoSurfacePoint::isoSurfacePoint
             fvmesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         fvmesh,
         dimLength,
@@ -1448,7 +1448,7 @@ Foam::isoSurfacePoint::isoSurfacePoint
                 fvmesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvmesh,
             dimensionedScalar(dimless, Zero)
diff --git a/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C b/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
index a4bf332ae3..fe314fc6df 100644
--- a/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
+++ b/src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
@@ -51,7 +51,7 @@ Foam::isoSurfacePoint::adaptPatchFields
             fld.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         fld,        // internal field
         true        // preserveCouples
diff --git a/src/sampling/surface/isoSurface/isoSurfaceTopo.C b/src/sampling/surface/isoSurface/isoSurfaceTopo.C
index 68a1c831f1..1c8d10c1f6 100644
--- a/src/sampling/surface/isoSurface/isoSurfaceTopo.C
+++ b/src/sampling/surface/isoSurface/isoSurfaceTopo.C
@@ -978,7 +978,7 @@ Foam::isoSurfaceTopo::isoSurfaceTopo
                 fvmesh.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             fvmesh,
             dimensionedScalar(dimless)
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index d3559f4ea9..c1f87b91fc 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -79,7 +79,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
                 mesh,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
       : coeffDict(),
@@ -101,7 +101,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         pointMesh::New(mesh),
         dimensionedScalar(dimless, Zero)
@@ -311,7 +311,7 @@ bool Foam::sixDoFRigidBodyMotionSolver::writeObject
             mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 5a692aa7f0..698ece2438 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -499,7 +499,7 @@ Foam::MeshedSurface<Face>::MeshedSurface
             runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         surfName
     );
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index ae9ee831d9..b1d38377a1 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -155,7 +155,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
                 t,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -181,7 +181,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
                 t,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -214,7 +214,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
                 t,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index d1edce3521..c0116a212b 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -92,7 +92,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -106,7 +106,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -121,7 +121,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
                 *this,
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
@@ -176,7 +176,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
                 *this,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index c1dcdf2fb5..114f24e52a 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -116,7 +116,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
             *dummyTimePtr,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/surfMesh/writers/debug/debugSurfaceWriter.C b/src/surfMesh/writers/debug/debugSurfaceWriter.C
index 7d1ee11c48..b0ab5cb7b5 100644
--- a/src/surfMesh/writers/debug/debugSurfaceWriter.C
+++ b/src/surfMesh/writers/debug/debugSurfaceWriter.C
@@ -283,7 +283,7 @@ Foam::fileName Foam::surfaceWriters::debugWriter::write()
                 *dummyTimePtr,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false  // Do not register
+                IOobject::NO_REGISTER
             )
         );
         iopts.note() = (this->isPointData() ? "point data" : "face data");
@@ -351,7 +351,7 @@ Foam::fileName Foam::surfaceWriters::debugWriter::writeTemplate
                     *dummyTimePtr,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false  // Do not register
+                    IOobject::NO_REGISTER
                 )
             );
             iopts.note() = (this->isPointData() ? "point data" : "face data");
@@ -369,7 +369,7 @@ Foam::fileName Foam::surfaceWriters::debugWriter::writeTemplate
                     *dummyTimePtr,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false  // Do not register
+                    IOobject::NO_REGISTER
                 )
             );
             iofld.note() = (this->isPointData() ? "point data" : "face data");
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index ca69a45607..68e540cf44 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -141,9 +141,9 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
             phasePropertyName(dictName, phaseName),
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -190,9 +190,9 @@ Foam::autoPtr<Thermo> Foam::basicThermo::New
             dictName,
             mesh.time().constant(),
             mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index b880caa00c..3690a1f30d 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -229,7 +229,7 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::he
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             he_.dimensions()
@@ -324,7 +324,7 @@ Foam::heThermo<BasicThermo, MixtureType>::hc() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             he_.dimensions()
@@ -415,7 +415,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cp() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimEnergy/dimMass/dimTemperature
@@ -510,7 +510,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cv() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimEnergy/dimMass/dimTemperature
@@ -579,7 +579,7 @@ Foam::heThermo<BasicThermo, MixtureType>::gamma() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimless
@@ -654,7 +654,7 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimEnergy/dimMass/dimTemperature
@@ -726,7 +726,7 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimless
@@ -832,7 +832,7 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::W
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimMass/dimMoles
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
index cad5e2b9fe..e7f3cd40c3 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
@@ -481,7 +481,7 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::tc() const
                 this->mesh(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh(),
             dimensionedScalar("small", dimTime, SMALL),
@@ -555,7 +555,7 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::Qdot() const
                 this->mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh_,
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
index 6d355fbe23..bcc0abb832 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
@@ -651,7 +651,7 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
             this->mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->thermo().rho()
     );
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index 954d41d1d0..32d5f00358 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -46,7 +46,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
             thermo.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
index 5ea04324a8..d17d028d9f 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
@@ -123,7 +123,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
                 p.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             p.mesh(),
             dimensionedScalar(dimVelocity, Zero)
@@ -176,7 +176,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
                 p.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             p.mesh(),
             dimensionedScalar(dimVelocity, Zero)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
index 6a16125f8f..f3478e80b3 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
@@ -123,7 +123,7 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
                 p.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             p.mesh(),
             dimensionedScalar(dimVelocity, Zero)
@@ -178,7 +178,7 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
                 p.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             p.mesh(),
             dimensionedScalar(dimVelocity, Zero)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
index 1e4f934e75..ac4df02529 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
@@ -302,7 +302,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
             p.db(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         p.mesh(),
         dimensionedScalar(dimless, Zero)
@@ -334,7 +334,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
                 p.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             p.mesh(),
             dimensionedScalar(dimVelocity, Zero)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
index 7d11e8c5ba..2f09891022 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
@@ -82,7 +82,7 @@ Foam::laminarFlameSpeedModels::constant::operator()() const
                 psiuReactionThermo_.T().db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             psiuReactionThermo_.T().mesh(),
             Su_
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
index eb1b021db7..772457b3ff 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
             ct.T().db(),
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE,
-            false // Do not register
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H b/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H
index 8179b67553..ebb6991aba 100644
--- a/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H
+++ b/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H
@@ -21,7 +21,7 @@
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false // Do not register
+                IOobject::NO_REGISTER
             )
         );
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
index d4336dd3c7..4df1c317a5 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
@@ -265,7 +265,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::P1::Rp() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             4.0*absorptionEmission_->eCont()*physicoChemical::sigma
         )
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 1f452986b6..e7aabf242a 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -656,7 +656,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::fvDOM::Rp() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             (
                 4
@@ -699,7 +699,7 @@ Foam::radiation::fvDOM::Ru() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimensionSet(1, -1, -3, 0, 0), Zero)
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
index 01d416d035..cc17586264 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
@@ -46,9 +46,9 @@ Foam::radiation::radiationModel::New
         "radiationProperties",
         T.time().constant(),
         T.mesh(),
-        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false // Do not register
+        IOobject::NO_REGISTER
     );
 
     if (io.typeHeaderOk<IOdictionary>(true))
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.C
index fb670bc53e..d415b9c030 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.C
@@ -223,7 +223,7 @@ void Foam::faceShading::calculate()
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
index 1b897d7a61..ef13824206 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
@@ -427,7 +427,7 @@ void Foam::radiation::solarLoad::calculateQdiff
             mesh_,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -920,7 +920,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::solarLoad::Rp() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index 7e9bc5a010..86f3432a72 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -79,7 +79,7 @@ void Foam::radiation::viewFactor::initialise()
                 mesh_.time(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             finalAgglom_
@@ -123,7 +123,7 @@ void Foam::radiation::viewFactor::initialise()
                 mesh_,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
     );
@@ -139,7 +139,7 @@ void Foam::radiation::viewFactor::initialise()
                 mesh_,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
     );
@@ -155,7 +155,7 @@ void Foam::radiation::viewFactor::initialise()
                 mesh_,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
     );
@@ -548,7 +548,7 @@ Foam::radiation::viewFactor::viewFactor(const volScalarField& T)
             mesh_,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
     map_(),
@@ -561,7 +561,7 @@ Foam::radiation::viewFactor::viewFactor(const volScalarField& T)
 //             mesh_.time(),
 //             IOobject::NO_READ,
 //             IOobject::NO_WRITE,
-//             false
+//             IOobject::NO_REGISTER
 //         ),
 //         mesh_,
 //         finalAgglom_
@@ -611,7 +611,7 @@ Foam::radiation::viewFactor::viewFactor
             mesh_,
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     ),
     map_(),
@@ -624,7 +624,7 @@ Foam::radiation::viewFactor::viewFactor
 //             mesh_.time(),
 //             IOobject::NO_READ,
 //             IOobject::NO_WRITE,
-//             false
+//             IOobject::NO_REGISTER
 //         ),
 //         mesh_,
 //         finalAgglom_
@@ -1149,7 +1149,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::viewFactor::Rp() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar
@@ -1172,7 +1172,7 @@ Foam::radiation::viewFactor::Ru() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
index c0307676b7..f9f78d2d2d 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
@@ -80,7 +80,7 @@ Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
@@ -103,7 +103,7 @@ Foam::radiation::absorptionEmissionModel::aDisp(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
@@ -133,7 +133,7 @@ Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
@@ -156,7 +156,7 @@ Foam::radiation::absorptionEmissionModel::eDisp(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
@@ -186,7 +186,7 @@ Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
@@ -209,7 +209,7 @@ Foam::radiation::absorptionEmissionModel::EDisp(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
index 5fdc255b70..c3f0af471a 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
@@ -78,7 +78,7 @@ Foam::radiation::constantAbsorptionEmission::aCont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             a_
@@ -103,7 +103,7 @@ Foam::radiation::constantAbsorptionEmission::eCont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             e_
@@ -128,7 +128,7 @@ Foam::radiation::constantAbsorptionEmission::ECont(const label bandI) const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             E_
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
index c77ec73321..e6201ee327 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
@@ -62,7 +62,7 @@ Foam::radiation::boundaryRadiationProperties::boundaryRadiationProperties
         mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
-        false
+        IOobject::NO_REGISTER
     );
 
     if (boundaryIO.typeHeaderOk<IOdictionary>(true))
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C
index 2aa5c07f9f..666af9dc28 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C
@@ -77,7 +77,7 @@ Foam::radiation::constantScatter::sigmaEff() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             sigma_*(3.0 - C_)
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C b/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C
index 239cb6edcf..cc7f40c745 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C
@@ -67,7 +67,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::noScatter::sigmaEff() const
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless/dimLength, Zero)
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index 46bbdfc786..738cde1275 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
@@ -478,7 +478,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::Tb() const
                 this->T_.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->T_
         )
@@ -537,7 +537,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psiu() const
                 this->psi_.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->psi_.mesh(),
             this->psi_.dimensions()
@@ -591,7 +591,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psib() const
                 this->psi_.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->psi_.mesh(),
             this->psi_.dimensions()
@@ -646,7 +646,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::muu() const
                 this->T_.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->T_.mesh(),
             dimensionSet(1, -1, -1, 0, 0)
@@ -704,7 +704,7 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::mub() const
                 this->T_.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->T_.mesh(),
             dimensionSet(1, -1, -1, 0, 0)
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
index 1820bebfa2..3a305820a8 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
@@ -42,7 +42,7 @@ Foam::basicSolidChemistryModel::New(solidReactionThermo& thermo)
             thermo.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
@@ -58,9 +58,9 @@ Foam::basicSolidChemistryModel::New(solidReactionThermo& thermo)
             basicThermo::dictName,
             thermo.db().time().constant(),
             thermo.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index 402f912981..cda0d2ec76 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -465,7 +465,7 @@ calculate()
             this->mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->solidThermo().rho()
     );
@@ -537,7 +537,7 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::solve
             this->mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         this->solidThermo().rho()
     );
@@ -632,7 +632,7 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
                 this->mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh_,
             dimensionedScalar(dimEnergy/dimMass, Zero)
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 9a5fafefa9..6441efddce 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -127,7 +127,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::Qdot() const
                 this->mesh_,
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             this->mesh_,
             dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 0923015d83..440288d022 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -247,16 +247,14 @@ Foam::linearValveFvMesh::linearValveFvMesh(const IOobject& io)
     topoChangerFvMesh(io),
     motionDict_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).optionalSubDict(typeName + "Coeffs")
     ),
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 7aac1ee2da..4e56adeb3d 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -314,16 +314,14 @@ Foam::linearValveLayersFvMesh::linearValveLayersFvMesh(const IOobject& io)
     topoChangerFvMesh(io),
     motionDict_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).optionalSubDict(typeName + "Coeffs")
     )
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 81a47f7d93..411bb59ba4 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -256,16 +256,14 @@ Foam::mixerFvMesh::mixerFvMesh
     topoChangerFvMesh(io),
     motionDict_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).optionalSubDict(typeName + "Coeffs")
     ),
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 6bdc46baf5..14115509ab 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -253,16 +253,14 @@ Foam::movingConeTopoFvMesh::movingConeTopoFvMesh
     topoChangerFvMesh(io, doInit),
     motionDict_
     (
-        IOdictionary
+        IOdictionary::readContents
         (
             IOobject
             (
                 "dynamicMeshDict",
                 time().constant(),
                 *this,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
+                IOobject::MUST_READ
             )
         ).optionalSubDict(typeName + "Coeffs")
     )
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
index 0c8c348cbf..f4d676933f 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
@@ -92,7 +92,7 @@ void Foam::rawTopoChangerFvMesh::zeroUnmappedValues
                     *this,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 *this,
                 dimensioned<Type>(fld.dimensions(), Zero)
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
index df3c4aecbe..0fed669c5a 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
@@ -74,7 +74,7 @@ Foam::surfaceTensionModels::constant::sigma() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         sigma_
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
index dc942889e1..ccde889325 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
@@ -81,7 +81,7 @@ Foam::surfaceTensionModels::temperatureDependent::sigma() const
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimSigma
diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
index ad37d25c3b..12c6f73ec3 100644
--- a/src/waveModels/waveModel/waveModelNew.C
+++ b/src/waveModels/waveModel/waveModelNew.C
@@ -45,7 +45,7 @@ Foam::autoPtr<Foam::waveModel> Foam::waveModel::New
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false                   // Not registering
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/makePerturbation.C b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/makePerturbation.C
index af628bfa7a..e4a9b01661 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/makePerturbation.C
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/makePerturbation.C
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/makeWave.C b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/makeWave.C
index 2cd9c39185..0910fa3e7a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/makeWave.C
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/makeWave.C
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
             runTime,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         )
     );
 

From 1d81190881e9ed8d9f195e828f4de8d968188d83 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 10 Mar 2023 16:36:28 +0000
Subject: [PATCH 139/348] ENH: consistent reported topoSet counts (#2719)

---
 .../topoSet/cellSources/boxToCell/boxToCell.C |  4 ++--
 .../cellSources/cellToCell/cellToCell.C       |  6 ++---
 .../cellSources/faceToCell/faceToCell.C       | 10 ++++-----
 .../faceZoneToCell/faceZoneToCell.C           | 12 +++++-----
 .../cellSources/haloToCell/haloToCell.C       | 10 +++++----
 .../cellSources/patchToCell/patchToCell.C     | 12 +++++-----
 .../cellSources/pointToCell/pointToCell.C     |  6 ++---
 .../cellSources/surfaceToCell/surfaceToCell.C |  2 +-
 .../cellSources/zoneToCell/zoneToCell.C       | 15 ++++++-------
 .../setToCellZone/setToCellZone.C             |  8 +++----
 .../topoSet/faceSources/boxToFace/boxToFace.C |  4 ++--
 .../faceSources/cellToFace/cellToFace.C       |  6 ++---
 .../faceSources/faceToFace/faceToFace.C       |  6 ++---
 .../faceSources/holeToFace/holeToFace.C       | 21 +++++++++---------
 .../faceSources/patchToFace/patchToFace.C     | 19 ++++++----------
 .../faceSources/pointToFace/pointToFace.C     |  6 ++---
 .../faceSources/zoneToFace/zoneToFace.C       | 18 +++++++--------
 .../cellToFaceZone/cellToFaceZone.C           | 22 +++++++++----------
 .../faceZoneToFaceZone/faceZoneToFaceZone.C   |  8 +++----
 .../setAndNormalToFaceZone.C                  |  8 +++----
 .../setToFaceZone/setToFaceZone.C             |  8 +++----
 .../setsToFaceZone/setsToFaceZone.C           | 17 +++++++-------
 .../pointSources/boxToPoint/boxToPoint.C      | 12 +++++-----
 .../pointSources/cellToPoint/cellToPoint.C    |  6 ++---
 .../pointSources/faceToPoint/faceToPoint.C    |  6 ++---
 .../pointSources/labelToPoint/labelToPoint.C  |  6 ++---
 .../pointSources/pointToPoint/pointToPoint.C  |  6 ++---
 .../surfaceToPoint/surfaceToPoint.C           |  8 +++----
 .../pointSources/zoneToPoint/zoneToPoint.C    | 16 +++++++-------
 .../setToPointZone/setToPointZone.C           | 10 ++++-----
 src/meshTools/topoSet/topoSets/faceZoneSet.C  |  6 ++---
 31 files changed, 149 insertions(+), 155 deletions(-)

diff --git a/src/meshTools/topoSet/cellSources/boxToCell/boxToCell.C b/src/meshTools/topoSet/cellSources/boxToCell/boxToCell.C
index a3ca126907..6796fe2200 100644
--- a/src/meshTools/topoSet/cellSources/boxToCell/boxToCell.C
+++ b/src/meshTools/topoSet/cellSources/boxToCell/boxToCell.C
@@ -145,9 +145,9 @@ Foam::boxToCell::boxToCell
     if (!dict.readIfPresent("boxes", bbs_))
     {
         bbs_.resize(1);
-        if (!dict.readIfPresent("box", bbs_.first()))
+        if (!dict.readIfPresent("box", bbs_.front()))
         {
-            readBoxDim(dict, bbs_.first());
+            readBoxDim(dict, bbs_.front());
         }
     }
 }
diff --git a/src/meshTools/topoSet/cellSources/cellToCell/cellToCell.C b/src/meshTools/topoSet/cellSources/cellToCell/cellToCell.C
index 3a03593ae6..a427b4dc21 100644
--- a/src/meshTools/topoSet/cellSources/cellToCell/cellToCell.C
+++ b/src/meshTools/topoSet/cellSources/cellToCell/cellToCell.C
@@ -77,7 +77,7 @@ Foam::cellToCell::cellToCell
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -105,7 +105,7 @@ void Foam::cellToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding all elements of cellSet "
+            Info<< "    Adding all elements of cell sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -120,7 +120,7 @@ void Foam::cellToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing all elements of cellSet "
+            Info<< "    Removing all elements of cell sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/cellSources/faceToCell/faceToCell.C b/src/meshTools/topoSet/cellSources/faceToCell/faceToCell.C
index c477fb319c..1fb53e60ad 100644
--- a/src/meshTools/topoSet/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/topoSet/cellSources/faceToCell/faceToCell.C
@@ -163,7 +163,7 @@ Foam::faceToCell::faceToCell
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -192,8 +192,8 @@ void Foam::faceToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding cells according to faceSet "
-                << flatOutput(names_) << nl;
+            Info<< "    Adding cells according to face sets: "
+                << flatOutput(names_) << endl;
         }
 
         for (const word& setName : names_)
@@ -205,8 +205,8 @@ void Foam::faceToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing cells according to faceSet "
-                << flatOutput(names_) << nl;
+            Info<< "    Removing cells according to face sets: "
+                << flatOutput(names_) << endl;
         }
 
         for (const word& setName : names_)
diff --git a/src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.C
index f0bba7bdca..412a69ab4b 100644
--- a/src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.C
+++ b/src/meshTools/topoSet/cellSources/faceZoneToCell/faceZoneToCell.C
@@ -98,8 +98,9 @@ void Foam::faceZoneToCell::combine
 
         if (verbosity)
         {
-            Info<< "    Using matching zone " << zone.name()
-                << " with " << cellLabels.size() << " cells on "
+            Info<< "    Using matching zone " << zone.name() << " with "
+                << returnReduce(cellLabels.size(), sumOp<label>())
+                << " cells on "
                 << faceActionNames_[option_] << " side" << endl;
         }
 
@@ -131,7 +132,7 @@ void Foam::faceZoneToCell::combine(topoSet& set, const bool add) const
         WarningInFunction
             << "Cannot find any faceZone matching "
             << flatOutput(zoneMatcher_) << nl
-            << "Valid names are " << flatOutput(mesh_.faceZones().names())
+            << "Valid names: " << flatOutput(mesh_.faceZones().names())
             << endl;
 
         return;  // Nothing to do
@@ -183,8 +184,7 @@ Foam::faceZoneToCell::faceZoneToCell
     if (!dict.readIfPresent("zones", zoneMatcher_))
     {
         zoneMatcher_.resize(1);
-        zoneMatcher_.first() =
-            dict.getCompat<wordRe>("zone", {{"name", 1806}});
+        zoneMatcher_.front() = dict.getCompat<wordRe>("zone", {{"name", 1806}});
     }
 }
 
@@ -218,7 +218,7 @@ void Foam::faceZoneToCell::zones(const wordRes& zonesSelector)
 void Foam::faceZoneToCell::zones(const wordRe& zoneName)
 {
     zoneMatcher_.resize(1);
-    zoneMatcher_.first() = zoneName;
+    zoneMatcher_.front() = zoneName;
 }
 
 
diff --git a/src/meshTools/topoSet/cellSources/haloToCell/haloToCell.C b/src/meshTools/topoSet/cellSources/haloToCell/haloToCell.C
index 83a9a6d8bf..0bce5d66b0 100644
--- a/src/meshTools/topoSet/cellSources/haloToCell/haloToCell.C
+++ b/src/meshTools/topoSet/cellSources/haloToCell/haloToCell.C
@@ -144,8 +144,9 @@ void Foam::haloToCell::combine(topoSet& set, const bool add) const
 
             if (verbose_)
             {
-                Info<< "    Grow " << current.count()
-                    << " by " << updates.count() << endl;
+                Info<< "    Grow "
+                    << returnReduce(current.count(), sumOp<label>()) << " by "
+                    << returnReduce(updates.count(), sumOp<label>()) << endl;
             }
 
             // Add to current set for the next loop
@@ -158,8 +159,9 @@ void Foam::haloToCell::combine(topoSet& set, const bool add) const
 
             if (verbose_)
             {
-                Info<< "    Shrink " << current.count()
-                    << " by " << updates.count() << endl;
+                Info<< "    Shrink "
+                    << returnReduce(current.count(), sumOp<label>()) << " by "
+                    << returnReduce(updates.count(), sumOp<label>()) << endl;
             }
 
             // Remove from current set for the next loop
diff --git a/src/meshTools/topoSet/cellSources/patchToCell/patchToCell.C b/src/meshTools/topoSet/cellSources/patchToCell/patchToCell.C
index 2233e3f400..39e5e54733 100644
--- a/src/meshTools/topoSet/cellSources/patchToCell/patchToCell.C
+++ b/src/meshTools/topoSet/cellSources/patchToCell/patchToCell.C
@@ -80,8 +80,8 @@ void Foam::patchToCell::combine(topoSet& set, const bool add) const
 
         if (verbose_)
         {
-            Info<< "    Found matching patch " << pp.name()
-                << " with " << pp.size() << " faces." << endl;
+            Info<< "    Found matching patch " << pp.name() << " with "
+                << returnReduce(pp.size(), sumOp<label>()) << " faces" << endl;
         }
 
         for
@@ -100,7 +100,7 @@ void Foam::patchToCell::combine(topoSet& set, const bool add) const
         WarningInFunction
             << "Cannot find any patches matching "
             << flatOutput(selectedPatches_) << nl
-            << "Valid names are " << flatOutput(mesh_.boundaryMesh().names())
+            << "Valid names: " << flatOutput(mesh_.boundaryMesh().names())
             << endl;
     }
 }
@@ -132,7 +132,7 @@ Foam::patchToCell::patchToCell
     if (!dict.readIfPresent("patches", selectedPatches_))
     {
         selectedPatches_.resize(1);
-        selectedPatches_.first() =
+        selectedPatches_.front() =
             dict.getCompat<wordRe>("patch", {{"name", 1806}});
     }
 }
@@ -161,7 +161,7 @@ void Foam::patchToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding cells associated with patches "
+            Info<< "    Adding cells associated with patches: "
                 << flatOutput(selectedPatches_) << " ..." << endl;
         }
 
@@ -171,7 +171,7 @@ void Foam::patchToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing cells associated with patches "
+            Info<< "    Removing cells associated with patches: "
                 << flatOutput(selectedPatches_) << " ..." << endl;
         }
 
diff --git a/src/meshTools/topoSet/cellSources/pointToCell/pointToCell.C b/src/meshTools/topoSet/cellSources/pointToCell/pointToCell.C
index a329352339..cc373c0790 100644
--- a/src/meshTools/topoSet/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/topoSet/cellSources/pointToCell/pointToCell.C
@@ -143,7 +143,7 @@ Foam::pointToCell::pointToCell
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -172,7 +172,7 @@ void Foam::pointToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding cells according to pointSet "
+            Info<< "    Adding cells according to point sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -185,7 +185,7 @@ void Foam::pointToCell::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing cells according to pointSet "
+            Info<< "    Removing cells according to point sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
index ca7329dbec..cec0c476d1 100644
--- a/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/topoSet/cellSources/surfaceToCell/surfaceToCell.C
@@ -81,7 +81,7 @@ Foam::label Foam::surfaceToCell::getNearest
 
     if (iter.good())
     {
-        return *iter;  // Return cached value
+        return iter.val();  // Return cached value
     }
 
     pointIndexHit inter = querySurf.nearest(pt, span);
diff --git a/src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.C b/src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.C
index 64e6aafed4..37777f0513 100644
--- a/src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.C
+++ b/src/meshTools/topoSet/cellSources/zoneToCell/zoneToCell.C
@@ -93,8 +93,8 @@ void Foam::zoneToCell::combine
 
         if (verbosity)
         {
-            Info<< "    Using zone " << zone.name()
-                << " with " << zone.size() << " cells." << endl;
+            Info<< "    Using zone " << zone.name() << " with "
+                << returnReduce(zone.size(), sumOp<label>()) << " cells" << nl;
         }
 
         for (const label celli : zone)
@@ -188,8 +188,7 @@ Foam::zoneToCell::zoneToCell
     if (!dict.readIfPresent("zones", zoneMatcher_))
     {
         zoneMatcher_.resize(1);
-        zoneMatcher_.first() =
-            dict.getCompat<wordRe>("zone", {{"name", 1806}});
+        zoneMatcher_.front() = dict.getCompat<wordRe>("zone", {{"name", 1806}});
     }
 }
 
@@ -222,7 +221,7 @@ void Foam::zoneToCell::zones(const wordRes& zonesSelector)
 void Foam::zoneToCell::zones(const wordRe& zoneName)
 {
     zoneMatcher_.resize(1);
-    zoneMatcher_.first() = zoneName;
+    zoneMatcher_.front() = zoneName;
     zoneIDs_.clear();
 }
 
@@ -238,7 +237,7 @@ void Foam::zoneToCell::zones(const label zoneID)
 {
     zoneMatcher_.clear();
     zoneIDs_.resize(1);
-    zoneIDs_.first() = zoneID;
+    zoneIDs_.front() = zoneID;
 }
 
 
@@ -252,7 +251,7 @@ void Foam::zoneToCell::applyToSet
     {
         if (verbose_ && !zoneMatcher_.empty())
         {
-            Info<< "    Adding all cells of cell zones "
+            Info<< "    Adding all cells of cell zones: "
                 << flatOutput(zoneMatcher_) << " ..." << endl;
         }
 
@@ -262,7 +261,7 @@ void Foam::zoneToCell::applyToSet
     {
         if (verbose_ && !zoneMatcher_.empty())
         {
-            Info<< "    Removing all cells of cell zones "
+            Info<< "    Removing all cells of cell zones: "
                 << flatOutput(zoneMatcher_) << " ..." << endl;
         }
 
diff --git a/src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.C b/src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.C
index e269b316ef..9cd63b3548 100644
--- a/src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.C
+++ b/src/meshTools/topoSet/cellZoneSources/setToCellZone/setToCellZone.C
@@ -109,8 +109,8 @@ void Foam::setToCellZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Adding all cells from cellSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Adding all cells from cell set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the sets
@@ -134,8 +134,8 @@ void Foam::setToCellZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all cells from cellSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Removing all cells from cell set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the set
diff --git a/src/meshTools/topoSet/faceSources/boxToFace/boxToFace.C b/src/meshTools/topoSet/faceSources/boxToFace/boxToFace.C
index 91b633d13c..b277a6e90c 100644
--- a/src/meshTools/topoSet/faceSources/boxToFace/boxToFace.C
+++ b/src/meshTools/topoSet/faceSources/boxToFace/boxToFace.C
@@ -145,9 +145,9 @@ Foam::boxToFace::boxToFace
     if (!dict.readIfPresent("boxes", bbs_))
     {
         bbs_.resize(1);
-        if (!dict.readIfPresent("box", bbs_.first()))
+        if (!dict.readIfPresent("box", bbs_.front()))
         {
-            readBoxDim(dict, bbs_.first());
+            readBoxDim(dict, bbs_.front());
         }
     }
 }
diff --git a/src/meshTools/topoSet/faceSources/cellToFace/cellToFace.C b/src/meshTools/topoSet/faceSources/cellToFace/cellToFace.C
index 9e88902e6c..b66de8c2d6 100644
--- a/src/meshTools/topoSet/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/topoSet/faceSources/cellToFace/cellToFace.C
@@ -241,7 +241,7 @@ Foam::cellToFace::cellToFace
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -270,7 +270,7 @@ void Foam::cellToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding faces according to cellSet "
+            Info<< "    Adding faces according to cell sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -283,7 +283,7 @@ void Foam::cellToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing faces according to cellSet "
+            Info<< "    Removing faces according to cell sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/faceSources/faceToFace/faceToFace.C b/src/meshTools/topoSet/faceSources/faceToFace/faceToFace.C
index 22aca8ba6b..4abc17fac6 100644
--- a/src/meshTools/topoSet/faceSources/faceToFace/faceToFace.C
+++ b/src/meshTools/topoSet/faceSources/faceToFace/faceToFace.C
@@ -77,7 +77,7 @@ Foam::faceToFace::faceToFace
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -105,7 +105,7 @@ void Foam::faceToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding all elements of faceSet "
+            Info<< "    Adding all elements of face sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -120,7 +120,7 @@ void Foam::faceToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing all elements of faceSet "
+            Info<< "    Removing all elements of face sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
index a6d5640c1d..8ec3dac42c 100644
--- a/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
+++ b/src/meshTools/topoSet/faceSources/holeToFace/holeToFace.C
@@ -1102,20 +1102,21 @@ Foam::holeToFace::holeToFace
     erode_(dict.getOrDefault<bool>("erode", false))
 {
     // Look for 'sets' or 'set'
+    word setName;
     if (!dict.readIfPresent("faceSets", blockedFaceNames_))
     {
-        blockedFaceNames_.resize(1);
-        if (!dict.readEntry("faceSet", blockedFaceNames_.first()))
+        if (dict.readEntry("faceSet", setName))
         {
-            blockedFaceNames_.clear();
+            blockedFaceNames_.resize(1);
+            blockedFaceNames_.front() = std::move(setName);
         }
     }
     if (!dict.readIfPresent("cellSets", blockedCellNames_))
     {
-        blockedCellNames_.resize(1);
-        if (!dict.readEntry("cellSet", blockedCellNames_.first()))
+        if (dict.readEntry("cellSet", setName))
         {
-            blockedCellNames_.clear();
+            blockedCellNames_.resize(1);
+            blockedCellNames_.front() = std::move(setName);
         }
     }
 }
@@ -1129,7 +1130,7 @@ Foam::holeToFace::holeToFace
 :
     topoSetFaceSource(mesh),
     zonePoints_(expand(pointField(is))),
-    blockedFaceNames_(one(), word(checkIs(is))),
+    blockedFaceNames_(one{}, word(checkIs(is))),
     blockedCellNames_(),
     erode_(false)
 {}
@@ -1170,7 +1171,7 @@ void Foam::holeToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding all faces to disconnect regions "
+            Info<< "    Adding all faces to disconnect regions: "
                 << flatOutput(zonePoints_) << " ..." << endl;
         }
 
@@ -1180,7 +1181,7 @@ void Foam::holeToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing all faces to disconnect regions "
+            Info<< "    Removing all faces to disconnect regions: "
                 << flatOutput(zonePoints_) << " ..." << endl;
         }
 
@@ -1327,7 +1328,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::holeToFace::calcClosure
 
 
     // Per closure face the seed face
-    closureToBlocked.setSize(pp.size());
+    closureToBlocked.resize_nocopy(pp.size());
     closureToBlocked = -1;
     forAll(allFaceInfo, facei)
     {
diff --git a/src/meshTools/topoSet/faceSources/patchToFace/patchToFace.C b/src/meshTools/topoSet/faceSources/patchToFace/patchToFace.C
index 8b1ddc0a2e..8fe00702f5 100644
--- a/src/meshTools/topoSet/faceSources/patchToFace/patchToFace.C
+++ b/src/meshTools/topoSet/faceSources/patchToFace/patchToFace.C
@@ -81,16 +81,11 @@ void Foam::patchToFace::combine(topoSet& set, const bool add) const
 
         if (verbose_)
         {
-            Info<< "    Found matching patch " << pp.name()
-                << " with " << pp.size() << " faces." << endl;
+            Info<< "    Found matching patch " << pp.name() << " with "
+                << returnReduce(pp.size(), sumOp<label>()) << " faces" << endl;
         }
 
-        for
-        (
-            label facei = pp.start();
-            facei < pp.start() + pp.size();
-            ++facei
-        )
+        for (const label facei : pp.range())
         {
             addOrDelete(set, facei, add);
         }
@@ -101,7 +96,7 @@ void Foam::patchToFace::combine(topoSet& set, const bool add) const
         WarningInFunction
             << "Cannot find any patches matching "
             << flatOutput(selectedPatches_) << nl
-            << "Valid names are " << flatOutput(mesh_.boundaryMesh().names())
+            << "Valid names: " << flatOutput(mesh_.boundaryMesh().names())
             << endl;
     }
 }
@@ -133,7 +128,7 @@ Foam::patchToFace::patchToFace
     if (!dict.readIfPresent("patches", selectedPatches_))
     {
         selectedPatches_.resize(1);
-        selectedPatches_.first() =
+        selectedPatches_.front() =
             dict.getCompat<wordRe>("patch", {{"name", 1806}});
     }
 }
@@ -162,7 +157,7 @@ void Foam::patchToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding all faces of patches "
+            Info<< "    Adding all faces of patches: "
                 << flatOutput(selectedPatches_) << " ..." << endl;
         }
 
@@ -172,7 +167,7 @@ void Foam::patchToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing all faces of patches "
+            Info<< "    Removing all faces of patches: "
                 << flatOutput(selectedPatches_) << " ..." << endl;
         }
 
diff --git a/src/meshTools/topoSet/faceSources/pointToFace/pointToFace.C b/src/meshTools/topoSet/faceSources/pointToFace/pointToFace.C
index 7b40b6daef..cf0b8f5a14 100644
--- a/src/meshTools/topoSet/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/topoSet/faceSources/pointToFace/pointToFace.C
@@ -189,7 +189,7 @@ Foam::pointToFace::pointToFace
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -218,7 +218,7 @@ void Foam::pointToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding faces according to pointSet "
+            Info<< "    Adding faces according to point sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -231,7 +231,7 @@ void Foam::pointToFace::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing faces according to pointSet "
+            Info<< "    Removing faces according to point sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.C b/src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.C
index f0ca752b08..3ce8d9d7af 100644
--- a/src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.C
+++ b/src/meshTools/topoSet/faceSources/zoneToFace/zoneToFace.C
@@ -94,8 +94,9 @@ void Foam::zoneToFace::combine
 
         if (verbosity)
         {
-            Info<< "    Using zone " << zone.name()
-                << " with " << zone.size() << " faces." << endl;
+            Info<< "    Using zone " << zone.name() << " with "
+                << returnReduce(zone.size(), sumOp<label>()) << " faces"
+                << endl;
         }
 
         for (const label facei : zone)
@@ -130,7 +131,7 @@ void Foam::zoneToFace::combine(topoSet& set, const bool add) const
         WarningInFunction
             << "Cannot find any faceZone matching "
             << flatOutput(zoneMatcher_) << nl
-            << "Valid names are " << flatOutput(mesh_.faceZones().names())
+            << "Valid names: " << flatOutput(mesh_.faceZones().names())
             << endl;
 
         return;  // Nothing to do
@@ -189,8 +190,7 @@ Foam::zoneToFace::zoneToFace
     if (!dict.readIfPresent("zones", zoneMatcher_))
     {
         zoneMatcher_.resize(1);
-        zoneMatcher_.first() =
-            dict.getCompat<wordRe>("zone", {{"name", 1806}});
+        zoneMatcher_.front() = dict.getCompat<wordRe>("zone", {{"name", 1806}});
     }
 }
 
@@ -223,7 +223,7 @@ void Foam::zoneToFace::zones(const wordRes& zonesSelector)
 void Foam::zoneToFace::zones(const wordRe& zoneName)
 {
     zoneMatcher_.resize(1);
-    zoneMatcher_.first() = zoneName;
+    zoneMatcher_.front() = zoneName;
     zoneIDs_.clear();
 }
 
@@ -239,7 +239,7 @@ void Foam::zoneToFace::zones(const label zoneID)
 {
     zoneMatcher_.clear();
     zoneIDs_.resize(1);
-    zoneIDs_.first() = zoneID;
+    zoneIDs_.front() = zoneID;
 }
 
 
@@ -253,7 +253,7 @@ void Foam::zoneToFace::applyToSet
     {
         if (verbose_ && !zoneMatcher_.empty())
         {
-            Info<< "    Adding all faces of face zones "
+            Info<< "    Adding all faces of face zones: "
                 << flatOutput(zoneMatcher_) << " ..." << endl;
         }
 
@@ -263,7 +263,7 @@ void Foam::zoneToFace::applyToSet
     {
         if (verbose_ && !zoneMatcher_.empty())
         {
-            Info<< "    Removing all faces of face zones "
+            Info<< "    Removing all faces of face zones: "
                 << flatOutput(zoneMatcher_) << " ..." << endl;
         }
 
diff --git a/src/meshTools/topoSet/faceZoneSources/cellToFaceZone/cellToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/cellToFaceZone/cellToFaceZone.C
index ed6a4c3041..cf2680c76f 100644
--- a/src/meshTools/topoSet/faceZoneSources/cellToFaceZone/cellToFaceZone.C
+++ b/src/meshTools/topoSet/faceZoneSources/cellToFaceZone/cellToFaceZone.C
@@ -63,10 +63,10 @@ void Foam::cellToFaceZone::selectFaces
     bitSet& doFlip
 ) const
 {
-    selectedFace.setSize(mesh_.nFaces());
+    selectedFace.resize_nocopy(mesh_.nFaces());
     selectedFace = false;
 
-    doFlip.setSize(mesh_.nFaces());
+    doFlip.resize_nocopy(mesh_.nFaces());
     doFlip = false;
 
 
@@ -168,7 +168,7 @@ Foam::cellToFaceZone::cellToFaceZone
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -207,17 +207,16 @@ void Foam::cellToFaceZone::applyToSet
         {
             if (verbose_)
             {
+                Info<< "    Adding all faces on outside of cell sets: "
+                    << flatOutput(names_) << "; orientation pointing ";
+
                 if (flip_)
                 {
-                    Info<< "    Adding all faces on outside of cellSet "
-                        << flatOutput(names_)
-                        << "; orientation pointing into cellSet" << endl;
+                    Info<< "into cell sets" << endl;
                 }
                 else
                 {
-                    Info<< "    Adding all faces on outside of cellSet "
-                        << flatOutput(names_)
-                        << "; orientation pointing away from cellSet" << endl;
+                    Info<< "away from cell sets" << endl;
                 }
             }
 
@@ -252,9 +251,8 @@ void Foam::cellToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all faces on outside of cellSet "
-                    << flatOutput(names_)
-                    << " ..." << endl;
+                Info<< "    Removing all faces on outside of cell sets: "
+                    << flatOutput(names_) << " ..." << endl;
             }
 
             bitSet selectedFace(mesh_.nFaces());
diff --git a/src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
index 01017b20a9..b2d44b12d6 100644
--- a/src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
+++ b/src/meshTools/topoSet/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
@@ -119,8 +119,8 @@ void Foam::faceZoneToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Adding all faces from faceZone " << setName_
-                    << " ..." << endl;
+                Info<< "    Adding all faces from face zone: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the set
@@ -145,8 +145,8 @@ void Foam::faceZoneToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all faces from faceZone " << setName_
-                    << " ..." << endl;
+                Info<< "    Removing all faces from face zone: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the set
diff --git a/src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
index 8110ea597b..b0eeb21b33 100644
--- a/src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
+++ b/src/meshTools/topoSet/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
@@ -123,8 +123,8 @@ void Foam::setAndNormalToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Adding all faces from faceSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Adding all faces from face set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the sets
@@ -164,8 +164,8 @@ void Foam::setAndNormalToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all faces from faceSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Removing all faces from face set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the set
diff --git a/src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.C
index 8cd3d3646c..a460bfb649 100644
--- a/src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.C
+++ b/src/meshTools/topoSet/faceZoneSources/setToFaceZone/setToFaceZone.C
@@ -117,8 +117,8 @@ void Foam::setToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Adding all faces from faceSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Adding all faces from face set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the sets
@@ -146,8 +146,8 @@ void Foam::setToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all faces from faceSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Removing all faces from face set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the set
diff --git a/src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.C
index b630a7f151..642cf82bca 100644
--- a/src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.C
+++ b/src/meshTools/topoSet/faceZoneSources/setsToFaceZone/setsToFaceZone.C
@@ -119,18 +119,19 @@ void Foam::setsToFaceZone::applyToSet
         {
             if (verbose_)
             {
+                Info<< "    Adding all faces from face set: "
+                    << faceSetName_ << "; orientation pointing ";
+
                 if (flip_)
                 {
-                    Info<< "    Adding all faces from faceSet " << faceSetName_
-                        << "; orientation pointing into cellSet "
-                        << cellSetName_ << " ..." << endl;
+                    Info<< "into";
                 }
                 else
                 {
-                    Info<< "    Adding all faces from faceSet " << faceSetName_
-                        << "; orientation pointing away from cellSet "
-                        << cellSetName_ << " ..." << endl;
+                    Info<< "away from";
                 }
+
+                Info<< " cell set: " << cellSetName_ << " ..." << endl;
             }
 
             // Load the sets
@@ -202,8 +203,8 @@ void Foam::setsToFaceZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all faces from faceSet " << faceSetName_
-                    << " ..." << endl;
+                Info<< "    Removing all faces from face set: "
+                    << faceSetName_ << " ..." << endl;
             }
 
             // Load the set
diff --git a/src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.C
index 9086bb4098..b7fe126f18 100644
--- a/src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.C
+++ b/src/meshTools/topoSet/pointSources/boxToPoint/boxToPoint.C
@@ -145,9 +145,9 @@ Foam::boxToPoint::boxToPoint
     if (!dict.readIfPresent("boxes", bbs_))
     {
         bbs_.resize(1);
-        if (!dict.readIfPresent("box", bbs_.first()))
+        if (!dict.readIfPresent("box", bbs_.front()))
         {
-            readBoxDim(dict, bbs_.first());
+            readBoxDim(dict, bbs_.front());
         }
     }
 }
@@ -176,8 +176,8 @@ void Foam::boxToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding points that are within boxes " << bbs_
-                << " ..." << endl;
+            Info<< "    Adding points that are within boxes "
+                << bbs_ << " ..." << endl;
         }
 
         combine(set, true);
@@ -186,8 +186,8 @@ void Foam::boxToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing points that are within boxes " << bbs_
-                << " ..." << endl;
+            Info<< "    Removing points that are within boxes "
+                << bbs_ << " ..." << endl;
         }
 
         combine(set, false);
diff --git a/src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.C
index d0e7334755..39cccb0cdc 100644
--- a/src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/topoSet/pointSources/cellToPoint/cellToPoint.C
@@ -117,7 +117,7 @@ Foam::cellToPoint::cellToPoint
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -146,7 +146,7 @@ void Foam::cellToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding points in cellSet "
+            Info<< "    Adding points in cell sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -159,7 +159,7 @@ void Foam::cellToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing points in cellSet "
+            Info<< "    Removing points in cell sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.C
index 6514ff754c..86d20e9f90 100644
--- a/src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/topoSet/pointSources/faceToPoint/faceToPoint.C
@@ -111,7 +111,7 @@ Foam::faceToPoint::faceToPoint
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -140,7 +140,7 @@ void Foam::faceToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding points from face in faceSet "
+            Info<< "    Adding points from face in face sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -153,7 +153,7 @@ void Foam::faceToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing points from face in faceSet "
+            Info<< "    Removing points from face in face sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.C b/src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.C
index cdeb07aedb..4b3eb85c44 100644
--- a/src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.C
+++ b/src/meshTools/topoSet/pointSources/labelToPoint/labelToPoint.C
@@ -123,8 +123,7 @@ void Foam::labelToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding points mentioned in dictionary"
-                << " ..." << endl;
+            Info<< "    Adding points mentioned in dictionary ..." << endl;
         }
 
         addOrDelete(set, labels_, true);
@@ -133,8 +132,7 @@ void Foam::labelToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing points mentioned in dictionary"
-                << " ..." << endl;
+            Info<< "    Removing points mentioned in dictionary ..." << endl;
         }
 
         addOrDelete(set, labels_, false);
diff --git a/src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.C
index 5a87782719..ddb9810c92 100644
--- a/src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.C
+++ b/src/meshTools/topoSet/pointSources/pointToPoint/pointToPoint.C
@@ -77,7 +77,7 @@ Foam::pointToPoint::pointToPoint
     if (!dict.readIfPresent("sets", names_))
     {
         names_.resize(1);
-        dict.readEntry("set", names_.first());
+        dict.readEntry("set", names_.front());
     }
 }
 
@@ -105,7 +105,7 @@ void Foam::pointToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding all elements of pointSet "
+            Info<< "    Adding all elements of point sets: "
                 << flatOutput(names_) << nl;
         }
 
@@ -120,7 +120,7 @@ void Foam::pointToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing all elements of pointSet "
+            Info<< "    Removing all elements of point sets: "
                 << flatOutput(names_) << nl;
         }
 
diff --git a/src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.C
index ad7faba293..d6e94acab1 100644
--- a/src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.C
+++ b/src/meshTools/topoSet/pointSources/surfaceToPoint/surfaceToPoint.C
@@ -195,8 +195,8 @@ void Foam::surfaceToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Adding points in relation to surface " << surfName_
-                << " ..." << endl;
+            Info<< "    Adding points in relation to surface "
+                << surfName_ << " ..." << endl;
         }
 
         combine(set, true);
@@ -205,8 +205,8 @@ void Foam::surfaceToPoint::applyToSet
     {
         if (verbose_)
         {
-            Info<< "    Removing points in relation to surface " << surfName_
-                << " ..." << endl;
+            Info<< "    Removing points in relation to surface "
+                << surfName_ << " ..." << endl;
         }
 
         combine(set, false);
diff --git a/src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.C b/src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.C
index b29bb88167..44627db683 100644
--- a/src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.C
+++ b/src/meshTools/topoSet/pointSources/zoneToPoint/zoneToPoint.C
@@ -94,8 +94,9 @@ void Foam::zoneToPoint::combine
 
         if (verbosity)
         {
-            Info<< "    Using zone " << zone.name()
-                << " with " << zone.size() << " points." << endl;
+            Info<< "    Using zone " << zone.name() << " with "
+                << returnReduce(zone.size(), sumOp<label>()) << " points"
+                << endl;
         }
 
         for (const label pointi : zone)
@@ -189,8 +190,7 @@ Foam::zoneToPoint::zoneToPoint
     if (!dict.readIfPresent("zones", zoneMatcher_))
     {
         zoneMatcher_.resize(1);
-        zoneMatcher_.first() =
-            dict.getCompat<wordRe>("zone", {{"name", 1806}});
+        zoneMatcher_.front() = dict.getCompat<wordRe>("zone", {{"name", 1806}});
     }
 }
 
@@ -223,7 +223,7 @@ void Foam::zoneToPoint::zones(const wordRes& zonesSelector)
 void Foam::zoneToPoint::zones(const wordRe& zoneName)
 {
     zoneMatcher_.resize(1);
-    zoneMatcher_.first() = zoneName;
+    zoneMatcher_.front() = zoneName;
     zoneIDs_.clear();
 }
 
@@ -239,7 +239,7 @@ void Foam::zoneToPoint::zones(const label zoneID)
 {
     zoneMatcher_.clear();
     zoneIDs_.resize(1);
-    zoneIDs_.first() = zoneID;
+    zoneIDs_.front() = zoneID;
 }
 
 
@@ -253,7 +253,7 @@ void Foam::zoneToPoint::applyToSet
     {
         if (verbose_ && !zoneMatcher_.empty())
         {
-            Info<< "    Adding all points of point zones "
+            Info<< "    Adding all points of point zones: "
                 << flatOutput(zoneMatcher_) << " ..." << endl;
         }
 
@@ -263,7 +263,7 @@ void Foam::zoneToPoint::applyToSet
     {
         if (verbose_ && !zoneMatcher_.empty())
         {
-            Info<< "    Removing all points of point zones "
+            Info<< "    Removing all points of point zones: "
                 << flatOutput(zoneMatcher_) << " ..." << endl;
         }
 
diff --git a/src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.C b/src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.C
index d711a8e575..1fcc0cf0fd 100644
--- a/src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.C
+++ b/src/meshTools/topoSet/pointZoneSources/setToPointZone/setToPointZone.C
@@ -109,11 +109,11 @@ void Foam::setToPointZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Adding all points from pointSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Adding all points from point set: "
+                    << setName_ << " ..." << endl;
             }
 
-            // Load the sets
+            // Load the set
             pointSet loadedSet(mesh_, setName_);
             const labelHashSet& pointLabels = loadedSet;
 
@@ -135,8 +135,8 @@ void Foam::setToPointZone::applyToSet
         {
             if (verbose_)
             {
-                Info<< "    Removing all points from pointSet " << setName_
-                    << " ..." << endl;
+                Info<< "    Removing all points from point set: "
+                    << setName_ << " ..." << endl;
             }
 
             // Load the set
diff --git a/src/meshTools/topoSet/topoSets/faceZoneSet.C b/src/meshTools/topoSet/topoSets/faceZoneSet.C
index 557cbae831..fde5e3f1c7 100644
--- a/src/meshTools/topoSet/topoSets/faceZoneSet.C
+++ b/src/meshTools/topoSet/topoSets/faceZoneSet.C
@@ -185,7 +185,7 @@ void Foam::faceZoneSet::subset(const topoSet& set)
 
         if (iter.good())
         {
-            const label index = *iter;
+            const label index = iter.val();
 
             if (zoneSet.flipMap()[i] != flipMap_[index])
             {
@@ -233,7 +233,7 @@ void Foam::faceZoneSet::addSet(const topoSet& set)
 
         if (iter.good())
         {
-            const label index = *iter;
+            const label index = iter.val();
 
             if (zoneSet.flipMap()[i] != flipMap_[index])
             {
@@ -284,7 +284,7 @@ void Foam::faceZoneSet::subtractSet(const topoSet& set)
 
         if (iter.good())
         {
-            const label index = *iter;
+            const label index = iter.val();
 
             if (zoneSet.flipMap()[index] != flipMap_[i])
             {

From 34e36b83ab2612c0c0d18625c980a8046471a8e4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 14 Mar 2023 19:01:47 +0000
Subject: [PATCH 140/348] ENH: initEvaluate()/evaluate() for faePatchField,
 fvsPatchField

- no-op implementations, but makes the call to
  GeometricBoundaryField::evaluate() less dependent on PatchField type

- add updated()/manipulatedMatrix() methods to faePatchField,
  fvsPatchField etc. These are mostly no-ops, but provide name
  compatible with fvPatchField etc.
---
 .../codedFixedValuePointPatchField.H          |  2 +-
 .../pointPatchField/pointPatchField.H         | 77 +++++++++++--------
 .../basic/sliced/slicedFaPatchField.H         |  2 +-
 .../faPatchFields/faPatchField/faPatchField.H | 26 ++++---
 .../faePatchField/faePatchField.H             | 75 ++++++++++++++----
 .../basic/sliced/slicedFvPatchField.H         |  2 +-
 .../codedFixedValueFvPatchField.H             |  2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H | 15 ++--
 .../fvsPatchField/fvsPatchField.C             |  4 +-
 .../fvsPatchField/fvsPatchField.H             | 76 +++++++++++++-----
 10 files changed, 188 insertions(+), 93 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index 13b956627f..c398dc6131 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
@@ -247,7 +247,7 @@ public:
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 
-        //- Evaluate the patch field, sets Updated to false
+        //- Evaluate the patch field, sets updated() to false
         virtual void evaluate
         (
             const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 010b19a0e6..feaf899d28 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -104,6 +104,10 @@ protected:
             updated_ = state;
         }
 
+        //- Set matrix manipulated state. Currently a no-op for pointPatchField.
+        void setManipulated(bool state) noexcept
+        {}
+
 
 public:
 
@@ -170,6 +174,13 @@ public:
             return updated_;
         }
 
+        //- True if the matrix has already been manipulated.
+        //- Currently ignored (always false) for pointPatchField
+        bool manipulatedMatrix() const noexcept
+        {
+            return false;
+        }
+
 
     // Check
 
@@ -465,50 +476,48 @@ public:
             ) const;
 
 
-        // Mapping Functions
+    // Mapping Functions
 
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const pointPatchFieldMapper&
-            )
-            {}
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap
+        (
+            const pointPatchFieldMapper&
+        )
+        {}
 
-            //- Reverse map the given pointPatchField onto this pointPatchField
-            virtual void rmap
-            (
-                const pointPatchField<Type>&,
-                const labelList&
-            )
-            {}
+        //- Reverse map the given pointPatchField onto this pointPatchField
+        virtual void rmap
+        (
+            const pointPatchField<Type>&,
+            const labelList&
+        )
+        {}
 
 
-        // Evaluation Functions
+    // Evaluation Functions
 
-            //- Update the coefficients associated with the patch field
-            //  Sets Updated to true
-            virtual void updateCoeffs();
+        //- Update the coefficients associated with the patch field
+        //  Sets Updated to true
+        virtual void updateCoeffs();
 
-            //- Initialise evaluation of the patch field (do nothing)
-            virtual void initEvaluate
-            (
-                const Pstream::commsTypes commsType =
-                    Pstream::commsTypes::blocking
-            )
-            {}
+        //- Initialise evaluation of the patch field (do nothing)
+        virtual void initEvaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        )
+        {}
 
-            //- Evaluate the patch field
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType =
-                    Pstream::commsTypes::blocking
-            );
+        //- Evaluate the patch field, sets updated() to false
+        virtual void evaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        );
 
 
-        // I-O
+    // Other
 
-            //- Write
-            virtual void write(Ostream&) const;
+        //- Write
+        virtual void write(Ostream& os) const;
 
 
     // Member Operators
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
index ef83ff9cd8..cc8b4a778a 100644
--- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
@@ -177,7 +177,7 @@ public:
             )
             {}
 
-            //- Evaluate the patch field, sets Updated to false
+            //- Evaluate the patch field, sets updated() to false
             virtual void evaluate
             (
                 const Pstream::commsTypes commsType =
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index e34d725005..00a9fcb409 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -109,6 +109,10 @@ protected:
             updated_ = state;
         }
 
+        //- Set matrix manipulated state. Currently a no-op for faPatchField.
+        void setManipulated(bool state) noexcept
+        {}
+
 
 public:
 
@@ -175,6 +179,13 @@ public:
             return updated_;
         }
 
+        //- True if the matrix has already been manipulated.
+        //- Currently ignored (always false) for faPatchField
+        bool manipulatedMatrix() const noexcept
+        {
+            return false;
+        }
+
 
     // Check
 
@@ -486,7 +497,7 @@ public:
             )
             {}
 
-            //- Evaluate the patch field, sets Updated to false
+            //- Evaluate the patch field, sets updated() to false
             virtual void evaluate
             (
                 const Pstream::commsTypes commsType =
@@ -532,16 +543,13 @@ public:
             }
 
 
-        // IO
+    // Other
 
-            //- Write
-            virtual void write(Ostream&) const;
+        //- Write
+        virtual void write(Ostream& os) const;
 
-
-        // Check
-
-            //- Check faPatchField<Type> against given faPatchField<Type>
-            void check(const faPatchField<Type>&) const;
+        //- Check against given patch field
+        void check(const faPatchField<Type>&) const;
 
 
     // Member Operators
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index 297eeacc37..16df2ca380 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -91,6 +91,14 @@ protected:
         //  Useful when initially constructed without a dictionary
         virtual void readDict(const dictionary& dict);
 
+        //- Set updated state. This is a no-op for faePatchField
+        void setUpdated(bool state) noexcept
+        {}
+
+        //- Set matrix manipulated state. This is a no-op for faePatchField
+        void setManipulated(bool state) noexcept
+        {}
+
 
 public:
 
@@ -137,6 +145,23 @@ public:
         }
 
 
+    // Solution
+
+        //- True if the boundary condition has already been updated.
+        //- This is always true for faePatchField
+        bool updated() const noexcept
+        {
+            return true;
+        }
+
+        //- True if the matrix has already been manipulated.
+        //- Currently ignored (always false) for faePatchField
+        bool manipulatedMatrix() const noexcept
+        {
+            return false;
+        }
+
+
     // Check
 
         //- Check that patches are identical
@@ -401,29 +426,45 @@ public:
         }
 
 
-        // Mapping
+    // Mapping
 
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const faPatchFieldMapper&
-            );
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap
+        (
+            const faPatchFieldMapper&
+        );
 
-            //- Reverse map the given faePatchField onto this faePatchField
-            virtual void rmap
-            (
-                const faePatchField<Type>&,
-                const labelList&
-            );
+        //- Reverse map the given faePatchField onto this faePatchField
+        virtual void rmap
+        (
+            const faePatchField<Type>&,
+            const labelList&
+        );
 
 
+    // Evaluation Functions
+
+        //- Initialise the evaluation of the patch field, generally a no-op
+        virtual void initEvaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        )
+        {}
+
+        //- Evaluate the patch field, generally a no-op
+        virtual void evaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        )
+        {}
+
+
+    // Other
+
         //- Write
-        virtual void write(Ostream&) const;
+        virtual void write(Ostream& os) const;
 
-
-    // Check
-
-        //- Check faePatchField<Type> against given faePatchField<Type>
+        //- Check against given patch field
         void check(const faePatchField<Type>&) const;
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 21ffe3bf11..e41db62955 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -184,7 +184,7 @@ public:
             )
             {}
 
-            //- Evaluate the patch field, sets Updated to false
+            //- Evaluate the patch field, sets updated() to false
             virtual void evaluate
             (
                 const Pstream::commsTypes commsType =
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
index a6a7be105c..4daf935f7a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
@@ -245,7 +245,7 @@ public:
         //- Update the coefficients associated with the patch field
         virtual void updateCoeffs();
 
-        //- Evaluate the patch field, sets Updated to false
+        //- Evaluate the patch field, sets updated() to false
         virtual void evaluate
         (
             const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index c6ab641d39..6df6c018e6 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -583,7 +583,7 @@ public:
             )
             {}
 
-            //- Evaluate the patch field, sets Updated to false
+            //- Evaluate the patch field, sets updated() to false
             virtual void evaluate
             (
                 const Pstream::commsTypes commsType =
@@ -673,16 +673,13 @@ public:
             );
 
 
-        // I-O
+    // Other
 
-            //- Write
-            virtual void write(Ostream&) const;
+        //- Write
+        virtual void write(Ostream&) const;
 
-
-        // Check
-
-            //- Check fvPatchField<Type> against given fvPatchField<Type>
-            void check(const fvPatchField<Type>&) const;
+        //- Check against given patch field
+        void check(const fvPatchField<Type>&) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 579c35a7b3..07854658fb 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -167,9 +167,9 @@ Foam::fvsPatchField<Type>::fvsPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
+void Foam::fvsPatchField<Type>::check(const fvsPatchField<Type>& rhs) const
 {
-    fvsPatchFieldBase::checkPatch(ptf);
+    fvsPatchFieldBase::checkPatch(rhs);
 }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index b722f5d24d..00a3737be7 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -89,6 +89,14 @@ protected:
         //  Useful when initially constructed without a dictionary
         virtual void readDict(const dictionary& dict);
 
+        //- Set updated state. This is a no-op for fvsPatchField
+        void setUpdated(bool state) noexcept
+        {}
+
+        //- Set matrix manipulated state. This is a no-op for fvsPatchField
+        void setManipulated(bool state) noexcept
+        {}
+
 
 public:
 
@@ -132,6 +140,22 @@ public:
         }
 
 
+    // Solution
+
+        //- True if the boundary condition has already been updated.
+        //- This is always true for fvsPatchField
+        bool updated() const noexcept
+        {
+            return true;
+        }
+
+        //- True if the matrix has already been manipulated
+        bool manipulatedMatrix() const noexcept
+        {
+            return false;
+        }
+
+
     // Check
 
         //- Check that patches are identical
@@ -416,30 +440,46 @@ public:
         }
 
 
-        // Mapping Functions
+    // Mapping Functions
 
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper&
-            );
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap
+        (
+            const fvPatchFieldMapper&
+        );
 
-            //- Reverse map the given fvsPatchField onto this fvsPatchField
-            virtual void rmap
-            (
-                const fvsPatchField<Type>&,
-                const labelList&
-            );
+        //- Reverse map the given fvsPatchField onto this fvsPatchField
+        virtual void rmap
+        (
+            const fvsPatchField<Type>&,
+            const labelList&
+        );
 
 
+    // Evaluation Functions
+
+        //- Initialise the evaluation of the patch field, generally a no-op
+        virtual void initEvaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        )
+        {}
+
+        //- Evaluate the patch field, generally a no-op
+        virtual void evaluate
+        (
+            const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+        )
+        {}
+
+
+    // Other
+
         //- Write
-        virtual void write(Ostream&) const;
+        virtual void write(Ostream& os) const;
 
-
-        // Check
-
-            //- Check fvsPatchField<Type> against given fvsPatchField<Type>
-            void check(const fvsPatchField<Type>&) const;
+        //- Check against given patch field
+        void check(const fvsPatchField<Type>&) const;
 
 
     // Member Operators

From 13bd644cf48cd84b32361c163ae46cf7f364d368 Mon Sep 17 00:00:00 2001
From: Konstantinos Missios <>
Date: Wed, 22 Mar 2023 16:33:48 +0000
Subject: [PATCH 141/348] BUG: regionSizeDistribution: correct droplet volume
 calculation (fixes #2699)

---
 .../regionSizeDistribution/regionSizeDistribution.C      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index eac6555f3d..0a37d11ecb 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,8 +30,11 @@ License
 #include "regionSplit.H"
 #include "volFields.H"
 #include "fvcVolumeIntegrate.H"
+#include "mathematicalConstants.H"
 #include "addToRunTimeSelectionTable.H"
 
+using namespace Foam::constant;
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -97,7 +100,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
     const volScalarField& alpha
 ) const
 {
-    const scalar maxDropletVol = 1.0/6.0*pow3(maxDiam_);
+    const scalar maxDropletVol = 1.0/6.0*mathematical::pi*pow3(maxDiam_);
 
     // Split alpha field
     // ~~~~~~~~~~~~~~~~~
@@ -460,7 +463,7 @@ bool Foam::functionObjects::regionSizeDistribution::write()
         << endl;
 
     const scalar meshVol = gSum(mesh_.V());
-    const scalar maxDropletVol = 1.0/6.0*pow3(maxDiam_);
+    const scalar maxDropletVol = 1.0/6.0*mathematical::pi*pow3(maxDiam_);
     const scalar delta = (maxDiam_-minDiam_)/nBins_;
 
     Log << "    Mesh volume              = " << meshVol << nl

From e68acbe31449d5829fa20cc378fa92072eae53f0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 14 Mar 2023 10:58:46 +0100
Subject: [PATCH 142/348] STYLE: check tmp with is_reference() or movable(),
 instead of isTmp()

- missed consistency in a few places.

- return nullptr (with automatic conversion to tmp) on failures
  instead of tmp<....>(nullptr), for cleaner coding.

INT: add support for an 'immovable' tmp pointer

- this idea is from openfoam.org, to allow creation of a tmp that is
  protected from having its memory reclaimed in field operations

ENH: tmp NewImmovable factory method, forwards as immovable/movable
---
 src/OpenFOAM/memory/refPtr/refPtr.H           |  7 +-
 src/OpenFOAM/memory/refPtr/refPtrI.H          | 32 +++++-
 src/OpenFOAM/memory/tmp/tmp.H                 | 46 +++++++--
 src/OpenFOAM/memory/tmp/tmpI.H                | 97 +++++++++++++------
 .../atmAmbientTurbSource.C                    |  3 +-
 .../atmBuoyancyTurbSource.C                   |  3 +-
 .../atmLengthScaleTurbSource.C                |  3 +-
 .../atmPlantCanopyTurbSource.C                |  8 +-
 .../uncorrectedLnGrad/uncorrectedLnGrad.C     |  2 +-
 .../general/constrainHbyA/constrainHbyA.C     |  8 +-
 .../orthogonalSnGrad/orthogonalSnGrad.C       |  2 +-
 .../snGradSchemes/snGradScheme/snGradScheme.H |  8 +-
 .../uncorrectedSnGrad/uncorrectedSnGrad.C     |  2 +-
 .../schemes/CoBlended/CoBlended.H             |  5 +-
 .../schemes/cellCoBlended/cellCoBlended.H     |  5 +-
 .../schemes/fixedBlended/fixedBlended.H       |  5 +-
 .../schemes/limiterBlended/limiterBlended.H   |  5 +-
 .../schemes/localBlended/localBlended.H       |  5 +-
 .../outletStabilised/outletStabilised.H       |  5 +-
 .../surfaceInterpolationScheme.H              |  5 +-
 .../DispersionRASModel/DispersionRASModel.C   | 16 +--
 .../DispersionRASModel/DispersionRASModel.H   |  8 +-
 .../BrownianMotion/BrownianMotionForce.C      | 15 +--
 .../BrownianMotion/BrownianMotionForce.H      | 10 +-
 24 files changed, 187 insertions(+), 118 deletions(-)

diff --git a/src/OpenFOAM/memory/refPtr/refPtr.H b/src/OpenFOAM/memory/refPtr/refPtr.H
index 73bd6af3ef..3d0ef7d559 100644
--- a/src/OpenFOAM/memory/refPtr/refPtr.H
+++ b/src/OpenFOAM/memory/refPtr/refPtr.H
@@ -63,6 +63,7 @@ class refPtr
         enum refType
         {
             PTR,        //!< A managed pointer (not ref-counted)
+            REF_Types,  //!< Magic value (ptr: less-than, ref: greater than)
             CREF,       //!< A const reference to an object
             REF         //!< A non-const reference to an object
         };
@@ -175,13 +176,13 @@ public:
         bool good() const noexcept { return bool(ptr_); }
 
         //- If the stored/referenced content is const
-        bool is_const() const noexcept { return (type_ == CREF); }
+        inline bool is_const() const noexcept;
 
         //- True if this is a managed pointer (not a reference)
-        bool is_pointer() const noexcept { return (type_ == PTR); }
+        inline bool is_pointer() const noexcept;
 
         //- True if this is a reference (not a pointer)
-        bool is_reference() const noexcept { return (type_ != PTR); }
+        inline bool is_reference() const noexcept;
 
         //- True if this is a non-null managed pointer
         inline bool movable() const noexcept;
diff --git a/src/OpenFOAM/memory/refPtr/refPtrI.H b/src/OpenFOAM/memory/refPtr/refPtrI.H
index a496834ce9..dbb5394903 100644
--- a/src/OpenFOAM/memory/refPtr/refPtrI.H
+++ b/src/OpenFOAM/memory/refPtr/refPtrI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,7 +64,6 @@ inline constexpr Foam::refPtr<T>::refPtr(T* p) noexcept
 {}
 
 
-
 template<class T>
 inline constexpr Foam::refPtr<T>::refPtr(const T& obj) noexcept
 :
@@ -190,17 +189,40 @@ inline Foam::refPtr<T>::~refPtr() noexcept
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline bool Foam::refPtr<T>::is_const() const noexcept
+{
+    return (type_ == CREF);
+}
+
+
+template<class T>
+inline bool Foam::refPtr<T>::is_pointer() const noexcept
+{
+    //OR: return (type_ == PTR);
+    return (type_ < REF_Types);
+}
+
+
+template<class T>
+inline bool Foam::refPtr<T>::is_reference() const noexcept
+{
+    //OR: return (type_ == CREF || type_ == REF);
+    return (type_ > REF_Types);
+}
+
+
 template<class T>
 inline bool Foam::refPtr<T>::movable() const noexcept
 {
-    return (is_pointer() && ptr_);
+    return (ptr_ && is_pointer());
 }
 
 
 template<class T>
 inline const T& Foam::refPtr<T>::cref() const
 {
-    if (is_pointer() && !ptr_)
+    if (!ptr_ && is_pointer())
     {
         FatalErrorInFunction
             << this->typeName() << " deallocated"
@@ -221,7 +243,7 @@ inline T& Foam::refPtr<T>::ref() const
             << this->typeName()
             << abort(FatalError);
     }
-    else if (is_pointer() && !ptr_)
+    else if (!ptr_ && is_pointer())
     {
         FatalErrorInFunction
             << this->typeName() << " deallocated"
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 56661ebb24..98f8dcf222 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,8 @@ Description
     and a shared_ptr without ref-counting and null deleter.
     This allows the tmp to double as a pointer management and an indirect
     pointer to externally allocated objects.
+    In contrast to std::shared_ptr, only a limited number of tmp items
+    will ever share a pointer.
 
 SourceFiles
     tmpI.H
@@ -73,6 +75,8 @@ class tmp
         enum refType
         {
             PTR,        //!< A managed pointer (ref-counted)
+            CACHE_PTR,  //!< A managed pointer (ref-counted), but immovable
+            REF_Types,  //!< Magic value (ptr: less-than, ref: greater than)
             CREF,       //!< A const reference to an object
             REF         //!< A non-const reference to an object
         };
@@ -86,9 +90,8 @@ class tmp
 
     // Private Member Functions
 
-        //- Increment the ref-count for a managed pointer
-        //- and check that it is not oversubscribed
-        inline void incrCount();
+        //- Fatal if ref-count of a managed pointer is oversubscribed
+        inline void checkUseCount() const;
 
 
 public:
@@ -117,6 +120,10 @@ public:
         //- Construct, taking ownership of the pointer.
         inline explicit tmp(T* p);
 
+        //- Construct, taking ownership of the pointer,
+        //- with specified protection against moving.
+        inline tmp(bool immovable, T* p);
+
         //- Implicit construct for a const reference to an object.
         inline constexpr tmp(const T& obj) noexcept;
 
@@ -166,6 +173,19 @@ public:
             return tmp<T>(new T(std::forward<Args>(args)...));
         }
 
+        //- Construct movable/immovable tmp with forwarding arguments
+        //  \param immovable create as non-movable pointer
+        //  \param args list of arguments with which an instance of T
+        //      will be constructed.
+        //
+        //  \note Similar to std::make_shared, but the overload for
+        //      array types is not disabled.
+        template<class... Args>
+        static tmp<T> NewImmovable(bool immovable, Args&&... args)
+        {
+            return tmp<T>(immovable, new T(std::forward<Args>(args)...));
+        }
+
         //- Construct tmp from derived type with forwarding arguments
         //  \param args list of arguments with which an instance of U
         //      will be constructed.
@@ -191,13 +211,13 @@ public:
         bool good() const noexcept { return bool(ptr_); }
 
         //- If the stored/referenced content is const
-        bool is_const() const noexcept { return (type_ == CREF); }
+        inline bool is_const() const noexcept;
 
         //- True if this is a managed pointer (not a reference)
-        bool is_pointer() const noexcept { return (type_ == PTR); }
+        inline bool is_pointer() const noexcept;
 
         //- True if this is a reference (not a pointer)
-        bool is_reference() const noexcept { return (type_ != PTR); }
+        inline bool is_reference() const noexcept;
 
         //- True if this is a non-null managed pointer with a unique ref-count
         inline bool movable() const noexcept;
@@ -239,9 +259,13 @@ public:
         //- Clear existing and transfer ownership.
         inline void reset(tmp<T>&& other) noexcept;
 
-        //- Delete managed temporary object and set to new given pointer
+        //- Delete managed temporary object and set to new given pointer.
         inline void reset(T* p = nullptr) noexcept;
 
+        //- Delete managed temporary object and set to new given pointer,
+        //- with specified protection against moving.
+        inline void reset(bool immovable, T* p) noexcept;
+
         //- Avoid inadvertent casting (to object or pointer)
         void reset(const autoPtr<T>&) = delete;
 
@@ -330,8 +354,10 @@ public:
         //- Identical to good(), or bool operator
         bool valid() const noexcept { return bool(ptr_); }
 
-        //- Identical to is_pointer()
-        bool isTmp() const noexcept { return type_ == PTR; }
+        //- Identical to is_pointer(). Prefer is_pointer() or movable().
+        //
+        //  \deprecated(2020-07) - prefer is_pointer() or movable()
+        bool isTmp() const noexcept { return is_pointer(); }
 
         //- Deprecated(2020-07) True if a null managed pointer
         //
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index 191b44a67f..044b2c1bbe 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -29,23 +29,6 @@ License
 #include "error.H"
 #include <typeinfo>
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class T>
-inline void Foam::tmp<T>::incrCount()
-{
-    ptr_->refCount::operator++();
-
-    if (ptr_->refCount::use_count() > 1)
-    {
-        FatalErrorInFunction
-            << "Attempt to create more than 2 tmp's referring to the same"
-               " object of type tmp<" << typeid(T).name() << '>'
-            << abort(FatalError);
-    }
-}
-
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 template<class T>
@@ -55,6 +38,23 @@ inline Foam::word Foam::tmp<T>::typeName()
 }
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class T>
+inline void Foam::tmp<T>::checkUseCount() const
+{
+    if (ptr_ && ptr_->refCount::use_count() > 1)
+    {
+        FatalErrorInFunction
+            << "Attempt to create more than "
+            << (ptr_->refCount::use_count() + 1)
+            << " tmp's referring to the same object of type tmp<"
+            << typeid(T).name() << '>'
+            << abort(FatalError);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
@@ -90,6 +90,15 @@ inline Foam::tmp<T>::tmp(T* p)
 }
 
 
+template<class T>
+inline Foam::tmp<T>::tmp(bool immovable, T* p)
+:
+    tmp<T>(p)
+{
+    if (ptr_ && immovable) type_ = CACHE_PTR;
+}
+
+
 template<class T>
 inline constexpr Foam::tmp<T>::tmp(const T& obj) noexcept
 :
@@ -130,7 +139,8 @@ inline Foam::tmp<T>::tmp(const tmp<T>& rhs)
     {
         if (ptr_)
         {
-            this->incrCount();
+            ptr_->refCount::operator++();
+            this->checkUseCount();
         }
         else
         {
@@ -160,7 +170,8 @@ inline Foam::tmp<T>::tmp(const tmp<T>& rhs, bool reuse)
             }
             else
             {
-                this->incrCount();
+                ptr_->refCount::operator++();
+                this->checkUseCount();
             }
         }
         else
@@ -192,17 +203,40 @@ inline Foam::tmp<T>::~tmp() noexcept
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline bool Foam::tmp<T>::is_const() const noexcept
+{
+    return (type_ == CREF);
+}
+
+
+template<class T>
+inline bool Foam::tmp<T>::is_pointer() const noexcept
+{
+    //OR: return (type_ == PTR || type_ == CACHE_PTR);
+    return (type_ < REF_Types);
+}
+
+
+template<class T>
+inline bool Foam::tmp<T>::is_reference() const noexcept
+{
+    //OR: return (type_ == CREF || type_ == REF);
+    return (type_ > REF_Types);
+}
+
+
 template<class T>
 inline bool Foam::tmp<T>::movable() const noexcept
 {
-    return (is_pointer() && ptr_ && ptr_->refCount::unique());
+    return (ptr_ && type_ == PTR && ptr_->refCount::unique());
 }
 
 
 template<class T>
 inline const T& Foam::tmp<T>::cref() const
 {
-    if (is_pointer() && !ptr_)
+    if (!ptr_ && is_pointer())
     {
         FatalErrorInFunction
             << this->typeName() << " deallocated"
@@ -223,7 +257,7 @@ inline T& Foam::tmp<T>::ref() const
             << this->typeName()
             << abort(FatalError);
     }
-    else if (is_pointer() && !ptr_)
+    else if (!ptr_ && is_pointer())
     {
         FatalErrorInFunction
             << this->typeName() << " deallocated"
@@ -244,7 +278,7 @@ inline T* Foam::tmp<T>::ptr() const
             << abort(FatalError);
     }
 
-    if (is_pointer())
+    if (type_ == PTR)
     {
         if (!ptr_->refCount::unique())
         {
@@ -262,6 +296,7 @@ inline T* Foam::tmp<T>::ptr() const
         return p;
     }
 
+    // CACHE_PTR (immovable) is cloned, as per a reference
     return ptr_->clone().ptr();
 }
 
@@ -269,7 +304,7 @@ inline T* Foam::tmp<T>::ptr() const
 template<class T>
 inline void Foam::tmp<T>::clear() const noexcept
 {
-    if (is_pointer() && ptr_)
+    if (ptr_ && is_pointer())
     {
         if (ptr_->refCount::unique())
         {
@@ -293,6 +328,14 @@ inline void Foam::tmp<T>::reset(T* p) noexcept
 }
 
 
+template<class T>
+inline void Foam::tmp<T>::reset(bool immovable, T* p) noexcept
+{
+    reset(p);
+    if (ptr_ && immovable) type_ = CACHE_PTR;
+}
+
+
 template<class T>
 inline void Foam::tmp<T>::reset(tmp<T>&& other) noexcept
 {
@@ -382,7 +425,7 @@ inline void Foam::tmp<T>::swap(tmp<T>& other) noexcept
 template<class T>
 inline const T* Foam::tmp<T>::operator->() const
 {
-    if (is_pointer() && !ptr_)
+    if (!ptr_ && is_pointer())
     {
         FatalErrorInFunction
             << this->typeName() << " deallocated"
@@ -403,7 +446,7 @@ inline T* Foam::tmp<T>::operator->()
             << this->typeName()
             << abort(FatalError);
     }
-    else if (is_pointer() && !ptr_)
+    else if (!ptr_ && is_pointer())
     {
         FatalErrorInFunction
             << this->typeName() << " deallocated"
@@ -428,7 +471,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& other)
     if (other.is_pointer())
     {
         ptr_ = other.ptr_;
-        type_ = PTR;
+        type_ = other.type_;
 
         other.ptr_ = nullptr;
         other.type_ = PTR;
diff --git a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
index 3fb7f1e708..1685e500b6 100644
--- a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSource.C
@@ -134,8 +134,7 @@ Foam::fv::atmAmbientTurbSource::atmAmbientTurbSource
     else
     {
         FatalErrorInFunction
-            << "Unable to find neither epsilon nor omega field." << nl
-            << "atmAmbientTurbSource needs either epsilon or omega field."
+            << "Needs either epsilon or omega field."
             << abort(FatalError);
     }
 
diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
index 29b0d9ed4f..cc6e074cb0 100644
--- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C
@@ -226,8 +226,7 @@ Foam::fv::atmBuoyancyTurbSource::atmBuoyancyTurbSource
     else
     {
         FatalErrorInFunction
-            << "Unable to find neither epsilon nor omega field." << nl
-            << "atmBuoyancyTurbSource needs either epsilon or omega field."
+            << "Needs either epsilon or omega field."
             << abort(FatalError);
     }
 
diff --git a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
index bbb26ecd6f..421a7d4d67 100644
--- a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSource.C
@@ -161,8 +161,7 @@ Foam::fv::atmLengthScaleTurbSource::atmLengthScaleTurbSource
     else
     {
         FatalErrorInFunction
-            << "Unable to find neither epsilon nor omega field." << nl
-            << "atmLengthScaleTurbSource needs either epsilon or omega field."
+            << "Needs either epsilon or omega field."
             << abort(FatalError);
     }
 
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
index c7df352eb9..9ced80a9a1 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
@@ -123,8 +123,9 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource
     tmp<volScalarField> tepsilon = turbPtr->epsilon();
     tmp<volScalarField> tomega = turbPtr->omega();
 
-    if (!tepsilon.isTmp())
+    if (tepsilon.is_reference())
     {
+        isEpsilon_ = true;
         fieldNames_[0] = tepsilon().name();
 
         const dictionary& turbDict = turbPtr->coeffDict();
@@ -132,7 +133,7 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource
         C1_.read("C1", turbDict);
         C2_.read("C2", turbDict);
     }
-    else if (!tomega.isTmp())
+    else if (tomega.is_reference())
     {
         isEpsilon_ = false;
         fieldNames_[0] = tomega().name();
@@ -143,8 +144,7 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource
     else
     {
         FatalErrorInFunction
-            << "Unable to find neither epsilon nor omega field." << nl
-            << "atmPlantCanopyTurbSource needs either epsilon or omega field."
+            << "Needs either epsilon or omega field."
             << abort(FatalError);
     }
 
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.C b/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.C
index 19b6641e57..ccc3155a1a 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.C
+++ b/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.C
@@ -49,7 +49,7 @@ uncorrectedLnGrad<Type>::correction
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, faePatchField, edgeMesh>>(nullptr);
+    return nullptr;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
index 61c1f89de5..4b56ed4096 100644
--- a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
+++ b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
@@ -40,18 +40,18 @@ Foam::tmp<Foam::volVectorField> Foam::constrainHbyA
 {
     tmp<volVectorField> tHbyANew;
 
-    if (tHbyA.isTmp())
+    if (tHbyA.movable())
     {
         tHbyANew = tHbyA;
         tHbyANew.ref().rename("HbyA");
     }
     else
     {
-        tHbyANew = new volVectorField("HbyA", tHbyA);
+        // Clone and use given name
+        tHbyANew.reset(new volVectorField("HbyA", tHbyA));
     }
 
-    volVectorField& HbyA = tHbyANew.ref();
-    volVectorField::Boundary& HbyAbf = HbyA.boundaryFieldRef();
+    auto& HbyAbf = tHbyANew.ref().boundaryFieldRef();
 
     forAll(U.boundaryField(), patchi)
     {
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
index 64380af3ad..4ee99b4adc 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
@@ -50,7 +50,7 @@ orthogonalSnGrad<Type>::correction
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(nullptr);
+    return nullptr;
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index d19a63bf3f..b460f0a9a8 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -172,15 +172,11 @@ public:
             return false;
         }
 
-        //- Return the explicit correction to the snGrad
-        //- for the given field
+        //- Return the explicit correction to the snGrad for the given field
         virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const
         {
-            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-            (
-                nullptr
-            );
+            return nullptr;
         }
 
         //- Return the snGrad of the given cell field
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
index 793e16a563..ea5a36dd86 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
@@ -50,7 +50,7 @@ uncorrectedSnGrad<Type>::correction
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(nullptr);
+    return nullptr;
 }
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index fd7f661afb..9e41919ab4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -315,10 +315,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
+                return nullptr;
             }
         }
 };
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index d9ca8e77a3..123ab26b0f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -342,10 +342,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
+                return nullptr;
             }
         }
 };
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
index 92b6f83e11..4c706f0201 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -242,10 +242,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
+                return nullptr;
             }
         }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
index cfa6d0e603..f040a92dcd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H
@@ -222,10 +222,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
+                return nullptr;
             }
         }
 };
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
index 3ee9a60be0..55892b91b2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H
@@ -234,10 +234,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
+                return nullptr;
             }
         }
 };
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index 91f283d4a7..381ab0cc03 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -238,10 +238,7 @@ public:
             }
             else
             {
-                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-                (
-                    nullptr
-                );
+                return nullptr;
             }
         }
 };
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 53ec747eb3..14c6d7ba00 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -203,10 +203,7 @@ public:
         virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const
         {
-            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
-            (
-                nullptr
-            );
+            return nullptr;
         }
 
         //- Return the face-interpolate of the given cell field
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index acc0a9f070..2917c7d132 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -98,8 +98,8 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
 :
     DispersionModel<CloudType>(owner),
     kPtr_(nullptr),
-    ownK_(false),
     epsilonPtr_(nullptr),
+    ownK_(false),
     ownEpsilon_(false)
 {}
 
@@ -112,8 +112,8 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
 :
     DispersionModel<CloudType>(dm),
     kPtr_(dm.kPtr_),
-    ownK_(dm.ownK_),
     epsilonPtr_(dm.epsilonPtr_),
+    ownK_(dm.ownK_),
     ownEpsilon_(dm.ownEpsilon_)
 {
     dm.ownK_ = false;
@@ -138,20 +138,22 @@ void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
     if (store)
     {
         tmp<volScalarField> tk = this->kModel();
-        if (tk.isTmp())
+        if (tk.movable())
         {
+            // Take ownership
             kPtr_ = tk.ptr();
             ownK_ = true;
         }
         else
         {
-            kPtr_ = &tk();
+            kPtr_ = &tk.cref();
             ownK_ = false;
         }
 
         tmp<volScalarField> tepsilon = this->epsilonModel();
-        if (tepsilon.isTmp())
+        if (tepsilon.movable())
         {
+            // Take ownership
             epsilonPtr_ = tepsilon.ptr();
             ownEpsilon_ = true;
         }
@@ -163,12 +165,12 @@ void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
     }
     else
     {
-        if (ownK_ && kPtr_)
+        if (ownK_)
         {
             deleteDemandDrivenData(kPtr_);
             ownK_ = false;
         }
-        if (ownEpsilon_ && epsilonPtr_)
+        if (ownEpsilon_)
         {
             deleteDemandDrivenData(epsilonPtr_);
             ownEpsilon_ = false;
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index a99a3e5c18..cbe84a7c5f 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -60,13 +60,13 @@ protected:
             //- Turbulence k
             const volScalarField* kPtr_;
 
-            //- Take ownership of the k field
-            mutable bool ownK_;
-
             //- Turbulence epsilon
             const volScalarField* epsilonPtr_;
 
-            //- Take ownership of the epsilon field
+            //- Local ownership of the k field
+            mutable bool ownK_;
+
+            //- Local ownership of the epsilon field
             mutable bool ownEpsilon_;
 
 
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 2f65c0cef9..adf3811696 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -77,8 +77,8 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
     ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
     rndGen_(owner.rndGen()),
     lambda_(this->coeffs().getScalar("lambda")),
-    turbulence_(this->coeffs().getBool("turbulence")),
     kPtr_(nullptr),
+    turbulence_(this->coeffs().getBool("turbulence")),
     ownK_(false)
 {}
 
@@ -92,8 +92,8 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
     ParticleForce<CloudType>(bmf),
     rndGen_(bmf.rndGen_),
     lambda_(bmf.lambda_),
-    turbulence_(bmf.turbulence_),
     kPtr_(nullptr),
+    turbulence_(bmf.turbulence_),
     ownK_(false)
 {}
 
@@ -102,7 +102,9 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
 
 template<class CloudType>
 Foam::BrownianMotionForce<CloudType>::~BrownianMotionForce()
-{}
+{
+    cacheFields(false);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -115,20 +117,21 @@ void Foam::BrownianMotionForce<CloudType>::cacheFields(const bool store)
         if (store)
         {
             tmp<volScalarField> tk = kModel();
-            if (tk.isTmp())
+            if (tk.movable())
             {
+                // Take ownership
                 kPtr_ = tk.ptr();
                 ownK_ = true;
             }
             else
             {
-                kPtr_ = &tk();
+                kPtr_ = &tk.cref();
                 ownK_ = false;
             }
         }
         else
         {
-            if (ownK_ && kPtr_)
+            if (ownK_)
             {
                 deleteDemandDrivenData(kPtr_);
                 ownK_ = false;
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
index 9405a4473d..57bbbdfdb2 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -65,7 +65,7 @@ class BrownianMotionForce
 :
     public ParticleForce<CloudType>
 {
-    // Private data
+    // Private Data
 
         //- Reference to the cloud random number generator
         Random& rndGen_;
@@ -73,13 +73,13 @@ class BrownianMotionForce
         //- Molecular free path length [m]
         const scalar lambda_;
 
-        //- Turbulence flag
-        bool turbulence_;
-
         //- Pointer to the turbulence kinetic energy field
         const volScalarField* kPtr_;
 
-        //- Flag that indicates ownership of turbulence k field
+        //- Turbulence flag
+        bool turbulence_;
+
+        //- Local ownership of the turbulence k field
         bool ownK_;
 
 

From 80a416d2535d14dee78d03f175992c48096548f0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 17 Mar 2023 18:19:41 +0100
Subject: [PATCH 143/348] ENH: support construct Geometric field from separate
 value/dimensions

- can be easier to specify than copying into a dimensioned type.

  Eg,
      volSymmTensorField(io, mesh, Zero, dimLength);

      fluxFieldType
      (
          io
          mesh,
          Zero,
          Uf.dimensions()*dimArea/dimTime
      );

  vs
      volSymmTensorField
      (
          io,
          mesh,
          dimensionedSymmTensor("0", dimLength, Zero)
      );

      fluxFieldType
      (
          io
          mesh,
          dimensioned<typename flux<Type>::type>
          (
              Uf.dimensions()*dimArea/dimTime, Zero
          )
      );
---
 src/OpenFOAM/dimensionSet/dimensionSet.H      |   2 +
 src/OpenFOAM/dimensionSet/dimensionSets.H     |   4 +-
 .../DimensionedField/DimensionedField.C       |  29 +++-
 .../DimensionedField/DimensionedField.H       |  40 ++++--
 .../DimensionedField/DimensionedFieldIO.C     |   8 +-
 .../DimensionedField/DimensionedFieldNew.C    |  68 +++++----
 .../DimensionedField/SlicedDimensionedField.H |   4 +-
 .../GeometricField/GeometricField.C           | 129 ++++++++++++------
 .../GeometricField/GeometricField.H           |  82 +++++++++--
 .../GeometricField/GeometricFieldNew.C        | 108 ++++++++++++---
 .../SlicedGeometricField.C                    |   8 +-
 .../SlicedGeometricField.H                    |   4 +-
 12 files changed, 370 insertions(+), 116 deletions(-)

diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index b50571a767..1c21e90f32 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -433,6 +433,8 @@ dimensionSet operator&&(const dimensionSet& ds1, const dimensionSet& ds2);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Predefined dimensions (eg, dimless, dimMass, dimLength, dimTime, ...)
+// and unit systems
 #include "dimensionSets.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.H b/src/OpenFOAM/dimensionSet/dimensionSets.H
index b11797db0b..a4f9c63f62 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dimensionSets_H
-#define dimensionSets_H
+#ifndef Foam_dimensionSets_H
+#define Foam_dimensionSets_H
 
 #include "scalarMatrices.H"
 #include "dimensionedScalarFwd.H"
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index fad6981021..44168d5024 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -168,14 +168,15 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensioned<Type>& dt,
+    const Type& value,
+    const dimensionSet& dims,
     const bool checkIOFlags
 )
 :
     regIOobject(io),
-    Field<Type>(GeoMesh::size(mesh), dt.value()),
+    Field<Type>(GeoMesh::size(mesh), value),
     mesh_(mesh),
-    dimensions_(dt.dimensions()),
+    dimensions_(dims),
     oriented_()
 {
     if (checkIOFlags)
@@ -185,6 +186,26 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 }
 
 
+template<class Type, class GeoMesh>
+Foam::DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dimensioned<Type>& dt,
+    const bool checkIOFlags
+)
+:
+    DimensionedField<Type, GeoMesh>
+    (
+        io,
+        mesh,
+        dt.value(),
+        dt.dimensions(),
+        checkIOFlags
+    )
+{}
+
+
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 72ee48bb72..60b3de8775 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -165,8 +165,8 @@ public:
             const tmp<Field<Type>>& tfield
         );
 
-        //- Construct from components, setting the initial size and assigning
-        //- the dimensions, but not initialising any field values.
+        //- Construct from components, setting initial size and dimensions,
+        //- but not initialising any field values.
         //  Used for temporary fields which are initialised after construction
         DimensionedField
         (
@@ -176,9 +176,20 @@ public:
             const bool checkIOFlags = true
         );
 
-        //- Construct from components, setting the initial size and assigning
-        //- both dimensions and values.
-        //  The internal name for the dimensioned\<Type\> has no influence.
+        //- Construct from components, setting dimensions and initial
+        //- uniform field value.
+        DimensionedField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const Type& value,
+            const dimensionSet& dims,
+            const bool checkIOFlags = true
+        );
+
+        //- Construct from components, setting dimensions and initial
+        //- uniform field value.
+        //  The name of the dimensioned\<Type\> has no influence.
         DimensionedField
         (
             const IOobject& io,
@@ -292,7 +303,7 @@ public:
         (
             const word& name,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const Field<Type>& iField
         );
 
@@ -304,7 +315,7 @@ public:
         (
             const word& name,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             Field<Type>&& iField
         );
 
@@ -315,7 +326,18 @@ public:
         (
             const word& name,
             const Mesh& mesh,
-            const dimensionSet& ds
+            const dimensionSet& dims
+        );
+
+        //- Return uniform value tmp field from name, mesh, dimensions, value.
+        //  The field is NO_READ, NO_WRITE, unregistered and uses the
+        //  current timeName from the mesh registry
+        static tmp<DimensionedField<Type, GeoMesh>> New
+        (
+            const word& name,
+            const Mesh& mesh,
+            const Type& value,
+            const dimensionSet& dims
         );
 
         //- Return tmp field from name, mesh, dimensioned\<Type\>.
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index 0f27a6fb1d..c17948b4ae 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
@@ -49,8 +49,12 @@ void Foam::DimensionedField<Type, GeoMesh>::readField
         oriented_.read(fieldDict);
     }
 
-    Field<Type> f(fieldDictEntry, fieldDict, GeoMesh::size(mesh_));
-    this->transfer(f);
+
+    // The primitive field
+    auto& fld = static_cast<Field<Type>&>(*this);
+
+    fld.resize_nocopy(GeoMesh::size(mesh_));
+    fld.assign(fieldDictEntry, fieldDict, fld.size());
 }
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C
index 8caf9d2b68..2c57d75fd9 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,7 +33,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const Field<Type>& iField
 )
 {
@@ -49,7 +49,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        ds,
+        dims,
         iField
     );
 }
@@ -61,7 +61,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     Field<Type>&& iField
 )
 {
@@ -77,7 +77,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        ds,
+        dims,
         std::move(iField)
     );
 }
@@ -89,7 +89,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensionSet& ds
+    const dimensionSet& dims
 )
 {
     return tmp<DimensionedField<Type, GeoMesh>>::New
@@ -104,8 +104,37 @@ Foam::DimensionedField<Type, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        ds,
-        false  // checkIOFlags = true
+        dims,
+        false  // checkIOFlags off
+    );
+}
+
+
+template<class Type, class GeoMesh>
+Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
+Foam::DimensionedField<Type, GeoMesh>::New
+(
+    const word& name,
+    const Mesh& mesh,
+    const Type& value,
+    const dimensionSet& dims
+)
+{
+    return tmp<DimensionedField<Type, GeoMesh>>::New
+    (
+        IOobject
+        (
+            name,
+            mesh.thisDb().time().timeName(),
+            mesh.thisDb(),
+            IOobjectOption::NO_READ,
+            IOobjectOption::NO_WRITE,
+            IOobjectOption::NO_REGISTER
+        ),
+        mesh,
+        value,
+        dims,
+        false  // checkIOFlags off
     );
 }
 
@@ -119,20 +148,12 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const dimensioned<Type>& dt
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    return DimensionedField<Type, GeoMesh>::New
     (
-        IOobject
-        (
-            name,
-            mesh.thisDb().time().timeName(),
-            mesh.thisDb(),
-            IOobjectOption::NO_READ,
-            IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
-        ),
+        name,
         mesh,
-        dt,
-        false  // checkIOFlags = true
+        dt.value(),
+        dt.dimensions()
     );
 }
 
@@ -141,7 +162,7 @@ template<class Type, class GeoMesh>
 Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
 Foam::DimensionedField<Type, GeoMesh>::New
 (
-    const word& newName,
+    const word& name,
     const tmp<DimensionedField<Type, GeoMesh>>& tfld
 )
 {
@@ -149,7 +170,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
     (
         IOobject
         (
-            newName,
+            name,
             tfld().instance(),
             tfld().local(),
             tfld().db(),
@@ -211,7 +232,8 @@ Foam::DimensionedField<Type, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         fld.mesh(),
-        dt
+        dt.value(),
+        dt.dimensions()
     );
 }
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SlicedDimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SlicedDimensionedField.H
index d9ad2fb5fc..9f6df361ac 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SlicedDimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SlicedDimensionedField.H
@@ -67,11 +67,11 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const Field<Type>& iField
         )
         :
-            DimensionedField<Type, GeoMesh>(io, mesh, ds, Field<Type>())
+            DimensionedField<Type, GeoMesh>(io, mesh, dims, Field<Type>())
         {
             // Set internalField to the slice of the complete field
             UList<Type>::shallowCopy
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index af2ef82dd9..3756d2208e 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -193,18 +193,18 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const word& patchFieldType
 )
 :
-    Internal(io, mesh, ds, false),
+    Internal(io, mesh, dims, false),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
     boundaryField_(mesh.boundary(), *this, patchFieldType)
 {
     DebugInFunction
-        << "Creating temporary" << nl << this->info() << endl;
+        << "Creating" << nl << this->info() << endl;
 
     readIfPresent();
 }
@@ -215,19 +215,71 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const wordList& patchFieldTypes,
     const wordList& actualPatchTypes
 )
 :
-    Internal(io, mesh, ds, false),
+    Internal(io, mesh, dims, false),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
     boundaryField_(mesh.boundary(), *this, patchFieldTypes, actualPatchTypes)
 {
     DebugInFunction
-        << "Creating temporary" << nl << this->info() << endl;
+        << "Creating" << nl << this->info() << endl;
+
+    readIfPresent();
+}
+
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const Type& value,
+    const dimensionSet& dims,
+    const word& patchFieldType
+)
+:
+    Internal(io, mesh, value, dims, false),
+    timeIndex_(this->time().timeIndex()),
+    field0Ptr_(nullptr),
+    fieldPrevIterPtr_(nullptr),
+    boundaryField_(mesh.boundary(), *this, patchFieldType)
+{
+    DebugInFunction
+        << "Creating" << nl << this->info() << endl;
+
+    boundaryField_ == value;
+
+    readIfPresent();
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const Type& value,
+    const dimensionSet& dims,
+    const wordList& patchFieldTypes,
+    const wordList& actualPatchTypes
+)
+:
+    Internal(io, mesh, value, dims, false),
+    timeIndex_(this->time().timeIndex()),
+    field0Ptr_(nullptr),
+    fieldPrevIterPtr_(nullptr),
+    boundaryField_(mesh.boundary(), *this, patchFieldTypes, actualPatchTypes)
+{
+    DebugInFunction
+        << "Creating" << nl << this->info() << endl;
+
+    boundaryField_ == value;
 
     readIfPresent();
 }
@@ -242,19 +294,15 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const word& patchFieldType
 )
 :
-    Internal(io, mesh, dt, false),
-    timeIndex_(this->time().timeIndex()),
-    field0Ptr_(nullptr),
-    fieldPrevIterPtr_(nullptr),
-    boundaryField_(mesh.boundary(), *this, patchFieldType)
-{
-    DebugInFunction
-        << "Creating temporary" << nl << this->info() << endl;
-
-    boundaryField_ == dt.value();
-
-    readIfPresent();
-}
+    GeometricField<Type, PatchField, GeoMesh>
+    (
+        io,
+        mesh,
+        dt.value(),
+        dt.dimensions(),
+        patchFieldType
+    )
+{}
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -267,19 +315,16 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const wordList& actualPatchTypes
 )
 :
-    Internal(io, mesh, dt, false),
-    timeIndex_(this->time().timeIndex()),
-    field0Ptr_(nullptr),
-    fieldPrevIterPtr_(nullptr),
-    boundaryField_(mesh.boundary(), *this, patchFieldTypes, actualPatchTypes)
-{
-    DebugInFunction
-        << "Creating temporary" << nl << this->info() << endl;
-
-    boundaryField_ == dt.value();
-
-    readIfPresent();
-}
+    GeometricField<Type, PatchField, GeoMesh>
+    (
+        io,
+        mesh,
+        dt.value(),
+        dt.dimensions(),
+        patchFieldTypes,
+        actualPatchTypes
+    )
+{}
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -390,12 +435,12 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const Field<Type>& iField,
     const word& patchFieldType
 )
 :
-    Internal(io, mesh, ds, iField),
+    Internal(io, mesh, dims, iField),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -413,12 +458,12 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     Field<Type>&& iField,
     const word& patchFieldType
 )
 :
-    Internal(io, mesh, ds, std::move(iField)),
+    Internal(io, mesh, dims, std::move(iField)),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -436,12 +481,12 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const Field<Type>& iField,
     const PtrList<PatchField<Type>>& ptfl
 )
 :
-    Internal(io, mesh, ds, iField),
+    Internal(io, mesh, dims, iField),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -459,12 +504,12 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     Field<Type>&& iField,
     const PtrList<PatchField<Type>>& ptfl
 )
 :
-    Internal(io, mesh, ds, std::move(iField)),
+    Internal(io, mesh, dims, std::move(iField)),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
@@ -482,12 +527,12 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const tmp<Field<Type>>& tfield,
     const PtrList<PatchField<Type>>& ptfl
 )
 :
-    Internal(io, mesh, ds, tfield),
+    Internal(io, mesh, dims, tfield),
     timeIndex_(this->time().timeIndex()),
     field0Ptr_(nullptr),
     fieldPrevIterPtr_(nullptr),
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index d7fffa0d23..eaa54bab72 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -155,7 +155,7 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const word& patchFieldType = PatchField<Type>::calculatedType()
         );
 
@@ -166,7 +166,32 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
+            const wordList& wantedPatchTypes,
+            const wordList& actualPatchTypes = wordList()
+        );
+
+        //- Construct given IOobject, mesh, dimensions, initial field value
+        //- and given patch type.
+        //  This assigns both dimensions and values.
+        GeometricField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const Type& value,
+            const dimensionSet& dims,
+            const word& patchFieldType = PatchField<Type>::calculatedType()
+        );
+
+        //- Construct given IOobject, mesh, dimensions, initial field value
+        //- and given patch types.
+        //  This assigns both dimensions and values.
+        GeometricField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const Type& value,
+            const dimensionSet& dims,
             const wordList& wantedPatchTypes,
             const wordList& actualPatchTypes = wordList()
         );
@@ -237,7 +262,7 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const Field<Type>& iField,
             const word& patchFieldType = PatchField<Type>::calculatedType()
         );
@@ -247,7 +272,7 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             Field<Type>&& iField,
             const word& patchFieldType = PatchField<Type>::calculatedType()
         );
@@ -257,7 +282,7 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const Field<Type>& iField,
             const PtrList<PatchField<Type>>& ptfl
         );
@@ -267,7 +292,7 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             Field<Type>&& iField,
             const PtrList<PatchField<Type>>& ptfl
         );
@@ -277,7 +302,7 @@ public:
         (
             const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const tmp<Field<Type>>& tiField,
             const PtrList<PatchField<Type>>& ptfl
         );
@@ -387,7 +412,7 @@ public:
         (
             const word& name,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const word& patchFieldType = PatchField<Type>::calculatedType()
         );
 
@@ -399,7 +424,7 @@ public:
         (
             const word& name,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             const Field<Type>& iField,
             const word& patchFieldType = PatchField<Type>::calculatedType()
         );
@@ -412,11 +437,38 @@ public:
         (
             const word& name,
             const Mesh& mesh,
-            const dimensionSet& ds,
+            const dimensionSet& dims,
             Field<Type>&& iField,
             const word& patchFieldType = PatchField<Type>::calculatedType()
         );
 
+        //- Return tmp field from name, mesh, dimensions, initial field value
+        //- and patch type.
+        //  The field is NO_READ, NO_WRITE, unregistered and uses the
+        //  current timeName from the mesh registry
+        static tmp<GeometricField<Type, PatchField, GeoMesh>> New
+        (
+            const word& name,
+            const Mesh& mesh,
+            const Type& value,
+            const dimensionSet& dims,
+            const word& patchFieldType = PatchField<Type>::calculatedType()
+        );
+
+        //- Return tmp field from name, mesh, dimensioned\<Type\>
+        //- and patch types.
+        //  The field is NO_READ, NO_WRITE, unregistered and uses the
+        //  current timeName from the mesh registry
+        static tmp<GeometricField<Type, PatchField, GeoMesh>> New
+        (
+            const word& name,
+            const Mesh& mesh,
+            const Type& value,
+            const dimensionSet& dims,
+            const wordList& patchFieldTypes,
+            const wordList& actualPatchTypes = wordList()
+        );
+
         //- Return tmp field from name, mesh, dimensioned\<Type\>
         //- and patch type.
         //  The field is NO_READ, NO_WRITE, unregistered and uses the
@@ -451,6 +503,16 @@ public:
             const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
         );
 
+        //- Rename tmp field and reset patch field type
+        //  The field is NO_READ, NO_WRITE, unregistered and uses the
+        //  current timeName from the mesh registry
+        static tmp<GeometricField<Type, PatchField, GeoMesh>> New
+        (
+            const word& newName,
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
+            const word& patchFieldType
+        );
+
         //- Rename tmp field and reset patch field types and return
         //  The field is NO_READ, NO_WRITE, unregistered and uses the
         //  current timeName from the mesh registry
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C
index 5c0b0cb822..8aa3f79d7f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,7 +34,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const word& patchFieldType
 )
 {
@@ -50,7 +50,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        ds,
+        dims,
         patchFieldType
     );
 }
@@ -62,7 +62,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const Field<Type>& iField,
     const word& patchFieldType
 )
@@ -79,7 +79,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        ds,
+        dims,
         iField,
         patchFieldType
     );
@@ -92,7 +92,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     Field<Type>&& iField,
     const word& patchFieldType
 )
@@ -109,7 +109,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        ds,
+        dims,
         std::move(iField),
         patchFieldType
     );
@@ -122,7 +122,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensioned<Type>& dt,
+    const Type& value,
+    const dimensionSet& dims,
     const word& patchFieldType
 )
 {
@@ -138,7 +139,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        dt,
+        value,
+        dims,
         patchFieldType
     );
 }
@@ -150,7 +152,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
     const word& name,
     const Mesh& mesh,
-    const dimensioned<Type>& dt,
+    const Type& value,
+    const dimensionSet& dims,
     const wordList& patchFieldTypes,
     const wordList& actualPatchTypes
 )
@@ -167,7 +170,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         mesh,
-        dt,
+        value,
+        dims,
         patchFieldTypes,
         actualPatchTypes
     );
@@ -178,7 +182,78 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
 Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
-    const word& newName,
+    const word& name,
+    const Mesh& mesh,
+    const dimensioned<Type>& dt,
+    const word& patchFieldType
+)
+{
+    return GeometricField<Type, PatchField, GeoMesh>::New
+    (
+        name,
+        mesh,
+        dt.value(),
+        dt.dimensions(),
+        patchFieldType
+    );
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
+Foam::GeometricField<Type, PatchField, GeoMesh>::New
+(
+    const word& name,
+    const Mesh& mesh,
+    const dimensioned<Type>& dt,
+    const wordList& patchFieldTypes,
+    const wordList& actualPatchTypes
+)
+{
+    return GeometricField<Type, PatchField, GeoMesh>::New
+    (
+        name,
+        mesh,
+        dt.value(),
+        dt.dimensions(),
+        patchFieldTypes,
+        actualPatchTypes
+    );
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
+Foam::GeometricField<Type, PatchField, GeoMesh>::New
+(
+    const word& name,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
+    const word& patchFieldType
+)
+{
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    (
+        IOobject
+        (
+            name,
+            tgf().instance(),
+            tgf().local(),
+            tgf().db(),
+            IOobjectOption::NO_READ,
+            IOobjectOption::NO_WRITE,
+            IOobjectOption::NO_REGISTER
+        ),
+        tgf,
+        patchFieldType
+    );
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
+Foam::GeometricField<Type, PatchField, GeoMesh>::New
+(
+    const word& name,
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
@@ -186,7 +261,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     (
         IOobject
         (
-            newName,
+            name,
             tgf().instance(),
             tgf().local(),
             tgf().db(),
@@ -203,7 +278,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
 Foam::GeometricField<Type, PatchField, GeoMesh>::New
 (
-    const word& newName,
+    const word& name,
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
     const wordList& patchFieldTypes,
     const wordList& actualPatchTypes
@@ -213,7 +288,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     (
         IOobject
         (
-            newName,
+            name,
             tgf().instance(),
             tgf().local(),
             tgf().db(),
@@ -280,7 +355,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             IOobjectOption::NO_REGISTER
         ),
         fld.mesh(),
-        dt,
+        dt.value(),
+        dt.dimensions(),
         patchFieldType
     );
 }
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index efa92277d2..2b378137fd 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -201,7 +201,7 @@ SlicedGeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const Field<Type>& completeField,
     const bool preserveCouples
 )
@@ -210,7 +210,7 @@ SlicedGeometricField
     (
         io,
         mesh,
-        ds,
+        dims,
         Field<Type>(),
         // preserveProcessorOnly = false
         // isBoundaryOnly = false
@@ -239,7 +239,7 @@ SlicedGeometricField
 (
     const IOobject& io,
     const Mesh& mesh,
-    const dimensionSet& ds,
+    const dimensionSet& dims,
     const Field<Type>& completeIField,
     const Field<Type>& completeBField,
     const bool preserveCouples,
@@ -250,7 +250,7 @@ SlicedGeometricField
     (
         io,
         mesh,
-        ds,
+        dims,
         Field<Type>(),
         makeBoundary
         (
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index 1ae1df29a8..d26923f8b5 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -140,7 +140,7 @@ public:
         (
             const IOobject&,
             const Mesh&,
-            const dimensionSet&,
+            const dimensionSet& dims,
             const Field<Type>& completeField,
             const bool preserveCouples = true
         );
@@ -151,7 +151,7 @@ public:
         (
             const IOobject&,
             const Mesh&,
-            const dimensionSet&,
+            const dimensionSet& dims,
             const Field<Type>& completeIField,
             const Field<Type>& completeBField,
             const bool preserveCouples = true,

From 81807646ca7c3ba294e439695c86bddf7e3ce2be Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 20 Mar 2023 11:22:50 +0100
Subject: [PATCH 144/348] ENH: additional SHA1Digest constructors and methods

- data_bytes(), size_bytes() methods to support broadcasting or
  gather/scatter content. Additional construct from raw bytes
  to support transmitting content.
---
 .../primitives/hashes/SHA1/SHA1Digest.C       | 85 +++++++++++++++++--
 .../primitives/hashes/SHA1/SHA1Digest.H       | 50 ++++++++---
 2 files changed, 118 insertions(+), 17 deletions(-)

diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C
index d91aa11942..934cca0d98 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C
@@ -76,9 +76,66 @@ static unsigned char readHexDigit(Istream& is)
 } // End namespace Foam
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+namespace
+{
 
-bool Foam::SHA1Digest::isEqual(const char* hexdigits, std::size_t len) const
+// Copy assign digest from content
+bool assign
+(
+    std::array<unsigned char, 20>& digest,
+    const unsigned char* content,
+    std::size_t len
+)
+{
+    if (!content || !len)
+    {
+        return false;
+    }
+
+    if (len == digest.size())
+    {
+        // ie, std::copy
+        for (auto& val : digest)
+        {
+            val = *content;
+            ++content;
+        }
+
+        return true;
+    }
+
+    // Skip possible '_' prefix
+    if (*content == '_')
+    {
+        ++content;
+        --len;
+    }
+
+    // Incorrect length - can never assign
+    if (len != 2*digest.size())
+    {
+        return false;
+    }
+
+    for (auto& val : digest)
+    {
+        const unsigned char upp = *content++;
+        const unsigned char low = *content++;
+
+        val = (upp << 4) + low;
+    }
+
+    return true;
+}
+
+
+// Byte-wise compare digest contents
+bool isEqual
+(
+    const std::array<unsigned char, 20>& digest,
+    const char* hexdigits,
+    std::size_t len
+)
 {
     // Skip possible '_' prefix
     if (*hexdigits == '_')
@@ -88,12 +145,12 @@ bool Foam::SHA1Digest::isEqual(const char* hexdigits, std::size_t len) const
     }
 
     // Incorrect length - can never match
-    if (len != 2*dig_.size())
+    if (len != 2*digest.size())
     {
         return false;
     }
 
-    for (const auto& byteVal : dig_)
+    for (const auto& byteVal : digest)
     {
         const char upp = hexChars[((byteVal >> 4) & 0xF)];
         const char low = hexChars[(byteVal & 0xF)];
@@ -105,6 +162,8 @@ bool Foam::SHA1Digest::isEqual(const char* hexdigits, std::size_t len) const
     return true;
 }
 
+} // End anonymous namespace
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -114,6 +173,20 @@ Foam::SHA1Digest::SHA1Digest()
 }
 
 
+Foam::SHA1Digest::SHA1Digest(const char* content, std::size_t len)
+{
+    clear();
+    assign(dig_, reinterpret_cast<const unsigned char*>(content), len);
+}
+
+
+Foam::SHA1Digest::SHA1Digest(const unsigned char* content, std::size_t len)
+{
+    clear();
+    assign(dig_, content, len);
+}
+
+
 Foam::SHA1Digest::SHA1Digest(Istream& is)
 {
     clear();
@@ -214,7 +287,7 @@ bool Foam::SHA1Digest::operator==(const std::string& hexdigits) const
     // Interpret empty string as '0000..'
     size_t len = hexdigits.length();
 
-    return len ? isEqual(hexdigits.data(), len) : empty();
+    return len ? isEqual(dig_, hexdigits.data(), len) : empty();
 }
 
 
@@ -223,7 +296,7 @@ bool Foam::SHA1Digest::operator==(const char* hexdigits) const
     // Interpret nullptr or empty string as '0000..'
     size_t len = (hexdigits ? strlen(hexdigits) : 0);
 
-    return len ? isEqual(hexdigits, len) : empty();
+    return len ? isEqual(dig_, hexdigits, len) : empty();
 }
 
 
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
index c8d0e7fa27..f3b3535f5b 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,18 +68,12 @@ class SHA1Digest
 
     // Private Member Functions
 
-        //- Pointer to the underlying digest data
-        unsigned char* data()
-        {
-            return dig_.data();
-        }
-
-        //- Byte-wise compare digest contents
-        bool isEqual(const char* hexdigits, std::size_t len) const;
-
         // Permit SHA1 to calculate the digest
         friend class SHA1;
 
+        //- Raw digest data (20 bytes). Non-const access for SHA1
+        unsigned char* data() noexcept { return dig_.data(); }
+
 
 public:
 
@@ -94,9 +88,19 @@ public:
         //- Default construct a zero digest
         SHA1Digest();
 
-        //- Read construct a digest
+        //- Read construct a digest from stringified content
         explicit SHA1Digest(Istream& is);
 
+        //- Construct digest from raw or stringified content.
+        //- The length is 20 for raw digest content and 40 (or 41) for
+        //- stringified versions.
+        SHA1Digest(const char* content, std::size_t len);
+
+        //- Construct digest from raw or stringified content.
+        //- The length is 20 for raw digest content and 40 (or 41) for
+        //- stringified versions.
+        SHA1Digest(const unsigned char* content, std::size_t len);
+
 
     // Member Functions
 
@@ -119,6 +123,30 @@ public:
         Ostream& write(Ostream& os, const bool prefixed=false) const;
 
 
+    // Low-level access
+
+        //- Raw digest data (20 bytes) - const access
+        const unsigned char* cdata() const noexcept { return dig_.data(); }
+
+        //- Raw digest data (20 bytes) - const access
+        const unsigned char* cdata_bytes() const noexcept
+        {
+            return dig_.data();
+        }
+
+        //- Raw digest data (20 bytes) - non-const access. Use with caution!
+        unsigned char* data_bytes() noexcept
+        {
+            return dig_.data();
+        }
+
+        //- The number of bytes in digest (20)
+        static constexpr unsigned size_bytes() noexcept { return 20; }
+
+        //- The dimensioned size of the digest is always 20 bytes
+        static constexpr unsigned max_size() noexcept { return 20; }
+
+
     // Member Operators
 
         //- Equality operator

From f6969631a64d6137ab9cfaae92ebf983c6fd067c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 21 Mar 2023 20:27:10 +0100
Subject: [PATCH 145/348] ENH: support optional upper limit for printStack

- when only a partial stacktrace is desirable.

ENH: add stack trace decorators

- the 0-th frame is always printStack(), so skip that and emit
  some headers/footers instead. Eg,

  [stack trace]
  =============
  #1  Foam::SymmTensor<double> Foam::inv<double>(...)
  #2  Foam::inv(Foam::UList<Foam::SymmTensor<double>> const&) ...
  ...
  =============
---
 .../MSwindows/printStack/dummyPrintStack.C    |  7 ++---
 .../POSIX/printStack/dummyPrintStack.C        |  7 ++---
 src/OSspecific/POSIX/printStack/printStack.C  | 27 ++++++++++++++-----
 src/OpenFOAM/db/error/error.H                 | 12 ++++-----
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/OSspecific/MSwindows/printStack/dummyPrintStack.C b/src/OSspecific/MSwindows/printStack/dummyPrintStack.C
index 04b635dbb1..61bf8f63a6 100644
--- a/src/OSspecific/MSwindows/printStack/dummyPrintStack.C
+++ b/src/OSspecific/MSwindows/printStack/dummyPrintStack.C
@@ -5,7 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,11 +30,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::error::safePrintStack(std::ostream& os)
+void Foam::error::safePrintStack(std::ostream& os, int size)
 {}
 
 
-void Foam::error::printStack(Ostream& os)
+void Foam::error::printStack(Ostream& os, int size)
 {}
 
 
diff --git a/src/OSspecific/POSIX/printStack/dummyPrintStack.C b/src/OSspecific/POSIX/printStack/dummyPrintStack.C
index 04b635dbb1..61bf8f63a6 100644
--- a/src/OSspecific/POSIX/printStack/dummyPrintStack.C
+++ b/src/OSspecific/POSIX/printStack/dummyPrintStack.C
@@ -5,7 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,11 +30,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::error::safePrintStack(std::ostream& os)
+void Foam::error::safePrintStack(std::ostream& os, int size)
 {}
 
 
-void Foam::error::printStack(Ostream& os)
+void Foam::error::printStack(Ostream& os, int size)
 {}
 
 
diff --git a/src/OSspecific/POSIX/printStack/printStack.C b/src/OSspecific/POSIX/printStack/printStack.C
index 358ee8e8c0..a492937696 100644
--- a/src/OSspecific/POSIX/printStack/printStack.C
+++ b/src/OSspecific/POSIX/printStack/printStack.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,15 +201,20 @@ inline Foam::fileName whichPath(const char* fn)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::error::safePrintStack(std::ostream& os)
+void Foam::error::safePrintStack(std::ostream& os, int size)
 {
     // Get raw stack symbols
     void *callstack[100];
-    const int size = backtrace(callstack, 100);
+    size = backtrace(callstack, (size > 0 && size < 100) ? size + 1 : 100);
+
     char **strings = backtrace_symbols(callstack, size);
     size_t rdelim;
 
-    for (int i = 0; i < size; ++i)
+    // Frame 0 is 'printStack()' - report something more meaningful
+    os  << "[stack trace]" << std::endl
+        << "=============" << std::endl;
+
+    for (int i = 1; i < size; ++i)
     {
         std::string str(strings[i]);
 
@@ -269,20 +274,26 @@ void Foam::error::safePrintStack(std::ostream& os)
         os  << std::endl;
     }
 
+    os  << "=============" << std::endl;
+
     free(strings);
 }
 
 
-void Foam::error::printStack(Ostream& os)
+void Foam::error::printStack(Ostream& os, int size)
 {
     // Get raw stack symbols
     void *callstack[100];
-    const int size = backtrace(callstack, 100);
+    size = backtrace(callstack, (size > 0 && size < 100) ? size + 1 : 100);
 
     Dl_info info;
     fileName fname;
 
-    for (int i = 0; i < size; ++i)
+    // Frame 0 is 'printStack()' - report something more meaningful
+    os  << "[stack trace]" << nl
+        << "=============" << nl;
+
+    for (int i = 1; i < size; ++i)
     {
         int st = dladdr(callstack[i], &info);
 
@@ -309,6 +320,8 @@ void Foam::error::printStack(Ostream& os)
         printSourceFileAndLine(os, fname, info, callstack[i]);
         os  << nl;
     }
+
+    os  << "=============" << nl;
 }
 
 
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 22fe3ad136..36b5a200bc 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -231,12 +231,12 @@ public:
         operator dictionary() const;
 
 
-        //- Helper function to print a stack,
-        //- used when OpenFOAM IO not yet initialised.
-        static void safePrintStack(std::ostream& os);
+        //- Helper function to print a stack, with optional upper limit.
+        //- Used when OpenFOAM IO not yet initialised.
+        static void safePrintStack(std::ostream& os, int size = -1);
 
-        //- Helper function to print a stack
-        static void printStack(Ostream& os);
+        //- Helper function to print a stack, with optional upper limit.
+        static void printStack(Ostream& os, int size = -1);
 
         //- True if FOAM_ABORT is on.
         static bool useAbort();

From 726787b0d270e420a98fee2aec931016cbfaf296 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Mar 2023 14:56:03 +0100
Subject: [PATCH 146/348] BUG: remove overly optimistic short-cut when reading
 BCs

- had an optimisation to skip attempted reading for zero-sized
  patches. But this leads to inconsistency in the code branching, thus
  removing it.
---
 .../pointPatchFields/basic/value/valuePointPatchField.C       | 4 +---
 .../fields/faPatchFields/basic/mixed/mixedFaPatchField.C      | 4 +---
 .../fields/faPatchFields/faPatchField/faPatchField.C          | 4 +---
 .../fields/faePatchFields/faePatchField/faePatchField.C       | 4 +---
 .../fields/fvPatchFields/basic/mixed/mixedFvPatchField.C      | 4 +---
 .../fields/fvPatchFields/fvPatchField/fvPatchField.C          | 4 +---
 .../fields/fvsPatchFields/fvsPatchField/fvsPatchField.C       | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index 5bbad239ef..e7f1095996 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -38,10 +38,8 @@ bool Foam::valuePointPatchField<Type>::readValueEntry
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = pointPatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = pointPatchFieldBase::patch();
 
 
     const auto* eptr = dict.findEntry("value", keyType::LITERAL);
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index 36defc1d88..bcc81e72e7 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -37,10 +37,8 @@ bool Foam::mixedFaPatchField<Type>::readMixedEntries
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = faPatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = faPatchFieldBase::patch();
 
 
     // If there is a 'refValue', also require all others
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index c1ba7ffb4f..6441d0a4fc 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -39,10 +39,8 @@ bool Foam::faPatchField<Type>::readValueEntry
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = faPatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = faPatchFieldBase::patch();
 
 
     const auto* eptr = dict.findEntry("value", keyType::LITERAL);
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
index 45c84aae51..b843d9fe41 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
@@ -38,10 +38,8 @@ bool Foam::faePatchField<Type>::readValueEntry
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = faePatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = faePatchFieldBase::patch();
 
 
     const auto* eptr = dict.findEntry("value", keyType::LITERAL);
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index e8f4c61efb..80dd0a9718 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -37,10 +37,8 @@ bool Foam::mixedFvPatchField<Type>::readMixedEntries
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = fvPatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = fvPatchFieldBase::patch();
 
 
     // If there is a 'refValue', also require all others
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 5803bce2d3..99e4a31719 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -41,10 +41,8 @@ bool Foam::fvPatchField<Type>::readValueEntry
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = fvPatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = fvPatchFieldBase::patch();
 
 
     const auto* eptr = dict.findEntry("value", keyType::LITERAL);
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 07854658fb..9154558752 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -41,10 +41,8 @@ bool Foam::fvsPatchField<Type>::readValueEntry
     IOobjectOption::readOption readOpt
 )
 {
-    const auto& p = fvsPatchFieldBase::patch();
-
-    if (!p.size()) return true;  // Can be exceptionally lazy
     if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = fvsPatchFieldBase::patch();
 
 
     const auto* eptr = dict.findEntry("value", keyType::LITERAL);

From 4994456a289e82bdf4d6bac09a3c8e65b89c7530 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Mar 2023 12:46:15 +0100
Subject: [PATCH 147/348] ENH: add 2D det() / inv() methods for
 Tensor/SymmTensor (#2724)

- for cases where a 3D tensor is being used to represent 2D content,
  the determinant is zero. Can use inv2D(excludeDirection) to compensate
  and invert as if it were only 2D.

ENH: consistent definitions for magSqr of symmTensors, diagSqr() norm

COMP: return scalar not component type for magSqr

- had inconsistent definitions with SymmTensor returning the component
  type and Tensor returning scalar. Only evident with complex.
---
 .../test/SymmTensor/Test-SymmTensor.C         |   2 +-
 .../test/SymmTensor2D/Test-SymmTensor2D.C     |   2 +-
 applications/test/complex/Test-complex.C      |  69 +++++++
 .../primitives/DiagTensor/DiagTensor.H        |  12 +-
 .../primitives/DiagTensor/DiagTensorI.H       |  30 +++
 .../SphericalTensor/SphericalTensor.H         |  10 +-
 .../SphericalTensor/SphericalTensorI.H        |  15 +-
 .../SphericalTensor2D/SphericalTensor2D.H     |  14 +-
 .../SphericalTensor2D/SphericalTensor2DI.H    |  15 +-
 .../primitives/SymmTensor/SymmTensor.H        |  31 ++-
 .../primitives/SymmTensor/SymmTensorI.H       | 176 ++++++++++++++----
 .../primitives/SymmTensor2D/SymmTensor2D.H    |  16 +-
 .../primitives/SymmTensor2D/SymmTensor2DI.H   |  70 ++++---
 src/OpenFOAM/primitives/Tensor/Tensor.H       |  26 ++-
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 171 ++++++++++++++---
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H   |  14 +-
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H  |  61 ++++--
 17 files changed, 612 insertions(+), 122 deletions(-)

diff --git a/applications/test/SymmTensor/Test-SymmTensor.C b/applications/test/SymmTensor/Test-SymmTensor.C
index d1ea6a0b1d..0d73f4d0d7 100644
--- a/applications/test/SymmTensor/Test-SymmTensor.C
+++ b/applications/test/SymmTensor/Test-SymmTensor.C
@@ -370,7 +370,7 @@ void test_global_funcs(Type)
                                 Type(126)
         )
     );
-    cmp("  Square of Frobenius norm = ", magSqr(sT), Type(205));
+    cmp("  Square of Frobenius norm = ", magSqr(sT), scalar(205));
 }
 
 
diff --git a/applications/test/SymmTensor2D/Test-SymmTensor2D.C b/applications/test/SymmTensor2D/Test-SymmTensor2D.C
index da9b102b5f..315e9e808e 100644
--- a/applications/test/SymmTensor2D/Test-SymmTensor2D.C
+++ b/applications/test/SymmTensor2D/Test-SymmTensor2D.C
@@ -325,7 +325,7 @@ void test_global_funcs(Type)
                      Type(13)
         )
     );
-    cmp("  Square of Frobenius norm = ", magSqr(sT), Type(17.999999999999996));
+    cmp("  Square of Frobenius norm = ", magSqr(sT), scalar(17.999999999999996));
     cmp
     (
         "  Outer-product of a Vector2D with itself = ",
diff --git a/applications/test/complex/Test-complex.C b/applications/test/complex/Test-complex.C
index e8940e07a7..f4875f42ec 100644
--- a/applications/test/complex/Test-complex.C
+++ b/applications/test/complex/Test-complex.C
@@ -34,6 +34,9 @@ Description
 #include "complex.H"
 #include "complexFields.H"
 #include "scalarField.H"
+#include "diagTensor.H"
+#include "symmTensor.H"
+#include "symmTensor2D.H"
 #include "ListOps.H"
 #include "ops.H"
 
@@ -164,6 +167,72 @@ int main(int argc, char *argv[])
             << " => " << imags << nl;
     }
 
+    {
+        SymmTensor<complex> st1(SymmTensor<complex>::uniform({3, 4}));
+
+        Info<< "symmTensor: " << st1 << nl
+            << "  tr: " << tr(st1) << nl
+            << "  diagSqr: " << st1.diagSqr() << nl
+            << "  magSqr: " << magSqr(st1) << nl
+            << "  mag: " << mag(st1) << nl;
+
+        SymmTensor<scalar> st2(SymmTensor<scalar>::uniform(5));
+
+        Info<< "symmTensor: " << st2 << nl
+            << "  tr: " << tr(st2) << nl
+            << "  diagSqr: " << st2.diagSqr() << nl
+            << "  magSqr: " << magSqr(st2) << nl
+            << "  mag: " << mag(st2) << nl;
+
+        st2 = Zero;
+
+        DiagTensor<complex> dt1(SphericalTensor<complex>({3, 4}));
+
+        Info<< "diagTensor: " << dt1 << nl
+            << "  tr: " << tr(dt1) << nl
+            << "  diagSqr: " << dt1.diagSqr() << nl
+            << "  magSqr: " << magSqr(dt1) << nl
+            << "  mag: " << mag(dt1) << nl;
+
+
+        // A bit ugly...
+        st1 = SphericalTensor<complex>({3, 4});
+
+        Info<< "symmTensor: " << st1 << nl
+            << "  tr: " << tr(st1) << nl
+            << "  diagSqr: " << st1.diagSqr() << nl
+            << "  magSqr: " << magSqr(st1) << nl
+            << "  mag: " << mag(st1) << nl;
+    }
+
+    {
+        SymmTensor2D<complex> st1(SymmTensor2D<complex>::uniform({3, 4}));
+
+        Info<< "symmTensor: " << st1 << nl
+            << "  tr: " << tr(st1) << nl
+            << "  diagSqr: " << st1.diagSqr() << nl
+            << "  magSqr: " << magSqr(st1) << nl
+            << "  mag: " << mag(st1) << nl;
+    }
+
+    {
+        Tensor<complex> st1(Tensor<complex>::uniform({3, 4}));
+
+        Info<< "tensor: " << st1 << nl
+            << "  tr: " << tr(st1) << nl
+            << "  diagSqr: " << st1.diagSqr() << nl
+            << "  magSqr: " << magSqr(st1) << nl
+            << "  mag: " << mag(st1) << endl;
+
+        Tensor<scalar> st2(Tensor<scalar>::uniform(5));
+
+        Info<< "Tensor: " << st2 << nl
+            << "  tr: " << tr(st2) << nl
+            << "  diagSqr: " << st2.diagSqr() << nl
+            << "  magSqr: " << magSqr(st2) << nl
+            << "  mag: " << mag(st2) << endl;
+    }
+
     complexField fld1(3, complex(2.0, 1.0));
     complexField fld2(fld1);
 
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index 2f5817037a..c4d141d667 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,7 @@ SourceFiles
 #define Foam_DiagTensor_H
 
 #include "Tensor.H"
+#include "SphericalTensor.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -97,6 +98,9 @@ public:
         template<class Cmpt2>
         inline DiagTensor(const VectorSpace<DiagTensor<Cmpt2>, Cmpt2, 3>&);
 
+        //- Construct given SphericalTensor
+        inline DiagTensor(const SphericalTensor<Cmpt>&);
+
         //- Construct given three components
         inline DiagTensor(const Cmpt& txx, const Cmpt& tyy, const Cmpt& tzz);
 
@@ -115,6 +119,12 @@ public:
         Cmpt& xx() noexcept { return this->v_[XX]; }
         Cmpt& yy() noexcept { return this->v_[YY]; }
         Cmpt& zz() noexcept { return this->v_[ZZ]; }
+
+
+    // Diagonal access and manipulation
+
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 2432ac4d06..e898e8181d 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -49,6 +49,15 @@ inline Foam::DiagTensor<Cmpt>::DiagTensor
 {}
 
 
+template<class Cmpt>
+inline Foam::DiagTensor<Cmpt>::DiagTensor(const SphericalTensor<Cmpt>& st)
+{
+    this->v_[XX] = st.ii();
+    this->v_[YY] = st.ii();
+    this->v_[ZZ] = st.ii();
+}
+
+
 template<class Cmpt>
 inline Foam::DiagTensor<Cmpt>::DiagTensor
 (
@@ -70,6 +79,20 @@ inline Foam::DiagTensor<Cmpt>::DiagTensor(Istream& is)
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::scalar Foam::DiagTensor<Cmpt>::diagSqr() const
+{
+    return
+    (
+        Foam::magSqr(this->xx())
+      + Foam::magSqr(this->yy())
+      + Foam::magSqr(this->zz())
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -138,6 +161,13 @@ inline DiagTensor<Cmpt> diag(const SymmTensor<Cmpt>& st)
 }
 
 
+template<class Cmpt>
+inline Foam::scalar magSqr(const DiagTensor<Cmpt>& t)
+{
+    return t.diagSqr();
+}
+
+
 //- Linear interpolation of diagonal tensors a and b by factor t
 template<class Cmpt>
 inline DiagTensor<Cmpt> lerp
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index 768f239e8d..0dba5685bd 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -124,10 +124,16 @@ public:
         Cmpt& ii() noexcept { return this->v_[II]; }
 
 
+    // Diagonal access and manipulation
+
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
+
+
     // Tensor Operations
 
         //- Return non-Hermitian transpose (no-op)
-        inline const SphericalTensor<Cmpt>& T() const;
+        const SphericalTensor<Cmpt>& T() const noexcept { return *this; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index f7d2f5b387..3f0ed117d2 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -65,10 +65,9 @@ inline Foam::SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Cmpt>
-inline const Foam::SphericalTensor<Cmpt>&
-Foam::SphericalTensor<Cmpt>::T() const
+inline Foam::scalar Foam::SphericalTensor<Cmpt>::diagSqr() const
 {
-    return *this;
+    return 3*Foam::magSqr(this->ii());
 }
 
 
@@ -111,8 +110,8 @@ inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
     if (mag(st.ii()) < VSMALL)
     {
         FatalErrorInFunction
-            << "SphericalTensor is not invertible due to the zero determinant:"
-            << "det(SphericalTensor) = " << det(st)
+            << "SphericalTensor not invertible, determinant:"
+            << det(st) << " tensor:" << st << nl
             << abort(FatalError);
     }
     #endif
@@ -121,11 +120,11 @@ inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
 }
 
 
-//- Return the square of Frobenius norm of a SphericalTensor as a Cmpt
+//- Return the square of Frobenius norm of a SphericalTensor
 template<class Cmpt>
-inline Cmpt magSqr(const SphericalTensor<Cmpt>& st)
+inline Foam::scalar magSqr(const SphericalTensor<Cmpt>& st)
 {
-    return Cmpt(3*mag(st.ii()*st.ii()));
+    return st.diagSqr();
 }
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index e40a4542c2..72936c4a9c 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -121,6 +121,18 @@ public:
         const Cmpt& ii() const noexcept { return this->v_[II]; }
 
         Cmpt& ii() noexcept { return this->v_[II]; }
+
+
+    // Diagonal access and manipulation
+
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
+
+
+    // Tensor Operations
+
+        //- Return non-Hermitian transpose (no-op)
+        const SphericalTensor2D<Cmpt>& T() const noexcept { return *this; }
 };
 
 
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
index 3f3297054a..389637527d 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,6 +61,15 @@ inline Foam::SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline Foam::scalar Foam::SphericalTensor2D<Cmpt>::diagSqr() const
+{
+    return 2*Foam::magSqr(this->ii());
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -100,8 +109,8 @@ inline SphericalTensor2D<Cmpt> inv(const SphericalTensor2D<Cmpt>& st)
     if (mag(st.ii()) < VSMALL)
     {
         FatalErrorInFunction
-            << "SphericalTensor2D is not invertible due to zero determinant:"
-            << "det(SphericalTensor2D) = " << det(st)
+            << "SphericalTensor2D not invertible, determinant:"
+            << det(st) << " tensor:" << st << nl
             << abort(FatalError);
     }
     #endif
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index 45ff7aabac..d3f3f5f88f 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -224,11 +224,38 @@ public:
         //- Set values of the diagonal
         inline void diag(const Vector<Cmpt>& v);
 
+        //- Add to the diagonal
+        inline void addDiag(const Vector<Cmpt>& v);
+
+        //- Subtract from the diagonal
+        inline void subtractDiag(const Vector<Cmpt>& v);
+
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
+
 
     // Tensor Operations
 
         //- Return non-Hermitian transpose
-        inline const SymmTensor<Cmpt>& T() const;
+        const SymmTensor<Cmpt>& T() const noexcept { return *this; }
+
+        //- The determinate
+        inline Cmpt det() const;
+
+        //- The 2D determinant by excluding given direction
+        inline Cmpt det2D(const direction excludeCmpt) const;
+
+        //- Return cofactor matrix
+        inline SymmTensor<Cmpt> cof() const;
+
+        //- Return 2D cofactor matrix by excluding given direction
+        inline SymmTensor<Cmpt> cof2D(const direction excludeCmpt) const;
+
+        //- Return inverse
+        inline SymmTensor<Cmpt> inv() const;
+
+        //- Return inverse of 2D tensor (by excluding given direction)
+        inline SymmTensor<Cmpt> inv2D(const direction excludeCmpt) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index ed665450e7..56ad9eb4c6 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -213,9 +213,129 @@ inline void Foam::SymmTensor<Cmpt>::diag(const Vector<Cmpt>& v)
 
 
 template<class Cmpt>
-inline const Foam::SymmTensor<Cmpt>& Foam::SymmTensor<Cmpt>::T() const
+inline void Foam::SymmTensor<Cmpt>::addDiag(const Vector<Cmpt>& v)
 {
-    return *this;
+    this->v_[XX] += v.x(); this->v_[YY] += v.y(); this->v_[ZZ] += v.z();
+}
+
+
+template<class Cmpt>
+inline void Foam::SymmTensor<Cmpt>::subtractDiag(const Vector<Cmpt>& v)
+{
+    this->v_[XX] -= v.x(); this->v_[YY] -= v.y(); this->v_[ZZ] -= v.z();
+}
+
+
+template<class Cmpt>
+inline Foam::scalar Foam::SymmTensor<Cmpt>::diagSqr() const
+{
+    return
+    (
+        Foam::magSqr(this->xx())
+      + Foam::magSqr(this->yy())
+      + Foam::magSqr(this->zz())
+    );
+}
+
+
+template<class Cmpt>
+inline Cmpt Foam::SymmTensor<Cmpt>::det() const
+{
+    return
+    (
+        xx()*yy()*zz() + xy()*yz()*xz()
+      + xz()*xy()*yz() - xx()*yz()*yz()
+      - xy()*xy()*zz() - xz()*yy()*xz()
+    );
+}
+
+
+template<class Cmpt>
+inline Cmpt Foam::SymmTensor<Cmpt>::det2D(const direction excludeCmpt) const
+{
+    switch (excludeCmpt)
+    {
+        case 0:  // Eliminate x
+        {
+            return (yy()*zz() - yz()*yz());
+        }
+
+        case 1:  // Eliminate y
+        {
+            return (xx()*zz() - xz()*xz());
+        }
+    }
+
+    // Fall-through: Eliminate z
+    return (xx()*yy() - xy()*xy());
+}
+
+
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::cof() const
+{
+    return SymmTensor<Cmpt>
+    (
+        yy()*zz() - yz()*yz(),
+        xz()*yz() - xy()*zz(),
+        xy()*yz() - xz()*yy(),
+
+        xx()*zz() - xz()*xz(),
+        xy()*xz() - xx()*yz(),
+
+        xx()*yy() - xy()*xy()
+    );
+}
+
+
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::cof2D
+(
+    const direction excludeCmpt
+) const
+{
+    switch (excludeCmpt)
+    {
+        case 0:  // Eliminate x
+        {
+            return SymmTensor<Cmpt>
+            (
+                Zero, Zero,  Zero,
+                      zz(), -yz(),
+                             yy()
+            );
+        }
+
+        case 1:  // Eliminate y
+        {
+            return SymmTensor<Cmpt>
+            (
+                zz(), Zero, -xz(),
+                      Zero,  Zero,
+                             xx()
+            );
+        }
+    }
+
+    // Fall-through: Eliminate z
+    return SymmTensor<Cmpt>
+    (
+        yy(), -xy(), Zero,
+               xx(), Zero,
+                     Zero
+    );
+}
+
+
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::inv2D
+(
+    const direction excludeCmpt
+) const
+{
+    const Cmpt detval = this->det2D(excludeCmpt);
+
+    return this->cof2D(excludeCmpt).T()/detval;
 }
 
 
@@ -292,12 +412,7 @@ inline SymmTensor<Cmpt> dev2(const SymmTensor<Cmpt>& st)
 template<class Cmpt>
 inline Cmpt det(const SymmTensor<Cmpt>& st)
 {
-    return
-    (
-        st.xx()*st.yy()*st.zz() + st.xy()*st.yz()*st.xz()
-      + st.xz()*st.xy()*st.yz() - st.xx()*st.yz()*st.yz()
-      - st.xy()*st.xy()*st.zz() - st.xz()*st.yy()*st.xz()
-    );
+    return st.det();
 }
 
 
@@ -305,35 +420,25 @@ inline Cmpt det(const SymmTensor<Cmpt>& st)
 template<class Cmpt>
 inline SymmTensor<Cmpt> cof(const SymmTensor<Cmpt>& st)
 {
-    return SymmTensor<Cmpt>
-    (
-        st.yy()*st.zz() - st.yz()*st.yz(),
-        st.xz()*st.yz() - st.xy()*st.zz(),
-        st.xy()*st.yz() - st.xz()*st.yy(),
-
-        st.xx()*st.zz() - st.xz()*st.xz(),
-        st.xy()*st.xz() - st.xx()*st.yz(),
-
-        st.xx()*st.yy() - st.xy()*st.xy()
-    );
+    return st.cof();
 }
 
 
-//- Return the inverse of a SymmTensor by using the given determinant
+//- Return the inverse of a SymmTensor, using given determinant value
 template<class Cmpt>
-inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detst)
+inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detval)
 {
     #ifdef FULLDEBUG
-    if (mag(detst) < VSMALL)
+    if (mag(detval) < VSMALL)
     {
         FatalErrorInFunction
-            << "SymmTensor is not invertible due to the zero determinant:"
-            << "det(symmTensor) = " << mag(detst)
+            << "SymmTensor not properly invertible, determinant:"
+            << detval << " tensor:" << st << nl
             << abort(FatalError);
     }
     #endif
 
-    return cof(st).T()/detst;
+    return st.cof().T()/detval;
 }
 
 
@@ -341,7 +446,14 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detst)
 template<class Cmpt>
 inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
 {
-    return inv(st, det(st));
+    return inv(st, st.det());
+}
+
+
+template<class Cmpt>
+inline SymmTensor<Cmpt> SymmTensor<Cmpt>::inv() const
+{
+    return Foam::inv(*this, this->det());
 }
 
 
@@ -392,15 +504,15 @@ innerSqr(const SymmTensor<Cmpt>& st)
 }
 
 
-//- Return the square of Frobenius norm of a SymmTensor as a Cmpt
+//- Return the square of Frobenius norm of a SymmTensor
 template<class Cmpt>
-inline Cmpt magSqr(const SymmTensor<Cmpt>& st)
+inline Foam::scalar magSqr(const SymmTensor<Cmpt>& st)
 {
-    return Cmpt
+    return
     (
-        mag(st.xx()*st.xx()) + 2*mag(st.xy()*st.xy()) + 2*mag(st.xz()*st.xz())
-                             +   mag(st.yy()*st.yy()) + 2*mag(st.yz()*st.yz())
-                                                      +   mag(st.zz()*st.zz())
+        magSqr(st.xx()) + 2*magSqr(st.xy()) + 2*magSqr(st.xz())
+                        +   magSqr(st.yy()) + 2*magSqr(st.yz())
+                                            +   magSqr(st.zz())
     );
 }
 
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index a10e93ad4b..1308b015e9 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -140,11 +140,23 @@ public:
         //- Set values of the diagonal
         inline void diag(const Vector2D<Cmpt>& v);
 
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
+
 
     // Tensor Operations
 
         //- Return non-Hermitian transpose
-        inline const SymmTensor2D<Cmpt>& T() const;
+        const SymmTensor2D<Cmpt>& T() const noexcept { return *this; }
+
+        //- The determinate
+        inline Cmpt det() const;
+
+        //- Return cofactor matrix
+        inline SymmTensor2D<Cmpt> cof() const;
+
+        //- Return inverse
+        inline SymmTensor2D<Cmpt> inv() const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
index 5f0ab5fdf0..b583b669c5 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,9 +91,31 @@ inline void Foam::SymmTensor2D<Cmpt>::diag(const Vector2D<Cmpt>& v)
 
 
 template<class Cmpt>
-inline const Foam::SymmTensor2D<Cmpt>& Foam::SymmTensor2D<Cmpt>::T() const
+inline Foam::scalar Foam::SymmTensor2D<Cmpt>::diagSqr() const
 {
-    return *this;
+    return
+    (
+        Foam::magSqr(this->xx())
+      + Foam::magSqr(this->yy())
+    );
+}
+
+
+template<class Cmpt>
+inline Cmpt Foam::SymmTensor2D<Cmpt>::det() const
+{
+    return (xx()*yy() - xy()*xy());
+}
+
+
+template<class Cmpt>
+inline Foam::SymmTensor2D<Cmpt> Foam::SymmTensor2D<Cmpt>::cof() const
+{
+    return SymmTensor2D<Cmpt>
+    (
+        yy(), -yx(),
+               xx()
+    );
 }
 
 
@@ -172,7 +194,7 @@ inline SymmTensor2D<Cmpt> dev2(const SymmTensor2D<Cmpt>& st)
 template<class Cmpt>
 inline Cmpt det(const SymmTensor2D<Cmpt>& st)
 {
-    return (st.xx()*st.yy() - st.xy()*st.xy());
+    return st.det();
 }
 
 
@@ -180,29 +202,25 @@ inline Cmpt det(const SymmTensor2D<Cmpt>& st)
 template<class Cmpt>
 inline SymmTensor2D<Cmpt> cof(const SymmTensor2D<Cmpt>& st)
 {
-    return SymmTensor2D<Cmpt>
-    (
-        st.yy(), -st.yx(),
-                  st.xx()
-    );
+    return st.cof();
 }
 
 
-//- Return the inverse of a SymmTensor2D using a given determinant
+//- Return the inverse of a SymmTensor2D, using given determinant value
 template<class Cmpt>
-inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st, const Cmpt detst)
+inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st, const Cmpt detval)
 {
     #ifdef FULLDEBUG
-    if (mag(detst) < SMALL)
+    if (mag(detval) < SMALL)
     {
         FatalErrorInFunction
-            << "SymmTensor2D is not invertible due to the zero determinant:"
-            << "det(SymmTensor2D) = " << mag(detst)
+            << "SymmTensor2D not properly invertible, determinant:"
+            << detval << " tensor:" << st << nl
             << abort(FatalError);
     }
     #endif
-    // cofactor and adjugate matrices of SymmTensor are the same, hence no .T()
-    return cof(st)/detst;
+
+    return st.cof().T()/detval;
 }
 
 
@@ -210,7 +228,15 @@ inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st, const Cmpt detst)
 template<class Cmpt>
 inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st)
 {
-    return inv(st, det(st));
+    return inv(st, st.det());
+}
+
+
+// The inverse of this SymmTensor2D
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> SymmTensor2D<Cmpt>::inv() const
+{
+    return Foam::inv(*this, this->det());
 }
 
 
@@ -244,14 +270,14 @@ innerSqr(const SymmTensor2D<Cmpt>& st)
 }
 
 
-//- Return the square of Frobenius norm of a SymmTensor2D as a Cmpt
+//- Return the square of Frobenius norm of a SymmTensor2D
 template<class Cmpt>
-inline Cmpt magSqr(const SymmTensor2D<Cmpt>& st)
+inline Foam::scalar magSqr(const SymmTensor2D<Cmpt>& st)
 {
-    return Cmpt
+    return
     (
-        mag(st.xx()*st.xx()) + 2*mag(st.xy()*st.xy())
-                             +   mag(st.yy()*st.yy())
+        magSqr(st.xx()) + 2*magSqr(st.xy())
+                        +   magSqr(st.yy())
     );
 }
 
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index dfcb5b1c10..eac4435f94 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -260,6 +260,15 @@ public:
         //- Set values of the diagonal
         inline void diag(const Vector<Cmpt>& v);
 
+        //- Add to the diagonal
+        inline void addDiag(const Vector<Cmpt>& v);
+
+        //- Subtract from the diagonal
+        inline void subtractDiag(const Vector<Cmpt>& v);
+
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
+
 
     // Characteristics
 
@@ -272,9 +281,24 @@ public:
         //- Return non-Hermitian transpose
         inline Tensor<Cmpt> T() const;
 
+        //- The determinate
+        inline Cmpt det() const;
+
+        //- The 2D determinant by excluding given direction
+        inline Cmpt det2D(const direction excludeCmpt) const;
+
+        //- Return cofactor matrix
+        inline Tensor<Cmpt> cof() const;
+
+        //- Return 2D cofactor matrix by excluding given direction
+        inline Tensor<Cmpt> cof2D(const direction excludeCmpt) const;
+
         //- Return inverse
         inline Tensor<Cmpt> inv() const;
 
+        //- Return inverse of 2D tensor (by excluding given direction)
+        inline Tensor<Cmpt> inv2D(const direction excludeCmpt) const;
+
         //- Inner-product of this with another Tensor.
         inline Tensor<Cmpt> inner(const Tensor<Cmpt>& t2) const;
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 19173ee725..a0254112bb 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -379,6 +379,32 @@ inline void Foam::Tensor<Cmpt>::diag(const Vector<Cmpt>& v)
 }
 
 
+template<class Cmpt>
+inline void Foam::Tensor<Cmpt>::addDiag(const Vector<Cmpt>& v)
+{
+    this->v_[XX] += v.x(); this->v_[YY] += v.y(); this->v_[ZZ] += v.z();
+}
+
+
+template<class Cmpt>
+inline void Foam::Tensor<Cmpt>::subtractDiag(const Vector<Cmpt>& v)
+{
+    this->v_[XX] -= v.x(); this->v_[YY] -= v.y(); this->v_[ZZ] -= v.z();
+}
+
+
+template<class Cmpt>
+inline Foam::scalar Foam::Tensor<Cmpt>::diagSqr() const
+{
+    return
+    (
+        Foam::magSqr(this->xx())
+      + Foam::magSqr(this->yy())
+      + Foam::magSqr(this->zz())
+    );
+}
+
+
 template<class Cmpt>
 inline bool Foam::Tensor<Cmpt>::is_identity(const scalar tol) const
 {
@@ -408,6 +434,110 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::T() const
 }
 
 
+template<class Cmpt>
+inline Cmpt Foam::Tensor<Cmpt>::det() const
+{
+    return
+    (
+        xx()*yy()*zz() + xy()*yz()*zx()
+      + xz()*yx()*zy() - xx()*yz()*zy()
+      - xy()*yx()*zz() - xz()*yy()*zx()
+    );
+}
+
+
+template<class Cmpt>
+inline Cmpt Foam::Tensor<Cmpt>::det2D(const direction excludeCmpt) const
+{
+    switch (excludeCmpt)
+    {
+        case 0:  // Eliminate x
+        {
+            return (yy()*zz() - yz()*zy());
+        }
+
+        case 1:  // Eliminate y
+        {
+            return (xx()*zz() - xz()*zx());
+        }
+    }
+
+    // Fall-through: Eliminate z
+    return (xx()*yy() - xy()*yx());
+}
+
+
+template<class Cmpt>
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof() const
+{
+    return Tensor<Cmpt>
+    (
+        yy()*zz() - zy()*yz(),
+        zx()*yz() - yx()*zz(),
+        yx()*zy() - yy()*zx(),
+
+        xz()*zy() - xy()*zz(),
+        xx()*zz() - xz()*zx(),
+        xy()*zx() - xx()*zy(),
+
+        xy()*yz() - xz()*yy(),
+        yx()*xz() - xx()*yz(),
+        xx()*yy() - yx()*xy()
+    );
+}
+
+
+template<class Cmpt>
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof2D
+(
+    const direction excludeCmpt
+) const
+{
+    switch (excludeCmpt)
+    {
+        case 0:  // Eliminate x
+        {
+            return Tensor<Cmpt>
+            (
+                Zero,  Zero,  Zero,
+                Zero,  zz(), -zy(),
+                Zero, -yz(),  yy()
+            );
+        }
+
+        case 1:  // Eliminate y
+        {
+            return Tensor<Cmpt>
+            (
+                zz(), Zero, -zx(),
+                Zero, Zero,  Zero,
+               -xz(), Zero,  xx()
+            );
+        }
+    }
+
+    // Fall-through: Eliminate z
+    return Tensor<Cmpt>
+    (
+        yy(), -yx(), Zero,
+       -xy(),  xx(), Zero,
+        Zero,  Zero, Zero
+    );
+}
+
+
+template<class Cmpt>
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::inv2D
+(
+    const direction excludeCmpt
+) const
+{
+    const Cmpt detval = this->det2D(excludeCmpt);
+
+    return this->cof2D(excludeCmpt).T()/detval;
+}
+
+
 template<class Cmpt>
 inline Foam::Tensor<Cmpt>
 Foam::Tensor<Cmpt>::inner(const Tensor<Cmpt>& t2) const
@@ -594,12 +724,7 @@ inline Tensor<Cmpt> dev2(const Tensor<Cmpt>& t)
 template<class Cmpt>
 inline Cmpt det(const Tensor<Cmpt>& t)
 {
-    return
-    (
-        t.xx()*t.yy()*t.zz() + t.xy()*t.yz()*t.zx()
-      + t.xz()*t.yx()*t.zy() - t.xx()*t.yz()*t.zy()
-      - t.xy()*t.yx()*t.zz() - t.xz()*t.yy()*t.zx()
-    );
+    return t.det();
 }
 
 
@@ -607,39 +732,24 @@ inline Cmpt det(const Tensor<Cmpt>& t)
 template<class Cmpt>
 inline Tensor<Cmpt> cof(const Tensor<Cmpt>& t)
 {
-    return Tensor<Cmpt>
-    (
-        t.yy()*t.zz() - t.zy()*t.yz(),
-        t.zx()*t.yz() - t.yx()*t.zz(),
-        t.yx()*t.zy() - t.yy()*t.zx(),
-
-        t.xz()*t.zy() - t.xy()*t.zz(),
-        t.xx()*t.zz() - t.xz()*t.zx(),
-        t.xy()*t.zx() - t.xx()*t.zy(),
-
-        t.xy()*t.yz() - t.xz()*t.yy(),
-        t.yx()*t.xz() - t.xx()*t.yz(),
-        t.xx()*t.yy() - t.yx()*t.xy()
-    );
+    return t.cof();
 }
 
 
-//- Return the inverse of a Tensor by using the given determinant
+//- Return the inverse of a Tensor, using the given determinant value
 template<class Cmpt>
-inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt dett)
+inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt detval)
 {
     #ifdef FULLDEBUG
-    if (mag(dett) < VSMALL)
+    if (mag(detval) < VSMALL)
     {
         FatalErrorInFunction
-            << "Tensor is not invertible due to the (almost) zero determinant:"
-            << "    Tensor = " << t << nl
-            << "    det(Tensor) = " << dett
-            << abort(FatalError);
+            << "Tensor not properly invertible, determinant:"
+            << detval << " tensor:" << t << nl
     }
     #endif
 
-    return cof(t).T()/dett;
+    return t.cof().T()/detval;
 }
 
 
@@ -647,15 +757,14 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt dett)
 template<class Cmpt>
 inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
 {
-    return inv(t, det(t));
+    return inv(t, t.det());
 }
 
 
-//- Return the inverse of this Tensor
 template<class Cmpt>
 inline Tensor<Cmpt> Tensor<Cmpt>::inv() const
 {
-    return Foam::inv(*this);
+    return Foam::inv(*this, this->det());
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index 079aa9501a..f12b68104f 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -200,12 +200,24 @@ public:
         //- Set values of the diagonal
         inline void diag(const Vector2D<Cmpt>& v);
 
+        //- The L2-norm squared of the diagonal
+        inline scalar diagSqr() const;
+
 
     // Tensor Operations
 
         //- Return non-Hermitian transpose
         inline Tensor2D<Cmpt> T() const;
 
+        //- The determinate
+        inline Cmpt det() const;
+
+        //- Return cofactor matrix
+        inline Tensor2D<Cmpt> cof() const;
+
+        //- Return inverse
+        inline Tensor2D<Cmpt> inv() const;
+
         //- Inner-product of this with another Tensor2D.
         inline Tensor2D<Cmpt> inner(const Tensor2D<Cmpt>& t2) const;
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index 178ad48496..9367f4c82b 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -286,6 +286,17 @@ inline void Foam::Tensor2D<Cmpt>::diag(const Vector2D<Cmpt>& v)
 }
 
 
+template<class Cmpt>
+inline Foam::scalar Foam::Tensor2D<Cmpt>::diagSqr() const
+{
+    return
+    (
+        Foam::magSqr(this->xx())
+      + Foam::magSqr(this->yy())
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Member Operations * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -299,6 +310,24 @@ inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::T() const
 }
 
 
+template<class Cmpt>
+inline Cmpt Foam::Tensor2D<Cmpt>::det() const
+{
+    return (xx()*yy() - xy()*yx());
+}
+
+
+template<class Cmpt>
+inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::cof() const
+{
+    return Tensor2D<Cmpt>
+    (
+        yy(), -yx(),
+       -xy(),  xx()
+    );
+}
+
+
 template<class Cmpt>
 inline Foam::Tensor2D<Cmpt>
 Foam::Tensor2D<Cmpt>::inner(const Tensor2D<Cmpt>& t2) const
@@ -430,7 +459,7 @@ inline Tensor2D<Cmpt> dev2(const Tensor2D<Cmpt>& t)
 template<class Cmpt>
 inline Cmpt det(const Tensor2D<Cmpt>& t)
 {
-    return t.xx()*t.yy() - t.xy()*t.yx();
+    return t.det();
 }
 
 
@@ -438,29 +467,25 @@ inline Cmpt det(const Tensor2D<Cmpt>& t)
 template<class Cmpt>
 inline Tensor2D<Cmpt> cof(const Tensor2D<Cmpt>& t)
 {
-    return Tensor2D<Cmpt>
-    (
-        t.yy(), -t.yx(),
-       -t.xy(),  t.xx()
-    );
+    return t.cof();
 }
 
 
-//- Return the inverse of a Tensor2D using a given determinant
+//- Return the inverse of a Tensor2D, using given determinant value
 template<class Cmpt>
-inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt dett)
+inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt detval)
 {
     #ifdef FULLDEBUG
-    if (mag(dett) < SMALL)
+    if (mag(detval) < SMALL)
     {
         FatalErrorInFunction
-            << "Tensor2D is not invertible due to the zero determinant:"
-            << "det(Tensor2D) = " << mag(dett)
+            << "Tensor2D not properly invertible, determinant:"
+            << detval << " tensor:" << t << nl
             << abort(FatalError);
     }
     #endif
 
-    return cof(t).T()/dett;
+    return t.cof().T()/detval;
 }
 
 
@@ -468,7 +493,15 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt dett)
 template<class Cmpt>
 inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t)
 {
-    return inv(t, det(t));
+    return inv(t, t.det());
+}
+
+
+// Return the inverse of this Tensor2D
+template<class Cmpt>
+inline Tensor2D<Cmpt> Tensor2D<Cmpt>::inv() const
+{
+    return Foam::inv(*this, this->det());
 }
 
 

From 66cae2b9d124caad78ea6d2321d8e85343aec67b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Mar 2023 22:58:31 +0100
Subject: [PATCH 148/348] ENH: robuster handling inv() of singular tensor for
 finite-area LSQ (#2724)

- with the current handling of small edges (finite-area), the LSQ
  vectors can result in singular/2D tensors. However, the regular
  2D handling in field inv() only detects based on the first element.

  Provide a 'failsafe' inv() method for symmTensor and tensor that
  follows a similar logic for avoiding zero determinates, but it is
  applied on a per element basis, instead of deciding based on the
  first field element.

  The symmTensor::inv(bool) and tensor::inv(bool) methods have a
  fairly modest additional overhead.

- unroll the field inv() function to avoid creating an intermediate
  field.  Reduce the number of operations when adjusting/re-adjusting
  the diagonal.
---
 .../Fields/symmTensorField/symmTensorField.C  | 59 +++++++++++--------
 .../fields/Fields/tensorField/tensorField.C   | 53 ++++++++++-------
 .../primitives/SymmTensor/SymmTensor.H        |  5 +-
 .../primitives/SymmTensor/SymmTensorI.H       | 52 +++++++++++++++-
 src/OpenFOAM/primitives/Tensor/Tensor.H       |  5 +-
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 53 ++++++++++++++++-
 .../leastSquaresFaVectors.C                   | 28 +++++++--
 7 files changed, 199 insertions(+), 56 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index d71bafa5e5..1be5183d4c 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,41 +51,54 @@ UNARY_FUNCTION(symmTensor, symmTensor, dev2)
 UNARY_FUNCTION(scalar, symmTensor, det)
 UNARY_FUNCTION(symmTensor, symmTensor, cof)
 
-void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
+void inv(Field<symmTensor>& result, const UList<symmTensor>& tf1)
 {
-    if (tf.empty())
+    if (result.empty() || tf1.empty())
     {
         return;
     }
 
     // Attempting to identify 2-D cases
-    const scalar minThreshold = SMALL*magSqr(tf1[0]);
-    const Vector<bool> removeCmpts
-    (
-        magSqr(tf1[0].xx()) < minThreshold,
-        magSqr(tf1[0].yy()) < minThreshold,
-        magSqr(tf1[0].zz()) < minThreshold
-    );
+    const scalar minThreshold = SMALL * magSqr(tf1[0]);
 
-    if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
+    const bool small_xx = (magSqr(tf1[0].xx()) < minThreshold);
+    const bool small_yy = (magSqr(tf1[0].yy()) < minThreshold);
+    const bool small_zz = (magSqr(tf1[0].zz()) < minThreshold);
+
+    if (small_xx || small_yy || small_zz)
     {
-        symmTensor adjust(Zero);
+        const vector adjust
+        (
+            (small_xx ? 1 : 0),
+            (small_yy ? 1 : 0),
+            (small_zz ? 1 : 0)
+        );
 
-        if (removeCmpts.x()) adjust.xx() = 1;
-        if (removeCmpts.y()) adjust.yy() = 1;
-        if (removeCmpts.z()) adjust.zz() = 1;
+        // Cannot use TFOR_ALL_F_OP_FUNC_F (additional operations)
 
-        symmTensorField tf1Plus(tf1);
+        const label loopLen = (result).size();
 
-        tf1Plus += adjust;
+        /* pragmas... */
+        for (label i = 0; i < loopLen; ++i)
+        {
+            symmTensor work(tf1[i]);
+            work.addDiag(adjust);
 
-        TFOR_ALL_F_OP_FUNC_F(symmTensor, tf, =, inv, symmTensor, tf1Plus)
-
-        tf -= adjust;
+            result[i] = Foam::inv(work);
+            result[i].subtractDiag(adjust);
+        }
     }
     else
     {
-        TFOR_ALL_F_OP_FUNC_F(symmTensor, tf, =, inv, symmTensor, tf1)
+        // Same as TFOR_ALL_F_OP_FUNC_F
+
+        const label loopLen = (result).size();
+
+        /* pragmas... */
+        for (label i = 0; i < loopLen; ++i)
+        {
+            result[i] = Foam::inv(tf1[i]);
+        }
     }
 }
 
@@ -104,6 +117,8 @@ tmp<symmTensorField> inv(const tmp<symmTensorField>& tf)
     return tresult;
 }
 
+UNARY_FUNCTION(symmTensor, symmTensor, pinv)
+
 
 template<>
 tmp<Field<symmTensor>> transformFieldMask<symmTensor>
@@ -144,8 +159,6 @@ tmp<Field<symmTensor>> transformFieldMask<symmTensor>
     return tstf;
 }
 
-UNARY_FUNCTION(symmTensor, symmTensor, pinv)
-
 
 // * * * * * * * * * * * * * * * global operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 43eb0b8493..c4f76fc978 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -50,41 +50,54 @@ UNARY_FUNCTION(tensor, tensor, dev2)
 UNARY_FUNCTION(scalar, tensor, det)
 UNARY_FUNCTION(tensor, tensor, cof)
 
-void inv(Field<tensor>& tf, const UList<tensor>& tf1)
+void inv(Field<tensor>& result, const UList<tensor>& tf1)
 {
-    if (tf.empty())
+    if (result.empty() || tf1.empty())
     {
         return;
     }
 
     // Attempting to identify 2-D cases
-    const scalar minThreshold = SMALL*magSqr(tf1[0]);
-    const Vector<bool> removeCmpts
-    (
-        magSqr(tf1[0].xx()) < minThreshold,
-        magSqr(tf1[0].yy()) < minThreshold,
-        magSqr(tf1[0].zz()) < minThreshold
-    );
+    const scalar minThreshold = SMALL * magSqr(tf1[0]);
 
-    if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
+    const bool small_xx = (magSqr(tf1[0].xx()) < minThreshold);
+    const bool small_yy = (magSqr(tf1[0].yy()) < minThreshold);
+    const bool small_zz = (magSqr(tf1[0].zz()) < minThreshold);
+
+    if (small_xx || small_yy || small_zz)
     {
-        tensor adjust(Zero);
+        const vector adjust
+        (
+            (small_xx ? 1 : 0),
+            (small_yy ? 1 : 0),
+            (small_zz ? 1 : 0)
+        );
 
-        if (removeCmpts.x()) adjust.xx() = 1;
-        if (removeCmpts.y()) adjust.yy() = 1;
-        if (removeCmpts.z()) adjust.zz() = 1;
+        // Cannot use TFOR_ALL_F_OP_FUNC_F (additional operations)
 
-        tensorField tf1Plus(tf1);
+        const label loopLen = (result).size();
 
-        tf1Plus += adjust;
+        /* pragmas... */
+        for (label i = 0; i < loopLen; ++i)
+        {
+            tensor work(tf1[i]);
+            work.addDiag(adjust);
 
-        TFOR_ALL_F_OP_FUNC_F(tensor, tf, =, inv, tensor, tf1Plus)
-
-        tf -= adjust;
+            result[i] = Foam::inv(work);
+            result[i].subtractDiag(adjust);
+        }
     }
     else
     {
-        TFOR_ALL_F_OP_FUNC_F(tensor, tf, =, inv, tensor, tf1)
+        // Same as TFOR_ALL_F_OP_FUNC_F
+
+        const label loopLen = (result).size();
+
+        /* pragmas... */
+        for (label i = 0; i < loopLen; ++i)
+        {
+            result[i] = Foam::inv(tf1[i]);
+        }
     }
 }
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index d3f3f5f88f..e365081023 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -251,8 +251,9 @@ public:
         //- Return 2D cofactor matrix by excluding given direction
         inline SymmTensor<Cmpt> cof2D(const direction excludeCmpt) const;
 
-        //- Return inverse
-        inline SymmTensor<Cmpt> inv() const;
+        //- Return inverse, with optional (ad hoc) failsafe handling
+        //- of 2D tensors
+        inline SymmTensor<Cmpt> inv(const bool failsafe=false) const;
 
         //- Return inverse of 2D tensor (by excluding given direction)
         inline SymmTensor<Cmpt> inv2D(const direction excludeCmpt) const;
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 56ad9eb4c6..47c10fa13b 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -451,9 +451,57 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
 
 
 template<class Cmpt>
-inline SymmTensor<Cmpt> SymmTensor<Cmpt>::inv() const
+inline SymmTensor<Cmpt> SymmTensor<Cmpt>::inv(const bool failsafe) const
 {
-    return Foam::inv(*this, this->det());
+    const Cmpt detval = this->det();
+
+    if (failsafe)
+    {
+        // Attempt to identify and handle 2-D cases.
+        // - use diagSqr instead of magSqr for fewer operations
+        const scalar magSqr_xx = Foam::magSqr(xx());
+        const scalar magSqr_yy = Foam::magSqr(yy());
+        const scalar magSqr_zz = Foam::magSqr(zz());
+
+        const scalar threshold = SMALL * (magSqr_xx + magSqr_yy + magSqr_zz);
+
+        const bool small_xx = (magSqr_xx < threshold);
+        const bool small_yy = (magSqr_yy < threshold);
+        const bool small_zz = (magSqr_zz < threshold);
+
+        if (small_xx || small_yy || small_zz)
+        {
+            SymmTensor<Cmpt> work(*this);
+
+            if (small_xx) { work.xx() += pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() += pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() += pTraits<Cmpt>::one; }
+
+            work = Foam::inv(work, work.det());
+
+            if (small_xx) { work.xx() -= pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() -= pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() -= pTraits<Cmpt>::one; }
+
+            return work;
+        }
+        else if (mag(detval) < VSMALL)
+        {
+            // Really appears to be zero - leave untouched?
+            return SymmTensor<Cmpt>(Zero);
+        }
+    }
+    #ifdef FULLDEBUG
+    else if (mag(detval) < VSMALL)
+    {
+        FatalErrorInFunction
+            << "Tensor not properly invertible, determinant:"
+            << detval << " tensor:" << *this << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->cof().T()/detval;
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index eac4435f94..7391d06865 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -293,8 +293,9 @@ public:
         //- Return 2D cofactor matrix by excluding given direction
         inline Tensor<Cmpt> cof2D(const direction excludeCmpt) const;
 
-        //- Return inverse
-        inline Tensor<Cmpt> inv() const;
+        //- Return inverse, with optional (ad hoc) failsafe handling
+        //- of 2D tensors
+        inline Tensor<Cmpt> inv(const bool failsafe=false) const;
 
         //- Return inverse of 2D tensor (by excluding given direction)
         inline Tensor<Cmpt> inv2D(const direction excludeCmpt) const;
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index a0254112bb..ec6997262a 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -762,9 +762,58 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
 
 
 template<class Cmpt>
-inline Tensor<Cmpt> Tensor<Cmpt>::inv() const
+inline Tensor<Cmpt> Tensor<Cmpt>::inv(const bool failsafe) const
 {
-    return Foam::inv(*this, this->det());
+    const Cmpt detval = this->det();
+
+    if (failsafe)
+    {
+        // Attempt to identify and handle 2-D cases
+        // - use diagSqr instead of magSqr for fewer operations
+
+        const scalar magSqr_xx = Foam::magSqr(xx());
+        const scalar magSqr_yy = Foam::magSqr(yy());
+        const scalar magSqr_zz = Foam::magSqr(zz());
+
+        const scalar threshold = SMALL * (magSqr_xx + magSqr_yy + magSqr_zz);
+
+        const bool small_xx = (magSqr_xx < threshold);
+        const bool small_yy = (magSqr_yy < threshold);
+        const bool small_zz = (magSqr_zz < threshold);
+
+        if (small_xx || small_yy || small_zz)
+        {
+            Tensor<Cmpt> work(*this);
+
+            if (small_xx) { work.xx() += pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() += pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() += pTraits<Cmpt>::one; }
+
+            work = Foam::inv(work, work.det());
+
+            if (small_xx) { work.xx() -= pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() -= pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() -= pTraits<Cmpt>::one; }
+
+            return work;
+        }
+        else if (mag(detval) < VSMALL)
+        {
+            // Really appears to be zero - leave untouched?
+            return Tensor<Cmpt>(Zero);
+        }
+    }
+    #ifdef FULLDEBUG
+    else if (mag(detval) < VSMALL)
+    {
+        FatalErrorInFunction
+            << "Tensor not properly invertible, determinant:"
+            << detval << " tensor:" << *this << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->cof().T()/detval;
 }
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
index ebcd3d6d64..f2bd352bbd 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,7 +81,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
         mesh(),
         dimensionedVector(dimless/dimLength, Zero)
     );
-    edgeVectorField& lsP = *pVectorsPtr_;
+    auto& lsP = *pVectorsPtr_;
 
     nVectorsPtr_ = new edgeVectorField
     (
@@ -97,7 +97,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
         mesh(),
         dimensionedVector(dimless/dimLength, Zero)
     );
-    edgeVectorField& lsN = *nVectorsPtr_;
+    auto& lsN = *nVectorsPtr_;
 
     // Set local references to mesh data
     const labelUList& owner = mesh().owner();
@@ -148,8 +148,26 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
     }
 
 
-    // Invert the dd tensor
-    const symmTensorField invDd(inv(dd));
+    // Invert the dd tensor.
+
+    // Cannot rely on the usual field inv() since that only uses the
+    // first element to guess if the remaining tensors are 2D (or
+    // singular). We, however, can have a mixture (eg, skipping over
+    // zero-length edges can yield a zero). Instead use the
+    // 'failsafe' inv() that checks each tensor (#2724)
+
+    // Fragile:  const symmTensorField invDd(inv(dd));
+
+    symmTensorField invDd(dd.size());
+    {
+        const label loopLen = dd.size();
+
+        /* pragmas... */
+        for (label i = 0; i < loopLen; ++i)
+        {
+            invDd[i] = dd[i].inv(true);  // With 'failsafe' handling
+        }
+    }
 
 
     // Revisit all faces and calculate the lsP and lsN vectors

From f903707e4a50b1d7c83f96c397d71ecca45c8d56 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 23 Mar 2023 11:03:56 +0100
Subject: [PATCH 149/348] STYLE: Allwmake report api/patch directly from
 META-INFO

- avoid dependency on etc/openfoam (location may change)
---
 Allwmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Allwmake b/Allwmake
index d34b3665ec..514b42e321 100755
--- a/Allwmake
+++ b/Allwmake
@@ -96,10 +96,12 @@ echo "  ${WM_PROJECT_DIR##*/}"
 echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo
-echo "  api   = $(etc/openfoam -show-api 2>/dev/null)"
-echo "  patch = $(etc/openfoam -show-patch 2>/dev/null)"
-echo "  bin   = $(_foamCountDirEntries "$FOAM_APPBIN") entries"
-echo "  lib   = $(_foamCountDirEntries "$FOAM_LIBBIN") entries"
+
+# The api/patch information
+sed -e 's/^/  /; s/=/ = /' ./META-INFO/api-info 2>/dev/null || true
+
+echo "  bin = $(_foamCountDirEntries "$FOAM_APPBIN") entries"
+echo "  lib = $(_foamCountDirEntries "$FOAM_LIBBIN") entries"
 echo
 echo ========================================
 

From b339be24592b2e0d98632fdd7339a0e4bfe06444 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 23 Feb 2023 13:22:19 +0000
Subject: [PATCH 150/348] BUG: GAMG: avoid inter-level interpolation. Fixes
 #2710

---
 .../lduMatrix/solvers/GAMG/GAMGSolverSolve.C        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index 58076216e3..cdba91572e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2021,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -347,8 +347,17 @@ void Foam::GAMGSolver::Vcycle
 
             if (interpolateCorrection_) //&& leveli < coarsestLevel - 2)
             {
-                if (coarseCorrFields.set(leveli+1))
+                if
+                (
+                    coarseCorrFields.set(leveli+1)
+                 && (
+                        matrixLevels_[leveli].mesh().comm()
+                     == matrixLevels_[leveli+1].mesh().comm()
+                    )
+                )
                 {
+                    // Normal operation : have both coarse level and fine
+                    // level. No processor agglomeration
                     interpolate
                     (
                         coarseCorrFields[leveli],

From ddf9d528e254bc0d499a7c01c7c6a40581298cc4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 29 Mar 2023 14:32:08 +0100
Subject: [PATCH 151/348] COMP: TensorI.H: missing ;

---
 src/OpenFOAM/primitives/Tensor/TensorI.H | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index ec6997262a..6e24c0f506 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -746,6 +746,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt detval)
         FatalErrorInFunction
             << "Tensor not properly invertible, determinant:"
             << detval << " tensor:" << t << nl
+            << abort(FatalError);
     }
     #endif
 

From bd1e1ec9c7dd6d101f9f7ce3c055522d439c5a36 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 31 Mar 2023 08:59:31 +0100
Subject: [PATCH 152/348] ENH: uniformFixedValue: avoid unallocated autoPtr
 error

---
 .../uniformFixedValueFvPatchField.C           | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 6f75c96bec..c1ba993d44 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -130,7 +130,11 @@ void Foam::uniformFixedValueFvPatchField<Type>::autoMap
 )
 {
     fixedValueFvPatchField<Type>::autoMap(mapper);
-    refValueFunc_().autoMap(mapper);
+
+    if (refValueFunc_)
+    {
+        refValueFunc_().autoMap(mapper);
+    }
 
     if (refValueFunc_().constant())
     {
@@ -152,7 +156,10 @@ void Foam::uniformFixedValueFvPatchField<Type>::rmap
     const uniformFixedValueFvPatchField& tiptf =
         refCast<const uniformFixedValueFvPatchField>(ptf);
 
-    refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
+    if (refValueFunc_)
+    {
+        refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
+    }
 }
 
 
@@ -174,7 +181,12 @@ template<class Type>
 void Foam::uniformFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-    refValueFunc_->writeData(os);
+
+    if (refValueFunc_)
+    {
+        refValueFunc_->writeData(os);
+    }
+
     fvPatchField<Type>::writeValueEntry(os);
 }
 

From 87eed5e3b83de5d317fc025eae50c818cf23a77f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 23 Mar 2023 16:27:32 +0100
Subject: [PATCH 153/348] ENH: place more patch field attributes under template
 invariant Base

- attributes such as assignable(), coupled() etc

- common patchField types: calculatedType(), zeroGradientType() etc.
  This simplifies reference to these types without actually needing a
  typed patchField version.

ENH: add some basic patchField types to fieldTypes namespace

- allows more general use of the names

ENH: set extrapolated/calculated from patchInternalField directly

- avoids intermediate tmp
---
 .../T/smoluchowskiJumpTFvPatchScalarField.C   |  3 +-
 .../tractionDisplacementFvPatchVectorField.C  |  4 +-
 ...DisplacementCorrectionFvPatchVectorField.C |  4 +-
 .../test/pointField/Test-PointField.C         |  8 +-
 src/OpenFOAM/fields/Fields/fieldTypes.C       | 25 +++++-
 src/OpenFOAM/fields/Fields/fieldTypes.H       | 48 +++++++++--
 .../calculated/calculatedPointPatchField.C    |  9 --
 .../calculated/calculatedPointPatchField.H    |  3 +-
 .../fixedValue/fixedValuePointPatchField.H    | 13 +--
 .../zeroGradientPointPatchField.C             |  9 --
 .../zeroGradientPointPatchField.H             |  2 +-
 .../constraint/empty/emptyPointPatchField.H   |  7 +-
 .../pointPatchField/pointPatchField.H         | 72 +++++++++-------
 .../fixedShearStressFvPatchVectorField.C      |  2 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |  2 +-
 .../omegaWallFunctionFvPatchScalarField.C     |  2 +-
 ...entHeatFluxTemperatureFvPatchScalarField.C |  4 +-
 .../freeSurfaceVelocityFvPatchVectorField.C   |  2 +-
 .../basic/calculated/calculatedFaPatchField.C |  9 --
 .../basic/calculated/calculatedFaPatchField.H | 15 +---
 .../extrapolatedCalculatedFaPatchField.C      |  3 +-
 .../extrapolatedCalculatedFaPatchField.H      |  1 +
 .../basic/fixedValue/fixedValueFaPatchField.H | 13 +--
 .../basic/mixed/mixedFaPatchField.H           | 13 +--
 .../basic/sliced/slicedFaPatchField.H         |  4 +-
 .../zeroGradient/zeroGradientFaPatchField.C   | 12 +--
 .../zeroGradient/zeroGradientFaPatchField.H   | 14 ++--
 .../clampedPlate/clampedPlateFaPatchField.C   |  3 +-
 .../fixedValueOutflowFaPatchField.H           | 13 +--
 .../faPatchFields/faPatchField/faPatchField.H | 69 ++++++++++------
 .../calculated/calculatedFaePatchField.C      |  9 --
 .../calculated/calculatedFaePatchField.H      | 13 +--
 .../fixedValue/fixedValueFaePatchField.H      | 15 ++--
 .../basic/sliced/slicedFaePatchField.H        |  2 -
 .../constraint/empty/emptyFaePatchField.H     |  2 +-
 .../faePatchField/faePatchField.H             | 53 +++++++-----
 .../basic/calculated/calculatedFvPatchField.C |  9 --
 .../basic/calculated/calculatedFvPatchField.H | 16 +---
 .../directionMixedFvPatchField.H              | 20 ++---
 .../extrapolatedCalculatedFvPatchField.C      |  6 +-
 .../extrapolatedCalculatedFvPatchField.H      |  1 +
 .../basic/fixedValue/fixedValueFvPatchField.H | 20 ++---
 .../basic/mixed/mixedFvPatchField.H           | 20 ++---
 .../basic/sliced/slicedFvPatchField.H         | 20 ++---
 .../basic/transform/transformFvPatchField.H   | 12 +--
 .../zeroGradient/zeroGradientFvPatchField.C   | 16 +---
 .../zeroGradient/zeroGradientFvPatchField.H   | 12 +--
 .../cyclicAMI/cyclicAMIFvPatchField.C         |  2 +-
 .../constraint/empty/emptyFvPatchField.H      |  7 +-
 .../processor/processorFvPatchField.C         |  2 +-
 .../derived/advective/advectiveFvPatchField.C |  2 +-
 .../codedFixedValueFvPatchField.C             |  2 +-
 ...lectrostaticDepositionFvPatchScalarField.C |  2 +-
 .../fixedFluxPressureFvPatchScalarField.C     |  2 +-
 ...malInletOutletVelocityFvPatchVectorField.H | 11 +--
 .../fixedNormalSlipFvPatchField.H             | 10 +--
 .../fluxCorrectedVelocityFvPatchVectorField.C |  2 +-
 .../inletOutlet/inletOutletFvPatchField.H     |  9 +-
 .../outletMappedUniformInletFvPatchField.C    |  6 +-
 ...utletPhaseMeanVelocityFvPatchVectorField.C |  2 +-
 .../partialSlip/partialSlipFvPatchField.H     |  9 +-
 ...aseHydrostaticPressureFvPatchScalarField.H | 11 +--
 ...tedInletOutletVelocityFvPatchVectorField.H | 11 +--
 ...eDirectedInletVelocityFvPatchVectorField.H | 10 +--
 ...tOutletParSlipVelocityFvPatchVectorField.H | 11 +--
 ...ureInletOutletVelocityFvPatchVectorField.H | 11 +--
 ...reInletUniformVelocityFvPatchVectorField.H | 11 +--
 .../pressureInletVelocityFvPatchVectorField.H | 11 +--
 ...malInletOutletVelocityFvPatchVectorField.H | 11 +--
 ...phaInletOutletVelocityFvPatchVectorField.H |  9 +-
 .../supersonicFreestreamFvPatchVectorField.C  |  2 +-
 .../uniformInletOutletFvPatchField.H          |  9 +-
 .../variableHeightFlowRateFvPatchField.C      |  5 +-
 .../fvPatchFields/fvPatchField/fvPatchField.C |  4 +-
 .../fvPatchFields/fvPatchField/fvPatchField.H | 82 ++++++++++++-------
 .../calculated/calculatedFvsPatchField.C      |  8 --
 .../calculated/calculatedFvsPatchField.H      | 20 ++---
 .../fixedValue/fixedValueFvsPatchField.H      | 13 +--
 .../basic/sliced/slicedFvsPatchField.H        | 15 +---
 .../constraint/empty/emptyFvsPatchField.H     |  7 +-
 .../fvsPatchField/fvsPatchField.H             | 53 +++++++-----
 .../fields/volFields/volFieldsFwd.H           |  5 +-
 ...oupledTemperatureMixedFvPatchScalarField.C |  2 +-
 .../oversetPolyPatch/oversetFvPatchField.C    |  2 +-
 ...ilmHeightInletVelocityFvPatchVectorField.H | 11 +--
 ...fixedIncidentRadiationFvPatchScalarField.C |  4 +-
 .../sorptionWallFunctionFvPatchScalarField.C  |  5 +-
 ...haContactAngleTwoPhaseFvPatchScalarField.C |  3 +-
 88 files changed, 462 insertions(+), 586 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index 1445e56940..270e07d797 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -105,7 +105,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<scalar>::operator=(patchInternalField());
+        // Fallback: set to the internal field
+        fvPatchField<scalar>::patchInternalField(*this);
     }
 
     refValue() = *this;
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index 1e9619c65e..4db517c658 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -47,7 +47,7 @@ tractionDisplacementFvPatchVectorField
     traction_(p.size(), Zero),
     pressure_(p.size(), Zero)
 {
-    fvPatchVectorField::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
     gradient() = Zero;
 }
 
@@ -79,7 +79,7 @@ tractionDisplacementFvPatchVectorField
     traction_("traction", dict, p.size()),
     pressure_("pressure", dict, p.size())
 {
-    fvPatchVectorField::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
     gradient() = Zero;
 }
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index be853da48b..20b3a8c8cf 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -47,7 +47,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     traction_(p.size(), Zero),
     pressure_(p.size(), Zero)
 {
-    fvPatchVectorField::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
     gradient() = Zero;
 }
 
@@ -79,7 +79,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     traction_("traction", dict, p.size()),
     pressure_("pressure", dict, p.size())
 {
-    fvPatchVectorField::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
     gradient() = Zero;
 }
 
diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C
index 2665d4b515..3591279c54 100644
--- a/applications/test/pointField/Test-PointField.C
+++ b/applications/test/pointField/Test-PointField.C
@@ -53,13 +53,13 @@ int main(int argc, char *argv[])
         (
             "U",
             runTime.timeName(),
-            mesh,
+            pMesh.thisDb(),
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE
+            IOobject::NO_WRITE
         ),
         pMesh,
-        dimensionedVector(dimLength, Zero),
-        pointPatchVectorField::calculatedType()
+        dimensionedVector(dimLength, Zero)
+        // pointPatchFieldBase::calculatedType()
     );
 
     pointVectorField V(U + 2*U);
diff --git a/src/OpenFOAM/fields/Fields/fieldTypes.C b/src/OpenFOAM/fields/Fields/fieldTypes.C
index cf21360c75..943ecdd46f 100644
--- a/src/OpenFOAM/fields/Fields/fieldTypes.C
+++ b/src/OpenFOAM/fields/Fields/fieldTypes.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,4 +42,27 @@ const Foam::wordList Foam::fieldTypes::basic
 });
 
 
+// Commonly used patch field types
+
+const Foam::word Foam::fieldTypes::emptyType
+(
+    Foam::fieldTypes::emptyTypeName_()
+);
+
+const Foam::word Foam::fieldTypes::calculatedType
+(
+    Foam::fieldTypes::calculatedTypeName_()
+);
+
+const Foam::word Foam::fieldTypes::extrapolatedCalculatedType
+(
+    Foam::fieldTypes::extrapolatedCalculatedTypeName_()
+);
+
+const Foam::word Foam::fieldTypes::zeroGradientType
+(
+    Foam::fieldTypes::zeroGradientTypeName_()
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/fieldTypes.H b/src/OpenFOAM/fields/Fields/fieldTypes.H
index 2c2a87a59a..9f279730a1 100644
--- a/src/OpenFOAM/fields/Fields/fieldTypes.H
+++ b/src/OpenFOAM/fields/Fields/fieldTypes.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,8 +24,15 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Namespace
+    Foam::fieldTypes
+
 Description
-    Header files for all the primitive types that Fields are instantiated for.
+    Collection of common field types
+
+Note
+    The fieldTypes header contains macros for primitive types
+    that Fields are instantiated for.
 
 \*---------------------------------------------------------------------------*/
 
@@ -69,9 +76,40 @@ namespace Foam
 {
 namespace fieldTypes
 {
-    //- Standard basic field types (label, scalar, vector, tensor, etc)
-    //  These also correspond to cloud output fields.
-    extern const wordList basic;
+
+//- Standard basic field types (label, scalar, vector, tensor, etc)
+//  These also correspond to cloud output fields.
+extern const wordList basic;
+
+
+// Commonly used patch field types
+
+//- An \c empty patch field type
+inline const char* emptyTypeName_() noexcept { return "empty"; }
+
+//- An \c empty patch field type
+extern const word emptyType;
+
+//- A \c calculated patch field type
+inline const char* calculatedTypeName_() noexcept { return "calculated"; }
+
+//- A \c calculated patch field type
+extern const word calculatedType;
+
+//- A combined \c zero-gradient and \c calculated patch field type
+inline const char* extrapolatedCalculatedTypeName_() noexcept
+{
+    return "extrapolatedCalculated";
+}
+
+//- A combined \c zero-gradient and \c calculated patch field type
+extern const word extrapolatedCalculatedType;
+
+//- A \c zeroGradient patch field type
+inline const char* zeroGradientTypeName_() noexcept { return "zeroGradient"; }
+
+//- A \c zeroGradient patch field type
+extern const word zeroGradientType;
 
 } // End namespace fieldTypes
 } // End namespace Foam
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
index eee6cf809a..44c460d5c6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
@@ -28,15 +28,6 @@ License
 
 #include "calculatedPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::pointPatchField<Type>::calculatedType()
-{
-    return Foam::calculatedPointPatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
index 1ceaba98a4..42189f5a27 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
@@ -53,11 +53,10 @@ class calculatedPointPatchField
 :
     public pointPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("calculated");
+    TypeName("calculated");  // fieldTypes::calculatedTypeName_()
 
 
     // Constructors
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index 9c7c53a45e..ff6437ae20 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -139,18 +139,13 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
-    // Member operators
+    // Member Operators
 
         // Disable assignment operators
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
index 9e01a4df9f..1cc3430ddc 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
@@ -27,15 +27,6 @@ License
 
 #include "zeroGradientPointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::pointPatchField<Type>::zeroGradientType()
-{
-    return Foam::zeroGradientPointPatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
index 1026efac17..ca91d23cff 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
@@ -56,7 +56,7 @@ class zeroGradientPointPatchField
 public:
 
     //- Runtime type information
-    TypeName("zeroGradient");
+    TypeName("zeroGradient");  // fieldTypes::zeroGradientTypeName_()
 
 
     // Constructors
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
index 146c79dfdc..dc2c9fc903 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef emptyPointPatchField_H
-#define emptyPointPatchField_H
+#ifndef Foam_emptyPointPatchField_H
+#define Foam_emptyPointPatchField_H
 
 #include "pointPatchField.H"
 #include "emptyPointPatch.H"
@@ -54,11 +54,10 @@ class emptyPointPatchField
 :
     public pointPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName(emptyPointPatch::typeName_());
+    TypeName(emptyPointPatch::typeName_());  // fieldTypes::emptyTypeName_()
 
 
     // Constructors
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index feaf899d28..85d2b582c7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -140,8 +140,50 @@ public:
     virtual ~pointPatchFieldBase() = default;
 
 
+    // Static Member Functions
+
+        //- The type name for \c empty patch fields
+        static const word& emptyType() noexcept
+        {
+            return Foam::fieldTypes::emptyType;
+        }
+
+        //- The type name for \c calculated patch fields
+        static const word& calculatedType() noexcept
+        {
+            return Foam::fieldTypes::calculatedType;
+        }
+
+        //- The type name for \c zeroGradient patch fields
+        static const word& zeroGradientType() noexcept
+        {
+            return Foam::fieldTypes::zeroGradientType;
+        }
+
+
     // Member Functions
 
+    // Attributes
+
+        //- True if the patch field fixes a value
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
+
+        //- True if the patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
+
+        //- The constraint type the pointPatchField implements
+        virtual const word& constraintType() const
+        {
+            return word::null;
+        }
+
+
     // Access
 
         //- The associated objectRegistry
@@ -366,34 +408,6 @@ public:
 
     // Member Functions
 
-        //- The type name for calculated patch fields
-        static const word& calculatedType();
-
-        //- The type name for zeroGradient patch fields
-        static const word& zeroGradientType();
-
-
-    // Attributes
-
-        //- True if this patch field fixes a value
-        virtual bool fixesValue() const
-        {
-            return false;
-        }
-
-        //- True if this patch field is coupled
-        virtual bool coupled() const
-        {
-            return false;
-        }
-
-        //- The constraint type this pointPatchField implements.
-        virtual const word& constraintType() const
-        {
-            return word::null;
-        }
-
-
     // Access
 
         //- Return the patch size
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 744eb7df3e..da6fc26d91 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -56,7 +56,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     tau0_(dict.getOrDefault<vector>("tau", Zero))
 {
-    fvPatchField<vector>::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 724c4c2ceb..b4175b385b 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -366,7 +366,7 @@ epsilonWallFunctionFvPatchScalarField
     cornerWeights_()
 {
     // Apply zero-gradient condition on start-up
-    this->operator==(patchInternalField());
+    fvPatchField<scalar>::patchInternalField(*this);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index e4c67849be..ec53d93776 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -359,7 +359,7 @@ Foam::omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     cornerWeights_()
 {
     // apply zero-gradient condition on start-up
-    this->operator==(patchInternalField());
+    fvPatchField<scalar>::patchInternalField(*this);
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index cedb9bdc9a..d6563ca590 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -114,8 +114,8 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     }
     else
     {
-        fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
+        fvPatchField<scalar>::patchInternalField(*this);
+        gradient() = Zero;
     }
 }
 
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
index 30076a0f3c..2091fb1a56 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
@@ -70,7 +70,7 @@ freeSurfaceVelocityFvPatchVectorField
     fixedGradientFvPatchVectorField(p, iF)
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
index 7e9ddfa6b1..4ea2400fef 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
@@ -29,15 +29,6 @@ License
 #include "calculatedFaPatchField.H"
 #include "faPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::faPatchField<Type>::calculatedType()
-{
-    return Foam::calculatedFaPatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
index a6d93302e9..4cda540f43 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
@@ -60,7 +60,7 @@ class calculatedFaPatchField
 public:
 
     //- Runtime type information
-    TypeName("calculated");
+    TypeName("calculated");  // fieldTypes::calculatedTypeName_()
 
 
     // Constructors
@@ -126,17 +126,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
         // Evaluation functions
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
index 0b2b6ad6e0..d605cd73db 100644
--- a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
@@ -54,7 +54,8 @@ extrapolatedCalculatedFaPatchField
 :
     calculatedFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    calculatedFaPatchField<Type>::operator==(this->patchInternalField());
+    // Set to the internal field
+    faPatchField<Type>::patchInternalField(*this);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
index e0f2c6e635..c326fe3d63 100644
--- a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
@@ -73,6 +73,7 @@ public:
 
     //- Runtime type information
     TypeName("extrapolatedCalculated");
+    // fieldTypes::extrapolatedCalculatedTypeName_()
 
 
     // Constructors
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
index 3788cc1058..399e628e44 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
@@ -127,17 +127,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
         // Evaluation functions
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
index c64af5442f..5109e64920 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
@@ -164,17 +164,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: the patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
         // Return defining fields
diff --git a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
index cc8b4a778a..8afba50b8e 100644
--- a/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
@@ -139,12 +139,10 @@ public:
 
     // Member Functions
 
-    // Attributes
-
         //- True: this patch field fixes a value.
         virtual bool fixesValue() const { return true; }
 
-        //- False: this patch field is not altered by assignment
+        //- False: this patch field is not altered by assignment.
         virtual bool assignable() const { return false; }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
index 1465c0a8c3..edaa2ded0a 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
@@ -28,15 +28,6 @@ License
 #include "zeroGradientFaPatchField.H"
 #include "faPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::faPatchField<Type>::zeroGradientType()
-{
-    return Foam::zeroGradientFaPatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -109,7 +100,8 @@ void Foam::zeroGradientFaPatchField<Type>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    this->operator==(this->patchInternalField());
+    // Set to the internal field
+    faPatchField<Type>::patchInternalField(*this);
     faPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
index 3a0c3ef6cc..ba4a9dff76 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef zeroGradientFaPatchField_H
-#define zeroGradientFaPatchField_H
+#ifndef Foam_zeroGradientFaPatchField_H
+#define Foam_zeroGradientFaPatchField_H
 
 #include "faPatchField.H"
 
@@ -60,7 +60,7 @@ class zeroGradientFaPatchField
 public:
 
     //- Runtime type information
-    TypeName("zeroGradient");
+    TypeName("zeroGradient");  // fieldTypes::zeroGradientTypeName_()
 
 
     // Constructors
@@ -132,16 +132,14 @@ public:
             //- Return gradient at boundary
             virtual tmp<Field<Type>> snGrad() const
             {
-                return tmp<Field<Type>>
-                (
-                    new Field<Type>(this->size(), Zero)
-                );
+                return tmp<Field<Type>>::New(this->size(), Zero);
             }
 
             //- Evaluate the patch field
             virtual void evaluate
             (
-                const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
+                const Pstream::commsTypes commsType =
+                    Pstream::commsTypes::blocking
             );
 
             //- Return the matrix diagonal coefficients corresponding to the
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
index 77fde57095..f7bf73b384 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
@@ -58,7 +58,8 @@ clampedPlateFaPatchField<Type>::clampedPlateFaPatchField
 :
     faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    faPatchField<Type>::operator=(this->patchInternalField());
+    // Set to the internal field
+    faPatchField<Type>::patchInternalField(*this);
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
index cc90c9ddf0..d6b63c61c4 100644
--- a/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H
@@ -125,17 +125,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: the patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
         // Evaluation functions
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index 00a9fcb409..93b73c61ff 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -145,8 +145,53 @@ public:
     virtual ~faPatchFieldBase() = default;
 
 
+    // Static Member Functions
+
+        //- The type name for \c empty patch fields
+        static const word& emptyType() noexcept
+        {
+            return Foam::fieldTypes::emptyType;
+        }
+
+        //- The type name for \c calculated patch fields
+        static const word& calculatedType() noexcept
+        {
+            return Foam::fieldTypes::calculatedType;
+        }
+
+        //- The type name for \c extrapolatedCalculated patch fields
+        //- combines \c zero-gradient and \c calculated
+        static const word& extrapolatedCalculatedType() noexcept
+        {
+            return Foam::fieldTypes::extrapolatedCalculatedType;
+        }
+
+        //- The type name for \c zeroGradient patch fields
+        static const word& zeroGradientType() noexcept
+        {
+            return Foam::fieldTypes::zeroGradientType;
+        }
+
+
     // Member Functions
 
+    // Attributes
+
+        //- True if the patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
+
+        //- True if the patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
+
+
     // Access
 
         //- The associated objectRegistry
@@ -411,30 +456,6 @@ public:
 
     // Member Functions
 
-        //- The type name for calculated patch fields
-        static const word& calculatedType();
-
-        //- The type name for zeroGradient patch fields
-        static const word& zeroGradientType();
-
-
-    // Attributes
-
-        //- True if this patch field fixes a value.
-        //  Needed to check if a level has to be specified while solving
-        //  Poissons equations.
-        virtual bool fixesValue() const
-        {
-            return false;
-        }
-
-        //- True if this patch field is coupled
-        virtual bool coupled() const
-        {
-            return false;
-        }
-
-
     // Access
 
         //- Return const-reference to the dimensioned internal field
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
index 181683faa7..ab40effddc 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
@@ -29,15 +29,6 @@ License
 #include "calculatedFaePatchField.H"
 #include "faPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::faePatchField<Type>::calculatedType()
-{
-    return Foam::calculatedFaePatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
index 61d3b13a64..f63080c194 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
@@ -60,7 +60,7 @@ class calculatedFaePatchField
 public:
 
     //- Runtime type information
-    TypeName("calculated");
+    TypeName("calculated");  // fieldTypes::calculatedTypeName_()
 
 
     // Constructors
@@ -128,16 +128,11 @@ public:
 
     // Member Functions
 
-        // Access
+        //- True: the patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
 
+    // Other
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
index beb7d4c751..9892f9923c 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
@@ -130,24 +130,19 @@ public:
     virtual ~fixedValueFaePatchField() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
 
+    // Other
 
         //- Write
         virtual void write(Ostream&) const;
 
 
-    // Member operators
+    // Member Operators
 
         virtual void operator=(const UList<Type>&) {}
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
index 40caa47ba1..c56b7a9ffe 100644
--- a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H
@@ -132,8 +132,6 @@ public:
 
     // Member Functions
 
-    // Attributes
-
         //- True: this patch field fixes a value.
         virtual bool fixesValue() const { return true; }
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
index 03b86c0cda..a539268742 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchField.H
@@ -61,7 +61,7 @@ class emptyFaePatchField
 public:
 
     //- Runtime type information
-    TypeName("empty");
+    TypeName(emptyFaPatch::typeName_());  // fieldTypes::emptyTypeName_()
 
 
     // Constructors
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index 16df2ca380..b2fe67f877 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -131,8 +131,40 @@ public:
     virtual ~faePatchFieldBase() = default;
 
 
+    // Static Member Functions
+
+        //- The type name for \c empty patch fields
+        static const word& emptyType() noexcept
+        {
+            return Foam::fieldTypes::emptyType;
+        }
+
+        //- The type name for \c calculated patch fields
+        static const word& calculatedType() noexcept
+        {
+            return Foam::fieldTypes::calculatedType;
+        }
+
+
     // Member Functions
 
+    // Attributes
+
+        //- True if the patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
+
+        //- True if the patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
+
+
     // Access
 
         //- The associated objectRegistry
@@ -390,27 +422,6 @@ public:
 
     // Member Functions
 
-        //- The type name for calculated patch fields
-        static const word& calculatedType();
-
-
-    // Attributes
-
-        //- True if this patch field fixes a value.
-        //  Needed to check if a level has to be specified while solving
-        //  Poissons equations.
-        virtual bool fixesValue() const
-        {
-            return false;
-        }
-
-        //- True if this patch field is coupled
-        virtual bool coupled() const
-        {
-            return false;
-        }
-
-
     // Access
 
         //- Return const-reference to the dimensioned internal field
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index e0720407f6..03e44871b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -29,15 +29,6 @@ License
 #include "calculatedFvPatchField.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::fvPatchField<Type>::calculatedType()
-{
-    return Foam::calculatedFvPatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
index a97ccbdd6c..59089a4b4d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H
@@ -69,11 +69,10 @@ class calculatedFvPatchField
 :
     public fvPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("calculated");
+    TypeName("calculated");  // fieldTypes::calculatedTypeName_()
 
 
     // Constructors
@@ -154,17 +153,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
         // Evaluation functions
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
index e1d6c59d0d..d56bc7113a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
@@ -130,23 +130,13 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
-            //- Return true: this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
-
-            //- Return false: this patch field is not altered by assignment
-            virtual bool assignable() const
-            {
-                return false;
-            }
+        //- False: this patch field is not altered by assignment.
+        virtual bool assignable() const { return false; }
 
 
         // Mapping functions
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
index 105e23c4f8..a1442f4e1a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
@@ -54,7 +54,8 @@ extrapolatedCalculatedFvPatchField
 :
     calculatedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    calculatedFvPatchField<Type>::operator==(this->patchInternalField());
+    // Set to the internal field
+    fvPatchField<Type>::patchInternalField(*this);
 }
 
 
@@ -108,7 +109,8 @@ void Foam::extrapolatedCalculatedFvPatchField<Type>::evaluate
         this->updateCoeffs();
     }
 
-    calculatedFvPatchField<Type>::operator==(this->patchInternalField());
+    // Set to the internal field
+    fvPatchField<Type>::patchInternalField(*this);
     calculatedFvPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
index 6ca1a44557..dad65d55ff 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
@@ -72,6 +72,7 @@ public:
 
     //- Runtime type information
     TypeName("extrapolatedCalculated");
+    // fieldTypes::extrapolatedCalculatedTypeName_()
 
 
     // Constructors
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
index 3643d82925..d8c09c5717 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H
@@ -166,23 +166,13 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
-
-            //- Return false: this patch field is not altered by assignment
-            virtual bool assignable() const
-            {
-                return false;
-            }
+        //- False: this patch field is not altered by assignment.
+        virtual bool assignable() const { return false; }
 
 
         // Evaluation functions
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index 87c2f8b5c3..143df47f4f 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -188,23 +188,13 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
-
-            //- Return false: this patch field is not altered by assignment
-            virtual bool assignable() const
-            {
-                return false;
-            }
+        //- False: this patch field is not altered by assignment.
+        virtual bool assignable() const { return false; }
 
 
         // Return defining fields
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index e41db62955..6b7a51733e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -136,23 +136,13 @@ public:
     virtual ~slicedFvPatchField<Type>();
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
-
-            //- Return false: this patch field is not altered by assignment
-            virtual bool assignable() const
-            {
-                return false;
-            }
+        //- False: this patch field is not altered by assignment.
+        virtual bool assignable() const { return false; }
 
 
         // Evaluation functions
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index 4bb2e5016f..89042ab751 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -113,16 +113,10 @@ public:
         ) const = 0;
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true if the value of the patch field
-            //  is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment.
+        virtual bool assignable() const { return true; }
 
 
         // Evaluation functions
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index b7ee3544fe..fd5dfca10d 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -28,16 +28,6 @@ License
 #include "zeroGradientFvPatchField.H"
 #include "fvPatchFieldMapper.H"
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::fvPatchField<Type>::zeroGradientType()
-{
-    return zeroGradientFvPatchField<Type>::typeName;
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -61,7 +51,8 @@ Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 :
     fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    fvPatchField<Type>::operator=(this->patchInternalField());
+    // Set to the internal field
+    fvPatchField<Type>::patchInternalField(*this);
 }
 
 
@@ -109,7 +100,8 @@ void Foam::zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    fvPatchField<Type>::operator==(this->patchInternalField());
+    // Set to the internal field
+    fvPatchField<Type>::patchInternalField(*this);
     fvPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
index 05cc20e4b5..65d8582bc2 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
@@ -47,8 +47,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef zeroGradientFvPatchField_H
-#define zeroGradientFvPatchField_H
+#ifndef Foam_zeroGradientFvPatchField_H
+#define Foam_zeroGradientFvPatchField_H
 
 #include "fvPatchField.H"
 
@@ -66,11 +66,10 @@ class zeroGradientFvPatchField
 :
     public fvPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("zeroGradient");
+    TypeName("zeroGradient");  // fieldTypes::zeroGradientTypeName_()
 
 
     // Constructors
@@ -142,10 +141,7 @@ public:
             //- Return gradient at boundary
             virtual tmp<Field<Type>> snGrad() const
             {
-                return tmp<Field<Type>>
-                (
-                    new Field<Type>(this->size(), Zero)
-                );
+                return tmp<Field<Type>>::New(this->size(), Zero);
             }
 
             //- Evaluate the patch field
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 7cbf4c5d53..8f983958ef 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -77,7 +77,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
         }
         else
         {
-            fvPatchField<Type>::operator=(this->patchInternalField());
+            fvPatchField<Type>::patchInternalField(*this);
         }
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
index e7d87356aa..6d97bc67ed 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H
@@ -49,8 +49,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef emptyFvPatchField_H
-#define emptyFvPatchField_H
+#ifndef Foam_emptyFvPatchField_H
+#define Foam_emptyFvPatchField_H
 
 #include "fvPatchField.H"
 #include "emptyFvPatch.H"
@@ -69,11 +69,10 @@ class emptyFvPatchField
 :
     public fvPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName(emptyFvPatch::typeName_());
+    TypeName(emptyFvPatch::typeName_());  // fieldTypes::emptyTypeName_()
 
 
     // Constructors
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index eaa4786d12..b5350e4f3f 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -89,7 +89,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::operator=(this->patchInternalField());
+        fvPatchField<Type>::patchInternalField(*this);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 7e989ae29c..47285e9e8f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -91,7 +91,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::operator=(this->patchInternalField());
+        fvPatchField<Type>::patchInternalField(*this);
     }
 
     this->refValue() = *this;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 59228d43b1..1eb6787657 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -189,7 +189,7 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
     if (!this->readValueEntry(dict))
     {
         // Assign dummy value to get redirectPatchField not fail
-        this->operator==(this->patchInternalField());
+        fvPatchField<Type>::patchInternalField(*this);
 
         this->evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index 9786b53ace..7ee4400f50 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -208,7 +208,7 @@ electrostaticDepositionFvPatchScalarField
 {
     if (!this->readValueEntry(dict))
     {
-        fvPatchScalarField::operator=(patchInternalField());
+        fvPatchField<scalar>::patchInternalField(*this);
     }
 
     // If flow is multiphase
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index 32a98f9f11..3187bf0a3b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -65,7 +65,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     }
     else
     {
-        fvPatchField<scalar>::operator=(patchInternalField());
+        fvPatchField<scalar>::patchInternalField(*this);
         gradient() = Zero;
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
index 5ef9e8bda8..0ebb2f934e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H
@@ -188,15 +188,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment.
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
index 1588c53328..d811f125f5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
@@ -178,13 +178,11 @@ public:
 
     // Member Functions
 
-        // Access
+        //- False: this patch field is not altered by assignment.
+        virtual bool assignable() const { return false; }
 
-            //- This patch field is not altered by assignment
-            virtual bool assignable() const
-            {
-                return false;
-            }
+
+        // Access
 
             //- User-defined input field (modifiable field)
             virtual Field<Type>& fixedValue()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index fd02bf04bc..820552d8b8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -75,7 +75,7 @@ fluxCorrectedVelocityFvPatchVectorField
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(patchInternalField());
+    fvPatchField<vector>::patchInternalField(*this);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index 0462c6bc0e..ac1e29355b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -166,13 +166,8 @@ public:
 
     // Member functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment.
+        virtual bool assignable() const { return true; }
 
 
         //- Update the coefficients associated with the patch field
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 7a16714c53..9c3ac4ac2e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -170,7 +170,8 @@ outletMappedUniformInletFvPatchField
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::operator=(this->patchInternalField());
+        // Fallback: set to the internal field
+        fvPatchField<Type>::patchInternalField(*this);
     }
 }
 
@@ -203,7 +204,8 @@ outletMappedUniformInletFvPatchField
     }
     else
     {
-        fvPatchField<Type>::operator=(this->patchInternalField());
+        // Fallback: set to the internal field
+        fvPatchField<Type>::patchInternalField(*this);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 44b8b317d3..4f9e0f9036 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -86,7 +86,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchVectorField::operator=(patchInternalField());
+        fvPatchField<vector>::patchInternalField(*this);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
index 320e3f313e..c9b3f27834 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
@@ -166,13 +166,10 @@ public:
 
     // Member Functions
 
-        // Access/attributes
+        //- False: this patch field is not altered by assignment
+        virtual bool assignable() const { return false; }
 
-            //- This patch field is not altered by assignment
-            virtual bool assignable() const
-            {
-                return false;
-            }
+        // Access
 
             virtual Field<Type>& refValue()
             {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
index 79362f5447..ca1f4c4d2d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
@@ -184,15 +184,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
index a7f58e6681..85bf2b931d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
@@ -176,15 +176,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
index cfc7ce6c1b..080c250af7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
@@ -172,15 +172,11 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
 
         // Access
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H
index d420e30f6a..f4f52f7c22 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H
@@ -172,15 +172,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
index 478c3f1d4a..766c68b026 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
@@ -162,15 +162,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H
index a6ad0a7320..e4af130ac2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H
@@ -137,15 +137,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         //- Update the coefficients associated with the patch field
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H
index 2876980117..3db2a464eb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H
@@ -155,15 +155,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H
index c97e5d226d..1ea26624f3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H
@@ -171,15 +171,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.H
index f087b5cae5..d09ab668d9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.H
@@ -194,13 +194,8 @@ public:
 
     // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index ec336b2354..4962f0bf82 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -76,7 +76,7 @@ supersonicFreestreamFvPatchVectorField
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<vector>::operator=(patchInternalField());
+        fvPatchField<vector>::patchInternalField(*this);
     }
 
     refValue() = *this;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index 9382071b8f..fc2bca0339 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -169,13 +169,8 @@ public:
 
     // Member functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Mapping functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index c7609a9053..a569a669dc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -82,13 +82,14 @@ Foam::variableHeightFlowRateFvPatchScalarField
     upperBound_(dict.get<scalar>("upperBound"))
 {
     fvPatchFieldBase::readDict(dict);
-    this->refValue() = 0.0;
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchScalarField::operator=(this->patchInternalField());
+        // Fallback: set to the internal field
+        fvPatchField<scalar>::patchInternalField(*this);
     }
 
+    this->refValue() = 0.0;
     this->refGrad() = 0.0;
     this->valueFraction() = 0.0;
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 99e4a31719..d0f5908b10 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -169,7 +169,7 @@ Foam::fvPatchField<Type>::fvPatchField
     // For unmapped faces set to internal field value (zero-gradient)
     if (notNull(iF) && mapper.hasUnmapped())
     {
-        fvPatchField<Type>::operator=(this->patchInternalField());
+        fvPatchField<Type>::patchInternalField(*this);
     }
     this->map(ptf, mapper);
 }
@@ -241,7 +241,7 @@ void Foam::fvPatchField<Type>::autoMap
 
     if (!this->size() && !mapper.distributed())
     {
-        f.setSize(mapper.size());
+        f.resize_nocopy(mapper.size());
         if (f.size())
         {
             f = this->patchInternalField();
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 6df6c018e6..1382ab356c 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -154,8 +154,59 @@ public:
     virtual ~fvPatchFieldBase() = default;
 
 
+    // Static Member Functions
+
+        //- The type name for \c empty patch fields
+        static const word& emptyType() noexcept
+        {
+            return Foam::fieldTypes::emptyType;
+        }
+
+        //- The type name for \c calculated patch fields
+        static const word& calculatedType() noexcept
+        {
+            return Foam::fieldTypes::calculatedType;
+        }
+
+        //- The type name for \c extrapolatedCalculated patch fields
+        //- combines \c zero-gradient and \c calculated
+        static const word& extrapolatedCalculatedType() noexcept
+        {
+            return Foam::fieldTypes::extrapolatedCalculatedType;
+        }
+
+        //- The type name for \c zeroGradient patch fields
+        static const word& zeroGradientType() noexcept
+        {
+            return Foam::fieldTypes::zeroGradientType;
+        }
+
+
     // Member Functions
 
+    // Attributes
+
+        //- True if the value of the patch field is altered by assignment
+        virtual bool assignable() const
+        {
+            return true;
+        }
+
+        //- True if the patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
+
+        //- True if the patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
+
+
     // Access
 
         //- The associated objectRegistry
@@ -473,37 +524,6 @@ public:
 
     // Member Functions
 
-        //- The type name for calculated patch fields
-        static const word& calculatedType();
-
-        //- The type name for zeroGradient patch fields
-        static const word& zeroGradientType();
-
-
-    // Attributes
-
-        //- True if this patch field fixes a value.
-        //  Needed to check if a level has to be specified while solving
-        //  Poissons equations.
-        virtual bool fixesValue() const
-        {
-            return false;
-        }
-
-        //- True if the value of the patch field
-        //- is altered by assignment (the default)
-        virtual bool assignable() const
-        {
-            return true;
-        }
-
-        //- True if this patch field is coupled
-        virtual bool coupled() const
-        {
-            return false;
-        }
-
-
     // Access
 
         //- Return const-reference to the dimensioned internal field
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index 35f82e8b04..443ab350aa 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -29,14 +29,6 @@ License
 #include "calculatedFvsPatchField.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::word& Foam::fvsPatchField<Type>::calculatedType()
-{
-    return Foam::calculatedFvsPatchField<Type>::typeName;
-}
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
index 838f03b2ff..56982775be 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calculatedFvsPatchField_H
-#define calculatedFvsPatchField_H
+#ifndef Foam_calculatedFvsPatchField_H
+#define Foam_calculatedFvsPatchField_H
 
 #include "fvsPatchField.H"
 
@@ -53,11 +53,10 @@ class calculatedFvsPatchField
 :
     public fvsPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("calculated");
+    TypeName("calculated");  // fieldTypes::calculatedTypeName_()
 
 
     // Constructors
@@ -121,17 +120,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 };
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index 6d3d19f7e3..5189bfd2a2 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -122,17 +122,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
         // Evaluation functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index d5ce648c96..64aeaeb486 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -130,20 +130,13 @@ public:
     virtual ~slicedFvsPatchField<Type>();
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
-
-            //- Return true if this patch field fixes a value.
-            //  Needed to check if a level has to be specified while solving
-            //  Poissons equations.
-            virtual bool fixesValue() const
-            {
-                return true;
-            }
+        //- True: this patch field fixes a value.
+        virtual bool fixesValue() const { return true; }
 
 
-    // Member operators
+    // Member Operators
 
         virtual void operator=(const UList<Type>&) {}
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
index c0ecbc9b21..1d96c1c568 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef emptyFvsPatchField_H
-#define emptyFvsPatchField_H
+#ifndef Foam_emptyFvsPatchField_H
+#define Foam_emptyFvsPatchField_H
 
 #include "fvsPatchField.H"
 #include "emptyFvPatch.H"
@@ -54,11 +54,10 @@ class emptyFvsPatchField
 :
     public fvsPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
-    TypeName(emptyFvPatch::typeName_());
+    TypeName(emptyFvPatch::typeName_());  // fieldTypes::emptyTypeName_()
 
 
     // Constructors
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 00a3737be7..3d305997a5 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -126,8 +126,40 @@ public:
     virtual ~fvsPatchFieldBase() = default;
 
 
+    // Static Member Functions
+
+        //- The type name for \c empty patch fields
+        static const word& emptyType() noexcept
+        {
+            return Foam::fieldTypes::emptyType;
+        }
+
+        //- The type name for \c calculated patch fields
+        static const word& calculatedType() noexcept
+        {
+            return Foam::fieldTypes::calculatedType;
+        }
+
+
     // Member Functions
 
+    // Attributes
+
+        //- True if the patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return false;
+        }
+
+        //- True if the patch field is coupled
+        virtual bool coupled() const
+        {
+            return false;
+        }
+
+
     // Access
 
         //- The associated objectRegistry
@@ -403,27 +435,6 @@ public:
 
     // Member Functions
 
-        //- The type name for calculated patch fields
-        static const word& calculatedType();
-
-
-    // Attributes
-
-        //- True if this patch field fixes a value.
-        //  Needed to check if a level has to be specified while solving
-        //  Poissons equations.
-        virtual bool fixesValue() const
-        {
-            return false;
-        }
-
-        //- True if this patch field is coupled
-        virtual bool coupled() const
-        {
-            return false;
-        }
-
-
     // Access
 
         //- Return const-reference to the dimensioned internal field
diff --git a/src/finiteVolume/fields/volFields/volFieldsFwd.H b/src/finiteVolume/fields/volFields/volFieldsFwd.H
index 8d1293f421..e4daf9f73b 100644
--- a/src/finiteVolume/fields/volFields/volFieldsFwd.H
+++ b/src/finiteVolume/fields/volFields/volFieldsFwd.H
@@ -24,11 +24,8 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Namespace
-    Foam::fieldTypes
-
 Description
-    Collection of common field types
+    Forwards and collection of common volume field types
 
 SourceFiles
     volFields.C
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index 7e4af42bf4..7dad174696 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -160,7 +160,7 @@ externalCoupledTemperatureMixedFvPatchScalarField
         // or extrapolated value
         if (!this->readValueEntry(dict))
         {
-            fvPatchField<scalar>::operator=(this->patchInternalField());
+            fvPatchField<scalar>::patchInternalField(*this);
         }
 
         // Initialise as a fixed value
diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index 9f27a7a248..0329d406fc 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -113,7 +113,7 @@ Foam::oversetFvPatchField<Type>::oversetFvPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        Field<Type>::operator=(this->patchInternalField());
+        fvPatchField<Type>::patchInternalField(*this);
     }
 }
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
index 9c489b8205..91b6940c3b 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
@@ -176,15 +176,10 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-        // Attributes
-
-            //- Return true: this patch field is altered by assignment
-            virtual bool assignable() const
-            {
-                return true;
-            }
+        //- True: this patch field is altered by assignment
+        virtual bool assignable() const { return true; }
 
 
         // Access
diff --git a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
index 177f94c3d6..d74e60c07b 100644
--- a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
@@ -86,8 +86,8 @@ fixedIncidentRadiationFvPatchScalarField
     else
     {
         // Still reading so cannot yet evaluate. Make up a value.
-        fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
+        fvPatchField<scalar>::patchInternalField(*this);
+        gradient() = Zero;
     }
 }
 
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
index a3ce1f2b72..3bf82af083 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
@@ -311,8 +311,9 @@ sorptionWallFunctionFvPatchScalarField::sorptionWallFunctionFvPatchScalarField
     }
     else
     {
-        fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
+        // Fallback: set to zero-gradient
+        fvPatchField<scalar>::patchInternalField(*this);
+        gradient() = Zero;
     }
 }
 
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 9cc864c752..216b17537c 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -80,7 +80,8 @@ alphaContactAngleTwoPhaseFvPatchScalarField
     }
     else
     {
-        fvPatchField<scalar>::operator=(patchInternalField());
+        // Fallback: set to zero-gradient
+        fvPatchField<scalar>::patchInternalField(*this);
         gradient() = Zero;
     }
 }

From e5e1440020724508ebb3d1df6ef74aa01bb82646 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 3 Apr 2023 14:23:14 +0200
Subject: [PATCH 154/348] ENH: align use of extrapolatedCalculated in faMatrix
 with fvMatrix

STYLE: prefer GeometricField::New factory methods
---
 src/finiteArea/faMatrices/faMatrix/faMatrix.C |  61 +++-------
 .../faScalarMatrix/faScalarMatrix.C           |  30 ++---
 .../faScalarMatrix/faScalarMatrix.H           |   5 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            | 113 +++++-------------
 .../fvScalarMatrix/fvScalarMatrix.C           |  46 ++-----
 .../fvScalarMatrix/fvScalarMatrix.H           |   4 +-
 6 files changed, 75 insertions(+), 184 deletions(-)

diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
index b2d8169798..d4b8576638 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
@@ -29,6 +29,7 @@ License
 #include "areaFields.H"
 #include "edgeFields.H"
 #include "calculatedFaPatchFields.H"
+#include "extrapolatedCalculatedFaPatchFields.H"
 #include "zeroGradientFaPatchFields.H"
 #include "IndirectList.H"
 #include "UniformList.H"
@@ -610,7 +611,7 @@ void Foam::faMatrix<Type>::relax()
 template<class Type>
 Foam::tmp<Foam::scalarField> Foam::faMatrix<Type>::D() const
 {
-    tmp<scalarField> tdiag(new scalarField(diag()));
+    auto tdiag = tmp<scalarField>::New(diag());
     addCmptAvBoundaryDiag(tdiag.ref());
     return tdiag;
 }
@@ -619,20 +620,12 @@ Foam::tmp<Foam::scalarField> Foam::faMatrix<Type>::D() const
 template<class Type>
 Foam::tmp<Foam::areaScalarField> Foam::faMatrix<Type>::A() const
 {
-    tmp<areaScalarField> tAphi
+    auto tAphi = areaScalarField::New
     (
-        new areaScalarField
-        (
-            IOobject
-            (
-                "A("+psi_.name()+')',
-                psi_.instance(),
-                psi_.db()
-            ),
-            psi_.mesh(),
-            dimensions_/psi_.dimensions()/dimArea,
-            zeroGradientFaPatchScalarField::typeName
-        )
+        "A(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions_/psi_.dimensions()/dimArea,
+        faPatchFieldBase::extrapolatedCalculatedType()
     );
 
     tAphi.ref().primitiveFieldRef() = D()/psi_.mesh().S();
@@ -646,22 +639,14 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
 Foam::faMatrix<Type>::H() const
 {
-    tmp<GeometricField<Type, faPatchField, areaMesh>> tHphi
+    auto tHphi = GeometricField<Type, faPatchField, areaMesh>::New
     (
-        new GeometricField<Type, faPatchField, areaMesh>
-        (
-            IOobject
-            (
-                "H("+psi_.name()+')',
-                psi_.instance(),
-                psi_.db()
-            ),
-            psi_.mesh(),
-            dimensions_/dimArea,
-            zeroGradientFaPatchScalarField::typeName
-        )
+        "H(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions_/dimArea,
+        faPatchFieldBase::extrapolatedCalculatedType()
     );
-    GeometricField<Type, faPatchField, areaMesh>& Hphi = tHphi.ref();
+    auto& Hphi = tHphi.ref();
 
     // Loop over field components
     for (direction cmpt=0; cmpt<Type::nComponents; ++cmpt)
@@ -698,23 +683,13 @@ Foam::faMatrix<Type>::flux() const
             << abort(FatalError);
     }
 
-    // construct GeometricField<Type, faePatchField, edgeMesh>
-    tmp<GeometricField<Type, faePatchField, edgeMesh>> tfieldFlux
+    auto tfieldFlux = GeometricField<Type, faePatchField, edgeMesh>::New
     (
-        new GeometricField<Type, faePatchField, edgeMesh>
-        (
-            IOobject
-            (
-                "flux("+psi_.name()+')',
-                psi_.instance(),
-                psi_.db()
-            ),
-            psi_.mesh(),
-            dimensions()
-        )
+        "flux(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions()
     );
-    GeometricField<Type, faePatchField, edgeMesh>& fieldFlux =
-        tfieldFlux.ref();
+    auto& fieldFlux = tfieldFlux.ref();
 
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; ++cmpt)
     {
diff --git a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
index 4fd605449d..d8a5ff4c7b 100644
--- a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
+++ b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,13 +24,11 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-     Finite-Area scalar matrix member functions and operators
-
 \*---------------------------------------------------------------------------*/
 
 #include "faScalarMatrix.H"
-#include "zeroGradientFaPatchFields.H"
+#include "extrapolatedCalculatedFaPatchFields.H"
+#include "profiling.H"
 #include "PrecisionAdaptor.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -136,24 +134,14 @@ Foam::tmp<Foam::scalarField> Foam::faMatrix<Foam::scalar>::residual() const
 template<>
 Foam::tmp<Foam::areaScalarField> Foam::faMatrix<Foam::scalar>::H() const
 {
-    tmp<areaScalarField> tHphi
+    auto tHphi = areaScalarField::New
     (
-        new areaScalarField
-        (
-            IOobject
-            (
-                "H("+psi_.name()+')',
-                psi_.instance(),
-                psi_.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions_/dimArea,
-            zeroGradientFaPatchScalarField::typeName
-        )
+        "H(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions_/dimArea,
+        faPatchFieldBase::extrapolatedCalculatedType()
     );
-    areaScalarField& Hphi = tHphi.ref();
+    auto& Hphi = tHphi.ref();
 
     Hphi.primitiveFieldRef() = (lduMatrix::H(psi_.primitiveField()) + source_);
     addBoundarySource(Hphi.primitiveFieldRef());
diff --git a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H
index e8652d8475..272cbd1b25 100644
--- a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H
+++ b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.H
@@ -38,10 +38,11 @@ Author
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faScalarMatrix_H
-#define faScalarMatrix_H
+#ifndef Foam_faScalarMatrix_H
+#define Foam_faScalarMatrix_H
 
 #include "faMatrix.H"
+#include "faMatricesFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 38dd6520a8..14bacc7f0e 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1285,7 +1285,7 @@ void Foam::fvMatrix<Type>::boundaryManipulate
 template<class Type>
 Foam::tmp<Foam::scalarField> Foam::fvMatrix<Type>::D() const
 {
-    tmp<scalarField> tdiag(new scalarField(diag()));
+    auto tdiag = tmp<scalarField>::New(diag());
     addCmptAvBoundaryDiag(tdiag.ref());
     return tdiag;
 }
@@ -1318,22 +1318,12 @@ Foam::tmp<Foam::Field<Type>> Foam::fvMatrix<Type>::DD() const
 template<class Type>
 Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::A() const
 {
-    tmp<volScalarField> tAphi
+    auto tAphi = volScalarField::New
     (
-        new volScalarField
-        (
-            IOobject
-            (
-                "A("+psi_.name()+')',
-                psi_.instance(),
-                psi_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions_/psi_.dimensions()/dimVol,
-            extrapolatedCalculatedFvPatchScalarField::typeName
-        )
+        "A(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions_/psi_.dimensions()/dimVol,
+        fvPatchFieldBase::extrapolatedCalculatedType()
     );
 
     tAphi.ref().primitiveFieldRef() = D()/psi_.mesh().V();
@@ -1347,24 +1337,14 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvMatrix<Type>::H() const
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tHphi
+    auto tHphi = GeometricField<Type, fvPatchField, volMesh>::New
     (
-        new GeometricField<Type, fvPatchField, volMesh>
-        (
-            IOobject
-            (
-                "H("+psi_.name()+')',
-                psi_.instance(),
-                psi_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions_/dimVol,
-            extrapolatedCalculatedFvPatchScalarField::typeName
-        )
+        "H(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions_/dimVol,
+        fvPatchFieldBase::extrapolatedCalculatedType()
     );
-    GeometricField<Type, fvPatchField, volMesh>& Hphi = tHphi.ref();
+    auto& Hphi = tHphi.ref();
 
     // Loop over field components
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
@@ -1409,24 +1389,14 @@ Foam::fvMatrix<Type>::H() const
 template<class Type>
 Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
 {
-    tmp<volScalarField> tH1
+    auto tH1 = volScalarField::New
     (
-        new volScalarField
-        (
-            IOobject
-            (
-                "H(1)",
-                psi_.instance(),
-                psi_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions_/(dimVol*psi_.dimensions()),
-            extrapolatedCalculatedFvPatchScalarField::typeName
-        )
+        "H(1)",
+        psi_.mesh(),
+        dimensions_/(dimVol*psi_.dimensions()),
+        fvPatchFieldBase::extrapolatedCalculatedType()
     );
-    volScalarField& H1_ = tH1.ref();
+    auto& H1_ = tH1.ref();
 
     H1_.primitiveFieldRef() = lduMatrix::H1();
 
@@ -1452,7 +1422,6 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
 }
 
 
-
 template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvMatrix<Type>::
@@ -1475,25 +1444,13 @@ flux() const
             << abort(FatalError);
     }
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfieldFlux
+    auto tfieldFlux = GeometricField<Type, fvsPatchField, surfaceMesh>::New
     (
-        new GeometricField<Type, fvsPatchField, surfaceMesh>
-        (
-            IOobject
-            (
-                "flux("+psi_.name()+')',
-                psi_.instance(),
-                psi_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions()
-        )
+        "flux(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions()
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& fieldFlux =
-        tfieldFlux.ref();
+    auto& fieldFlux = tfieldFlux.ref();
 
     fieldFlux.setOriented();
 
@@ -2898,24 +2855,14 @@ Foam::operator&
     const DimensionedField<Type, volMesh>& psi
 )
 {
-    tmp<GeometricField<Type, fvPatchField, volMesh>> tMphi
+    auto tMphi = GeometricField<Type, fvPatchField, volMesh>::New
     (
-        new GeometricField<Type, fvPatchField, volMesh>
-        (
-            IOobject
-            (
-                "M&" + psi.name(),
-                psi.instance(),
-                psi.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi.mesh(),
-            M.dimensions()/dimVol,
-            extrapolatedCalculatedFvPatchScalarField::typeName
-        )
+        "M&" + psi.name(),
+        psi.mesh(),
+        M.dimensions()/dimVol,
+        fvPatchFieldBase::extrapolatedCalculatedType()
     );
-    GeometricField<Type, fvPatchField, volMesh>& Mphi = tMphi.ref();
+    auto& Mphi = tMphi.ref();
 
     // Loop over field components
     if (M.hasDiag())
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 8d8fb32705..591450e206 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -356,24 +356,14 @@ Foam::tmp<Foam::scalarField> Foam::fvMatrix<Foam::scalar>::residual() const
 template<>
 Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H() const
 {
-    tmp<volScalarField> tHphi
+    auto tHphi = volScalarField::New
     (
-        new volScalarField
-        (
-            IOobject
-            (
-                "H("+psi_.name()+')',
-                psi_.instance(),
-                psi_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions_/dimVol,
-            extrapolatedCalculatedFvPatchScalarField::typeName
-        )
+        "H(" + psi_.name() + ')',
+        psi_.mesh(),
+        dimensions_/dimVol,
+        fvPatchFieldBase::extrapolatedCalculatedType()
     );
-    volScalarField& Hphi = tHphi.ref();
+    auto& Hphi = tHphi.ref();
 
     Hphi.primitiveFieldRef() = (lduMatrix::H(psi_.primitiveField()) + source_);
     addBoundarySource(Hphi.primitiveFieldRef());
@@ -388,24 +378,14 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H() const
 template<>
 Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Foam::scalar>::H1() const
 {
-    tmp<volScalarField> tH1
+    auto tH1 = volScalarField::New
     (
-        new volScalarField
-        (
-            IOobject
-            (
-                "H(1)",
-                psi_.instance(),
-                psi_.mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            psi_.mesh(),
-            dimensions_/(dimVol*psi_.dimensions()),
-            extrapolatedCalculatedFvPatchScalarField::typeName
-        )
+        "H(1)",
+        psi_.mesh(),
+        dimensions_/(dimVol*psi_.dimensions()),
+        fvPatchFieldBase::extrapolatedCalculatedType()
     );
-    volScalarField& H1_ = tH1.ref();
+    auto& H1_ = tH1.ref();
 
     H1_.primitiveFieldRef() = lduMatrix::H1();
     //addBoundarySource(Hphi.primitiveField());
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
index 82545cec64..075dce5df4 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fvScalarMatrix_H
-#define fvScalarMatrix_H
+#ifndef Foam_fvScalarMatrix_H
+#define Foam_fvScalarMatrix_H
 
 #include "fvMatrix.H"
 #include "fvMatricesFwd.H"

From 188e61af164125824866dfd95de1775f5dc2d3fb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 14 Mar 2023 17:39:28 +0100
Subject: [PATCH 155/348] STYLE: use readValueEntry in BCs. Assign Zero for
 refValue/refGrad

---
 etc/codeTemplates/BC/BC.C                     |  5 +---
 ...thDissipationRateInletFvPatchScalarField.C | 10 +++----
 ...ngLengthFrequencyInletFvPatchScalarField.C | 10 +++----
 ...ndaryLayerInletEpsilonFvPatchScalarField.C |  2 +-
 ...atmBoundaryLayerInletKFvPatchScalarField.C |  2 +-
 ...oundaryLayerInletOmegaFvPatchScalarField.C |  2 +-
 ...daryLayerInletVelocityFvPatchVectorField.C |  2 +-
 .../displacementLayeredMotionMotionSolver.C   |  2 +-
 .../SRFFreestreamVelocityFvPatchVectorField.C |  3 +--
 ...malInletOutletVelocityFvPatchVectorField.C |  2 +-
 .../freestream/freestreamFvPatchField.H       | 23 ++++++++--------
 .../freestreamPressureFvPatchScalarField.C    |  8 +++---
 .../freestreamPressureFvPatchScalarField.H    | 21 +++++----------
 .../freestreamVelocityFvPatchVectorField.C    |  8 +++---
 .../freestreamVelocityFvPatchVectorField.H    | 21 +++++----------
 ...tedInletOutletVelocityFvPatchVectorField.C |  2 +-
 ...tOutletParSlipVelocityFvPatchVectorField.C |  2 +-
 ...ureInletOutletVelocityFvPatchVectorField.C |  2 +-
 ...malInletOutletVelocityFvPatchVectorField.C |  2 +-
 ...phaInletOutletVelocityFvPatchVectorField.C |  2 +-
 ...sityKineticEnergyInletFvPatchScalarField.C | 10 +++----
 .../mappedVariableThicknessWallPolyPatch.C    |  9 +------
 .../mappedVariableThicknessWallPolyPatch.H    | 26 ++++++-------------
 ...djointFarFieldPressureFvPatchScalarField.C |  5 +---
 ...djointFarFieldVelocityFvPatchVectorField.C |  5 +---
 .../adjointInletVelocityFvPatchVectorField.C  |  5 +---
 .../adjointOutletPressureFvPatchScalarField.C |  5 +---
 .../adjointOutletVelocityFvPatchVectorField.C |  5 +---
 ...ointOutletVelocityFluxFvPatchVectorField.C |  5 +---
 .../adjointWallVelocityFvPatchVectorField.C   |  5 +---
 ...jointWallVelocityLowReFvPatchVectorField.C |  5 +---
 ...djointFarFieldNuaTildaFvPatchScalarField.C |  5 +---
 .../adjointFarFieldTMVar1FvPatchScalarField.C |  5 +---
 .../adjointFarFieldTMVar2FvPatchScalarField.C |  5 +---
 .../adjointOutletKaFvPatchScalarField.C       |  5 +---
 .../adjointOutletNuaTildaFvPatchScalarField.C |  5 +---
 ...ointOutletNuaTildaFluxFvPatchScalarField.C |  5 +---
 .../adjointOutletWaFvPatchScalarField.C       |  5 +---
 ...haseChangeWallFunctionFvPatchScalarField.C | 20 ++++----------
 ...sonJacksonParticleSlipFvPatchVectorField.C |  5 +---
 ...onJacksonParticleThetaFvPatchScalarField.C |  5 +---
 ...sonJacksonParticleSlipFvPatchVectorField.C |  5 +---
 ...onJacksonParticleThetaFvPatchScalarField.C |  5 +---
 ...pedMassWallTemperatureFvPatchScalarField.C |  8 +++---
 ...ableBaffleMassFractionFvPatchScalarField.C |  2 +-
 ...ermeableBaffleVelocityFvPatchVectorField.C |  2 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.C |  8 +++---
 ...eratureRadCoupledMixedFvPatchScalarField.C |  6 ++---
 .../wallHeatTransferFvPatchScalarField.C      |  6 ++---
 .../mixedEnergyFvPatchScalarField.C           |  4 +--
 ...iffusiveRadiationMixedFvPatchScalarField.C |  8 +++---
 ...iffusiveRadiationMixedFvPatchScalarField.C |  4 +--
 .../enthalpySorptionFvPatchScalarField.C      |  7 +----
 .../mixedUnburntEnthalpyFvPatchScalarField.C  |  4 +--
 .../speciesSorptionFvPatchScalarField.C       | 14 ++--------
 55 files changed, 124 insertions(+), 240 deletions(-)

diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index 7dc8098b37..045b57b800 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -93,10 +93,7 @@ CONSTRUCT
 
     /*
     //Initialise with the value entry if evaluation is not possible
-    FVPATCHF::operator=
-    (
-        FIELD("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
     this->refValue() = *this;
     */
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index dfdff55615..0ef4be29a2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -52,8 +52,8 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
     mixingLength_(0.0),
     Cmu_(0.0)
 {
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -92,10 +92,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
 {
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 1fec48c218..0869cb3724 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -51,8 +51,8 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
     mixingLength_(0.0),
     kName_("undefined-k")
 {
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -84,10 +84,10 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 {
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index 1c4216ed16..9250dec137 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -71,7 +71,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
 
     if (!initABL_)
     {
-        scalarField::operator=(scalarField("value", dict, p.size()));
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
     else
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index 1590676c7b..1bda2bbd54 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -70,7 +70,7 @@ atmBoundaryLayerInletKFvPatchScalarField
 
     if (!initABL_)
     {
-        scalarField::operator=(scalarField("value", dict, p.size()));
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
     else
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
index 12aff01673..4d46621c3b 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.C
@@ -69,7 +69,7 @@ atmBoundaryLayerInletOmegaFvPatchScalarField
 
     if (!initABL_)
     {
-        scalarField::operator=(scalarField("value", dict, p.size()));
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
     else
     {
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 51eacba6a0..43177f1bf9 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -70,7 +70,7 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
 
     if (!initABL_)
     {
-        vectorField::operator=(vectorField("value", dict, p.size()));
+        this->readValueEntry(dict, IOobjectOption::MUST_READ);
     }
     else
     {
diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index fefa520f88..5b88d28c57 100644
--- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -242,7 +242,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
 
     if (type == "fixedValue")
     {
-        fld = vectorField("value", dict, meshPoints.size());
+        fld.assign("value", dict, meshPoints.size());
     }
     else if (type == "timeVaryingUniformFixedValue")
     {
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index da50a57f7e..b2f876dffe 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -77,8 +77,7 @@ SRFFreestreamVelocityFvPatchVectorField
     UInf_(dict.get<vector>("UInf"))
 {
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
-
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index bb58e32123..cc33808dd1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -72,7 +72,7 @@ fixedNormalInletOutletVelocityFvPatchVectorField
     )
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
     refValue() = normalVelocity();
     refGrad() = Zero;
     valueFraction() = Zero;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
index 7a86c6db2e..76f5707391 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H
@@ -177,23 +177,24 @@ public:
 
     // Member Functions
 
-    // Access
-
+        //- Same as refValue()
         const Field<Type>& freestreamValue() const { return this->refValue(); }
+
+        //- Same as refValue()
         Field<Type>& freestreamValue() { return this->refValue(); }
 
 
-        // Mapping functions
+    // Mapping Functions
 
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap(const fvPatchFieldMapper& mapper);
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap(const fvPatchFieldMapper& mapper);
 
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchField<Type>& ptf,
-                const labelList& addr
-            );
+        //- Reverse map the given fvPatchField onto this fvPatchField
+        virtual void rmap
+        (
+            const fvPatchField<Type>& ptf,
+            const labelList& addr
+        );
 
 
         //- Update the coefficients associated with the patch field
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index aafa59a625..c75f5add6b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -55,15 +55,15 @@ freestreamPressureFvPatchScalarField
     mixedFvPatchScalarField(p, iF),
     UName_(dict.getOrDefault<word>("U", "U"))
 {
-    freestreamValue() = scalarField("freestreamValue", dict, p.size());
+    // freestreamValue() and refValue() are identical
+    freestreamValue().assign("freestreamValue", dict, p.size());
+    refGrad() = Zero;
+    valueFraction() = 0;
 
     if (!this->readValueEntry(dict))
     {
         fvPatchScalarField::operator=(freestreamValue());
     }
-
-    refGrad() = Zero;
-    valueFraction() = 0;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H
index e93b26223a..1922113c0b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H
@@ -157,24 +157,17 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-            const scalarField& freestreamValue() const
-            {
-                return refValue();
-            }
+        //- Same as refValue()
+        const scalarField& freestreamValue() const { return refValue(); }
 
-            scalarField& freestreamValue()
-            {
-                return refValue();
-            }
+        //- Same as refValue()
+        scalarField& freestreamValue() { return refValue(); }
 
 
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
index 3a147e9886..0a0af10b84 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C
@@ -49,15 +49,15 @@ Foam::freestreamVelocityFvPatchVectorField::freestreamVelocityFvPatchVectorField
 :
     mixedFvPatchVectorField(p, iF)
 {
-    freestreamValue() = vectorField("freestreamValue", dict, p.size());
+    // freestreamValue() and refValue() are identical
+    freestreamValue().assign("freestreamValue", dict, p.size());
+    refGrad() = Zero;
+    valueFraction() = 1;
 
     if (!this->readValueEntry(dict))
     {
         fvPatchVectorField::operator=(freestreamValue());
     }
-
-    refGrad() = Zero;
-    valueFraction() = 1;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H
index 26bf7ee809..aadeeb81c2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H
@@ -151,24 +151,17 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
-            const vectorField& freestreamValue() const
-            {
-                return refValue();
-            }
+        //- Same as refValue()
+        const vectorField& freestreamValue() const { return refValue(); }
 
-            vectorField& freestreamValue()
-            {
-                return refValue();
-            }
+        //- Same as refValue()
+        vectorField& freestreamValue() { return refValue(); }
 
 
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index b2cef93cf2..fa386466a5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -82,7 +82,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
     inletDir_("inletDirection", dict, p.size())
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
     refValue() = *this;
     refGrad() = Zero;
     valueFraction() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index d3b2100080..f7d0249a65 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -80,7 +80,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
     refValue() = *this;
     refGrad() = Zero;
     valueFraction() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 94d7392f31..b158e6bce4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -81,7 +81,7 @@ pressureInletOutletVelocityFvPatchVectorField
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
     if (dict.found("tangentialVelocity"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index e0ea49b05d..32be116c66 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -80,7 +80,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
     refValue() = *this;
     refGrad() = Zero;
     valueFraction() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
index 0a23414a40..21e8dab8e6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePermeableAlphaInletOutletVelocity/pressurePermeableAlphaInletOutletVelocityFvPatchVectorField.C
@@ -84,7 +84,7 @@ pressurePermeableAlphaInletOutletVelocityFvPatchVectorField
     alphaMin_(dict.getOrDefault<scalar>("alphaMin", 1))
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
     refValue() = Zero;
     refGrad() = Zero;
     valueFraction() = 1.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 06f5809c0d..1f92652f09 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -45,8 +45,8 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
     intensity_(0.0),
     UName_("U")
 {
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
@@ -91,10 +91,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
             << exit(FatalError);
     }
 
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 0.0;
 }
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
index ca9193e569..8107096ab0 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
@@ -113,7 +113,7 @@ Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch
 )
 :
     mappedWallPolyPatch(name, dict, index, bm, patchType),
-    thickness_(scalarField("thickness", dict, this->size()))
+    thickness_("thickness", dict, this->size())
 {}
 
 
@@ -157,13 +157,6 @@ Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::mappedVariableThicknessWallPolyPatch::
-~mappedVariableThicknessWallPolyPatch()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::mappedVariableThicknessWallPolyPatch::
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
index ac97145f35..e089e28526 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
@@ -37,17 +37,15 @@ SourceFiles
 #ifndef mappedVariableThicknessWallPolyPatch_H
 #define mappedVariableThicknessWallPolyPatch_H
 
+#include "scalarField.H"
 #include "wallPolyPatch.H"
 #include "mappedWallPolyPatch.H"
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class polyMesh;
-
 /*---------------------------------------------------------------------------*\
            Class mappedVariableThicknessWallPolyPatch Declaration
 \*---------------------------------------------------------------------------*/
@@ -60,7 +58,7 @@ class mappedVariableThicknessWallPolyPatch
     // Private data
 
         //- Thickness
-        scalarList thickness_;
+        scalarField thickness_;
 
 
 public:
@@ -205,24 +203,16 @@ public:
 
 
     //- Destructor
-    virtual ~mappedVariableThicknessWallPolyPatch();
+    virtual ~mappedVariableThicknessWallPolyPatch() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        //- Return non const thickness
-        scalarList& thickness()
-        {
-            return thickness_;
-        }
-
-
-        //- Return const thickness
-        const scalarList& thickness() const
-        {
-            return thickness_;
-        }
+        //- Return thickness (non-const access)
+        scalarField& thickness() noexcept { return thickness_; }
 
+        //- Return thickness (const access)
+        const scalarField& thickness() const noexcept { return thickness_; }
 
         //- Write the polyPatch data as a dictionary
         void write(Ostream&) const;
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
index c4dea30df3..7f40afe8a4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldPressure/adjointFarFieldPressureFvPatchScalarField.C
@@ -73,10 +73,7 @@ adjointFarFieldPressureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
index 71e56b5359..b39a0a2c97 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointFarFieldVelocity/adjointFarFieldVelocityFvPatchVectorField.C
@@ -69,10 +69,7 @@ adjointFarFieldVelocityFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF),
     adjointVectorBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<vector>::operator=
-    (
-        vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
index 869b4c9dec..d6a6d3fa43 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
@@ -71,10 +71,7 @@ adjointInletVelocityFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF),
     adjointVectorBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<vector>::operator=
-    (
-        vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index 0e80d181e2..b0bf3c563e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -74,10 +74,7 @@ adjointOutletPressureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 49adb64b19..41d715afa4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -131,10 +131,7 @@ adjointOutletVelocityFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF),
     adjointVectorBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<vector>::operator=
-    (
-         vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
index dd385480e3..597cc61d62 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
@@ -71,10 +71,7 @@ adjointOutletVelocityFluxFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF),
     adjointVectorBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<vector>::operator=
-    (
-         vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
index 2ee1f2a848..0172840bb0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
@@ -77,10 +77,7 @@ adjointWallVelocityFvPatchVectorField
     kappa_(dict.getOrDefault<scalar>("kappa", 0.41)),
     E_(dict.getOrDefault<scalar>("E", 9.8))
 {
-    fvPatchField<vector>::operator=
-    (
-        vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
index fb54a88b1a..bc4e70af26 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocityLowRe/adjointWallVelocityLowReFvPatchVectorField.C
@@ -70,10 +70,7 @@ adjointWallVelocityLowReFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF),
     adjointVectorBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<vector>::operator=
-    (
-        vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
index 13340dc1b6..05dd9aba11 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldNuaTilda/adjointFarFieldNuaTildaFvPatchScalarField.C
@@ -77,10 +77,7 @@ adjointFarFieldNuaTildaFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
index 35d9034a0c..13db68bb89 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar1/adjointFarFieldTMVar1FvPatchScalarField.C
@@ -76,10 +76,7 @@ adjointFarFieldTMVar1FvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
index b51d8be812..7f269509ae 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointFarFieldTMVar2/adjointFarFieldTMVar2FvPatchScalarField.C
@@ -76,10 +76,7 @@ adjointFarFieldTMVar2FvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
index dbbfac5451..4c49cb09b1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletKa/adjointOutletKaFvPatchScalarField.C
@@ -72,10 +72,7 @@ adjointOutletKaFvPatchScalarField::adjointOutletKaFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
index 32cc4f76c9..78c4b1dae6 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTilda/adjointOutletNuaTildaFvPatchScalarField.C
@@ -73,10 +73,7 @@ adjointOutletNuaTildaFvPatchScalarField::adjointOutletNuaTildaFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
index 2382fa4e17..758b23c65d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
@@ -76,10 +76,7 @@ adjointOutletNuaTildaFluxFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
index 68fab059d3..0809fc0b25 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletWa/adjointOutletWaFvPatchScalarField.C
@@ -72,10 +72,7 @@ adjointOutletWaFvPatchScalarField::adjointOutletWaFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     adjointScalarBoundaryCondition(p, iF, dict.get<word>("solverName"))
 {
-    fvPatchField<scalar>::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
index dae81c48d9..21d19c3bcb 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -51,8 +51,8 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    dmdt_(p.size(), 0),
-    mDotL_(p.size(), 0)
+    dmdt_(p.size(), Zero),
+    mDotL_(p.size(), Zero)
 {}
 
 
@@ -65,19 +65,9 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    dmdt_(p.size(), 0),
-    mDotL_(p.size(), 0)
-{
-    if (dict.found("dmdt"))
-    {
-        dmdt_ = scalarField("dmdt", dict, p.size());
-    }
-
-    if (dict.found("mDotL"))
-    {
-        dmdt_ = scalarField("mDotL", dict, p.size());
-    }
-}
+    dmdt_("dmdt", dict, p.size(), IOobjectOption::LAZY_READ),
+    mDotL_("mDotL", dict, p.size(), IOobjectOption::LAZY_READ)
+{}
 
 
 alphatPhaseChangeWallFunctionFvPatchScalarField::
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index a1d4580da7..add9f321a1 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -91,10 +91,7 @@ JohnsonJacksonParticleSlipFvPatchVectorField
             << abort(FatalError);
     }
 
-    fvPatchVectorField::operator=
-    (
-        vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index d46037600c..ce782fc762 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -105,10 +105,7 @@ JohnsonJacksonParticleThetaFvPatchScalarField
             << abort(FatalError);
     }
 
-    fvPatchScalarField::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 84d56ae636..8c4d5335be 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -91,10 +91,7 @@ JohnsonJacksonParticleSlipFvPatchVectorField
             << abort(FatalError);
     }
 
-    fvPatchVectorField::operator=
-    (
-        vectorField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 6947267135..a073bada84 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -105,10 +105,7 @@ JohnsonJacksonParticleThetaFvPatchScalarField
             << abort(FatalError);
     }
 
-    fvPatchScalarField::operator=
-    (
-        scalarField("value", dict, p.size())
-    );
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
index 2d1ecc121c..d2ddbbe2e2 100644
--- a/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
@@ -83,11 +83,11 @@ lumpedMassWallTemperatureFvPatchScalarField
     mass_(dict.get<scalar>("mass")),
     curTimeIndex_(-1)
 {
-    refGrad() = 0.0;
+    fvPatchFieldBase::readDict(dict);
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
+    refValue() = *this;
+    refGrad() = Zero;
     valueFraction() = 1.0;
-    refValue() = scalarField("value", dict, p.size());
-
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
index d9d00a8bd3..ce75942e27 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
@@ -66,7 +66,7 @@ semiPermeableBaffleMassFractionFvPatchScalarField
     c_(dict.getOrDefault<scalar>("c", 0)),
     phiName_(dict.getOrDefault<word>("phi", "phi"))
 {
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
     refValue() = Zero;
     refGrad() = Zero;
diff --git a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
index 579989b7f1..a4d24cead9 100644
--- a/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
+++ b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
@@ -86,7 +86,7 @@ semiPermeableBaffleVelocityFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF),
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
 {
-    fvPatchVectorField::operator==(vectorField("value", dict, p.size()));
+    this->readValueEntry(dict, IOobjectOption::MUST_READ);
 }
 
 
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index e23e941453..379eb0b991 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -57,8 +57,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
     ),
     TnbrName_("undefined-Tnbr")
 {
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 1.0;
 }
 
@@ -153,7 +153,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
     {
         // Start from user entered data. Assume fixedValue.
         refValue() = *this;
-        refGrad() = 0.0;
+        refGrad() = Zero;
         valueFraction() = 1.0;
     }
 
@@ -377,7 +377,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
     //    - mixFraction = nbrKDelta / (nbrKDelta + myKDelta())
 
     this->refValue() = nbrIntFld;
-    this->refGrad() = 0.0;
+    this->refGrad() = Zero;
     this->valueFraction() = nbrKDelta/(nbrKDelta + myKDelta());
 
     mixedFvPatchScalarField::updateCoeffs();
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index ced3437922..7e5da847ca 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -62,8 +62,8 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
     qrName_("undefined-qr"),
     thermalInertia_(false)
 {
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
     this->valueFraction() = 1.0;
     this->source() = 0.0;
 }
@@ -201,7 +201,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
     {
         // Start from user entered data. Assume fixedValue.
         refValue() = *this;
-        refGrad() = 0.0;
+        refGrad() = Zero;
         valueFraction() = 1.0;
     }
 
diff --git a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index d8862abdad..2c435144f0 100644
--- a/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -42,8 +42,8 @@ Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
     Tinf_(p.size(), Zero),
     alphaWall_(p.size(), Zero)
 {
-    refValue() = 0.0;
-    refGrad() = 0.0;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 }
 
@@ -74,7 +74,7 @@ Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
     alphaWall_("alphaWall", dict, p.size())
 {
     refValue() = Tinf_;
-    refGrad() = 0.0;
+    refGrad() = Zero;
     valueFraction() = 0.0;
 
     if (!this->readValueEntry(dict))
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
index 4e0a680fb2..0f755657ed 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
@@ -46,8 +46,8 @@ mixedEnergyFvPatchScalarField
     mixedFvPatchScalarField(p, iF)
 {
     valueFraction() = 0.0;
-    refValue() = 0.0;
-    refGrad() = 0.0;
+    refValue() = Zero;
+    refGrad() = Zero;
     source() = 0.0;
 }
 
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index ccf1d365ad..cb6dc1b7c7 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -53,8 +53,8 @@ greyDiffusiveRadiationMixedFvPatchScalarField
     qRadExt_(0),
     qRadExtDir_(Zero)
 {
-    refValue() = 0.0;
-    refGrad() = 0.0;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 1.0;
 }
 
@@ -95,8 +95,8 @@ greyDiffusiveRadiationMixedFvPatchScalarField
     }
     else
     {
-        refValue() = 0.0;
-        refGrad() = 0.0;
+        refValue() = Zero;
+        refGrad() = Zero;
         valueFraction() = 1.0;
 
         fvPatchScalarField::operator=(refValue());
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index 0c4c68caf3..b6ae35082a 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -50,8 +50,8 @@ wideBandDiffusiveRadiationMixedFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF)
 {
-    refValue() = 0.0;
-    refGrad() = 0.0;
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 1.0;
 }
 
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
index 9cf248c50d..a3caadc95a 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/enthalpySorption/enthalpySorptionFvPatchScalarField.C
@@ -82,12 +82,7 @@ Foam::enthalpySorptionFvPatchScalarField::enthalpySorptionFvPatchScalarField
     speciesName_(dict.get<word>("species")),
     pName_(dict.getOrDefault<word>("p", "p")),
     TName_(dict.getOrDefault<word>("T", "T")),
-    dhdt_
-    (
-        dict.found("dhdt")
-      ? scalarField("dhdt", dict, p.size())
-      : scalarField(p.size(), 0)
-    )
+    dhdt_("dhdt", dict, p.size(), IOobjectOption::LAZY_READ)
 {
     switch (enthalpyModel_)
     {
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
index ab14754c6c..b0c64d90fe 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
@@ -42,9 +42,9 @@ mixedUnburntEnthalpyFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF)
 {
+    refValue() = Zero;
+    refGrad() = Zero;
     valueFraction() = 0.0;
-    refValue() = 0.0;
-    refGrad() = 0.0;
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
index efbce74bae..f1275de1bc 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
@@ -174,18 +174,8 @@ Foam::speciesSorptionFvPatchScalarField::speciesSorptionFvPatchScalarField
     max_(dict.getCheck<scalar>("max", scalarMinMax::ge(0))),
     rhoS_(dict.get<scalar>("rhoS")),
     pName_(dict.getOrDefault<word>("p", "p")),
-    dfldp_
-    (
-        dict.found("dfldp")
-      ? scalarField("dfldp", dict, p.size())
-      : scalarField(p.size(), 0)
-    ),
-    mass_
-    (
-        dict.found("mass")
-      ? scalarField("mass", dict, p.size())
-      : scalarField(p.size(), 0)
-    )
+    dfldp_("dfldp", dict, p.size(), IOobjectOption::LAZY_READ),
+    mass_("mass", dict, p.size(), IOobjectOption::LAZY_READ)
 {
     if (!this->readValueEntry(dict))
     {

From 475ed5cc32d2c28f5d1064e7c8be3bcfe105deeb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 14 Mar 2023 17:39:28 +0100
Subject: [PATCH 156/348] STYLE: readOnProc/writeOnProc instead of 'valid' for
 IO

---
 applications/test/IOField/Test-IOField.C      | 14 +++--
 .../foamFormatConvert/foamFormatConvert.C     |  9 ++-
 .../unmappedPassivePositionParticleCloud.H    |  2 +-
 .../IOobjects/CompactIOField/CompactIOField.C | 20 +++---
 .../IOobjects/CompactIOField/CompactIOField.H |  8 +--
 .../IOobjects/CompactIOList/CompactIOList.C   |  6 +-
 .../IOobjects/CompactIOList/CompactIOList.H   |  2 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.C   | 37 ++++++-----
 src/OpenFOAM/db/IOobjects/IOField/IOField.H   |  5 +-
 .../decomposedBlockData/decomposedBlockData.C |  2 +-
 .../decomposedBlockData/decomposedBlockData.H |  2 +-
 .../db/IOstreams/Fstreams/masterOFstream.C    | 10 +--
 .../db/IOstreams/Fstreams/masterOFstream.H    |  8 +--
 src/OpenFOAM/db/Time/Time.H                   |  2 +-
 src/OpenFOAM/db/Time/TimeIO.C                 |  4 +-
 .../db/objectRegistry/objectRegistry.C        |  4 +-
 .../db/objectRegistry/objectRegistry.H        |  2 +-
 src/OpenFOAM/db/regIOobject/regIOobject.H     | 12 ++--
 src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 10 +--
 .../db/regIOobject/regIOobjectWrite.C         |  8 +--
 .../collatedFileOperation.C                   |  6 +-
 .../collatedFileOperation.H                   |  2 +-
 .../fileOperation/fileOperation.C             |  4 +-
 .../fileOperation/fileOperation.H             | 10 +--
 .../masterUncollatedFileOperation.C           | 32 ++++++----
 .../masterUncollatedFileOperation.H           | 10 +--
 .../uncollatedFileOperation.C                 |  8 +--
 .../uncollatedFileOperation.H                 |  4 +-
 src/OpenFOAM/global/profiling/profiling.C     |  2 +-
 src/OpenFOAM/global/profiling/profiling.H     |  2 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  4 +-
 .../polyBoundaryMesh/polyBoundaryMesh.H       |  2 +-
 .../coordinate/systems/coordinateSystems.C    | 10 +--
 .../coordinate/systems/coordinateSystems.H    |  4 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C |  8 +--
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.H |  2 +-
 .../motionSolvers/motionSolver/motionSolver.C |  2 +-
 .../motionSolvers/motionSolver/motionSolver.H |  2 +-
 .../polyTopoChange/hexRef8/hexRef8.C          | 10 +--
 .../polyTopoChange/hexRef8/hexRef8.H          |  2 +-
 .../faMesh/faBoundaryMesh/faBoundaryMesh.C    |  4 +-
 .../faMesh/faBoundaryMesh/faBoundaryMesh.H    |  2 +-
 src/finiteArea/faMesh/faMesh.C                |  2 +-
 src/finiteArea/faMesh/faMesh.H                |  2 +-
 src/finiteVolume/fvMesh/fvMesh.C              | 12 ++--
 src/finiteVolume/fvMesh/fvMesh.H              |  4 +-
 .../field/streamLine/streamLineParticle.C     | 12 ++--
 .../Templates/DSMCParcel/DSMCParcelIO.C       | 17 +++---
 src/lagrangian/basic/Cloud/Cloud.H            |  2 +-
 src/lagrangian/basic/Cloud/CloudIO.C          | 16 ++---
 src/lagrangian/basic/IOPosition/IOPosition.C  |  7 ++-
 src/lagrangian/basic/IOPosition/IOPosition.H  |  4 +-
 .../basic/particle/particleTemplates.C        | 16 ++---
 .../CollidingParcel/CollidingParcelIO.C       | 44 ++++++-------
 .../KinematicParcel/KinematicParcelIO.C       | 48 +++++++--------
 .../Templates/MPPICParcel/MPPICParcelIO.C     |  9 ++-
 .../ReactingHeterogeneousParcelIO.C           | 21 ++++---
 .../ReactingMultiphaseParcelIO.C              | 23 ++++---
 .../ReactingParcel/ReactingParcelIO.C         | 14 +++--
 .../Templates/ThermoParcel/ThermoParcelIO.C   | 12 ++--
 .../AveragingMethod/AveragingMethod.C         | 10 +--
 .../AveragingMethod/AveragingMethod.H         |  2 +-
 .../molecule/molecule/moleculeIO.C            | 50 ++++++++-------
 .../solidParticle/solidParticleIO.C           | 11 ++--
 .../Templates/SprayParcel/SprayParcelIO.C     | 61 ++++++++++---------
 .../triSurfaceMesh/triSurfaceMesh.C           |  2 +-
 .../triSurfaceMesh/triSurfaceMesh.H           |  2 +-
 src/meshTools/topoSet/topoSets/cellZoneSet.C  |  6 +-
 src/meshTools/topoSet/topoSets/cellZoneSet.H  |  2 +-
 src/meshTools/topoSet/topoSets/faceZoneSet.C  |  6 +-
 src/meshTools/topoSet/topoSets/faceZoneSet.H  |  2 +-
 src/meshTools/topoSet/topoSets/pointZoneSet.C |  6 +-
 src/meshTools/topoSet/topoSets/pointZoneSet.H |  2 +-
 .../incompressiblePrimalSolver.H              |  1 -
 .../dynamicOversetFvMesh.C                    |  7 ++-
 .../dynamicOversetFvMesh.H                    |  2 +-
 src/overset/oversetFvMesh/oversetFvMeshBase.C |  8 +--
 src/overset/oversetFvMesh/oversetFvMeshBase.H |  2 +-
 .../staticOversetFvMesh/staticOversetFvMesh.C |  6 +-
 .../staticOversetFvMesh/staticOversetFvMesh.H |  2 +-
 .../distributedTriSurfaceMesh.C               |  4 +-
 .../distributedTriSurfaceMesh.H               |  2 +-
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.C |  4 +-
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.H |  2 +-
 .../rigidBodyMeshMotionSolver.C               |  4 +-
 .../rigidBodyMeshMotionSolver.H               |  2 +-
 .../sixDoFRigidBodyMotionSolver.C             |  4 +-
 .../sixDoFRigidBodyMotionSolver.H             |  2 +-
 .../MeshedSurfaceIOAllocator.C                |  6 +-
 .../MeshedSurfaceIOAllocator.H                |  2 +-
 src/surfMesh/polySurface/polySurface.H        |  2 +-
 src/surfMesh/polySurface/polySurfaceIO.C      |  2 +-
 src/surfMesh/surfMesh/surfMesh.H              |  2 +-
 src/surfMesh/surfMesh/surfMeshIO.C            |  6 +-
 94 files changed, 415 insertions(+), 383 deletions(-)

diff --git a/applications/test/IOField/Test-IOField.C b/applications/test/IOField/Test-IOField.C
index 478d917359..d921dc09b0 100644
--- a/applications/test/IOField/Test-IOField.C
+++ b/applications/test/IOField/Test-IOField.C
@@ -46,35 +46,39 @@ using namespace Foam;
 template<class Type>
 void doWrite(const IOobject& io, const label sz)
 {
+    const bool writeOnProc = (sz > 0);
+
     IOField<Type> fld(io, sz);
     forAll(fld, i)
     {
         fld[i] = i + 1000.25 + (0.25 * i);
     }
     Pout<< "writing:" << fld << endl;
-    fld.write(sz > 0);
+    fld.write(writeOnProc);
 }
 
 
 template<>
 void doWrite<bool>(const IOobject& io, const label sz)
 {
+    const bool writeOnProc = (sz > 0);
+
     IOField<bool> fld(io, sz);
     forAll(fld, i)
     {
         fld[i] = i % 2;
     }
     Pout<< "writing:" << fld << endl;
-    fld.write(sz > 0);
+    fld.write(writeOnProc);
 }
 
 
 template<class Type>
 void doRead(const IOobject& io, const label sz)
 {
-    bool valid = (sz > 0);
-    Pout<< "    valid:" << valid << endl;
-    IOField<Type> fld(io, valid);
+    const bool readOnProc = (sz > 0);
+    Pout<< "    readOnProc:" << readOnProc << endl;
+    IOField<Type> fld(io, readOnProc);
     Pout<< "    wanted:" << sz << " actually read:" << fld.size() << endl;
 
     if (fld.size() != sz)
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index 45734f1ef5..e95503d021 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -203,7 +203,7 @@ bool writeOptionalMeshObject
     const word& name,
     const fileName& meshDir,
     Time& runTime,
-    const bool valid
+    const bool writeOnProc
 )
 {
     IOobject io
@@ -218,8 +218,7 @@ bool writeOptionalMeshObject
     );
 
     bool writeOk = false;
-
-    bool haveFile = io.typeHeaderOk<IOField<label>>(false);
+    const bool haveFile = io.typeHeaderOk<IOField<label>>(false);
 
     // Make sure all know if there is a valid class name
     wordList classNames(1, io.headerClassName());
@@ -230,10 +229,10 @@ bool writeOptionalMeshObject
     {
         Info<< "        Reading " << classNames[0]
             << " : " << name << endl;
-        T meshObject(io, valid && haveFile);
+        T meshObject(io, writeOnProc && haveFile);
 
         Info<< "        Writing " << name << endl;
-        writeOk = meshObject.regIOobject::write(valid && haveFile);
+        writeOk = meshObject.regIOobject::write(writeOnProc && haveFile);
     }
 
     return writeOk;
diff --git a/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H b/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H
index 74cc738f15..031e04801c 100644
--- a/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H
+++ b/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H
@@ -94,7 +94,7 @@ public:
         {}
 
         //- Disable writing objects
-        virtual bool writeObject(IOstreamOption, const bool valid) const
+        virtual bool writeObject(IOstreamOption, const bool writeOnProc) const
         {
             return true;
         }
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
index e89d103913..b37ae44d6b 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
@@ -32,11 +32,11 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T, class BaseType>
-void Foam::CompactIOField<T, BaseType>::readFromStream(const bool valid)
+void Foam::CompactIOField<T, BaseType>::readFromStream(const bool readOnProc)
 {
-    Istream& is = readStream(word::null, valid);
+    Istream& is = readStream(word::null, readOnProc);
 
-    if (valid)
+    if (readOnProc)
     {
         if (headerClassName() == IOField<T>::typeName)
         {
@@ -93,19 +93,19 @@ template<class T, class BaseType>
 Foam::CompactIOField<T, BaseType>::CompactIOField
 (
     const IOobject& io,
-    const bool valid
+    const bool readOnProc
 )
 :
     regIOobject(io)
 {
     if (readOpt() == IOobject::MUST_READ)
     {
-        readFromStream(valid);
+        readFromStream(readOnProc);
     }
     else if (isReadOptional())
     {
-        bool haveFile = headerOk();
-        readFromStream(valid && haveFile);
+        const bool haveFile = headerOk();
+        readFromStream(readOnProc && haveFile);
     }
 }
 
@@ -176,7 +176,7 @@ template<class T, class BaseType>
 bool Foam::CompactIOField<T, BaseType>::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     if (streamOpt.format() == IOstreamOption::ASCII)
@@ -186,7 +186,7 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
 
         const_cast<word&>(typeName) = IOField<T>::typeName;
 
-        bool good = regIOobject::writeObject(streamOpt, valid);
+        bool good = regIOobject::writeObject(streamOpt, writeOnProc);
 
         // Restore type
         const_cast<word&>(typeName) = oldTypeName;
@@ -194,7 +194,7 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
         return good;
     }
 
-    return regIOobject::writeObject(streamOpt, valid);
+    return regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
index fe7baa3a7e..506a0e0c67 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
@@ -76,8 +76,8 @@ class CompactIOField
 {
     // Private Member Functions
 
-        //- Read according to header type
-        void readFromStream(const bool valid = true);
+        //- Read according to header type, with optional 'on-proc' value
+        void readFromStream(const bool readOnProc = true);
 
         //- Read if IOobject flags set. Return true if read.
         //  Reads according to the header type
@@ -99,7 +99,7 @@ public:
         explicit CompactIOField(const IOobject& io);
 
         //- Construct from IOobject, with local processor conditional reading
-        CompactIOField(const IOobject& io, const bool valid);
+        CompactIOField(const IOobject& io, const bool readOnProc);
 
         //- Construct from IOobject and zero size (if not read)
         CompactIOField(const IOobject& io, Foam::zero);
@@ -124,7 +124,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         virtual bool writeData(Ostream& os) const;
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index 3780264f83..eb9ec7c591 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
@@ -169,7 +169,7 @@ template<class T, class BaseType>
 bool Foam::CompactIOList<T, BaseType>::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     if
@@ -193,7 +193,7 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
 
         const_cast<word&>(typeName) = IOList<T>::typeName;
 
-        bool good = regIOobject::writeObject(streamOpt, valid);
+        bool good = regIOobject::writeObject(streamOpt, writeOnProc);
 
         // Change type back
         const_cast<word&>(typeName) = oldTypeName;
@@ -201,7 +201,7 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
         return good;
     }
 
-    return regIOobject::writeObject(streamOpt, valid);
+    return regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index 20312ff262..77d599428f 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -127,7 +127,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         virtual bool writeData(Ostream&) const;
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 516971f8c0..3c4a7a9eb5 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -30,13 +30,25 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+template<class Type>
+void Foam::IOField<Type>::readFromStream(const bool readOnProc)
+{
+    Istream& is = readStream(typeName, readOnProc);
+
+    if (readOnProc)
+    {
+        is >> *this;
+    }
+    close();
+}
+
+
 template<class Type>
 bool Foam::IOField<Type>::readContents()
 {
     if (isReadRequired() || (isReadOptional() && headerOk()))
     {
-        readStream(typeName) >> *this;
-        close();
+        readFromStream();
         return true;
     }
 
@@ -59,7 +71,7 @@ Foam::IOField<Type>::IOField(const IOobject& io)
 
 
 template<class Type>
-Foam::IOField<Type>::IOField(const IOobject& io, const bool valid)
+Foam::IOField<Type>::IOField(const IOobject& io, const bool readOnProc)
 :
     regIOobject(io)
 {
@@ -68,25 +80,12 @@ Foam::IOField<Type>::IOField(const IOobject& io, const bool valid)
 
     if (isReadRequired())
     {
-        Istream& is = readStream(typeName, valid);
-
-        if (valid)
-        {
-            is >> *this;
-        }
-        close();
+        readFromStream(readOnProc);
     }
     else if (isReadOptional())
     {
-        bool haveFile = headerOk();
-
-        Istream& is = readStream(typeName, haveFile && valid);
-
-        if (valid && haveFile)
-        {
-            is >> *this;
-        }
-        close();
+        const bool haveFile = headerOk();
+        readFromStream(readOnProc && haveFile);
     }
 }
 
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index bb6bff2584..3132244c2b 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -59,6 +59,9 @@ class IOField
 {
     // Private Member Functions
 
+        //- Read with optional 'on-proc' value
+        void readFromStream(const bool readOnProc = true);
+
         //- Read if IOobject flags set. Return true if read.
         bool readContents();
 
@@ -80,7 +83,7 @@ public:
         explicit IOField(const IOobject& io);
 
         //- Construct from IOobject, with local processor conditional reading
-        IOField(const IOobject& io, const bool valid);
+        IOField(const IOobject& io, const bool readOnProc);
 
         //- Construct from IOobject and zero size (if not read)
         IOField(const IOobject& io, Foam::zero);
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
index 1d5105688b..aff5bd271e 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -1002,7 +1002,7 @@ bool Foam::decomposedBlockData::writeData(Ostream& os) const
 bool Foam::decomposedBlockData::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     autoPtr<OSstream> osPtr;
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
index 247a7006f2..bedc5e5e5e 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
@@ -188,7 +188,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
index 58f1caddf3..79da7ae93b 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
@@ -101,7 +101,7 @@ void Foam::masterOFstream::commit()
 
         if (uniform)
         {
-            if (Pstream::master() && valid_)
+            if (Pstream::master() && writeOnProc_)
             {
                 checkWrite(pathName_, this->str());
             }
@@ -116,7 +116,7 @@ void Foam::masterOFstream::commit()
         // Send my (valid) buffer to master
         if (!Pstream::master())
         {
-            if (valid_)
+            if (writeOnProc_)
             {
                 string s(this->str());
 
@@ -131,7 +131,7 @@ void Foam::masterOFstream::commit()
         if (Pstream::master())
         {
             // Write (valid) master data
-            if (valid_)
+            if (writeOnProc_)
             {
                 checkWrite(filePaths[Pstream::masterNo()], this->str());
             }
@@ -173,7 +173,7 @@ Foam::masterOFstream::masterOFstream
     const fileName& pathName,
     IOstreamOption streamOpt,
     IOstreamOption::appendType append,
-    const bool valid
+    const bool writeOnProc
 )
 :
     OStringStream(streamOpt),
@@ -181,7 +181,7 @@ Foam::masterOFstream::masterOFstream
     atomic_(atomic),
     compression_(streamOpt.compression()),
     append_(append),
-    valid_(valid)
+    writeOnProc_(writeOnProc)
 {}
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
index aa75227b94..4abeaf17e8 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
@@ -68,7 +68,7 @@ class masterOFstream
         const IOstreamOption::appendType append_;
 
         //- Should file be written (on this processor)
-        const bool valid_;
+        const bool writeOnProc_;
 
 
     // Private Member Functions
@@ -100,7 +100,7 @@ public:
             const fileName& pathname,
             IOstreamOption streamOpt = IOstreamOption(),
             IOstreamOption::appendType append = IOstreamOption::NON_APPEND,
-            const bool valid = true
+            const bool writeOnProc = true
         );
 
         //- Construct (with worldComm)
@@ -110,7 +110,7 @@ public:
             const fileName& pathname,
             IOstreamOption streamOpt = IOstreamOption(),
             IOstreamOption::appendType append = IOstreamOption::NON_APPEND,
-            const bool valid = true
+            const bool writeOnProc = true
         )
         :
             masterOFstream
@@ -119,7 +119,7 @@ public:
                 pathname,
                 streamOpt,
                 append,
-                valid
+                writeOnProc
             )
         {}
 
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index ec329333e7..f9a410114f 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -465,7 +465,7 @@ public:
             virtual bool writeObject
             (
                 IOstreamOption streamOpt,
-                const bool valid
+                const bool writeOnProc
             ) const;
 
             //- Write the objects immediately (not at end of iteration)
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index d41f0485f5..5f54fc28dc 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -547,7 +547,7 @@ bool Foam::Time::writeTimeDict() const
 bool Foam::Time::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     if (writeTime())
@@ -556,7 +556,7 @@ bool Foam::Time::writeObject
 
         if (writeOK)
         {
-            writeOK = objectRegistry::writeObject(streamOpt, valid);
+            writeOK = objectRegistry::writeObject(streamOpt, writeOnProc);
         }
 
         if (writeOK)
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 9f730d0375..13f1b5f16e 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -500,7 +500,7 @@ bool Foam::objectRegistry::readIfModified()
 bool Foam::objectRegistry::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     bool ok = true;
@@ -521,7 +521,7 @@ bool Foam::objectRegistry::writeObject
 
         if (iter.val()->writeOpt() != IOobjectOption::NO_WRITE)
         {
-            ok = iter.val()->writeObject(streamOpt, valid) && ok;
+            ok = iter.val()->writeObject(streamOpt, writeOnProc) && ok;
         }
     }
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index d8a56712bb..f0cff91d5c 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -585,7 +585,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index bdd4d9ec25..ea84d29dc3 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -114,7 +114,7 @@ private:
     // Private Member Functions
 
         //- Construct object stream, read header if not already constructed
-        void readStream(const bool valid);
+        void readStream(const bool readOnProc);
 
         //- No copy assignment
         void operator=(const regIOobject&) = delete;
@@ -306,7 +306,7 @@ public:
             bool headerOk();
 
             //- Return Istream and check object type against that given
-            Istream& readStream(const word&, const bool valid = true);
+            Istream& readStream(const word&, const bool readOnProc = true);
 
             //- Close Istream
             void close();
@@ -347,11 +347,11 @@ public:
             virtual bool writeObject
             (
                 IOstreamOption streamOpt,
-                const bool valid
+                const bool writeOnProc
             ) const;
 
             //- Write using setting from DB
-            virtual bool write(const bool valid = true) const;
+            virtual bool write(const bool writeOnProc = true) const;
 
 
         // Other
@@ -378,10 +378,10 @@ public:
             IOstreamOption::streamFormat fmt,
             IOstreamOption::versionNumber ver,
             IOstreamOption::compressionType cmp,
-            const bool valid
+            const bool writeOnProc
         ) const
         {
-            return writeObject(IOstreamOption(fmt, ver, cmp), valid);
+            return writeObject(IOstreamOption(fmt, ver, cmp), writeOnProc);
         }
 };
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 9de632967e..7f47d0f818 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -83,7 +83,7 @@ bool Foam::regIOobject::readHeaderOk
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::regIOobject::readStream(const bool valid)
+void Foam::regIOobject::readStream(const bool readOnProc)
 {
     if (readOpt() == IOobject::NO_READ)
     {
@@ -117,7 +117,7 @@ void Foam::regIOobject::readStream(const bool valid)
             }
         }
 
-        isPtr_ = fileHandler().readStream(*this, objPath, type(), valid);
+        isPtr_ = fileHandler().readStream(*this, objPath, type(), readOnProc);
     }
 }
 
@@ -125,7 +125,7 @@ void Foam::regIOobject::readStream(const bool valid)
 Foam::Istream& Foam::regIOobject::readStream
 (
     const word& expectName,
-    const bool valid
+    const bool readOnProc
 )
 {
     if (IFstream::debug)
@@ -140,14 +140,14 @@ Foam::Istream& Foam::regIOobject::readStream
     // Construct IFstream if not already constructed
     if (!isPtr_)
     {
-        readStream(valid);
+        readStream(readOnProc);
 
         // Check the className of the regIOobject
         // dictionary is an allowable name in case the actual class
         // instantiated is a dictionary
         if
         (
-            valid
+            readOnProc
          && expectName.size()
          && headerClassName() != expectName
          && headerClassName() != "dictionary"
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index 42864ee98a..44dcdcd449 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -35,7 +35,7 @@ License
 bool Foam::regIOobject::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     if (!good())
@@ -107,7 +107,7 @@ bool Foam::regIOobject::writeObject
     bool osGood = false;
     if (!masterOnly || Pstream::master())
     {
-        osGood = fileHandler().writeObject(*this, streamOpt, valid);
+        osGood = fileHandler().writeObject(*this, streamOpt, writeOnProc);
     }
     else
     {
@@ -131,12 +131,12 @@ bool Foam::regIOobject::writeObject
 }
 
 
-bool Foam::regIOobject::write(const bool valid) const
+bool Foam::regIOobject::write(const bool writeOnProc) const
 {
     return writeObject
     (
         IOstreamOption(time().writeFormat(), time().writeCompression()),
-        valid
+        writeOnProc
     );
 }
 
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
index ec67865fca..e12779bf69 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -364,7 +364,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
 (
     const regIOobject& io,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     const Time& tm = io.time();
@@ -392,7 +392,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
             pathName,
             streamOpt,
             IOstreamOption::NON_APPEND,
-            valid
+            writeOnProc
         );
 
         // If any of these fail, return
@@ -436,7 +436,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
                 pathName,
                 streamOpt,
                 IOstreamOption::NON_APPEND,
-                valid
+                writeOnProc
             );
 
             // If any of these fail, return
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
index b789fee4a9..fdfd59c2c4 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -162,7 +162,7 @@ public:
             (
                 const regIOobject&,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 
         // Other
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 62a485d85b..4fcef621cf 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -801,10 +801,10 @@ bool Foam::fileOperation::writeObject
 (
     const regIOobject& io,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
-    if (valid)
+    if (writeOnProc)
     {
         const fileName pathName(io.objectPath());
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 982ac5dfe4..8da0f46275 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -433,7 +433,7 @@ public:
                 regIOobject&,
                 const fileName&,
                 const word& typeName,
-                const bool valid = true
+                const bool readOnProc = true
             ) const = 0;
 
             //- Top-level read
@@ -447,14 +447,14 @@ public:
 
             //- Writes a regIOobject (so header, contents and divider).
             //  Returns success state. Default action is to write to
-            //  the objectPath using writeData. If !valid the
+            //  the objectPath using writeData. If !writeOnProc the
             //  file does not need to be written (this is used e.g. to
             //  suppress empty local lagrangian data)
             virtual bool writeObject
             (
                 const regIOobject& io,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 
 
@@ -477,7 +477,7 @@ public:
             (
                 const fileName& pathname,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const = 0;
 
             //- Generate an OSstream that writes a file
@@ -486,7 +486,7 @@ public:
                 IOstreamOption::atomicType atomic,
                 const fileName& pathname,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const = 0;
 
 
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index df2c0822c8..de391d0b0c 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -1835,7 +1835,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
     regIOobject& io,
     const fileName& fName,
     const word& typeName,
-    const bool valid
+    const bool readOnProc
 ) const
 {
     if (debug)
@@ -1843,7 +1843,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
         Pout<< "masterUncollatedFileOperation::readStream :"
             << " object : " << io.name()
             << " global : " << io.global()
-            << " fName : " << fName << " valid:" << valid << endl;
+            << " fName : " << fName << " readOnProc:" << readOnProc << endl;
     }
 
 
@@ -2027,10 +2027,13 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
             filePaths[Pstream::myProcNo()] = fName;
             Pstream::gatherList(filePaths);
 
-            boolList procValid(UPstream::listGatherValues<bool>(valid));
+            boolList procValid
+            (
+                UPstream::listGatherValues<bool>(readOnProc)
+            );
             // NB: local proc validity information required on sub-ranks too!
             procValid.resize(Pstream::nProcs());
-            procValid[Pstream::myProcNo()] = valid;
+            procValid[Pstream::myProcNo()] = readOnProc;
 
             return read(io, Pstream::worldComm, true, filePaths, procValid);
         }
@@ -2041,10 +2044,13 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
             filePaths[Pstream::myProcNo(comm_)] = fName;
             Pstream::gatherList(filePaths, Pstream::msgType(), comm_);
 
-            boolList procValid(UPstream::listGatherValues<bool>(valid, comm_));
+            boolList procValid
+            (
+                UPstream::listGatherValues<bool>(readOnProc, comm_)
+            );
             // NB: local proc validity information required on sub-ranks too!
             procValid.resize(Pstream::nProcs(comm_));
-            procValid[Pstream::myProcNo(comm_)] = valid;
+            procValid[Pstream::myProcNo(comm_)] = readOnProc;
 
             // Uniform in local comm
             const bool uniform = uniformFile(filePaths);
@@ -2139,7 +2145,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::writeObject
 (
     const regIOobject& io,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     fileName pathName(io.objectPath());
@@ -2147,7 +2153,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::writeObject
     if (debug)
     {
         Pout<< "masterUncollatedFileOperation::writeObject :"
-            << " io:" << pathName << " valid:" << valid << endl;
+            << " io:" << pathName << " writeOnProc:" << writeOnProc << endl;
     }
 
     // Make sure to pick up any new times
@@ -2156,7 +2162,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::writeObject
     // Update meta-data for current state
     const_cast<regIOobject&>(io).updateMetaData();
 
-    autoPtr<OSstream> osPtr(NewOFstream(pathName, streamOpt, valid));
+    autoPtr<OSstream> osPtr(NewOFstream(pathName, streamOpt, writeOnProc));
     OSstream& os = *osPtr;
 
     // If any of these fail, return (leave error handling to Ostream class)
@@ -2406,7 +2412,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
 (
     const fileName& pathName,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return autoPtr<OSstream>
@@ -2416,7 +2422,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
             pathName,
             streamOpt,
             IOstreamOption::NON_APPEND,
-            valid
+            writeOnProc
         )
     );
 }
@@ -2428,7 +2434,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
     IOstreamOption::atomicType atomic,
     const fileName& pathName,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return autoPtr<OSstream>
@@ -2439,7 +2445,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
             pathName,
             streamOpt,
             IOstreamOption::NON_APPEND,
-            valid
+            writeOnProc
         )
     );
 }
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
index 54ce0dbd38..225102ab4d 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -662,13 +662,13 @@ public:
             ) const;
 
             //- Reads header for regIOobject and returns an ISstream
-            //  to read the contents.
+            //- to read the contents.
             virtual autoPtr<ISstream> readStream
             (
                 regIOobject&,
                 const fileName&,
                 const word& typeName,
-                const bool valid = true
+                const bool readOnProc = true
             ) const;
 
             //- Top-level read
@@ -686,7 +686,7 @@ public:
             (
                 const regIOobject& io,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 
             //- Generate an ISstream that reads a file
@@ -697,7 +697,7 @@ public:
             (
                 const fileName& pathname,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 
             //- Generate an OSstream that writes a file
@@ -706,7 +706,7 @@ public:
                 IOstreamOption::atomicType atomic,
                 const fileName& pathname,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 
 
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 39181c4702..8acc5692ad 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -548,10 +548,10 @@ Foam::fileOperations::uncollatedFileOperation::readStream
     regIOobject& io,
     const fileName& fName,
     const word& typeName,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
-    if (!valid)
+    if (!writeOnProc)
     {
         return autoPtr<ISstream>(new dummyISstream());
     }
@@ -718,7 +718,7 @@ Foam::fileOperations::uncollatedFileOperation::NewOFstream
 (
     const fileName& pathName,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return autoPtr<OSstream>(new OFstream(pathName, streamOpt));
@@ -731,7 +731,7 @@ Foam::fileOperations::uncollatedFileOperation::NewOFstream
     IOstreamOption::atomicType atomic,
     const fileName& pathName,
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return autoPtr<OSstream>(new OFstream(atomic, pathName, streamOpt));
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
index 66949b2adc..d81c54d86d 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
@@ -291,7 +291,7 @@ public:
             (
                 const fileName& pathname,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 
             //- Generate an OSstream that writes a file
@@ -300,7 +300,7 @@ public:
                 IOstreamOption::atomicType,
                 const fileName& pathname,
                 IOstreamOption streamOpt = IOstreamOption(),
-                const bool valid = true
+                const bool writeOnProc = true
             ) const;
 };
 
diff --git a/src/OpenFOAM/global/profiling/profiling.C b/src/OpenFOAM/global/profiling/profiling.C
index 74fb946cb9..7d4f10908f 100644
--- a/src/OpenFOAM/global/profiling/profiling.C
+++ b/src/OpenFOAM/global/profiling/profiling.C
@@ -386,7 +386,7 @@ bool Foam::profiling::writeData(Ostream& os) const
 bool Foam::profiling::writeObject
 (
     IOstreamOption,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return
diff --git a/src/OpenFOAM/global/profiling/profiling.H b/src/OpenFOAM/global/profiling/profiling.H
index fe711bad20..472a6b2c18 100644
--- a/src/OpenFOAM/global/profiling/profiling.H
+++ b/src/OpenFOAM/global/profiling/profiling.H
@@ -260,7 +260,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption /*ignore*/,
-            const bool valid
+            const bool writeOnProc
         ) const;
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 5f7e691c76..2f2ce8a568 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -1246,11 +1246,11 @@ bool Foam::polyBoundaryMesh::writeData(Ostream& os) const
 bool Foam::polyBoundaryMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     streamOpt.compression(IOstreamOption::UNCOMPRESSED);
-    return regIOobject::writeObject(streamOpt, valid);
+    return regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 6230d222f4..8787136c47 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -315,7 +315,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
 
diff --git a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C
index 296f9aae28..54a95185d2 100644
--- a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C
+++ b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C
@@ -46,11 +46,11 @@ static const char* headerTypeCompat = "IOPtrList<coordinateSystem>";
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::coordinateSystems::readFromStream(const bool valid)
+void Foam::coordinateSystems::readFromStream(const bool readOnProc)
 {
-    Istream& is = readStream(word::null, valid);
+    Istream& is = readStream(word::null, readOnProc);
 
-    if (valid)
+    if (readOnProc)
     {
         if (headerClassName() == typeName)
         {
@@ -308,14 +308,14 @@ bool Foam::coordinateSystems::writeData(Ostream& os) const
 bool Foam::coordinateSystems::writeObject
 (
     IOstreamOption,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Force ASCII, uncompressed
     return regIOobject::writeObject
     (
         IOstreamOption(IOstreamOption::ASCII),
-        valid
+        writeOnProc
     );
 }
 
diff --git a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H
index de5b756425..3f4b483f8a 100644
--- a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H
+++ b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H
@@ -84,7 +84,7 @@ class coordinateSystems
     // Private Member Functions
 
         //- Read "coordinateSystems" or older "IOPtrList<coordinateSystem>"
-        void readFromStream(const bool valid = true);
+        void readFromStream(const bool readOnProc = true);
 
         //- Read if IOobject flags set. Return true if read.
         bool readContents();
@@ -184,7 +184,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid = true
+            const bool writeOnProc = true
         ) const;
 
 
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 5d5ad7e906..7c9eae6219 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -1486,7 +1486,7 @@ bool Foam::dynamicRefineFvMesh::update()
 bool Foam::dynamicRefineFvMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Force refinement data to go to the current time directory.
@@ -1494,9 +1494,9 @@ bool Foam::dynamicRefineFvMesh::writeObject
 
     bool writeOk =
     (
-        //dynamicFvMesh::writeObject(streamOpt, valid)
-        dynamicMotionSolverListFvMesh::writeObject(streamOpt, valid)
-     && meshCutter_.write(valid)
+        //dynamicFvMesh::writeObject(streamOpt, writeOnProc)
+        dynamicMotionSolverListFvMesh::writeObject(streamOpt, writeOnProc)
+     && meshCutter_.write(writeOnProc)
     );
 
     if (dumpLevel_)
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index 53e245f702..99ece8c4ff 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -280,7 +280,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 };
 
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index 8ec0424182..1e2c396d35 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -217,7 +217,7 @@ void Foam::motionSolver::updateMesh(const mapPolyMesh& mpm)
 bool Foam::motionSolver::writeObject
 (
     IOstreamOption,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return true;
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
index 576f4931b3..6e5d2e04a4 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
@@ -174,7 +174,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 2a361e6bbd..81bb134441 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -5690,16 +5690,16 @@ void Foam::hexRef8::setUnrefinement
 
 
 // Write refinement to polyMesh directory.
-bool Foam::hexRef8::write(const bool valid) const
+bool Foam::hexRef8::write(const bool writeOnProc) const
 {
     bool writeOk =
-        cellLevel_.write(valid)
-     && pointLevel_.write(valid)
-     && level0Edge_.write(valid);
+        cellLevel_.write(writeOnProc)
+     && pointLevel_.write(writeOnProc)
+     && level0Edge_.write(writeOnProc);
 
     if (history_.active())
     {
-        writeOk = writeOk && history_.write(valid);
+        writeOk = writeOk && history_.write(writeOnProc);
     }
     else
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index d82f7b4fef..d013c92a58 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -588,7 +588,7 @@ public:
             void setInstance(const fileName& inst);
 
             //- Force writing refinement+history to polyMesh directory.
-            bool write(const bool valid = true) const;
+            bool write(const bool writeOnProc = true) const;
 
             //- Helper: remove all relevant files from mesh instance
             static void removeFiles(const polyMesh&);
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index 9dee45cd56..47fc2ff480 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -909,14 +909,14 @@ bool Foam::faBoundaryMesh::writeData(Ostream& os) const
 bool Foam::faBoundaryMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Allow/disallow compression?
     // 1. keep readable
     // 2. save some space
     // ??? streamOpt.compression(IOstreamOption::UNCOMPRESSED);
-    return regIOobject::writeObject(streamOpt, valid);
+    return regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
index e3945375ea..ca64a6380c 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
@@ -244,7 +244,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
 
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index 12d34152be..46719c6b86 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -1044,7 +1044,7 @@ Foam::boolList& Foam::faMesh::correctPatchPointNormals() const
 }
 
 
-bool Foam::faMesh::write(const bool valid) const
+bool Foam::faMesh::write(const bool writeOnProc) const
 {
     faceLabels_.write();
     boundary_.write();
diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H
index 7ccfa6c268..a512b9de59 100644
--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@@ -947,7 +947,7 @@ public:
 
 
         //- Write mesh
-        virtual bool write(const bool valid = true) const;
+        virtual bool write(const bool writeOnProc = true) const;
 
 
     // Member Operators
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 9d1765ad0d..f2759e7cdd 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -1048,13 +1048,13 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
 bool Foam::fvMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     bool ok = true;
     if (phiPtr_)
     {
-        ok = phiPtr_->write(valid);
+        ok = phiPtr_->write(writeOnProc);
         // NOTE: The old old time mesh phi might be necessary for certain
         // solver smooth restart using second order time schemes.
         //ok = phiPtr_->oldTime().write();
@@ -1062,16 +1062,16 @@ bool Foam::fvMesh::writeObject
     if (V0Ptr_ && V0Ptr_->writeOpt() == IOobject::AUTO_WRITE)
     {
         // For second order restarts we need to write V0
-        ok = V0Ptr_->write(valid);
+        ok = V0Ptr_->write(writeOnProc);
     }
 
-    return ok && polyMesh::writeObject(streamOpt, valid);
+    return ok && polyMesh::writeObject(streamOpt, writeOnProc);
 }
 
 
-bool Foam::fvMesh::write(const bool valid) const
+bool Foam::fvMesh::write(const bool writeOnProc) const
 {
-    return polyMesh::write(valid);
+    return polyMesh::write(writeOnProc);
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 4b76ea8515..1d0d9b1fa2 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -508,11 +508,11 @@ public:
             virtual bool writeObject
             (
                 IOstreamOption streamOpt,
-                const bool valid
+                const bool writeOnProc
             ) const;
 
             //- Write mesh using IO settings from time
-            virtual bool write(const bool valid = true) const;
+            virtual bool write(const bool writeOnProc = true) const;
 
 
     // Member Operators
diff --git a/src/functionObjects/field/streamLine/streamLineParticle.C b/src/functionObjects/field/streamLine/streamLineParticle.C
index 41c2bb8e8d..c18415d524 100644
--- a/src/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/functionObjects/field/streamLine/streamLineParticle.C
@@ -388,21 +388,21 @@ void Foam::streamLineParticle::hitWallPatch
 
 void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     particle::readFields(c);
 
     IOField<label> lifeTime
     (
         c.fieldIOobject("lifeTime", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, lifeTime);
 
     vectorFieldIOField sampledPositions
     (
         c.fieldIOobject("sampledPositions", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, sampledPositions);
 
@@ -421,7 +421,7 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
     particle::writeFields(c);
 
     const label np = c.size();
-    const bool valid = c.size();
+    const bool writeOnProc = c.size();
 
     IOField<label> lifeTime
     (
@@ -442,8 +442,8 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
         ++i;
     }
 
-    lifeTime.write(valid);
-    sampledPositions.write(valid);
+    lifeTime.write(writeOnProc);
+    sampledPositions.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index 3900bd6fb0..c50c4e3501 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
@@ -87,20 +87,20 @@ Foam::DSMCParcel<ParcelType>::DSMCParcel
 template<class ParcelType>
 void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType>>& c)
 {
-    bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ), valid);
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, U);
 
-    IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::MUST_READ), valid);
+    IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, Ei);
 
     IOField<label> typeId
     (
         c.fieldIOobject("typeId", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, typeId);
 
@@ -123,7 +123,8 @@ void Foam::DSMCParcel<ParcelType>::writeFields
 {
     ParcelType::writeFields(c);
 
-    label np = c.size();
+    const label np = c.size();
+    const bool writeOnProc = c.size();
 
     IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
     IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::NO_READ), np);
@@ -138,9 +139,9 @@ void Foam::DSMCParcel<ParcelType>::writeFields
         ++i;
     }
 
-    U.write(np > 0);
-    Ei.write(np > 0);
-    typeId.write(np > 0);
+    U.write(writeOnProc);
+    Ei.write(writeOnProc);
+    typeId.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 5a92cc0320..e295f600d4 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -269,7 +269,7 @@ public:
             virtual bool writeObject
             (
                 IOstreamOption streamOpt,
-                const bool valid
+                const bool writeOnProc
             ) const;
 
             //- Write positions to \<cloudName\>_positions.obj file
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index cbe38d4aed..21e46bbc11 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -134,18 +134,18 @@ void Foam::Cloud<ParticleType>::initCloud(const bool checkClass)
 
     IOPosition<Cloud<ParticleType>> ioP(*this, geometryType_);
 
-    const bool valid = ioP.headerOk();
-    Istream& is = ioP.readStream(checkClass ? typeName : "", valid);
-    if (valid)
+    const bool haveFile = ioP.headerOk();
+    Istream& is = ioP.readStream(checkClass ? typeName : word::null, haveFile);
+    if (haveFile)
     {
         ioP.readData(is, *this);
         ioP.close();
     }
 
-    if (!valid && debug)
+    if (!haveFile && debug)
     {
-        Pout<< "Cannot read particle positions file:" << nl
-            << "    " << ioP.objectPath() << nl
+        Pout<< "Not reading particle positions file: "
+            << ioP.objectRelPath() << nl
             << "Assuming the initial cloud contains 0 particles." << endl;
     }
 
@@ -329,13 +329,13 @@ template<class ParticleType>
 bool Foam::Cloud<ParticleType>::writeObject
 (
     IOstreamOption streamOpt,
-    const bool
+    const bool /* writeOnProc */
 ) const
 {
     writeCloudUniformProperties();
 
     writeFields();
-    return cloud::writeObject(streamOpt, this->size());
+    return cloud::writeObject(streamOpt, (this->size() > 0));
 }
 
 
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index 27014dab3a..ad772a278e 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -54,9 +54,12 @@ Foam::IOPosition<CloudType>::IOPosition
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-bool Foam::IOPosition<CloudType>::write(const bool valid) const
+bool Foam::IOPosition<CloudType>::write
+(
+    const bool /* writeOnProc */
+) const
 {
-    return regIOobject::write(cloud_.size());
+    return regIOobject::write(cloud_.size() > 0);
 }
 
 
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index 74e62d7876..0ffd43ea2f 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -84,14 +84,14 @@ public:
         );
 
 
-    // Member functions
+    // Member Functions
 
         //- Inherit readData from regIOobject
         using regIOobject::readData;
 
         virtual void readData(Istream&, CloudType&);
 
-        virtual bool write(const bool valid = true) const;
+        virtual bool write(const bool writeOnProc = true) const;
 
         virtual bool writeData(Ostream& os) const;
 };
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index 7ebc4d4201..9169336118 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -139,19 +139,19 @@ void Foam::particle::writeProperty
 template<class TrackCloudType>
 void Foam::particle::readFields(TrackCloudType& c)
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
 
     const bool haveFile = procIO.typeHeaderOk<IOField<label>>(true);
 
-    IOField<label> origProcId(procIO, valid && haveFile);
+    IOField<label> origProcId(procIO, readOnProc && haveFile);
     c.checkFieldIOobject(c, origProcId);
 
     IOField<label> origId
     (
         c.fieldIOobject("origId", IOobject::MUST_READ),
-        valid && haveFile
+        readOnProc && haveFile
     );
     c.checkFieldIOobject(c, origId);
 
@@ -170,12 +170,12 @@ template<class TrackCloudType>
 void Foam::particle::writeFields(const TrackCloudType& c)
 {
     const label np = c.size();
-    const bool valid = np;
+    const bool writeOnProc = c.size();
 
     if (writeLagrangianCoordinates)
     {
         IOPosition<TrackCloudType> ioP(c);
-        ioP.write(valid);
+        ioP.write(writeOnProc);
     }
     else if (!writeLagrangianPositions)
     {
@@ -192,7 +192,7 @@ void Foam::particle::writeFields(const TrackCloudType& c)
             c,
             cloud::geometryType::POSITIONS
         );
-        ioP.write(valid);
+        ioP.write(writeOnProc);
     }
 
     IOField<label> origProc
@@ -215,8 +215,8 @@ void Foam::particle::writeFields(const TrackCloudType& c)
         ++i;
     }
 
-    origProc.write(valid);
-    origId.write(valid);
+    origProc.write(writeOnProc);
+    origId.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
index 9cc2e20489..1aa32adde2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -97,31 +97,31 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ), valid);
+    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, f);
 
     IOField<vector> angularMomentum
     (
         c.fieldIOobject("angularMomentum", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, angularMomentum);
 
     IOField<vector> torque
     (
         c.fieldIOobject("torque", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, torque);
 
     labelFieldCompactIOField collisionRecordsPairAccessed
     (
         c.fieldIOobject("collisionRecordsPairAccessed", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairAccessed);
 
@@ -132,7 +132,7 @@ void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
             "collisionRecordsPairOrigProcOfOther",
             IOobject::MUST_READ
         ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
 
@@ -143,35 +143,35 @@ void Foam::CollidingParcel<ParcelType>::readFields(CloudType& c)
             "collisionRecordsPairOrigIdOfOther",
             IOobject::MUST_READ
         ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairOrigProcOfOther);
 
     pairDataFieldCompactIOField collisionRecordsPairData
     (
         c.fieldIOobject("collisionRecordsPairData", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsPairData);
 
     labelFieldCompactIOField collisionRecordsWallAccessed
     (
         c.fieldIOobject("collisionRecordsWallAccessed", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsWallAccessed);
 
     vectorFieldCompactIOField collisionRecordsWallPRel
     (
         c.fieldIOobject("collisionRecordsWallPRel", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsWallPRel);
 
     wallDataFieldCompactIOField collisionRecordsWallData
     (
         c.fieldIOobject("collisionRecordsWallData", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldFieldIOobject(c, collisionRecordsWallData);
 
@@ -206,7 +206,7 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
     ParcelType::writeFields(c);
 
     const label np = c.size();
-    const bool valid = np;
+    const bool writeOnProc = c.size();
 
 
     IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
@@ -277,17 +277,17 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
         ++i;
     }
 
-    f.write(valid);
-    angMom.write(valid);
-    torque.write(valid);
+    f.write(writeOnProc);
+    angMom.write(writeOnProc);
+    torque.write(writeOnProc);
 
-    collisionRecordsPairAccessed.write(valid);
-    collisionRecordsPairOrigProcOfOther.write(valid);
-    collisionRecordsPairOrigIdOfOther.write(valid);
-    collisionRecordsPairData.write(valid);
-    collisionRecordsWallAccessed.write(valid);
-    collisionRecordsWallPRel.write(valid);
-    collisionRecordsWallData.write(valid);
+    collisionRecordsPairAccessed.write(writeOnProc);
+    collisionRecordsPairOrigProcOfOther.write(writeOnProc);
+    collisionRecordsPairOrigIdOfOther.write(writeOnProc);
+    collisionRecordsPairData.write(writeOnProc);
+    collisionRecordsWallAccessed.write(writeOnProc);
+    collisionRecordsWallPRel.write(writeOnProc);
+    collisionRecordsWallData.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index c51ccf6ba7..a488b9e4f7 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -120,84 +120,84 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::KinematicParcel<ParcelType>::readFields(CloudType& c)
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
     IOField<label> active
     (
         c.fieldIOobject("active", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, active);
 
     IOField<label> typeId
     (
         c.fieldIOobject("typeId", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, typeId);
 
     IOField<scalar> nParticle
     (
         c.fieldIOobject("nParticle", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, nParticle);
 
     IOField<scalar> d
     (
         c.fieldIOobject("d", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, d);
 
     IOField<scalar> dTarget
     (
         c.fieldIOobject("dTarget", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, dTarget);
 
     IOField<vector> U
     (
         c.fieldIOobject("U", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, U);
 
     IOField<scalar> rho
     (
         c.fieldIOobject("rho", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, rho);
 
     IOField<scalar> age
     (
         c.fieldIOobject("age", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, age);
 
     IOField<scalar> tTurb
     (
         c.fieldIOobject("tTurb", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, tTurb);
 
     IOField<vector> UTurb
     (
         c.fieldIOobject("UTurb", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, UTurb);
 
     IOField<vector> UCorrect
     (
         c.fieldIOobject("UCorrect", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, UCorrect);
 
@@ -229,7 +229,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
     ParcelType::writeFields(c);
 
     const label np = c.size();
-    const bool valid = np;
+    const bool writeOnProc = c.size();
 
     IOField<label> active(c.fieldIOobject("active", IOobject::NO_READ), np);
     IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
@@ -266,17 +266,17 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
         ++i;
     }
 
-    active.write(valid);
-    typeId.write(valid);
-    nParticle.write(valid);
-    d.write(valid);
-    dTarget.write(valid);
-    U.write(valid);
-    rho.write(valid);
-    age.write(valid);
-    tTurb.write(valid);
-    UTurb.write(valid);
-    UCorrect.write(valid);
+    active.write(writeOnProc);
+    typeId.write(writeOnProc);
+    nParticle.write(writeOnProc);
+    d.write(writeOnProc);
+    dTarget.write(writeOnProc);
+    U.write(writeOnProc);
+    rho.write(writeOnProc);
+    age.write(writeOnProc);
+    tTurb.write(writeOnProc);
+    UTurb.write(writeOnProc);
+    UCorrect.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
index 6ae5b2bffa..581e53e5b2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
@@ -88,14 +88,14 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::MPPICParcel<ParcelType>::readFields(CloudType& c)
 {
-    bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
     IOField<vector> UCorrect
     (
         c.fieldIOobject("UCorrect", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, UCorrect);
 
@@ -116,6 +116,7 @@ void Foam::MPPICParcel<ParcelType>::writeFields(const CloudType& c)
     ParcelType::writeFields(c);
 
     const label np = c.size();
+    const bool writeOnProc = c.size();
 
     IOField<vector>
         UCorrect(c.fieldIOobject("UCorrect", IOobject::NO_READ), np);
@@ -129,7 +130,7 @@ void Foam::MPPICParcel<ParcelType>::writeFields(const CloudType& c)
         ++i;
     }
 
-    UCorrect.write(np > 0);
+    UCorrect.write(writeOnProc);
 }
 
 
@@ -164,6 +165,7 @@ void Foam::MPPICParcel<ParcelType>::readObjects
 {
     ParcelType::readObjects(c, obr);
 
+    // const bool readOnProc = c.size();
     if (!c.size()) return;
 
     const auto& UCorrect = cloud::lookupIOField<vector>("UCorrect", obr);
@@ -189,6 +191,7 @@ void Foam::MPPICParcel<ParcelType>::writeObjects
     ParcelType::writeObjects(c, obr);
 
     const label np = c.size();
+    // const bool writeOnProc = c.size();
 
     auto& UCorrect = cloud::createIOField<vector>("UCorrect", np, obr);
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C
index e055b9efc6..a1109002f1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C
@@ -87,14 +87,14 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
     IOField<scalar> mass0
     (
         c.fieldIOobject("mass0", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, mass0);
 
@@ -128,7 +128,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::readFields
                 "F" + name(i),
                 IOobject::MUST_READ
             ),
-            valid
+            readOnProc
         );
 
         label j = 0;
@@ -149,7 +149,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::readFields
                 "Y" + solidNames[j],
                 IOobject::MUST_READ
             ),
-            valid
+            readOnProc
         );
 
         label i = 0;
@@ -186,7 +186,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::writeFields
     ThermoParcel<KinematicParcel<particle>>::writeFields(c);
 
     const label np = c.size();
-    const bool valid = np;
+    const bool writeOnProc = c.size();
 
     IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
 
@@ -202,7 +202,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::writeFields
         }
         ++i;
     }
-    mass0.write(valid);
+    mass0.write(writeOnProc);
 
     for (label i = 0; i < nF; i++)
     {
@@ -221,7 +221,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::writeFields
             F = p0.F()[i];
         }
 
-        F.write(valid);
+        F.write(writeOnProc);
     }
 
     const label idSolid = compModel.idSolid();
@@ -246,7 +246,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::writeFields
             ++i;
         }
 
-        Y.write(valid);
+        Y.write(writeOnProc);
     }
 }
 
@@ -310,7 +310,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::readObjects
     // Skip Reacting layer
     ThermoParcel<KinematicParcel<particle>>::readObjects(c, obr);
 
-    // const label np = c.size();
+    // const bool readOnProc = c.size();
 
     WarningInFunction
         << "Reading of objects is still a work-in-progress" << nl;
@@ -332,6 +332,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::writeObjects
     ThermoParcel<KinematicParcel<particle>>::writeObjects(c, obr);
 
     const label np = c.size();
+    const bool writeOnProc = c.size();
 
     // WIP
     label nF = 0;
@@ -341,7 +342,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::writeObjects
         break;
     }
 
-    if (np > 0)
+    if (writeOnProc)
     {
         for (label i = 0; i < nF; i++)
         {
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 6009aa5c27..f309f8db8a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -93,7 +93,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c, compModel);
 
@@ -124,7 +124,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
                 "Y" + gasNames[j] + stateLabels[idGas],
                 IOobject::MUST_READ
             ),
-            valid
+            readOnProc
         );
 
         label i = 0;
@@ -144,7 +144,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
                 "Y" + liquidNames[j] + stateLabels[idLiquid],
                  IOobject::MUST_READ
             ),
-            valid
+            readOnProc
         );
 
         label i = 0;
@@ -164,7 +164,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
                 "Y" + solidNames[j] + stateLabels[idSolid],
                 IOobject::MUST_READ
             ),
-            valid
+            readOnProc
         );
 
         label i = 0;
@@ -195,7 +195,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 {
     ParcelType::writeFields(c, compModel);
 
-    label np = c.size();
+    const label np = c.size();
+    const bool writeOnProc = c.size();
 
     // Write the composition fractions
     {
@@ -222,7 +223,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
                 ++i;
             }
 
-            YGas.write(np > 0);
+            YGas.write(writeOnProc);
         }
 
         const label idLiquid = compModel.idLiquid();
@@ -246,7 +247,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
                 ++i;
             }
 
-            YLiquid.write(np > 0);
+            YLiquid.write(writeOnProc);
         }
 
         const label idSolid = compModel.idSolid();
@@ -270,7 +271,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
                 ++i;
             }
 
-            YSolid.write(np > 0);
+            YSolid.write(writeOnProc);
         }
     }
 }
@@ -336,9 +337,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readObjects
     ParcelType::readObjects(c, obr);
 
     const label np = c.size();
+    const bool readOnProc = c.size();
 
     // The composition fractions
-    if (np > 0)
+    if (readOnProc)
     {
         const wordList& stateLabels = compModel.stateLabels();
 
@@ -402,9 +404,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeObjects
     ParcelType::writeObjects(c, obr);
 
     const label np = c.size();
+    const bool writeOnProc = c.size();
 
     // Write the composition fractions
-    if (np > 0)
+    if (writeOnProc)
     {
         const wordList& stateLabels = compModel.stateLabels();
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 2ff7086b26..9c4d324b5c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -106,14 +106,14 @@ void Foam::ReactingParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
     IOField<scalar> mass0
     (
         c.fieldIOobject("mass0", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, mass0);
 
@@ -151,7 +151,7 @@ void Foam::ReactingParcel<ParcelType>::readFields
                 "Y" + phaseTypes[j] + stateLabels[j],
                  IOobject::MUST_READ
             ),
-            valid
+            readOnProc
         );
 
         label i = 0;
@@ -184,6 +184,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
     ParcelType::writeFields(c);
 
     const label np = c.size();
+    const bool writeOnProc = c.size();
 
     {
         IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
@@ -195,7 +196,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
 
             ++i;
         }
-        mass0.write(np > 0);
+        mass0.write(writeOnProc);
 
         // Write the composition fractions
         const wordList& phaseTypes = compModel.phaseTypes();
@@ -225,7 +226,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
                 ++i;
             }
 
-            Y.write(np > 0);
+            Y.write(writeOnProc);
         }
     }
 }
@@ -337,8 +338,9 @@ void Foam::ReactingParcel<ParcelType>::writeObjects
     ParcelType::writeObjects(c, obr);
 
     const label np = c.size();
+    const bool writeOnProc = c.size();
 
-    if (np > 0)
+    if (writeOnProc)
     {
         auto& mass0 = cloud::createIOField<scalar>("mass0", np, obr);
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index 66c2715b49..410836a816 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -90,14 +90,14 @@ template<class ParcelType>
 template<class CloudType>
 void Foam::ThermoParcel<ParcelType>::readFields(CloudType& c)
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c);
 
-    IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ), valid);
+    IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, T);
 
-    IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::MUST_READ), valid);
+    IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, Cp);
 
 
@@ -119,7 +119,7 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
     ParcelType::writeFields(c);
 
     const label np = c.size();
-    const bool valid = np;
+    const bool writeOnProc = c.size();
 
     IOField<scalar> T(c.fieldIOobject("T", IOobject::NO_READ), np);
     IOField<scalar> Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np);
@@ -133,8 +133,8 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
         ++i;
     }
 
-    T.write(valid);
-    Cp.write(valid);
+    T.write(writeOnProc);
+    Cp.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 00fdc15b52..08f575bdce 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -138,7 +138,7 @@ bool Foam::AveragingMethod<Type>::writeData(Ostream& os) const
 
 
 template<class Type>
-bool Foam::AveragingMethod<Type>::write(const bool valid) const
+bool Foam::AveragingMethod<Type>::write(const bool writeOnProc) const
 {
     const pointMesh pointMesh_(mesh_);
 
@@ -234,10 +234,10 @@ bool Foam::AveragingMethod<Type>::write(const bool valid) const
     pointGrad.primitiveFieldRef() /= pointVolume;
 
     // write
-    if (!cellValue.write(valid)) return false;
-    if (!cellGrad.write(valid)) return false;
-    if (!pointValue.write(valid)) return false;
-    if (!pointGrad.write(valid)) return false;
+    if (!cellValue.write(writeOnProc)) return false;
+    if (!cellGrad.write(writeOnProc)) return false;
+    if (!pointValue.write(writeOnProc)) return false;
+    if (!pointGrad.write(writeOnProc)) return false;
 
     return true;
 }
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
index b85f98953d..bf352e0b8a 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H
@@ -167,7 +167,7 @@ public:
         virtual bool writeData(Ostream&) const;
 
         //- Write using setting from DB
-        virtual bool write(const bool valid = true) const;
+        virtual bool write(const bool writeOnProc = true) const;
 
         //- Return an internal field of the average
         virtual tmp<Field<Type>> primitiveField() const = 0;
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index dbf86f3ac4..e52aa54145 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -110,40 +110,44 @@ Foam::molecule::molecule
 
 void Foam::molecule::readFields(Cloud<molecule>& mC)
 {
-    const bool valid = mC.size();
+    const bool readOnProc = mC.size();
 
     particle::readFields(mC);
 
-    IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::MUST_READ), valid);
+    IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::MUST_READ), readOnProc);
     mC.checkFieldIOobject(mC, Q);
 
-    IOField<vector> v(mC.fieldIOobject("v", IOobject::MUST_READ), valid);
+    IOField<vector> v(mC.fieldIOobject("v", IOobject::MUST_READ), readOnProc);
     mC.checkFieldIOobject(mC, v);
 
-    IOField<vector> a(mC.fieldIOobject("a", IOobject::MUST_READ), valid);
+    IOField<vector> a(mC.fieldIOobject("a", IOobject::MUST_READ), readOnProc);
     mC.checkFieldIOobject(mC, a);
 
-    IOField<vector> pi(mC.fieldIOobject("pi", IOobject::MUST_READ), valid);
+    IOField<vector> pi(mC.fieldIOobject("pi", IOobject::MUST_READ), readOnProc);
     mC.checkFieldIOobject(mC, pi);
 
-    IOField<vector> tau(mC.fieldIOobject("tau", IOobject::MUST_READ), valid);
+    IOField<vector> tau
+    (
+        mC.fieldIOobject("tau", IOobject::MUST_READ),
+        readOnProc
+    );
     mC.checkFieldIOobject(mC, tau);
 
     IOField<vector> specialPosition
     (
         mC.fieldIOobject("specialPosition", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     mC.checkFieldIOobject(mC, specialPosition);
 
     IOField<label> special
     (
         mC.fieldIOobject("special", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     mC.checkFieldIOobject(mC, special);
 
-    IOField<label> id(mC.fieldIOobject("id", IOobject::MUST_READ), valid);
+    IOField<label> id(mC.fieldIOobject("id", IOobject::MUST_READ), readOnProc);
     mC.checkFieldIOobject(mC, id);
 
     label i = 0;
@@ -168,7 +172,7 @@ void Foam::molecule::writeFields(const Cloud<molecule>& mC)
     particle::writeFields(mC);
 
     const label np = mC.size();
-    const bool valid = np;
+    const bool writeOnProc = mC.size();
 
     IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::NO_READ), np);
     IOField<vector> v(mC.fieldIOobject("v", IOobject::NO_READ), np);
@@ -237,21 +241,21 @@ void Foam::molecule::writeFields(const Cloud<molecule>& mC)
         ++i;
     }
 
-    Q.write(valid);
-    v.write(valid);
-    a.write(valid);
-    pi.write(valid);
-    tau.write(valid);
-    specialPosition.write(valid);
-    special.write(valid);
-    id.write(valid);
+    Q.write(writeOnProc);
+    v.write(writeOnProc);
+    a.write(writeOnProc);
+    pi.write(writeOnProc);
+    tau.write(writeOnProc);
+    specialPosition.write(writeOnProc);
+    special.write(writeOnProc);
+    id.write(writeOnProc);
 
-    piGlobal.write(valid);
-    tauGlobal.write(valid);
+    piGlobal.write(writeOnProc);
+    tauGlobal.write(writeOnProc);
 
-    orientation1.write(valid);
-    orientation2.write(valid);
-    orientation3.write(valid);
+    orientation1.write(writeOnProc);
+    orientation2.write(writeOnProc);
+    orientation3.write(writeOnProc);
 
     Info<< "writeFields " << mC.name() << endl;
 
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 1b7bb53d35..eab74deb74 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -78,14 +78,14 @@ Foam::solidParticle::solidParticle
 
 void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
 {
-    bool valid = c.size();
+    const bool readOnProc = c.size();
 
     particle::readFields(c);
 
-    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ), valid);
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, d);
 
-    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ), valid);
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, U);
 
     label i = 0;
@@ -103,6 +103,7 @@ void Foam::solidParticle::writeFields(const Cloud<solidParticle>& c)
     particle::writeFields(c);
 
     const label np = c.size();
+    const bool writeOnProc = c.size();
 
     IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
     IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
@@ -115,8 +116,8 @@ void Foam::solidParticle::writeFields(const Cloud<solidParticle>& c)
         ++i;
     }
 
-    d.write(np > 0);
-    U.write(np > 0);
+    d.write(writeOnProc);
+    U.write(writeOnProc);
 }
 
 
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 46cf5b26ce..feb807b5ec 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -135,86 +135,90 @@ void Foam::SprayParcel<ParcelType>::readFields
     const CompositionType& compModel
 )
 {
-    const bool valid = c.size();
+    const bool readOnProc = c.size();
 
     ParcelType::readFields(c, compModel);
 
-    IOField<scalar> d0(c.fieldIOobject("d0", IOobject::MUST_READ), valid);
+    IOField<scalar> d0(c.fieldIOobject("d0", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, d0);
 
     IOField<vector> position0
     (
         c.fieldIOobject("position0", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, position0);
 
-    IOField<scalar> sigma(c.fieldIOobject("sigma", IOobject::MUST_READ), valid);
+    IOField<scalar> sigma
+    (
+        c.fieldIOobject("sigma", IOobject::MUST_READ),
+        readOnProc
+    );
     c.checkFieldIOobject(c, sigma);
 
-    IOField<scalar> mu(c.fieldIOobject("mu", IOobject::MUST_READ), valid);
+    IOField<scalar> mu(c.fieldIOobject("mu", IOobject::MUST_READ), readOnProc);
     c.checkFieldIOobject(c, mu);
 
     IOField<scalar> liquidCore
     (
         c.fieldIOobject("liquidCore", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, liquidCore);
 
     IOField<scalar> KHindex
     (
         c.fieldIOobject("KHindex", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, KHindex);
 
     IOField<scalar> y
     (
         c.fieldIOobject("y", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, y);
 
     IOField<scalar> yDot
     (
         c.fieldIOobject("yDot", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, yDot);
 
     IOField<scalar> tc
     (
         c.fieldIOobject("tc", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, tc);
 
     IOField<scalar> ms
     (
         c.fieldIOobject("ms", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, ms);
 
     IOField<scalar> injector
     (
         c.fieldIOobject("injector", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, injector);
 
     IOField<scalar> tMom
     (
         c.fieldIOobject("tMom", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, tMom);
 
     IOField<scalar> user
     (
         c.fieldIOobject("user", IOobject::MUST_READ),
-        valid
+        readOnProc
     );
     c.checkFieldIOobject(c, user);
 
@@ -259,8 +263,7 @@ void Foam::SprayParcel<ParcelType>::writeFields
     ParcelType::writeFields(c, compModel);
 
     const label np = c.size();
-    const bool valid = np;
-
+    const bool writeOnProc = c.size();
 
     IOField<scalar> d0(c.fieldIOobject("d0", IOobject::NO_READ), np);
     IOField<vector> position0
@@ -307,19 +310,19 @@ void Foam::SprayParcel<ParcelType>::writeFields
         ++i;
     }
 
-    d0.write(valid);
-    position0.write(valid);
-    sigma.write(valid);
-    mu.write(valid);
-    liquidCore.write(valid);
-    KHindex.write(valid);
-    y.write(valid);
-    yDot.write(valid);
-    tc.write(valid);
-    ms.write(valid);
-    injector.write(valid);
-    tMom.write(valid);
-    user.write(valid);
+    d0.write(writeOnProc);
+    position0.write(writeOnProc);
+    sigma.write(writeOnProc);
+    mu.write(writeOnProc);
+    liquidCore.write(writeOnProc);
+    KHindex.write(writeOnProc);
+    y.write(writeOnProc);
+    yDot.write(writeOnProc);
+    tc.write(writeOnProc);
+    ms.write(writeOnProc);
+    injector.write(writeOnProc);
+    tMom.write(writeOnProc);
+    user.write(writeOnProc);
 }
 
 
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index b4eb59a16b..dd5b041590 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -1265,7 +1265,7 @@ void Foam::triSurfaceMesh::getVolumeType
 bool Foam::triSurfaceMesh::writeObject
 (
     IOstreamOption,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     const Time& runTime = searchableSurface::time();
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
index e5fe8825ad..79502a40f6 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.H
@@ -316,7 +316,7 @@ public:
             virtual bool writeObject
             (
                 IOstreamOption streamOpt,
-                const bool valid
+                const bool writeOnProc
             ) const;
 
             //- Is object global
diff --git a/src/meshTools/topoSet/topoSets/cellZoneSet.C b/src/meshTools/topoSet/topoSets/cellZoneSet.C
index bc4ef675a0..b3bc4007dd 100644
--- a/src/meshTools/topoSet/topoSets/cellZoneSet.C
+++ b/src/meshTools/topoSet/topoSets/cellZoneSet.C
@@ -229,13 +229,13 @@ Foam::label Foam::cellZoneSet::maxSize(const polyMesh& mesh) const
 bool Foam::cellZoneSet::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Write shadow cellSet
     word oldTypeName = typeName;
     const_cast<word&>(type()) = cellSet::typeName;
-    bool ok = cellSet::writeObject(streamOpt, valid);
+    bool ok = cellSet::writeObject(streamOpt, writeOnProc);
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify cellZone
@@ -265,7 +265,7 @@ bool Foam::cellZoneSet::writeObject
     }
     cellZones.clearAddressing();
 
-    return ok && cellZones.write(valid);
+    return ok && cellZones.write(writeOnProc);
 }
 
 
diff --git a/src/meshTools/topoSet/topoSets/cellZoneSet.H b/src/meshTools/topoSet/topoSets/cellZoneSet.H
index e0f9f8fc08..d2e34e416b 100644
--- a/src/meshTools/topoSet/topoSets/cellZoneSet.H
+++ b/src/meshTools/topoSet/topoSets/cellZoneSet.H
@@ -143,7 +143,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Update any stored data for new labels
diff --git a/src/meshTools/topoSet/topoSets/faceZoneSet.C b/src/meshTools/topoSet/topoSets/faceZoneSet.C
index fde5e3f1c7..92167a4695 100644
--- a/src/meshTools/topoSet/topoSets/faceZoneSet.C
+++ b/src/meshTools/topoSet/topoSets/faceZoneSet.C
@@ -445,13 +445,13 @@ Foam::label Foam::faceZoneSet::maxSize(const polyMesh& mesh) const
 bool Foam::faceZoneSet::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Write shadow faceSet
     word oldTypeName = typeName;
     const_cast<word&>(type()) = faceSet::typeName;
-    bool ok = faceSet::writeObject(streamOpt, valid);
+    bool ok = faceSet::writeObject(streamOpt, writeOnProc);
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify faceZone
@@ -482,7 +482,7 @@ bool Foam::faceZoneSet::writeObject
     }
     faceZones.clearAddressing();
 
-    return ok && faceZones.write(valid);
+    return ok && faceZones.write(writeOnProc);
 }
 
 
diff --git a/src/meshTools/topoSet/topoSets/faceZoneSet.H b/src/meshTools/topoSet/topoSets/faceZoneSet.H
index cfdf54e30d..4a621de44c 100644
--- a/src/meshTools/topoSet/topoSets/faceZoneSet.H
+++ b/src/meshTools/topoSet/topoSets/faceZoneSet.H
@@ -157,7 +157,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Update any stored data for new labels
diff --git a/src/meshTools/topoSet/topoSets/pointZoneSet.C b/src/meshTools/topoSet/topoSets/pointZoneSet.C
index 5cd923f598..25b16d4c4c 100644
--- a/src/meshTools/topoSet/topoSets/pointZoneSet.C
+++ b/src/meshTools/topoSet/topoSets/pointZoneSet.C
@@ -229,13 +229,13 @@ Foam::label Foam::pointZoneSet::maxSize(const polyMesh& mesh) const
 bool Foam::pointZoneSet::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Write shadow pointSet
     word oldTypeName = typeName;
     const_cast<word&>(type()) = pointSet::typeName;
-    bool ok = pointSet::writeObject(streamOpt, valid);
+    bool ok = pointSet::writeObject(streamOpt, writeOnProc);
     const_cast<word&>(type()) = oldTypeName;
 
     // Modify pointZone
@@ -265,7 +265,7 @@ bool Foam::pointZoneSet::writeObject
     }
     pointZones.clearAddressing();
 
-    return ok && pointZones.write(valid);
+    return ok && pointZones.write(writeOnProc);
 }
 
 
diff --git a/src/meshTools/topoSet/topoSets/pointZoneSet.H b/src/meshTools/topoSet/topoSets/pointZoneSet.H
index d8de8a3294..5ba34edc85 100644
--- a/src/meshTools/topoSet/topoSets/pointZoneSet.H
+++ b/src/meshTools/topoSet/topoSets/pointZoneSet.H
@@ -144,7 +144,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Update any stored data for new labels
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.H b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.H
index 60a64687b1..9506e59fb5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.H
@@ -25,7 +25,6 @@ License
     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::incompressiblePrimalSolver
 
diff --git a/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.C b/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.C
index 777642d85c..172d974eee 100644
--- a/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.C
+++ b/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.C
@@ -74,11 +74,12 @@ bool Foam::dynamicOversetFvMesh::update()
 bool Foam::dynamicOversetFvMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
-    bool ok = dynamicMotionSolverListFvMesh::writeObject(streamOpt, valid);
-    ok = oversetFvMeshBase::writeObject(streamOpt, valid) && ok;
+    bool ok =
+        dynamicMotionSolverListFvMesh::writeObject(streamOpt, writeOnProc);
+    ok = oversetFvMeshBase::writeObject(streamOpt, writeOnProc) && ok;
     return ok;
 }
 
diff --git a/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.H b/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.H
index e7ac6336a5..19196b46e4 100644
--- a/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.H
+++ b/src/overset/oversetFvMesh/dynamicOversetFvMesh/dynamicOversetFvMesh.H
@@ -210,7 +210,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 };
 
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.C b/src/overset/oversetFvMesh/oversetFvMeshBase.C
index 3832a282ac..d297cebdc6 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.C
@@ -633,7 +633,7 @@ bool Foam::oversetFvMeshBase::interpolateFields()
 bool Foam::oversetFvMeshBase::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // For postprocessing : write cellTypes and zoneID
@@ -664,7 +664,7 @@ bool Foam::oversetFvMeshBase::writeObject
             volTypes[cellI] = cellTypes[cellI];
         }
         volTypes.correctBoundaryConditions();
-        volTypes.writeObject(streamOpt, valid);
+        volTypes.writeObject(streamOpt, writeOnProc);
     }
     {
         volScalarField volZoneID
@@ -691,7 +691,7 @@ bool Foam::oversetFvMeshBase::writeObject
             volZoneID[cellI] = zoneID[cellI];
         }
         volZoneID.correctBoundaryConditions();
-        volZoneID.writeObject(streamOpt, valid);
+        volZoneID.writeObject(streamOpt, writeOnProc);
     }
     if (debug)
     {
@@ -752,7 +752,7 @@ bool Foam::oversetFvMeshBase::writeObject
         (
             volDonorZoneID
         );
-        ok = volDonorZoneID.writeObject(streamOpt, valid);
+        ok = volDonorZoneID.writeObject(streamOpt, writeOnProc);
     }
 
     return ok;
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.H b/src/overset/oversetFvMesh/oversetFvMeshBase.H
index 0d410eda04..4951322195 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.H
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.H
@@ -248,7 +248,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Debug: check halo swap is ok
diff --git a/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.C b/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.C
index 6b84b42d87..f0c2442dd7 100644
--- a/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.C
+++ b/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.C
@@ -72,11 +72,11 @@ bool Foam::staticOversetFvMesh::update()
 bool Foam::staticOversetFvMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
-    bool ok = staticFvMesh::writeObject(streamOpt, valid);
-    ok = oversetFvMeshBase::writeObject(streamOpt, valid) && ok;
+    bool ok = staticFvMesh::writeObject(streamOpt, writeOnProc);
+    ok = oversetFvMeshBase::writeObject(streamOpt, writeOnProc) && ok;
     return ok;
 }
 
diff --git a/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.H b/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.H
index c167f87c20..054df0f059 100644
--- a/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.H
+++ b/src/overset/oversetFvMesh/staticOversetFvMesh/staticOversetFvMesh.H
@@ -209,7 +209,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 };
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index e79c31d330..c338498f01 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -4911,14 +4911,14 @@ void Foam::distributedTriSurfaceMesh::distribute
 bool Foam::distributedTriSurfaceMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     if (debug)
     {
         Pout<< "distributedTriSurfaceMesh::writeObject :"
             << " surface " << searchableSurface::name()
-            << " writing surface valid:" << valid << endl;
+            << " writing surface:" << writeOnProc << endl;
     }
 
     // Make sure dictionary goes to same directory as surface
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index 514d675f3d..3a38ad33f5 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -584,7 +584,7 @@ public:
             virtual bool writeObject
             (
                 IOstreamOption streamOpt,
-                const bool valid
+                const bool writeOnProc
             ) const;
 
             //- Is object global
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index cc52b3237e..780844e6e7 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -392,7 +392,7 @@ void Foam::rigidBodyMeshMotion::solve()
 bool Foam::rigidBodyMeshMotion::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Force ASCII writing
@@ -413,7 +413,7 @@ bool Foam::rigidBodyMeshMotion::writeObject
     );
 
     model_.state().write(dict);
-    return dict.regIOobject::writeObject(streamOpt, valid);
+    return dict.regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
index 6fcccfe448..cc2641a985 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -177,7 +177,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index 3544dd2723..e278e4a626 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -279,7 +279,7 @@ void Foam::rigidBodyMeshMotionSolver::solve()
 bool Foam::rigidBodyMeshMotionSolver::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     // Force ASCII writing
@@ -300,7 +300,7 @@ bool Foam::rigidBodyMeshMotionSolver::writeObject
     );
 
     model_.state().write(dict);
-    return dict.regIOobject::writeObject(streamOpt, valid);
+    return dict.regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
index 23297d3b5a..30cb1a56f6 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.H
@@ -157,7 +157,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index c1f87b91fc..267fc19643 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -298,7 +298,7 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
 bool Foam::sixDoFRigidBodyMotionSolver::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     IOdictionary dict
@@ -316,7 +316,7 @@ bool Foam::sixDoFRigidBodyMotionSolver::writeObject
     );
 
     motion_.state().write(dict);
-    return dict.regIOobject::write();
+    return dict.regIOobject::writeObject(streamOpt, writeOnProc);
 }
 
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
index 9d8ff05f3d..21d82a3a29 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
@@ -145,7 +145,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
         //- Read dynamicMeshDict dictionary
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
index 7425bab57f..7115ca125c 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
@@ -103,13 +103,13 @@ void Foam::Detail::MeshedSurfaceIOAllocator::clear()
 bool Foam::Detail::MeshedSurfaceIOAllocator::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return
     (
-        points_.writeObject(streamOpt, valid)
-     && faces_.writeObject(streamOpt, valid)
+        points_.writeObject(streamOpt, writeOnProc)
+     && faces_.writeObject(streamOpt, writeOnProc)
     );
 }
 
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index 674a767994..7fd3b4a9b2 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -152,7 +152,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 };
 
diff --git a/src/surfMesh/polySurface/polySurface.H b/src/surfMesh/polySurface/polySurface.H
index 3256c2ec68..faa59e1054 100644
--- a/src/surfMesh/polySurface/polySurface.H
+++ b/src/surfMesh/polySurface/polySurface.H
@@ -391,7 +391,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
 
diff --git a/src/surfMesh/polySurface/polySurfaceIO.C b/src/surfMesh/polySurface/polySurfaceIO.C
index bd6201f117..51bc6b1acf 100644
--- a/src/surfMesh/polySurface/polySurfaceIO.C
+++ b/src/surfMesh/polySurface/polySurfaceIO.C
@@ -32,7 +32,7 @@ License
 bool Foam::polySurface::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
     return true; // no-op
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 078126c098..67a47d1f3e 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -341,7 +341,7 @@ public:
         virtual bool writeObject
         (
             IOstreamOption streamOpt,
-            const bool valid
+            const bool writeOnProc
         ) const;
 
 
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index c0116a212b..1554365237 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -194,14 +194,14 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
 bool Foam::surfMesh::writeObject
 (
     IOstreamOption streamOpt,
-    const bool valid
+    const bool writeOnProc
 ) const
 {
-    bool ok = Allocator::writeObject(streamOpt, valid);
+    bool ok = Allocator::writeObject(streamOpt, writeOnProc);
 
     if (ok)
     {
-        surfZones_.writeObject(streamOpt, valid);
+        surfZones_.writeObject(streamOpt, writeOnProc);
     }
 
     return ok;

From 9577a0f6b522db6fef3868282e1cda35f1e609e4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 4 Apr 2023 20:54:15 +0200
Subject: [PATCH 157/348] ENH: extend parProfiling (#2737)

- separate broadcast times from reduce/gather/scatter time
- separate wait times from all-to-all time
- support invocation counts, split off requests time/count
  from others to avoid flooding the counts

- support 'detail' switch to increase the output information.
  Format may change in the future
---
 etc/caseDicts/profiling/parallel.cfg          |  23 +
 .../global/profiling/profilingPstream.C       |  24 +-
 .../global/profiling/profilingPstream.H       |  91 ++--
 src/Pstream/mpi/UIPstreamRead.C               |   5 +-
 src/Pstream/mpi/UOPstreamWrite.C              |   2 +-
 src/Pstream/mpi/UPstream.C                    |   8 +
 src/Pstream/mpi/UPstreamWrappingTemplates.C   |  83 ++--
 .../utilities/parProfiling/parProfiling.C     | 400 ++++++++++++++----
 .../utilities/parProfiling/parProfiling.H     |  21 +-
 .../squareBend/system/controlDict             |   1 +
 .../rhoSimpleFoam/squareBend/system/profiling |  10 +
 .../simpleFoam/motorBike/system/profiling     |  10 +-
 .../windAroundBuildings/system/profiling      |  10 +-
 13 files changed, 520 insertions(+), 168 deletions(-)
 create mode 100644 etc/caseDicts/profiling/parallel.cfg
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBend/system/profiling

diff --git a/etc/caseDicts/profiling/parallel.cfg b/etc/caseDicts/profiling/parallel.cfg
new file mode 100644
index 0000000000..b61a963c6e
--- /dev/null
+++ b/etc/caseDicts/profiling/parallel.cfg
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Version:  v2306
+    \\  /    A nd           | Website:  www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+Description
+    Configuration for profiling parallel (MPI) timings
+
+\*---------------------------------------------------------------------------*/
+
+type    parProfiling;
+libs    (utilityFunctionObjects);
+
+// Level of detail to report
+detail  0;
+
+// Report stats on exit only (instead of every time step)
+executeControl  onEnd;
+writeControl    none;
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingPstream.C b/src/OpenFOAM/global/profiling/profilingPstream.C
index c46348bcc6..588d3e1cde 100644
--- a/src/OpenFOAM/global/profiling/profilingPstream.C
+++ b/src/OpenFOAM/global/profiling/profilingPstream.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,10 +31,11 @@ License
 
 std::unique_ptr<Foam::cpuTime> Foam::profilingPstream::timer_(nullptr);
 
-Foam::profilingPstream::timingList Foam::profilingPstream::times_(Zero);
-
 bool Foam::profilingPstream::suspend_(false);
 
+Foam::profilingPstream::timingList Foam::profilingPstream::times_(double(0));
+Foam::profilingPstream::countList Foam::profilingPstream::counts_(uint64_t(0));
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -52,7 +53,7 @@ Foam::profilingPstream::~profilingPstream()
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 void Foam::profilingPstream::enable()
 {
@@ -63,7 +64,8 @@ void Foam::profilingPstream::enable()
     else
     {
         timer_.reset(new cpuTime);
-        times_ = Zero;
+        times_ = double(0);
+        counts_ = uint64_t(0);
     }
 
     suspend_ = false;
@@ -77,4 +79,16 @@ void Foam::profilingPstream::disable() noexcept
 }
 
 
+double Foam::profilingPstream::elapsedTime()
+{
+    double total = 0;
+    for (const double val : times_)
+    {
+        total += val;
+    }
+
+    return total;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingPstream.H b/src/OpenFOAM/global/profiling/profilingPstream.H
index c088d988e0..961aa88596 100644
--- a/src/OpenFOAM/global/profiling/profilingPstream.H
+++ b/src/OpenFOAM/global/profiling/profilingPstream.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,20 +57,26 @@ public:
 
     // Public Types
 
-        //- Enumeration within times array
-        enum timingType
+        //- The enumerated timing categories (for times and counts arrays)
+        enum timingType : unsigned
         {
-            GATHER = 0,
-            SCATTER,
-            BROADCAST,
+            BROADCAST = 0,
             REDUCE,
+            PROBE,
+            REQUEST,
             WAIT,
+            GATHER,
+            SCATTER,
             ALL_TO_ALL,
-            OTHER
+            OTHER,
+            nCategories  // Dimensioning size
         };
 
-        //- The timing values
-        typedef FixedList<double, 7> timingList;
+        //- Fixed-size container for timing values
+        typedef FixedList<double, timingType::nCategories> timingList;
+
+        //- Fixed-size container for timing counts
+        typedef FixedList<uint64_t, timingType::nCategories> countList;
 
 
 private:
@@ -80,12 +86,15 @@ private:
         //- The timer to use
         static std::unique_ptr<cpuTime> timer_;
 
-        //- The timing values
-        static timingList times_;
-
         //- Is timer in a suspend state?
         static bool suspend_;
 
+        //- The accumulated values for various timing categories
+        static timingList times_;
+
+        //- The timing frequency for various timing categories
+        static countList counts_;
+
 
 public:
 
@@ -125,18 +134,27 @@ public:
             return !suspend_ && bool(timer_);
         }
 
-        //- Access to the timing information
-        static timingList& times() noexcept
-        {
-            return times_;
-        }
+        //- The total of times
+        static double elapsedTime();
 
-        //- Access to the timing information at given index
+        //- Access to the timing information
+        static timingList& times() noexcept { return times_; }
+
+        //- Access to the timing counts
+        static countList& counts() noexcept { return counts_; }
+
+        //- Access to the timing information for given timing category
         static double times(const timingType idx)
         {
             return times_[idx];
         }
 
+        //- Access to the count for given timing category
+        static uint64_t counts(const timingType idx)
+        {
+            return counts_[idx];
+        }
+
         //- Update timer prior to measurement
         static void beginTiming()
         {
@@ -152,21 +170,10 @@ public:
             if (active())
             {
                 times_[idx] += timer_->cpuTimeIncrement();
+                ++counts_[idx];
             }
         }
 
-        //- Add time increment to \em gather time
-        static void addGatherTime()
-        {
-            addTime(timingType::GATHER);
-        }
-
-        //- Add time increment to \em scatter time
-        static void addScatterTime()
-        {
-            addTime(timingType::SCATTER);
-        }
-
         //- Add time increment to \em broadcast time
         static void addBroadcastTime()
         {
@@ -179,12 +186,36 @@ public:
             addTime(timingType::REDUCE);
         }
 
+        //- Add time increment to \em probe time
+        static void addProbeTime()
+        {
+            addTime(timingType::PROBE);
+        }
+
+        //- Add time increment to \em request time
+        static void addRequestTime()
+        {
+            addTime(timingType::REQUEST);
+        }
+
         //- Add time increment to \em wait time
         static void addWaitTime()
         {
             addTime(timingType::WAIT);
         }
 
+        //- Add time increment to \em gather time
+        static void addGatherTime()
+        {
+            addTime(timingType::GATHER);
+        }
+
+        //- Add time increment to \em scatter time
+        static void addScatterTime()
+        {
+            addTime(timingType::SCATTER);
+        }
+
         //- Add time increment to \em allToAll time
         static void addAllToAllTime()
         {
diff --git a/src/Pstream/mpi/UIPstreamRead.C b/src/Pstream/mpi/UIPstreamRead.C
index e7bb303da0..37cb441414 100644
--- a/src/Pstream/mpi/UIPstreamRead.C
+++ b/src/Pstream/mpi/UIPstreamRead.C
@@ -61,8 +61,7 @@ void Foam::UIPstream::bufferIPCrecv()
         );
         MPI_Get_count(&status, MPI_BYTE, &messageSize_);
 
-        // Assume these are from gathers ...
-        profilingPstream::addGatherTime();
+        profilingPstream::addProbeTime();
 
         recvBuf_.resize(messageSize_);
 
@@ -206,7 +205,7 @@ Foam::label Foam::UIPstream::read
             return 0;
         }
 
-        profilingPstream::addWaitTime();
+        profilingPstream::addRequestTime();
 
         if (debug)
         {
diff --git a/src/Pstream/mpi/UOPstreamWrite.C b/src/Pstream/mpi/UOPstreamWrite.C
index a971799ac9..c14404d077 100644
--- a/src/Pstream/mpi/UOPstreamWrite.C
+++ b/src/Pstream/mpi/UOPstreamWrite.C
@@ -179,7 +179,7 @@ bool Foam::UOPstream::write
             );
         }
 
-        profilingPstream::addWaitTime();
+        profilingPstream::addRequestTime();
 
         if (debug)
         {
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index f56d5631e9..a84cdddf82 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -822,6 +822,8 @@ Foam::UPstream::probeMessage
     if (UPstream::commsTypes::blocking == commsType)
     {
         // Blocking
+        profilingPstream::beginTiming();
+
         if
         (
             MPI_Probe
@@ -837,11 +839,15 @@ Foam::UPstream::probeMessage
                 << "MPI_Probe returned with error"
                 << Foam::abort(FatalError);
         }
+
+        profilingPstream::addProbeTime();
         flag = 1;
     }
     else
     {
         // Non-blocking
+        profilingPstream::beginTiming();
+
         if
         (
             MPI_Iprobe
@@ -858,6 +864,8 @@ Foam::UPstream::probeMessage
                 << "MPI_Iprobe returned with error"
                 << Foam::abort(FatalError);
         }
+
+        profilingPstream::addRequestTime();
     }
 
     if (flag)
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index b93f9d447b..65e85bb8ea 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -158,14 +158,14 @@ void Foam::PstreamDetail::allReduce
         error::printStack(Pout);
     }
 
-    profilingPstream::beginTiming();
-
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -198,11 +198,15 @@ void Foam::PstreamDetail::allReduce
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -224,9 +228,9 @@ void Foam::PstreamDetail::allReduce
                 << UList<Type>(values, count)
                 << Foam::abort(FatalError);
         }
-    }
 
-    profilingPstream::addReduceTime();
+        profilingPstream::addReduceTime();
+    }
 }
 
 
@@ -283,14 +287,14 @@ void Foam::PstreamDetail::allToAll
         return;
     }
 
-    profilingPstream::beginTiming();
-
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -326,11 +330,15 @@ void Foam::PstreamDetail::allToAll
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -355,9 +363,9 @@ void Foam::PstreamDetail::allToAll
                 << " For " << sendData
                 << Foam::abort(FatalError);
         }
-    }
 
-    profilingPstream::addAllToAllTime();
+        profilingPstream::addAllToAllTime();
+    }
 }
 
 
@@ -438,14 +446,14 @@ void Foam::PstreamDetail::allToAllv
         return;
     }
 
-    profilingPstream::beginTiming();
-
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -482,11 +490,15 @@ void Foam::PstreamDetail::allToAllv
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -512,9 +524,10 @@ void Foam::PstreamDetail::allToAllv
                 << " recvCounts " << recvCounts
                 << Foam::abort(FatalError);
         }
+
+        profilingPstream::addAllToAllTime();
     }
 
-    profilingPstream::addAllToAllTime();
 }
 
 
@@ -929,14 +942,14 @@ void Foam::PstreamDetail::gather
         error::printStack(Pout);
     }
 
-    profilingPstream::beginTiming();
-
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -972,11 +985,15 @@ void Foam::PstreamDetail::gather
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -1001,9 +1018,9 @@ void Foam::PstreamDetail::gather
                 << " recvCount " << recvCount
                 << Foam::abort(FatalError);
         }
-    }
 
-    profilingPstream::addGatherTime();
+        profilingPstream::addGatherTime();
+    }
 }
 
 
@@ -1055,14 +1072,14 @@ void Foam::PstreamDetail::scatter
         error::printStack(Pout);
     }
 
-    profilingPstream::beginTiming();
-
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -1098,11 +1115,15 @@ void Foam::PstreamDetail::scatter
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -1127,9 +1148,9 @@ void Foam::PstreamDetail::scatter
                 << " recvCount " << recvCount
                 << Foam::abort(FatalError);
         }
-    }
 
-    profilingPstream::addScatterTime();
+        profilingPstream::addScatterTime();
+    }
 }
 
 
@@ -1200,8 +1221,6 @@ void Foam::PstreamDetail::gatherv
             << Foam::abort(FatalError);
     }
 
-    profilingPstream::beginTiming();
-
     // Ensure send/recv consistency on master
     if (UPstream::master(comm) && !recvCounts[0])
     {
@@ -1214,6 +1233,8 @@ void Foam::PstreamDetail::gatherv
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -1250,11 +1271,15 @@ void Foam::PstreamDetail::gatherv
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -1280,9 +1305,9 @@ void Foam::PstreamDetail::gatherv
                 << " recvCounts " << recvCounts
                 << Foam::abort(FatalError);
         }
-    }
 
-    profilingPstream::addGatherTime();
+        profilingPstream::addGatherTime();
+    }
 }
 
 
@@ -1352,14 +1377,14 @@ void Foam::PstreamDetail::scatterv
             << Foam::abort(FatalError);
     }
 
-    profilingPstream::beginTiming();
-
     bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
     // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        profilingPstream::beginTiming();
+
         handled = true;
         MPI_Request request;
 
@@ -1396,11 +1421,15 @@ void Foam::PstreamDetail::scatterv
         {
             *requestID = PstreamGlobals::push_request(request);
         }
+
+        profilingPstream::addRequestTime();
     }
 #endif
 
     if (!handled)
     {
+        profilingPstream::beginTiming();
+
         if (req) req->reset();
         if (requestID) *requestID = -1;
 
@@ -1426,9 +1455,9 @@ void Foam::PstreamDetail::scatterv
                 << " sendOffsets " << sendOffsets
                 << Foam::abort(FatalError);
         }
-    }
 
-    profilingPstream::addScatterTime();
+        profilingPstream::addScatterTime();
+    }
 }
 
 
diff --git a/src/functionObjects/utilities/parProfiling/parProfiling.C b/src/functionObjects/utilities/parProfiling/parProfiling.C
index ab0de02f6b..5af73afd99 100644
--- a/src/functionObjects/utilities/parProfiling/parProfiling.C
+++ b/src/functionObjects/utilities/parProfiling/parProfiling.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,8 +61,10 @@ Foam::functionObjects::parProfiling::parProfiling
     const dictionary& dict
 )
 :
-    functionObject(name)
+    functionObject(name),
+    detailLevel_(0)
 {
+    dict.readIfPresent("detail", detailLevel_);
     profilingPstream::enable();
 }
 
@@ -75,121 +77,365 @@ Foam::functionObjects::parProfiling::~parProfiling()
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
-void Foam::functionObjects::parProfiling::report()
+namespace Foam
 {
-    if (!profilingPstream::active())
+
+// Loop over all values (with striding) and extract the value at given index
+template<class Type>
+inline static void extractValues
+(
+    UList<Type>& result,
+    const int index,
+    const UList<Type>& allValues
+)
+{
+    if (result.empty())
     {
         return;
     }
 
-    // (Time, Processor) for each of: min/max/sum
-    typedef FixedList<Tuple2<double, int>, 3> statData;
-    typedef FixedList<statData, 3> statDataTimes;
+    const label numProc = result.size();
+    const Type* values = allValues.cbegin();
+    const label stride = allValues.size() / numProc;
 
-    // Reduction: if x and y are unequal assign value.
-    auto statsEqOp = [](statDataTimes& xStats, const statDataTimes& yStats)
+    if (!values || !stride)
     {
-        forAll(xStats, i)
+        result = Type(0);
+        return;
+    }
+
+    for (label proci = 0; proci < numProc; ++proci, values += stride)
+    {
+        result[proci] = values[index];
+    }
+}
+
+
+// Loop over all values (with striding) and extract combined value
+// using the given unary function
+template<class Type, class Extract>
+inline static void extractValues
+(
+    UList<Type>& result,
+    const UList<Type>& allValues,
+    const Extract& extract
+)
+{
+    if (result.empty())
+    {
+        return;
+    }
+
+    const label numProc = result.size();
+    const Type* values = allValues.cbegin();
+    const label stride = allValues.size() / numProc;
+
+    if (!values || !stride)
+    {
+        result = Type(0);
+        return;
+    }
+
+    for (label proci = 0; proci < numProc; ++proci, values += stride)
+    {
+        result[proci] = extract(values);
+    }
+}
+
+
+inline static void printTimingDetail(const UList<double>& values)
+{
+    const label numProc = values.size();
+
+    if (numProc)
+    {
+        Info<< indent << "    times   " << numProc << '(';
+
+        for (label proci = 0; proci < numProc; ++proci)
         {
-            statData& x = xStats[i];
-            const statData& y = yStats[i];
-
-            // 0: min, 1: max, 2: total (or avg)
-            if (x[0].first() > y[0].first())
-            {
-                x[0] = y[0];
-            }
-            if (x[1].first() < y[1].first())
-            {
-                x[1] = y[1];
-            }
-            x[2].first() += y[2].first();
+            if (proci) Info<< ' ';
+            Info<< values[proci];
         }
-    };
 
-    statDataTimes times;
+        Info<< ')' << nl;
+    }
+}
 
-    // Master time
+
+inline static void printTimingDetail(const UList<uint64_t>& values)
+{
+    const label numProc = values.size();
+
+    if (numProc)
     {
-        const double total =
-        (
-            profilingPstream::times(profilingPstream::REDUCE)
-          + profilingPstream::times(profilingPstream::GATHER)
-          + profilingPstream::times(profilingPstream::SCATTER)
-            // Include broadcast with reduce instead of all-to-all
-          + profilingPstream::times(profilingPstream::BROADCAST)
-        );
+        // Output via std::ostream to avoid conversion to Foam::label
+        // that Ostream performs
 
-        times[0] = Tuple2<double, int>(total, Pstream::myProcNo());
+        auto& os = Info.stdStream();
+
+        Info<< indent << "    counts  " << numProc << '(';
+
+        for (label proci = 0; proci < numProc; ++proci)
+        {
+            if (proci) os << ' ';
+            os << values[proci];
+        }
+
+        Info<< ')' << nl;
+    }
+}
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::functionObjects::parProfiling::report()
+{
+    const label numProc = (UPstream::parRun() ? UPstream::nProcs() : 1);
+
+    if (!profilingPstream::active() || numProc < 2)
+    {
+        return;
     }
 
-    // All time
-    {
-        const double total =
-        (
-            profilingPstream::times(profilingPstream::WAIT)
-          + profilingPstream::times(profilingPstream::ALL_TO_ALL)
-          + profilingPstream::times(profilingPstream::OTHER)
-        );
+    // Use mpiGather on all values and perform the combinations
+    // and statistics locally. This reduces the overall number of MPI
+    // calls. For detailed output we need this information anyhow.
 
-        times[1] = Tuple2<double, int>(total, Pstream::myProcNo());
-    }
+    // NB: profilingPstream uses a FixedList for timings(), counts()
+    // so the sizes are guaranteed to be consistent and identical
+    // everywhere.
 
-    // Other time
-    {
-        const double total =
-        (
-            profilingPstream::times(profilingPstream::OTHER)
-        );
-
-        times[2] = Tuple2<double, int>(total, Pstream::myProcNo());
-    }
+    List<double> allTimes;
+    List<uint64_t> allCounts;
 
+    // Avoid disturbing the counts
     profilingPstream::suspend();
 
-    Pstream::combineGather(times, statsEqOp);
+    {
+        // The timings
+        const auto& procTimes = profilingPstream::times();
+
+        if (Pstream::master())
+        {
+            allTimes.resize(numProc * procTimes.size());
+        }
+
+        UPstream::mpiGather
+        (
+            procTimes.cdata_bytes(), // Send
+            procTimes.size_bytes(),  // Num send per proc
+            allTimes.data_bytes(),   // Recv
+            procTimes.size_bytes(),  // Num recv per proc
+            UPstream::commWorld()
+        );
+    }
+
+    if (detailLevel_ > 1)
+    {
+        // The counts
+        const auto& procCounts = profilingPstream::counts();
+
+        if (Pstream::master())
+        {
+            allCounts.resize(numProc * procCounts.size());
+        }
+
+        UPstream::mpiGather
+        (
+            procCounts.cdata_bytes(), // Send
+            procCounts.size_bytes(),  // Num send per proc
+            allCounts.data_bytes(),   // Recv
+            procCounts.size_bytes(),  // Num recv per proc
+            UPstream::commWorld()
+        );
+    }
 
     profilingPstream::resume();
 
 
+    // (Time, Processor) for each of: min/max/sum(avg)
+    typedef FixedList<Tuple2<double, int>, 3> statData;
+
+    // Extract min/max/average
+    auto calcStats = [](const UList<double>& data) -> statData
+    {
+        statData stats;
+        stats = Tuple2<double, int>((data.empty() ? 0 : data[0]), 0);
+
+        const label np = data.size();
+        for (label proci = 1; proci < np; ++proci)
+        {
+            Tuple2<double, int> tup(data[proci], proci);
+
+            // 0: min, 1: max, 2: total(avg)
+            if (stats[0].first() > tup.first()) stats[0] = tup;
+            if (stats[1].first() < tup.first()) stats[1] = tup;
+            stats[2].first() += tup.first();
+        }
+
+        // From total -> average value
+        if (np) { stats[2].first() /= np; }
+
+        return stats;
+    };
+
+
+    const auto printTimingStats =
+        [&](Ostream& os, const char* tag, const statData& stats)
+        {
+            os  << indent << tag << ": avg = " << stats[2].first()
+                << ", min = " << stats[0].first()
+                << " (proc " << stats[0].second() << ')'
+                << ", max = " << stats[1].first()
+                << " (proc " << stats[1].second() << ')'
+                << nl;
+        };
+
+
     if (Pstream::master())
     {
+        statData stats;
+        List<double> extractedTimes(numProc);
+        List<uint64_t> extractedCounts;
+
+        if (detailLevel_ > 1)
+        {
+            extractedCounts.resize(numProc);
+        }
+
         Info<< type() << ':' << nl
             << incrIndent;
 
+        // Total times
         {
-            const statData& stats = times[0];
-            double avg = stats[2].first()/Pstream::nProcs();
+            extractValues
+            (
+                extractedTimes,
+                allTimes,
+                [=](const double values[])
+                {
+                    double total = 0;
+                    for (unsigned i = 0; i < profilingPstream::nCategories; ++i)
+                    {
+                        total += values[i];
+                    }
+                    return total;
+                }
+            );
+            stats = calcStats(extractedTimes);
 
-            Info<< indent << "reduce    : avg = " << avg << 's' << nl
-                << indent << "            min = " << stats[0].first()
-                << "s (processor " << stats[0].second() << ')' << nl
-                << indent << "            max = " << stats[1].first()
-                << "s (processor " << stats[1].second() << ')' << nl;
+            printTimingStats(Info(), "total     ", stats);
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
         }
 
+        // all-all
         {
-            const statData& stats = times[1];
-            double avg = stats[2].first()/Pstream::nProcs();
+            const int index = int(profilingPstream::ALL_TO_ALL);
 
-            Info<< indent << "all-all   : avg = " << avg << 's' << nl
-                << indent << "            min = " << stats[0].first()
-                << "s (processor " << stats[0].second() << ')' << nl
-                << indent << "            max = " << stats[1].first()
-                << "s (processor " << stats[1].second() << ')' << nl;
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "all-all   ", stats);
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
+            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
         }
 
+        // broadcast
         {
-            const statData& stats = times[2];
-            double avg = stats[2].first()/Pstream::nProcs();
+            const int index = int(profilingPstream::BROADCAST);
 
-            Info<< indent << "other     : avg = " << avg << 's' << nl
-                << indent << "            min = " << stats[0].first()
-                << "s (processor " << stats[0].second() << ')' << nl
-                << indent << "            max = " << stats[1].first()
-                << "s (processor " << stats[1].second() << ')' << nl;
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "broadcast ", stats);
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
+            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
+        }
+
+        // probe
+        {
+            const int index = int(profilingPstream::PROBE);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "probe     ", stats);
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
+            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
+        }
+
+        // Reduce/scatter times
+        {
+            // const int index = int(profilingPstream::REDUCE);
+
+            extractValues
+            (
+                extractedTimes,
+                allTimes,
+                [=](const double values[])
+                {
+                    return
+                    (
+                        values[profilingPstream::REDUCE]
+                      + values[profilingPstream::GATHER]
+                      + values[profilingPstream::SCATTER]
+                    );
+                }
+            );
+            extractValues
+            (
+                extractedCounts,
+                allCounts,
+                [=](const uint64_t values[])
+                {
+                    return
+                    (
+                        values[profilingPstream::REDUCE]
+                      + values[profilingPstream::GATHER]
+                      + values[profilingPstream::SCATTER]
+                    );
+                }
+            );
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "reduce    ", stats);
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
+            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
+        }
+
+        // request
+        {
+            const int index = int(profilingPstream::REQUEST);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "request   ", stats);
+
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
+            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
+        }
+
+        // wait
+        {
+            const int index = int(profilingPstream::WAIT);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "wait      ", stats);
+
+            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
+            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
         }
 
         Info<< decrIndent;
diff --git a/src/functionObjects/utilities/parProfiling/parProfiling.H b/src/functionObjects/utilities/parProfiling/parProfiling.H
index 0529bc01fb..4a3f37eb2a 100644
--- a/src/functionObjects/utilities/parProfiling/parProfiling.H
+++ b/src/functionObjects/utilities/parProfiling/parProfiling.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,7 @@ Usage
         // Report stats on exit only (instead of every time step)
         executeControl  onEnd;
         writeControl    none;
+        detail          0;
     }
     \endverbatim
 
@@ -60,10 +61,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward Declarations
-class Time;
-
 namespace functionObjects
 {
 
@@ -75,7 +72,15 @@ class parProfiling
 :
     public functionObject
 {
-    // Private Member Functions
+    // Private Data
+
+        //- The level of detail
+        //  0: summary, 1: per-proc times, 2: per-proc times/counts
+        int detailLevel_;
+
+public:
+
+    // Generated Methods
 
         //- No copy construct
         parProfiling(const parProfiling&) = delete;
@@ -84,8 +89,6 @@ class parProfiling
         void operator=(const parProfiling&) = delete;
 
 
-public:
-
     //- Runtime type information
     TypeName("parProfiling");
 
@@ -116,7 +119,7 @@ public:
         //- Do nothing
         virtual bool write();
 
-        //- Report
+        //- Disables profilingPstream
         virtual bool end();
 };
 
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
index 3761a08a3d..77a23d28a5 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
@@ -54,6 +54,7 @@ functions
     // #include "sampleCellCentres"
     #include "isentropicTotalPressure"
     #include "wallHeatFlux"
+    #include "profiling"
 }
 
 
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/profiling b/tutorials/compressible/rhoSimpleFoam/squareBend/system/profiling
new file mode 100644
index 0000000000..9e1a10e62c
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/profiling
@@ -0,0 +1,10 @@
+// -*- C++ -*-
+
+profiling
+{
+    #includeEtc "caseDicts/profiling/parallel.cfg"
+    detail  2;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/profiling b/tutorials/incompressible/simpleFoam/motorBike/system/profiling
index 7efc5a8441..b762c1cd79 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/profiling
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/profiling
@@ -2,14 +2,8 @@
 
 profiling
 {
-    type  parProfiling;
-
-    libs  (utilityFunctionObjects);
-
-    // Report stats on exit only (instead of every time step)
-    executeControl  onEnd;
-    writeControl    none;
+    #includeEtc "caseDicts/profiling/parallel.cfg"
+    detail  1;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/profiling b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/profiling
index 7efc5a8441..b762c1cd79 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/profiling
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/profiling
@@ -2,14 +2,8 @@
 
 profiling
 {
-    type  parProfiling;
-
-    libs  (utilityFunctionObjects);
-
-    // Report stats on exit only (instead of every time step)
-    executeControl  onEnd;
-    writeControl    none;
+    #includeEtc "caseDicts/profiling/parallel.cfg"
+    detail  1;
 }
 
-
 // ************************************************************************* //

From 5de59417f8ada30e24e0aab28f30689e3ac53a82 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 5 Apr 2023 15:11:18 +0200
Subject: [PATCH 158/348] ENH: improve suspend/resume handling of Pstream
 profiling (#2737)

- allow reporting even when profiling is suspended

- consolidate reporting into profilingPstream itself
  (avoids code scatter).

Example of possible advanced use for timing only one section of
code:

    ====
    // Profile local operations
    profilingPstream::enable();

    ... do something

    // Don't profile elsewhere
    profilingPstream::suspend();
    ====
---
 .../global/profiling/profilingPstream.C       | 441 +++++++++++++++++-
 .../global/profiling/profilingPstream.H       |  60 +--
 .../utilities/parProfiling/parProfiling.C     | 371 +--------------
 .../utilities/parProfiling/parProfiling.H     |   4 +-
 4 files changed, 460 insertions(+), 416 deletions(-)

diff --git a/src/OpenFOAM/global/profiling/profilingPstream.C b/src/OpenFOAM/global/profiling/profilingPstream.C
index 588d3e1cde..cb6de74904 100644
--- a/src/OpenFOAM/global/profiling/profilingPstream.C
+++ b/src/OpenFOAM/global/profiling/profilingPstream.C
@@ -26,6 +26,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "profilingPstream.H"
+#include "List.H"
+#include "Tuple2.H"
+#include "UPstream.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -37,37 +40,16 @@ Foam::profilingPstream::timingList Foam::profilingPstream::times_(double(0));
 Foam::profilingPstream::countList Foam::profilingPstream::counts_(uint64_t(0));
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::profilingPstream::profilingPstream()
-{
-    enable();
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::profilingPstream::~profilingPstream()
-{
-    disable();
-}
-
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 void Foam::profilingPstream::enable()
 {
-    if (timer_)
-    {
-        timer_->resetCpuTime(); // Not necessarily required ...
-    }
-    else
+    if (!timer_)
     {
         timer_.reset(new cpuTime);
         times_ = double(0);
         counts_ = uint64_t(0);
     }
-
     suspend_ = false;
 }
 
@@ -79,6 +61,13 @@ void Foam::profilingPstream::disable() noexcept
 }
 
 
+void Foam::profilingPstream::reset()
+{
+    times_ = double(0);
+    counts_ = uint64_t(0);
+}
+
+
 double Foam::profilingPstream::elapsedTime()
 {
     double total = 0;
@@ -91,4 +80,412 @@ double Foam::profilingPstream::elapsedTime()
 }
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Loop over all values (with striding) and extract the value at given index
+template<class Type>
+inline static void extractValues
+(
+    UList<Type>& result,
+    const int index,
+    const UList<Type>& allValues
+)
+{
+    if (result.empty())
+    {
+        return;
+    }
+
+    const label numProc = result.size();
+    const Type* values = allValues.cbegin();
+    const label stride = allValues.size() / numProc;
+
+    if (!values || !stride)
+    {
+        result = Type(0);
+        return;
+    }
+
+    for (label proci = 0; proci < numProc; ++proci, values += stride)
+    {
+        result[proci] = values[index];
+    }
+}
+
+
+// Loop over all values (with striding) and extract combined value
+// using the given unary function
+template<class Type, class Extract>
+inline static void extractValues
+(
+    UList<Type>& result,
+    const UList<Type>& allValues,
+    const Extract& extract
+)
+{
+    if (result.empty())
+    {
+        return;
+    }
+
+    const label numProc = result.size();
+    const Type* values = allValues.cbegin();
+    const label stride = allValues.size() / numProc;
+
+    if (!values || !stride)
+    {
+        result = Type(0);
+        return;
+    }
+
+    for (label proci = 0; proci < numProc; ++proci, values += stride)
+    {
+        result[proci] = extract(values);
+    }
+}
+
+
+inline static void printTimingDetail(const UList<double>& values)
+{
+    const label numProc = values.size();
+
+    if (numProc)
+    {
+        Info<< indent << "    times   " << numProc << '(';
+
+        for (label proci = 0; proci < numProc; ++proci)
+        {
+            if (proci) Info<< ' ';
+            Info<< values[proci];
+        }
+
+        Info<< ')' << nl;
+    }
+}
+
+
+inline static void printTimingDetail(const UList<uint64_t>& values)
+{
+    const label numProc = values.size();
+
+    if (numProc)
+    {
+        // Output via std::ostream to avoid conversion to Foam::label
+        // that Ostream performs
+
+        auto& os = Info.stdStream();
+
+        Info<< indent << "    counts  " << numProc << '(';
+
+        for (label proci = 0; proci < numProc; ++proci)
+        {
+            if (proci) os << ' ';
+            os << values[proci];
+        }
+
+        Info<< ')' << nl;
+    }
+}
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::profilingPstream::report(const int reportLevel)
+{
+    const label numProc = (UPstream::parRun() ? UPstream::nProcs() : 1);
+
+    if (numProc < 2)
+    {
+        return;
+    }
+
+    // Use mpiGather on all values and perform the combinations
+    // and statistics locally. This reduces the overall number of MPI
+    // calls. For detailed output we need this information anyhow.
+
+    // NB: profilingPstream uses a FixedList for timings(), counts()
+    // so sizes are guaranteed to be consistent and identical everywhere.
+
+    List<double> allTimes;
+    List<uint64_t> allCounts;
+
+    // Avoid disturbing any information
+    const bool oldSuspend = suspend();
+
+    {
+        // The timings
+        const auto& procValues = times_;
+
+        if (UPstream::master())
+        {
+            allTimes.resize(numProc * procValues.size());
+        }
+
+        UPstream::mpiGather
+        (
+            procValues.cdata_bytes(),   // Send
+            procValues.size_bytes(),    // Num send per proc
+            allTimes.data_bytes(),      // Recv
+            procValues.size_bytes(),    // Num recv per proc
+            UPstream::commWorld()
+        );
+    }
+
+    if (reportLevel > 1)
+    {
+        // The counts
+        const auto& procValues = counts_;
+
+        if (UPstream::master())
+        {
+            allCounts.resize(numProc * procValues.size());
+        }
+
+        UPstream::mpiGather
+        (
+            procValues.cdata_bytes(),   // Send
+            procValues.size_bytes(),    // Num send per proc
+            allCounts.data_bytes(),     // Recv
+            procValues.size_bytes(),    // Num recv per proc
+            UPstream::commWorld()
+        );
+    }
+
+    // Resume if not previously suspended
+    if (!oldSuspend)
+    {
+        resume();
+    }
+
+
+    // (Time, Processor) for each of: min/max/sum(avg)
+    typedef FixedList<Tuple2<double, int>, 3> statData;
+
+    // Extract min/max/average
+    auto calcStats = [](const UList<double>& data) -> statData
+    {
+        statData stats;
+        stats = Tuple2<double, int>((data.empty() ? 0 : data[0]), 0);
+
+        const label np = data.size();
+        for (label proci = 1; proci < np; ++proci)
+        {
+            Tuple2<double, int> tup(data[proci], proci);
+
+            // 0: min, 1: max, 2: total(avg)
+            if (stats[0].first() > tup.first()) stats[0] = tup;
+            if (stats[1].first() < tup.first()) stats[1] = tup;
+            stats[2].first() += tup.first();
+        }
+
+        // From total -> average value
+        if (np) { stats[2].first() /= np; }
+
+        return stats;
+    };
+
+
+    const auto printTimingStats =
+        [&](Ostream& os, const char* tag, const statData& stats)
+        {
+            os  << indent << tag << ": avg = " << stats[2].first()
+                << ", min = " << stats[0].first()
+                << " (proc " << stats[0].second() << ')'
+                << ", max = " << stats[1].first()
+                << " (proc " << stats[1].second() << ')'
+                << nl;
+        };
+
+
+    if (UPstream::master())
+    {
+        Info<< "profiling(parallel):" << nl
+            << incrIndent;
+
+        statData stats;
+        List<double> extractedTimes(numProc);
+        List<uint64_t> extractedCounts;
+
+        if (reportLevel > 1)
+        {
+            extractedCounts.resize(numProc);
+        }
+
+        // Total times
+        {
+            extractValues
+            (
+                extractedTimes,
+                allTimes,
+                [=](const double values[])
+                {
+                    double total = 0;
+                    for (unsigned i = 0; i < timingType::nCategories; ++i)
+                    {
+                        total += values[i];
+                    }
+                    return total;
+                }
+            );
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "total     ", stats);
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+        }
+
+        // all-all
+        {
+            const int index = int(timingType::ALL_TO_ALL);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "all-all   ", stats);
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+
+        // broadcast
+        {
+            const int index = int(timingType::BROADCAST);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "broadcast ", stats);
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+
+        // probe
+        {
+            const int index = int(timingType::PROBE);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "probe     ", stats);
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+
+        // Reduce/scatter times
+        {
+            // const int index = int(timingType::REDUCE);
+
+            extractValues
+            (
+                extractedTimes,
+                allTimes,
+                [=](const double values[])
+                {
+                    return
+                    (
+                        values[timingType::REDUCE]
+                      + values[timingType::GATHER]
+                      + values[timingType::SCATTER]
+                    );
+                }
+            );
+            extractValues
+            (
+                extractedCounts,
+                allCounts,
+                [=](const uint64_t values[])
+                {
+                    return
+                    (
+                        values[timingType::REDUCE]
+                      + values[timingType::GATHER]
+                      + values[timingType::SCATTER]
+                    );
+                }
+            );
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "reduce    ", stats);
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+
+        // Recv/send times
+        #if 0  // FUTURE?
+        {
+            // const int index = int(timingType::RECV);
+
+            extractValues
+            (
+                extractedTimes,
+                allTimes,
+                [=](const double values[])
+                {
+                    return
+                    (
+                        values[timingType::RECV]
+                      + values[timingType::SEND]
+                    );
+                }
+            );
+            extractValues
+            (
+                extractedCounts,
+                allCounts,
+                [=](const uint64_t values[])
+                {
+                    return
+                    (
+                        values[timingType::RECV]
+                      + values[timingType::SEND]
+                    );
+                }
+            );
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "send/recv ", stats);
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+        #endif
+
+        // request
+        {
+            const int index = int(timingType::REQUEST);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "request   ", stats);
+
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+
+        // wait
+        {
+            const int index = int(timingType::WAIT);
+
+            extractValues(extractedTimes, index, allTimes);
+            extractValues(extractedCounts, index, allCounts);
+            stats = calcStats(extractedTimes);
+
+            printTimingStats(Info(), "wait      ", stats);
+
+            if (reportLevel > 0) printTimingDetail(extractedTimes);
+            if (reportLevel > 1) printTimingDetail(extractedCounts);
+        }
+
+        Info<< decrIndent;
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingPstream.H b/src/OpenFOAM/global/profiling/profilingPstream.H
index 961aa88596..8256fb1418 100644
--- a/src/OpenFOAM/global/profiling/profilingPstream.H
+++ b/src/OpenFOAM/global/profiling/profilingPstream.H
@@ -60,16 +60,16 @@ public:
         //- The enumerated timing categories (for times and counts arrays)
         enum timingType : unsigned
         {
-            BROADCAST = 0,
-            REDUCE,
+            ALL_TO_ALL = 0,
+            BROADCAST,
             PROBE,
+            REDUCE,
+            GATHER,         // gather (or recv)
+            SCATTER,        // scatter (or send)
             REQUEST,
             WAIT,
-            GATHER,
-            SCATTER,
-            ALL_TO_ALL,
             OTHER,
-            nCategories  // Dimensioning size
+            nCategories     // Dimensioning size
         };
 
         //- Fixed-size container for timing values
@@ -98,28 +98,29 @@ private:
 
 public:
 
-    // Constructors
+    // Static Member Functions
 
-        //- Default construct, enables global timer
-        profilingPstream();
+    // Management
 
+        //- True if timer is active (ie, enabled and not suspended)
+        static bool active() noexcept { return !suspend_ && timer_; }
 
-    //- Destructor, disables global timer
-    ~profilingPstream();
-
-
-    // Member Functions
-
-        //- Create timer for measuring communication, or reset existing
+        //- Create timer for measuring communication or un-suspend existing
         static void enable();
 
-        //- Remove timer for measuring communication activity
+        //- Remove timer for measuring communication activity.
+        //- Does not affect times/counts.
         static void disable() noexcept;
 
-        //- Suspend use of timer (if active)
-        static void suspend() noexcept
+        //- Reset times/counts. Does not affect the timer itself
+        static void reset();
+
+        //- Suspend use of timer. Return old status
+        static bool suspend() noexcept
         {
+            bool old(suspend_);
             suspend_ = bool(timer_);
+            return old;
         }
 
         //- Resume use of timer (if previously active)
@@ -128,14 +129,8 @@ public:
             suspend_ = false;
         }
 
-        //- Timer is active (not suspended and enabled)
-        static bool active() noexcept
-        {
-            return !suspend_ && bool(timer_);
-        }
 
-        //- The total of times
-        static double elapsedTime();
+    // Timing/Counts
 
         //- Access to the timing information
         static timingList& times() noexcept { return times_; }
@@ -155,10 +150,13 @@ public:
             return counts_[idx];
         }
 
+        //- The total of times
+        static double elapsedTime();
+
         //- Update timer prior to measurement
         static void beginTiming()
         {
-            if (active())
+            if (!suspend_ && timer_)
             {
                 (void) timer_->cpuTimeIncrement();
             }
@@ -167,7 +165,7 @@ public:
         //- Add time increment
         static void addTime(const timingType idx)
         {
-            if (active())
+            if (!suspend_ && timer_)
             {
                 times_[idx] += timer_->cpuTimeIncrement();
                 ++counts_[idx];
@@ -227,6 +225,12 @@ public:
         {
             addTime(timingType::OTHER);
         }
+
+
+    // Output
+
+        //- Report current information. Uses parallel communication!
+        static void report(const int reportLevel = 0);
 };
 
 
diff --git a/src/functionObjects/utilities/parProfiling/parProfiling.C b/src/functionObjects/utilities/parProfiling/parProfiling.C
index 5af73afd99..6b0bfef9ca 100644
--- a/src/functionObjects/utilities/parProfiling/parProfiling.C
+++ b/src/functionObjects/utilities/parProfiling/parProfiling.C
@@ -26,12 +26,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "parProfiling.H"
-#include "addToRunTimeSelectionTable.H"
-#include "Pstream.H"
-#include "PstreamReduceOps.H"
 #include "profilingPstream.H"
-#include "Tuple2.H"
-#include "FixedList.H"
+#include "Pstream.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -62,9 +59,9 @@ Foam::functionObjects::parProfiling::parProfiling
 )
 :
     functionObject(name),
-    detailLevel_(0)
+    reportLevel_(0)
 {
-    dict.readIfPresent("detail", detailLevel_);
+    dict.readIfPresent("detail", reportLevel_);
     profilingPstream::enable();
 }
 
@@ -77,368 +74,14 @@ Foam::functionObjects::parProfiling::~parProfiling()
 }
 
 
-// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Loop over all values (with striding) and extract the value at given index
-template<class Type>
-inline static void extractValues
-(
-    UList<Type>& result,
-    const int index,
-    const UList<Type>& allValues
-)
-{
-    if (result.empty())
-    {
-        return;
-    }
-
-    const label numProc = result.size();
-    const Type* values = allValues.cbegin();
-    const label stride = allValues.size() / numProc;
-
-    if (!values || !stride)
-    {
-        result = Type(0);
-        return;
-    }
-
-    for (label proci = 0; proci < numProc; ++proci, values += stride)
-    {
-        result[proci] = values[index];
-    }
-}
-
-
-// Loop over all values (with striding) and extract combined value
-// using the given unary function
-template<class Type, class Extract>
-inline static void extractValues
-(
-    UList<Type>& result,
-    const UList<Type>& allValues,
-    const Extract& extract
-)
-{
-    if (result.empty())
-    {
-        return;
-    }
-
-    const label numProc = result.size();
-    const Type* values = allValues.cbegin();
-    const label stride = allValues.size() / numProc;
-
-    if (!values || !stride)
-    {
-        result = Type(0);
-        return;
-    }
-
-    for (label proci = 0; proci < numProc; ++proci, values += stride)
-    {
-        result[proci] = extract(values);
-    }
-}
-
-
-inline static void printTimingDetail(const UList<double>& values)
-{
-    const label numProc = values.size();
-
-    if (numProc)
-    {
-        Info<< indent << "    times   " << numProc << '(';
-
-        for (label proci = 0; proci < numProc; ++proci)
-        {
-            if (proci) Info<< ' ';
-            Info<< values[proci];
-        }
-
-        Info<< ')' << nl;
-    }
-}
-
-
-inline static void printTimingDetail(const UList<uint64_t>& values)
-{
-    const label numProc = values.size();
-
-    if (numProc)
-    {
-        // Output via std::ostream to avoid conversion to Foam::label
-        // that Ostream performs
-
-        auto& os = Info.stdStream();
-
-        Info<< indent << "    counts  " << numProc << '(';
-
-        for (label proci = 0; proci < numProc; ++proci)
-        {
-            if (proci) os << ' ';
-            os << values[proci];
-        }
-
-        Info<< ')' << nl;
-    }
-}
-
-} // End namespace Foam
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::functionObjects::parProfiling::report()
 {
-    const label numProc = (UPstream::parRun() ? UPstream::nProcs() : 1);
-
-    if (!profilingPstream::active() || numProc < 2)
+    if (UPstream::parRun() && UPstream::nProcs() > 1)
     {
-        return;
-    }
-
-    // Use mpiGather on all values and perform the combinations
-    // and statistics locally. This reduces the overall number of MPI
-    // calls. For detailed output we need this information anyhow.
-
-    // NB: profilingPstream uses a FixedList for timings(), counts()
-    // so the sizes are guaranteed to be consistent and identical
-    // everywhere.
-
-    List<double> allTimes;
-    List<uint64_t> allCounts;
-
-    // Avoid disturbing the counts
-    profilingPstream::suspend();
-
-    {
-        // The timings
-        const auto& procTimes = profilingPstream::times();
-
-        if (Pstream::master())
-        {
-            allTimes.resize(numProc * procTimes.size());
-        }
-
-        UPstream::mpiGather
-        (
-            procTimes.cdata_bytes(), // Send
-            procTimes.size_bytes(),  // Num send per proc
-            allTimes.data_bytes(),   // Recv
-            procTimes.size_bytes(),  // Num recv per proc
-            UPstream::commWorld()
-        );
-    }
-
-    if (detailLevel_ > 1)
-    {
-        // The counts
-        const auto& procCounts = profilingPstream::counts();
-
-        if (Pstream::master())
-        {
-            allCounts.resize(numProc * procCounts.size());
-        }
-
-        UPstream::mpiGather
-        (
-            procCounts.cdata_bytes(), // Send
-            procCounts.size_bytes(),  // Num send per proc
-            allCounts.data_bytes(),   // Recv
-            procCounts.size_bytes(),  // Num recv per proc
-            UPstream::commWorld()
-        );
-    }
-
-    profilingPstream::resume();
-
-
-    // (Time, Processor) for each of: min/max/sum(avg)
-    typedef FixedList<Tuple2<double, int>, 3> statData;
-
-    // Extract min/max/average
-    auto calcStats = [](const UList<double>& data) -> statData
-    {
-        statData stats;
-        stats = Tuple2<double, int>((data.empty() ? 0 : data[0]), 0);
-
-        const label np = data.size();
-        for (label proci = 1; proci < np; ++proci)
-        {
-            Tuple2<double, int> tup(data[proci], proci);
-
-            // 0: min, 1: max, 2: total(avg)
-            if (stats[0].first() > tup.first()) stats[0] = tup;
-            if (stats[1].first() < tup.first()) stats[1] = tup;
-            stats[2].first() += tup.first();
-        }
-
-        // From total -> average value
-        if (np) { stats[2].first() /= np; }
-
-        return stats;
-    };
-
-
-    const auto printTimingStats =
-        [&](Ostream& os, const char* tag, const statData& stats)
-        {
-            os  << indent << tag << ": avg = " << stats[2].first()
-                << ", min = " << stats[0].first()
-                << " (proc " << stats[0].second() << ')'
-                << ", max = " << stats[1].first()
-                << " (proc " << stats[1].second() << ')'
-                << nl;
-        };
-
-
-    if (Pstream::master())
-    {
-        statData stats;
-        List<double> extractedTimes(numProc);
-        List<uint64_t> extractedCounts;
-
-        if (detailLevel_ > 1)
-        {
-            extractedCounts.resize(numProc);
-        }
-
-        Info<< type() << ':' << nl
-            << incrIndent;
-
-        // Total times
-        {
-            extractValues
-            (
-                extractedTimes,
-                allTimes,
-                [=](const double values[])
-                {
-                    double total = 0;
-                    for (unsigned i = 0; i < profilingPstream::nCategories; ++i)
-                    {
-                        total += values[i];
-                    }
-                    return total;
-                }
-            );
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "total     ", stats);
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-        }
-
-        // all-all
-        {
-            const int index = int(profilingPstream::ALL_TO_ALL);
-
-            extractValues(extractedTimes, index, allTimes);
-            extractValues(extractedCounts, index, allCounts);
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "all-all   ", stats);
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
-        }
-
-        // broadcast
-        {
-            const int index = int(profilingPstream::BROADCAST);
-
-            extractValues(extractedTimes, index, allTimes);
-            extractValues(extractedCounts, index, allCounts);
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "broadcast ", stats);
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
-        }
-
-        // probe
-        {
-            const int index = int(profilingPstream::PROBE);
-
-            extractValues(extractedTimes, index, allTimes);
-            extractValues(extractedCounts, index, allCounts);
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "probe     ", stats);
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
-        }
-
-        // Reduce/scatter times
-        {
-            // const int index = int(profilingPstream::REDUCE);
-
-            extractValues
-            (
-                extractedTimes,
-                allTimes,
-                [=](const double values[])
-                {
-                    return
-                    (
-                        values[profilingPstream::REDUCE]
-                      + values[profilingPstream::GATHER]
-                      + values[profilingPstream::SCATTER]
-                    );
-                }
-            );
-            extractValues
-            (
-                extractedCounts,
-                allCounts,
-                [=](const uint64_t values[])
-                {
-                    return
-                    (
-                        values[profilingPstream::REDUCE]
-                      + values[profilingPstream::GATHER]
-                      + values[profilingPstream::SCATTER]
-                    );
-                }
-            );
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "reduce    ", stats);
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
-        }
-
-        // request
-        {
-            const int index = int(profilingPstream::REQUEST);
-
-            extractValues(extractedTimes, index, allTimes);
-            extractValues(extractedCounts, index, allCounts);
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "request   ", stats);
-
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
-        }
-
-        // wait
-        {
-            const int index = int(profilingPstream::WAIT);
-
-            extractValues(extractedTimes, index, allTimes);
-            extractValues(extractedCounts, index, allCounts);
-            stats = calcStats(extractedTimes);
-
-            printTimingStats(Info(), "wait      ", stats);
-
-            if (detailLevel_ > 0) printTimingDetail(extractedTimes);
-            if (detailLevel_ > 1) printTimingDetail(extractedCounts);
-        }
-
-        Info<< decrIndent;
+        Info<< nl;
+        profilingPstream::report(reportLevel_);
     }
 }
 
diff --git a/src/functionObjects/utilities/parProfiling/parProfiling.H b/src/functionObjects/utilities/parProfiling/parProfiling.H
index 4a3f37eb2a..9b93aa8009 100644
--- a/src/functionObjects/utilities/parProfiling/parProfiling.H
+++ b/src/functionObjects/utilities/parProfiling/parProfiling.H
@@ -74,9 +74,9 @@ class parProfiling
 {
     // Private Data
 
-        //- The level of detail
+        //- The reporting level
         //  0: summary, 1: per-proc times, 2: per-proc times/counts
-        int detailLevel_;
+        int reportLevel_;
 
 public:
 

From d51967d72812b28a6f5170e1648322f9036f0129 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 6 Apr 2023 13:33:18 +0100
Subject: [PATCH 159/348] ENH: faceAgglomerate: more robust. Fixes #2741

- feature angle compared to real angle
- stop agglomerating if number of marked edges does not change
---
 .../pairPatchAgglomeration/Make/options       |   1 +
 .../pairPatchAgglomeration.C                  | 431 ++++++++++++------
 .../pairPatchAgglomeration.H                  |  34 +-
 .../constant/air/viewFactorsDict              |  23 +-
 4 files changed, 352 insertions(+), 137 deletions(-)

diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
index 82c725aa85..7063a63df5 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index d1e2faf2ec..8bc9ed667e 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +30,15 @@ License
 #include "meshTools.H"
 #include "edgeHashes.H"
 #include "unitConversion.H"
+#include "OBJstream.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(pairPatchAgglomeration, 0);
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -44,7 +53,8 @@ void Foam::pairPatchAgglomeration::compactLevels(const label nCreatedLevels)
 bool Foam::pairPatchAgglomeration::continueAgglomerating
 (
     const label nLocal,
-    const label nLocalOld
+    const label nLocalOld,
+    const label nMarkedEdges
 )
 {
     // Keep agglomerating
@@ -54,65 +64,80 @@ bool Foam::pairPatchAgglomeration::continueAgglomerating
 
     label nGlobal = returnReduce(nLocal, sumOp<label>());
     label nGlobalOld = returnReduce(nLocalOld, sumOp<label>());
+    label nGlobalMarked = returnReduce(nMarkedEdges, sumOp<label>());
 
     return
     (
         returnReduceOr(nLocal > nFacesInCoarsestLevel_)
      || nGlobal > nGlobalFacesInCoarsestLevel_
     )
-    && nGlobal != nGlobalOld;
+    && (nGlobal != nGlobalOld || nGlobalMarked > 0);
 }
 
 
 void Foam::pairPatchAgglomeration::setLevel0EdgeWeights()
 {
     const bPatch& coarsePatch = patchLevels_[0];
-    forAll(coarsePatch.edges(), i)
+    const auto& coarseEdges = coarsePatch.edges();
+
+    // Statistics on edges
+    label nNonManif = 0;
+    label nFeat = 0;
+
+    for (label i = 0; i < coarsePatch.nInternalEdges(); i++)
     {
-        if (coarsePatch.isInternalEdge(i))
+        scalar edgeLength = coarseEdges[i].mag(coarsePatch.localPoints());
+
+        const labelList& eFaces = coarsePatch.edgeFaces()[i];
+
+        if (eFaces.size() == 2)
         {
-            scalar edgeLength =
-                coarsePatch.edges()[i].mag(coarsePatch.localPoints());
+            scalar cosI =
+                coarsePatch.faceNormals()[eFaces[0]]
+              & coarsePatch.faceNormals()[eFaces[1]];
 
-            const labelList& eFaces = coarsePatch.edgeFaces()[i];
+            const edge edgeCommon = edge(eFaces[0], eFaces[1]);
 
-            if (eFaces.size() == 2)
+            if (facePairWeight_.found(edgeCommon))
             {
-                scalar cosI =
-                    coarsePatch.faceNormals()[eFaces[0]]
-                  & coarsePatch.faceNormals()[eFaces[1]];
-
-                const edge edgeCommon = edge(eFaces[0], eFaces[1]);
-
-                if (facePairWeight_.found(edgeCommon))
-                {
-                    facePairWeight_[edgeCommon] += edgeLength;
-                }
-                else
-                {
-                    facePairWeight_.insert(edgeCommon, edgeLength);
-                }
-
-                if (mag(cosI) < Foam::cos(degToRad(featureAngle_)))
-                {
-                    facePairWeight_[edgeCommon] = -1.0;
-                }
+                facePairWeight_[edgeCommon] += edgeLength;
             }
             else
             {
-                forAll(eFaces, j)
-                {
-                    for (label k = j+1; k<eFaces.size(); k++)
-                    {
-                        facePairWeight_.insert
-                        (
-                            edge(eFaces[j], eFaces[k]),
-                            -1.0
-                        );
-                    }
-                }
+                facePairWeight_.insert(edgeCommon, edgeLength);
+            }
+
+            if (cosI < Foam::cos(degToRad(featureAngle_)))
+            {
+                facePairWeight_[edgeCommon] = -1.0;
+                nFeat++;
             }
         }
+        else
+        {
+            forAll(eFaces, j)
+            {
+                for (label k = j+1; k<eFaces.size(); k++)
+                {
+                    facePairWeight_.insert
+                    (
+                        edge(eFaces[j], eFaces[k]),
+                        -1.0
+                    );
+                }
+            }
+            nNonManif++;
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< "Level:" << 0
+            << " nEdges:" << coarsePatch.nEdges() << " of which:" << nl
+            << "    boundary:" << coarsePatch.nBoundaryEdges() << nl
+            << "    non-manifold:" << nNonManif << nl
+            << "    feature (angle < " << featureAngle_ << "):" << nFeat << nl
+            << endl;
     }
 }
 
@@ -123,9 +148,8 @@ void Foam::pairPatchAgglomeration::setEdgeWeights
 )
 {
     const bPatch& coarsePatch = patchLevels_[fineLevelIndex];
+    const auto& coarseEdges = coarsePatch.edges();
     const labelList& fineToCoarse = restrictAddressing_[fineLevelIndex];
-    const label nCoarseI =  max(fineToCoarse) + 1;
-    labelListList coarseToFine(invertOneToMany(nCoarseI, fineToCoarse));
 
     edgeHashSet fineFeaturedFaces(coarsePatch.nEdges()/10);
 
@@ -144,54 +168,173 @@ void Foam::pairPatchAgglomeration::setEdgeWeights
         }
     }
 
+
+    // Statistics on edges
+    label nNonManif = 0;
+    label nFeat = 0;
+
     // Clean old weights
     facePairWeight_.clear();
     facePairWeight_.resize(coarsePatch.nEdges());
 
-    forAll(coarsePatch.edges(), i)
+    for (label i = 0; i < coarsePatch.nInternalEdges(); i++)
     {
-        if (coarsePatch.isInternalEdge(i))
+        scalar edgeLength = coarseEdges[i].mag(coarsePatch.localPoints());
+
+        const labelList& eFaces = coarsePatch.edgeFaces()[i];
+
+        if (eFaces.size() == 2)
         {
-            scalar edgeLength =
-                coarsePatch.edges()[i].mag(coarsePatch.localPoints());
-
-            const labelList& eFaces = coarsePatch.edgeFaces()[i];
-
-            if (eFaces.size() == 2)
+            const edge edgeCommon(eFaces[0], eFaces[1]);
+            // If the fine 'pair' faces was featured edge so it is
+            // the coarse 'pair'
+            if (fineFeaturedFaces.found(edgeCommon))
             {
-                const edge edgeCommon = edge(eFaces[0], eFaces[1]);
-                if (facePairWeight_.found(edgeCommon))
+                auto w = facePairWeight_.find(edgeCommon);
+                if (!w.good())
                 {
-                    facePairWeight_[edgeCommon] += edgeLength;
+                    facePairWeight_.insert(edgeCommon, -1.0);
+                    nFeat++;
+                }
+                else if (w() != -1.0)
+                {
+                    // Mark as feature edge
+                    w() = -1.0;
+                    nFeat++;
+                }
+            }
+            else
+            {
+                auto w = facePairWeight_.find(edgeCommon);
+                if (w)
+                {
+                    if (w() != -1.0)
+                    {
+                        w() += edgeLength;
+                    }
                 }
                 else
                 {
                     facePairWeight_.insert(edgeCommon, edgeLength);
                 }
-                // If the fine 'pair' faces was featured edge so it is
-                // the coarse 'pair'
-                if (fineFeaturedFaces.found(edgeCommon))
+            }
+        }
+        else
+        {
+            // Set edge as barrier by setting weight to -1
+            forAll(eFaces, j)
+            {
+                for (label k = j+1; k<eFaces.size(); k++)
                 {
-                    facePairWeight_[edgeCommon] = -1.0;
+                    facePairWeight_.insert
+                    (
+                        edge(eFaces[j], eFaces[k]),
+                        -1.0
+                    );
                 }
             }
-            else
+            nNonManif++;
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< "Level:" << fineLevelIndex
+            << " nEdges:" << coarsePatch.nEdges() << " of which:" << nl
+            << "    boundary:" << coarsePatch.nBoundaryEdges() << nl
+            << "    non-manifold:" << nNonManif << nl
+            << "    feature (angle < " << featureAngle_ << "):" << nFeat << nl
+            << endl;
+    }
+}
+
+
+bool Foam::pairPatchAgglomeration::isSingleEdgeLoop
+(
+    const bPatch& patch,
+    const labelList& faceIDs,
+    const label facei
+) const
+{
+    // Does combining facei with faceIDs produce a valid single face?
+
+    labelList allFaces(faceIDs.size()+1);
+    SubList<label>(allFaces, faceIDs.size()) = faceIDs;
+    allFaces.last() = facei;
+
+    // Construct single face
+    const indirectPrimitivePatch upp
+    (
+        IndirectList<face>(patch, allFaces),
+        patch.points()
+    );
+
+    return (upp.edgeLoops().size() == 1);
+}
+
+
+Foam::label Foam::pairPatchAgglomeration::maxValidNeighbour
+(
+    const bool addToCluster,
+    const bPatch& patch,
+    const label facei,
+    const labelList& fineToCoarse
+    //const labelListList& coarseToFine
+) const
+{
+    // Return index of neighbour face with max edge weight. Either looks
+    // at clustered faces (addToCluster=true) or at unclustered faces
+
+    const auto& fFaces = patch.faceFaces()[facei];
+
+    label matchFaceNeibNo = -1;
+    scalar maxFaceWeight = -0.5;    // negative but larger than -1 (= feature)
+
+    if (addToCluster)
+    {
+        // Check faces to find grouped neighbour with largest face weight
+        // and that forms a single edge cut
+        for (const label faceNeig : fFaces)
+        {
+            const label coarsei = fineToCoarse[faceNeig];
+
+            if (coarsei >= 0)
             {
-                // Set edge as barrier by setting weight to -1
-                forAll(eFaces, j)
+                const edge edgeCommon = edge(facei, faceNeig);
+                const auto& weight = facePairWeight_[edgeCommon];
+                if
+                (
+                    (weight > maxFaceWeight)
+                 //&& (isSingleEdgeLoop(patch, coarseToFine[coarsei], facei))
+                )
                 {
-                    for (label k = j+1; k<eFaces.size(); k++)
-                    {
-                        facePairWeight_.insert
-                        (
-                            edge(eFaces[j], eFaces[k]),
-                            -1.0
-                        );
-                    }
+                    maxFaceWeight = weight;
+                    matchFaceNeibNo = faceNeig;
                 }
             }
         }
     }
+    else
+    {
+        // Check faces to find ungrouped neighbour with largest face weight
+        for (const label faceNeig : fFaces)
+        {
+            const label coarsei = fineToCoarse[faceNeig];
+
+            if (coarsei < 0)    // ungrouped
+            {
+                const edge edgeCommon = edge(facei, faceNeig);
+                const auto& weight = facePairWeight_[edgeCommon];
+                if (weight > maxFaceWeight)
+                {
+                    maxFaceWeight = weight;
+                    matchFaceNeibNo = faceNeig;
+                }
+            }
+        }
+    }
+
+    return matchFaceNeibNo;
 }
 
 
@@ -307,7 +450,8 @@ bool Foam::pairPatchAgglomeration::agglomeratePatch
 (
     const bPatch& patch,
     const labelList& fineToCoarse,
-    const label fineLevelIndex
+    const label fineLevelIndex,
+    label& nMarkedEdges
 )
 {
     if (min(fineToCoarse) == -1)
@@ -333,10 +477,13 @@ bool Foam::pairPatchAgglomeration::agglomeratePatch
     const label nCoarseI =  max(fineToCoarse) + 1;
     List<face> patchFaces(nCoarseI);
 
-
     // Patch faces per agglomeration
     labelListList coarseToFine(invertOneToMany(nCoarseI, fineToCoarse));
 
+    // Additional feature edges created
+    nMarkedEdges = 0;
+
+
     for (label coarseI = 0; coarseI < nCoarseI; coarseI++)
     {
         const labelList& fineFaces = coarseToFine[coarseI];
@@ -350,23 +497,54 @@ bool Foam::pairPatchAgglomeration::agglomeratePatch
 
         if (upp.edgeLoops().size() != 1)
         {
-            if (fineFaces.size() == 2)
+            // More than one outside loop. Possible because pair-wise
+            // agglomeration has e.g. walked a path leaving a hole in the
+            // middle of a coarse face.
+            //  - mark as feature edges to avoid locally further agglomeration
+            //  - but further agglomeration might e.g. 'fill in the hole'
+            //  - or immediately leave all agglomeration
+            // Currently we have no choice but to leave agglomeration since
+            // we cannot store a face-with-hole.
+
+
+            //{
+            //    OBJstream os
+            //    (
+            //        "error_agglomeration_"+Foam::name(fineLevelIndex)+".obj"
+            //    );
+            //    Pout<< "Writing error patch at level:" << fineLevelIndex
+            //        << " to:" << os.name() << endl;
+            //    os.write(upp.localFaces(), upp.localPoints(), true);
+            //}
+
+            if (fineFaces.size() >= 2)
             {
-                const edge e(fineFaces[0], fineFaces[1]);
-                facePairWeight_[e] = -1.0;
-            }
-            else if (fineFaces.size() == 3)
-            {
-                const edge e(fineFaces[0], fineFaces[1]);
-                const edge e1(fineFaces[0], fineFaces[2]);
-                const edge e2(fineFaces[2], fineFaces[1]);
-                facePairWeight_[e] = -1.0;
-                facePairWeight_[e1] = -1.0;
-                facePairWeight_[e2] = -1.0;
+                forAll(fineFaces, j)
+                {
+                    for (label k = j+1; k<fineFaces.size(); k++)
+                    {
+                        const edge e(fineFaces[j], fineFaces[k]);
+
+                        auto w = facePairWeight_.find(e);
+                        if (!w.good())
+                        {
+                            facePairWeight_.insert(e, -1.0);
+                            nMarkedEdges++;
+                        }
+                        else if (w() != -1.0)
+                        {
+                            // Mark as feature edge
+                            w() = -1.0;
+                            nMarkedEdges++;
+                        }
+                    }
+                }
             }
+
             return false;
         }
 
+        // In-place override face
         patchFaces[coarseI] = face
         (
             renumber
@@ -398,6 +576,7 @@ void Foam::pairPatchAgglomeration::agglomerate()
 
     label nCoarseFaces = 0;
     label nCoarseFacesOld = 0;
+    label nMarkedEdges = 0;
 
     while (nCreatedLevels < maxLevels_)
     {
@@ -421,18 +600,28 @@ void Foam::pairPatchAgglomeration::agglomerate()
             {
                 // Attempt to create coarse face addressing
                 // - returns true if successful; otherwise resets edge weights
-                //   and assume try again...
+                //   and tries again...
                 createdLevel = agglomeratePatch
                 (
                     patch,
                     tfinalAgglom,
-                    nCreatedLevels
+                    nCreatedLevels,
+                    nMarkedEdges
                 );
             }
         }
 
         if (createdLevel)
         {
+            if (debug)
+            {
+                const auto& agglomPatch = patchLevels_[nCreatedLevels];
+                OBJstream os("agglomPatch"+Foam::name(nCreatedLevels)+".obj");
+                Pout<< "Writing new patch at level:" << nCreatedLevels
+                    << " to:" << os.name() << endl;
+                os.write(agglomPatch, agglomPatch.points(), true);
+            }
+
             restrictAddressing_.set(nCreatedLevels, tfinalAgglom);
 
             mapBaseToTopAgglom(nCreatedLevels);
@@ -455,7 +644,7 @@ void Foam::pairPatchAgglomeration::agglomerate()
 
         // Check to see if we need to continue agglomerating
         // - Note: performs parallel reductions
-        if (!continueAgglomerating(nCoarseFaces, nCoarseFacesOld))
+        if (!continueAgglomerating(nCoarseFaces, nCoarseFacesOld, nMarkedEdges))
         {
             break;
         }
@@ -480,82 +669,64 @@ Foam::tmp<Foam::labelField> Foam::pairPatchAgglomeration::agglomerateOneLevel
 
     const labelListList& faceFaces = patch.faceFaces();
 
+    //labelListList coarseToFine(nFineFaces);
     nCoarseFaces = 0;
 
     forAll(faceFaces, facei)
     {
-        const labelList& fFaces = faceFaces[facei];
-
         if (coarseCellMap[facei] < 0)
         {
-            label matchFaceNo = -1;
-            label matchFaceNeibNo = -1;
-            scalar maxFaceWeight = -GREAT;
+            const label matchFaceNeibNo = maxValidNeighbour
+            (
+                false,          // ungrouped neighbours only
+                patch,
+                facei,
+                coarseCellMap
+                //coarseToFine
+            );
 
-            // Check faces to find ungrouped neighbour with largest face weight
-            forAll(fFaces, i)
-            {
-                label faceNeig = fFaces[i];
-                const edge edgeCommon = edge(facei, faceNeig);
-                if
-                (
-                    facePairWeight_[edgeCommon] > maxFaceWeight
-                 && coarseCellMap[faceNeig] < 0
-                 && facePairWeight_[edgeCommon] != -1.0
-                )
-                {
-                    // Match found. Pick up all the necessary data
-                    matchFaceNo = facei;
-                    matchFaceNeibNo = faceNeig;
-                    maxFaceWeight = facePairWeight_[edgeCommon];
-                }
-            }
-
-            if (matchFaceNo >= 0)
+            if (matchFaceNeibNo >= 0)
             {
                 // Make a new group
-                coarseCellMap[matchFaceNo] = nCoarseFaces;
+                coarseCellMap[facei] = nCoarseFaces;
                 coarseCellMap[matchFaceNeibNo] = nCoarseFaces;
+                //coarseToFine[nCoarseFaces] =
+                //    labelList({facei, matchFaceNeibNo});
                 nCoarseFaces++;
             }
             else
             {
                 // No match. Find the best neighbouring cluster and
                 // put the cell there
-                label clusterMatchFaceNo = -1;
-                scalar clusterMaxFaceCoeff = -GREAT;
+                const label clusterMatchFaceNo = maxValidNeighbour
+                (
+                    true,          // grouped neighbours only
+                    patch,
+                    facei,
+                    coarseCellMap
+                    //coarseToFine
+                );
 
-                forAll(fFaces, i)
-                {
-                    label faceNeig = fFaces[i];
-                    const edge edgeCommon = edge(facei, faceNeig);
-                    if
-                    (
-                        facePairWeight_[edgeCommon] > clusterMaxFaceCoeff
-                     && facePairWeight_[edgeCommon] != -1.0
-                     && coarseCellMap[faceNeig] >= 0
-                    )
-                    {
-                        clusterMatchFaceNo = faceNeig;
-                        clusterMaxFaceCoeff = facePairWeight_[edgeCommon];
-                    }
-                }
-
-                if (clusterMatchFaceNo > 0)
+                if (clusterMatchFaceNo >= 0)
                 {
                     // Add the cell to the best cluster
-                    coarseCellMap[facei] = coarseCellMap[clusterMatchFaceNo];
+                    const label coarsei = coarseCellMap[clusterMatchFaceNo];
+                    coarseCellMap[facei] = coarsei;
+                    //coarseToFine[coarsei].append(facei);
                 }
                 else
                 {
                     // If not create single-cell "clusters" for each
                     coarseCellMap[facei] = nCoarseFaces;
+                    //coarseToFine[nCoarseFaces] = labelList({facei});
                     nCoarseFaces++;
                 }
             }
         }
     }
 
+    //coarseToFine.setSize(nCoarseFaces);
+
     // Check that all faces are part of clusters,
     for (label facei=0; facei<nFineFaces; facei++)
     {
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
index bf2827ce9a..ac564b2b91 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,9 +101,30 @@ private:
         (
             const bPatch& patch,
             const labelList& fineToCoarse,
-            const label fineLevelIndex
+            const label fineLevelIndex,
+            label& nMarkedEdges
         );
 
+        //- Does combining facei with faceIDs produce a single face?
+        bool isSingleEdgeLoop
+        (
+            const bPatch& patch,
+            const labelList& faceIDs,
+            const label facei
+        ) const;
+
+        //- Select neighbour with highest inbetween edge weight. Either looks
+        //- at already clustered faces (addToCluster=true) or only
+        //  unclustered
+        label maxValidNeighbour
+        (
+            const bool addToCluster,
+            const bPatch& patch,
+            const label facei,
+            const labelList& coarseCellMap
+            //const labelListList& coarseToFine
+        ) const;
+
         //- Agglomerate one level
         tmp<labelField> agglomerateOneLevel
         (
@@ -121,7 +142,8 @@ private:
         bool continueAgglomerating
         (
             const label nLocal,
-            const label nLocalOld
+            const label nLocalOld,
+            const label nMarkedEdges
         );
 
         //- Set edge weights
@@ -142,6 +164,10 @@ private:
 
 public:
 
+    //- Runtime type information
+    TypeName("pairPatch");
+
+
     // Constructors
 
         //- Construct given faces, points and control dictionary
@@ -166,7 +192,7 @@ public:
 
 
     // Destructor
-    ~pairPatchAgglomeration();
+    virtual ~pairPatchAgglomeration();
 
 
     // Member Functions
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict
index 44dd441363..f2dcc52672 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict
@@ -14,9 +14,26 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-writeViewFactorMatrix     true;
-writePatchViewFactors     false;
-// dumpRays    true;
+
+writeViewFactorMatrix       true;
+writePatchViewFactors       false;
+
+// Write rays as lines to .obj file
+//dumpRays                    true;
+
+
+// Switch on debug for faceAgglomerate
+//debug                       1;
+writeFacesAgglomeration     true;
+patchAgglomeration
+{
+    // Do all of the view-factor patches
+    viewFactorWall
+    {
+        nFacesInCoarsestLevel   10;
+        featureAngle            45;
+    }
+}
 
 maxDynListLength          200000;
 

From d826f9259f8783336c60990d3b7e7fea65b1fb89 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Mar 2023 13:02:36 +0100
Subject: [PATCH 160/348] ENH: properly trap any sub-rank changes in
 allocatePstreamCommunicator

- not currently used, but it is possible that communicator allocation
  modifies the list of sub-ranks. Ensure that the correct size is used
  when (re)initialising the linear/tree structures.

STYLE: adjust MPI test applications

- remove some clutter and unneeded grouping.
  Some ideas for host-only communicators
---
 .../test/parallel-comm2/Test-parallel-comm2.C | 302 ++++++++++++++----
 .../Test-parallel-external-init.C             |  50 +--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  45 ++-
 3 files changed, 282 insertions(+), 115 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index ce77d5b38c..53b8fc3e5e 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -39,6 +39,7 @@ Description
 #include "Tuple2.H"
 #include "IOstreams.H"
 #include "PstreamReduceOps.H"
+#include "SHA1.H"
 #include <mpi.h>
 
 using namespace Foam;
@@ -99,51 +100,61 @@ int main(int argc, char *argv[])
     labelList subRanks;
     UPstream::communicator newComm;
 
-    #if 1
-    // With first ranks
-    subRanks = identity(UPstream::nProcs(UPstream::commWorld()) / 2);
-
-    newComm.reset(UPstream::commWorld(), subRanks);
-    localRanki = UPstream::myProcNo(newComm);
-
-    Pout.prefix() =
-    (
-        '[' + Foam::name(myProci) + " a:" + Foam::name(localRanki) + "] "
-    );
-
-    Info<< "procIDs: "
-        << flatOutput(UPstream::procID(newComm)) << endl;
-
-    rankInfo(newComm);
-    Pout<< endl;
-    #endif
-
-    #if 1
-    // With every other rank
-    subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
-
-    for (label& val : subRanks)
+    if (!args.found("comm-split") && !args.found("host-comm"))
     {
-        if (val % 2) val = -1;
+        #if 1
+        // With first ranks
+        subRanks = identity(UPstream::nProcs(UPstream::commWorld()) / 2);
+
+        newComm.reset(UPstream::commWorld(), subRanks);
+        localRanki = UPstream::myProcNo(newComm);
+
+        Pout.prefix() =
+        (
+            '[' + Foam::name(myProci) + " a:" + Foam::name(localRanki) + "] "
+        );
+
+        Info<< "procIDs: "
+            << flatOutput(UPstream::procID(newComm)) << endl;
+
+        rankInfo(newComm);
+        Pout<< endl;
+        #endif
+
+        #if 1
+        // With every other rank
+        subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
+
+        for (label& val : subRanks)
+        {
+            if (val % 2) val = -1;
+        }
+
+        newComm.reset(UPstream::commWorld(), subRanks);
+        localRanki = UPstream::myProcNo(newComm);
+
+        Pout.prefix() =
+        (
+            '[' + Foam::name(myProci) + " b:" + Foam::name(localRanki) + "] "
+        );
+
+        Info<< "procIDs: "
+            << flatOutput(UPstream::procID(newComm)) << endl;
+
+        rankInfo(newComm);
+        Pout<< endl;
+        #endif
     }
 
-    newComm.reset(UPstream::commWorld(), subRanks);
-    localRanki = UPstream::myProcNo(newComm);
-
-    Pout.prefix() =
-    (
-        '[' + Foam::name(myProci) + " b:" + Foam::name(localRanki) + "] "
-    );
-
-    Info<< "procIDs: "
-        << flatOutput(UPstream::procID(newComm)) << endl;
-
-    rankInfo(newComm);
-    Pout<< endl;
-    #endif
-
     if (Pstream::parRun() && args.found("comm-split"))
     {
+        int world_nprocs = 0;
+        int world_rank = -1;
+        MPI_Comm_size(MPI_COMM_WORLD, &world_nprocs);
+        MPI_Comm_rank(MPI_COMM_WORLD, &world_rank);
+
+        int host_nprocs = 0;
+        int host_rank = -1;
         MPI_Comm hostComm;
         MPI_Comm_split_type
         (
@@ -152,15 +163,98 @@ int main(int argc, char *argv[])
             0, MPI_INFO_NULL, &hostComm
         );
 
-        int host_nprocs = 0;
-        int host_rank = 0;
         MPI_Comm_size(hostComm, &host_nprocs);
         MPI_Comm_rank(hostComm, &host_rank);
 
-        Pout<< nl << "Host comm with "
-            << host_rank << " / " << host_nprocs
-            << " (using MPI_Comm_split_type)" << endl;
+        int leader_nprocs = 0;
+        int leader_rank = -1;
+        MPI_Comm hostMasterComm;
 
+        if (false)
+        {
+            // Easy enough to use MPI_Comm_split, but slightly annoying
+            // that it returns MPI_COMM_NULL for unused ranks...
+            MPI_Comm hostMasterComm;
+            MPI_Comm_split
+            (
+                MPI_COMM_WORLD,
+                (host_rank == 0) ? 0 : MPI_UNDEFINED,
+                0, &hostMasterComm
+            );
+
+            if (hostMasterComm != MPI_COMM_NULL)
+            {
+                MPI_Comm_size(hostMasterComm, &leader_nprocs);
+                MPI_Comm_rank(hostMasterComm, &leader_rank);
+            }
+        }
+        else
+        {
+            boolList isHostLeader(world_nprocs, false);
+            isHostLeader[world_rank] = (host_rank == 0);
+
+            MPI_Allgather
+            (
+                // recv is also send
+                MPI_IN_PLACE, 1, MPI_C_BOOL,
+                isHostLeader.data(), 1, MPI_C_BOOL,
+                MPI_COMM_WORLD
+            );
+
+            Pout<< "leaders: " << isHostLeader << endl;
+
+            DynamicList<int> subRanks(isHostLeader.size());
+            forAll(isHostLeader, proci)
+            {
+                if (isHostLeader[proci])
+                {
+                    subRanks.push_back(proci);
+                }
+            }
+            // Starting from parent
+            MPI_Group parent_group;
+            MPI_Comm_group(MPI_COMM_WORLD, &parent_group);
+
+            MPI_Group active_group;
+            MPI_Group_incl
+            (
+                parent_group,
+                subRanks.size(),
+                subRanks.cdata(),
+                &active_group
+            );
+
+            // Create new communicator for this group
+            MPI_Comm_create_group
+            (
+                MPI_COMM_WORLD,
+                active_group,
+                UPstream::msgType(),
+                &hostMasterComm
+            );
+
+            // Groups not needed after this...
+            MPI_Group_free(&parent_group);
+            MPI_Group_free(&active_group);
+
+            MPI_Comm_size(hostMasterComm, &leader_nprocs);
+            MPI_Comm_rank(hostMasterComm, &leader_rank);
+        }
+
+        Pout<< nl << "[MPI_Comm_split_type]" << nl
+            << "Host comm with " << host_rank << " / " << host_nprocs
+            << " on " << hostName()
+            << " master:" << (host_rank == 0)
+            << " leader rank: " << leader_rank
+            << " / " << leader_nprocs
+            << " host leader:" << (leader_rank == 0)
+            << " sub-rank:" << (leader_rank > 0)
+            << nl;
+
+        if (hostMasterComm != MPI_COMM_NULL)
+        {
+            MPI_Comm_free(&hostMasterComm);
+        }
         MPI_Comm_free(&hostComm);
     }
     if (Pstream::parRun() && args.found("host-comm"))
@@ -171,16 +265,56 @@ int main(int argc, char *argv[])
 
         label numprocs = UPstream::nProcs(UPstream::commGlobal());
 
+        // Option 1: using hostnames
+        // - pro: trivial coding
+        // - con: unequal lengths, more allocations and 'hops'
         stringList hosts(numprocs);
         hosts[Pstream::myProcNo(UPstream::commGlobal())] = hostName();
+        Pstream::gatherList(hosts, UPstream::msgType(), UPstream::commGlobal());
 
-        labelList hostIDs_;
+
+        // Option 2: using SHA1 of hostnames
+        // - con: uglier coding (but only needed locally!)
+        // - pro: fixed digest length enables direct MPI calls
+        //        can avoid Pstream::gatherList() during setup...
+
+        SHA1Digest myHostDigest(SHA1(hostName()).digest());
+
+        List<SHA1Digest> digests;
+        if (UPstream::master(UPstream::commGlobal()))
+        {
+            digests.resize(numprocs);
+        }
+
+        UPstream::mpiGather
+        (
+            reinterpret_cast<const char*>(myHostDigest.cdata_bytes()),
+            SHA1Digest::max_size(),     // Num send per proc
+            digests.data_bytes(),       // Recv
+            SHA1Digest::max_size(),     // Num recv per proc
+            UPstream::commGlobal()
+        );
+
+        // MPI_Gather
+        // (
+        //     myHostDigest.cdata_bytes(), // Send
+        //     SHA1Digest::max_size(),     // Num send per proc
+        //     MPI_BYTE,
+        //     digests.data_bytes(),       // Recv
+        //     SHA1Digest::max_size(),     // Num recv per proc
+        //     MPI_BYTE,
+        //     0,  //  root
+        //     MPI_COMM_WORLD
+        // );
+
+        Info<< "digests: " << digests << nl;
+
+        labelList hostIDs_(numprocs);
 
         // Compact
-        if (Pstream::master(UPstream::commGlobal()))
+        if (UPstream::master(UPstream::commGlobal()))
         {
             DynamicList<word> hostNames(numprocs);
-            hostIDs_.resize_nocopy(numprocs);
 
             forAll(hosts, proci)
             {
@@ -188,20 +322,72 @@ int main(int argc, char *argv[])
 
                 hostIDs_[proci] = hostNames.find(host);
 
-                if (hostIDs_[proci] == -1)
+                if (hostIDs_[proci] < 0)
                 {
-                    hostIDs_[proci] = hostNames.size();
+                    // First appearance of host (encode as leader)
+                    hostIDs_[proci] = -(hostNames.size() + 1);
                     hostNames.push_back(host);
                 }
             }
+
+            DynamicList<SHA1Digest> hostDigest(numprocs);
+
+            forAll(digests, proci)
+            {
+                const SHA1Digest& dig = digests[proci];
+
+                hostIDs_[proci] = hostDigest.find(dig);
+
+                if (hostIDs_[proci] < 0)
+                {
+                    // First appearance of host (encode as leader)
+                    hostIDs_[proci] = -(hostDigest.size() + 1);
+                    hostDigest.push_back(dig);
+                }
+            }
         }
 
-        Pstream::broadcasts(UPstream::commGlobal(), hostIDs_);
+        Info<< "hosts =  " << hosts << endl;
+        Info<< "hostIDs_ =  " << hostIDs_ << endl;
+
+        UPstream::broadcast
+        (
+            hostIDs_.data_bytes(),
+            hostIDs_.size_bytes(),
+            UPstream::commGlobal(),
+            UPstream::masterNo()
+        );
+
+        DynamicList<label> subRanks(numprocs);
+
+        // Ranks for world to hostMaster
+        forAll(hostIDs_, proci)
+        {
+            // Is host leader?
+            if (hostIDs_[proci] < 0)
+            {
+                subRanks.push_back(proci);
+
+                // Flip back to generic host id
+                hostIDs_[proci] = -(hostIDs_[proci] + 1);
+            }
+        }
+
+        // From world to hostMaster
+        const label hostMasterComm =
+            UPstream::allocateCommunicator
+            (
+                UPstream::commGlobal(),
+                subRanks,
+                true
+            );
+
 
         const label myHostId =
             hostIDs_[Pstream::myProcNo(UPstream::commGlobal())];
 
-        DynamicList<label> subRanks;
+        // Ranks for within a host
+        subRanks.clear();
         forAll(hostIDs_, proci)
         {
             if (hostIDs_[proci] == myHostId)
@@ -210,7 +396,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        // Allocate new communicator with global communicator as its parent
+        // The intra-host ranks
         const label hostComm =
             UPstream::allocateCommunicator
             (
@@ -219,11 +405,19 @@ int main(int argc, char *argv[])
                 true
             );
 
-        Pout<< nl << "Host comm with "
+        Pout<< nl << "[manual split]" << nl
+            << nl << "Host comm with "
             << UPstream::myProcNo(hostComm)
             << " / " << UPstream::nProcs(hostComm)
+            << " on " << hostName()
+            << " master:" << UPstream::master(hostComm)
+            << " leader rank: " << UPstream::myProcNo(hostMasterComm)
+            << " / " << UPstream::nProcs(hostMasterComm)
+            << " host leader:" << UPstream::master(hostMasterComm)
+            << " sub-rank:" << UPstream::is_subrank(hostMasterComm)
             << nl;
 
+        UPstream::freeCommunicator(hostMasterComm, true);
         UPstream::freeCommunicator(hostComm, true);
     }
 
diff --git a/applications/test/parallel-external-init/Test-parallel-external-init.C b/applications/test/parallel-external-init/Test-parallel-external-init.C
index dbcead0d8b..362dc0b382 100644
--- a/applications/test/parallel-external-init/Test-parallel-external-init.C
+++ b/applications/test/parallel-external-init/Test-parallel-external-init.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,11 +52,6 @@ bool startMPI()
     int nprocs[3];
     int rank[3];
 
-    int group_nprocs[3];
-    int group_rank[3];
-
-    MPI_Group mpiGroup;
-
     MPI_Init(nullptr, nullptr);
 
     MPI_Comm_size(MPI_COMM_WORLD, &nprocs[worldComm]);
@@ -65,62 +60,27 @@ bool startMPI()
     const bool isMaster = (rank[worldComm] == 0);
     const string prefix = '[' + Foam::name(rank[worldComm]) + "] ";
 
-    MPI_Comm_group(MPI_COMM_WORLD, &mpiGroup);
-    MPI_Group_size(mpiGroup, &group_nprocs[worldComm]);
-    MPI_Group_rank(mpiGroup, &group_rank[worldComm]);
-
-
     if (isMaster && nprocs[worldComm])
     {
         std::cout
-            << nl << "Using MPI with " << nprocs[worldComm]
-            << " procs, group:"
-            << group_nprocs[worldComm] << nl
-            << "World group: " << Foam::name(mpiGroup) << nl
+            << nl << "Using MPI with "
+            << nprocs[worldComm] << " procs" << nl
             << nl;
     }
 
     MPI_Comm worldMpiComm;
-
     MPI_Comm_dup(MPI_COMM_WORLD, &worldMpiComm);
-
-    MPI_Comm_group(MPI_COMM_WORLD, &mpiGroup);
-
-    if (isMaster && nprocs[worldComm])
-    {
-        std::cout
-            << "dup comm group: " << Foam::name(mpiGroup) << nl;
-    }
-
     MPI_Comm_free(&worldMpiComm);
 
-    // May be a bad idea
-    MPI_Group_free(&mpiGroup);
-
     MPI_Comm_size(MPI_COMM_SELF, &nprocs[selfComm]);
     MPI_Comm_rank(MPI_COMM_SELF, &rank[selfComm]);
 
-    MPI_Comm_group(MPI_COMM_SELF, &mpiGroup);
-    MPI_Group_size(mpiGroup, &group_nprocs[selfComm]);
-    MPI_Group_rank(mpiGroup, &group_rank[selfComm]);
-
-    if (isMaster && nprocs[worldComm])
-    {
-        std::cout
-            << nl
-            << "Self group: " << Foam::name(mpiGroup) << nl;
-    }
-
-    // Should be a bad idea
-    MPI_Group_free(&mpiGroup);
-
     // if (nprocs && isMaster)
     {
         std::cout
             << prefix
-            << "Self: " << rank[selfComm] << " from " << nprocs[selfComm]
-            << " procs, group:"
-            << group_nprocs[selfComm] << nl;
+            << "Self: " << rank[selfComm]
+            << " from " << nprocs[selfComm] << " procs" << nl;
     }
 
     if (isMaster)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index e3cf730d71..6fc66f9021 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -155,6 +155,14 @@ Foam::label Foam::UPstream::allocateCommunicator
         // LIFO pop
         index = freeComms_.back();
         freeComms_.pop_back();
+
+        // Reset existing
+        myProcNo_[index] = -1;
+        parentComm_[index] = parentIndex;
+
+        procIDs_[index].clear();
+        linearCommunication_[index].clear();
+        treeCommunication_[index].clear();
     }
     else
     {
@@ -162,8 +170,9 @@ Foam::label Foam::UPstream::allocateCommunicator
         index = parentComm_.size();
 
         myProcNo_.push_back(-1);
+        parentComm_.push_back(parentIndex);
+
         procIDs_.emplace_back();
-        parentComm_.push_back(-1);
         linearCommunication_.emplace_back();
         treeCommunication_.emplace_back();
     }
@@ -213,8 +222,6 @@ Foam::label Foam::UPstream::allocateCommunicator
 
     procIds.resize(numSubRanks);
 
-    parentComm_[index] = parentIndex;
-
     // Size but do not fill structure - this is done on-the-fly
     linearCommunication_[index] = List<commsStruct>(numSubRanks);
     treeCommunication_[index] = List<commsStruct>(numSubRanks);
@@ -236,6 +243,14 @@ Foam::label Foam::UPstream::allocateCommunicator
         ///         myProcNo_[index] = -(myProcNo_[parentIndex]+1);
         ///     }
         /// }
+
+        // Did communicator allocation adjust procIDs_ as well?
+        if (numSubRanks != procIDs_[index].size())
+        {
+            numSubRanks = procIDs_[index].size();
+            linearCommunication_[index] = List<commsStruct>(numSubRanks);
+            treeCommunication_[index] = List<commsStruct>(numSubRanks);
+        }
     }
 
     return index;
@@ -268,8 +283,8 @@ void Foam::UPstream::freeCommunicator
     }
 
     myProcNo_[communicator] = -1;
-    //procIDs_[communicator].clear();
     parentComm_[communicator] = -1;
+    //procIDs_[communicator].clear();
     linearCommunication_[communicator].clear();
     treeCommunication_[communicator].clear();
 
@@ -449,26 +464,24 @@ bool Foam::UPstream::haveThreads_(false);
 int Foam::UPstream::msgType_(1);
 
 
-Foam::DynamicList<int> Foam::UPstream::myProcNo_(10);
-
-Foam::DynamicList<Foam::List<int>> Foam::UPstream::procIDs_(10);
-
-Foam::DynamicList<Foam::label> Foam::UPstream::parentComm_(10);
-
-Foam::DynamicList<Foam::label> Foam::UPstream::freeComms_;
-
 Foam::wordList Foam::UPstream::allWorlds_(Foam::one{}, "");
 Foam::labelList Foam::UPstream::worldIDs_(Foam::one{}, 0);
 
-Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
-Foam::UPstream::linearCommunication_(10);
+
+Foam::DynamicList<int> Foam::UPstream::myProcNo_(16);
+Foam::DynamicList<Foam::List<int>> Foam::UPstream::procIDs_(16);
+
+Foam::DynamicList<Foam::label> Foam::UPstream::parentComm_(16);
+Foam::DynamicList<Foam::label> Foam::UPstream::freeComms_;
 
 Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
-Foam::UPstream::treeCommunication_(10);
+Foam::UPstream::linearCommunication_(16);
+
+Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
+Foam::UPstream::treeCommunication_(16);
 
 
 Foam::label Foam::UPstream::worldComm(0);
-
 Foam::label Foam::UPstream::warnComm(-1);
 
 

From 700156b4c54e1ea3379f24f9abdcb31fa6ac56f6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 6 Apr 2023 13:58:27 +0200
Subject: [PATCH 161/348] DEFEATURE: remove unused UPstream allocateTag(),
 freeTag() routines

- mechanism has been unused for at least a decade or more
  (or was never used). Message tags are assigned on an ad hoc basis
  locally when collision avoidance is necessary.
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  3 --
 src/Pstream/dummy/UPstream.C                  |  7 ----
 src/Pstream/mpi/PstreamGlobals.C              |  3 --
 src/Pstream/mpi/PstreamGlobals.H              |  6 ----
 src/Pstream/mpi/UPstream.C                    | 36 -------------------
 5 files changed, 55 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 81b04bc120..eb4a485340 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -548,9 +548,6 @@ public:
             //  A no-op and returns true if parRun() == false or list is empty
             static bool finishedRequests(UList<UPstream::Request>& requests);
 
-            static int allocateTag(const char* const msg = nullptr);
-            static void freeTag(const int tag, const char* const msg = nullptr);
-
 
         //- Set as parallel run on/off.
         //  \return the previous value
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 6eddc72490..2368e9e899 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -87,13 +87,6 @@ void Foam::UPstream::freePstreamCommunicator(const label)
 {}
 
 
-int Foam::UPstream::allocateTag(const char* const msg) { return 0; }
-
-
-void Foam::UPstream::freeTag(const int tag, const char* const msg)
-{}
-
-
 void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
 {}
 
diff --git a/src/Pstream/mpi/PstreamGlobals.C b/src/Pstream/mpi/PstreamGlobals.C
index de5634b906..601d371331 100644
--- a/src/Pstream/mpi/PstreamGlobals.C
+++ b/src/Pstream/mpi/PstreamGlobals.C
@@ -38,9 +38,6 @@ Foam::DynamicList<MPI_Group> Foam::PstreamGlobals::MPIGroups_;
 Foam::DynamicList<MPI_Request> Foam::PstreamGlobals::outstandingRequests_;
 Foam::DynamicList<Foam::label> Foam::PstreamGlobals::freedRequests_;
 
-int Foam::PstreamGlobals::nTags_ = 0;
-Foam::DynamicList<int> Foam::PstreamGlobals::freedTags_;
-
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index a45bd1b858..1edb623a1a 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -73,12 +73,6 @@ extern DynamicList<MPI_Group> MPIGroups_;
 extern DynamicList<MPI_Request> outstandingRequests_;
 extern DynamicList<label> freedRequests_;
 
-//- Max outstanding message tag operations.
-extern int nTags_;
-
-//- Free'd message tags
-extern DynamicList<int> freedTags_;
-
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index a84cdddf82..bbd879d806 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -713,42 +713,6 @@ void Foam::UPstream::freePstreamCommunicator(const label index)
 }
 
 
-int Foam::UPstream::allocateTag(const char* const msg)
-{
-    int tag;
-    if (PstreamGlobals::freedTags_.size())
-    {
-        tag = PstreamGlobals::freedTags_.back();
-        PstreamGlobals::freedTags_.pop_back();
-    }
-    else
-    {
-        tag = ++PstreamGlobals::nTags_;
-    }
-
-    if (debug)
-    {
-        Pout<< "UPstream::allocateTag";
-        if (msg) Pout<< ' ' << msg;
-        Pout<< " : tag:" << tag << endl;
-    }
-
-    return tag;
-}
-
-
-void Foam::UPstream::freeTag(const int tag, const char* const msg)
-{
-    if (debug)
-    {
-        Pout<< "UPstream::freeTag ";
-        if (msg) Pout<< ' ' << msg;
-        Pout<< " : tag:" << tag << endl;
-    }
-    PstreamGlobals::freedTags_.push_back(tag);
-}
-
-
 void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
 {
     // No-op for non-parallel

From aa002122c2192085879365148c2468eca5943fe7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 6 Apr 2023 14:35:00 +0200
Subject: [PATCH 162/348] ENH: simplify handling of pushed/freed requests

- previously had an additional stack for freedRequests_,
  which were used to 'remember' locations into the list of
  outstandingRequests_ that were handled by 'waitRequest()'.

  This was principally done for sanity checks on shutdown,
  but we now just test for any outstanding requests that
  are *not* MPI_REQUEST_NULL instead (much simpler).

  The framework with freedRequests_ also had a provision to 'recycle'
  them by popping from that stack, but this is rather fragile since it
  would only triggered by some collectives
  (MPI_Iallreduce, MPI_Ialltoall, MPI_Igather, MPI_Iscatter)
  with no guarantee that these will all be properly removed again.
  There was also no pruning of extraneous indices.

ENH: consolidate internal reset/push of requests

- replace duplicate code with inline functions
  reset_request(), push_request()

ENH: null out trailing requests

- extra safety (paranoia) for the UPstream::Request versions
  of finishedRequests(), waitAnyRequest()

CONFIG: document nPollProcInterfaces in etc/controlDict

- still experimental, but at least make the keyword known
---
 etc/controlDict                               |   6 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  89 +++++++-----
 src/Pstream/mpi/PstreamGlobals.C              |   1 -
 src/Pstream/mpi/PstreamGlobals.H              |  60 +++++---
 src/Pstream/mpi/UIPstreamRead.C               |  16 +-
 src/Pstream/mpi/UOPstreamWrite.C              |  18 +--
 src/Pstream/mpi/UPstream.C                    |   1 -
 src/Pstream/mpi/UPstreamRequest.C             |  30 ++--
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 137 +++---------------
 9 files changed, 149 insertions(+), 209 deletions(-)

diff --git a/etc/controlDict b/etc/controlDict
index ea88edf7d7..d605346302 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -146,6 +146,10 @@ OptimisationSwitches
     // global reduction, even if multi-pass is not needed)
     maxCommsSize    0;
 
+    // Optional (quite experimental) feature in lduMatrixUpdate
+    // to poll (processor) interfaces for individual readiness
+    // instead of waiting for all to complete first.
+    nPollProcInterfaces 0;
 
     // Trap floating point exception.
     // Can override with FOAM_SIGFPE env variable (true|false)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index eb4a485340..820ef017d7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -499,56 +499,69 @@ public:
         );
 
 
-        // Non-blocking comms
+    // Requests (non-blocking comms)
 
-            //- Number of outstanding requests
-            static label nRequests() noexcept;
+        //- Number of outstanding requests (on the internal list of requests)
+        static label nRequests() noexcept;
 
-            //- Truncate outstanding requests to given length, which is
-            //- expected to be in the range 0 to nRequests.
-            //  A no-op for out-of-range values.
-            static void resetRequests(const label n);
+        //- Truncate outstanding requests to given length, which is
+        //- expected to be in the range [0 to nRequests()].
+        //  A no-op for out-of-range values.
+        static void resetRequests(const label n);
 
-            //- Wait until all requests (from position onwards) have finished.
-            //  A no-op if parRun() == false, if there are no pending requests
-            //  or if the start is out-of-range (0 to nRequests)
-            static void waitRequests(const label pos);
+        //- Wait until all requests (from position onwards) have finished.
+        //- Corresponds to MPI_Waitall()
+        //  A no-op if parRun() == false,
+        //  if the position is out-of-range [0 to nRequests()],
+        //  or the internal list of requests is empty.
+        //
+        //  \param pos starting position within the internal list of requests
+        static void waitRequests(const label pos);
 
-            //- Wait until all requests have finished.
-            //  A no-op if parRun() == false or the list is empty
-            static void waitRequests(UList<UPstream::Request>& requests);
+        //- Wait until all requests have finished.
+        //- Corresponds to MPI_Waitall()
+        //  A no-op if parRun() == false, or the list is empty.
+        static void waitRequests(UList<UPstream::Request>& requests);
 
-            //- Wait until any request has finished and return its index.
-            //  Returns -1 if parRun() == false, or the list is empty,
-            //  or if all the requests have already been handled
-            static label waitAnyRequest(UList<UPstream::Request>& requests);
+        //- Wait until any request has finished and return its index.
+        //- Corresponds to MPI_Waitany()
+        //  Returns -1 if parRun() == false, or the list is empty,
+        //  or if all the requests have already been handled
+        static label waitAnyRequest(UList<UPstream::Request>& requests);
 
-            //- Wait until request i has finished.
-            //  A no-op if parRun() == false,
-            //  there are no pending requests,
-            //  or if the index is out-of-range (0 to nRequests)
-            static void waitRequest(const label i);
+        //- Wait until request i has finished.
+        //- Corresponds to MPI_Wait()
+        //  A no-op if parRun() == false,
+        //  there are no pending requests,
+        //  or if the index is out-of-range (0 to nRequests)
+        static void waitRequest(const label i);
 
-            //- Wait until specified request has finished.
-            //  A no-op if parRun() == false or for a null-request
-            static void waitRequest(UPstream::Request& req);
+        //- Wait until specified request has finished.
+        //- Corresponds to MPI_Wait()
+        //  A no-op if parRun() == false or for a null-request
+        static void waitRequest(UPstream::Request& req);
 
-            //- Non-blocking comms: has request i finished?
-            //  A no-op and returns true if parRun() == false,
-            //  there are no pending requests,
-            //  or if the index is out-of-range (0 to nRequests)
-            static bool finishedRequest(const label i);
+        //- Non-blocking comms: has request i finished?
+        //- Corresponds to MPI_Test()
+        //  A no-op and returns true if parRun() == false,
+        //  there are no pending requests,
+        //  or if the index is out-of-range (0 to nRequests)
+        static bool finishedRequest(const label i);
 
-            //- Non-blocking comms: has request finished?
-            //  A no-op and returns true if parRun() == false
-            //  or for a null-request
-            static bool finishedRequest(UPstream::Request& req);
+        //- Non-blocking comms: has request finished?
+        //- Corresponds to MPI_Test()
+        //  A no-op and returns true if parRun() == false
+        //  or for a null-request
+        static bool finishedRequest(UPstream::Request& req);
 
-            //- Non-blocking comms: have all requests finished?
-            //  A no-op and returns true if parRun() == false or list is empty
-            static bool finishedRequests(UList<UPstream::Request>& requests);
+        //- Non-blocking comms: have all requests finished?
+        //- Corresponds to MPI_Testall()
+        //  A no-op and returns true if parRun() == false or list is empty
+        static bool finishedRequests(UList<UPstream::Request>& requests);
 
 
+    // General
+
         //- Set as parallel run on/off.
         //  \return the previous value
         static bool parRun(const bool on) noexcept
diff --git a/src/Pstream/mpi/PstreamGlobals.C b/src/Pstream/mpi/PstreamGlobals.C
index 601d371331..5fd81abae9 100644
--- a/src/Pstream/mpi/PstreamGlobals.C
+++ b/src/Pstream/mpi/PstreamGlobals.C
@@ -36,7 +36,6 @@ Foam::DynamicList<MPI_Comm> Foam::PstreamGlobals::MPICommunicators_;
 Foam::DynamicList<MPI_Group> Foam::PstreamGlobals::MPIGroups_;
 
 Foam::DynamicList<MPI_Request> Foam::PstreamGlobals::outstandingRequests_;
-Foam::DynamicList<Foam::label> Foam::PstreamGlobals::freedRequests_;
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index 1edb623a1a..276f189328 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -29,7 +29,7 @@ Namespace
 
 Description
     Global functions and variables for working with parallel streams,
-    but principally for mpi
+    but principally for MPI.
 
 SourceFiles
     PstreamGlobals.C
@@ -40,6 +40,7 @@ SourceFiles
 #define Foam_PstreamGlobals_H
 
 #include "DynamicList.H"
+#include "UPstream.H"  // for UPstream::Request
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,7 +72,6 @@ extern DynamicList<MPI_Group> MPIGroups_;
 
 //- Outstanding non-blocking operations.
 extern DynamicList<MPI_Request> outstandingRequests_;
-extern DynamicList<label> freedRequests_;
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
@@ -79,28 +79,50 @@ extern DynamicList<label> freedRequests_;
 //- Fatal if comm is outside the allocated range
 void checkCommunicator(const label comm, const label toProcNo);
 
-//- Push request onto list of outstanding requests,
-//- optionally reusing previously freed request locations
-//
-//  \return index of request within outstandingRequests_
-inline label push_request(MPI_Request request)
+
+//- Reset UPstream::Request to null and/or the index of the outstanding
+//- request to -1.
+//  Does not affect the stack of outstanding requests.
+inline void reset_request
+(
+    UPstream::Request* requestPtr,
+    label* requestIdx = nullptr
+)
 {
-    while (!freedRequests_.empty())
+    if (requestPtr) *requestPtr = UPstream::Request(MPI_REQUEST_NULL);
+    if (requestIdx) *requestIdx = -1;
+}
+
+
+//- Transcribe MPI_Request to UPstream::Request
+//- (does not affect the stack of outstanding requests)
+//- or else push onto list of outstanding requests
+//- and (optionally) record its location
+inline void push_request
+(
+    MPI_Request request,
+    UPstream::Request* requestPtr = nullptr,
+    label* requestIdx = nullptr
+)
+{
+    if (requestPtr)
     {
-        const label index = freedRequests_.back();
-        freedRequests_.pop_back();
+        // Transcribe as UPstream::Request
+        *requestPtr = UPstream::Request(request);
 
-        if (index < outstandingRequests_.size())
-        {
-            outstandingRequests_[index] = request;
-            return index;
-        }
+        // Not on stack of outstanding requests
+        if (requestIdx) *requestIdx = -1;
     }
+    else
+    {
+        if (requestIdx)
+        {
+            // Its index into outstanding requests
+            *requestIdx = PstreamGlobals::outstandingRequests_.size();
+        }
 
-    const label index = outstandingRequests_.size();
-    outstandingRequests_.push_back(request);
-
-    return index;
+        PstreamGlobals::outstandingRequests_.push_back(request);
+    }
 }
 
 
diff --git a/src/Pstream/mpi/UIPstreamRead.C b/src/Pstream/mpi/UIPstreamRead.C
index 37cb441414..20fed25c8d 100644
--- a/src/Pstream/mpi/UIPstreamRead.C
+++ b/src/Pstream/mpi/UIPstreamRead.C
@@ -105,6 +105,8 @@ Foam::label Foam::UIPstream::read
     UPstream::Request* req
 )
 {
+    PstreamGlobals::reset_request(req);
+
     if (debug)
     {
         Pout<< "UIPstream::read : starting read from:" << fromProcNo
@@ -205,26 +207,18 @@ Foam::label Foam::UIPstream::read
             return 0;
         }
 
-        profilingPstream::addRequestTime();
-
         if (debug)
         {
             Pout<< "UIPstream::read : started read from:" << fromProcNo
                 << " tag:" << tag << " read size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
-                <<
+                << " request:" <<
                 (req ? label(-1) : PstreamGlobals::outstandingRequests_.size())
                 << Foam::endl;
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-        }
-        else
-        {
-            PstreamGlobals::outstandingRequests_.push_back(request);
-        }
+        PstreamGlobals::push_request(request, req);
+        profilingPstream::addRequestTime();
 
         // Assume the message is completely received.
         return bufSize;
diff --git a/src/Pstream/mpi/UOPstreamWrite.C b/src/Pstream/mpi/UOPstreamWrite.C
index c14404d077..944b09ed71 100644
--- a/src/Pstream/mpi/UOPstreamWrite.C
+++ b/src/Pstream/mpi/UOPstreamWrite.C
@@ -60,6 +60,8 @@ bool Foam::UOPstream::write
     const UPstream::sendModes sendMode
 )
 {
+    PstreamGlobals::reset_request(req);
+
     if (debug)
     {
         Pout<< "UOPstream::write : starting write to:" << toProcNo
@@ -79,7 +81,6 @@ bool Foam::UOPstream::write
         error::printStack(Pout);
     }
 
-
     PstreamGlobals::checkCommunicator(communicator, toProcNo);
 
 
@@ -179,27 +180,18 @@ bool Foam::UOPstream::write
             );
         }
 
-        profilingPstream::addRequestTime();
-
         if (debug)
         {
             Pout<< "UOPstream::write : started write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commType:" << UPstream::commsTypeNames[commsType]
-                << " request:"
-                <<
+                << " request:" <<
                 (req ? label(-1) : PstreamGlobals::outstandingRequests_.size())
                 << Foam::endl;
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-        }
-        else
-        {
-            PstreamGlobals::outstandingRequests_.push_back(request);
-        }
+        PstreamGlobals::push_request(request, req);
+        profilingPstream::addRequestTime();
     }
     else
     {
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index bbd879d806..4555fd62ed 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -442,7 +442,6 @@ void Foam::UPstream::shutdown(int errNo)
         }
 
         PstreamGlobals::outstandingRequests_.clear();
-        PstreamGlobals::freedRequests_.clear();
 
         if (nOutstanding)
         {
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index 603b638a85..e719bf56d3 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -149,7 +149,7 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 
     if (!count)
     {
-        // Early exit: non-NULL requests found
+        // Early exit: has NULL requests only
         return;
     }
 
@@ -212,9 +212,18 @@ Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>& requests)
     }
 
     // Transcribe MPI_Request back into UPstream::Request
-    while (--count >= 0)
+    // - do in reverse order - see note in finishedRequests()
     {
-        requests[count] = UPstream::Request(waitRequests[count]);
+        for (label i = count-1; i >= 0; --i)
+        {
+            requests[i] = UPstream::Request(waitRequests[i]);
+        }
+
+        // Trailing portion
+        for (label i = count; i < requests.size(); ++i)
+        {
+            requests[i] = UPstream::Request(MPI_REQUEST_NULL);
+        }
     }
 
     return index;
@@ -286,9 +295,6 @@ void Foam::UPstream::waitRequest(const label i)
         return;
     }
 
-    // Push index onto free cache (for later reuse)
-    PstreamGlobals::freedRequests_.push_back(i);
-
     auto& request = PstreamGlobals::outstandingRequests_[i];
 
     // No-op for null request
@@ -452,7 +458,7 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
 
     if (!count)
     {
-        // Early exit: non-NULL requests found
+        // Early exit: has NULL requests only
         return true;
     }
 
@@ -476,9 +482,15 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
         // This is uglier that we'd like, but much better than allocating
         // and freeing a scratch buffer each time we query things.
 
-        while (--count >= 0)
+        for (label i = count-1; i >= 0; --i)
         {
-            requests[count] = UPstream::Request(waitRequests[count]);
+            requests[i] = UPstream::Request(waitRequests[i]);
+        }
+
+        // Trailing portion
+        for (label i = count; i < requests.size(); ++i)
+        {
+            requests[i] = UPstream::Request(MPI_REQUEST_NULL);
         }
     }
 
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 65e85bb8ea..f19507e857 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -125,11 +125,10 @@ void Foam::PstreamDetail::allReduce
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     if (!UPstream::parRun())
     {
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -189,16 +188,8 @@ void Foam::PstreamDetail::allReduce
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
 
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -207,9 +198,6 @@ void Foam::PstreamDetail::allReduce
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Allreduce
@@ -246,6 +234,8 @@ void Foam::PstreamDetail::allToAll
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     const bool immediate = (req || requestID);
 
     const label numProc = UPstream::nProcs(comm);
@@ -280,10 +270,6 @@ void Foam::PstreamDetail::allToAll
     if (!UPstream::parRun() || numProc < 2)
     {
         recvData.deepCopy(sendData);
-
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -321,16 +307,7 @@ void Foam::PstreamDetail::allToAll
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
-
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -339,9 +316,6 @@ void Foam::PstreamDetail::allToAll
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Alltoall
@@ -387,6 +361,8 @@ void Foam::PstreamDetail::allToAllv
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     const bool immediate = (req || requestID);
 
     const label np = UPstream::nProcs(comm);
@@ -440,9 +416,6 @@ void Foam::PstreamDetail::allToAllv
             recvCounts[0]*sizeof(Type)
         );
 
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -481,16 +454,7 @@ void Foam::PstreamDetail::allToAllv
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
-
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -499,9 +463,6 @@ void Foam::PstreamDetail::allToAllv
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Alltoallv
@@ -910,13 +871,11 @@ void Foam::PstreamDetail::gather
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     if (!UPstream::parRun())
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
-
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -976,16 +935,7 @@ void Foam::PstreamDetail::gather
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
-
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -994,9 +944,6 @@ void Foam::PstreamDetail::gather
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Gather
@@ -1040,13 +987,11 @@ void Foam::PstreamDetail::scatter
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     if (!UPstream::parRun())
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
-
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -1106,16 +1051,7 @@ void Foam::PstreamDetail::scatter
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
-
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -1124,9 +1060,6 @@ void Foam::PstreamDetail::scatter
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Scatter
@@ -1171,14 +1104,12 @@ void Foam::PstreamDetail::gatherv
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     if (!UPstream::parRun())
     {
         // recvCounts[0] may be invalid - use sendCount instead
         std::memmove(recvData, sendData, sendCount*sizeof(Type));
-
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -1262,16 +1193,7 @@ void Foam::PstreamDetail::gatherv
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
-
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -1280,9 +1202,6 @@ void Foam::PstreamDetail::gatherv
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Gatherv
@@ -1328,13 +1247,11 @@ void Foam::PstreamDetail::scatterv
     label* requestID
 )
 {
+    PstreamGlobals::reset_request(req, requestID);
+
     if (!UPstream::parRun())
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
-
-        // No requests generated
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
         return;
     }
 
@@ -1412,16 +1329,7 @@ void Foam::PstreamDetail::scatterv
                 << Foam::abort(FatalError);
         }
 
-        if (req)
-        {
-            *req = UPstream::Request(request);
-            if (requestID) *requestID = -1;
-        }
-        else
-        {
-            *requestID = PstreamGlobals::push_request(request);
-        }
-
+        PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
 #endif
@@ -1430,9 +1338,6 @@ void Foam::PstreamDetail::scatterv
     {
         profilingPstream::beginTiming();
 
-        if (req) req->reset();
-        if (requestID) *requestID = -1;
-
         if
         (
             MPI_Scatterv

From 11065bb029827b1c4f60bdc30a03cd015649c8af Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 6 Apr 2023 14:35:00 +0200
Subject: [PATCH 163/348] ENH: MPI_Waitany / MPI_Waitsome interface for
 internal list of requests

- checks requests from completion, returning true when some requests
  have completed and false when there are no active requests.
  This allows it to be used in a polling loop to progress MPI
  and then respond when as requests become satisfied.

  When using as part of a dispatch loop, waitSomeRequests() is
  probably more efficient than calling waitAnyRequest() and can help
  avoid biasing which client requests are serviced.

  Takes an optional return parameter, to retrieve the indices,
  but more importantly to avoid inner-loop reallocations.

  Example,

      DynamicList<int> indices;
      while (UPstream::waitSomeRequests(startRequest, &indices))
      {
          // Dispatch something ....
      }

      // Reset list of outstanding requests with 'Waitall' for safety
      UPstream::waitRequests(startRequest);

  ---

  If only dealing with single items and an index is required for
  dispatching, it can be better to use a list of UPstream::Request
  instead.

  Example,

      List<UPstream::Request> requests = ...;

      label index = -1;
      while ((index = UPstream::waitAnyRequest(requests)) >= 0)
      {
          // Do something at index
      }

ENH: pair-wise wrappers for MPI_Test or MPI_Wait

- for send/recv pairs of requests, can bundle both together and use a
  single MPI_Testsome and MPI_Waitall instead of two individual
  calls.
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  52 ++-
 src/Pstream/dummy/UPstreamRequest.C           |  31 ++
 src/Pstream/mpi/UPstreamRequest.C             | 344 +++++++++++++++++-
 3 files changed, 422 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 820ef017d7..395ac02160 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -523,6 +523,38 @@ public:
         //  A no-op if parRun() == false, or the list is empty.
         static void waitRequests(UList<UPstream::Request>& requests);
 
+        //- Wait until any request (from position onwards) has finished.
+        //- Corresponds to MPI_Waitany()
+        //  A no-op and returns false if parRun() == false,
+        //  if the position is out-of-range [0 to nRequests()],
+        //  or the internal list of requests is empty.
+        //
+        //  \returns true if any pending request completed.
+        //  \returns false if all requests have already been handled.
+        //
+        //  \param pos starting position within the internal list of requests
+        static bool waitAnyRequest(const label pos);
+
+        //- Wait until some requests (from position onwards) have finished.
+        //- Corresponds to MPI_Waitsome()
+        //  A no-op and returns false if parRun() == false,
+        //  if the position is out-of-range [0 to nRequests],
+        //  or the internal list of requests is empty.
+        //
+        //  \returns true if some pending requests completed.
+        //  \returns false if all requests have already been handled
+        //
+        //  \param pos starting position within the internal list of requests
+        //  \param[out] indices the completed request indices relative to the
+        //      starting position. The is an optional parameter, which can be
+        //      used to recover the indices or simply to avoid reallocations
+        //      when calling within a loop.
+        static bool waitSomeRequests
+        (
+            const label pos,
+            DynamicList<int>* indices = nullptr
+        );
+
         //- Wait until any request has finished and return its index.
         //- Corresponds to MPI_Waitany()
         //  Returns -1 if parRun() == false, or the list is empty,
@@ -532,7 +564,7 @@ public:
         //- Wait until request i has finished.
         //- Corresponds to MPI_Wait()
         //  A no-op if parRun() == false,
-        //  there are no pending requests,
+        //  if there are no pending requests,
         //  or if the index is out-of-range (0 to nRequests)
         static void waitRequest(const label i);
 
@@ -544,7 +576,7 @@ public:
         //- Non-blocking comms: has request i finished?
         //- Corresponds to MPI_Test()
         //  A no-op and returns true if parRun() == false,
-        //  there are no pending requests,
+        //  if there are no pending requests,
         //  or if the index is out-of-range (0 to nRequests)
         static bool finishedRequest(const label i);
 
@@ -559,6 +591,22 @@ public:
         //  A no-op and returns true if parRun() == false or list is empty
         static bool finishedRequests(UList<UPstream::Request>& requests);
 
+        //- Non-blocking comms: have both requests finished?
+        //- Corresponds to pair of MPI_Test()
+        //  A no-op and returns true if parRun() == false,
+        //  if there are no pending requests,
+        //  or if the indices are out-of-range (0 to nRequests)
+        //  Each finished request parameter is set to -1 (ie, done).
+        static bool finishedRequestPair(label& req1, label& req2);
+
+        //- Non-blocking comms: wait for both requests to finish.
+        //- Corresponds to pair of MPI_Wait()
+        //  A no-op if parRun() == false,
+        //  if there are no pending requests,
+        //  or if the indices are out-of-range (0 to nRequests)
+        //  Each finished request parameter is set to -1 (ie, done).
+        static void waitRequestPair(label& req1, label& req2);
+
 
     // General
 
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index b158f9e8b7..74fbe523e1 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -56,6 +56,21 @@ void Foam::UPstream::resetRequests(const label n) {}
 void Foam::UPstream::waitRequests(const label pos) {}
 void Foam::UPstream::waitRequests(UList<UPstream::Request>&) {}
 
+bool Foam::UPstream::waitAnyRequest(const label pos)
+{
+    return false;
+}
+
+bool Foam::UPstream::waitSomeRequests
+(
+    const label pos,
+    DynamicList<int>* indices
+)
+{
+    if (indices) indices->clear();
+    return false;
+}
+
 Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>&)
 {
     return -1;
@@ -66,10 +81,26 @@ void Foam::UPstream::waitRequest(UPstream::Request&) {}
 
 bool Foam::UPstream::finishedRequest(const label i) { return true; }
 bool Foam::UPstream::finishedRequest(UPstream::Request&) { return true; }
+
 bool Foam::UPstream::finishedRequests(UList<UPstream::Request>&)
 {
     return true;
 }
 
 
+bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
+{
+    req1 = -1;
+    req2 = -1;
+    return true;
+}
+
+
+void Foam::UPstream::waitRequestPair(label& req1, label& req2)
+{
+    req1 = -1;
+    req2 = -1;
+}
+
+
 // ************************************************************************* //
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index e719bf56d3..5bb10904e0 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -170,6 +170,156 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 }
 
 
+bool Foam::UPstream::waitAnyRequest(const label pos)
+{
+    // No-op for non-parallel, no pending requests or out-of-range
+    if
+    (
+        !UPstream::parRun()
+     || pos < 0
+     || pos >= PstreamGlobals::outstandingRequests_.size()
+     /// || !len
+    )
+    {
+        return false;
+    }
+
+    label count = (PstreamGlobals::outstandingRequests_.size() - pos);
+
+    /// // Treat len < 0 like npos (ie, the rest of the list) but also
+    /// // apply range checking to avoid bad slices
+    ///
+    /// if (len >= 0 && len < count)
+    /// {
+    ///     count = len;
+    /// }
+
+    auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::waitAnyRequest : starting wait for some of "
+            << count << " requests starting at " << pos << endl;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets request to MPI_REQUEST_NULL
+    int index = MPI_UNDEFINED;
+    if (MPI_Waitany(count, waitRequests, &index, MPI_STATUS_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Waitany returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    if (index == MPI_UNDEFINED)
+    {
+        // No active request handles
+        return false;
+    }
+
+    return true;
+}
+
+
+bool Foam::UPstream::waitSomeRequests
+(
+    const label pos,
+    DynamicList<int>* indices
+)
+{
+    // No-op for non-parallel, no pending requests or out-of-range
+    if
+    (
+        !UPstream::parRun()
+     || pos < 0
+     || pos >= PstreamGlobals::outstandingRequests_.size()
+     /// || !len
+    )
+    {
+        if (indices)
+        {
+            indices->clear();
+        }
+        return false;
+    }
+
+    label count = (PstreamGlobals::outstandingRequests_.size() - pos);
+
+    /// // Treat len < 0 like npos (ie, the rest of the list) but also
+    /// // apply range checking to avoid bad slices
+    ///
+    /// if (len >= 0 && len < count)
+    /// {
+    ///     count = len;
+    /// }
+
+    auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream:waitSomeRequest : starting wait for any of "
+            << count << " requests starting at " << pos << endl;
+    }
+
+
+    // Local temporary storage, or return via calling parameter
+    List<int> tmpIndices;
+
+    if (indices)
+    {
+        indices->resize_nocopy(count);
+    }
+    else
+    {
+        tmpIndices.resize(count);
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets non-blocking requests to MPI_REQUEST_NULL
+    int outcount = 0;
+    if
+    (
+        MPI_Waitsome
+        (
+            count,
+            waitRequests,
+           &outcount,
+            (indices ? indices->data() : tmpIndices.data()),
+            MPI_STATUSES_IGNORE
+        )
+    )
+    {
+        FatalErrorInFunction
+            << "MPI_Waitsome returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    if (outcount == MPI_UNDEFINED || outcount < 1)
+    {
+        // No active request handles
+        if (indices)
+        {
+            indices->clear();
+        }
+        return false;
+    }
+
+    if (indices)
+    {
+        indices->resize(outcount);
+    }
+
+    return true;
+}
+
+
 Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>& requests)
 {
     // No-op for non-parallel or no pending requests
@@ -196,7 +346,7 @@ Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>& requests)
     profilingPstream::beginTiming();
 
     // On success: sets request to MPI_REQUEST_NULL
-    int index = -1;
+    int index = MPI_UNDEFINED;
     if (MPI_Waitany(count, waitRequests, &index, MPI_STATUS_IGNORE))
     {
         FatalErrorInFunction
@@ -376,7 +526,7 @@ bool Foam::UPstream::finishedRequest(const label i)
 
     auto& request = PstreamGlobals::outstandingRequests_[i];
 
-    // No-op for null request
+    // Fast-path (no-op) for null request
     if (MPI_REQUEST_NULL == request)
     {
         return true;
@@ -412,7 +562,7 @@ bool Foam::UPstream::finishedRequest(UPstream::Request& req)
 
     MPI_Request request = PstreamDetail::Request::get(req);
 
-    // No-op for null request
+    // Fast-path (no-op) for null request
     if (MPI_REQUEST_NULL == request)
     {
         return true;
@@ -498,4 +648,192 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
 }
 
 
+bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        req1 = -1;
+        req2 = -1;
+        return true;
+    }
+
+    int count = 0;
+    MPI_Request waitRequests[2];
+
+    // In range?
+    if (req1 >= 0 && req1 < PstreamGlobals::outstandingRequests_.size())
+    {
+        waitRequests[0] = PstreamGlobals::outstandingRequests_[req1];
+        ++count;
+    }
+    else
+    {
+        waitRequests[0] = MPI_REQUEST_NULL;
+        req1 = -1;
+    }
+
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if (req2 >= 0 && req2 < PstreamGlobals::outstandingRequests_.size())
+    {
+        waitRequests[1] = PstreamGlobals::outstandingRequests_[req2];
+        ++count;
+    }
+    else
+    {
+        waitRequests[1] = MPI_REQUEST_NULL;
+        req2 = -1;
+    }
+
+    if (!count)
+    {
+        return true;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets each request to MPI_REQUEST_NULL
+    int indices[2];
+    int outcount = 0;
+    if
+    (
+        MPI_Testsome
+        (
+            2,
+            waitRequests,
+           &outcount,
+            indices,
+            MPI_STATUSES_IGNORE
+        )
+    )
+    {
+        FatalErrorInFunction
+            << "MPI_Testsome returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    if (outcount == MPI_UNDEFINED)
+    {
+        // No active request handles.
+        // Slight pedantic, but copy back requests in case they were altered
+
+        if (req1 >= 0)
+        {
+            PstreamGlobals:: outstandingRequests_[req1] = waitRequests[0];
+        }
+
+        if (req2 >= 0)
+        {
+            PstreamGlobals:: outstandingRequests_[req2] = waitRequests[1];
+        }
+
+        // Flag indices as 'done'
+        req1 = -1;
+        req2 = -1;
+        return true;
+    }
+
+    // Copy back requests to their 'stack' locations
+    for (int i = 0; i < outcount; ++i)
+    {
+        int reqid = indices[i];
+
+        if (reqid == 0)
+        {
+            if (req1 >= 0)
+            {
+                PstreamGlobals:: outstandingRequests_[req1] = waitRequests[0];
+                req1 = -1;
+            }
+        }
+        if (reqid == 1)
+        {
+            if (req2 >= 0)
+            {
+                PstreamGlobals:: outstandingRequests_[req2] = waitRequests[1];
+                req2 = -1;
+            }
+        }
+    }
+
+    return (outcount > 0);
+}
+
+
+void Foam::UPstream::waitRequestPair(label& req1, label& req2)
+{
+    // No-op for non-parallel. Flag indices as 'done'
+    if (!UPstream::parRun())
+    {
+        req1 = -1;
+        req2 = -1;
+        return;
+    }
+
+    int count = 0;
+    MPI_Request waitRequests[2];
+
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if (req1 >= 0 && req1 < PstreamGlobals::outstandingRequests_.size())
+    {
+        waitRequests[0] = PstreamGlobals::outstandingRequests_[req1];
+        ++count;
+    }
+    else
+    {
+        waitRequests[0] = MPI_REQUEST_NULL;
+        req1 = -1;  // Flag as 'done'
+    }
+
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if (req2 >= 0 && req2 < PstreamGlobals::outstandingRequests_.size())
+    {
+        waitRequests[1] = PstreamGlobals::outstandingRequests_[req2];
+        ++count;
+    }
+    else
+    {
+        waitRequests[1] = MPI_REQUEST_NULL;
+        req2 = -1;  // Flag as 'done'
+    }
+
+    // Early exit
+    if (!count)
+    {
+        return;
+    }
+
+    profilingPstream::beginTiming();
+
+    // On success: sets each request to MPI_REQUEST_NULL
+    if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
+    {
+        FatalErrorInFunction
+            << "MPI_Waitall returned with error"
+            << Foam::abort(FatalError);
+    }
+
+    profilingPstream::addWaitTime();
+
+    // Copy back requests to their 'stack' locations
+    // and flag index as done
+
+    if (req1 >= 0)
+    {
+        PstreamGlobals::outstandingRequests_[req1] = waitRequests[0];
+    }
+
+    if (req2 >= 0)
+    {
+        PstreamGlobals::outstandingRequests_[req2] = waitRequests[1];
+    }
+
+    // Flag indices as 'done'
+    req1 = -1;
+    req2 = -1;
+}
+
+
 // ************************************************************************* //

From 9fbc484cdf419714e605d96b5f74ecfdce110db6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 11 Apr 2023 11:50:17 +0200
Subject: [PATCH 164/348] ENH: use bundled MPI_Test when checking processor
 interface ready()

- fewer calls, potentially more consistent

ENH: update sendRequest state after recvRequest wait

- previously had this type of code:

    // Treat send as finished when recv is done
    UPstream::waitRequest(recvRequest_);
    recvRequest_ = -1;
    sendRequest_ = -1;

  Now refined as follows:

    // Require receive data. Update the send request state.
    UPstream::waitRequest(recvRequest_);
    recvRequest_ = -1;
    if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;

  Can potentially investigate with requiring both,
  but this may be over-contrained.
  Example,

    // Require receive data, but also wait for sends too
    UPstream::waitRequestPair(recvRequest_, sendRequest_);
---
 .../lduCalculatedProcessorField.C             | 18 ++++-----
 .../processorGAMGInterfaceField.C             |  9 +++--
 .../processor/processorFaPatchField.C         | 39 +++++++++---------
 .../calculatedProcessorFvPatchField.C         | 33 +++++++--------
 .../processor/processorFvPatchField.C         | 40 +++++++++----------
 .../calculatedProcessorGAMGInterfaceField.C   |  9 +++--
 6 files changed, 69 insertions(+), 79 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
index 11e837c530..d60692571d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
@@ -60,13 +60,7 @@ Foam::lduCalculatedProcessorField<Type>::lduCalculatedProcessorField
 template<class Type>
 bool Foam::lduCalculatedProcessorField<Type>::ready() const
 {
-    if (!UPstream::finishedRequest(this->sendRequest_)) return false;
-    this->sendRequest_ = -1;
-
-    if (!UPstream::finishedRequest(this->recvRequest_)) return false;
-    this->recvRequest_ = -1;
-
-    return true;
+    return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
@@ -173,10 +167,12 @@ void Foam::lduCalculatedProcessorField<Type>::updateInterfaceMatrix
         return;
     }
 
-    // Treat send as finished when recv is done
-    UPstream::waitRequest(recvRequest_);
-    recvRequest_ = -1;
-    sendRequest_ = -1;
+    // Require receive data. Update the send request state.
+    // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+    UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+    if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
+
 
     // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 8309c1b31a..0e4b221535 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -171,10 +171,11 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
     else
     {
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index d65ea2637d..70935bcf79 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -176,13 +176,7 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 template<class Type>
 bool Foam::processorFaPatchField<Type>::ready() const
 {
-    if (!UPstream::finishedRequest(sendRequest_)) return false;
-    sendRequest_ = -1;
-
-    if (!UPstream::finishedRequest(recvRequest_)) return false;
-    recvRequest_ = -1;
-
-    return true;
+    return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
@@ -207,7 +201,7 @@ void Foam::processorFaPatchField<Type>::initEvaluate
     const Pstream::commsTypes commsType
 )
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         this->patchInternalField(sendBuf_);
 
@@ -259,16 +253,17 @@ void Foam::processorFaPatchField<Type>::evaluate
     const Pstream::commsTypes commsType
 )
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         if (commsType == UPstream::commsTypes::nonBlocking)
         {
             // Fast path. Received into *this
 
-            // Treat send as finished when recv is done
-            UPstream::waitRequest(recvRequest_);
-            recvRequest_ = -1;
-            sendRequest_ = -1;
+            // Require receive data. Update the send request state.
+            // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+            UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+            if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
         }
         else
         {
@@ -373,10 +368,11 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
     else
     {
@@ -479,10 +475,11 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
     else
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
index 875c98105f..25e6ee5a23 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
@@ -76,13 +76,7 @@ Foam::calculatedProcessorFvPatchField<Type>::calculatedProcessorFvPatchField
 template<class Type>
 bool Foam::calculatedProcessorFvPatchField<Type>::ready() const
 {
-    if (!UPstream::finishedRequest(this->sendRequest_)) return false;
-    this->sendRequest_ = -1;
-
-    if (!UPstream::finishedRequest(this->recvRequest_)) return false;
-    this->recvRequest_ = -1;
-
-    return true;
+    return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
@@ -109,7 +103,7 @@ void Foam::calculatedProcessorFvPatchField<Type>::initEvaluate
     const Pstream::commsTypes commsType
 )
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         if (!is_contiguous<Type>::value)
         {
@@ -164,12 +158,13 @@ void Foam::calculatedProcessorFvPatchField<Type>::evaluate
     const Pstream::commsTypes commsType
 )
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
 }
 
@@ -278,14 +273,16 @@ void Foam::calculatedProcessorFvPatchField<Type>::updateInterfaceMatrix
         return;
     }
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
 
+
     // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
     addToInternalField(result, !add, coeffs, scalarRecvBuf_);
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index b5350e4f3f..3fdec71d96 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -111,6 +111,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     if (!isA<processorFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
@@ -177,13 +178,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 template<class Type>
 bool Foam::processorFvPatchField<Type>::ready() const
 {
-    if (!UPstream::finishedRequest(sendRequest_)) return false;
-    sendRequest_ = -1;
-
-    if (!UPstream::finishedRequest(recvRequest_)) return false;
-    recvRequest_ = -1;
-
-    return true;
+    return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
@@ -208,7 +203,7 @@ void Foam::processorFvPatchField<Type>::initEvaluate
     const Pstream::commsTypes commsType
 )
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         this->patchInternalField(sendBuf_);
 
@@ -264,7 +259,7 @@ void Foam::processorFvPatchField<Type>::evaluate
     const Pstream::commsTypes commsType
 )
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         if
         (
@@ -274,10 +269,11 @@ void Foam::processorFvPatchField<Type>::evaluate
         {
             // Fast path: received into *this
 
-            // Treat send as finished when recv is done
-            UPstream::waitRequest(recvRequest_);
-            recvRequest_ = -1;
-            sendRequest_ = -1;
+            // Require receive data. Update the send request state.
+            // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+            UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+            if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
         }
         else
         {
@@ -402,10 +398,11 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
     else
     {
@@ -523,10 +520,11 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
     else
     {
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
index cc58546967..adf9b74a17 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
@@ -172,10 +172,11 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Treat send as finished when recv is done
-        UPstream::waitRequest(recvRequest_);
-        recvRequest_ = -1;
-        sendRequest_ = -1;
+        // Require receive data. Update the send request state.
+        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
+
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
     else
     {

From e1cb12509e7363dd74144e53caaa2d3f1a1d14ba Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 11 Apr 2023 14:51:55 +0200
Subject: [PATCH 165/348] GIT: remove unused/spurious Amultiplier definition

---
 .../LduMatrix/LduMatrix/LduMatrixATmul.C      | 30 -------------------
 .../LduMatrixUpdateMatrixInterfaces.C         |  8 +----
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index 565068d4d9..50cbf806b2 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -28,36 +28,6 @@ License
 
 #include "LduMatrix.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class Type, class LUType>
-class Amultiplier
-:
-    public LduInterfaceField<Type>::Amultiplier
-{
-    const Field<LUType>& A_;
-
-public:
-
-    Amultiplier(const Field<LUType>& A)
-    :
-        A_(A)
-    {}
-
-    virtual ~Amultiplier() = default;
-
-    virtual void addAmul(Field<Type>& Apsi, const Field<Type>& psi) const
-    {
-        Apsi += A_*psi;
-    }
-};
-
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index 0b63849d53..1e36a82086 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -60,7 +60,6 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
                     interfacei,
                     psiif,
                     interfaceCoeffs[interfacei],
-                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfacei]),
                     commsType
                 );
             }
@@ -89,7 +88,6 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
                     interfacei,
                     psiif,
                     interfaceCoeffs[interfacei],
-                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfacei]),
                     UPstream::commsTypes::blocking
                 );
             }
@@ -141,7 +139,6 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                     interfacei,
                     psiif,
                     interfaceCoeffs[interfacei],
-                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfacei]),
                     commsType
                 );
             }
@@ -168,7 +165,6 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                         interfacei,
                         psiif,
                         interfaceCoeffs[interfacei],
-                      //Amultiplier<Type, LUType>(interfaceCoeffs[interfacei]),
                         commsType
                     );
                 }
@@ -182,7 +178,6 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                         interfacei,
                         psiif,
                         interfaceCoeffs[interfacei],
-                      //Amultiplier<Type, LUType>(interfaceCoeffs[interfacei]),
                         commsType
                     );
                 }
@@ -208,8 +203,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                     interfacei,
                     psiif,
                     interfaceCoeffs[interfacei],
-                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfacei]),
-                    Pstream::commsTypes::blocking
+                    UPstream::commsTypes::blocking
                 );
             }
         }

From 1f5cf3958bc8743af25c8870f84082258c5b4f5a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 11 Apr 2023 10:28:34 +0200
Subject: [PATCH 166/348] ENH: add request-driven polling/consumption of
 processor interfaces

- with (nPollProcInterfaces < 0) it does the following:

  - loop, waiting for some requests to finish
  - for each out-of-date interface, check if its associated
    requests have now finished (ie, the ready() check).
  - if ready() -> call updateInterfaceMatrix()

  In contrast to (nPollProcInterfaces > 0) which loops a specified
  number of times with several calls to MPI_Test each time, the
  (nPollProcInterfaces < 0) variant relies on internal MPI looping
  within MPI_Waitsome to progress communication.

  The actual dispatch still remains non-deterministic (ie, waiting for
  some requests to finish does not mean that any particular interface
  is eligible for update, or in any particular order). However, using
  Waitsome places the tight looping into the MPI layer, which results
  in few calls and eliminates behaviour dependent on the value of
  nPollProcInterfaces.

TUT: add polling to windAroundBuildings case (for testing purposes)
---
 .../LduMatrixUpdateMatrixInterfaces.C         |  57 ++++++++-
 .../lduMatrixUpdateMatrixInterfaces.C         | 121 +++++++++++-------
 .../windAroundBuildings/Allrun-parallel       |   3 +-
 3 files changed, 126 insertions(+), 55 deletions(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index 1e36a82086..5376a1947b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -115,23 +115,70 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
 {
     const UPstream::commsTypes commsType = UPstream::defaultCommsType;
 
-    // Block until sends/receives have finished
-    if (commsType == UPstream::commsTypes::nonBlocking)
+    if
+    (
+        commsType == UPstream::commsTypes::nonBlocking
+     && UPstream::nPollProcInterfaces
+    )
     {
-        UPstream::waitRequests(startRequest);
+        // Wait for some interface requests to become available and
+        // consume them. No guarantee that the finished requests actually
+        // correspond to any particular interface, but it is reasonably
+        // probable that some interfaces will be able to start consumption
+        // without waiting for all requests.
+
+        DynamicList<int> indices;  // (work array)
+        while
+        (
+            UPstream::nPollProcInterfaces < 0
+         && UPstream::waitSomeRequests(startRequest, &indices)
+        )
+        {
+            forAll(interfaces_, interfacei)
+            {
+                auto* intf = interfaces_.get(interfacei);
+
+                if (intf && !intf->updatedMatrix() && intf->ready())
+                {
+                    intf->updateInterfaceMatrix
+                    (
+                        result,
+                        add,
+                        lduMesh_.lduAddr(),
+                        interfacei,
+                        psiif,
+                        interfaceCoeffs[interfacei],
+                        commsType
+                    );
+                }
+            }
+        }
     }
 
+
     if
     (
         commsType == UPstream::commsTypes::blocking
      || commsType == UPstream::commsTypes::nonBlocking
     )
     {
+        // Wait until sends/receives have finished.
+        // - effectively a no-op (without waiting) if already completed.
+        if (commsType == UPstream::commsTypes::nonBlocking)
+        {
+            UPstream::waitRequests(startRequest);
+        }
+
+        // Check/no-check for updatedMatrix() ?
+        const bool noCheck = (commsType == UPstream::commsTypes::blocking);
+
         forAll(interfaces_, interfacei)
         {
-            if (interfaces_.set(interfacei))
+            auto* intf = interfaces_.get(interfacei);
+
+            if (intf && (noCheck || !intf->updatedMatrix()))
             {
-                interfaces_[interfacei].updateInterfaceMatrix
+                intf->updateInterfaceMatrix
                 (
                     result,
                     add,
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index d2e78b4cba..1d20ed7023 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -118,46 +118,68 @@ void Foam::lduMatrix::updateMatrixInterfaces
 {
     const UPstream::commsTypes commsType = UPstream::defaultCommsType;
 
-    if (commsType == UPstream::commsTypes::blocking)
+    if
+    (
+        commsType == UPstream::commsTypes::nonBlocking
+     && UPstream::nPollProcInterfaces
+    )
     {
-        forAll(interfaces, interfacei)
+        // Wait for some interface requests to become available and
+        // consume them. No guarantee that the finished requests actually
+        // correspond to any particular interface, but it is reasonably
+        // probable that some interfaces will be able to start consumption
+        // without waiting for all requests.
+
+        DynamicList<int> indices;  // (work array)
+        while
+        (
+            UPstream::nPollProcInterfaces < 0
+         && UPstream::waitSomeRequests(startRequest, &indices)
+        )
         {
-            if (interfaces.set(interfacei))
+            forAll(interfaces, interfacei)
             {
-                interfaces[interfacei].updateInterfaceMatrix
-                (
-                    result,
-                    add,
-                    mesh().lduAddr(),
-                    interfacei,
-                    psiif,
-                    coupleCoeffs[interfacei],
-                    cmpt,
-                    commsType
-                );
+                auto* intf = interfaces.get(interfacei);
+
+                if (intf && !intf->updatedMatrix() && intf->ready())
+                {
+                    intf->updateInterfaceMatrix
+                    (
+                        result,
+                        add,
+                        mesh().lduAddr(),
+                        interfacei,
+                        psiif,
+                        coupleCoeffs[interfacei],
+                        cmpt,
+                        commsType
+                    );
+                }
             }
         }
-    }
-    else if (commsType == UPstream::commsTypes::nonBlocking)
-    {
-        // Try and consume interfaces as they become available
-        bool allUpdated = false;
 
-        for (label i=0; i<UPstream::nPollProcInterfaces; i++)
+        // [OLDER]
+        // Alternative for consuming interfaces as they become available.
+        // Within the loop, the ready() calls an MPI_Test
+        // that can trigger progression. However, a bit less reliably
+        // (and less efficient) since it is implies multiple calls to
+        // MPI_Test to progress the MPI transfer, but no guarantee that
+        // any of them will actually complete within nPollProcInterfaces
+        // calls.
+
+        for (label i = 0; i < UPstream::nPollProcInterfaces; ++i)
         {
-            allUpdated = true;
+            bool allUpdated = true;
 
             forAll(interfaces, interfacei)
             {
-                if
-                (
-                    interfaces.set(interfacei)
-                && !interfaces[interfacei].updatedMatrix()
-                )
+                auto* intf = interfaces.get(interfacei);
+
+                if (intf && !intf->updatedMatrix())
                 {
-                    if (interfaces[interfacei].ready())
+                    if (intf->ready())
                     {
-                        interfaces[interfacei].updateInterfaceMatrix
+                        intf->updateInterfaceMatrix
                         (
                             result,
                             add,
@@ -178,35 +200,36 @@ void Foam::lduMatrix::updateMatrixInterfaces
 
             if (allUpdated)
             {
-                break;
+                break;  // Early exit
             }
         }
+    }
 
-        // Block for everything
-        if (Pstream::parRun())
+
+    if
+    (
+        commsType == UPstream::commsTypes::blocking
+     || commsType == UPstream::commsTypes::nonBlocking
+    )
+    {
+        // Wait until sends/receives have finished.
+        // - effectively a no-op (without waiting) if already completed.
+        if (commsType == UPstream::commsTypes::nonBlocking)
         {
-            if (allUpdated)
-            {
-                // All received. Just remove all outstanding requests
-                UPstream::resetRequests(startRequest);
-            }
-            else
-            {
-                // Block for all requests and remove storage
-                UPstream::waitRequests(startRequest);
-            }
+            UPstream::waitRequests(startRequest);
         }
 
-        // Consume
+        // Check/no-check for updatedMatrix() ?
+        const bool noCheck = (commsType == UPstream::commsTypes::blocking);
+
+        // Consume anything still outstanding
         forAll(interfaces, interfacei)
         {
-            if
-            (
-                interfaces.set(interfacei)
-            && !interfaces[interfacei].updatedMatrix()
-            )
+            auto* intf = interfaces.get(interfacei);
+
+            if (intf && (noCheck || !intf->updatedMatrix()))
             {
-                interfaces[interfacei].updateInterfaceMatrix
+                intf->updateInterfaceMatrix
                 (
                     result,
                     add,
@@ -282,7 +305,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
                     psiif,
                     coupleCoeffs[interfacei],
                     cmpt,
-                    Pstream::commsTypes::blocking
+                    UPstream::commsTypes::blocking
                 );
             }
         }
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
index c391fe6cca..96d81ea377 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
@@ -9,7 +9,8 @@ runApplication decomposePar
 
 restore0Dir -processor
 
-runParallel $(getApplication)
+# Test polling interfaces
+runParallel $(getApplication) -opt-switch nPollProcInterfaces=-1
 
 runApplication reconstructPar
 

From 89e1d8c2690efc829a0435cace756478c3c9a9a1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Mar 2023 13:02:36 +0100
Subject: [PATCH 167/348] ENH: restrict use of MPI_Group to local scope

- don't need to retain group references globally.
  Just retrieve parent group reference on-demand and discard
  immediately afterwards.
---
 src/Pstream/mpi/PstreamGlobals.C |  5 +--
 src/Pstream/mpi/PstreamGlobals.H | 17 +-------
 src/Pstream/mpi/UPstream.C       | 74 ++++++++++++--------------------
 3 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/src/Pstream/mpi/PstreamGlobals.C b/src/Pstream/mpi/PstreamGlobals.C
index 5fd81abae9..0da82d7043 100644
--- a/src/Pstream/mpi/PstreamGlobals.C
+++ b/src/Pstream/mpi/PstreamGlobals.C
@@ -30,11 +30,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-Foam::DynamicList<unsigned> Foam::PstreamGlobals::pendingMPIFree_;
-
+Foam::DynamicList<bool> Foam::PstreamGlobals::pendingMPIFree_;
 Foam::DynamicList<MPI_Comm> Foam::PstreamGlobals::MPICommunicators_;
-Foam::DynamicList<MPI_Group> Foam::PstreamGlobals::MPIGroups_;
-
 Foam::DynamicList<MPI_Request> Foam::PstreamGlobals::outstandingRequests_;
 
 
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index 276f189328..d2ce681ce0 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -50,26 +50,13 @@ namespace Foam
 namespace PstreamGlobals
 {
 
-//- Internal enumeration to track the state of MPI_Comm, MPI_Group allocation
-//  Handled as bitmasks
-enum allocationTypes : unsigned
-{
-    NonePending = 0u,   // No MPI free is pending
-    CommPending = 1u,   // MPI_Comm_free() is needed
-    GroupPending = 2u   // MPI_Group_free() is needed
-};
-
-// Track if MPI_Comm_free and/or MPI_Group_free are pending for
-// each communicator index (indexes into MPICommunicators_, MPIGroups_)
-extern DynamicList<unsigned> pendingMPIFree_;
+// Track if MPI_Comm_free is needed for communicator index in MPICommunicators_
+extern DynamicList<bool> pendingMPIFree_;
 
 // Current communicators, which may be allocated or predefined
 // (eg, MPI_COMM_SELF, MPI_COMM_WORLD)
 extern DynamicList<MPI_Comm> MPICommunicators_;
 
-// Groups used to create communicators
-extern DynamicList<MPI_Group> MPIGroups_;
-
 //- Outstanding non-blocking operations.
 extern DynamicList<MPI_Request> outstandingRequests_;
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 4555fd62ed..19587ccd90 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -511,12 +511,8 @@ void Foam::UPstream::allocatePstreamCommunicator
     if (index == PstreamGlobals::MPICommunicators_.size())
     {
         // Extend storage with null values
-
-        PstreamGlobals::
-            pendingMPIFree_.emplace_back(PstreamGlobals::NonePending);
-
+        PstreamGlobals::pendingMPIFree_.emplace_back(false);
         PstreamGlobals::MPICommunicators_.emplace_back(MPI_COMM_NULL);
-        PstreamGlobals::MPIGroups_.emplace_back(MPI_GROUP_NULL);
     }
     else if (index > PstreamGlobals::MPICommunicators_.size())
     {
@@ -538,18 +534,13 @@ void Foam::UPstream::allocatePstreamCommunicator
                 << Foam::exit(FatalError);
         }
 
-        PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
+        PstreamGlobals::pendingMPIFree_[index] = false;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_WORLD;
 
         // TBD: MPI_Comm_dup(MPI_COMM_WORLD, ...);
-        // with pendingMPIFree_[index] = CommPending ...
+        // with pendingMPIFree_[index] = true
         // Note: freePstreamCommunicator may need an update
 
-        MPI_Comm_group
-        (
-            PstreamGlobals::MPICommunicators_[index],
-           &PstreamGlobals::MPIGroups_[index]
-        );
         MPI_Comm_rank
         (
             PstreamGlobals::MPICommunicators_[index],
@@ -572,10 +563,9 @@ void Foam::UPstream::allocatePstreamCommunicator
     {
         // Self communicator (selfComm)
 
-        PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
+        PstreamGlobals::pendingMPIFree_[index] = false;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_SELF;
 
-        MPI_Comm_group(MPI_COMM_SELF, &PstreamGlobals::MPIGroups_[index]);
         MPI_Comm_rank(MPI_COMM_SELF, &myProcNo_[index]);
 
         // Number of ranks is always 1 (self communicator)
@@ -604,16 +594,23 @@ void Foam::UPstream::allocatePstreamCommunicator
     {
         // General sub-communicator
 
-        PstreamGlobals::pendingMPIFree_[index]
-            = (PstreamGlobals::CommPending | PstreamGlobals::GroupPending);
+        PstreamGlobals::pendingMPIFree_[index] = true;
 
-        // Create new group
+        // Starting from parent
+        MPI_Group parent_group;
+        MPI_Comm_group
+        (
+            PstreamGlobals::MPICommunicators_[parentIndex],
+           &parent_group
+        );
+
+        MPI_Group active_group;
         MPI_Group_incl
         (
-            PstreamGlobals::MPIGroups_[parentIndex],
+            parent_group,
             procIDs_[index].size(),
             procIDs_[index].cdata(),
-           &PstreamGlobals::MPIGroups_[index]
+           &active_group
         );
 
         #if defined(MSMPI_VER)
@@ -621,26 +618,29 @@ void Foam::UPstream::allocatePstreamCommunicator
         MPI_Comm_create
         (
             PstreamGlobals::MPICommunicators_[parentIndex],
-            PstreamGlobals::MPIGroups_[index],
-            &PstreamGlobals::MPICommunicators_[index]
+            active_group,
+           &PstreamGlobals::MPICommunicators_[index]
         );
         #else
         // Create new communicator for this group
         MPI_Comm_create_group
         (
             PstreamGlobals::MPICommunicators_[parentIndex],
-            PstreamGlobals::MPIGroups_[index],
+            active_group,
             UPstream::msgType(),
            &PstreamGlobals::MPICommunicators_[index]
         );
         #endif
 
+        // Groups not needed after this...
+        MPI_Group_free(&parent_group);
+        MPI_Group_free(&active_group);
+
         if (PstreamGlobals::MPICommunicators_[index] == MPI_COMM_NULL)
         {
-            // No communicator created, group only
+            // No communicator created
             myProcNo_[index] = -1;
-            PstreamGlobals::
-                pendingMPIFree_[index] = PstreamGlobals::GroupPending;
+            PstreamGlobals::pendingMPIFree_[index] = false;
         }
         else
         {
@@ -681,33 +681,15 @@ void Foam::UPstream::freePstreamCommunicator(const label index)
     {
         if
         (
-            (MPI_COMM_NULL != PstreamGlobals::MPICommunicators_[index])
-         &&
-            (
-                PstreamGlobals::pendingMPIFree_[index]
-              & PstreamGlobals::CommPending
-            )
+            (true == PstreamGlobals::pendingMPIFree_[index])
+         && (MPI_COMM_NULL != PstreamGlobals::MPICommunicators_[index])
         )
         {
             // Free communicator. Sets communicator to MPI_COMM_NULL
             MPI_Comm_free(&PstreamGlobals::MPICommunicators_[index]);
         }
 
-        if
-        (
-            (MPI_GROUP_NULL != PstreamGlobals::MPIGroups_[index])
-         &&
-            (
-                PstreamGlobals::pendingMPIFree_[index]
-              & PstreamGlobals::GroupPending
-            )
-        )
-        {
-            // Free group. Sets group to MPI_GROUP_NULL
-            MPI_Group_free(&PstreamGlobals::MPIGroups_[index]);
-        }
-
-        PstreamGlobals::pendingMPIFree_[index] = PstreamGlobals::NonePending;
+        PstreamGlobals::pendingMPIFree_[index] = false;
     }
 }
 

From 3d2df7cdf6acd780427b0ba7f5f33cc0d55af9a4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 12 Apr 2023 15:10:04 +0200
Subject: [PATCH 168/348] COMP: remove unused variables, etc in Cloud

---
 .../wallBoundedParticleTemplates.C            |  2 +-
 .../clouds/Templates/DSMCCloud/DSMCCloud.C    | 38 ++++++++-----------
 src/lagrangian/basic/Cloud/Cloud.H            |  2 +-
 src/lagrangian/basic/Cloud/CloudIO.C          |  4 +-
 .../injectedParticle/injectedParticleIO.C     |  2 +-
 .../ReactingMultiphaseParcelIO.C              |  2 +-
 6 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
index e331976d21..895f8104ae 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
@@ -460,7 +460,7 @@ void Foam::wallBoundedParticle::writeFields(const TrackCloudType& c)
 {
     particle::writeFields(c);
 
-    label np = c.size();
+    const label np = c.size();
 
     IOField<point> localPosition
     (
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 3c18e98a9e..0be3c472cd 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -615,33 +615,27 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
     rndGen_(Pstream::myProcNo()),
     boundaryT_
     (
-        volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "boundaryT",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh_
-        )
+            "boundaryT",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
     ),
     boundaryU_
     (
-        volVectorField
+        IOobject
         (
-            IOobject
-            (
-                "boundaryU",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh_
-        )
+            "boundaryU",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
     ),
     binaryCollisionModel_
     (
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index e295f600d4..44696ae669 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -222,7 +222,7 @@ public:
             IOobject fieldIOobject
             (
                 const word& fieldName,
-                IOobjectOption::readOption rOpt
+                IOobjectOption::readOption rOpt = IOobjectOption::NO_READ
             ) const;
 
             //- Check lagrangian data field
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 21e46bbc11..ad8d0574ea 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -199,8 +199,8 @@ Foam::IOobject Foam::Cloud<ParticleType>::fieldIOobject
         time().timeName(),
         *this,
         rOpt,
-        IOobject::NO_WRITE,
-        IOobject::NO_REGISTER
+        IOobjectOption::NO_WRITE,
+        IOobjectOption::NO_REGISTER
     );
 }
 
diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
index 60e9f383db..5a44f4caa5 100644
--- a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
+++ b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
@@ -142,7 +142,7 @@ void Foam::injectedParticle::writeFields(const Cloud<injectedParticle>& c)
 
     // Note: not writing local position_ - defer to base particle class
 
-    label np =  c.size();
+    const label np = c.size();
 
     IOField<label> tag(c.fieldIOobject("tag", IOobject::NO_READ), np);
     IOField<scalar> soi(c.fieldIOobject("soi", IOobject::NO_READ), np);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index f309f8db8a..f5e5987fa2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -336,7 +336,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readObjects
 {
     ParcelType::readObjects(c, obr);
 
-    const label np = c.size();
+    // const label np = c.size();
     const bool readOnProc = c.size();
 
     // The composition fractions

From 6b16a614ca7e5d77dc6dc2e1203260517582e653 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 13 Apr 2023 17:01:46 +0200
Subject: [PATCH 169/348] BUG: incorrect function introducer for mixedExpr with
 point field

- was primed with toPoint(..) expression call instead of point(...)
---
 src/finiteVolume/expressions/fields/base/patchExprFieldBase.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/expressions/fields/base/patchExprFieldBase.C b/src/finiteVolume/expressions/fields/base/patchExprFieldBase.C
index f88d3b10d5..88caa5a1ec 100644
--- a/src/finiteVolume/expressions/fields/base/patchExprFieldBase.C
+++ b/src/finiteVolume/expressions/fields/base/patchExprFieldBase.C
@@ -82,7 +82,7 @@ void Foam::expressions::patchExprFieldBase::readExpressions
                 // but not for 0/1 (handled as shortcuts later)
                 if (wantPointData && fracExpr_ != "0" && fracExpr_ != "1")
                 {
-                    fracExpr_ = "toPoint(" + fracExpr_ + ")";
+                    fracExpr_ = "point(" + fracExpr_ + ")";
                 }
             }
         }

From 09dd913077606161107cf2b7e589444d73a9c82c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 12 Apr 2023 17:12:18 +0200
Subject: [PATCH 170/348] ENH: use primitive fields when calculating triSurface
 fields (#2758)

---
 .../surface/surfaceInflate/surfaceInflate.C          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
index 2e305e818a..364b00e0e7 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -683,7 +683,8 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         s,
-        dimensionedScalar("scale", dimLength, 1.0)
+        scalar(1),
+        dimLength
     );
 
 
@@ -715,7 +716,8 @@ int main(int argc, char *argv[])
         ),
         s,
         dimLength,
-        distance*scale*pointNormals
+        // - calculate with primitive fields (#2758)
+        (distance*scale.field()*pointNormals)
     );
 
 
@@ -826,7 +828,9 @@ int main(int argc, char *argv[])
 
 
         // From scale update the pointDisplacement
-        pointDisplacement *= distance*scale/mag(pointDisplacement);
+        // - calculate with primitive fields (#2758)
+        pointDisplacement.normalise();
+        pointDisplacement.field() *= distance*scale.field();
 
 
         // Do some smoothing (Lloyds algorithm)

From 3947f3c441752e9a275c145096e86648a81cccf1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 12 Apr 2023 17:57:46 +0200
Subject: [PATCH 171/348] STYLE: use zeroGradientType() instead of hard-coded
 or typeName

---
 .../ObukhovLength/ObukhovLength.C             |  4 +--
 .../diffusionMulticomponent.C                 |  6 ++--
 .../eddyDissipationDiffusionModel.C           |  2 +-
 .../interfaceTrackingFvMesh.C                 |  4 +--
 .../finiteArea/fac/facEdgeIntegrate.C         |  4 +--
 .../leastSquaresFaGrad/leastSquaresFaGrad.C   |  2 +-
 .../cfdTools/general/CorrectPhi/CorrectPhi.C  |  4 +--
 .../finiteVolume/fvc/fvcSmooth/fvcSmooth.C    |  2 +-
 .../fvMeshSubset/fvMeshSubsetProxyTemplates.C |  2 +-
 .../patchDistMethodTemplates.C                |  2 +-
 .../field/CourantNo/CourantNo.C               |  2 +-
 src/functionObjects/field/age/age.C           |  2 +-
 .../field/blendingFactor/blendingFactor.C     |  2 +-
 .../resolutionIndexModel.C                    |  4 +--
 .../stabilityBlendingFactor.C                 |  8 +++---
 .../zeroGradient/zeroGradientTemplates.C      |  2 +-
 .../utilities/solverInfo/solverInfo.C         |  2 +-
 .../inverseVolume/inverseVolumeDiffusivity.C  |  2 +-
 .../motionDirectionalDiffusivity.C            |  3 +-
 .../patchCorrectedInterpolationTemplates.C    |  6 ++--
 .../acousticDampingSource.C                   |  5 ++--
 .../jouleHeatingSource/jouleHeatingSource.C   |  2 +-
 .../solidificationMeltingSource.C             |  2 +-
 .../interRegionHeatTransferModel.C            |  2 +-
 .../clouds/Templates/DSMCCloud/DSMCCloud.C    |  2 +-
 .../MPPIC/AveragingMethods/Basic/Basic.C      |  2 +-
 .../MPPIC/PackingModels/Implicit/Implicit.C   |  8 +++---
 .../molecule/mdTools/createMDFields.H         | 20 ++++++-------
 .../meshRefinement/meshRefinement.C           | 24 ++++++++--------
 .../meshRefinement/meshRefinementBaffles.C    |  2 +-
 .../adjoint/ATCModel/ATCModel/ATCModel.C      | 28 ++++++++++---------
 .../ATCModel/ATCModel/ATCModelTemplates.C     |  5 ++--
 .../elasticityMotionSolver.C                  |  2 +-
 .../adjointEikonalSolverIncompressible.C      |  2 +-
 .../sensitivitySurfaceIncompressible.C        |  2 +-
 .../adjointkOmegaSST/adjointkOmegaSST.C       |  2 +-
 .../cellCellStencilTemplates.C                |  2 +-
 .../cellVolumeWeightCellCellStencil.C         |  2 +-
 .../inverseDistanceCellCellStencil.C          |  2 +-
 src/overset/include/createCellMask.H          |  5 ++--
 src/overset/include/createInterpolatedCells.H |  5 ++--
 src/overset/oversetFvMesh/oversetFvMeshBase.C |  9 +++---
 .../InterfaceCompositionModel.C               | 11 ++++----
 .../dragModels/segregated/segregated.C        |  2 +-
 .../dragModels/segregated/segregated.C        |  2 +-
 .../KirchhoffShell/KirchhoffShell.C           |  2 +-
 .../thermalShell/thermalShell.C               |  6 ++--
 .../singleLayerRegion/singleLayerRegion.C     |  8 +++---
 .../singleLayerRegionTemplates.C              | 22 ++++++++-------
 .../functionObjects/filmFlux/filmFlux.C       |  2 +-
 .../kinematicSingleLayer.C                    | 20 ++++++-------
 .../curvatureSeparation/curvatureSeparation.C | 12 +++++---
 .../standardRadiation/standardRadiation.C     |  2 +-
 .../waxSolventViscosity/waxSolventViscosity.C |  4 +--
 .../solidification/solidification.C           |  4 +--
 .../thermoSingleLayer/thermoSingleLayer.C     | 10 +++----
 56 files changed, 161 insertions(+), 146 deletions(-)

diff --git a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
index 4ce789050a..399e940477 100644
--- a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
+++ b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
@@ -76,7 +76,7 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
             ),
             mesh_,
             dimLength,
-            zeroGradientFvPatchField<scalar>::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         result1->store();
@@ -94,7 +94,7 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
             ),
             mesh_,
             dimVelocity,
-            zeroGradientFvPatchField<scalar>::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         result2->store();
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
index f14d2ec546..fb5c155625 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
@@ -71,7 +71,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::init()
                 ),
                 this->mesh_,
                 dimensionedScalar(dimMass/dimTime/dimVolume, Zero),
-                zeroGradientFvPatchScalarField::typeName
+                fvPatchFieldBase::zeroGradientType()
             )
         );
 
@@ -209,7 +209,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::correct()
                     ),
                     this->mesh_,
                     dimensionedScalar(dimMass/dimTime/dimVolume, Zero),
-                    zeroGradientFvPatchScalarField::typeName
+                    fvPatchFieldBase::zeroGradientType()
                 )
             );
 
@@ -410,7 +410,7 @@ diffusionMulticomponent<ReactionThermo, ThermoType>::Qdot() const
             ),
             this->mesh(),
             dimensionedScalar(dimEnergy/dimTime/dimVolume, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
 
diff --git a/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C b/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C
index 2663ade256..fa042bfce0 100644
--- a/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C
+++ b/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C
@@ -91,7 +91,7 @@ eddyDissipationDiffusionModel<ReactionThermo, ThermoType>::rtDiff() const
             ),
             this->mesh(),
             dimensionedScalar(dimLength, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
 
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
index fc3e6cee87..d3c87b6f33 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
@@ -144,7 +144,7 @@ void Foam::interfaceTrackingFvMesh::makeUs() const
     wordList patchFieldTypes
     (
         aMesh().boundary().size(),
-        zeroGradientFaPatchVectorField::typeName
+        faPatchFieldBase::zeroGradientType()
     );
 
     forAll(aMesh().boundary(), patchI)
@@ -883,7 +883,7 @@ void Foam::interfaceTrackingFvMesh::updateSurfactantConcentration()
                 ),
                 aMesh(),
                 dimensionedScalar(dimMoles/dimVolume, Zero),
-                zeroGradientFaPatchScalarField::typeName
+                faPatchFieldBase::zeroGradientType()
             );
 
             Cb.ref().field() =
diff --git a/src/finiteArea/finiteArea/fac/facEdgeIntegrate.C b/src/finiteArea/finiteArea/fac/facEdgeIntegrate.C
index 3cae46f5ee..cb32d94a36 100644
--- a/src/finiteArea/finiteArea/fac/facEdgeIntegrate.C
+++ b/src/finiteArea/finiteArea/fac/facEdgeIntegrate.C
@@ -62,7 +62,7 @@ edgeIntegrate
             ),
             mesh,
             dimensioned<Type>(ssf.dimensions()/dimArea, Zero),
-            zeroGradientFaPatchField<Type>::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
     GeometricField<Type, faPatchField, areaMesh>& vf = tvf.ref();
@@ -134,7 +134,7 @@ edgeSum
             ),
             mesh,
             dimensioned<Type>(ssf.dimensions(), Zero),
-            zeroGradientFaPatchField<Type>::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
     GeometricField<Type, faPatchField, areaMesh>& vf = tvf.ref();
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C
index 5893faa910..ef6c9d6ce9 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C
@@ -77,7 +77,7 @@ leastSquaresFaGrad<Type>::grad
             ),
             mesh,
             dimensioned<GradType>(vsf.dimensions()/dimLength, Zero),
-            zeroGradientFaPatchField<GradType>::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
     GeometricField<GradType, faPatchField, areaMesh>& lsGrad = tlsGrad.ref();
diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
index bf53f6c6f6..c92d10b68c 100644
--- a/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
+++ b/src/finiteVolume/cfdTools/general/CorrectPhi/CorrectPhi.C
@@ -60,7 +60,7 @@ void Foam::CorrectPhi
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
@@ -140,7 +140,7 @@ void Foam::CorrectPhi
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
index befe5e3181..3a5ed60f0f 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
@@ -345,7 +345,7 @@ void Foam::fvc::spreadSource
         ),
         mesh,
         dimensionedScalar(mDotOut.dimensions(), Zero),
-        zeroGradientFvPatchField<scalar>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Smearing of source term field
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetProxyTemplates.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetProxyTemplates.C
index 4d336786aa..5791434f6f 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetProxyTemplates.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetProxyTemplates.C
@@ -51,7 +51,7 @@ Foam::fvMeshSubsetProxy::zeroGradientField
         io,
         df.mesh(),
         dimensioned<Type>(df.dimensions(), Zero),
-        zeroGradientFvPatchField<Type>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     tfield.ref().primitiveFieldRef() = df;
     tfield.ref().oriented() = df.oriented();
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethodTemplates.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethodTemplates.C
index 8eea096a3b..be91746147 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethodTemplates.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethodTemplates.C
@@ -40,7 +40,7 @@ Foam::wordList Foam::patchDistMethod::patchTypes
     wordList yTypes
     (
         mesh.boundary().size(),
-        zeroGradientFvPatchField<Type>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     for (const label patchi : patchIDs)
diff --git a/src/functionObjects/field/CourantNo/CourantNo.C b/src/functionObjects/field/CourantNo/CourantNo.C
index 04da791feb..55ff252fb3 100644
--- a/src/functionObjects/field/CourantNo/CourantNo.C
+++ b/src/functionObjects/field/CourantNo/CourantNo.C
@@ -100,7 +100,7 @@ bool Foam::functionObjects::CourantNo::calc()
                 ),
                 mesh_,
                 dimensionedScalar(dimless, Zero),
-                zeroGradientFvPatchScalarField::typeName
+                fvPatchFieldBase::zeroGradientType()
             );
             tCo.ref().ref() = Coi();
             tCo.ref().correctBoundaryConditions();
diff --git a/src/functionObjects/field/age/age.C b/src/functionObjects/field/age/age.C
index 4da8f127bc..7ecb04bc69 100644
--- a/src/functionObjects/field/age/age.C
+++ b/src/functionObjects/field/age/age.C
@@ -63,7 +63,7 @@ Foam::wordList Foam::functionObjects::age::patchTypes() const
     {
         if (isA<wallFvPatch>(mesh_.boundary()[patchi]))
         {
-            result[patchi] = zeroGradientFvPatchField<scalar>::typeName;
+            result[patchi] = fvPatchFieldBase::zeroGradientType();
         }
     }
 
diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C
index 00e1642301..81e0cc2307 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactor.C
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.C
@@ -96,7 +96,7 @@ Foam::functionObjects::blendingFactor::blendingFactor
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     store(resultName_, indicatorPtr);
diff --git a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
index b4e4610989..44baba6b55 100644
--- a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
+++ b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
@@ -58,7 +58,7 @@ Foam::tmp<Foam::volScalarField> Foam::resolutionIndexModel::V() const
         ),
         mesh_,
         dimVolume,
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     tV.ref().primitiveFieldRef() = mesh_.V();
@@ -104,7 +104,7 @@ bool Foam::resolutionIndexModel::read(const dictionary& dict)
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         mesh_.objectRegistry::store(indexPtr);
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 7839740c32..871367501b 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -71,7 +71,7 @@ Foam::functionObjects::stabilityBlendingFactor::indicator()
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         mesh_.objectRegistry::store(fldPtr);
@@ -332,7 +332,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         auto& magGradCC = tmagGradCC.ref();
 
@@ -351,7 +351,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
                 ),
                 mesh_,
                 dimensionedScalar(dimLength, Zero),
-                zeroGradientFvPatchScalarField::typeName
+                fvPatchFieldBase::zeroGradientType()
             );
             cci = mesh_.C().component(i);
             cci.correctBoundaryConditions();
@@ -405,7 +405,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         auto& Co = CoPtr.ref();
diff --git a/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C b/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C
index 8f87143e50..75505f24fe 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C
@@ -96,7 +96,7 @@ int Foam::functionObjects::zeroGradient::apply
             ),
             mesh_,
             dimensioned<Type>(input.dimensions(), Zero),
-            zeroGradientFvPatchField<Type>::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         store(outputName, tzeroGrad);
diff --git a/src/functionObjects/utilities/solverInfo/solverInfo.C b/src/functionObjects/utilities/solverInfo/solverInfo.C
index 60f0863aeb..51942e72eb 100644
--- a/src/functionObjects/utilities/solverInfo/solverInfo.C
+++ b/src/functionObjects/utilities/solverInfo/solverInfo.C
@@ -217,7 +217,7 @@ bool Foam::functionObjects::solverInfo::write()
                 ),
                 mesh_,
                 dimensionedScalar(dimless, Zero),
-                zeroGradientFvPatchField<scalar>::typeName
+                fvPatchFieldBase::zeroGradientType()
             );
 
             residual.primitiveFieldRef() = *residualPtr;
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
index 4fdccec098..ff0582a84e 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
@@ -84,7 +84,7 @@ void Foam::inverseVolumeDiffusivity::correct()
         ),
         mesh(),
         dimless,
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     V.primitiveFieldRef() = mesh().V();
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.C
index 6f0243dbb7..ec0832c7d2 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.C
@@ -87,7 +87,8 @@ void Foam::motionDirectionalDiffusivity::correct()
             diffusivityVector_.y()*vector::one
           + (diffusivityVector_.x() - diffusivityVector_.y())*cellMotionU
            /(mag(cellMotionU) + dimensionedScalar("small", dimVelocity, SMALL)),
-            zeroGradientFvPatchVectorField::typeName
+
+            fvPatchFieldBase::zeroGradientType()
         );
         D.correctBoundaryConditions();
 
diff --git a/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
index bf8d27b957..5b79b23e7d 100644
--- a/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
+++ b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
@@ -65,7 +65,7 @@ void Foam::patchCorrectedInterpolation::interpolateType
             wordList
             (
                 pointUncorrectedDisplacement.boundaryField().size(),
-                zeroGradientPointPatchField<Type>::typeName
+                pointPatchFieldBase::zeroGradientType()
             )
         );
 
@@ -107,7 +107,7 @@ void Foam::patchCorrectedInterpolation::interpolateDataFromPatchGroups
         ),
         data.mesh(),
         dimensionedScalar(dimless, Zero),
-        zeroGradientPointPatchField<scalar>::typeName
+        pointPatchFieldBase::zeroGradientType()
     );
     data = dimensioned<Type>(data.dimensions(), Zero);
 
@@ -124,7 +124,7 @@ void Foam::patchCorrectedInterpolation::interpolateDataFromPatchGroups
             ),
             data.mesh(),
             dimensionedScalar(data.dimensions(), Zero),
-            zeroGradientPointPatchField<scalar>::typeName
+            pointPatchFieldBase::zeroGradientType()
         );
         GeometricField<Type, pointPatchField, pointMesh> patchData(data);
 
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index f00cd64079..898926ef18 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -98,8 +98,9 @@ Foam::fv::acousticDampingSource::acousticDampingSource
                 IOobject::NO_WRITE
             ),
             mesh_,
-            dimensionedScalar("blend0", dimless, 1.0),
-            zeroGradientFvPatchField<vector>::typeName
+            scalar(1),
+            dimless,
+            fvPatchFieldBase::zeroGradientType()
         )
     ),
     frequency_("frequency", dimless/dimTime, 0),
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index a548662098..f6f41c11a0 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -68,7 +68,7 @@ Foam::fv::jouleHeatingSource::transformSigma
         ),
         mesh_,
         dimensionedSymmTensor(sigmaLocal.dimensions(), Zero),
-        zeroGradientFvPatchField<symmTensor>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     auto& sigma = tsigma.ref();
 
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index cf55b450bc..63d6b54b97 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -192,7 +192,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     curTimeIndex_(-1),
     deltaT_(cells_.size(), 0)
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index ea1d6f4d17..5a729f981f 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -139,7 +139,7 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel
         ),
         mesh,
         dimensionedScalar(dimEnergy/dimTime/dimTemperature/dimVolume, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     TName_(coeffs_.getOrDefault<word>("T", "T")),
     TNbrName_(coeffs_.getOrDefault<word>("TNbr", "T"))
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 0be3c472cd..a02de47f9c 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -717,7 +717,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         ),
         mesh_,
         dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     collisionSelectionRemainder_
     (
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
index fd36a47760..1febf1f3ee 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C
@@ -80,7 +80,7 @@ void Foam::AveragingMethods::Basic<Type>::updateGrad()
         ),
         this->mesh_,
         dimensioned<Type>(dimless, Zero),
-        zeroGradientFvPatchField<Type>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     tempData.primitiveFieldRef() = data_;
     tempData.correctBoundaryConditions();
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index 68ea5dd75b..c811306bc4 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -56,7 +56,7 @@ Foam::PackingModels::Implicit<CloudType>::Implicit
         ),
         this->owner().mesh(),
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     phiCorrect_(nullptr),
     uCorrect_(nullptr),
@@ -150,7 +150,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
             ),
             mesh,
             dimensionedScalar(dimDensity, Zero),
-            zeroGradientFvPatchField<scalar>::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         rho.primitiveFieldRef() = max(rhoAverage.primitiveField(), rhoMin_);
         rho.correctBoundaryConditions();
@@ -171,7 +171,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
             ),
             mesh,
             dimensionedScalar(dimPressure, Zero),
-            zeroGradientFvPatchField<scalar>::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         tauPrime.primitiveFieldRef() =
@@ -256,7 +256,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
                 ),
                 mesh,
                 dimensionedVector(dimVelocity, Zero),
-                fixedValueFvPatchField<vector>::typeName
+                fvPatchFieldBase::zeroGradientType()
             );
             U.primitiveFieldRef() = uAverage.primitiveField();
             U.correctBoundaryConditions();
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index d33c360937..025c398c4a 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -57,7 +57,7 @@ forAll(allSpeciesRhoN, rN)
             ),
             mesh,
             dimless/dimVolume,
-            "zeroGradient"
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     allSpeciesRhoN[rN].primitiveFieldRef() = 0;
@@ -78,7 +78,7 @@ volScalarField totalRhoN
     ),
     mesh,
     dimless/dimVolume,
-    "zeroGradient"
+    fvPatchFieldBase::zeroGradientType()
 );
 totalRhoN.primitiveFieldRef() = 0;
 totalRhoN.correctBoundaryConditions();
@@ -112,7 +112,7 @@ forAll(allSpeciesRhoM, rM)
             ),
             mesh,
             dimMass/dimVolume,
-            "zeroGradient"
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     allSpeciesRhoM[rM].primitiveFieldRef() = 0;
@@ -133,7 +133,7 @@ volScalarField totalRhoM
     ),
     mesh,
     dimMass/dimVolume,
-    "zeroGradient"
+    fvPatchFieldBase::zeroGradientType()
 );
 totalRhoM.primitiveFieldRef() = 0;
 totalRhoM.correctBoundaryConditions();
@@ -167,7 +167,7 @@ forAll(allSpeciesVelocity, v)
             ),
             mesh,
             dimVelocity,
-            "zeroGradient"
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     allSpeciesVelocity[v].primitiveFieldRef() = Zero;
@@ -188,7 +188,7 @@ Info << "    Creating total velocity field" << endl;
 //     ),
 //     mesh,
 //     dimVelocity,
-//     "zeroGradient"
+//     fvPatchFieldBase::zeroGradientType()
 // );
 // totalVelocity.primitiveFieldRef() = Zero;
 // totalVelocity.correctBoundaryConditions();
@@ -237,7 +237,7 @@ forAll(allSpeciesTemperature, t)
             ),
             mesh,
             dimTemperature,
-            "zeroGradient"
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     allSpeciesTemperature[t].primitiveFieldRef() = 0;
@@ -258,7 +258,7 @@ volScalarField totalTemperature
     ),
     mesh,
     dimTemperature,
-    "zeroGradient"
+    fvPatchFieldBase::zeroGradientType()
 );
 totalTemperature.primitiveFieldRef() = 0;
 totalTemperature.correctBoundaryConditions();
@@ -293,7 +293,7 @@ forAll(allSpeciesMeanKE, mKE)
             ),
             mesh,
             dimensionSet(1, 2, -2, 0, 0, 0, 0),
-            "zeroGradient"
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     allSpeciesMeanKE[mKE].primitiveFieldRef() = 0;
@@ -314,7 +314,7 @@ volScalarField totalMeanKE
     ),
     mesh,
     dimensionSet(1, 2, -2, 0, 0, 0, 0),
-    "zeroGradient"
+    fvPatchFieldBase::zeroGradientType()
 );
 totalMeanKE.primitiveFieldRef() = 0;
 totalMeanKE.correctBoundaryConditions();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index f945f0f369..309223d95b 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -2406,27 +2406,27 @@ Foam::label Foam::meshRefinement::appendPatch
     addPatchFields<volScalarField>
     (
         mesh,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
     addPatchFields<volVectorField>
     (
         mesh,
-        calculatedFvPatchField<vector>::typeName
+        fvPatchFieldBase::calculatedType()
     );
     addPatchFields<volSphericalTensorField>
     (
         mesh,
-        calculatedFvPatchField<sphericalTensor>::typeName
+        fvPatchFieldBase::calculatedType()
     );
     addPatchFields<volSymmTensorField>
     (
         mesh,
-        calculatedFvPatchField<symmTensor>::typeName
+        fvPatchFieldBase::calculatedType()
     );
     addPatchFields<volTensorField>
     (
         mesh,
-        calculatedFvPatchField<tensor>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     // Surface fields
@@ -2434,27 +2434,27 @@ Foam::label Foam::meshRefinement::appendPatch
     addPatchFields<surfaceScalarField>
     (
         mesh,
-        calculatedFvPatchField<scalar>::typeName
+        fvsPatchFieldBase::calculatedType()
     );
     addPatchFields<surfaceVectorField>
     (
         mesh,
-        calculatedFvPatchField<vector>::typeName
+        fvsPatchFieldBase::calculatedType()
     );
     addPatchFields<surfaceSphericalTensorField>
     (
         mesh,
-        calculatedFvPatchField<sphericalTensor>::typeName
+        fvsPatchFieldBase::calculatedType()
     );
     addPatchFields<surfaceSymmTensorField>
     (
         mesh,
-        calculatedFvPatchField<symmTensor>::typeName
+        fvsPatchFieldBase::calculatedType()
     );
     addPatchFields<surfaceTensorField>
     (
         mesh,
-        calculatedFvPatchField<tensor>::typeName
+        fvsPatchFieldBase::calculatedType()
     );
     return patchi;
 }
@@ -2574,7 +2574,7 @@ Foam::label Foam::meshRefinement::addMeshedPatch
 //            mesh_,
 //            ppPtr(),
 //            dictionary(),       // optional field values
-//            calculatedFvPatchField<scalar>::typeName,
+//            fvPatchFieldBase::calculatedType(),
 //            true
 //        );
 
@@ -3595,7 +3595,7 @@ void Foam::meshRefinement::dumpRefinementLevel() const
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         const labelList& cellLevel = meshCutter_.cellLevel();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 57946636c1..c36580ced6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -3576,7 +3576,7 @@ void Foam::meshRefinement::zonify
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         forAll(cellToZone, cellI)
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.C b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.C
index 057996e18a..d6791326aa 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.C
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.C
@@ -101,8 +101,9 @@ ATCModel::ATCModel
             IOobject::NO_WRITE
         ),
         mesh_,
-        dimensionedScalar("limiter", dimless, 1.0),
-        zeroGradientFvPatchField<scalar>::typeName
+        scalar(1),
+        dimless,
+        fvPatchFieldBase::zeroGradientType()
     ),
     ATC_
     (
@@ -231,17 +232,18 @@ tmp<volScalarField> ATCModel::createLimiter
     (
         new volScalarField
         (
-           IOobject
-           (
-               "limiter",
-               mesh.time().timeName(),
-               mesh,
-               IOobject::NO_READ,
-               IOobject::NO_WRITE
-           ),
-           mesh,
-           dimensionedScalar("limiter", dimless, 1.0),
-           zeroGradientFvPatchField<scalar>::typeName
+            IOobject
+            (
+                "limiter",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            scalar(1),
+            dimless,
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     volScalarField& limiter = tlimiter.ref();
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModelTemplates.C b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModelTemplates.C
index 488a4f7713..f9bba35323 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModelTemplates.C
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModelTemplates.C
@@ -50,8 +50,9 @@ void Foam::ATCModel::smoothFieldBasedOnCells
             IOobject::NO_WRITE
         ),
         mesh_,
-        dimensionedScalar("limiter", dimless, 1.0),
-        zeroGradientFvPatchField<scalar>::typeName
+        scalar(1),
+        dimless,
+        fvPatchFieldBase::zeroGradientType()
     );
 
     computeLimiter(limiter, cells, nSmooth_);
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
index 89f048fcc0..663f7e3ea9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
@@ -153,7 +153,7 @@ Foam::elasticityMotionSolver::elasticityMotionSolver
         ),
         fvMesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     exponent_(this->coeffDict().get<scalar>("exponent")),
     nSteps_(this->coeffDict().get<label>("steps")),
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
index 85ad4b6d32..bdffd2682e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
@@ -55,7 +55,7 @@ wordList adjointEikonalSolver::patchTypes() const
 
     for (const label patchi : wallPatchIDs_)
     {
-        daTypes[patchi] = zeroGradientFvPatchScalarField::typeName;
+        daTypes[patchi] = fvPatchFieldBase::zeroGradientType();
     }
 
     return daTypes;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
index 8844079cfd..3b93e7cbcf 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -320,7 +320,7 @@ void sensitivitySurface::smoothSensitivities()
         ),
         aMesh,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFaPatchField<scalar>::typeName
+        faPatchFieldBase::zeroGradientType()
     );
 
     // Copy sensitivities to area field
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
index 0dc5bd7198..82ad7014cf 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
@@ -2293,7 +2293,7 @@ tmp<volTensorField> adjointkOmegaSST::FISensitivityTerm()
             ),
             mesh_,
             dimensionedTensor(sqr(dimLength)/pow3(dimTime), Zero),
-            zeroGradientFvPatchTensorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     volTensorField& FISens = tFISens.ref();
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
index f0834d5dba..fd5ebc5992 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
@@ -171,7 +171,7 @@ Foam::cellCellStencil::createField
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     volScalarField& fld = tfld.ref();
 
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index f678ec9e25..a9f238d1c0 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -534,7 +534,7 @@ Foam::cellCellStencils::cellVolumeWeight::cellVolumeWeight
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     allowInterpolatedDonors_
     (
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index 1f49f27ff8..a6eeba364a 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -1736,7 +1736,7 @@ Foam::cellCellStencils::inverseDistance::inverseDistance
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     )
 {
     // Protect local fields from interpolation
diff --git a/src/overset/include/createCellMask.H b/src/overset/include/createCellMask.H
index 8cea239768..5ccd58ac39 100644
--- a/src/overset/include/createCellMask.H
+++ b/src/overset/include/createCellMask.H
@@ -46,8 +46,9 @@ volScalarField cellMask
         IOobject::NO_WRITE
     ),
     mesh,
-    dimensionedScalar("one", dimless, 1.0),
-    zeroGradientFvPatchScalarField::typeName
+    scalar(1),
+    dimless,
+    fvPatchFieldBase::zeroGradientType()
 );
 
 surfaceScalarField faceMask
diff --git a/src/overset/include/createInterpolatedCells.H b/src/overset/include/createInterpolatedCells.H
index a3f6d61704..881833fd43 100644
--- a/src/overset/include/createInterpolatedCells.H
+++ b/src/overset/include/createInterpolatedCells.H
@@ -46,8 +46,9 @@ volScalarField interpolatedCells
         IOobject::NO_WRITE
     ),
     mesh,
-    dimensionedScalar("one", dimless, 1.0),
-    zeroGradientFvPatchScalarField::typeName
+    scalar(1),
+    dimless,
+    fvPatchFieldBase::zeroGradientType()
 );
 
 #include "setInterpolatedCells.H"
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.C b/src/overset/oversetFvMesh/oversetFvMeshBase.C
index d297cebdc6..8182a1f927 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.C
@@ -656,7 +656,7 @@ bool Foam::oversetFvMeshBase::writeObject
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         forAll(volTypes.internalField(), cellI)
@@ -680,7 +680,7 @@ bool Foam::oversetFvMeshBase::writeObject
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         const cellCellStencilObject& overlap = Stencil::New(mesh_);
@@ -719,8 +719,9 @@ bool Foam::oversetFvMeshBase::writeObject
                 IOobject::NO_REGISTER
             ),
             mesh_,
-            dimensionedScalar("minOne", dimless, scalar(-1)),
-            zeroGradientFvPatchScalarField::typeName
+            scalar(-1),
+            dimless,
+            fvPatchFieldBase::zeroGradientType()
         );
 
         forAll(cellStencil, cellI)
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C
index baf820ab43..4c15779cc3 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C
@@ -90,7 +90,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::getSpecieMassFraction
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     auto& Ys = tY.ref();
@@ -123,8 +123,9 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::getSpecieMassFraction
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedScalar("one", dimless, scalar(1)),
-        zeroGradientFvPatchScalarField::typeName
+        scalar(1),
+        dimless,
+        fvPatchFieldBase::zeroGradientType()
     );
 }
 
@@ -156,7 +157,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::MwMixture
             dimMass/dimMoles,
             1e-3*mixture.cellMixture(0).W()
         ),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 }
 
@@ -328,7 +329,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::L
         ),
         p.mesh(),
         dimensionedScalar(dimEnergy/dimMass, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     auto& L = tmpL.ref();
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
index 3f96b5353e..e3b8208670 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
@@ -104,7 +104,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::K() const
         ),
         mesh,
         dimensionedScalar(dimLength),
-        zeroGradientFvPatchField<scalar>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     L.primitiveFieldRef() = cbrt(mesh.V());
     L.correctBoundaryConditions();
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
index aa9860f0da..c67eaa8bf1 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
@@ -104,7 +104,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::K() const
         ),
         mesh,
         dimensionedScalar(dimLength, Zero),
-        zeroGradientFvPatchField<scalar>::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     L.primitiveFieldRef() = cbrt(mesh.V());
     L.correctBoundaryConditions();
diff --git a/src/regionFaModels/KirchhoffShell/KirchhoffShell.C b/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
index fa9a645c98..cef06db82b 100644
--- a/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
+++ b/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
@@ -297,7 +297,7 @@ const tmp<areaScalarField> KirchhoffShell::rho() const
             ),
             regionMesh(),
             dimensionedScalar("rho", dimDensity, solid().rho()),
-            zeroGradientFaPatchScalarField::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
 }
diff --git a/src/regionFaModels/thermalShell/thermalShell.C b/src/regionFaModels/thermalShell/thermalShell.C
index 9d7fe5855d..43830c875f 100644
--- a/src/regionFaModels/thermalShell/thermalShell.C
+++ b/src/regionFaModels/thermalShell/thermalShell.C
@@ -199,7 +199,7 @@ const tmp<areaScalarField> thermalShell::Cp() const
             ),
             regionMesh(),
             dimensionedScalar(dimEnergy/dimTemperature/dimMass, thermo_.Cp()),
-            zeroGradientFaPatchScalarField::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
 }
@@ -222,7 +222,7 @@ const tmp<areaScalarField> thermalShell::rho() const
             ),
             regionMesh(),
             dimensionedScalar(dimDensity, thermo_.rho()),
-            zeroGradientFaPatchScalarField::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
 }
@@ -249,7 +249,7 @@ const tmp<areaScalarField> thermalShell::kappa() const
                 dimPower/dimLength/dimTemperature,
                 thermo_.kappa()
             ),
-            zeroGradientFaPatchScalarField::typeName
+            faPatchFieldBase::zeroGradientType()
         )
     );
 }
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index ff95490d56..871fdcc199 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -56,11 +56,11 @@ void Foam::regionModels::singleLayerRegion::constructMeshObjects()
                 time_.timeName(),
                 regionMesh(),
                 IOobject::READ_IF_PRESENT,
-                NO_WRITE
+                IOobject::NO_WRITE
             ),
             regionMesh(),
             dimensionedVector(dimless, Zero),
-            zeroGradientFvPatchField<vector>::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
 
@@ -75,11 +75,11 @@ void Foam::regionModels::singleLayerRegion::constructMeshObjects()
                 time_.timeName(),
                 regionMesh(),
                 IOobject::READ_IF_PRESENT,
-                NO_WRITE
+                IOobject::NO_WRITE
             ),
             regionMesh(),
             dimensionedScalar(dimArea, Zero),
-            zeroGradientFvPatchField<scalar>::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
 }
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C
index b60a9d7bb1..56cb155b31 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C
@@ -36,13 +36,14 @@ template<class Type>
 Foam::wordList
 Foam::regionModels::singleLayerRegion::mappedFieldAndInternalPatchTypes() const
 {
-    wordList bTypes(regionMesh().boundaryMesh().size());
+    wordList bTypes
+    (
+        regionMesh().boundaryMesh().size(),
+        fvPatchFieldBase::zeroGradientType()
+    );
 
-    bTypes = zeroGradientFvPatchField<Type>::typeName;
-
-    forAll(intCoupledPatchIDs_, i)
+    for (const label patchi : intCoupledPatchIDs_)
     {
-        const label patchi = intCoupledPatchIDs_[i];
         bTypes[patchi] = mappedFixedInternalValueFvPatchField<Type>::typeName;
     }
 
@@ -54,13 +55,14 @@ template<class Type>
 Foam::wordList
 Foam::regionModels::singleLayerRegion::mappedPushedFieldPatchTypes() const
 {
-    wordList bTypes(regionMesh().boundaryMesh().size());
+    wordList bTypes
+    (
+        regionMesh().boundaryMesh().size(),
+        fvPatchFieldBase::zeroGradientType()
+    );
 
-    bTypes = zeroGradientFvPatchField<Type>::typeName;
-
-    forAll(intCoupledPatchIDs_, i)
+    for (const label patchi : intCoupledPatchIDs_)
     {
-        const label patchi = intCoupledPatchIDs_[i];
         bTypes[patchi] =
             mappedFixedPushedInternalValueFvPatchField<Type>::typeName;
     }
diff --git a/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C b/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
index 0cc9c2005b..aad394213e 100644
--- a/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
+++ b/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
@@ -129,7 +129,7 @@ bool Foam::functionObjects::filmFlux::execute()
         ),
         filmMesh,
         dimensionedScalar(dimLength, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     auto& heightc = height.ref();
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 09763a0dbc..58a6beeb1b 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -468,7 +468,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimDensity, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     mu_
     (
@@ -482,7 +482,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimPressure*dimTime, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     sigma_
     (
@@ -496,7 +496,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimMass/sqr(dimTime), Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
 
     delta_
@@ -523,7 +523,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     U_
     (
@@ -548,7 +548,7 @@ kinematicSingleLayer::kinematicSingleLayer
             IOobject::NO_WRITE
         ),
         U_,
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     Uw_
     (
@@ -561,7 +561,7 @@ kinematicSingleLayer::kinematicSingleLayer
             IOobject::NO_WRITE
         ),
         U_,
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     deltaRho_
     (
@@ -575,7 +575,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(delta_.dimensions()*rho_.dimensions(), Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
 
     phi_
@@ -604,7 +604,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimMass, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     cloudMassTrans_
     (
@@ -618,7 +618,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimMass, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     cloudDiameterTrans_
     (
@@ -632,7 +632,7 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh(),
         dimensionedScalar("minus1", dimLength, -1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
 
     USp_
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index a5474ef420..11c405527a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -204,11 +204,13 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
                 "cosAngle",
                 mesh.time().timeName(),
                 mesh,
-                IOobject::NO_READ
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         volCosAngle.primitiveFieldRef() = cosAngle;
         volCosAngle.correctBoundaryConditions();
@@ -346,11 +348,13 @@ void curvatureSeparation::correct
                 "Fnet",
                 mesh.time().timeName(),
                 mesh,
-                IOobject::NO_READ
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             mesh,
             dimensionedScalar(dimForce, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         volFnet.primitiveFieldRef() = Fnet;
         volFnet.correctBoundaryConditions();
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index 0a7d3eaedc..b3c8c375a3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -85,7 +85,7 @@ standardRadiation::standardRadiation
         ),
         film.regionMesh(),
         dimensionedScalar(dimMass/pow3(dimTime), Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     beta_(coeffDict_.get<scalar>("beta")),
     kappaBar_(coeffDict_.get<scalar>("kappaBar"))
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C
index 75a9b620de..69a1a0e3be 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C
@@ -126,7 +126,7 @@ waxSolventViscosity::waxSolventViscosity
         ),
         film.regionMesh(),
         dimensionedScalar(dimDynamicViscosity, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     muWaxModel_
     (
@@ -149,7 +149,7 @@ waxSolventViscosity::waxSolventViscosity
         ),
         film.regionMesh(),
         dimensionedScalar(dimDynamicViscosity, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     muSolventModel_
     (
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
index f27a2ec32d..d9113f319e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
@@ -83,7 +83,7 @@ solidification::solidification
         ),
         film.regionMesh(),
         dimensionedScalar(dimMass, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     thickness_
     (
@@ -97,7 +97,7 @@ solidification::solidification
         ),
         film.regionMesh(),
         dimensionedScalar(dimLength, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     )
 {}
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index b792aa807e..30b5653e5f 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -331,7 +331,7 @@ thermoSingleLayer::thermoSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimEnergy/dimMass/dimTemperature, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     kappa_
     (
@@ -345,7 +345,7 @@ thermoSingleLayer::thermoSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimEnergy/dimTime/dimLength/dimTemperature, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
 
     T_
@@ -371,7 +371,7 @@ thermoSingleLayer::thermoSingleLayer
             IOobject::NO_WRITE
         ),
         T_,
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     Tw_
     (
@@ -384,7 +384,7 @@ thermoSingleLayer::thermoSingleLayer
             IOobject::NO_WRITE
         ),
         T_,
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     hs_
     (
@@ -413,7 +413,7 @@ thermoSingleLayer::thermoSingleLayer
         ),
         regionMesh(),
         dimensionedScalar(dimEnergy, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
 
     deltaWet_(coeffs_.get<scalar>("deltaWet")),

From a96dcf706bf4ea0a638991cf870bba97bcda3f8d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 13 Apr 2023 11:25:03 +0200
Subject: [PATCH 172/348] ENH: robuster handling of inv() of fields with
 singular tensors (#2724)

- replace the "one-size-fits-all" approach of tensor field inv()
  with individual 'failsafe' inverts.

  The inv() field function historically just checked the first entry
  to detect 2D cases and adjusted/readjusted *all* tensors accordingly
  (to avoid singularity tensors and/or noisy inversions).

  This seems to have worked reasonably well with 3D volume meshes, but
  breaks down for 2D area meshes, which can be axis-aligned
  differently on different sections of the mesh.
---
 applications/test/invTensor/Make/files        |   3 +
 applications/test/invTensor/Make/options      |   2 +
 applications/test/invTensor/Test-invTensor.C  |  96 ++++++++++
 .../dimensionedSymmTensor.H                   |   4 +-
 .../dimensionedTensor/dimensionedTensor.H     |   5 +-
 .../Fields/symmTensorField/symmTensorField.C  |  51 +----
 .../fields/Fields/tensorField/tensorField.C   |  51 +----
 .../primitives/SymmTensor/SymmTensor.H        |  17 +-
 .../primitives/SymmTensor/SymmTensorI.H       | 162 +++++++++-------
 .../SymmTensor/symmTensor/symmTensor.C        |   6 +-
 .../primitives/SymmTensor2D/SymmTensor2D.H    |   5 +-
 .../primitives/SymmTensor2D/SymmTensor2DI.H   |  45 +++--
 src/OpenFOAM/primitives/Tensor/Tensor.H       |  17 +-
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 177 ++++++++++--------
 .../primitives/Tensor/floats/tensor.C         |   6 +-
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H   |   5 +-
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H  |  47 +++--
 .../leastSquaresFaVectors.C                   |  22 +--
 .../invDistLeastSquaresVectors.C              |  47 +++--
 .../leastSquaresGrad/leastSquaresVectors.C    |   2 +-
 .../unweightedLeastSquaresVectors.C           |   2 +-
 21 files changed, 446 insertions(+), 326 deletions(-)
 create mode 100644 applications/test/invTensor/Make/files
 create mode 100644 applications/test/invTensor/Make/options
 create mode 100644 applications/test/invTensor/Test-invTensor.C

diff --git a/applications/test/invTensor/Make/files b/applications/test/invTensor/Make/files
new file mode 100644
index 0000000000..c99507752a
--- /dev/null
+++ b/applications/test/invTensor/Make/files
@@ -0,0 +1,3 @@
+Test-invTensor.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-invTensor
diff --git a/applications/test/invTensor/Make/options b/applications/test/invTensor/Make/options
new file mode 100644
index 0000000000..18e6fe47af
--- /dev/null
+++ b/applications/test/invTensor/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/invTensor/Test-invTensor.C b/applications/test/invTensor/Test-invTensor.C
new file mode 100644
index 0000000000..b16b7d3666
--- /dev/null
+++ b/applications/test/invTensor/Test-invTensor.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-invTensor
+
+Description
+    Tests for regular and corner cases of tensor inversion.
+
+\*---------------------------------------------------------------------------*/
+
+#include "tensor.H"
+#include "symmTensor.H"
+#include "transform.H"
+#include "unitConversion.H"
+#include "Random.H"
+#include "scalar.H"
+#include "complex.H"
+#include "sigFpe.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class TensorType>
+void test_invert(const TensorType& tt)
+{
+    Info<< pTraits<TensorType>::typeName << nl
+        << "ten : " << tt << nl;
+
+    // Non-failsafe. try/catch does not work here
+    if (tt.det() < ROOTVSMALL)
+    {
+        Info<< "inv : " << "nan/inf" << nl;
+    }
+    else
+    {
+        Info<< "inv : " << tt.inv() << nl;
+    }
+
+    // Failsafe
+    Info<< "inv : " << tt.safeInv() << nl;
+
+    Info<< nl;
+}
+
+
+// * * * * * * * * * * * * * * * Main Program  * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    // Run with FOAM_SIGFPE=true to ensure we see divide by zero
+    Foam::sigFpe::set(true);
+
+    {
+        symmTensor st(1e-3, 0, 0, 1e-3, 0, 1e-6);
+        test_invert(st);
+    }
+
+    {
+        symmTensor st(1e-3, 0, 0, 1e-3, 0, 1e-30);
+        test_invert(st);
+    }
+
+    {
+        symmTensor st(1e-3, 0, 0, 1e-3, 0, 0);
+        test_invert(st);
+    }
+
+    return 0;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H b/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
index 2d7cbf6016..a435341551 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
@@ -50,7 +50,7 @@ namespace Foam
 typedef dimensioned<symmTensor> dimensionedSymmTensor;
 
 
-// global functions
+// Global Functions
 
 dimensionedSymmTensor sqr(const dimensionedVector&);
 dimensionedSymmTensor innerSqr(const dimensionedSymmTensor&);
@@ -65,7 +65,7 @@ dimensionedSymmTensor cof(const dimensionedSymmTensor&);
 dimensionedSymmTensor inv(const dimensionedSymmTensor&);
 
 
-// global operators
+// Global Operators
 
 //- Hodge Dual operator (tensor -> vector)
 dimensionedVector operator*(const dimensionedSymmTensor&);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H b/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H
index 8de0683efe..a66aea3c07 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.H
@@ -51,8 +51,7 @@ namespace Foam
 
 typedef dimensioned<tensor> dimensionedTensor;
 
-
-// global functions
+// Global Functions
 
 dimensionedScalar tr(const dimensionedTensor&);
 dimensionedTensor dev(const dimensionedTensor&);
@@ -68,7 +67,7 @@ dimensionedVector eigenValues(const dimensionedSymmTensor&);
 dimensionedTensor eigenVectors(const dimensionedSymmTensor&);
 
 
-// global operators
+// Global Operators
 
 //- Hodge Dual operator (tensor -> vector)
 dimensionedVector operator*(const dimensionedTensor&);
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index 1be5183d4c..afdf86c186 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -51,55 +51,10 @@ UNARY_FUNCTION(symmTensor, symmTensor, dev2)
 UNARY_FUNCTION(scalar, symmTensor, det)
 UNARY_FUNCTION(symmTensor, symmTensor, cof)
 
-void inv(Field<symmTensor>& result, const UList<symmTensor>& tf1)
+void inv(Field<symmTensor>& result, const UList<symmTensor>& f1)
 {
-    if (result.empty() || tf1.empty())
-    {
-        return;
-    }
-
-    // Attempting to identify 2-D cases
-    const scalar minThreshold = SMALL * magSqr(tf1[0]);
-
-    const bool small_xx = (magSqr(tf1[0].xx()) < minThreshold);
-    const bool small_yy = (magSqr(tf1[0].yy()) < minThreshold);
-    const bool small_zz = (magSqr(tf1[0].zz()) < minThreshold);
-
-    if (small_xx || small_yy || small_zz)
-    {
-        const vector adjust
-        (
-            (small_xx ? 1 : 0),
-            (small_yy ? 1 : 0),
-            (small_zz ? 1 : 0)
-        );
-
-        // Cannot use TFOR_ALL_F_OP_FUNC_F (additional operations)
-
-        const label loopLen = (result).size();
-
-        /* pragmas... */
-        for (label i = 0; i < loopLen; ++i)
-        {
-            symmTensor work(tf1[i]);
-            work.addDiag(adjust);
-
-            result[i] = Foam::inv(work);
-            result[i].subtractDiag(adjust);
-        }
-    }
-    else
-    {
-        // Same as TFOR_ALL_F_OP_FUNC_F
-
-        const label loopLen = (result).size();
-
-        /* pragmas... */
-        for (label i = 0; i < loopLen; ++i)
-        {
-            result[i] = Foam::inv(tf1[i]);
-        }
-    }
+    // With 'failsafe' invert
+    TFOR_ALL_F_OP_F_FUNC(symmTensor, result, =, symmTensor, f1, safeInv)
 }
 
 tmp<symmTensorField> inv(const UList<symmTensor>& tf)
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index c4f76fc978..9b343fa5a0 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -50,55 +50,10 @@ UNARY_FUNCTION(tensor, tensor, dev2)
 UNARY_FUNCTION(scalar, tensor, det)
 UNARY_FUNCTION(tensor, tensor, cof)
 
-void inv(Field<tensor>& result, const UList<tensor>& tf1)
+void inv(Field<tensor>& result, const UList<tensor>& f1)
 {
-    if (result.empty() || tf1.empty())
-    {
-        return;
-    }
-
-    // Attempting to identify 2-D cases
-    const scalar minThreshold = SMALL * magSqr(tf1[0]);
-
-    const bool small_xx = (magSqr(tf1[0].xx()) < minThreshold);
-    const bool small_yy = (magSqr(tf1[0].yy()) < minThreshold);
-    const bool small_zz = (magSqr(tf1[0].zz()) < minThreshold);
-
-    if (small_xx || small_yy || small_zz)
-    {
-        const vector adjust
-        (
-            (small_xx ? 1 : 0),
-            (small_yy ? 1 : 0),
-            (small_zz ? 1 : 0)
-        );
-
-        // Cannot use TFOR_ALL_F_OP_FUNC_F (additional operations)
-
-        const label loopLen = (result).size();
-
-        /* pragmas... */
-        for (label i = 0; i < loopLen; ++i)
-        {
-            tensor work(tf1[i]);
-            work.addDiag(adjust);
-
-            result[i] = Foam::inv(work);
-            result[i].subtractDiag(adjust);
-        }
-    }
-    else
-    {
-        // Same as TFOR_ALL_F_OP_FUNC_F
-
-        const label loopLen = (result).size();
-
-        /* pragmas... */
-        for (label i = 0; i < loopLen; ++i)
-        {
-            result[i] = Foam::inv(tf1[i]);
-        }
-    }
+    // With 'failsafe' invert
+    TFOR_ALL_F_OP_F_FUNC(tensor, result, =, tensor, f1, safeInv)
 }
 
 tmp<tensorField> inv(const UList<tensor>& tf)
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index e365081023..2f38d3e481 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -245,15 +245,20 @@ public:
         //- The 2D determinant by excluding given direction
         inline Cmpt det2D(const direction excludeCmpt) const;
 
-        //- Return cofactor matrix
+        //- Return adjunct matrix (transpose of cofactor matrix)
+        inline SymmTensor<Cmpt> adjunct() const;
+
+        //- Return cofactor matrix (transpose of adjunct matrix)
         inline SymmTensor<Cmpt> cof() const;
 
-        //- Return 2D cofactor matrix by excluding given direction
-        inline SymmTensor<Cmpt> cof2D(const direction excludeCmpt) const;
+        //- Return 2D adjunct matrix by excluding given direction
+        inline SymmTensor<Cmpt> adjunct2D(const direction excludeCmpt) const;
 
-        //- Return inverse, with optional (ad hoc) failsafe handling
-        //- of 2D tensors
-        inline SymmTensor<Cmpt> inv(const bool failsafe=false) const;
+        //- Return inverse
+        inline SymmTensor<Cmpt> inv() const;
+
+        //- Return inverse, with (ad hoc) failsafe handling of 2D tensors
+        inline SymmTensor<Cmpt> safeInv() const;
 
         //- Return inverse of 2D tensor (by excluding given direction)
         inline SymmTensor<Cmpt> inv2D(const direction excludeCmpt) const;
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 47c10fa13b..5c28c6c2bc 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -272,24 +272,28 @@ inline Cmpt Foam::SymmTensor<Cmpt>::det2D(const direction excludeCmpt) const
 
 
 template<class Cmpt>
-inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::cof() const
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::adjunct() const
 {
+    // symmetric: cof() == adjunct()
     return SymmTensor<Cmpt>
     (
-        yy()*zz() - yz()*yz(),
-        xz()*yz() - xy()*zz(),
-        xy()*yz() - xz()*yy(),
-
-        xx()*zz() - xz()*xz(),
-        xy()*xz() - xx()*yz(),
-
-        xx()*yy() - xy()*xy()
+        yy()*zz() - yz()*yz(), xz()*yz() - xy()*zz(), xy()*yz() - xz()*yy(),
+                               xx()*zz() - xz()*xz(), xy()*xz() - xx()*yz(),
+                                                      xx()*yy() - xy()*xy()
     );
 }
 
 
 template<class Cmpt>
-inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::cof2D
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::cof() const
+{
+    // symmetric: cof() == adjunct()
+    return this->adjunct();
+}
+
+
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::adjunct2D
 (
     const direction excludeCmpt
 ) const
@@ -335,7 +339,84 @@ inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::inv2D
 {
     const Cmpt detval = this->det2D(excludeCmpt);
 
-    return this->cof2D(excludeCmpt).T()/detval;
+    return this->adjunct2D(excludeCmpt)/detval;
+}
+
+
+// Invert without much error handling
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::inv() const
+{
+    const Cmpt detval = this->det();
+
+    #ifdef FULLDEBUG
+    if (mag(detval) < VSMALL)
+    {
+        FatalErrorInFunction
+            << "Tensor not properly invertible, determinant:"
+            << detval << " tensor:" << *this << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->adjunct()/detval;
+}
+
+
+// Invert with some error handling
+template<class Cmpt>
+inline Foam::SymmTensor<Cmpt> Foam::SymmTensor<Cmpt>::safeInv() const
+{
+    {
+        // Attempt to identify and handle 2-D cases.
+        // - use diagSqr instead of magSqr for fewer operations
+        const scalar magSqr_xx = Foam::magSqr(xx());
+        const scalar magSqr_yy = Foam::magSqr(yy());
+        const scalar magSqr_zz = Foam::magSqr(zz());
+
+        // SMALL: 1e-15 (double), 1e-6 (float), but 1e-6 may be adequate
+
+        const scalar threshold = SMALL * (magSqr_xx + magSqr_yy + magSqr_zz);
+
+        const bool small_xx = (magSqr_xx < threshold);
+        const bool small_yy = (magSqr_yy < threshold);
+        const bool small_zz = (magSqr_zz < threshold);
+
+        if (small_xx || small_yy || small_zz)
+        {
+            SymmTensor<Cmpt> work(*this);
+
+            if (small_xx) { work.xx() += pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() += pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() += pTraits<Cmpt>::one; }
+
+            const Cmpt detval = work.det();
+
+            if (mag(detval) < ROOTVSMALL)
+            {
+                // Appears to be nearly zero - leave untouched?
+                return SymmTensor<Cmpt>(Zero);
+            }
+
+            work = work.adjunct()/detval;
+
+            if (small_xx) { work.xx() -= pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() -= pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() -= pTraits<Cmpt>::one; }
+
+            return work;
+        }
+    }
+
+    const Cmpt detval = this->det();
+
+    if (mag(detval) < ROOTVSMALL)
+    {
+        // Appears to be nearly zero - leave untouched?
+        return SymmTensor<Cmpt>(Zero);
+    }
+
+    return this->adjunct()/detval;
 }
 
 
@@ -438,7 +519,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detval)
     }
     #endif
 
-    return st.cof().T()/detval;
+    return st.adjunct()/detval;
 }
 
 
@@ -446,62 +527,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detval)
 template<class Cmpt>
 inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
 {
-    return inv(st, st.det());
-}
-
-
-template<class Cmpt>
-inline SymmTensor<Cmpt> SymmTensor<Cmpt>::inv(const bool failsafe) const
-{
-    const Cmpt detval = this->det();
-
-    if (failsafe)
-    {
-        // Attempt to identify and handle 2-D cases.
-        // - use diagSqr instead of magSqr for fewer operations
-        const scalar magSqr_xx = Foam::magSqr(xx());
-        const scalar magSqr_yy = Foam::magSqr(yy());
-        const scalar magSqr_zz = Foam::magSqr(zz());
-
-        const scalar threshold = SMALL * (magSqr_xx + magSqr_yy + magSqr_zz);
-
-        const bool small_xx = (magSqr_xx < threshold);
-        const bool small_yy = (magSqr_yy < threshold);
-        const bool small_zz = (magSqr_zz < threshold);
-
-        if (small_xx || small_yy || small_zz)
-        {
-            SymmTensor<Cmpt> work(*this);
-
-            if (small_xx) { work.xx() += pTraits<Cmpt>::one; }
-            if (small_yy) { work.yy() += pTraits<Cmpt>::one; }
-            if (small_zz) { work.zz() += pTraits<Cmpt>::one; }
-
-            work = Foam::inv(work, work.det());
-
-            if (small_xx) { work.xx() -= pTraits<Cmpt>::one; }
-            if (small_yy) { work.yy() -= pTraits<Cmpt>::one; }
-            if (small_zz) { work.zz() -= pTraits<Cmpt>::one; }
-
-            return work;
-        }
-        else if (mag(detval) < VSMALL)
-        {
-            // Really appears to be zero - leave untouched?
-            return SymmTensor<Cmpt>(Zero);
-        }
-    }
-    #ifdef FULLDEBUG
-    else if (mag(detval) < VSMALL)
-    {
-        FatalErrorInFunction
-            << "Tensor not properly invertible, determinant:"
-            << detval << " tensor:" << *this << nl
-            << abort(FatalError);
-    }
-    #endif
-
-    return this->cof().T()/detval;
+    return st.inv();
 }
 
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
index 8869e9fb56..fb41001b1f 100644
--- a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
+++ b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
@@ -340,9 +340,9 @@ Foam::tensor Foam::eigenVectors(const symmTensor& T)
 
 Foam::symmTensor Foam::pinv(const symmTensor& st)
 {
-    const scalar dt = det(st);
+    const scalar detval = st.det();
 
-    if (dt < ROOTVSMALL)
+    if (detval < ROOTVSMALL)
     {
         // Fall back to pseudo inverse
         scalarRectangularMatrix mat(3, 3);
@@ -361,7 +361,7 @@ Foam::symmTensor Foam::pinv(const symmTensor& st)
         );
     }
 
-    return inv(st, dt);
+    return Foam::inv(st, detval);
 }
 
 
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
index 1308b015e9..e70a951c9b 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H
@@ -152,7 +152,10 @@ public:
         //- The determinate
         inline Cmpt det() const;
 
-        //- Return cofactor matrix
+        //- Return adjunct matrix (transpose of cofactor matrix)
+        inline SymmTensor2D<Cmpt> adjunct() const;
+
+        //- Return cofactor matrix (transpose of adjunct matrix)
         inline SymmTensor2D<Cmpt> cof() const;
 
         //- Return inverse
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
index b583b669c5..4eba6e6cc3 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
+++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H
@@ -109,16 +109,45 @@ inline Cmpt Foam::SymmTensor2D<Cmpt>::det() const
 
 
 template<class Cmpt>
-inline Foam::SymmTensor2D<Cmpt> Foam::SymmTensor2D<Cmpt>::cof() const
+inline Foam::SymmTensor2D<Cmpt> Foam::SymmTensor2D<Cmpt>::adjunct() const
 {
+    // symmetric: cof() == adjunct()
     return SymmTensor2D<Cmpt>
     (
-        yy(), -yx(),
+        yy(), -xy(),
                xx()
     );
 }
 
 
+template<class Cmpt>
+inline Foam::SymmTensor2D<Cmpt> Foam::SymmTensor2D<Cmpt>::cof() const
+{
+    // symmetric: cof() == adjunct()
+    return this->adjunct();
+}
+
+
+// Invert without much error handling
+template<class Cmpt>
+inline Foam::SymmTensor2D<Cmpt> Foam::SymmTensor2D<Cmpt>::inv() const
+{
+    const Cmpt detval = this->det();
+
+    #ifdef FULLDEBUG
+    if (mag(detval) < SMALL)
+    {
+        FatalErrorInFunction
+            << "SymmTensor2D not properly invertible, determinant:"
+            << detval << " tensor:" << *this << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->adjunct()/detval;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -220,7 +249,7 @@ inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st, const Cmpt detval)
     }
     #endif
 
-    return st.cof().T()/detval;
+    return st.adjunct()/detval;
 }
 
 
@@ -228,15 +257,7 @@ inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st, const Cmpt detval)
 template<class Cmpt>
 inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st)
 {
-    return inv(st, st.det());
-}
-
-
-// The inverse of this SymmTensor2D
-template<class Cmpt>
-inline SymmTensor2D<Cmpt> SymmTensor2D<Cmpt>::inv() const
-{
-    return Foam::inv(*this, this->det());
+    return st.inv();
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 7391d06865..601e004416 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -287,15 +287,20 @@ public:
         //- The 2D determinant by excluding given direction
         inline Cmpt det2D(const direction excludeCmpt) const;
 
-        //- Return cofactor matrix
+        //- Return adjunct matrix (transpose of cofactor matrix)
+        inline Tensor<Cmpt> adjunct() const;
+
+        //- Return cofactor matrix (transpose of adjunct matrix)
         inline Tensor<Cmpt> cof() const;
 
-        //- Return 2D cofactor matrix by excluding given direction
-        inline Tensor<Cmpt> cof2D(const direction excludeCmpt) const;
+        //- Return 2D adjunct matrix by excluding given direction
+        inline Tensor<Cmpt> adjunct2D(const direction excludeCmpt) const;
 
-        //- Return inverse, with optional (ad hoc) failsafe handling
-        //- of 2D tensors
-        inline Tensor<Cmpt> inv(const bool failsafe=false) const;
+        //- Return inverse
+        inline Tensor<Cmpt> inv() const;
+
+        //- Return inverse, with (ad hoc) failsafe handling of 2D tensors
+        inline Tensor<Cmpt> safeInv() const;
 
         //- Return inverse of 2D tensor (by excluding given direction)
         inline Tensor<Cmpt> inv2D(const direction excludeCmpt) const;
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 6e24c0f506..b389f12ee1 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -468,27 +468,26 @@ inline Cmpt Foam::Tensor<Cmpt>::det2D(const direction excludeCmpt) const
 
 
 template<class Cmpt>
-inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof() const
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::adjunct() const
 {
     return Tensor<Cmpt>
     (
-        yy()*zz() - zy()*yz(),
-        zx()*yz() - yx()*zz(),
-        yx()*zy() - yy()*zx(),
-
-        xz()*zy() - xy()*zz(),
-        xx()*zz() - xz()*zx(),
-        xy()*zx() - xx()*zy(),
-
-        xy()*yz() - xz()*yy(),
-        yx()*xz() - xx()*yz(),
-        xx()*yy() - yx()*xy()
+        yy()*zz() - zy()*yz(), xz()*zy() - xy()*zz(), xy()*yz() - xz()*yy(),
+        zx()*yz() - yx()*zz(), xx()*zz() - xz()*zx(), yx()*xz() - xx()*yz(),
+        yx()*zy() - yy()*zx(), xy()*zx() - xx()*zy(), xx()*yy() - yx()*xy()
     );
 }
 
 
 template<class Cmpt>
-inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof2D
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof() const
+{
+    return this->adjunct().T();
+}
+
+
+template<class Cmpt>
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::adjunct2D
 (
     const direction excludeCmpt
 ) const
@@ -500,8 +499,8 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof2D
             return Tensor<Cmpt>
             (
                 Zero,  Zero,  Zero,
-                Zero,  zz(), -zy(),
-                Zero, -yz(),  yy()
+                Zero,  zz(), -yz(),
+                Zero, -zy(),  yy()
             );
         }
 
@@ -509,9 +508,9 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof2D
         {
             return Tensor<Cmpt>
             (
-                zz(), Zero, -zx(),
+                zz(), Zero, -xz(),
                 Zero, Zero,  Zero,
-               -xz(), Zero,  xx()
+               -zx(), Zero,  xx()
             );
         }
     }
@@ -519,8 +518,8 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::cof2D
     // Fall-through: Eliminate z
     return Tensor<Cmpt>
     (
-        yy(), -yx(), Zero,
-       -xy(),  xx(), Zero,
+        yy(), -xy(), Zero,
+       -yx(),  xx(), Zero,
         Zero,  Zero, Zero
     );
 }
@@ -534,7 +533,7 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::inv2D
 {
     const Cmpt detval = this->det2D(excludeCmpt);
 
-    return this->cof2D(excludeCmpt).T()/detval;
+    return this->adjunct2D(excludeCmpt)/detval;
 }
 
 
@@ -576,6 +575,84 @@ Foam::Tensor<Cmpt>::schur(const Tensor<Cmpt>& t2) const
 }
 
 
+// Invert without much error handling
+template<class Cmpt>
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::inv() const
+{
+    const Cmpt detval = this->det();
+
+    #ifdef FULLDEBUG
+    if (mag(detval) < VSMALL)
+    {
+        FatalErrorInFunction
+            << "Tensor not properly invertible, determinant:"
+            << detval << " tensor:" << *this << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->adjunct()/detval;
+}
+
+
+// Invert with some error handling
+template<class Cmpt>
+inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::safeInv() const
+{
+    {
+        // Attempt to identify and handle 2-D cases
+        // - use diagSqr instead of magSqr for fewer operations
+
+        const scalar magSqr_xx = Foam::magSqr(xx());
+        const scalar magSqr_yy = Foam::magSqr(yy());
+        const scalar magSqr_zz = Foam::magSqr(zz());
+
+        // SMALL: 1e-15 (double), 1e-6 (float), but 1e-6 may be adequate
+
+        const scalar threshold = SMALL * (magSqr_xx + magSqr_yy + magSqr_zz);
+
+        const bool small_xx = (magSqr_xx < threshold);
+        const bool small_yy = (magSqr_yy < threshold);
+        const bool small_zz = (magSqr_zz < threshold);
+
+        if (small_xx || small_yy || small_zz)
+        {
+            Tensor<Cmpt> work(*this);
+
+            if (small_xx) { work.xx() += pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() += pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() += pTraits<Cmpt>::one; }
+
+            const Cmpt detval = work.det();
+
+            if (mag(detval) < ROOTVSMALL)
+            {
+                // Appears to be nearly zero - leave untouched?
+                return Tensor<Cmpt>(Zero);
+            }
+
+            work = work.adjunct()/detval;
+
+            if (small_xx) { work.xx() -= pTraits<Cmpt>::one; }
+            if (small_yy) { work.yy() -= pTraits<Cmpt>::one; }
+            if (small_zz) { work.zz() -= pTraits<Cmpt>::one; }
+
+            return work;
+        }
+    }
+
+    const Cmpt detval = this->det();
+
+    if (mag(detval) < ROOTVSMALL)
+    {
+        // Appears to be nearly zero - leave untouched?
+        return Tensor<Cmpt>(Zero);
+    }
+
+    return this->adjunct()/detval;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -750,7 +827,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt detval)
     }
     #endif
 
-    return t.cof().T()/detval;
+    return t.adjunct()/detval;
 }
 
 
@@ -758,63 +835,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt detval)
 template<class Cmpt>
 inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
 {
-    return inv(t, t.det());
-}
-
-
-template<class Cmpt>
-inline Tensor<Cmpt> Tensor<Cmpt>::inv(const bool failsafe) const
-{
-    const Cmpt detval = this->det();
-
-    if (failsafe)
-    {
-        // Attempt to identify and handle 2-D cases
-        // - use diagSqr instead of magSqr for fewer operations
-
-        const scalar magSqr_xx = Foam::magSqr(xx());
-        const scalar magSqr_yy = Foam::magSqr(yy());
-        const scalar magSqr_zz = Foam::magSqr(zz());
-
-        const scalar threshold = SMALL * (magSqr_xx + magSqr_yy + magSqr_zz);
-
-        const bool small_xx = (magSqr_xx < threshold);
-        const bool small_yy = (magSqr_yy < threshold);
-        const bool small_zz = (magSqr_zz < threshold);
-
-        if (small_xx || small_yy || small_zz)
-        {
-            Tensor<Cmpt> work(*this);
-
-            if (small_xx) { work.xx() += pTraits<Cmpt>::one; }
-            if (small_yy) { work.yy() += pTraits<Cmpt>::one; }
-            if (small_zz) { work.zz() += pTraits<Cmpt>::one; }
-
-            work = Foam::inv(work, work.det());
-
-            if (small_xx) { work.xx() -= pTraits<Cmpt>::one; }
-            if (small_yy) { work.yy() -= pTraits<Cmpt>::one; }
-            if (small_zz) { work.zz() -= pTraits<Cmpt>::one; }
-
-            return work;
-        }
-        else if (mag(detval) < VSMALL)
-        {
-            // Really appears to be zero - leave untouched?
-            return Tensor<Cmpt>(Zero);
-        }
-    }
-    #ifdef FULLDEBUG
-    else if (mag(detval) < VSMALL)
-    {
-        FatalErrorInFunction
-            << "Tensor not properly invertible, determinant:"
-            << detval << " tensor:" << *this << nl
-            << abort(FatalError);
-    }
-    #endif
-
-    return this->cof().T()/detval;
+    return t.inv();
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/floats/tensor.C b/src/OpenFOAM/primitives/Tensor/floats/tensor.C
index dfe5851bd0..d26aad40a4 100644
--- a/src/OpenFOAM/primitives/Tensor/floats/tensor.C
+++ b/src/OpenFOAM/primitives/Tensor/floats/tensor.C
@@ -304,9 +304,9 @@ Foam::Tensor<Foam::complex> Foam::eigenVectors(const tensor& T)
 
 Foam::tensor Foam::pinv(const tensor& t)
 {
-    const scalar dt = det(t);
+    const scalar detval = t.det();
 
-    if (dt < ROOTVSMALL)
+    if (detval < ROOTVSMALL)
     {
         // Fall back to pseudo inverse
         scalarRectangularMatrix mat(3, 3);
@@ -325,7 +325,7 @@ Foam::tensor Foam::pinv(const tensor& t)
         );
     }
 
-    return inv(t, dt);
+    return Foam::inv(t, detval);
 }
 
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index f12b68104f..69f8efd091 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -212,7 +212,10 @@ public:
         //- The determinate
         inline Cmpt det() const;
 
-        //- Return cofactor matrix
+        //- Return adjunct matrix (transpose of cofactor matrix)
+        inline Tensor2D<Cmpt> adjunct() const;
+
+        //- Return cofactor matrix (transpose of adjunct matrix)
         inline Tensor2D<Cmpt> cof() const;
 
         //- Return inverse
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index 9367f4c82b..1acbb876a8 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -318,16 +318,23 @@ inline Cmpt Foam::Tensor2D<Cmpt>::det() const
 
 
 template<class Cmpt>
-inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::cof() const
+inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::adjunct() const
 {
     return Tensor2D<Cmpt>
     (
-        yy(), -yx(),
-       -xy(),  xx()
+        yy(), -xy(),
+       -yx(),  xx()
     );
 }
 
 
+template<class Cmpt>
+inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::cof() const
+{
+    return this->adjunct().T();
+}
+
+
 template<class Cmpt>
 inline Foam::Tensor2D<Cmpt>
 Foam::Tensor2D<Cmpt>::inner(const Tensor2D<Cmpt>& t2) const
@@ -359,6 +366,26 @@ Foam::Tensor2D<Cmpt>::schur(const Tensor2D<Cmpt>& t2) const
 }
 
 
+// Invert without much error handling
+template<class Cmpt>
+inline Foam::Tensor2D<Cmpt> Foam::Tensor2D<Cmpt>::inv() const
+{
+    const Cmpt detval = this->det();
+
+    #ifdef FULLDEBUG
+    if (mag(detval) < SMALL)
+    {
+        FatalErrorInFunction
+            << "SymmTensor2D not properly invertible, determinant:"
+            << detval << " tensor:" << *this << nl
+            << abort(FatalError);
+    }
+    #endif
+
+    return this->adjunct()/detval;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Cmpt>
@@ -463,7 +490,7 @@ inline Cmpt det(const Tensor2D<Cmpt>& t)
 }
 
 
-//- Return the cofactor Tensor2D of a Tensor2D
+//- Return the cofactor of a Tensor2D
 template<class Cmpt>
 inline Tensor2D<Cmpt> cof(const Tensor2D<Cmpt>& t)
 {
@@ -485,7 +512,7 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt detval)
     }
     #endif
 
-    return t.cof().T()/detval;
+    return t.adjunct()/detval;
 }
 
 
@@ -493,15 +520,7 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt detval)
 template<class Cmpt>
 inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t)
 {
-    return inv(t, t.det());
-}
-
-
-// Return the inverse of this Tensor2D
-template<class Cmpt>
-inline Tensor2D<Cmpt> Tensor2D<Cmpt>::inv() const
-{
-    return Foam::inv(*this, this->det());
+    return t.inv();
 }
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
index f2bd352bbd..e40618b0a0 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
@@ -148,26 +148,8 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
     }
 
 
-    // Invert the dd tensor.
-
-    // Cannot rely on the usual field inv() since that only uses the
-    // first element to guess if the remaining tensors are 2D (or
-    // singular). We, however, can have a mixture (eg, skipping over
-    // zero-length edges can yield a zero). Instead use the
-    // 'failsafe' inv() that checks each tensor (#2724)
-
-    // Fragile:  const symmTensorField invDd(inv(dd));
-
-    symmTensorField invDd(dd.size());
-    {
-        const label loopLen = dd.size();
-
-        /* pragmas... */
-        for (label i = 0; i < loopLen; ++i)
-        {
-            invDd[i] = dd[i].inv(true);  // With 'failsafe' handling
-        }
-    }
+    // Invert the dd tensors - including failsafe checks
+    const symmTensorField invDd(inv(dd));
 
 
     // Revisit all faces and calculate the lsP and lsN vectors
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
index 5bfe9a515f..584968db7d 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
@@ -104,14 +104,17 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
         const label nei = neighbour[facei];
 
         const vector d(C[nei] - C[own]);
-        const symmTensor wdd(sqr(d)/magSqr(d));
-        dd[own] += wdd;
-        dd[nei] += wdd;
+        const scalar magSqrDist = d.magSqr();
+
+        if (magSqrDist > ROOTVSMALL)
+        {
+            const symmTensor wdd(sqr(d)/magSqrDist);
+            dd[own] += wdd;
+            dd[nei] += wdd;
+        }
     }
 
-
-    surfaceVectorField::Boundary& blsP =
-        pVectors_.boundaryField();
+    auto& blsP = pVectors_.boundaryField();
 
     forAll(blsP, patchi)
     {
@@ -126,13 +129,17 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
         forAll(pd, patchFacei)
         {
             const vector& d = pd[patchFacei];
+            const scalar magSqrDist = d.magSqr();
 
-            dd[faceCells[patchFacei]] += sqr(d)/magSqr(d);
+            if (magSqrDist > ROOTVSMALL)
+            {
+                dd[faceCells[patchFacei]] += sqr(d)/magSqrDist;
+            }
         }
     }
 
 
-    // Invert the dd tensor
+    // Invert the dd tensors - including failsafe checks
     const symmTensorField invDd(inv(dd));
 
 
@@ -143,9 +150,18 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
         const label nei = neighbour[facei];
 
         const vector d(C[nei] - C[own]);
+        const scalar magSqrDist = d.magSqr();
 
-        pVectors_[facei] = (invDd[own] & d)/magSqr(d);
-        nVectors_[facei] = -(invDd[nei] & d)/magSqr(d);
+        if (magSqrDist > ROOTVSMALL)
+        {
+            pVectors_[facei] = (invDd[own] & d)/magSqrDist;
+            nVectors_[facei] = -(invDd[nei] & d)/magSqrDist;
+        }
+        else
+        {
+            pVectors_[facei] = Zero;
+            nVectors_[facei] = Zero;
+        }
     }
 
     forAll(blsP, patchi)
@@ -161,8 +177,17 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
         forAll(pd, patchFacei)
         {
             const vector& d = pd[patchFacei];
+            const scalar magSqrDist = d.magSqr();
 
-            patchLsP[patchFacei] = (invDd[faceCells[patchFacei]] & d)/magSqr(d);
+            if (magSqrDist > ROOTVSMALL)
+            {
+                patchLsP[patchFacei] =
+                    (invDd[faceCells[patchFacei]] & d)/magSqrDist;
+            }
+            else
+            {
+                patchLsP[patchFacei] = Zero;
+            }
         }
     }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 40dfc42445..c8f5b01051 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -151,7 +151,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
     }
 
 
-    // Invert the dd tensor
+    // Invert the dd tensors - including failsafe checks
     const symmTensorField invDd(inv(dd));
 
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
index 20c8bf5406..c19c1ba86b 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
@@ -129,7 +129,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
     }
 
 
-    // Invert the dd tensor
+    // Invert the dd tensors - including failsafe checks
     const symmTensorField invDd(inv(dd));
 
 

From 2cf200aef46b7bfdfe4a951d1d92502e3bc54188 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 13 Apr 2023 18:03:53 +0200
Subject: [PATCH 173/348] ENH: more consistent min edge lengths (finite-area)

- for robustness with small edges (which can occur with snappy meshes),
  the Le() and magLe() are limited to SMALL (commit a0f1e98d2474).
  Now use factor sqrt(1/3) in the components to maintain magnitude of 1.

ENH: add fvMesh::unitSf() and faMesh::unitLe() methods

- simple wrappers around Sf()/magSf() and Le()/magLe() but with
  the potential for additional/alternative corrections.

STYLE: thisDb() in faMesh code to simplify future changes in storage

ENH: do not register finite-area geometric fields

- consistent with finite-volume treatment
---
 .../constraint/processor/processorPolyPatch.C |   9 +-
 .../constraint/processor/processorPolyPatch.H |  20 +-
 src/finiteArea/faMesh/faMesh.C                |  20 +-
 src/finiteArea/faMesh/faMesh.H                |   5 +-
 .../faMesh/faMeshDemandDrivenData.C           | 173 ++++++++++++------
 .../constraint/processor/processorFaPatch.C   |  20 +-
 .../constraint/processor/processorFaPatch.H   |  11 +-
 .../faMesh/faPatches/faPatch/faPatch.C        |   8 +-
 .../faMesh/faPatches/faPatch/faPatch.H        |   6 +-
 src/finiteArea/finiteArea/fac/facAverage.C    |   2 +-
 .../leastSquaresFaVectors.C                   |  11 +-
 .../schemes/NVDscheme/faNVDscheme.C           |   6 +-
 src/finiteVolume/fvMesh/fvMesh.H              |   3 +
 src/finiteVolume/fvMesh/fvMeshGeometry.C      |  24 +++
 .../constraint/processor/processorFvPatch.H   |   2 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.C        |  18 +-
 .../fvMesh/fvPatches/fvPatch/fvPatch.H        |  11 +-
 17 files changed, 233 insertions(+), 116 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index c805f018f6..6c042881e0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -244,9 +244,8 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
         // Calculate normals from areas and check
         forAll(faceNormals, facei)
         {
-            scalar magSf = mag(faceAreas()[facei]);
-            scalar nbrMagSf = mag(neighbFaceAreas_[facei]);
-            scalar avSf = (magSf + nbrMagSf)/2.0;
+            const scalar magSf = mag(faceAreas()[facei]);
+            const scalar nbrMagSf = mag(neighbFaceAreas_[facei]);
 
             // For small face area calculation the results of the area
             // calculation have been found to only be accurate to ~1e-20
@@ -260,6 +259,8 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
             }
             else if (mag(magSf - nbrMagSf) > matchTolerance()*sqr(tols[facei]))
             {
+                const scalar avgMagSf = 0.5*(magSf + nbrMagSf);
+
                 fileName nm
                 (
                     boundaryMesh().mesh().time().path()
@@ -295,7 +296,7 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
 
                 FatalErrorInFunction
                     << "face " << facei << " area does not match neighbour by "
-                    << 100*mag(magSf - nbrMagSf)/avSf
+                    << 100*mag(magSf - nbrMagSf)/avgMagSf
                     << "% -- possible face ordering problem." << endl
                     << "patch:" << name()
                     << " my area:" << magSf
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index aa8cce2933..ea445773ce 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorPolyPatch_H
-#define processorPolyPatch_H
+#ifndef Foam_processorPolyPatch_H
+#define Foam_processorPolyPatch_H
 
 #include "coupledPolyPatch.H"
 #include "polyBoundaryMesh.H"
@@ -60,7 +60,7 @@ class processorPolyPatch
 :
     public coupledPolyPatch
 {
-    // Private data
+    // Private Data
 
         int myProcNo_;
         int neighbProcNo_;
@@ -255,17 +255,17 @@ public:
         //- Return true only if this is a parallel run
         virtual bool coupled() const
         {
-            return Pstream::parRun();
+            return UPstream::parRun();
         }
 
         //- Return processor number
-        int myProcNo() const
+        int myProcNo() const noexcept
         {
             return myProcNo_;
         }
 
         //- Return neighbour processor number
-        int neighbProcNo() const
+        int neighbProcNo() const noexcept
         {
             return neighbProcNo_;
         }
@@ -291,19 +291,19 @@ public:
         );
 
         //- Return processor-neighbour patch face centres
-        const vectorField& neighbFaceCentres() const
+        const vectorField& neighbFaceCentres() const noexcept
         {
             return neighbFaceCentres_;
         }
 
         //- Return processor-neighbour patch face areas
-        const vectorField& neighbFaceAreas() const
+        const vectorField& neighbFaceAreas() const noexcept
         {
             return neighbFaceAreas_;
         }
 
         //- Return processor-neighbour patch neighbour cell centres
-        const vectorField& neighbFaceCellCentres() const
+        const vectorField& neighbFaceCellCentres() const noexcept
         {
             return neighbFaceCellCentres_;
         }
@@ -317,7 +317,7 @@ public:
         //- Return message tag to use for communication
         virtual int tag() const
         {
-            return Pstream::msgType();
+            return UPstream::msgType();
         }
 
         //- Return communicator used for communication
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index 46719c6b86..cf953b574c 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -353,7 +353,7 @@ Foam::faMesh::faMesh
             "faceLabels",
             time().findInstance(meshDir(), "faceLabels"),
             faMesh::meshSubDir,
-            mesh(),
+            faMesh::thisDb(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
@@ -372,7 +372,7 @@ Foam::faMesh::faMesh
                 faceLabels_.instance()
             ),
             faMesh::meshSubDir,
-            mesh(),
+            faMesh::thisDb(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         ),
@@ -425,7 +425,7 @@ Foam::faMesh::faMesh
                 "S0",
                 time().timeName(),
                 faMesh::meshSubDir,
-                mesh(),
+                faMesh::thisDb(),
                 IOobject::MUST_READ,
                 IOobject::AUTO_WRITE
             ),
@@ -464,7 +464,7 @@ Foam::faMesh::faMesh
             "faceLabels",
             mesh().facesInstance(),
             faMesh::meshSubDir,
-            mesh(),
+            faMesh::thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -477,7 +477,7 @@ Foam::faMesh::faMesh
             "faBoundary",
             mesh().facesInstance(),
             faMesh::meshSubDir,
-            mesh(),
+            faMesh::thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -545,7 +545,7 @@ Foam::faMesh::faMesh
             "faceLabels",
             mesh().facesInstance(),
             faMesh::meshSubDir,
-            mesh(),
+            faMesh::thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -558,7 +558,7 @@ Foam::faMesh::faMesh
             "faBoundary",
             mesh().facesInstance(),
             faMesh::meshSubDir,
-            mesh(),
+            faMesh::thisDb(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -672,7 +672,7 @@ Foam::faMesh::faMesh
                 "S0",
                 time().timeName(),
                 faMesh::meshSubDir,
-                mesh(),
+                faMesh::thisDb(),
                 IOobject::MUST_READ,
                 IOobject::AUTO_WRITE
             ),
@@ -857,7 +857,7 @@ Foam::faMesh::S00() const
             (
                 "S00",
                 time().timeName(),
-                mesh(),
+                faMesh::thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
@@ -985,7 +985,7 @@ bool Foam::faMesh::movePoints()
                 (
                     "S0",
                     time().timeName(),
-                    mesh(),
+                    faMesh::thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
                     IOobject::NO_REGISTER
diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H
index a512b9de59..0c4d3f8890 100644
--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@@ -817,7 +817,7 @@ public:
         bool hasAreaCentres() const noexcept { return bool(faceCentresPtr_); }
 
         //- Has edge centres: edgeCentres()
-        bool hasAdgeCentres() const noexcept { return bool(edgeCentresPtr_); }
+        bool hasEdgeCentres() const noexcept { return bool(edgeCentresPtr_); }
 
         //- Has edge length vectors: Le()
         bool hasLe() const noexcept { return bool(LePtr_); }
@@ -897,6 +897,9 @@ public:
             //- Return edge length magnitudes
             const edgeScalarField& magLe() const;
 
+            //- Return normalised edge length vectors
+            tmp<edgeVectorField> unitLe() const;
+
             //- Return face centres as areaVectorField
             const areaVectorField& areaCentres() const;
 
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index 3775a314ad..9d7b41c162 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -333,6 +333,32 @@ static inline vector calcLeVector
 } // End namespace Foam
 
 
+namespace Foam
+{
+
+// Impose a minimum (edge) vector length
+// - disallow any mag(vec) < SMALL
+static inline void imposeMinVectorLength(vectorField& fld)
+{
+    // If it is small, no orientation information reasonably possible
+    // so use a vector(1,1,1) * sqrt(1/3)*min-length
+
+    // sqrt(1/3) = 0.5773502691896257, but slightly rounded down
+    const vector minVector(vector::uniform(0.57735*SMALL));
+    const scalar minLenSqr(SMALL*SMALL);
+
+    for (vector& v : fld)
+    {
+        if (v.magSqr() < minLenSqr)
+        {
+            v = minVector;
+        }
+    }
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
@@ -628,14 +654,10 @@ Foam::tmp<Foam::vectorField> Foam::faMesh::calcRawEdgeNormals(int order) const
 
         edgeNormals[edgei].removeCollinear(edgeLine.unitVec());
         edgeNormals[edgei].normalise();
-
-        // Do not allow any mag(val) < SMALL
-        if (edgeNormals[edgei].magSqr() < ROOTSMALL)
-        {
-            edgeNormals[edgei] = vector::uniform(SMALL);
-        }
     }
 
+    imposeMinVectorLength(edgeNormals);
+
     return tedgeNormals;
 }
 
@@ -659,8 +681,11 @@ void Foam::faMesh::calcLe() const
             (
                 "Le",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimLength
@@ -691,12 +716,6 @@ void Foam::faMesh::calcLe() const
                     edges_[edgei].line(localPoints),
                     edgeNormals[edgei]
                 );
-
-                // Do not allow any mag(val) < SMALL
-                if (fld[edgei].magSqr() < ROOTSMALL)
-                {
-                    fld[edgei] = vector::uniform(SMALL);
-                }
             }
         }
 
@@ -720,16 +739,24 @@ void Foam::faMesh::calcLe() const
                     bndEdgeNormals[patchEdgei]
                 );
 
-                // Do not allow any mag(val) < SMALL
-                if (pfld[patchEdgei].magSqr() < ROOTSMALL)
-                {
-                    pfld[patchEdgei] = vector::uniform(SMALL);
-                }
-
                 ++edgei;
             }
         }
     }
+
+
+    // Impose a minimum (edge) vector length
+
+    // Internal (edge vector)
+    {
+        imposeMinVectorLength(Le.primitiveFieldRef());
+    }
+
+    // Boundary (edge vector)
+    for (vectorField& pfld : Le.boundaryFieldRef())
+    {
+        imposeMinVectorLength(pfld);
+    }
 }
 
 
@@ -752,8 +779,11 @@ void Foam::faMesh::calcMagLe() const
             (
                 "magLe",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimLength
@@ -825,8 +855,11 @@ void Foam::faMesh::calcFaceCentres() const
             (
                 "centres",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimLength
@@ -904,8 +937,11 @@ void Foam::faMesh::calcEdgeCentres() const
             (
                 "edgeCentres",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimLength
@@ -965,9 +1001,10 @@ void Foam::faMesh::calcS() const
         (
             "S",
             time().timeName(),
-            mesh(),
+            faMesh::thisDb(),
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         ),
         *this,
         dimArea
@@ -1037,8 +1074,11 @@ void Foam::faMesh::calcFaceAreaNormals() const
             (
                 "faceAreaNormals",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimless
@@ -1073,14 +1113,7 @@ void Foam::faMesh::calcFaceAreaNormals() const
         // Make unit normals
         fld.normalise();
 
-        for (auto& f : fld)
-        {
-            // Do not allow any mag(val) < SMALL
-            if (f.magSqr() < ROOTSMALL)
-            {
-                f = vector::uniform(SMALL);
-            }
-        }
+        imposeMinVectorLength(fld);
     }
 
 
@@ -1122,8 +1155,11 @@ void Foam::faMesh::calcEdgeAreaNormals() const
             (
                 "edgeAreaNormals",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimless
@@ -1194,13 +1230,9 @@ void Foam::faMesh::calcEdgeAreaNormals() const
 
             fld[edgei].removeCollinear(edgeLine.unitVec());
             fld[edgei].normalise();
-
-            // Do not allow any mag(val) < SMALL
-            if (fld[edgei].magSqr() < ROOTSMALL)
-            {
-                fld[edgei] = vector::uniform(SMALL);
-            }
         }
+
+        imposeMinVectorLength(fld);
     }
 
     // Boundary
@@ -1226,13 +1258,9 @@ void Foam::faMesh::calcEdgeAreaNormals() const
 
                 pfld[patchEdgei].removeCollinear(edgeLine.unitVec());
                 pfld[patchEdgei].normalise();
-
-                // Do not allow any mag(val) < SMALL
-                if (pfld[patchEdgei].magSqr() < ROOTSMALL)
-                {
-                    pfld[patchEdgei] = vector::uniform(SMALL);
-                }
             }
+
+            imposeMinVectorLength(pfld);
         }
     }
 }
@@ -1257,8 +1285,11 @@ void Foam::faMesh::calcFaceCurvatures() const
             (
                 "faceCurvatures",
                 mesh().pointsInstance(),
-                meshSubDir,
-                mesh()
+                faMesh::meshSubDir,
+                faMesh::thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
             dimless/dimLength
@@ -2291,8 +2322,11 @@ Foam::tmp<Foam::edgeScalarField> Foam::faMesh::edgeLengthCorrection() const
         (
             "edgeLengthCorrection",
             mesh().pointsInstance(),
-            meshSubDir,
-            mesh()
+            faMesh::meshSubDir,
+            faMesh::thisDb(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         ),
         *this,
         dimless
@@ -2350,4 +2384,31 @@ Foam::tmp<Foam::edgeScalarField> Foam::faMesh::edgeLengthCorrection() const
 }
 
 
+Foam::tmp<Foam::edgeVectorField> Foam::faMesh::unitLe() const
+{
+    auto tunitVectors = tmp<edgeVectorField>::New
+    (
+        IOobject
+        (
+            "unit(Le)",
+            mesh().pointsInstance(),
+            faMesh::meshSubDir,
+            faMesh::thisDb(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
+        ),
+        *this,
+        dimless,
+        (this->Le() / this->magLe())
+    );
+
+    // The above is not quite correct when a min-length limiter
+    // has been imposed on both Le() and magLe() fields
+
+    // tunitVectors.ref().oriented() = this->Le().oriented();
+    return tunitVectors;
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
index 0dab3f8636..3404034980 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C
@@ -235,7 +235,7 @@ void Foam::processorFaPatch::calcGeometry(PstreamBuffers& pBufs)
             edgeCentres(),
             neighbEdgeCentres_,
             edgeNormals(),
-            neighbEdgeLengths_/mag(neighbEdgeLengths_)
+            neighbEdgeNormals()
         );
     }
 }
@@ -364,6 +364,14 @@ void Foam::processorFaPatch::updateMesh(PstreamBuffers& pBufs)
 }
 
 
+Foam::tmp<Foam::vectorField> Foam::processorFaPatch::neighbEdgeNormals() const
+{
+    auto tresult = tmp<vectorField>::New(neighbEdgeLengths_);
+    tresult.ref().normalise();
+    return tresult;
+}
+
+
 const Foam::labelList& Foam::processorFaPatch::neighbPoints() const
 {
     if (!neighbPointsPtr_)
@@ -394,14 +402,8 @@ void Foam::processorFaPatch::makeWeights(scalarField& w) const
         // The face normals point in the opposite direction on the other side
         scalarField neighbEdgeCentresCn
         (
-            (
-                neighbEdgeLengths()
-               /(mag(neighbEdgeLengths()) + VSMALL)
-            )
-          & (
-              neighbEdgeCentres()
-            - neighbEdgeFaceCentres()
-            )
+            neighbEdgeNormals()
+          & (neighbEdgeCentres() - neighbEdgeFaceCentres())
         );
 
         w = neighbEdgeCentresCn/
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
index 8a15653964..6bcf0b05f9 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
@@ -191,7 +191,7 @@ public:
         //- Return true if running parallel
         virtual bool coupled() const
         {
-            return Pstream::parRun();
+            return UPstream::parRun();
         }
 
         //- Does this side own the patch ?
@@ -222,19 +222,22 @@ public:
 
 
         //- Return processor-neighbour patch edge centres
-        const vectorField& neighbEdgeCentres() const
+        const vectorField& neighbEdgeCentres() const noexcept
         {
             return neighbEdgeCentres_;
         }
 
         //- Return processor-neighbour patch edge lengths
-        const vectorField& neighbEdgeLengths() const
+        const vectorField& neighbEdgeLengths() const noexcept
         {
             return neighbEdgeLengths_;
         }
 
+        //- Return processor-neighbour patch edge unit normals
+        tmp<vectorField> neighbEdgeNormals() const;
+
         //- Return processor-neighbour patch neighbour face centres
-        const vectorField& neighbEdgeFaceCentres() const
+        const vectorField& neighbEdgeFaceCentres() const noexcept
         {
             return neighbEdgeFaceCentres_;
         }
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
index 578c943b59..06e6b1e64a 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C
@@ -493,11 +493,15 @@ Foam::tmp<Foam::vectorField> Foam::faPatch::delta() const
     vectorField edgePN(edgeCentres() - edgeFaceCentres());
 
     // Do not allow any mag(val) < SMALL
+    // sqrt(1/3) = 0.5773502691896257, but slightly rounded down
+    const vector minVector(vector::uniform(0.57735*SMALL));
+    const scalar minLenSqr(SMALL*SMALL);
+
     for (vector& e : edgePN)
     {
-        if (e.magSqr() < ROOTSMALL)
+        if (e.magSqr() < minLenSqr)
         {
-            e = vector::uniform(SMALL);
+            e = minVector;
         }
     }
 
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
index ae8670da53..e0f41c84f5 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.H
@@ -387,13 +387,13 @@ public:
             //- Return edge centres
             const vectorField& edgeCentres() const;
 
-            //- Return edge length vectors
+            //- Return edge length vectors, like the faMesh::Le() method
             const vectorField& edgeLengths() const;
 
-            //- Return edge length magnitudes
+            //- Return edge length magnitudes, like the faMesh::magLe() method
             const scalarField& magEdgeLengths() const;
 
-            //- Return edge normals
+            //- Return edge unit normals, like the faMesh::unitLe() method
             tmp<vectorField> edgeNormals() const;
 
             //- Return neighbour face centres
diff --git a/src/finiteArea/finiteArea/fac/facAverage.C b/src/finiteArea/finiteArea/fac/facAverage.C
index 57c4e78bbb..4fe75926ed 100644
--- a/src/finiteArea/finiteArea/fac/facAverage.C
+++ b/src/finiteArea/finiteArea/fac/facAverage.C
@@ -58,7 +58,7 @@ average
             (
                 "average("+ssf.name()+')',
                 ssf.instance(),
-                mesh(),
+                mesh.thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
index e40618b0a0..3421ea6379 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C
@@ -108,6 +108,9 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
     // Set up temporary storage for the dd tensor (before inversion)
     symmTensorField dd(mesh().nFaces(), Zero);
 
+    // No contribution when mag(val) < SMALL
+    const scalar minLenSqr(SMALL*SMALL);
+
     forAll(owner, facei)
     {
         const label own = owner[facei];
@@ -117,7 +120,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
 
         // No contribution when mag(val) < SMALL
         const scalar magSqrDist = d.magSqr();
-        if (magSqrDist > ROOTSMALL)
+        if (magSqrDist >= minLenSqr)
         {
             const symmTensor wdd(sqr(d)/magSqrDist);
             dd[own] += wdd;
@@ -140,7 +143,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
 
             // No contribution when mag(val) < SMALL
             const scalar magSqrDist = d.magSqr();
-            if (magSqrDist > ROOTSMALL)
+            if (magSqrDist >= minLenSqr)
             {
                 dd[edgeFaces[patchFacei]] += sqr(d)/magSqrDist;
             }
@@ -162,7 +165,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
 
         // No contribution when mag(val) < SMALL
         const scalar magSqrDist = d.magSqr();
-        if (magSqrDist > ROOTSMALL)
+        if (magSqrDist >= minLenSqr)
         {
             lsP[facei] = (invDd[own] & d)/magSqrDist;
             lsN[facei] = -(invDd[nei] & d)/magSqrDist;
@@ -189,7 +192,7 @@ void Foam::leastSquaresFaVectors::makeLeastSquaresVectors() const
 
             // No contribution when mag(val) < SMALL
             const scalar magSqrDist = d.magSqr();
-            if (magSqrDist > ROOTSMALL)
+            if (magSqrDist >= minLenSqr)
             {
                 patchLsP[patchFacei] =
                     (invDd[edgeFaces[patchFacei]] & d)/magSqrDist;
diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
index fe444ea02b..79380f7324 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
+++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
@@ -108,10 +108,11 @@ Foam::tmp<Foam::edgeScalarField> Foam::faNVDscheme<Type,NVDweight>::weights
         d.normalise();
         d *= mesh.edgeInterpolation::lPN().internalField()[edge];
 
-        // Do not allow any mag(val) < SMALL
+        // No zero-length vectors (after normalise)
         if (d.magSqr() < ROOTSMALL)
         {
             d = vector::uniform(SMALL);
+            // OR: d = vector::uniform(0.57735*SMALL);
         }
 
         weights[edge] =
@@ -195,10 +196,11 @@ Foam::tmp<Foam::edgeScalarField> Foam::faNVDscheme<Type,NVDweight>::weights
                 d.normalise();
                 d *= pLPN[edgeI];
 
-                // Do not allow any mag(val) < SMALL
+                // No zero-length vectors (after normalise)
                 if (d.magSqr() < ROOTSMALL)
                 {
                     d = vector::uniform(SMALL);
+                    // OR: d = vector::uniform(0.57735*SMALL);
                 }
 
                 pWeights[edgeI] =
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 1d0d9b1fa2..5d7adc7abe 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -451,6 +451,9 @@ public:
             //- Return cell face area magnitudes
             const surfaceScalarField& magSf() const;
 
+            //- Return cell face unit normals
+            tmp<surfaceVectorField> unitSf() const;
+
             //- Return cell face motion fluxes
             const surfaceScalarField& phi() const;
 
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 132d09f651..e7afa733b1 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -326,6 +326,30 @@ const Foam::surfaceScalarField& Foam::fvMesh::magSf() const
 }
 
 
+Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::unitSf() const
+{
+    auto tunitVectors = tmp<surfaceVectorField>::New
+    (
+        IOobject
+        (
+            "unit(Sf)",
+            pointsInstance(),
+            meshSubDir,
+            *this,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
+        ),
+        *this,
+        dimless,
+        (this->Sf() / this->magSf())
+    );
+
+    tunitVectors.ref().oriented() = this->Sf().oriented();
+    return tunitVectors;
+}
+
+
 const Foam::volVectorField& Foam::fvMesh::C() const
 {
     if (!CPtr_)
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
index 03934add2b..2a10a68dc3 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
@@ -114,7 +114,7 @@ public:
         //- Return true if running parallel
         virtual bool coupled() const
         {
-            return Pstream::parRun();
+            return UPstream::parRun();
         }
 
         const processorPolyPatch& procPolyPatch() const
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index e286fbc5df..29ab100b94 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -129,12 +129,6 @@ Foam::tmp<Foam::vectorField> Foam::fvPatch::Cn() const
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::fvPatch::nf() const
-{
-    return Sf()/magSf();
-}
-
-
 const Foam::vectorField& Foam::fvPatch::Sf() const
 {
     return boundaryMesh().mesh().Sf().boundaryField()[index()];
@@ -147,6 +141,18 @@ const Foam::scalarField& Foam::fvPatch::magSf() const
 }
 
 
+Foam::tmp<Foam::vectorField> Foam::fvPatch::unitSf() const
+{
+    return Sf()/magSf();
+}
+
+
+Foam::tmp<Foam::vectorField> Foam::fvPatch::nf() const
+{
+    return Sf()/magSf();
+}
+
+
 Foam::tmp<Foam::vectorField> Foam::fvPatch::delta() const
 {
     // Use patch-normal delta for all non-coupled BCs
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 537eec7c9c..37eb54806d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -249,13 +249,18 @@ public:
             //- Return neighbour cell centres
             tmp<vectorField> Cn() const;
 
-            //- Return face area vectors
+            //- Return face area vectors, like the fvMesh::Sf() method
             const vectorField& Sf() const;
 
-            //- Return face area magnitudes
+            //- Return face area magnitudes, like the fvMesh::magSf() method
             const scalarField& magSf() const;
 
-            //- Return face normals
+            //- Return face unit normals, like the fvMesh::unitSf() method.
+            //- Same as nf().
+            tmp<vectorField> unitSf() const;
+
+            //- Return face unit normals, like the fvMesh::unitSf() method
+            //- Same as unitSf().
             tmp<vectorField> nf() const;
 
             //- Return cell-centre to face-centre vector

From 74db18a9c3a54c045a51080b7d9ac9caa0c2a463 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Apr 2023 15:00:03 +0200
Subject: [PATCH 174/348] ENH: add interface code for MPI_Allgather

COMP: incorrect macro declaration for mpiGather/mpiScatter
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 13 ++-
 src/Pstream/dummy/UPstream.C                  |  2 +-
 src/Pstream/dummy/UPstreamGatherScatter.C     | 14 ++-
 src/Pstream/mpi/UPstream.C                    |  6 +-
 src/Pstream/mpi/UPstreamGatherScatter.C       | 18 +++-
 src/Pstream/mpi/UPstreamWrapping.H            | 14 +++
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 99 +++++++++++++++++++
 7 files changed, 157 insertions(+), 9 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 395ac02160..8fcd0ba7dc 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -900,7 +900,7 @@ public:
         (                                                                     \
             const Native* sendData,                                           \
             int sendCount,                                                    \
-            char* recvData,                                                   \
+            Native* recvData,                                                 \
             int recvCount,                                                    \
             const label communicator = worldComm                              \
         );                                                                    \
@@ -910,10 +910,19 @@ public:
         (                                                                     \
             const Native* sendData,                                           \
             int sendCount,                                                    \
-            char* recvData,                                                   \
+            Native* recvData,                                                 \
             int recvCount,                                                    \
             const label communicator = worldComm                              \
         );                                                                    \
+                                                                              \
+        /*! \brief Gather/scatter identically-sized \c Native data */         \
+        /*! Send data from proc slot, receive into all slots */               \
+        static void mpiAllGather                                              \
+        (                                                                     \
+            Native* allData,                                                  \
+            int count,                                                        \
+            const label communicator = worldComm                              \
+        );
 
         Pstream_CommonRoutines(char);
 
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 2368e9e899..c9f74eca1d 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -97,7 +97,7 @@ Foam::UPstream::probeMessage
     const UPstream::commsTypes commsType,
     const int fromProcNo,
     const int tag,
-    const label comm
+    const label communicator
 )
 {
     return std::pair<int,int>(-1, 0);
diff --git a/src/Pstream/dummy/UPstreamGatherScatter.C b/src/Pstream/dummy/UPstreamGatherScatter.C
index 3a5f54e901..7d2e2d63f9 100644
--- a/src/Pstream/dummy/UPstreamGatherScatter.C
+++ b/src/Pstream/dummy/UPstreamGatherScatter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,7 @@ License
 
 #undef  Pstream_CommonRoutines
 #define Pstream_CommonRoutines(Native)                                        \
+                                                                              \
 void Foam::UPstream::mpiGather                                                \
 (                                                                             \
     const Native* sendData,                                                   \
@@ -57,7 +58,16 @@ void Foam::UPstream::mpiScatter                                               \
 )                                                                             \
 {                                                                             \
     std::memmove(recvData, sendData, recvCount*sizeof(Native));               \
-}
+}                                                                             \
+                                                                              \
+                                                                              \
+void Foam::UPstream::mpiAllGather                                             \
+(                                                                             \
+    Native* allData,                                                          \
+    int count,                                                                \
+    const label comm                                                          \
+)                                                                             \
+{}
 
 Pstream_CommonRoutines(char);
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 19587ccd90..2be5913e71 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -748,7 +748,7 @@ Foam::UPstream::probeMessage
     const UPstream::commsTypes commsType,
     const int fromProcNo,
     const int tag,
-    const label comm
+    const label communicator
 )
 {
     std::pair<int,int> result(-1, 0);
@@ -775,7 +775,7 @@ Foam::UPstream::probeMessage
             (
                 source,
                 tag,
-                PstreamGlobals::MPICommunicators_[comm],
+                PstreamGlobals::MPICommunicators_[communicator],
                 &status
             )
         )
@@ -799,7 +799,7 @@ Foam::UPstream::probeMessage
             (
                 source,
                 tag,
-                PstreamGlobals::MPICommunicators_[comm],
+                PstreamGlobals::MPICommunicators_[communicator],
                 &flag,
                 &status
             )
diff --git a/src/Pstream/mpi/UPstreamGatherScatter.C b/src/Pstream/mpi/UPstreamGatherScatter.C
index 4937be2e1d..180a98b9a3 100644
--- a/src/Pstream/mpi/UPstreamGatherScatter.C
+++ b/src/Pstream/mpi/UPstreamGatherScatter.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,7 @@ License
 
 #undef  Pstream_CommonRoutines
 #define Pstream_CommonRoutines(Native, TaggedType)                            \
+                                                                              \
 void Foam::UPstream::mpiGather                                                \
 (                                                                             \
     const Native* sendData,                                                   \
@@ -67,6 +68,21 @@ void Foam::UPstream::mpiScatter                                               \
         sendData, sendCount, recvData, recvCount,                             \
         TaggedType, comm                                                      \
     );                                                                        \
+}                                                                             \
+                                                                              \
+                                                                              \
+void Foam::UPstream::mpiAllGather                                             \
+(                                                                             \
+    Native* allData,                                                          \
+    int count,                                                                \
+    const label comm                                                          \
+)                                                                             \
+{                                                                             \
+    PstreamDetail::allGather                                                  \
+    (                                                                         \
+        allData, count,                                                       \
+        TaggedType, comm                                                      \
+    );                                                                        \
 }
 
 Pstream_CommonRoutines(char, MPI_BYTE);
diff --git a/src/Pstream/mpi/UPstreamWrapping.H b/src/Pstream/mpi/UPstreamWrapping.H
index 125da4defd..92791503e0 100644
--- a/src/Pstream/mpi/UPstreamWrapping.H
+++ b/src/Pstream/mpi/UPstreamWrapping.H
@@ -230,6 +230,20 @@ void scatterv
 );
 
 
+// MPI_Allgather or MPI_Iallgather
+template<class Type>
+void allGather
+(
+    Type* allData,                      // The send/recv data
+    int count,                          // The send/recv count per element
+
+    MPI_Datatype datatype,              // The send/recv data type
+    const label comm,                   // Communicator
+    UPstream::Request* req = nullptr,   // Non-null for non-blocking
+    label* requestID = nullptr          // (alternative to UPstream::Request)
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace PstreamDetail
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index f19507e857..fba6933a17 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -1366,4 +1366,103 @@ void Foam::PstreamDetail::scatterv
 }
 
 
+template<class Type>
+void Foam::PstreamDetail::allGather
+(
+    Type* allData,
+    int count,
+
+    MPI_Datatype datatype,
+    const label comm,
+
+    UPstream::Request* req,
+    label* requestID
+)
+{
+    PstreamGlobals::reset_request(req, requestID);
+
+    const bool immediate = (req || requestID);
+
+    if (!UPstream::parRun() || UPstream::nProcs(comm) < 2)
+    {
+        // Nothing to do - ignore
+        return;
+    }
+
+    const label numProc = UPstream::nProcs(comm);
+
+    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    {
+        if (immediate)
+        {
+            Pout<< "** MPI_Iallgather (non-blocking):";
+        }
+        else
+        {
+            Pout<< "** MPI_Allgather (blocking):";
+        }
+        Pout<< " numProc:" << numProc
+            << " with comm:" << comm
+            << " warnComm:" << UPstream::warnComm
+            << endl;
+        error::printStack(Pout);
+    }
+
+    bool handled(false);
+
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
+    if (immediate)
+    {
+        profilingPstream::beginTiming();
+
+        handled = true;
+        MPI_Request request;
+
+        if
+        (
+            MPI_Iallgather
+            (
+                MPI_IN_PLACE, count, MPI_BYTE,
+                allData, count, MPI_BYTE,
+                PstreamGlobals::MPICommunicators_[comm],
+               &request
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Iallgather [comm: " << comm << "] failed."
+                << Foam::abort(FatalError);
+        }
+
+        PstreamGlobals::push_request(request, req, requestID);
+        profilingPstream::addRequestTime();
+    }
+#endif
+
+    if (!handled)
+    {
+        profilingPstream::beginTiming();
+
+        if
+        (
+            MPI_Allgather
+            (
+                MPI_IN_PLACE, count, MPI_BYTE,
+                allData, count, MPI_BYTE,
+                PstreamGlobals::MPICommunicators_[comm]
+            )
+        )
+        {
+            FatalErrorInFunction
+                << "MPI_Allgather [comm: " << comm << "] failed."
+                << Foam::abort(FatalError);
+        }
+
+        // Is actually gather/scatter but we can't split it apart
+        profilingPstream::addGatherTime();
+    }
+}
+
+
 // ************************************************************************* //

From b277b913cf351793b5afbbf7ea8a5f0381863026 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Apr 2023 15:00:03 +0200
Subject: [PATCH 175/348] ENH: add guards for partially populated communicators

- these are primarily when encountering sparse (eg, inter-host)
  communicators. Additional UPstream convenience methods:

  is_rank(comm)
    => True if process corresponds to a rank in the communicators.
       Can be a master rank or a sub-rank.

  is_parallel(comm)
    => True if parallel algorithm or exchange is used on the process.
       same as

           (parRun() && (nProcs(comm) > 1) && is_rank(comm))
---
 .../test/parallel-comm2/Test-parallel-comm2.C |  8 +-
 .../db/IOstreams/Pstreams/PstreamBroadcast.C  | 45 ++++-----
 .../IOstreams/Pstreams/PstreamCombineGather.C | 20 ++--
 .../db/IOstreams/Pstreams/PstreamExchange.C   | 39 ++++++--
 .../Pstreams/PstreamExchangeConsensus.C       | 29 +++---
 .../db/IOstreams/Pstreams/PstreamGather.C     |  4 +-
 .../db/IOstreams/Pstreams/PstreamGatherList.C | 26 +++--
 .../db/IOstreams/Pstreams/PstreamReduceOps.H  |  4 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 49 +++++-----
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 56 ++++++-----
 .../db/IOstreams/Pstreams/UPstreamTemplates.C | 18 ++--
 src/Pstream/mpi/UPstream.C                    |  8 +-
 src/Pstream/mpi/UPstreamBroadcast.C           |  4 +-
 src/Pstream/mpi/UPstreamReduce.C              |  2 +-
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 97 +++++++++++++------
 15 files changed, 257 insertions(+), 152 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 53b8fc3e5e..7f5a4afa5a 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -52,8 +52,8 @@ void rankInfo(const label comm)
         << "(parent:" << UPstream::parent(comm) << ')'
         << " rank:" << ranki
         << "(sub:" << UPstream::is_subrank(comm)
-        << ") nProcs:" << UPstream::nProcs(comm)
-        << " baseProcNo:" << UPstream::baseProcNo(comm, ranki);
+        << ") nProcs:" << UPstream::nProcs(comm);
+      // << " baseProcNo:" << UPstream::baseProcNo(comm, ranki);
 }
 
 
@@ -82,8 +82,10 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     Info<< nl
+        << "parallel:" << UPstream::parRun()
         << "nProcs = " << UPstream::nProcs()
-        << " with " << UPstream::nComms() << " predefined comm(s)" << nl;
+        << " with " << UPstream::nComms() << " predefined comm(s)."
+        << " proc:" << UPstream::myProcNo() << nl;
 
     Info<< nl;
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBroadcast.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBroadcast.C
index 5532260412..98c2486337 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBroadcast.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBroadcast.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,31 +34,28 @@ License
 template<class Type>
 void Foam::Pstream::broadcast(Type& value, const label comm)
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (is_contiguous<Type>::value)
     {
-        if (is_contiguous<Type>::value)
+        // Note: contains parallel guard internally
+        UPstream::broadcast
+        (
+            reinterpret_cast<char*>(&value),
+            sizeof(Type),
+            comm,
+            UPstream::masterNo()
+        );
+    }
+    else if (UPstream::is_parallel(comm))
+    {
+        if (UPstream::master(comm))
         {
-            // Note: contains parallel guard internally as well
-            UPstream::broadcast
-            (
-                reinterpret_cast<char*>(&value),
-                sizeof(Type),
-                comm,
-                UPstream::masterNo()
-            );
+            OPBstream os(UPstream::masterNo(), comm);
+            os << value;
         }
-        else
+        else  // UPstream::is_subrank(comm)
         {
-            if (UPstream::master(comm))
-            {
-                OPBstream os(UPstream::masterNo(), comm);
-                os << value;
-            }
-            else
-            {
-                IPBstream is(UPstream::masterNo(), comm);
-                is >> value;
-            }
+            IPBstream is(UPstream::masterNo(), comm);
+            is >> value;
         }
     }
 }
@@ -67,14 +64,14 @@ void Foam::Pstream::broadcast(Type& value, const label comm)
 template<class Type, class... Args>
 void Foam::Pstream::broadcasts(const label comm, Type& arg1, Args&&... args)
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         if (UPstream::master(comm))
         {
             OPBstream os(UPstream::masterNo(), comm);
             Detail::outputLoop(os, arg1, std::forward<Args>(args)...);
         }
-        else
+        else  // UPstream::is_subrank(comm)
         {
             IPBstream is(UPstream::masterNo(), comm);
             Detail::inputLoop(is, arg1, std::forward<Args>(args)...);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C
index 8460e33a73..41d427635b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineGather.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,7 @@ void Foam::Pstream::combineGather
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -155,7 +155,7 @@ void Foam::Pstream::combineScatter
     #ifndef Foam_Pstream_scatter_nobroadcast
     Pstream::broadcast(value, comm);
     #else
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const UPstream::commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -290,7 +290,7 @@ void Foam::Pstream::combineReduce
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         const auto& comms = UPstream::whichCommunication(comm);
 
@@ -312,7 +312,7 @@ void Foam::Pstream::listCombineGather
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -420,7 +420,7 @@ void Foam::Pstream::listCombineScatter
     #ifndef Foam_Pstream_scatter_nobroadcast
     Pstream::broadcast(values, comm);
     #else
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const UPstream::commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -540,7 +540,7 @@ void Foam::Pstream::listCombineReduce
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         const auto& comms = UPstream::whichCommunication(comm);
 
@@ -562,7 +562,7 @@ void Foam::Pstream::mapCombineGather
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -645,7 +645,7 @@ void Foam::Pstream::mapCombineScatter
     #ifndef Foam_Pstream_scatter_nobroadcast
     Pstream::broadcast(values, comm);
     #else
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const UPstream::commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -746,7 +746,7 @@ void Foam::Pstream::mapCombineReduce
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         const auto& comms = UPstream::whichCommunication(comm);
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index 6c590d76d8..ff6eeab4d4 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -469,6 +469,11 @@ void Foam::Pstream::exchange
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
 
+    if (!UPstream::is_rank(comm))
+    {
+        return;  // Process not in communicator
+    }
+
     const label myProci = UPstream::myProcNo(comm);
     const label numProcs = UPstream::nProcs(comm);
 
@@ -482,7 +487,7 @@ void Foam::Pstream::exchange
 
     recvBufs.resize_nocopy(numProcs);
 
-    if (UPstream::parRun() && numProcs > 1)
+    if (UPstream::is_parallel(comm))
     {
         // Presize all receive buffers
         forAll(recvSizes, proci)
@@ -567,7 +572,7 @@ void Foam::Pstream::exchange
         }
     }
 
-    // Do myself
+    // Do myself. Already checked if in communicator
     recvBufs[myProci] = sendBufs[myProci];
 }
 
@@ -586,7 +591,6 @@ void Foam::Pstream::exchange
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
 
     const int myProci = UPstream::myProcNo(comm);
-    const label numProcs = UPstream::nProcs(comm);
 
     // Initial: clear out receive 'slots'
     // Preferrable to clear out the map entries instead of the map itself
@@ -598,7 +602,7 @@ void Foam::Pstream::exchange
         iter.val().clear();
     }
 
-    if (UPstream::parRun() && numProcs > 1)
+    if (UPstream::is_parallel(comm))
     {
         // Presize all receive buffers
         forAllIters(recvSizes, iter)
@@ -708,8 +712,8 @@ void Foam::Pstream::exchange
         }
     }
 
-
-    // Do myself
+    // Do myself (if actually in the communicator)
+    if (UPstream::is_rank(comm))
     {
         const auto iter = sendBufs.find(myProci);
 
@@ -746,6 +750,12 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
+    if (!UPstream::is_rank(comm))
+    {
+        recvSizes.clear();
+        return;  // Process not in communicator
+    }
+
     const label myProci = UPstream::myProcNo(comm);
     const label numProcs = UPstream::nProcs(comm);
 
@@ -817,6 +827,12 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
+    if (!UPstream::is_rank(comm))
+    {
+        recvSizes.clear();
+        return;  // Process not in communicator
+    }
+
     Pstream::exchangeSizes<Container>
     (
         neighProcs,  // send
@@ -842,6 +858,11 @@ void Foam::Pstream::exchangeSizes
     Map<label> sendSizes(2*sendBufs.size());
     recvSizes.clear();  // Done in allToAllConsensus too, but be explicit here
 
+    if (!UPstream::is_rank(comm))
+    {
+        return;  // Process not in communicator
+    }
+
     forAllConstIters(sendBufs, iter)
     {
         const label proci = iter.key();
@@ -871,6 +892,12 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
+    if (!UPstream::is_rank(comm))
+    {
+        recvSizes.clear();
+        return;  // Process not in communicator
+    }
+
     const label numProcs = UPstream::nProcs(comm);
 
     if (sendBufs.size() != numProcs)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
index 5a9ff54349..cb529246a7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
@@ -80,6 +80,18 @@ void exchangeConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
+    // Initial: clear all receive information
+    for (auto& buf : recvBufs)
+    {
+        buf.clear();
+    }
+    recvSizes = Zero;
+
+    if (!UPstream::is_rank(comm))
+    {
+        return;  // Process not in communicator
+    }
+
     // #ifdef FULLDEBUG
     if (sendBufs.size() > numProc)
     {
@@ -95,14 +107,7 @@ void exchangeConsensus
     }
     // #endif
 
-    // Initial: clear all receive information
-    for (auto& buf : recvBufs)
-    {
-        buf.clear();
-    }
-    recvSizes = Zero;
-
-    if (!UPstream::parRun() || numProc < 2)
+    if (!UPstream::is_parallel(comm))
     {
         // Do myself
         recvBufs[myProci] = sendBufs[myProci];
@@ -252,7 +257,6 @@ void exchangeConsensus
 
     const label startOfRequests = UPstream::nRequests();
     const label myProci = UPstream::myProcNo(comm);
-    const label numProc = UPstream::nProcs(comm);
 
     // Initial: clear out receive 'slots'
     // Preferrable to clear out the map entries instead of the map itself
@@ -264,7 +268,7 @@ void exchangeConsensus
         iter.val().clear();
     }
 
-    if (!UPstream::parRun() || numProc < 2)
+    if (!UPstream::is_parallel(comm))
     {
         // Do myself
         const auto iter = sendBufs.find(myProci);
@@ -293,10 +297,11 @@ void exchangeConsensus
         const auto& sendData = iter.val();
 
         #ifdef FULLDEBUG
-        if (proci >= numProc)
+        if (proci >= UPstream::nProcs(comm))
         {
             FatalErrorInFunction
-                << "Send buffer:" << proci << " >= numProcs:" << numProc
+                << "Send buffer:" << proci << " >= numProcs:"
+                << UPstream::nProcs(comm)
                 << Foam::abort(FatalError);
         }
         #endif
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGather.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGather.C
index 3317663ef8..daeb052876 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGather.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGather.C
@@ -48,7 +48,7 @@ void Foam::Pstream::gather
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -130,7 +130,7 @@ void Foam::Pstream::scatter
     #ifndef Foam_Pstream_scatter_nobroadcast
     Pstream::broadcast(value, comm);
     #else
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         // My communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
index 785f6aedf2..ef4a344692 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,13 +51,12 @@ void Foam::Pstream::gatherList
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         if (values.size() != UPstream::nProcs(comm))
         {
             FatalErrorInFunction
-                << "Size of list:" << values.size()
-                << " does not equal the number of processors:"
+                << "Size of list:" << values.size() << " != numProcs:"
                 << UPstream::nProcs(comm)
                 << Foam::abort(FatalError);
         }
@@ -200,7 +199,7 @@ void Foam::Pstream::scatterList
     // between scatterList() and using broadcast(List<T>&) or a regular
     // scatter(List<T>&) is that processor-local data is skipped.
 
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
         if (values.size() != UPstream::nProcs(comm))
         {
@@ -349,8 +348,23 @@ void Foam::Pstream::allGatherList
     const label comm
 )
 {
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
+    if (UPstream::is_parallel(comm))
     {
+        // TBD
+        // if (std::is_arithmetic<T>::value)   // or is_contiguous ?
+        // {
+        //     if (values.size() != UPstream::nProcs(comm))
+        //     {
+        //         FatalErrorInFunction
+        //             << "Size of list:" << values.size()
+        //             << " != number of processors:"
+        //             << UPstream::nProcs(comm)
+        //             << Foam::abort(FatalError);
+        //     }
+        //     UPstream::mpiAllGather(values.data_bytes(), sizeof(T), comm);
+        //     return;
+        // }
+
         const auto& comms = UPstream::whichCommunication(comm);
 
         Pstream::gatherList(comms, values, tag, comm);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index 0bcf41e9ca..ce96c9a9fd 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -79,7 +79,7 @@ void reduce
     const label comm = UPstream::worldComm
 )
 {
-    if (UPstream::parRun())
+    if (UPstream::is_parallel(comm))
     {
         Foam::reduce(UPstream::whichCommunication(comm), value, bop, tag, comm);
     }
@@ -375,7 +375,7 @@ void sumReduce
     const label comm = UPstream::worldComm
 )
 {
-    if (UPstream::parRun())
+    if (UPstream::is_parallel(comm))
     {
         Foam::reduce(value, sumOp<T>(), tag, comm);
         Foam::reduce(count, sumOp<label>(), tag, comm);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 6fc66f9021..e14bcfc066 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -142,12 +142,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
 }
 
 
-Foam::label Foam::UPstream::allocateCommunicator
-(
-    const label parentIndex,
-    const labelUList& subRanks,
-    const bool doPstream
-)
+Foam::label Foam::UPstream::getAvailableCommIndex(const label parentIndex)
 {
     label index;
     if (!freeComms_.empty())
@@ -177,16 +172,29 @@ Foam::label Foam::UPstream::allocateCommunicator
         treeCommunication_.emplace_back();
     }
 
+    return index;
+}
+
+
+Foam::label Foam::UPstream::allocateCommunicator
+(
+    const label parentIndex,
+    const labelUList& subRanks,
+    const bool doPstream
+)
+{
+    const label index = getAvailableCommIndex(parentIndex);
+
     if (debug)
     {
-        Pout<< "Communicators : Allocating communicator " << index << endl
-            << "    parent : " << parentIndex << endl
-            << "    procs  : " << subRanks << endl
+        Pout<< "Allocating communicator " << index << nl
+            << "    parent : " << parentIndex << nl
+            << "    procs  : " << subRanks << nl
             << endl;
     }
 
-    // Initialise; overwritten by allocatePstreamCommunicator
-    myProcNo_[index] = 0;
+    // Initially treat as master, overwritten by allocatePstreamCommunicator
+    myProcNo_[index] = UPstream::masterNo();
 
     // The selected sub-ranks.
     // - transcribe from label to int. Treat negative values as 'ignore'
@@ -222,10 +230,6 @@ Foam::label Foam::UPstream::allocateCommunicator
 
     procIds.resize(numSubRanks);
 
-    // Size but do not fill structure - this is done on-the-fly
-    linearCommunication_[index] = List<commsStruct>(numSubRanks);
-    treeCommunication_[index] = List<commsStruct>(numSubRanks);
-
     if (doPstream && parRun())
     {
         allocatePstreamCommunicator(parentIndex, index);
@@ -243,16 +247,15 @@ Foam::label Foam::UPstream::allocateCommunicator
         ///         myProcNo_[index] = -(myProcNo_[parentIndex]+1);
         ///     }
         /// }
-
-        // Did communicator allocation adjust procIDs_ as well?
-        if (numSubRanks != procIDs_[index].size())
-        {
-            numSubRanks = procIDs_[index].size();
-            linearCommunication_[index] = List<commsStruct>(numSubRanks);
-            treeCommunication_[index] = List<commsStruct>(numSubRanks);
-        }
     }
 
+    // In case communicator allocation adjusted procIDs_
+    numSubRanks = procIDs_[index].size();
+
+    // Size but do not fill structure - this is done on-the-fly
+    linearCommunication_[index] = List<commsStruct>(numSubRanks);
+    treeCommunication_[index] = List<commsStruct>(numSubRanks);
+
     return index;
 }
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 8fcd0ba7dc..5030e9cef0 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -90,10 +90,8 @@ public:
 
     // Public Classes
 
-        // Forward Declarations
-
         //- Wrapper for MPI_Request
-        class Request;
+        class Request;  // Forward Declaration
 
         //- Structure for communicating between processors
         class commsStruct
@@ -237,6 +235,9 @@ private:
         //- Set data for parallel running
         static void setParRun(const label nProcs, const bool haveThreads);
 
+        //- Initialise entries for new communicator. Return the index
+        static label getAvailableCommIndex(const label parentIndex);
+
         //- Allocate a communicator with index
         static void allocatePstreamCommunicator
         (
@@ -621,46 +622,57 @@ public:
 
         //- Test if this a parallel run
         //  Modify access is deprecated
-        static bool& parRun() noexcept
-        {
-            return parRun_;
-        }
+        static bool& parRun() noexcept { return parRun_; }
 
         //- Have support for threads
-        static bool haveThreads() noexcept
-        {
-            return haveThreads_;
-        }
+        static bool haveThreads() noexcept { return haveThreads_; }
 
-        //- Number of ranks in parallel run (for given communicator)
-        //- is 1 for serial run
+        //- Relative rank for the master process - is always 0.
+        static constexpr int masterNo() noexcept { return 0; }
+
+        //- Number of ranks in parallel run (for given communicator).
+        //- It is 1 for serial run
         static label nProcs(const label communicator = worldComm)
         {
             return procIDs_[communicator].size();
         }
 
-        //- Process index of the master (always 0)
-        static constexpr int masterNo() noexcept
+        //- Rank of this process in the communicator (starting from masterNo()).
+        //- Can be negative if the process is not a rank in the communicator
+        static int myProcNo(const label communicator = worldComm)
         {
-            return 0;
+            return myProcNo_[communicator];
         }
 
-        //- Am I the master rank
+        //- True if process corresponds to the master rank in the communicator
         static bool master(const label communicator = worldComm)
         {
             return myProcNo_[communicator] == masterNo();
         }
 
-        //- Is this process a sub-rank on the communicator
+        //- True if process corresponds to any rank (master or sub-rank)
+        //- in the given communicator
+        static bool is_rank(const label communicator = worldComm)
+        {
+            return myProcNo_[communicator] >= 0;
+        }
+
+        //- True if process corresponds to a sub-rank in the given communicator
         static bool is_subrank(const label communicator = worldComm)
         {
             return myProcNo_[communicator] > masterNo();
         }
 
-        //- Number of this process (starting from masterNo() = 0)
-        static int myProcNo(const label communicator = worldComm)
+        //- True if parallel algorithm or exchange is required.
+        //  This is when parRun() == true, the process corresponds to a rank
+        //  in the communicator and there is more than one rank in the
+        //  communicator
+        static bool is_parallel(const label communicator = worldComm)
         {
-            return myProcNo_[communicator];
+            return
+            (
+                parRun_ && is_rank(communicator) && nProcs(communicator) > 1
+            );
         }
 
         //- The parent communicator
@@ -669,7 +681,7 @@ public:
             return parentComm_(communicator);
         }
 
-        //- Process IDs within a given communicator
+        //- The list of ranks within a given communicator
         static List<int>& procID(const label communicator)
         {
             return procIDs_[communicator];
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C
index 54a102f845..a6b99f6ce9 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,10 @@ Foam::List<T> Foam::UPstream::listGatherValues
 
     List<T> allValues;
 
-    const label nproc = (UPstream::parRun() ? UPstream::nProcs(comm) : 1);
+    const label nproc =
+    (
+        UPstream::is_parallel(comm) ? UPstream::nProcs(comm) : 1
+    );
 
     if (nproc > 1)
     {
@@ -88,7 +91,10 @@ T Foam::UPstream::listScatterValues
     }
 
 
-    const label nproc = (UPstream::parRun() ? UPstream::nProcs(comm) : 1);
+    const label nproc =
+    (
+        UPstream::is_parallel(comm) ? UPstream::nProcs(comm) : 1
+    );
 
     T localValue;
 
@@ -115,13 +121,13 @@ T Foam::UPstream::listScatterValues
     {
         // non-parallel: return local value
 
-        if (allValues.empty())   // Extra safety
+        if (UPstream::is_rank(comm) && !allValues.empty())
         {
-            localValue = Zero;
+            localValue = allValues[0];
         }
         else
         {
-            localValue = allValues[0];
+            localValue = Zero;
         }
      }
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 2be5913e71..576626ab51 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -696,9 +696,10 @@ void Foam::UPstream::freePstreamCommunicator(const label index)
 
 void Foam::UPstream::barrier(const label communicator, UPstream::Request* req)
 {
-    // No-op for non-parallel
-    if (!UPstream::parRun())
+    // No-op for non-parallel or not on communicator
+    if (!UPstream::parRun() || !UPstream::is_rank(communicator))
     {
+        PstreamGlobals::reset_request(req);
         return;
     }
 
@@ -753,7 +754,8 @@ Foam::UPstream::probeMessage
 {
     std::pair<int,int> result(-1, 0);
 
-    if (!UPstream::parRun())
+    // No-op for non-parallel or not on communicator
+    if (!UPstream::parRun() || !UPstream::is_rank(communicator))
     {
         return result;
     }
diff --git a/src/Pstream/mpi/UPstreamBroadcast.C b/src/Pstream/mpi/UPstreamBroadcast.C
index f5044970c7..522ce5032e 100644
--- a/src/Pstream/mpi/UPstreamBroadcast.C
+++ b/src/Pstream/mpi/UPstreamBroadcast.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ bool Foam::UPstream::broadcast
     const int rootProcNo
 )
 {
-    if (!UPstream::parRun() || UPstream::nProcs(comm) < 2)
+    if (!UPstream::is_parallel(comm))
     {
         // Nothing to do - ignore
         return true;
diff --git a/src/Pstream/mpi/UPstreamReduce.C b/src/Pstream/mpi/UPstreamReduce.C
index 5314dd17ce..b9d526fd02 100644
--- a/src/Pstream/mpi/UPstreamReduce.C
+++ b/src/Pstream/mpi/UPstreamReduce.C
@@ -247,7 +247,7 @@ void Foam::sumReduce                                                          \
     const label comm                                                          \
 )                                                                             \
 {                                                                             \
-    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)                     \
+    if (UPstream::is_parallel(comm))                                          \
     {                                                                         \
         Native values[2];                                                     \
         values[0] = static_cast<Native>(count);                               \
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index fba6933a17..53695b43b1 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -42,7 +42,7 @@ void Foam::PstreamDetail::broadcast0
     const label comm
 )
 {
-    if (!UPstream::parRun())
+    if (!UPstream::is_parallel(comm))
     {
         return;
     }
@@ -73,7 +73,7 @@ void Foam::PstreamDetail::reduce0
     const label comm
 )
 {
-    if (!UPstream::parRun())
+    if (!UPstream::is_parallel(comm))
     {
         return;
     }
@@ -127,13 +127,13 @@ void Foam::PstreamDetail::allReduce
 {
     PstreamGlobals::reset_request(req, requestID);
 
-    if (!UPstream::parRun())
+    const bool immediate = (req || requestID);
+
+    if (!UPstream::is_parallel(comm))
     {
         return;
     }
 
-    const bool immediate = (req || requestID);
-
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
@@ -238,6 +238,11 @@ void Foam::PstreamDetail::allToAll
 
     const bool immediate = (req || requestID);
 
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+
     const label numProc = UPstream::nProcs(comm);
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
@@ -258,7 +263,10 @@ void Foam::PstreamDetail::allToAll
         error::printStack(Pout);
     }
 
-    if (sendData.size() != numProc || recvData.size() != numProc)
+    if
+    (
+        (sendData.size() != numProc || recvData.size() != numProc)
+    )
     {
         FatalErrorInFunction
             << "Have " << numProc << " ranks, but size of sendData:"
@@ -267,7 +275,7 @@ void Foam::PstreamDetail::allToAll
             << Foam::abort(FatalError);
     }
 
-    if (!UPstream::parRun() || numProc < 2)
+    if (!UPstream::is_parallel(comm))
     {
         recvData.deepCopy(sendData);
         return;
@@ -365,6 +373,11 @@ void Foam::PstreamDetail::allToAllv
 
     const bool immediate = (req || requestID);
 
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
@@ -400,7 +413,7 @@ void Foam::PstreamDetail::allToAllv
             << Foam::abort(FatalError);
     }
 
-    if (!UPstream::parRun())
+    if (!UPstream::is_parallel(comm))
     {
         if (recvCounts[0] != sendCounts[0])
         {
@@ -502,6 +515,11 @@ void Foam::PstreamDetail::allToAllConsensus
     const label comm
 )
 {
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
@@ -529,7 +547,7 @@ void Foam::PstreamDetail::allToAllConsensus
     const Type zeroValue = pTraits<Type>::zero;
     recvData = zeroValue;
 
-    if (!UPstream::parRun() || numProc < 2)
+    if (!UPstream::is_parallel(comm))
     {
         // deep copy
         recvData.deepCopy(sendData);
@@ -691,6 +709,11 @@ void Foam::PstreamDetail::allToAllConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         Pout<< "** non-blocking consensus Alltoall (map):";
@@ -706,7 +729,7 @@ void Foam::PstreamDetail::allToAllConsensus
     const Type zeroValue = pTraits<Type>::zero;
     recvBufs.clear();
 
-    if (!UPstream::parRun() || numProc < 2)
+    if (!UPstream::is_parallel(comm))
     {
         // Do myself
         const auto iter = sendBufs.find(myProci);
@@ -873,15 +896,19 @@ void Foam::PstreamDetail::gather
 {
     PstreamGlobals::reset_request(req, requestID);
 
-    if (!UPstream::parRun())
+    const bool immediate = (req || requestID);
+
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+    if (!UPstream::is_parallel(comm))
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
         return;
     }
 
-    const bool immediate = (req || requestID);
-
-    const label np = UPstream::nProcs(comm);
+    const label numProc = UPstream::nProcs(comm);
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
@@ -893,7 +920,7 @@ void Foam::PstreamDetail::gather
         {
             Pout<< "** MPI_Gather (blocking):";
         }
-        Pout<< " np:" << np
+        Pout<< " numProc:" << numProc
             << " recvCount:" << recvCount
             << " with comm:" << comm
             << " warnComm:" << UPstream::warnComm
@@ -989,15 +1016,19 @@ void Foam::PstreamDetail::scatter
 {
     PstreamGlobals::reset_request(req, requestID);
 
-    if (!UPstream::parRun())
+    const bool immediate = (req || requestID);
+
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+    if (!UPstream::is_parallel(comm))
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
         return;
     }
 
-    const bool immediate = (req || requestID);
-
-    const label np = UPstream::nProcs(comm);
+    const label numProc = UPstream::nProcs(comm);
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
@@ -1009,7 +1040,7 @@ void Foam::PstreamDetail::scatter
         {
             Pout<< "** MPI_Scatter (blocking):";
         }
-        Pout<< " np:" << np
+        Pout<< " numProc:" << numProc
             << " recvCount:" << recvCount
             << " with comm:" << comm
             << " warnComm:" << UPstream::warnComm
@@ -1106,15 +1137,19 @@ void Foam::PstreamDetail::gatherv
 {
     PstreamGlobals::reset_request(req, requestID);
 
-    if (!UPstream::parRun())
+    const bool immediate = (req || requestID);
+
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+    if (!UPstream::is_parallel(comm))
     {
         // recvCounts[0] may be invalid - use sendCount instead
         std::memmove(recvData, sendData, sendCount*sizeof(Type));
         return;
     }
 
-    const bool immediate = (req || requestID);
-
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
@@ -1249,14 +1284,18 @@ void Foam::PstreamDetail::scatterv
 {
     PstreamGlobals::reset_request(req, requestID);
 
-    if (!UPstream::parRun())
+    const bool immediate = (req || requestID);
+
+    if (!UPstream::is_rank(comm))
+    {
+        return;
+    }
+    if (!UPstream::is_parallel(comm))
     {
         std::memmove(recvData, sendData, recvCount*sizeof(Type));
         return;
     }
 
-    const bool immediate = (req || requestID);
-
     const label np = UPstream::nProcs(comm);
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
@@ -1383,14 +1422,12 @@ void Foam::PstreamDetail::allGather
 
     const bool immediate = (req || requestID);
 
-    if (!UPstream::parRun() || UPstream::nProcs(comm) < 2)
+    if (!UPstream::is_parallel(comm))
     {
         // Nothing to do - ignore
         return;
     }
 
-    const label numProc = UPstream::nProcs(comm);
-
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
         if (immediate)
@@ -1401,7 +1438,7 @@ void Foam::PstreamDetail::allGather
         {
             Pout<< "** MPI_Allgather (blocking):";
         }
-        Pout<< " numProc:" << numProc
+        Pout<< " numProc:" << UPstream::nProcs(comm)
             << " with comm:" << comm
             << " warnComm:" << UPstream::warnComm
             << endl;

From 9d3427e0b4ad967ca2574c63cde0160773099888 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Apr 2023 15:00:03 +0200
Subject: [PATCH 176/348] ENH: consolidate UPstream::commsStruct code

- make sizing of commsStruct List demand-driven as well
  for more robustness, fewer unneeded allocations.

- fix potential latent bug with allBelow/allNotBelow for proc 0
  (linear communication).

ENH: remove unused/unusable UPstream::communicator optional parameter

- had constructor option to avoid constructing the MPI backend,
  but this is not useful and inconsistent with what the reset or
  destructor expect.

STYLE: local use of UPstream::communicator

- automatically frees communicator when it leaves scope
---
 .../test/parallel-comm2/Test-parallel-comm2.C |  28 +-
 applications/test/treeComms/Test-treeComms.C  |  14 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 137 +++-------
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 116 ++++----
 .../IOstreams/Pstreams/UPstreamCommsStruct.C  | 252 ++++++++++++++++--
 .../eagerGAMGProcAgglomeration.C              |   5 +-
 .../manualGAMGProcAgglomeration.C             |   5 +-
 .../masterCoarsestGAMGProcAgglomeration.C     |   5 +-
 .../procFacesGAMGProcAgglomeration.C          |  17 +-
 .../polyMesh/globalMeshData/globalMeshData.C  |  11 +-
 src/Pstream/mpi/UPstream.C                    |   7 +-
 .../multiWorld/multiWorldConnectionsObject.C  |   5 +-
 12 files changed, 358 insertions(+), 244 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 7f5a4afa5a..17f8283d13 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -64,6 +64,7 @@ int main(int argc, char *argv[])
     argList::noBanner();
     argList::noCheckProcessorDirectories();
     argList::addBoolOption("verbose", "Set debug level");
+    argList::addBoolOption("print-tree", "Report tree(s) as graph");
     argList::addBoolOption("comm-split", "Test simple comm split");
     argList::addBoolOption("host-comm", "Test DIY host-comm split");
 
@@ -81,6 +82,8 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
+    const bool optPrintTree = args.found("print-tree");
+
     Info<< nl
         << "parallel:" << UPstream::parRun()
         << "nProcs = " << UPstream::nProcs()
@@ -102,6 +105,13 @@ int main(int argc, char *argv[])
     labelList subRanks;
     UPstream::communicator newComm;
 
+
+    if (UPstream::parRun() && optPrintTree)
+    {
+        Info<< "comms: " << UPstream::whichCommunication() << endl;
+        UPstream::printCommTree(UPstream::commWorld());
+    }
+
     if (!args.found("comm-split") && !args.found("host-comm"))
     {
         #if 1
@@ -377,12 +387,7 @@ int main(int argc, char *argv[])
 
         // From world to hostMaster
         const label hostMasterComm =
-            UPstream::allocateCommunicator
-            (
-                UPstream::commGlobal(),
-                subRanks,
-                true
-            );
+            UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
 
 
         const label myHostId =
@@ -400,12 +405,7 @@ int main(int argc, char *argv[])
 
         // The intra-host ranks
         const label hostComm =
-            UPstream::allocateCommunicator
-            (
-                UPstream::commGlobal(),
-                subRanks,
-                true
-            );
+            UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
 
         Pout<< nl << "[manual split]" << nl
             << nl << "Host comm with "
@@ -419,8 +419,8 @@ int main(int argc, char *argv[])
             << " sub-rank:" << UPstream::is_subrank(hostMasterComm)
             << nl;
 
-        UPstream::freeCommunicator(hostMasterComm, true);
-        UPstream::freeCommunicator(hostComm, true);
+        UPstream::freeCommunicator(hostMasterComm);
+        UPstream::freeCommunicator(hostComm);
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/applications/test/treeComms/Test-treeComms.C b/applications/test/treeComms/Test-treeComms.C
index fe226b828a..94588bd797 100644
--- a/applications/test/treeComms/Test-treeComms.C
+++ b/applications/test/treeComms/Test-treeComms.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,7 @@ void printRecvCount_gatherList
     labelList nMesg;
     labelList nRecv;
 
-    if (UPstream::parRun() && np > 1 && Pstream::master(comm))
+    if (UPstream::parRun() && np > 1 && UPstream::master(comm))
     {
         nMesg.resize(np, Zero);
         nRecv.resize(np, Zero);
@@ -99,7 +99,7 @@ void printSendCount_scatterList
     labelList nMesg;
     labelList nSend;
 
-    if (UPstream::parRun() && np > 1 && Pstream::master(comm))
+    if (UPstream::parRun() && np > 1 && UPstream::master(comm))
     {
         nMesg.resize(np, Zero);
         nSend.resize(np, Zero);
@@ -139,7 +139,7 @@ void printWidths
     labelList maxBelow;
     labelList maxNotBelow;
 
-    if (UPstream::parRun() && np > 1 && Pstream::master(comm))
+    if (UPstream::parRun() && np > 1 && UPstream::master(comm))
     {
         maxBelow.resize(np, Zero);
         maxNotBelow.resize(np, Zero);
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 
     // Info<< "allComms: " << comms << nl;
 
-    if (Pstream::master())
+    if (UPstream::master())
     {
         OFstream os("treeComm.dot");
 
@@ -204,9 +204,9 @@ int main(int argc, char *argv[])
         printConnection(os, 0, myComm.below());
         // Pout<< flatOutput(myComm.allBelow()) << nl;
 
-        for (const int proci : Pstream::subProcs())
+        for (const int proci : UPstream::subProcs())
         {
-            IPstream fromProc(Pstream::commsTypes::scheduled, proci);
+            IPstream fromProc(UPstream::commsTypes::scheduled, proci);
             labelList below(fromProc);
 
             printConnection(os, proci, below);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index e14bcfc066..14a5cbc7d1 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -230,6 +230,10 @@ Foam::label Foam::UPstream::allocateCommunicator
 
     procIds.resize(numSubRanks);
 
+    // Sizing and filling are demand-driven
+    linearCommunication_[index].clear();
+    treeCommunication_[index].clear();
+
     if (doPstream && parRun())
     {
         allocatePstreamCommunicator(parentIndex, index);
@@ -249,13 +253,6 @@ Foam::label Foam::UPstream::allocateCommunicator
         /// }
     }
 
-    // In case communicator allocation adjusted procIDs_
-    numSubRanks = procIDs_[index].size();
-
-    // Size but do not fill structure - this is done on-the-fly
-    linearCommunication_[index] = List<commsStruct>(numSubRanks);
-    treeCommunication_[index] = List<commsStruct>(numSubRanks);
-
     return index;
 }
 
@@ -349,112 +346,40 @@ Foam::label Foam::UPstream::procNo
 }
 
 
-template<>
-Foam::UPstream::commsStruct&
-Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID)
+const Foam::List<Foam::UPstream::commsStruct>&
+Foam::UPstream::linearCommunication(const label communicator)
 {
-    UPstream::commsStruct& t = v_[procID];
-
-    if (t.allBelow().size() + t.allNotBelow().size() + 1 != size())
+    if (linearCommunication_[communicator].empty())
     {
-        // Not yet allocated
-
-        label above(-1);
-        labelList below;
-        labelList allBelow;
-
-        if (size() < UPstream::nProcsSimpleSum)
-        {
-            // Linear schedule
-
-            if (procID == 0)
-            {
-                below.setSize(size()-1);
-                for (label procI = 1; procI < size(); procI++)
-                {
-                    below[procI-1] = procI;
-                }
-            }
-            else
-            {
-                above = 0;
-            }
-        }
-        else
-        {
-            // Use tree like schedule. For 8 procs:
-            // (level 0)
-            //      0 receives from 1
-            //      2 receives from 3
-            //      4 receives from 5
-            //      6 receives from 7
-            // (level 1)
-            //      0 receives from 2
-            //      4 receives from 6
-            // (level 2)
-            //      0 receives from 4
-            //
-            // The sends/receives for all levels are collected per processor
-            // (one send per processor; multiple receives possible) creating
-            // a table:
-            //
-            // So per processor:
-            // proc     receives from   sends to
-            // ----     -------------   --------
-            //  0       1,2,4           -
-            //  1       -               0
-            //  2       3               0
-            //  3       -               2
-            //  4       5               0
-            //  5       -               4
-            //  6       7               4
-            //  7       -               6
-
-            label mod = 0;
-
-            for (label step = 1; step < size(); step = mod)
-            {
-                mod = step * 2;
-
-                if (procID % mod)
-                {
-                    above = procID - (procID % mod);
-                    break;
-                }
-                else
-                {
-                    for
-                    (
-                        label j = procID + step;
-                        j < size() && j < procID + mod;
-                        j += step
-                    )
-                    {
-                        below.append(j);
-                    }
-                    for
-                    (
-                        label j = procID + step;
-                        j < size() && j < procID + mod;
-                        j++
-                    )
-                    {
-                        allBelow.append(j);
-                    }
-                }
-            }
-        }
-        t = UPstream::commsStruct(size(), procID, above, below, allBelow);
+        linearCommunication_[communicator] =
+            List<commsStruct>(UPstream::nProcs(communicator));
     }
-    return t;
+
+    return linearCommunication_[communicator];
 }
 
 
-template<>
-const Foam::UPstream::commsStruct&
-Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID) const
+const Foam::List<Foam::UPstream::commsStruct>&
+Foam::UPstream::treeCommunication(const label communicator)
 {
-    return const_cast<UList<UPstream::commsStruct>&>(*this).operator[](procID);
+    if (treeCommunication_[communicator].empty())
+    {
+        treeCommunication_[communicator] =
+            List<commsStruct>(UPstream::nProcs(communicator));
+    }
+
+    return treeCommunication_[communicator];
+}
+
+
+void Foam::UPstream::printCommTree(const label communicator)
+{
+    const auto& comms = UPstream::whichCommunication(communicator);
+
+    if (UPstream::master(communicator))
+    {
+        commsStruct::printGraph(Info(), comms);
+    }
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 5030e9cef0..053eb8b9aa 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -98,17 +98,18 @@ public:
         {
             // Private Data
 
-                //- The procID of the processor directly above
+                //- The procID of the processor \em directly above
                 label above_;
 
-                //- The procIDs of all processors directly below
+                //- The procIDs of processors \em directly below
                 labelList below_;
 
-                //- procIDs of all processors below (so not just directly below)
+                //- The procIDs of all processors below myProcNo,
+                //- not just directly below
                 labelList allBelow_;
 
-                //- procIDs of all processors not below.
-                //  Inverse set of allBelow_ without myProcNo.
+                //- The procIDs of all processors not below myProcNo
+                //  (inverse of allBelow_ without myProcNo)
                 labelList allNotBelow_;
 
 
@@ -119,19 +120,19 @@ public:
                 //- Default construct with above == -1
                 commsStruct() noexcept : above_(-1) {}
 
-                //- Construct from components
+                //- Move construct from components
                 commsStruct
                 (
                     const label above,
-                    const labelUList& below,
-                    const labelUList& allBelow,
-                    const labelUList& allNotBelow
+                    labelList&& below,
+                    labelList&& allBelow,
+                    labelList&& allNotBelow
                 );
 
-                //- Construct from components; construct allNotBelow_
+                //- Copy construct from below, allBelow components
                 commsStruct
                 (
-                    const label nProcs,
+                    const label numProcs,
                     const label myProcID,
                     const label above,
                     const labelUList& below,
@@ -141,29 +142,31 @@ public:
 
             // Member Functions
 
-                //- Reset to default constructed state
-                void clear();
+                //- Print un-directed graph in graphviz dot format
+                static void printGraph
+                (
+                    Ostream& os,
+                    const UList<UPstream::commsStruct>& comms,
+                    const label proci = 0  // starting node
+                );
 
-                //- The procID of the processor directly above
-                label above() const noexcept
-                {
-                    return above_;
-                }
 
-                //- The procIDs of all processors directly below
-                const labelList& below() const noexcept
-                {
-                    return below_;
-                }
+            // Access
+
+                //- The number of processors addressed by the structure
+                label nProcs() const;
+
+                //- The procID of the processor \em directly above
+                label above() const noexcept { return above_; }
+
+                //- The procIDs of the processors \em directly below
+                const labelList& below() const noexcept { return below_; }
 
                 //- The procIDs of all processors below
                 //- (so not just directly below)
-                const labelList& allBelow() const noexcept
-                {
-                    return allBelow_;
-                }
+                const labelList& allBelow() const noexcept { return allBelow_; }
 
-                //- The procIDs of all processors that are above.
+                //- The procIDs of all processors not below myProcNo.
                 //- The inverse set of allBelow without myProcNo.
                 const labelList& allNotBelow() const noexcept
                 {
@@ -171,14 +174,20 @@ public:
                 }
 
 
-            // Member Operators
+            // Edit
+
+                //- Reset to default constructed state
+                void reset();
+
+                //- Reset with automatic linear/tree selection
+                void reset(const label procID, const label numProcs);
+
+
+            // Member / Friend Operators
 
                 bool operator==(const commsStruct&) const;
                 bool operator!=(const commsStruct&) const;
 
-
-             // Ostream Operator
-
                 friend Ostream& operator<<(Ostream&, const commsStruct&);
         };
 
@@ -335,6 +344,9 @@ public:
             return (communicator > worldComm && communicator > selfComm);
         }
 
+        //- Debugging: print the communication tree
+        static void printCommTree(const label communicator);
+
 
     // Constructors
 
@@ -391,24 +403,21 @@ public:
             //- Move construct, takes ownership
             communicator(communicator&& c) : comm_(c.comm_) { c.comm_ = -1; }
 
-            //- Allocate a communicator based on given parent
+            //- Allocate communicator for sub-ranks on given parent
             communicator
             (
                 //! The parent communicator
-                const label parent,
+                const label parentComm,
 
-                //! The sub-ranks of parent to use (ignore negative values)
-                const labelUList& subRanks,
-
-                //! Call allocatePstreamCommunicator
-                const bool doPstream = true
+                //! The sub-ranks of parent to use (negative values ignored)
+                const labelUList& subRanks
             )
             :
-                comm_(allocateCommunicator(parent, subRanks, doPstream))
+                comm_(UPstream::allocateCommunicator(parentComm, subRanks))
             {}
 
             //- Free allocated communicator and group
-            ~communicator() { freeCommunicator(comm_); }
+            ~communicator() { UPstream::freeCommunicator(comm_); }
 
             //- True if communicator is non-negative (ie, was allocated)
             bool good() const noexcept { return (comm_ >= 0); }
@@ -417,19 +426,19 @@ public:
             label comm() const noexcept { return comm_; }
 
             //- Free allocated communicator and group
-            void reset() { freeCommunicator(comm_); comm_ = -1; }
+            void reset() { UPstream::freeCommunicator(comm_); comm_ = -1; }
 
             //- Allocate with subRanks of parent communicator
             void reset(label parent, const labelUList& subRanks)
             {
-                freeCommunicator(comm_);
-                comm_ = allocateCommunicator(parent, subRanks);
+                UPstream::freeCommunicator(comm_);
+                comm_ = UPstream::allocateCommunicator(parent, subRanks);
             }
 
             //- Take ownership, free allocated communicator and group.
             void reset(communicator&& c)
             {
-                if (comm_ != c.comm_) freeCommunicator(comm_);
+                if (comm_ != c.comm_) UPstream::freeCommunicator(comm_);
                 comm_ = c.comm_;
                 c.comm_ = -1;
             }
@@ -730,22 +739,17 @@ public:
         }
 
         //- Communication schedule for linear all-to-master (proc 0)
-        static const List<commsStruct>& linearCommunication
+        static const List<commsStruct>&
+        linearCommunication
         (
             const label communicator = worldComm
-        )
-        {
-            return linearCommunication_[communicator];
-        }
+        );
 
         //- Communication schedule for tree all-to-master (proc 0)
         static const List<commsStruct>& treeCommunication
         (
             const label communicator = worldComm
-        )
-        {
-            return treeCommunication_[communicator];
-        }
+        );
 
         //- Communication schedule for linear/tree all-to-master (proc 0).
         //- Chooses based on the value of UPstream::nProcsSimpleSum
@@ -757,8 +761,8 @@ public:
             return
             (
                 nProcs(communicator) < nProcsSimpleSum
-              ? linearCommunication_[communicator]
-              : treeCommunication_[communicator]
+              ? linearCommunication(communicator)
+              : treeCommunication(communicator)
             );
         }
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
index 760c77d2bf..7aa432170b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,21 +33,21 @@ License
 Foam::UPstream::commsStruct::commsStruct
 (
     const label above,
-    const labelUList& below,
-    const labelUList& allBelow,
-    const labelUList& allNotBelow
+    labelList&& below,
+    labelList&& allBelow,
+    labelList&& allNotBelow
 )
 :
     above_(above),
-    below_(below),
-    allBelow_(allBelow),
-    allNotBelow_(allNotBelow)
+    below_(std::move(below)),
+    allBelow_(std::move(allBelow)),
+    allNotBelow_(std::move(allNotBelow))
 {}
 
 
 Foam::UPstream::commsStruct::commsStruct
 (
-    const label nProcs,
+    const label numProcs,
     const label myProcID,
     const label above,
     const labelUList& below,
@@ -57,33 +57,114 @@ Foam::UPstream::commsStruct::commsStruct
     above_(above),
     below_(below),
     allBelow_(allBelow),
-    allNotBelow_(nProcs - allBelow.size() - 1)
+    allNotBelow_(numProcs - allBelow.size() - 1)
 {
-    boolList inBelow(nProcs, false);
+    List<bool> isNotBelow(numProcs, true);
 
-    forAll(allBelow, belowI)
+    // Exclude self
+    isNotBelow[myProcID] = false;
+
+    // Exclude allBelow
+    for (const label proci : allBelow)
     {
-        inBelow[allBelow[belowI]] = true;
+        isNotBelow[proci] = false;
     }
 
-    label notI = 0;
-    forAll(inBelow, proci)
+    // Compacting to obtain allNotBelow_
+    label nNotBelow = 0;
+    forAll(isNotBelow, proci)
     {
-        if ((proci != myProcID) && !inBelow[proci])
+        if (isNotBelow[proci])
         {
-            allNotBelow_[notI++] = proci;
+            allNotBelow_[nNotBelow++] = proci;
         }
     }
-    if (notI != allNotBelow_.size())
+
+    if (nNotBelow != allNotBelow_.size())
     {
-        FatalErrorInFunction << "problem!" << Foam::abort(FatalError);
+        FatalErrorInFunction
+            << "Problem: " << nNotBelow << " != " << allNotBelow_.size() << nl
+            << Foam::abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+// This outputs as depth-first, but graphviz sorts that for us
+void Foam::UPstream::commsStruct::printGraph
+(
+    Ostream& os,
+    const UList<UPstream::commsStruct>& comms,
+    const label proci
+)
+{
+    // if (proci >= comms.size()) return;  // Extreme safety!
+
+    const auto& below = comms[proci].below();
+
+    if (proci == 0)
+    {
+        os << nl << "// communication graph:" << nl;
+        os.beginBlock("graph");
+
+        if (below.empty())
+        {
+            // A graph with a single-node (eg, self-comm)
+            os << indent << proci << nl;
+        }
+    }
+
+    int pos = 0;
+
+    for (const label nbrProci : below)
+    {
+        if (pos)
+        {
+            os << "  ";
+        }
+        else
+        {
+            os << indent;
+        }
+        os << proci << " -- " << nbrProci;
+
+        if (++pos >= 4)  // Max 4 items per line
+        {
+            pos = 0;
+            os << nl;
+        }
+    }
+
+    if (pos)
+    {
+        os << nl;
+    }
+
+    for (const label nbrProci : below)
+    {
+        // if (proci == nbrProci) continue;  // Extreme safety!
+        printGraph(os, comms, nbrProci);
+    }
+
+    if (proci == 0)
+    {
+        os.endBlock();
+
+        os << "// end graph" << nl;
     }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::UPstream::commsStruct::clear()
+Foam::label Foam::UPstream::commsStruct::nProcs() const
+{
+    return (1 + allBelow_.size() + allNotBelow_.size());
+}
+
+
+void Foam::UPstream::commsStruct::reset()
 {
     above_ = -1;
     below_.clear();
@@ -92,6 +173,127 @@ void Foam::UPstream::commsStruct::clear()
 }
 
 
+void Foam::UPstream::commsStruct::reset
+(
+    const label procID,
+    const label numProcs
+)
+{
+    reset();
+
+    label above(-1);
+    DynamicList<label> below;
+    DynamicList<label> allBelow;
+
+    if (numProcs < UPstream::nProcsSimpleSum)
+    {
+        // Linear schedule
+
+        if (procID == 0)
+        {
+            below = identity(numProcs-1, 1);
+            allBelow = below;
+        }
+        else
+        {
+            above = 0;
+        }
+    }
+    else
+    {
+        // Use tree like schedule. For 8 procs:
+        // (level 0)
+        //      0 receives from 1
+        //      2 receives from 3
+        //      4 receives from 5
+        //      6 receives from 7
+        // (level 1)
+        //      0 receives from 2
+        //      4 receives from 6
+        // (level 2)
+        //      0 receives from 4
+        //
+        // The sends/receives for all levels are collected per processor
+        // (one send per processor; multiple receives possible) creating
+        // a table:
+        //
+        // So per processor:
+        // proc     receives from   sends to
+        // ----     -------------   --------
+        //  0       1,2,4           -
+        //  1       -               0
+        //  2       3               0
+        //  3       -               2
+        //  4       5               0
+        //  5       -               4
+        //  6       7               4
+        //  7       -               6
+
+        label mod = 0;
+
+        for (label step = 1; step < numProcs; step = mod)
+        {
+            mod = step * 2;
+
+            if (procID % mod)
+            {
+                above = procID - (procID % mod);
+                break;
+            }
+            else
+            {
+                for
+                (
+                    label j = procID + step;
+                    j < numProcs && j < procID + mod;
+                    j += step
+                )
+                {
+                    below.push_back(j);
+                }
+                for
+                (
+                    label j = procID + step;
+                    j < numProcs && j < procID + mod;
+                    j++
+                )
+                {
+                    allBelow.push_back(j);
+                }
+            }
+        }
+    }
+
+    *this = UPstream::commsStruct(numProcs, procID, above, below, allBelow);
+}
+
+
+// * * * * * * * * * * * * * * * Specializations * * * * * * * * * * * * * * //
+
+template<>
+Foam::UPstream::commsStruct&
+Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID)
+{
+    auto& val = this->v_[procID];   // or this->data()[procID]
+
+    if (val.nProcs() != size())
+    {
+        // Create/update
+        val.reset(procID, size());
+    }
+
+    return val;
+}
+
+
+template<>
+const Foam::UPstream::commsStruct&
+Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID) const
+{
+    return const_cast<UList<UPstream::commsStruct>&>(*this).operator[](procID);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 bool Foam::UPstream::commsStruct::operator==(const commsStruct& comm) const
@@ -100,8 +302,8 @@ bool Foam::UPstream::commsStruct::operator==(const commsStruct& comm) const
     (
         (above_ == comm.above())
      && (below_ == comm.below())
-     && (allBelow_ == allBelow())
-     && (allNotBelow_ == allNotBelow())
+     // && (allBelow_ == comm.allBelow())
+     // && (allNotBelow_ == comm.allNotBelow())
     );
 }
 
@@ -116,10 +318,10 @@ bool Foam::UPstream::commsStruct::operator!=(const commsStruct& comm) const
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const UPstream::commsStruct& comm)
 {
-    os  << comm.above_ << token::SPACE
-        << comm.below_ << token::SPACE
-        << comm.allBelow_ << token::SPACE
-        << comm.allNotBelow_;
+    os  << comm.above() << nl << token::SPACE << token::SPACE;
+    comm.below().writeList(os) << nl << token::SPACE << token::SPACE;
+    comm.allBelow().writeList(os) << nl << token::SPACE << token::SPACE;
+    comm.allNotBelow().writeList(os);
 
     os.check(FUNCTION_NAME);
     return os;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
index f49db33303..3866554614 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
@@ -65,10 +65,7 @@ Foam::eagerGAMGProcAgglomeration::
 {
     forAllReverse(comms_, i)
     {
-        if (comms_[i] != -1)
-        {
-            UPstream::freeCommunicator(comms_[i]);
-        }
+        UPstream::freeCommunicator(comms_[i]);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
index 289f6a8aed..a5d266015f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
@@ -64,10 +64,7 @@ Foam::manualGAMGProcAgglomeration::
 {
     forAllReverse(comms_, i)
     {
-        if (comms_[i] != -1)
-        {
-            UPstream::freeCommunicator(comms_[i]);
-        }
+        UPstream::freeCommunicator(comms_[i]);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
index 20af4576cd..180ef2d385 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
@@ -104,10 +104,7 @@ Foam::masterCoarsestGAMGProcAgglomeration::
 {
     forAllReverse(comms_, i)
     {
-        if (comms_[i] != -1)
-        {
-            UPstream::freeCommunicator(comms_[i]);
-        }
+        UPstream::freeCommunicator(comms_[i]);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 9202dd0241..3fe22a5e2f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -149,10 +149,10 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     const lduMesh& mesh
 ) const
 {
-    label singleCellMeshComm = UPstream::allocateCommunicator
+    UPstream::communicator singleCellMeshComm
     (
         mesh.comm(),
-        labelList(1, Zero)   // only processor 0
+        labelList(Foam::one{}, 0)   // only processor 0
     );
 
     scalarField faceWeights;
@@ -160,14 +160,14 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     (
         singleCellMesh
         (
-            singleCellMeshComm,
+            singleCellMeshComm.comm(),
             mesh,
             faceWeights
         )
     );
 
-    tmp<labelField> tfineToCoarse(new labelField(0));
-    labelField& fineToCoarse = tfineToCoarse.ref();
+    auto tfineToCoarse = tmp<labelField>::New();
+    auto& fineToCoarse = tfineToCoarse.ref();
 
     if (singleCellMeshPtr)
     {
@@ -197,7 +197,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     }
 
     Pstream::broadcast(fineToCoarse, mesh.comm());
-    UPstream::freeCommunicator(singleCellMeshComm);
+    singleCellMeshComm.reset();
 
     return tfineToCoarse;
 }
@@ -234,10 +234,7 @@ Foam::procFacesGAMGProcAgglomeration::~procFacesGAMGProcAgglomeration()
 {
     forAllReverse(comms_, i)
     {
-        if (comms_[i] != -1)
-        {
-            UPstream::freeCommunicator(comms_[i]);
-        }
+        UPstream::freeCommunicator(comms_[i]);
     }
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index b65115d7c7..feba605416 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2714,13 +2714,14 @@ void Foam::globalMeshData::updateMesh()
 
     // *** Temporary hack to avoid problems with overlapping communication
     // *** between these reductions and the calculation of deltaCoeffs
-    //const label comm = UPstream::worldComm + 1;
-    const label comm = UPstream::allocateCommunicator
+
+    UPstream::communicator dupComm
     (
         UPstream::worldComm,
-        identity(UPstream::nProcs(UPstream::worldComm)),
-        true
+        identity(UPstream::nProcs(UPstream::worldComm))
     );
+
+    const label comm = dupComm.comm();
     const label oldWarnComm = UPstream::commWarn(comm);
 
 
@@ -2760,8 +2761,8 @@ void Foam::globalMeshData::updateMesh()
     );
 
     // Restore communicator settings
-    UPstream::freeCommunicator(comm);
     UPstream::commWarn(oldWarnComm);
+    dupComm.reset();
 
     if (debug)
     {
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 576626ab51..d841666199 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -335,12 +335,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
 
         // Allocate new communicator with globalComm as its parent
         const label subComm =
-            UPstream::allocateCommunicator
-            (
-                UPstream::globalComm,  // parent
-                subRanks,
-                true
-            );
+            UPstream::allocateCommunicator(UPstream::globalComm, subRanks);
 
 
         // Override worldComm
diff --git a/src/meshTools/multiWorld/multiWorldConnectionsObject.C b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
index 8b752d289a..2dc3d74dea 100644
--- a/src/meshTools/multiWorld/multiWorldConnectionsObject.C
+++ b/src/meshTools/multiWorld/multiWorldConnectionsObject.C
@@ -157,13 +157,12 @@ Foam::label Foam::multiWorldConnections::createCommunicator(const edge& worlds)
     {
         if (worlds.found(worldIDs[proci]))
         {
-            subRanks.append(proci);
+            subRanks.push_back(proci);
         }
     }
 
     // Allocate new communicator with global world
-    comm =
-        UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks, true);
+    comm = UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
 
     if (debug & 2)
     {

From 80bc1db5b7d09199b2e27c54288d5891b77e2943 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Apr 2023 15:00:03 +0200
Subject: [PATCH 177/348] ENH: provide UPstream intra-host and inter-host
 communicators

- simplifies communication structuring with intra-host communication.
  Can be used for IO only, or for specialised communication.

  Demand-driven construction. Gathers the SHA1 of host names when
  determining the connectivity. Internally uses an MPI_Gather of the
  digests and a MPI_Bcast of the unique host indices.

  NOTE:
    does not use MPI_Comm_splt or MPI_Comm_splt_type since these
    return MPI_COMM_NULL on non-participating process which does not
    easily fit into the OpenFOAM framework.

    Additionally, if using the caching version of
    UPstream::commInterHost() and UPstream::commIntraHost()
    the topology is determined simultaneously
    (ie, equivalent or potentially lower communication).
---
 .../test/parallel-comm2/Test-parallel-comm2.C | 429 ++++++++++++------
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 340 ++++++++++++--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  50 +-
 src/Pstream/dummy/UPstream.C                  |   4 +-
 src/Pstream/mpi/UPstream.C                    |  16 +-
 5 files changed, 658 insertions(+), 181 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 17f8283d13..ce01dc7cf9 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -64,9 +64,12 @@ int main(int argc, char *argv[])
     argList::noBanner();
     argList::noCheckProcessorDirectories();
     argList::addBoolOption("verbose", "Set debug level");
+    argList::addBoolOption("info", "information");
     argList::addBoolOption("print-tree", "Report tree(s) as graph");
     argList::addBoolOption("comm-split", "Test simple comm split");
-    argList::addBoolOption("host-comm", "Test DIY host-comm split");
+    argList::addBoolOption("mpi-host-comm", "Test DIY host-comm split");
+    argList::addBoolOption("host-comm", "Test Pstream host-comm");
+    argList::addBoolOption("host-broadcast", "Test host-base broadcasts");
 
     // Capture manually. We need values before proper startup
     int nVerbose = 0;
@@ -90,76 +93,30 @@ int main(int argc, char *argv[])
         << " with " << UPstream::nComms() << " predefined comm(s)."
         << " proc:" << UPstream::myProcNo() << nl;
 
-    Info<< nl;
-
-    //- Process IDs within a given communicator
-    Info<< "procIDs: "
-        << flatOutput(UPstream::procID(UPstream::commWorld())) << endl;
-
-    rankInfo(UPstream::commWorld());
-    Pout<< endl;
-
-    const int myProci = UPstream::myProcNo(UPstream::commWorld());
-    int localRanki = myProci;
-
-    labelList subRanks;
-    UPstream::communicator newComm;
-
-
     if (UPstream::parRun() && optPrintTree)
     {
         Info<< "comms: " << UPstream::whichCommunication() << endl;
         UPstream::printCommTree(UPstream::commWorld());
     }
 
-    if (!args.found("comm-split") && !args.found("host-comm"))
+    if (args.found("info"))
     {
-        #if 1
-        // With first ranks
-        subRanks = identity(UPstream::nProcs(UPstream::commWorld()) / 2);
-
-        newComm.reset(UPstream::commWorld(), subRanks);
-        localRanki = UPstream::myProcNo(newComm);
-
-        Pout.prefix() =
-        (
-            '[' + Foam::name(myProci) + " a:" + Foam::name(localRanki) + "] "
-        );
+        Info<< nl;
 
+        //- Process IDs within a given communicator
         Info<< "procIDs: "
-            << flatOutput(UPstream::procID(newComm)) << endl;
+            << flatOutput(UPstream::procID(UPstream::commWorld())) << endl;
 
-        rankInfo(newComm);
+        rankInfo(UPstream::commWorld());
         Pout<< endl;
-        #endif
-
-        #if 1
-        // With every other rank
-        subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
-
-        for (label& val : subRanks)
-        {
-            if (val % 2) val = -1;
-        }
-
-        newComm.reset(UPstream::commWorld(), subRanks);
-        localRanki = UPstream::myProcNo(newComm);
-
-        Pout.prefix() =
-        (
-            '[' + Foam::name(myProci) + " b:" + Foam::name(localRanki) + "] "
-        );
-
-        Info<< "procIDs: "
-            << flatOutput(UPstream::procID(newComm)) << endl;
-
-        rankInfo(newComm);
-        Pout<< endl;
-        #endif
     }
 
-    if (Pstream::parRun() && args.found("comm-split"))
+    bool generalTest = true;
+
+    if (UPstream::parRun() && args.found("comm-split"))
     {
+        generalTest = false;
+
         int world_nprocs = 0;
         int world_rank = -1;
         MPI_Comm_size(MPI_COMM_WORLD, &world_nprocs);
@@ -167,37 +124,37 @@ int main(int argc, char *argv[])
 
         int host_nprocs = 0;
         int host_rank = -1;
-        MPI_Comm hostComm;
+        MPI_Comm commIntraHost;
         MPI_Comm_split_type
         (
             MPI_COMM_WORLD,
             MPI_COMM_TYPE_SHARED,  // OMPI_COMM_TYPE_NODE
-            0, MPI_INFO_NULL, &hostComm
+            0, MPI_INFO_NULL, &commIntraHost
         );
 
-        MPI_Comm_size(hostComm, &host_nprocs);
-        MPI_Comm_rank(hostComm, &host_rank);
+        MPI_Comm_size(commIntraHost, &host_nprocs);
+        MPI_Comm_rank(commIntraHost, &host_rank);
 
         int leader_nprocs = 0;
         int leader_rank = -1;
-        MPI_Comm hostMasterComm;
+        MPI_Comm commInterHost;
 
         if (false)
         {
             // Easy enough to use MPI_Comm_split, but slightly annoying
             // that it returns MPI_COMM_NULL for unused ranks...
-            MPI_Comm hostMasterComm;
+            MPI_Comm commInterHost;
             MPI_Comm_split
             (
                 MPI_COMM_WORLD,
                 (host_rank == 0) ? 0 : MPI_UNDEFINED,
-                0, &hostMasterComm
+                0, &commInterHost
             );
 
-            if (hostMasterComm != MPI_COMM_NULL)
+            if (commInterHost != MPI_COMM_NULL)
             {
-                MPI_Comm_size(hostMasterComm, &leader_nprocs);
-                MPI_Comm_rank(hostMasterComm, &leader_rank);
+                MPI_Comm_size(commInterHost, &leader_nprocs);
+                MPI_Comm_rank(commInterHost, &leader_rank);
             }
         }
         else
@@ -242,35 +199,39 @@ int main(int argc, char *argv[])
                 MPI_COMM_WORLD,
                 active_group,
                 UPstream::msgType(),
-                &hostMasterComm
+                &commInterHost
             );
 
             // Groups not needed after this...
             MPI_Group_free(&parent_group);
             MPI_Group_free(&active_group);
 
-            MPI_Comm_size(hostMasterComm, &leader_nprocs);
-            MPI_Comm_rank(hostMasterComm, &leader_rank);
+            MPI_Comm_size(commInterHost, &leader_nprocs);
+            MPI_Comm_rank(commInterHost, &leader_rank);
         }
 
         Pout<< nl << "[MPI_Comm_split_type]" << nl
-            << "Host comm with " << host_rank << " / " << host_nprocs
+            << "Host rank " << host_rank << " / " << host_nprocs
             << " on " << hostName()
-            << " master:" << (host_rank == 0)
-            << " leader rank: " << leader_rank
-            << " / " << leader_nprocs
+            << " inter-rank: " << leader_rank << " / " << leader_nprocs
             << " host leader:" << (leader_rank == 0)
             << " sub-rank:" << (leader_rank > 0)
             << nl;
 
-        if (hostMasterComm != MPI_COMM_NULL)
+        if (commInterHost != MPI_COMM_NULL)
         {
-            MPI_Comm_free(&hostMasterComm);
+            MPI_Comm_free(&commInterHost);
+        }
+        if (commIntraHost != MPI_COMM_NULL)
+        {
+            MPI_Comm_free(&commIntraHost);
         }
-        MPI_Comm_free(&hostComm);
     }
-    if (Pstream::parRun() && args.found("host-comm"))
+
+    if (UPstream::parRun() && args.found("mpi-host-comm"))
     {
+        generalTest = false;
+
         // Host communicator, based on the current world communicator
         // Use hostname
         // Lowest rank per hostname is the IO rank
@@ -290,40 +251,32 @@ int main(int argc, char *argv[])
         // - pro: fixed digest length enables direct MPI calls
         //        can avoid Pstream::gatherList() during setup...
 
-        SHA1Digest myHostDigest(SHA1(hostName()).digest());
-
         List<SHA1Digest> digests;
         if (UPstream::master(UPstream::commGlobal()))
         {
             digests.resize(numprocs);
         }
 
-        UPstream::mpiGather
-        (
-            reinterpret_cast<const char*>(myHostDigest.cdata_bytes()),
-            SHA1Digest::max_size(),     // Num send per proc
-            digests.data_bytes(),       // Recv
-            SHA1Digest::max_size(),     // Num recv per proc
-            UPstream::commGlobal()
-        );
+        {
+            const SHA1Digest myHostDigest(SHA1(hostName()).digest());
 
-        // MPI_Gather
-        // (
-        //     myHostDigest.cdata_bytes(), // Send
-        //     SHA1Digest::max_size(),     // Num send per proc
-        //     MPI_BYTE,
-        //     digests.data_bytes(),       // Recv
-        //     SHA1Digest::max_size(),     // Num recv per proc
-        //     MPI_BYTE,
-        //     0,  //  root
-        //     MPI_COMM_WORLD
-        // );
+            UPstream::mpiGather
+            (
+                reinterpret_cast<const char*>(myHostDigest.cdata_bytes()),
+                SHA1Digest::max_size(),     // Num send per proc
+                digests.data_bytes(),       // Recv
+                SHA1Digest::max_size(),     // Num recv per proc
+                UPstream::commGlobal()
+            );
+        }
+
+
+        labelList hostIDs(numprocs);
+        DynamicList<label> subRanks(numprocs);
 
         Info<< "digests: " << digests << nl;
 
-        labelList hostIDs_(numprocs);
-
-        // Compact
+        // Compact numbering
         if (UPstream::master(UPstream::commGlobal()))
         {
             DynamicList<word> hostNames(numprocs);
@@ -332,95 +285,301 @@ int main(int argc, char *argv[])
             {
                 const word& host = hosts[proci];
 
-                hostIDs_[proci] = hostNames.find(host);
+                hostIDs[proci] = hostNames.find(host);
 
-                if (hostIDs_[proci] < 0)
+                if (hostIDs[proci] < 0)
                 {
                     // First appearance of host (encode as leader)
-                    hostIDs_[proci] = -(hostNames.size() + 1);
+                    hostIDs[proci] = -(hostNames.size() + 1);
                     hostNames.push_back(host);
-                }
+                 }
             }
+            hostIDs = -1;
 
-            DynamicList<SHA1Digest> hostDigest(numprocs);
+
+            DynamicList<SHA1Digest> uniqDigests(numprocs);
 
             forAll(digests, proci)
             {
                 const SHA1Digest& dig = digests[proci];
 
-                hostIDs_[proci] = hostDigest.find(dig);
+                hostIDs[proci] = uniqDigests.find(dig);
 
-                if (hostIDs_[proci] < 0)
+                if (hostIDs[proci] < 0)
                 {
                     // First appearance of host (encode as leader)
-                    hostIDs_[proci] = -(hostDigest.size() + 1);
-                    hostDigest.push_back(dig);
+                    hostIDs[proci] = -(uniqDigests.size() + 1);
+                    uniqDigests.push_back(dig);
                 }
             }
         }
 
+
         Info<< "hosts =  " << hosts << endl;
-        Info<< "hostIDs_ =  " << hostIDs_ << endl;
+        Info<< "hostIDs =  " << hostIDs << endl;
 
         UPstream::broadcast
         (
-            hostIDs_.data_bytes(),
-            hostIDs_.size_bytes(),
+            hostIDs.data_bytes(),
+            hostIDs.size_bytes(),
             UPstream::commGlobal(),
             UPstream::masterNo()
         );
 
-        DynamicList<label> subRanks(numprocs);
+        // Ranks for world to inter-host communicator
+        // - very straightforward
 
-        // Ranks for world to hostMaster
-        forAll(hostIDs_, proci)
+        #if 0
+        subRanks.clear();
+        forAll(hostIDs, proci)
         {
             // Is host leader?
-            if (hostIDs_[proci] < 0)
+            if (hostIDs[proci] < 0)
             {
                 subRanks.push_back(proci);
 
                 // Flip back to generic host id
-                hostIDs_[proci] = -(hostIDs_[proci] + 1);
+                hostIDs[proci] = -(hostIDs[proci] + 1);
             }
         }
 
         // From world to hostMaster
-        const label hostMasterComm =
+        const label commInterHost =
             UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
+        #endif
 
+        const label myWorldProci = UPstream::myProcNo(UPstream::commGlobal());
 
-        const label myHostId =
-            hostIDs_[Pstream::myProcNo(UPstream::commGlobal())];
+        label myHostId = hostIDs[myWorldProci];
+        if (myHostId < 0) myHostId = -(myHostId + 1);  // Flip to generic id
 
         // Ranks for within a host
         subRanks.clear();
-        forAll(hostIDs_, proci)
+        forAll(hostIDs, proci)
         {
-            if (hostIDs_[proci] == myHostId)
+            label id = hostIDs[proci];
+            if (id < 0) id = -(id + 1);  // Flip to generic id
+
+            if (id == myHostId)
             {
                 subRanks.push_back(proci);
             }
         }
 
         // The intra-host ranks
-        const label hostComm =
+        const label commIntraHost =
             UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
 
+
+        // Test what if we have intra-host comm and we want host-master
+
+        List<bool> isHostMaster(numprocs, false);
+        if (UPstream::master(commIntraHost))
+        {
+            isHostMaster[myWorldProci] = true;
+        }
+
+        UPstream::mpiAllGather
+        (
+            isHostMaster.data_bytes(),
+            sizeof(bool),
+            UPstream::commGlobal()
+        );
+
+        // Ranks for world to hostMaster
+        // - very straightforward
+        subRanks.clear();
+        forAll(isHostMaster, proci)
+        {
+            if (isHostMaster[proci])
+            {
+                subRanks.push_back(proci);
+            }
+        }
+
+        // From world to hostMaster
+        const label commInterHost =
+            UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
+
+
         Pout<< nl << "[manual split]" << nl
-            << nl << "Host comm with "
-            << UPstream::myProcNo(hostComm)
-            << " / " << UPstream::nProcs(hostComm)
+            << nl << "Host rank " << UPstream::myProcNo(commIntraHost)
+            << " / " << UPstream::nProcs(commIntraHost)
             << " on " << hostName()
-            << " master:" << UPstream::master(hostComm)
-            << " leader rank: " << UPstream::myProcNo(hostMasterComm)
-            << " / " << UPstream::nProcs(hostMasterComm)
-            << " host leader:" << UPstream::master(hostMasterComm)
-            << " sub-rank:" << UPstream::is_subrank(hostMasterComm)
+            << ", inter-rank: " << UPstream::myProcNo(commInterHost)
+            << " / " << UPstream::nProcs(commInterHost)
+            << " host leader:" << UPstream::master(commInterHost)
+            << " sub-rank:" << UPstream::is_subrank(commInterHost)
             << nl;
 
-        UPstream::freeCommunicator(hostMasterComm);
-        UPstream::freeCommunicator(hostComm);
+        UPstream::freeCommunicator(commInterHost);
+        UPstream::freeCommunicator(commIntraHost);
+    }
+
+    if (UPstream::parRun() && args.found("host-comm"))
+    {
+        generalTest = false;
+        Info<< nl << "[pstream host-comm]" << nl << endl;
+
+        const label commInterHost = UPstream::commInterHost();
+        const label commIntraHost = UPstream::commIntraHost();
+
+        Pout<< "Host rank " << UPstream::myProcNo(commIntraHost)
+            << " / " << UPstream::nProcs(commIntraHost)
+            << " on " << hostName()
+            << ", inter-rank: " << UPstream::myProcNo(commInterHost)
+            << " / " << UPstream::nProcs(commInterHost)
+            << ", host leader:" << UPstream::master(commInterHost)
+            << " sub-rank:" << UPstream::is_subrank(commInterHost)
+            << endl;
+
+
+        {
+            Info<< "host-master: "
+                << UPstream::whichCommunication(commInterHost) << endl;
+
+            UPstream::printCommTree(commInterHost);
+            UPstream::printCommTree(commIntraHost);
+        }
+    }
+
+    if (UPstream::parRun() && args.found("host-broadcast"))
+    {
+        generalTest = false;
+        Info<< nl << "[pstream host-broadcast]" << nl << endl;
+
+        const label commInterHost = UPstream::commInterHost();
+        const label commIntraHost = UPstream::commIntraHost();
+
+        Pout<< "world rank: " << UPstream::myProcNo(UPstream::commWorld())
+            << " host-leader rank: "
+            << UPstream::myProcNo(UPstream::commInterHost())
+            << " intra-host rank: "
+            << UPstream::myProcNo(UPstream::commIntraHost())
+            << endl;
+
+        label value1(0), value2(0), value3(0);
+        label hostIndex = UPstream::myProcNo(commInterHost);
+
+        if (UPstream::master(commInterHost))
+        {
+            value1 = 100;
+            value2 = 200;
+        }
+        if (UPstream::master(commIntraHost))
+        {
+            value3 = 300;
+        }
+
+        Pstream::broadcast(value1, commInterHost);
+        Pstream::broadcast(value2, commIntraHost);
+        Pstream::broadcast(hostIndex, commIntraHost);
+
+        Pout<< "host: " << hostIndex
+            << " broadcast 1: "
+            << value1 << ' '
+            << value2 << ' '
+            << value3 << endl;
+
+        // re-broadcast
+        Pstream::broadcast(value1, commIntraHost);
+        Pout<< "host: " << hostIndex
+            << " broadcast 2: "
+            << value1 << endl;
+
+
+        label reduced1 = value1;
+        label reduced2 = value1;
+
+        reduce
+        (
+            reduced1,
+            sumOp<label>(),
+            UPstream::msgType(),
+            commIntraHost
+        );
+
+        reduce
+        (
+            reduced2,
+            sumOp<label>(),
+            UPstream::msgType(),
+            commInterHost
+        );
+
+        Pout<< "value1: (host) " << reduced1
+            << " (leader) " << reduced2 << endl;
+
+        // Pout<< "ranks: " << UPstream::nProcs(commInterHost) << endl;
+
+        wordList strings;
+        if (UPstream::is_rank(commInterHost))
+        {
+            strings.resize(UPstream::nProcs(commInterHost));
+            strings[UPstream::myProcNo(commInterHost)] = name(pid());
+        }
+
+        // Some basic gather/scatter
+        Pstream::allGatherList(strings, UPstream::msgType(), commInterHost);
+
+        Pout<< "pids " << flatOutput(strings) << endl;
+
+        Foam::reverse(strings);
+
+        Pstream::broadcast(strings, commIntraHost);
+        Pout<< "PIDS " << flatOutput(strings) << endl;
+    }
+
+
+    if (UPstream::parRun() && generalTest)
+    {
+        #if 1
+        // With first ranks
+        labelList subRanks =
+            identity(UPstream::nProcs(UPstream::commWorld()) / 2);
+
+        UPstream::communicator newComm;
+
+        newComm.reset(UPstream::commWorld(), subRanks);
+        label localRanki = UPstream::myProcNo(newComm);
+
+        const int myProci = UPstream::myProcNo(UPstream::commWorld());
+
+        Pout.prefix() =
+        (
+            '[' + Foam::name(myProci) + " a:" + Foam::name(localRanki) + "] "
+        );
+
+        Info<< "procIDs: "
+            << flatOutput(UPstream::procID(newComm)) << endl;
+
+        rankInfo(newComm);
+        Pout<< endl;
+        #endif
+
+        #if 1
+        // With every other rank
+        subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
+
+        for (label& val : subRanks)
+        {
+            if (val % 2) val = -1;
+        }
+
+        newComm.reset(UPstream::commWorld(), subRanks);
+        localRanki = UPstream::myProcNo(newComm);
+
+        Pout.prefix() =
+        (
+            '[' + Foam::name(myProci) + " b:" + Foam::name(localRanki) + "] "
+        );
+
+        Info<< "procIDs: "
+            << flatOutput(UPstream::procID(newComm)) << endl;
+
+        rankInfo(newComm);
+        Pout<< endl;
+        #endif
     }
 
     Info<< "\nEnd\n" << endl;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 14a5cbc7d1..ae95f15daf 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -33,6 +33,8 @@ Note
 #include "debug.H"
 #include "registerSwitch.H"
 #include "dictionary.H"
+#include "SHA1.H"
+#include "OSspecific.H"  // for hostName()
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -54,6 +56,85 @@ Foam::UPstream::commsTypeNames
 });
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Determine host grouping.
+// Uses SHA1 of hostname instead of MPI_Comm_split or MPI_Comm_split_type
+// for two reasons:
+// - Comm_split returns an MPI_COMM_NULL on non-participating process
+//   which does not easily fit into the OpenFOAM framework
+//
+// - use the SHA1 of hostname allows a single MPI_Gather, determination of
+//   the inter-host vs intra-host (on the master) followed by a single
+//   broadcast of integers.
+//
+// Returns: the unique host indices with the leading hosts encoded
+// with negative values
+static List<int> getHostGroupIds(const label parentCommunicator)
+{
+    const label numProcs = UPstream::nProcs(parentCommunicator);
+
+    List<SHA1Digest> digests;
+    if (UPstream::master(parentCommunicator))
+    {
+        digests.resize(numProcs);
+    }
+
+    // Could also add lowercase etc, but since hostName()
+    // will be consistent within the same node, there is no need.
+    SHA1Digest myDigest(SHA1(hostName()).digest());
+
+    // The fixed-length digest allows use of MPI_Gather
+    // and avoids Pstream::gatherList() during setup...
+
+    UPstream::mpiGather
+    (
+        reinterpret_cast<const char*>(myDigest.cdata_bytes()),
+        SHA1Digest::max_size(),     // Num send per proc
+        digests.data_bytes(),       // Recv
+        SHA1Digest::max_size(),     // Num recv per proc
+        parentCommunicator
+    );
+
+    List<int> hostIDs(numProcs);
+
+    // Compact numbering of hosts.
+    if (UPstream::master(parentCommunicator))
+    {
+        DynamicList<SHA1Digest> uniqDigests;
+
+        forAll(digests, proci)
+        {
+            const SHA1Digest& dig = digests[proci];
+
+            hostIDs[proci] = uniqDigests.find(dig);
+
+            if (hostIDs[proci] < 0)
+            {
+                // First appearance of host. Encode as leader
+                hostIDs[proci] = -(uniqDigests.size() + 1);
+                uniqDigests.push_back(dig);
+            }
+        }
+    }
+
+    UPstream::broadcast
+    (
+        hostIDs.data_bytes(),
+        hostIDs.size_bytes(),
+        parentCommunicator,
+        UPstream::masterNo()
+    );
+
+    return hostIDs;
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
@@ -62,6 +143,11 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
     haveThreads_ = haveThreads;
 
     label comm = -1;
+    labelList singleProc(Foam::one{}, 0);
+
+    // Redo communicators that were created during static initialisation.
+    // When parRun == true, redo with MPI components
+    // When parRun == false, just redo in case of future changes
 
     if (!parRun_)
     {
@@ -73,7 +159,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         freeCommunicator(UPstream::globalComm);
 
         // 0: worldComm
-        comm = allocateCommunicator(-1, Foam::labelList(Foam::one{}, 0), false);
+        comm = allocateCommunicator(-1, singleProc, false);
         if (comm != UPstream::globalComm)
         {
             // Failed sanity check
@@ -84,7 +170,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         }
 
         // 1: selfComm
-        comm = allocateCommunicator(-2, Foam::labelList(Foam::one{}, 0), false);
+        comm = allocateCommunicator(-2, singleProc, false);
         if (comm != UPstream::selfComm)
         {
             // Failed sanity check
@@ -100,7 +186,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
     else
     {
         // Redo communicators that were created during static initialisation
-        // but this time with Pstream components
+        // but this time with MPI components
 
         // Using (world, self) ordering
         freeCommunicator(UPstream::selfComm);
@@ -117,11 +203,8 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
                 << Foam::exit(FatalError);
         }
 
-        Pout.prefix() = '[' +  Foam::name(myProcNo(comm)) + "] ";
-        Perr.prefix() = Pout.prefix();
-
         // 1: selfComm
-        comm = allocateCommunicator(-2, Foam::labelList(Foam::one{}, 0), true);
+        comm = allocateCommunicator(-2, singleProc, true);
         if (comm != UPstream::selfComm)
         {
             // Failed sanity check
@@ -130,6 +213,9 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
                 << "  UPstream::selfComm:" << UPstream::selfComm
                 << Foam::exit(FatalError);
         }
+
+        Pout.prefix() = '[' +  Foam::name(myProcNo(globalComm)) + "] ";
+        Perr.prefix() = Pout.prefix();
     }
 
     if (debug)
@@ -180,7 +266,7 @@ Foam::label Foam::UPstream::allocateCommunicator
 (
     const label parentIndex,
     const labelUList& subRanks,
-    const bool doPstream
+    const bool withComponents
 )
 {
     const label index = getAvailableCommIndex(parentIndex);
@@ -193,7 +279,8 @@ Foam::label Foam::UPstream::allocateCommunicator
             << endl;
     }
 
-    // Initially treat as master, overwritten by allocatePstreamCommunicator
+    // Initially treat as master,
+    // overwritten by allocateCommunicatorComponents
     myProcNo_[index] = UPstream::masterNo();
 
     // The selected sub-ranks.
@@ -234,9 +321,9 @@ Foam::label Foam::UPstream::allocateCommunicator
     linearCommunication_[index].clear();
     treeCommunication_[index].clear();
 
-    if (doPstream && parRun())
+    if (withComponents && parRun())
     {
-        allocatePstreamCommunicator(parentIndex, index);
+        allocateCommunicatorComponents(parentIndex, index);
 
         // Could 'remember' locations of uninvolved ranks
         /// if (myProcNo_[index] < 0 && parentIndex >= 0)
@@ -257,10 +344,174 @@ Foam::label Foam::UPstream::allocateCommunicator
 }
 
 
+Foam::label Foam::UPstream::allocateInterHostCommunicator
+(
+    const label parentCommunicator
+)
+{
+    List<int> hostIDs = getHostGroupIds(parentCommunicator);
+
+    DynamicList<label> subRanks(hostIDs.size());
+
+    // From master to host-leader. Ranks between hosts.
+    forAll(hostIDs, proci)
+    {
+        // Is host leader?
+        if (hostIDs[proci] < 0)
+        {
+            subRanks.push_back(proci);
+        }
+    }
+
+    return allocateCommunicator(parentCommunicator, subRanks);
+}
+
+
+Foam::label Foam::UPstream::allocateIntraHostCommunicator
+(
+    const label parentCommunicator
+)
+{
+    List<int> hostIDs = getHostGroupIds(parentCommunicator);
+
+    DynamicList<label> subRanks(hostIDs.size());
+
+    // Intra-host ranks. Ranks within a host
+    int myHostId = hostIDs[UPstream::myProcNo(parentCommunicator)];
+    if (myHostId < 0) myHostId = -(myHostId + 1);  // Flip to generic id
+
+    forAll(hostIDs, proci)
+    {
+        int id = hostIDs[proci];
+        if (id < 0) id = -(id + 1);  // Flip to generic id
+
+        if (id == myHostId)
+        {
+            subRanks.push_back(proci);
+        }
+    }
+
+    return allocateCommunicator(parentCommunicator, subRanks);
+}
+
+
+bool Foam::UPstream::allocateHostCommunicatorPairs()
+{
+    // Use the world communicator (not global communicator)
+    const label parentCommunicator = worldComm;
+
+    // Skip if non-parallel
+    if (!parRun())
+    {
+        return false;
+    }
+
+    if (interHostComm_ >= 0 || intraHostComm_ >= 0)
+    {
+        // Failed sanity check
+        FatalErrorInFunction
+            << "Host communicator(s) already created!" << endl
+            << Foam::exit(FatalError);
+        return false;
+    }
+
+    interHostComm_ = getAvailableCommIndex(parentCommunicator);
+    intraHostComm_ = getAvailableCommIndex(parentCommunicator);
+
+    // Sorted order, purely cosmetic
+    if (intraHostComm_ < interHostComm_)
+    {
+        std::swap(intraHostComm_, interHostComm_);
+    }
+
+    // Overwritten later
+    myProcNo_[intraHostComm_] = UPstream::masterNo();
+    myProcNo_[interHostComm_] = UPstream::masterNo();
+
+    if (debug)
+    {
+        Pout<< "Allocating host communicators "
+            << interHostComm_ << ", " << intraHostComm_ << nl
+            << "    parent : " << parentCommunicator << nl
+            << endl;
+    }
+
+    List<int> hostIDs = getHostGroupIds(parentCommunicator);
+
+    DynamicList<int> subRanks(hostIDs.size());
+
+    // From master to host-leader. Ranks between hosts.
+    {
+        subRanks.clear();
+        forAll(hostIDs, proci)
+        {
+            // Is host leader?
+            if (hostIDs[proci] < 0)
+            {
+                subRanks.push_back(proci);
+
+                // Flip to generic host id
+                hostIDs[proci] = -(hostIDs[proci] + 1);
+            }
+        }
+
+        const label index = interHostComm_;
+
+        // Direct copy (subRanks is also int)
+        procIDs_[index] = subRanks;
+
+        // Implicitly: withComponents = true
+        if (parRun())  // Already checked...
+        {
+            allocateCommunicatorComponents(parentCommunicator, index);
+        }
+
+        // Sizing and filling are demand-driven
+        linearCommunication_[index].clear();
+        treeCommunication_[index].clear();
+    }
+
+    // Intra-host ranks. Ranks within a host
+    {
+        int myHostId = hostIDs[UPstream::myProcNo(parentCommunicator)];
+        if (myHostId < 0) myHostId = -(myHostId + 1);  // Flip to generic id
+
+        subRanks.clear();
+        forAll(hostIDs, proci)
+        {
+            int id = hostIDs[proci];
+            if (id < 0) id = -(id + 1);  // Flip to generic id
+
+            if (id == myHostId)
+            {
+                subRanks.push_back(proci);
+            }
+        }
+
+        const label index = intraHostComm_;
+
+        // Direct copy (subRanks is also int)
+        procIDs_[index] = subRanks;
+
+        // Implicitly: withComponents = true
+        if (parRun())  // Already checked...
+        {
+            allocateCommunicatorComponents(parentCommunicator, index);
+        }
+
+        // Sizing and filling are demand-driven
+        linearCommunication_[index].clear();
+        treeCommunication_[index].clear();
+    }
+
+    return true;
+}
+
+
 void Foam::UPstream::freeCommunicator
 (
     const label communicator,
-    const bool doPstream
+    const bool withComponents
 )
 {
     // Filter out any placeholders
@@ -269,6 +520,10 @@ void Foam::UPstream::freeCommunicator
         return;
     }
 
+    // Update demand-driven communicators
+    if (interHostComm_ == communicator) interHostComm_ = -1;
+    if (intraHostComm_ == communicator) intraHostComm_ = -1;
+
     if (debug)
     {
         Pout<< "Communicators : Freeing communicator " << communicator
@@ -277,9 +532,9 @@ void Foam::UPstream::freeCommunicator
             << endl;
     }
 
-    if (doPstream && parRun())
+    if (withComponents && parRun())
     {
-        freePstreamCommunicator(communicator);
+        freeCommunicatorComponents(communicator);
     }
 
     myProcNo_[communicator] = -1;
@@ -293,18 +548,6 @@ void Foam::UPstream::freeCommunicator
 }
 
 
-void Foam::UPstream::freeCommunicators(const bool doPstream)
-{
-    forAll(myProcNo_, communicator)
-    {
-        if (myProcNo_[communicator] >= 0)
-        {
-            freeCommunicator(communicator, doPstream);
-        }
-    }
-}
-
-
 int Foam::UPstream::baseProcNo(label comm, int procID)
 {
     while (UPstream::parent(comm) >= 0 && procID >= 0)
@@ -383,6 +626,48 @@ void Foam::UPstream::printCommTree(const label communicator)
 }
 
 
+Foam::label Foam::UPstream::commIntraHost()
+{
+    if (!parRun())
+    {
+        return worldComm;  // Don't know anything better to return
+    }
+    if (intraHostComm_ < 0)
+    {
+        allocateHostCommunicatorPairs();
+    }
+    return intraHostComm_;
+}
+
+
+Foam::label Foam::UPstream::commInterHost()
+{
+    if (!parRun())
+    {
+        return worldComm;  // Don't know anything better to return
+    }
+    if (interHostComm_ < 0)
+    {
+        allocateHostCommunicatorPairs();
+    }
+    return interHostComm_;
+}
+
+
+bool Foam::UPstream::hasHostComms()
+{
+    return (intraHostComm_ >= 0 || interHostComm_ >= 0);
+}
+
+
+void Foam::UPstream::clearHostComms()
+{
+    // Always with Pstream
+    freeCommunicator(intraHostComm_, true);
+    freeCommunicator(interHostComm_, true);
+}
+
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 bool Foam::UPstream::parRun_(false);
@@ -409,6 +694,9 @@ Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::treeCommunication_(16);
 
 
+Foam::label Foam::UPstream::intraHostComm_(-1);
+Foam::label Foam::UPstream::interHostComm_(-1);
+
 Foam::label Foam::UPstream::worldComm(0);
 Foam::label Foam::UPstream::warnComm(-1);
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 053eb8b9aa..c2b38d6778 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -217,6 +217,12 @@ private:
         //- Per processor the world index (into allWorlds_)
         static labelList worldIDs_;
 
+        //- Intra-host communicator
+        static label intraHostComm_;
+
+        //- Inter-host communicator (between host leaders)
+        static label interHostComm_;
+
 
     // Communicator specific data
 
@@ -247,8 +253,8 @@ private:
         //- Initialise entries for new communicator. Return the index
         static label getAvailableCommIndex(const label parentIndex);
 
-        //- Allocate a communicator with index
-        static void allocatePstreamCommunicator
+        //- Allocate MPI components of communicator with given index
+        static void allocateCommunicatorComponents
         (
             const label parentIndex,
             const label index
@@ -256,7 +262,11 @@ private:
 
         //- Free MPI components of communicator.
         //  Does not touch the first two communicators (SELF, WORLD)
-        static void freePstreamCommunicator(const label index);
+        static void freeCommunicatorComponents(const label index);
+
+        //- Allocate inter-host, intra-host communicators
+        //- with worldComm as parent
+        static bool allocateHostCommunicatorPairs();
 
 
 public:
@@ -348,6 +358,21 @@ public:
         static void printCommTree(const label communicator);
 
 
+    // Host Communicators
+
+        //- Demand-driven: Intra-host communicator (respects any local worlds)
+        static label commIntraHost();
+
+        //- Demand-driven: Inter-host communicator (respects any local worlds)
+        static label commInterHost();
+
+        //- Test for presence of any intra or inter host communicators
+        static bool hasHostComms();
+
+        //- Remove any existing intra and inter host communicators
+        static void clearHostComms();
+
+
     // Constructors
 
         //- Construct for given communication type
@@ -368,8 +393,8 @@ public:
             //! The sub-ranks of parent to use (ignore negative values)
             const labelUList& subRanks,
 
-            //! Call allocatePstreamCommunicator
-            const bool doPstream = true
+            //! Call allocateCommunicatorComponents()
+            const bool withComponents = true
         );
 
         //- Free a previously allocated communicator.
@@ -377,11 +402,20 @@ public:
         static void freeCommunicator
         (
             const label communicator,
-            const bool doPstream = true
+            const bool withComponents = true
         );
 
-        //- Free all communicators
-        static void freeCommunicators(const bool doPstream);
+        //- Allocate an inter-host communicator
+        static label allocateInterHostCommunicator
+        (
+            const label parentCommunicator = worldComm
+        );
+
+        //- Allocate an intra-host communicator
+        static label allocateIntraHostCommunicator
+        (
+            const label parentCommunicator = worldComm
+        );
 
 
         //- Wrapper class for allocating/freeing communicators
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index c9f74eca1d..573c094469 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -75,7 +75,7 @@ void Foam::UPstream::abort()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::UPstream::allocatePstreamCommunicator
+void Foam::UPstream::allocateCommunicatorComponents
 (
     const label,
     const label
@@ -83,7 +83,7 @@ void Foam::UPstream::allocatePstreamCommunicator
 {}
 
 
-void Foam::UPstream::freePstreamCommunicator(const label)
+void Foam::UPstream::freeCommunicatorComponents(const label)
 {}
 
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index d841666199..b980948228 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -451,12 +451,9 @@ void Foam::UPstream::shutdown(int errNo)
     }
 
     // Clean mpi communicators
-    forAll(myProcNo_, communicator)
+    forAllReverse(myProcNo_, communicator)
     {
-        if (myProcNo_[communicator] >= 0)
-        {
-            freePstreamCommunicator(communicator);
-        }
+        freeCommunicatorComponents(communicator);
     }
 
     if (!flag)
@@ -497,7 +494,7 @@ void Foam::UPstream::abort()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::UPstream::allocatePstreamCommunicator
+void Foam::UPstream::allocateCommunicatorComponents
 (
     const label parentIndex,
     const label index
@@ -534,7 +531,7 @@ void Foam::UPstream::allocatePstreamCommunicator
 
         // TBD: MPI_Comm_dup(MPI_COMM_WORLD, ...);
         // with pendingMPIFree_[index] = true
-        // Note: freePstreamCommunicator may need an update
+        // Note: freeCommunicatorComponents() may need an update
 
         MPI_Comm_rank
         (
@@ -661,13 +658,12 @@ void Foam::UPstream::allocatePstreamCommunicator
 }
 
 
-void Foam::UPstream::freePstreamCommunicator(const label index)
+void Foam::UPstream::freeCommunicatorComponents(const label index)
 {
     // Skip placeholders and pre-defined (not allocated) communicators
-
     if (UPstream::debug)
     {
-        Pout<< "freePstreamCommunicator: " << index
+        Pout<< "freeCommunicatorComponents: " << index
             << " from " << PstreamGlobals::MPICommunicators_.size() << endl;
     }
 

From 66a7f0c9db92c5e04c45192d333f3fa065ed5249 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Apr 2023 15:00:03 +0200
Subject: [PATCH 178/348] ENH: provide UPstream::finishedRequests() support

- for querying all outstanding requests:

     if (UPstream::finishedRequests(startRequest)) ...
     if (UPstream::finishedRequests(startRequest, -1)) ...

- for querying slice of outstanding requests:

     if (UPstream::finishedRequests(startRequest, 10)) ...
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  22 ++-
 src/Pstream/dummy/UPstreamRequest.C           |  10 +-
 src/Pstream/mpi/UPstreamRequest.C             | 179 ++++++++++++------
 3 files changed, 152 insertions(+), 59 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index c2b38d6778..e8daae4e31 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -559,8 +559,13 @@ public:
         //  if the position is out-of-range [0 to nRequests()],
         //  or the internal list of requests is empty.
         //
+        //  If checking a trailing portion of the list, it will also trim
+        //  the list of outstanding requests as a side-effect.
+        //  This is a feature (not a bug) to conveniently manange the list.
+        //
         //  \param pos starting position within the internal list of requests
-        static void waitRequests(const label pos);
+        //  \param len length of slice to check (negative = until the end)
+        static void waitRequests(const label pos, label len = -1);
 
         //- Wait until all requests have finished.
         //- Corresponds to MPI_Waitall()
@@ -577,7 +582,8 @@ public:
         //  \returns false if all requests have already been handled.
         //
         //  \param pos starting position within the internal list of requests
-        static bool waitAnyRequest(const label pos);
+        //  \param len length of slice to check (negative = until the end)
+        static bool waitAnyRequest(const label pos, label len = -1);
 
         //- Wait until some requests (from position onwards) have finished.
         //- Corresponds to MPI_Waitsome()
@@ -630,6 +636,18 @@ public:
         //  or for a null-request
         static bool finishedRequest(UPstream::Request& req);
 
+        //- Non-blocking comms: have all requests (from position onwards)
+        //- finished?
+        //- Corresponds to MPI_Testall()
+        //  A no-op and returns true if parRun() == false,
+        //  if there are no pending requests,
+        //  or if the index is out-of-range (0 to nRequests)
+        //  or the addressed range is empty etc.
+        //
+        //  \param pos starting position within the internal list of requests
+        //  \param len length of slice to check (negative = until the end)
+        static bool finishedRequests(const label pos, label len = -1);
+
         //- Non-blocking comms: have all requests finished?
         //- Corresponds to MPI_Testall()
         //  A no-op and returns true if parRun() == false or list is empty
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index 74fbe523e1..09807e6e9b 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -53,10 +53,10 @@ Foam::label Foam::UPstream::nRequests() noexcept { return 0; }
 
 void Foam::UPstream::resetRequests(const label n) {}
 
-void Foam::UPstream::waitRequests(const label pos) {}
+void Foam::UPstream::waitRequests(const label pos, label len) {}
 void Foam::UPstream::waitRequests(UList<UPstream::Request>&) {}
 
-bool Foam::UPstream::waitAnyRequest(const label pos)
+bool Foam::UPstream::waitAnyRequest(const label pos, label len)
 {
     return false;
 }
@@ -82,6 +82,12 @@ void Foam::UPstream::waitRequest(UPstream::Request&) {}
 bool Foam::UPstream::finishedRequest(const label i) { return true; }
 bool Foam::UPstream::finishedRequest(UPstream::Request&) { return true; }
 
+bool Foam::UPstream::finishedRequests(const label pos, label len)
+{
+    return true;
+}
+
+
 bool Foam::UPstream::finishedRequests(UList<UPstream::Request>&)
 {
     return true;
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index 5bb10904e0..de3f611637 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -69,28 +69,31 @@ void Foam::UPstream::resetRequests(const label n)
 }
 
 
-void Foam::UPstream::waitRequests(const label pos)
+void Foam::UPstream::waitRequests(const label pos, label len)
 {
     // No-op for non-parallel, no pending requests or out-of-range
     if
     (
         !UPstream::parRun()
-     || pos < 0
-     || pos >= PstreamGlobals::outstandingRequests_.size()
-     /// || !len
+     || (pos < 0 || pos >= PstreamGlobals::outstandingRequests_.size())
+     || !len
     )
     {
         return;
     }
 
     label count = (PstreamGlobals::outstandingRequests_.size() - pos);
+    bool trim = true;  // Trim the trailing part of the list
 
-    /// // Treat len < 0 like npos (ie, the rest of the list) but also
-    /// // apply range checking to avoid bad slices
-    /// if (len > 0 && len < count)
-    /// {
-    ///     count = len;
-    /// }
+    // Apply range-checking on slice with (len < 0) behaving like npos
+    // (ie, the rest of the list)
+    if (len >= 0 && len < count)
+    {
+        // A non-trailing slice
+        count = len;
+        trim = false;
+    }
+    // Have count >= 1
 
     auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
 
@@ -102,18 +105,34 @@ void Foam::UPstream::waitRequests(const label pos)
 
     profilingPstream::beginTiming();
 
-    // On success: sets each request to MPI_REQUEST_NULL
-    if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
+    if (count == 1)
     {
-        FatalErrorInFunction
-            << "MPI_Waitall returned with error"
-            << Foam::abort(FatalError);
+        // On success: sets request to MPI_REQUEST_NULL
+        if (MPI_Wait(waitRequests, MPI_STATUS_IGNORE))
+        {
+            FatalErrorInFunction
+                << "MPI_Wait returned with error"
+                << Foam::abort(FatalError);
+        }
+    }
+    else if (count > 1)
+    {
+        // On success: sets each request to MPI_REQUEST_NULL
+        if (MPI_Waitall(count, waitRequests, MPI_STATUSES_IGNORE))
+        {
+            FatalErrorInFunction
+                << "MPI_Waitall returned with error"
+                << Foam::abort(FatalError);
+        }
     }
 
     profilingPstream::addWaitTime();
 
     // ie, resetRequests(pos)
-    PstreamGlobals::outstandingRequests_.resize(pos);
+    if (trim)
+    {
+        PstreamGlobals::outstandingRequests_.resize(pos);
+    }
 
     if (UPstream::debug)
     {
@@ -170,15 +189,14 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 }
 
 
-bool Foam::UPstream::waitAnyRequest(const label pos)
+bool Foam::UPstream::waitAnyRequest(const label pos, label len)
 {
     // No-op for non-parallel, no pending requests or out-of-range
     if
     (
         !UPstream::parRun()
-     || pos < 0
-     || pos >= PstreamGlobals::outstandingRequests_.size()
-     /// || !len
+     || (pos < 0 || pos >= PstreamGlobals::outstandingRequests_.size())
+     || !len
     )
     {
         return false;
@@ -186,13 +204,14 @@ bool Foam::UPstream::waitAnyRequest(const label pos)
 
     label count = (PstreamGlobals::outstandingRequests_.size() - pos);
 
-    /// // Treat len < 0 like npos (ie, the rest of the list) but also
-    /// // apply range checking to avoid bad slices
-    ///
-    /// if (len >= 0 && len < count)
-    /// {
-    ///     count = len;
-    /// }
+    // Apply range-checking on slice with (len < 0) behaving like npos
+    // (ie, the rest of the list)
+    if (len >= 0 && len < count)
+    {
+        // A non-trailing slice
+        count = len;
+    }
+    // Have count >= 1
 
     auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
 
@@ -235,9 +254,8 @@ bool Foam::UPstream::waitSomeRequests
     if
     (
         !UPstream::parRun()
-     || pos < 0
-     || pos >= PstreamGlobals::outstandingRequests_.size()
-     /// || !len
+     || (pos < 0 || pos >= PstreamGlobals::outstandingRequests_.size())
+     // || !len
     )
     {
         if (indices)
@@ -249,13 +267,14 @@ bool Foam::UPstream::waitSomeRequests
 
     label count = (PstreamGlobals::outstandingRequests_.size() - pos);
 
-    /// // Treat len < 0 like npos (ie, the rest of the list) but also
-    /// // apply range checking to avoid bad slices
-    ///
-    /// if (len >= 0 && len < count)
-    /// {
-    ///     count = len;
-    /// }
+    // Apply range-checking on slice with (len < 0) behaving like npos
+    // (ie, the rest of the list)
+    // if (len >= 0 && len < count)
+    // {
+    //     // A non-trailing slice
+    //     count = len;
+    // }
+    // Have count >= 1
 
     auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
 
@@ -524,6 +543,12 @@ bool Foam::UPstream::finishedRequest(const label i)
         return true;
     }
 
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::finishedRequest : check request:"
+            << i << endl;
+    }
+
     auto& request = PstreamGlobals::outstandingRequests_[i];
 
     // Fast-path (no-op) for null request
@@ -532,22 +557,10 @@ bool Foam::UPstream::finishedRequest(const label i)
         return true;
     }
 
-    if (UPstream::debug)
-    {
-        Pout<< "UPstream::finishedRequest : checking request:"
-            << i << endl;
-    }
-
     // On success: sets request to MPI_REQUEST_NULL
     int flag = 0;
     MPI_Test(&request, &flag, MPI_STATUS_IGNORE);
 
-    if (UPstream::debug)
-    {
-        Pout<< "UPstream::finishedRequest : finished request:" << i
-            << endl;
-    }
-
     return flag != 0;
 }
 
@@ -581,6 +594,62 @@ bool Foam::UPstream::finishedRequest(UPstream::Request& req)
 }
 
 
+bool Foam::UPstream::finishedRequests(const label pos, label len)
+{
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if
+    (
+        !UPstream::parRun()
+     || (pos < 0 || pos >= PstreamGlobals::outstandingRequests_.size())
+     || !len
+    )
+    {
+        return true;
+    }
+
+    label count = (PstreamGlobals::outstandingRequests_.size() - pos);
+
+    // Apply range-checking on slice with (len < 0) behaving like npos
+    // (ie, the rest of the list)
+    if (len >= 0 && len < count)
+    {
+        // A non-trailing slice
+        count = len;
+    }
+    // Have count >= 1
+
+    if (UPstream::debug)
+    {
+        Pout<< "UPstream::finishedRequests : check " << count
+            << " requests starting at " << pos << endl;
+    }
+
+    auto* waitRequests = (PstreamGlobals::outstandingRequests_.data() + pos);
+
+    int flag = 1;
+
+    if (count == 1)
+    {
+        // Fast-path (no-op) for single null request
+        if (MPI_REQUEST_NULL == *waitRequests)
+        {
+            return true;
+        }
+
+        // On success: sets request to MPI_REQUEST_NULL
+        MPI_Test(waitRequests, &flag, MPI_STATUS_IGNORE);
+    }
+    else if (count > 1)
+    {
+        // On success: sets each request to MPI_REQUEST_NULL
+        // On failure: no request is modified
+        MPI_Testall(count, waitRequests, &flag, MPI_STATUSES_IGNORE);
+    }
+
+    return flag != 0;
+}
+
+
 bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
 {
     // No-op for non-parallel or no pending requests
@@ -721,12 +790,12 @@ bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
 
         if (req1 >= 0)
         {
-            PstreamGlobals:: outstandingRequests_[req1] = waitRequests[0];
+            PstreamGlobals::outstandingRequests_[req1] = waitRequests[0];
         }
 
         if (req2 >= 0)
         {
-            PstreamGlobals:: outstandingRequests_[req2] = waitRequests[1];
+            PstreamGlobals::outstandingRequests_[req2] = waitRequests[1];
         }
 
         // Flag indices as 'done'
@@ -744,7 +813,7 @@ bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
         {
             if (req1 >= 0)
             {
-                PstreamGlobals:: outstandingRequests_[req1] = waitRequests[0];
+                PstreamGlobals::outstandingRequests_[req1] = waitRequests[0];
                 req1 = -1;
             }
         }
@@ -752,7 +821,7 @@ bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
         {
             if (req2 >= 0)
             {
-                PstreamGlobals:: outstandingRequests_[req2] = waitRequests[1];
+                PstreamGlobals::outstandingRequests_[req2] = waitRequests[1];
                 req2 = -1;
             }
         }
@@ -775,7 +844,7 @@ void Foam::UPstream::waitRequestPair(label& req1, label& req2)
     int count = 0;
     MPI_Request waitRequests[2];
 
-    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    // No-op for out-of-range (eg, placeholder indices)
     if (req1 >= 0 && req1 < PstreamGlobals::outstandingRequests_.size())
     {
         waitRequests[0] = PstreamGlobals::outstandingRequests_[req1];
@@ -787,7 +856,7 @@ void Foam::UPstream::waitRequestPair(label& req1, label& req2)
         req1 = -1;  // Flag as 'done'
     }
 
-    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    // No-op for out-of-range (eg, placeholder indices)
     if (req2 >= 0 && req2 < PstreamGlobals::outstandingRequests_.size())
     {
         waitRequests[1] = PstreamGlobals::outstandingRequests_[req2];

From b12e47d9ab66f8694535b3079c75751609fe4ac8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 18 Apr 2023 11:57:44 +0200
Subject: [PATCH 179/348] CONFIG: increment API level to 2302

---
 META-INFO/api-info          | 2 +-
 wmake/rules/General/general | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/META-INFO/api-info b/META-INFO/api-info
index edf8f1afde..c176b198ba 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
-api=2301
+api=2302
 patch=230110
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index ca8d294ba7..f8a7831575 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,5 +1,5 @@
 #-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM=2301
+WM_VERSION = OPENFOAM=2302
 
 AR         = ar
 ARFLAGS    = cr

From 8434931c298b81575b49dc1d7ad1aac6c428f343 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 18 Apr 2023 11:54:11 +0200
Subject: [PATCH 180/348] CONFIG: support call of 'openfoam' wrapper in other
 in-project locations

- directory discovery originally designed for a sub-dir location
  (eg, etc/openfoam) but failed if called from within the sub-dir
  itself.

  Now simply assume it is located in the project directory or the etc/
  sub-dir, so that it can also be relocated into the project directory
  in the future (pending changes to RPM and debian packaging)
---
 bin/tools/vscode-settings | 10 +++++++---
 etc/openfoam              | 38 ++++++++++++++++++++++++++------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/bin/tools/vscode-settings b/bin/tools/vscode-settings
index 2b6e851eac..6cf4804cd6 100755
--- a/bin/tools/vscode-settings
+++ b/bin/tools/vscode-settings
@@ -6,7 +6,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2020 OpenCFD Ltd.
+#     Copyright (C) 2020-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -19,7 +19,7 @@
 #
 # Example
 #     bin/tools/vscode-settings > .vscode/settings.json
-#     etc/openfoam -spdp -int64 bin/tools/vscode-settings
+#     openfoam -spdp -int64 bin/tools/vscode-settings
 #
 # Environment
 #     WM_PROJECT_DIR, WM_PROJECT_USER_DIR, WM_OPTIONS
@@ -43,7 +43,7 @@ Emit some settings for Visual Studio Code + OpenFOAM
 
 For example,
     bin/tools/vscode-settings > .vscode/settings.json
-    etc/openfoam -spdp -int64 bin/tools/vscode-settings
+    openfoam -spdp -int64 bin/tools/vscode-settings
 
 USAGE
     exit 0  # clean exit
@@ -80,6 +80,10 @@ echo "options: ${WM_OPTIONS:?not set}" 1>&2
 if [ -x "$session" ]
 then
     echo "session: $session" 1>&2
+elif [ -x "$projectDir"/openfoam ]
+then
+    session="$projectDir"/openfoam
+    echo "session: $session" 1>&2
 else
     echo "No session: $session" 1>&2
 fi
diff --git a/etc/openfoam b/etc/openfoam
index 7f775cfc59..2393ab3620 100755
--- a/etc/openfoam
+++ b/etc/openfoam
@@ -6,7 +6,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2019-2021 OpenCFD Ltd.
+#     Copyright (C) 2019-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -20,10 +20,6 @@
 #     the OpenFOAM etc/bashrc file from the project directory.
 #
 # Note
-#     This script normally exists in the $WM_PROJECT_DIR/etc/ directory.
-#     Do not copy/move/link to other locations. Use instead an edited copy of
-#     `bin/tools/openfoam.in` with a hard-coded projectDir entry.
-#
 #     See OpenFOAM etc/bashrc for (command-line) preferences.
 #     Some equivalent settings:
 #       -sp     | -DWM_PRECISION_OPTION=SP
@@ -31,15 +27,33 @@
 #       -int32  | -DWM_LABEL_SIZE=32
 #       -int64  | -DWM_LABEL_SIZE=64
 #
-#     The '-D' options grant even more flexibility. For example,
-#         etc/openfoam -DWM_COMPILER=Clang
+#     Can use '-D' options for even more flexibility. For example,
+#
+#         openfoam -DWM_COMPILER=Clang
+#
+# Warning
+#     This script is to be located in one of the following locations:
+#       - $WM_PROJECT_DIR/
+#       - $WM_PROJECT_DIR/etc/
+#       - $WM_PROJECT_DIR/share/
+#
+#     Do not copy/move/link to other locations.
+#     Use instead an edited copy of `bin/tools/openfoam.in`
+#     with a hard-coded projectDir entry.
 #
 # SeeAlso
 #     META-INFO/README.md for other routines that also use META-INFO.
 #
 #------------------------------------------------------------------------------
-# Auto-detect from location. Do not call from within the etc/directory itself!
-projectDir="$(\cd "$(dirname "${0%/*}")" && \pwd -L)"
+# Auto-detect from location
+projectDir="$(\cd "$(dirname "$0")" && \pwd -L)"
+
+# Handle common sub-directory locations
+case "$projectDir" in
+(*/etc | */share)
+    projectDir="${projectDir%/*}"
+    ;;
+esac
 
 #------------------------------------------------------------------------------
 printHelp() {
@@ -115,7 +129,7 @@ unset optTestTut
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-    ('') ;;
+    ('') ;;     # Ignore empty option
     (- | -- | /)
         shift
         break   # Stop option parsing
@@ -213,9 +227,9 @@ fi
 
 
 # Remove current OpenFOAM environment
-if [ -d "$WM_PROJECT_DIR" ] && [ -f "$WM_PROJECT_DIR/etc/config.sh/unset" ]
+if [ -d "$WM_PROJECT_DIR" ] && [ -f "$WM_PROJECT_DIR"/etc/config.sh/unset ]
 then
-    . "$WM_PROJECT_DIR/etc/config.sh/unset" || true
+    . "$WM_PROJECT_DIR"/etc/config.sh/unset || true
 fi
 
 

From 32df7c2e924f0a369999ceba7b9a1fb2e55a6593 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 17 Apr 2023 11:08:04 +0100
Subject: [PATCH 181/348] ENH: multiLevel: native scotch implementation of
 multi-level

---
 .../decompose/ptscotchDecomp/ptscotchDecomp.C | 27 ++++++-
 .../decompose/scotchDecomp/scotchDecomp.C     | 73 ++++++++++++++++++-
 .../decompose/scotchDecomp/scotchDecomp.H     | 35 ++++++++-
 3 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 2bf6e7d01c..6fc60079e7 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -395,6 +395,31 @@ Foam::label Foam::ptscotchDecomp::decompose
     }
     else
     {
+        // Check for optional domains/weights
+        List<SCOTCH_Num> domains;
+        List<scalar> dWeights;
+        if
+        (
+            coeffsDict_.readIfPresent
+            (
+                "domains",
+                domains,
+                keyType::LITERAL
+            )
+         && coeffsDict_.readIfPresent
+            (
+                "domainWeights",
+                dWeights,
+                keyType::LITERAL
+            )
+        )
+        {
+            WarningInFunction
+                << "Ignoring multi-level decomposition since"
+                << " not supported by ptscotch."
+                << " It is supported by scotch" << endl;
+        }
+
         if (debug & 2)
         {
             Pout<< "SCOTCH_archCmplt" << endl;
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index 514542e6b3..a16695326b 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2021,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -313,6 +313,12 @@ Foam::label Foam::scotchDecomp::decomposeSerial
     );
 
     List<SCOTCH_Num> procWeights;
+
+    // Do optional tree-like/multi-level decomposition by specifying
+    // domains/weights
+    List<SCOTCH_Num> domains;
+    List<scalar> dWeights;
+
     if
     (
         coeffsDict_.readIfPresent("processorWeights", procWeights)
@@ -337,6 +343,71 @@ Foam::label Foam::scotchDecomp::decomposeSerial
             "SCOTCH_archCmpltw"
         );
     }
+    else if
+    (
+        coeffsDict_.readIfPresent("domains", domains, keyType::LITERAL)
+     && coeffsDict_.readIfPresent("domainWeights", dWeights, keyType::LITERAL)
+    )
+    {
+        // multi-level
+
+        label nTotal = 1;
+        for (const label n : domains)
+        {
+            nTotal *= n;
+        }
+
+        if (nTotal < nDomains())
+        {
+            const label sz = domains.size();
+            domains.setSize(sz+1);
+            dWeights.setSize(sz+1);
+            for (label i = sz-1; i >= 0; i--)
+            {
+                domains[i+1] = domains[i];
+                dWeights[i+1] = dWeights[i];
+            }
+
+            if (nDomains() % nTotal)
+            {
+                FatalErrorInFunction
+                    << "Top level decomposition specifies " << nDomains()
+                    << " domains which is not equal to the product of"
+                    << " all sub domains " << nTotal
+                    << exit(FatalError);
+            }
+
+            domains[0] = nDomains() / nTotal;
+            dWeights[0] = scalar(1);
+        }
+
+
+        // Note: min, not gMin since routine runs on master only.
+        const scalar minWeights = min(dWeights);
+
+        // Convert to integers.
+        List<SCOTCH_Num> weights(dWeights.size());
+
+        forAll(weights, i)
+        {
+            weights[i] = static_cast<SCOTCH_Num>
+            (
+                (dWeights[i]/minWeights - 1) + 1
+            );
+        }
+
+        check
+        (
+            SCOTCH_archTleaf
+            (
+                &archdat,
+                SCOTCH_Num(domains.size()),
+                domains.cdata(),
+                weights.cdata()
+            ),
+            "SCOTCH_archTleaf"
+        );
+    }
     else
     {
         check
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index 051a8ecf99..6ce9588c97 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2021,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,6 +201,39 @@ Description
 
     </ol>
 
+
+    Also support for multi-level decomposition by specifying inter-level
+    communication weights:
+
+    \verbatim
+    numberOfSubdomains  2048;
+    coeffs
+    {
+        // Divide into 64 clusters, each of 32 cores
+        domains (64 32);
+        // Inside a cluster the communication weight is 1% of that inbetween
+        // clusters
+        domainWeights (1 0.01);
+    }
+    \endverbatim
+
+    Alternatively the first-level decomposition can be left out by assuming
+    weights are 1 for that level:
+
+    \verbatim
+    numberOfSubdomains  2048;
+    coeffs
+    {
+        // Divide into 2048/32 clusters
+        domains (32);
+        // Inside a cluster the communication weight is 1% of that inbetween
+        // clusters
+        domainWeights (0.01);
+    }
+    \endverbatim
+
+
+
 Note
     \c gpart can be found in the current search path by adding the respective
     \c bin folder from the Scotch installation, namely by running the following

From 35c2b4b603c3f47e5e94262690dbca740181a03c Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Thu, 16 Mar 2023 09:01:33 +0000
Subject: [PATCH 182/348] BUG: splash model - correction and code refactoring

---
 .../KinematicSurfaceFilm.C                    | 100 +++++++-----------
 .../KinematicSurfaceFilm.H                    |  29 +++--
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.C     |  12 +--
 3 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.C
index 9805153880..e3fb81f101 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.C
@@ -37,51 +37,18 @@ using namespace Foam::constant::mathematical;
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::wordList Foam::KinematicSurfaceFilm<CloudType>::interactionTypeNames_
+const Foam::Enum
+<
+    typename Foam::KinematicSurfaceFilm<CloudType>::interactionType
+>
+Foam::KinematicSurfaceFilm<CloudType>::interactionTypeNames
 ({
-    "absorb", "bounce", "splashBai"
+    { interactionType::absorb, "absorb" },
+    { interactionType::bounce, "bounce" },
+    { interactionType::splashBai, "splashBai" },
 });
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-template<class CloudType>
-typename Foam::KinematicSurfaceFilm<CloudType>::interactionType
-Foam::KinematicSurfaceFilm<CloudType>::interactionTypeEnum(const word& it) const
-{
-    forAll(interactionTypeNames_, i)
-    {
-        if (interactionTypeNames_[i] == it)
-        {
-            return interactionType(i);
-        }
-    }
-
-    FatalErrorInFunction
-        << "Unknown interaction type " << it
-        << ". Valid interaction types include: " << interactionTypeNames_
-        << abort(FatalError);
-
-    return interactionType(0);
-}
-
-
-template<class CloudType>
-Foam::word Foam::KinematicSurfaceFilm<CloudType>::interactionTypeStr
-(
-    const interactionType& it
-) const
-{
-    if (it >= interactionTypeNames_.size())
-    {
-        FatalErrorInFunction
-            << "Unknown interaction type enumeration" << abort(FatalError);
-    }
-
-    return interactionTypeNames_[it];
-}
-
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
@@ -415,8 +382,8 @@ void Foam::KinematicSurfaceFilm<CloudType>::splashInteraction
     const scalar dBarSplash = 1/cbrt(6.0)*cbrt(mRatio/Ns)*d + ROOTVSMALL;
 
     // Cumulative diameter splash distribution
-    const scalar dMax = 0.9*cbrt(mRatio)*d;
-    const scalar dMin = 0.1*dMax;
+    const scalar dMax = dMaxSplash_ > 0 ? dMaxSplash_ : 0.9*cbrt(mRatio)*d;
+    const scalar dMin = dMinSplash_ > 0 ? dMinSplash_ : 0.1*dMax;
     const scalar K = exp(-dMin/dBarSplash) - exp(-dMax/dBarSplash);
 
     // Surface energy of secondary parcels [J]
@@ -457,7 +424,9 @@ void Foam::KinematicSurfaceFilm<CloudType>::splashInteraction
     const scalar logD = log(d);
     const scalar coeff2 = log(dNew[0]) - logD + ROOTVSMALL;
     scalar coeff1 = 0.0;
-    forAll(dNew, i)
+
+    // Note: loop from i = 1 to (p-1)
+    for (int i = 1; i < parcelsPerSplash_; ++i)
     {
         coeff1 += sqr(log(dNew[i]) - logD);
     }
@@ -527,27 +496,32 @@ Foam::KinematicSurfaceFilm<CloudType>::KinematicSurfaceFilm
     areaFilms_(),
     interactionType_
     (
-        interactionTypeEnum(this->coeffDict().getWord("interactionType"))
+        interactionTypeNames.get("interactionType", this->coeffDict())
     ),
     parcelTypes_(this->coeffDict().getOrDefault("parcelTypes", labelList())),
-    deltaWet_(0.0),
+    deltaWet_(Zero),
     splashParcelType_(0),
     parcelsPerSplash_(0),
-    Adry_(0.0),
-    Awet_(0.0),
-    Cf_(0.0),
+    dMaxSplash_(-1),
+    dMinSplash_(-1),
+    Adry_(Zero),
+    Awet_(Zero),
+    Cf_(Zero),
     nParcelsSplashed_(0)
 {
-    Info<< "    Applying " << interactionTypeStr(interactionType_)
+    Info<< "    Applying " << interactionTypeNames[interactionType_]
         << " interaction model" << endl;
 
-    if (interactionType_ == itSplashBai)
+    if (interactionType_ == interactionType::splashBai)
     {
         this->coeffDict().readEntry("deltaWet", deltaWet_);
         splashParcelType_ =
             this->coeffDict().getOrDefault("splashParcelType", -1);
         parcelsPerSplash_ =
             this->coeffDict().getOrDefault("parcelsPerSplash", 2);
+        dMinSplash_ = this->coeffDict().getOrDefault("dMinSplash", -1);
+        dMaxSplash_ = this->coeffDict().getOrDefault("dMaxSplash", -1);
+
         this->coeffDict().readEntry("Adry", Adry_);
         this->coeffDict().readEntry("Awet", Awet_);
         this->coeffDict().readEntry("Cf", Cf_);
@@ -573,12 +547,14 @@ Foam::KinematicSurfaceFilm<CloudType>::KinematicSurfaceFilm
     deltaWet_(sfm.deltaWet_),
     splashParcelType_(sfm.splashParcelType_),
     parcelsPerSplash_(sfm.parcelsPerSplash_),
+    dMaxSplash_(sfm.dMaxSplash_),
+    dMinSplash_(sfm.dMinSplash_),
     Adry_(sfm.Adry_),
     Awet_(sfm.Awet_),
     Cf_(sfm.Cf_),
     nParcelsSplashed_(sfm.nParcelsSplashed_)
 {
-    if (interactionType_ == itSplashBai)
+    if (interactionType_ == interactionType::splashBai)
     {
         init(initThermo);
     }
@@ -620,14 +596,14 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
 
         switch (interactionType_)
         {
-            case itBounce:
+            case interactionType::bounce:
             {
                 bounceInteraction(p, pp, facei, keepParticle);
 
                 break;
             }
 
-            case itAbsorb:
+            case interactionType::absorb:
             {
                 const scalar m = p.nParticle()*p.mass();
 
@@ -637,7 +613,7 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
                 break;
             }
 
-            case itSplashBai:
+            case interactionType::splashBai:
             {
                 const scalarField X(thermo_->size(), 1);
                 const scalar mu = thermo_->mu(pRef_, TRef_, X);
@@ -693,14 +669,14 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
 
         switch (interactionType_)
         {
-            case itBounce:
+            case interactionType::bounce:
             {
                 bounceInteraction(p, pp, facei, keepParticle);
 
                 break;
             }
 
-            case itAbsorb:
+            case interactionType::absorb:
             {
                 const scalar m = p.nParticle()*p.mass();
 
@@ -711,7 +687,7 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
                 break;
             }
 
-            case itSplashBai:
+            case interactionType::splashBai:
             {
                 auto& liqFilm =
                     refCast
@@ -725,13 +701,9 @@ bool Foam::KinematicSurfaceFilm<CloudType>::transferParcel
                 const scalar TRef = liqFilm.Tref();
 
                 const scalar mu = liqFilm.thermo().mu(pRef, TRef, X);
-                const scalar sigma =
-                    liqFilm.thermo().sigma(pRef, TRef, X);
+                const scalar sigma = liqFilm.thermo().sigma(pRef, TRef, X);
 
-                const bool dry
-                (
-                    film.h()[filmFacei] < this->deltaWet_
-                );
+                const bool dry = film.h()[filmFacei] < this->deltaWet_;
 
                 if (dry)
                 {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.H
index d0300ef2d6..3c54dd001e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/KinematicSurfaceFilm/KinematicSurfaceFilm.H
@@ -33,7 +33,7 @@ Description
     Kinematic parcel surface film model.
 
     Responsible for:
-    - injecting parcelss from the film model into the cloud, e.g. for dripping
+    - injecting parcels from the film model into the cloud, e.g. for dripping
     - parcel interaction with the film, e.g absorb, bounce, splash
 
 SourceFiles
@@ -48,6 +48,7 @@ SourceFiles
 #include "SurfaceFilmModel.H"
 #include "UPtrList.H"
 #include "liquidMixtureProperties.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,24 +82,15 @@ public:
     // Public Data
 
         //- Options for the interaction types
-        enum interactionType
+        enum class interactionType
         {
-            itAbsorb,       //!< "absorb"
-            itBounce,       //!< "bounce"
-            itSplashBai     //!< "splashBai"
+            absorb,       //!< absorb
+            bounce,       //!< bounce
+            splashBai     //!< Bai splash model
         };
 
         //- Names for interactionType
-        static wordList interactionTypeNames_;
-
-
-    // Public Member Functions
-
-        //- Return interaction type enum from word
-        interactionType interactionTypeEnum(const word& it) const;
-
-        //- Return word from interaction type enum
-        word interactionTypeStr(const interactionType& it) const;
+        static const Enum<interactionType> interactionTypeNames;
 
 
 protected:
@@ -162,6 +154,13 @@ protected:
             //- Number of new parcels resulting from splash event
             label parcelsPerSplash_;
 
+            //- Maximum splash particle diameter for Chi-square distribution
+            //  Default is incident particle diameter
+            scalar dMaxSplash_;
+
+            //- Minimum splash particle diameter for Chi-square distribution
+            //  Default is 0.1 dMaxSplash
+            scalar dMinSplash_;
 
             // Surface roughness coefficient typically in the range 1300 - 5200
             // and decreases with increasing surface roughness
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index dbef189cc8..b44429cdb1 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -83,14 +83,14 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
 
         switch (this->interactionType_)
         {
-            case KinematicSurfaceFilm<CloudType>::itBounce:
+            case KinematicSurfaceFilm<CloudType>::interactionType::bounce:
             {
                 this->bounceInteraction(p, pp, facei, keepParticle);
 
                 break;
             }
 
-            case KinematicSurfaceFilm<CloudType>::itAbsorb:
+            case KinematicSurfaceFilm<CloudType>::interactionType::absorb:
             {
                 const scalar m = p.nParticle()*p.mass();
 
@@ -100,7 +100,7 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
                 break;
             }
 
-            case KinematicSurfaceFilm<CloudType>::itSplashBai:
+            case KinematicSurfaceFilm<CloudType>::interactionType::splashBai:
             {
                 // Local pressure
                 const scalar pc = thermo_.thermo().p()[p.cell()];
@@ -158,14 +158,14 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
 
         switch (this->interactionType_)
         {
-            case KinematicSurfaceFilm<CloudType>::itBounce:
+            case KinematicSurfaceFilm<CloudType>::interactionType::bounce:
             {
                 this->bounceInteraction(p, pp, facei, keepParticle);
 
                 break;
             }
 
-            case KinematicSurfaceFilm<CloudType>::itAbsorb:
+            case KinematicSurfaceFilm<CloudType>::interactionType::absorb:
             {
                 const scalar m = p.nParticle()*p.mass();
 
@@ -176,7 +176,7 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
                 break;
             }
 
-            case KinematicSurfaceFilm<CloudType>::itSplashBai:
+            case KinematicSurfaceFilm<CloudType>::interactionType::splashBai:
             {
                 // Local pressure
                 const scalar pc = thermo_.thermo().p()[p.cell()];

From 7bef18a274b20d5b0867b4dfb670966d28f05093 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 21 Apr 2023 11:33:48 +0200
Subject: [PATCH 183/348] STYLE: document const-ness of isA, refCast

---
 applications/test/router/Test-processorRouter.C   |  4 ++--
 src/OpenFOAM/db/typeInfo/typeInfo.H               | 15 +++++++++++----
 .../refinementSurfaces/refinementSurfaces.C       |  6 +++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C
index 66aac7bd05..808dda5f6e 100644
--- a/applications/test/router/Test-processorRouter.C
+++ b/applications/test/router/Test-processorRouter.C
@@ -66,8 +66,8 @@ labelList procNeighbours(const polyMesh& mesh)
 
     forAll(mesh.boundaryMesh(), patchi)
     {
-        const processorPolyPatch* procPatch =
-            isA<const processorPolyPatch>(mesh.boundaryMesh()[patchi]);
+        const auto* procPatch =
+            isA<processorPolyPatch>(mesh.boundaryMesh()[patchi]);
 
         if (procPatch)
         {
diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H
index fbd594df9a..c6897a2064 100644
--- a/src/OpenFOAM/db/typeInfo/typeInfo.H
+++ b/src/OpenFOAM/db/typeInfo/typeInfo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,7 +80,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-//- Check if dynamic_cast to \c Type is possible
+//- Check if dynamic_cast to \c Type is possible.
+//  The template types should \em not include any \c const qualifier.
 //  \returns const pointer to cast object, nullptr if cast is not possible
 template<class Type, class U>
 inline const Type* isA(const U& obj)
@@ -99,6 +100,7 @@ inline bool isType(const U& obj)
 
 
 //- A dynamic_cast (for references) that generates FatalError on failed casts
+//  Respects the constness of the template types.
 template<class Type, class U>
 inline Type& dynamicCast(U& obj)
 {
@@ -118,6 +120,7 @@ inline Type& dynamicCast(U& obj)
 
 
 //- A dynamic_cast (for references) that generates FatalIOError on failed casts
+//  Respects the constness of the template types.
 template<class Type, class U>
 inline Type& dynamicCast(U& obj, const dictionary& dict)
 {
@@ -136,8 +139,10 @@ inline Type& dynamicCast(U& obj, const dictionary& dict)
 }
 
 
-//- A dynamic_cast (for references) that generates FatalError on failed casts,
-//- uses the virtual type() method for error messages.
+//- A dynamic_cast (for references).
+//- Generates a FatalError on failed casts and uses the virtual type()
+//- method for error messages.
+//  Respects the constness of the template types.
 template<class Type, class U>
 inline Type& refCast(U& obj)
 {
@@ -158,6 +163,7 @@ inline Type& refCast(U& obj)
 
 //- A dynamic_cast (for references) that generates FatalIOError on failed casts,
 //- uses the virtual type() method for error messages.
+//  Respects the constness of the template types.
 template<class Type, class U>
 inline Type& refCast(U& obj, const dictionary& dict)
 {
@@ -179,6 +185,7 @@ inline Type& refCast(U& obj, const dictionary& dict)
 //- A dynamic_cast (for references) that generates FatalError on failed casts,
 //- uses the virtual type() method for error messages.
 //- The index can be used to convey additional context.
+//  Respects the constness of the template types.
 template<class Type, class U>
 inline Type& refCast(U& obj, const label index)
 {
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 85dec0a3ee..29c101a33c 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -835,7 +835,7 @@ void Foam::refinementSurfaces::setMinLevelFields(const shellSurfaces& shells)
 
             // In case of triangulated surfaces only cache value if triangle
             // centre and vertices are in same shell
-            const auto* tsPtr = isA<const triSurface>(geom);
+            const auto* tsPtr = isA<triSurface>(geom);
 
             if (tsPtr)
             {
@@ -936,11 +936,11 @@ void Foam::refinementSurfaces::setCurvatureMinLevelFields
         if (maxCurvLevel[surfI] <= 0)
         {
             continue;
-        } 
+        }
 
         const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
 
-        const auto* tsPtr = isA<const triSurface>(geom);
+        const auto* tsPtr = isA<triSurface>(geom);
 
         // Cache the refinement level (max of surface level and shell level)
         // on a per-element basis. Only makes sense if there are lots of

From 2b1061420c8a750304d42b25e8468b392e33c4c2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 21 Apr 2023 11:33:48 +0200
Subject: [PATCH 184/348] STYLE: remove trailing space, tabs

---
 .../manipulation/checkMesh/checkTopology.C    |   2 +-
 .../splitMeshRegions/splitMeshRegions.C       |   4 +-
 .../viewFactorsGen/viewFactorsGen.C           |  12 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C |   2 +-
 .../sensitivitySurfaceIncompressible.H        |   8 +-
 .../diffusionGasEvaporation.C                 |   2 +-
 .../isoAdvection/isoAdvection.H               |   2 +-
 .../rhoSimpleFoam/squareBendLiq/Allrun        |   2 +-
 .../turbulent/kOmegaSST/opt/system/fvSolution |   2 +-
 .../simpleFoam/rotatingCylinders/0/U          |   2 +-
 .../simpleFoam/rotatingCylinders/0/p          |   2 +-
 .../rotatingCylinders/system/blockMeshDict    |   2 +-
 .../rigidBodyHull/background/0.orig/epsilon   | 114 +++++++++---------
 .../overInterDyMFoam/simpleRotor/0.orig/p_rgh |   2 +-
 .../simpleRotor/system/controlDict            |   2 +-
 15 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index f461e45c43..61dd8c1b51 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -113,7 +113,7 @@ void Foam::checkPatch
             labelList()             // null value
         );
 
-        
+
         label labelTyp = TopoType::MANIFOLD;
         forAll(meshEdges, edgei)
         {
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 13667b2a23..5a8c6c5697 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -57,7 +57,7 @@ Description
         -combineZones '((zoneA "zoneB.*")(none otherZone))
     This can be combined with e.g. 'cellZones' or 'cellZonesOnly'. The
     addZones option supplies the destination region name as first element in
-    the list. The combineZones option synthesises the region name e.g. 
+    the list. The combineZones option synthesises the region name e.g.
         zoneA_zoneB0_zoneB1
 
     - cellZonesOnly does not do a walk and uses the cellZones only. Use
@@ -1830,7 +1830,7 @@ int main(int argc, char *argv[])
             {
                 label ownCluster = clusterID[mesh.faceOwner()[facei]];
                 label neiCluster = clusterID[mesh.faceNeighbour()[facei]];
-                
+
                 if (ownCluster != neiCluster)
                 {
                     blockedFace[facei] = true;
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index c8b74c6b42..9e9c3d3440 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -39,27 +39,28 @@ Description
     and the distance between face centres.
 
     The input from viewFactorsDict are:
-
+    \verbatim
         GaussQuadTol              0.1;      // GaussQuad  error
         distTol                   8;        // R/Average(rm)
         alpha                     0.22;     // Use for common edges for 2LI
+    \endverbatim
 
 
     For debugging purposes, the following entries can be set in viewFactorsDict:
-
+    \verbatim
         writeViewFactorMatrix     true;
         writeFacesAgglomeration   false;
-        dumpRays		          false;
-
+        dumpRays                  false;
 
         writeViewFactorMatrix   writes the sum of the VF on each face.
         writeFacesAgglomeration writes the agglomeration
         dumpRays                dumps rays
-
+    \endverbatim
 
     The participating patches in the VF calculation have to be in the
     'viewFactorWall' patch group (in the polyMesh/boundary file), e.g.
 
+    \verbatim
     floor
     {
         type            wall;
@@ -67,6 +68,7 @@ Description
         nFaces          100;
         startFace       3100;
     }
+    \endverbatim
 
     Compile with -DNO_CGAL only if no CGAL present - CGAL AABB tree performs
     better than the built-in octree.
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 7c9eae6219..96c019f9b6 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -216,7 +216,7 @@ void Foam::dynamicRefineFvMesh::mapFields(const mapPolyMesh& mpm)
             const label oldCelli = cellMap[celli];
             if (oldCelli >= 0 && reverseCellMap[oldCelli] >= 0)
             {
-                // Found master cell. 
+                // Found master cell.
                 nSubCells[oldCelli]++;
             }
         }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H
index 38f4f5326f..a1939835de 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H
@@ -36,7 +36,7 @@ Description
         The computation of the sensitivity derivatives  follows the (E-)SI
         formulation of
 
-            Kavvadias, I. S., Papoutsis-Kiachagias, E. M., 
+            Kavvadias, I. S., Papoutsis-Kiachagias, E. M.,
             Giannakoglou, K. C. (2015).
             On the proper treatment of grid sensitivities in continuous adjoint
             methods for shape optimization.
@@ -45,7 +45,7 @@ Description
 
         whereas their smoothing based on the computation of the 'Sobolev
         gradient' is derived from
-    
+
             Vassberg J. C., Jameson A. (2006).
             Aerodynamic Shape Optimization Part I: Theoretical Background.
             VKI Lecture Series, Introduction to Optimization and
@@ -119,7 +119,7 @@ protected:
         //- Write geometric info for use by external programs
         bool writeGeometricInfo_;
 
-        //- Smooth sensitivity derivatives based on the computation of the 
+        //- Smooth sensitivity derivatives based on the computation of the
         //- 'Sobolev gradient'
         bool smoothSensitivities_;
 
@@ -142,7 +142,7 @@ protected:
         //- Set suffix name for sensitivity fields
         void setSuffixName();
 
-        //- Smooth sensitivity derivatives based on the computation of the 
+        //- Smooth sensitivity derivatives based on the computation of the
         //- 'Sobolev gradient'
         void smoothSensitivities();
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C
index 7a9139bc0b..18ea28da4d 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C
@@ -185,7 +185,7 @@ Foam::meltingEvaporationModels::diffusionGasEvaporation<Thermo, OtherThermo>
         )
     );
 
-	const volScalarField Ygm(max(from*YvSat + to*Yv, Zero));
+    const volScalarField Ygm(max(from*YvSat + to*Yv, Zero));
 
     const multiphaseInterSystem& fluid = this->fluid();
 
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H
index 0e394ee6e8..40c4162f94 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.H
@@ -54,7 +54,7 @@ Description
     Extension to porous media flows:
     \verbatim
         Missios, K., Jacobsen, N. G., Moeller, K., & Roenby, J.
-        Using the isoAdvector Geometric VOF Method for Interfacial Flows 
+        Using the isoAdvector Geometric VOF Method for Interfacial Flows
         Through Porous Media. MARINE 2021.
     \endverbatim
 
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
index 7aba5f9834..83cb4993d5 100755
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
@@ -20,7 +20,7 @@ runParallel $(getApplication)
 foamDictionary -entry solvers.p.processorAgglomerator -set 'masterCoarsest' system/fvSolution
 runParallel -s masterCoarsest $(getApplication)
 
-#- Run with processorAgglomerator - multiple masters 
+#- Run with processorAgglomerator - multiple masters
 foamDictionary -entry solvers.p.nMasters -set '2' system/fvSolution
 runParallel -s masterCoarsest2 $(getApplication)
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution
index e048a9ecf1..65eafc14c5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution
@@ -35,7 +35,7 @@ solvers
         tolerance        1e-9;
         relTol           0.01;
     };
-    "U|Ua|nuTilda|nuaTilda|yWall|da|k|ka|omega|wa" 
+    "U|Ua|nuTilda|nuaTilda|yWall|da|k|ka|omega|wa"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U
index 590d14545f..7ae0241968 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U
@@ -20,7 +20,7 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    innerWall 
+    innerWall
     {
         type            noSlip;
     }
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p
index dbbd79a9e8..c8e5d605de 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p
@@ -20,7 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    "innerWall|outerWall" 
+    "innerWall|outerWall"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict
index fe8f0ccfc6..fbf56d7f0e 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict
@@ -25,7 +25,7 @@ geom
     ntheta      40;
 
     g           10;
-    
+
     mr0         #eval{ - $r0 };
     mr1         #eval{ - $r1 };
     invG        #eval{ 1./$g };
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
index 586c6ce289..7f0aad7c6e 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
@@ -1,57 +1,57 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -3 0 0 0 0];
-
-internalField   uniform 6.9e-5;
-
-boundaryField
-{
-    #includeEtc "caseDicts/setConstraintTypes"
-
-    inlet
-    {
-        type            fixedValue;
-        value           $internalField;
-    }
-
-    "(atmosphere|outlet)"
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
-    "(HULL*.*)"
-    {
-        type            epsilonWallFunction;
-        value           $internalField;
-    }
-
-    "(BLADES|HUB_DISK|HUB)"
-    {
-        type            epsilonWallFunction;
-        value           $internalField;
-    }
-
-    "(overset-1|oversetPatch)"
-    {
-        type           overset;
-    }
-}
-
-
-// ************************************************************************* //
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 6.9e-5;
+
+boundaryField
+{
+    #includeEtc "caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    "(atmosphere|outlet)"
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    "(HULL*.*)"
+    {
+        type            epsilonWallFunction;
+        value           $internalField;
+    }
+
+    "(BLADES|HUB_DISK|HUB)"
+    {
+        type            epsilonWallFunction;
+        value           $internalField;
+    }
+
+    "(overset-1|oversetPatch)"
+    {
+        type           overset;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh
index 5c287aa651..a481ad99a5 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh
@@ -31,7 +31,7 @@ boundaryField
     {
         type            overset;
         value           uniform 0;
-        fluxCorrection	false;
+        fluxCorrection  false;
     }
 
     top
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict
index 4af9baa7aa..a6fb36a70f 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict
@@ -47,7 +47,7 @@ runTimeModifiable true;
 adjustTimeStep  yes;
 
 maxCo           1.0;
-maxAlphaCo	    2.0;
+maxAlphaCo      2.0;
 
 functions
 {

From 1d39cdaa17ebb03112ec9879f4fe245da0db1d7c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 21 Apr 2023 10:35:26 +0200
Subject: [PATCH 185/348] STYLE: support READ_MODIFIED <->
 MUST_READ_IF_MODIFIED as aliases

---
 src/OpenFOAM/db/options/IOobjectOption.H | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/db/options/IOobjectOption.H b/src/OpenFOAM/db/options/IOobjectOption.H
index fba77e3bc6..2e654b5818 100644
--- a/src/OpenFOAM/db/options/IOobjectOption.H
+++ b/src/OpenFOAM/db/options/IOobjectOption.H
@@ -32,10 +32,6 @@ Description
     Can also be used for general handling of read/no-read/read-if-present
     logic outside of an IOobject.
 
-Note
-    In the future may include an Enumeration defining register preferences
-    (NO_REGISTER, REGISTER)
-
 See also
     Foam::IOobject
 
@@ -71,6 +67,11 @@ public:
             MUST_READ = 0x1,
 
             //! Reading required, file watched for runTime modification
+            //! [identical to MUST_READ_IF_MODIFIED]
+            READ_MODIFIED = 0x3,
+
+            //! Reading required, file watched for runTime modification
+            //! [identical to READ_MODIFIED]
             MUST_READ_IF_MODIFIED = 0x3,
 
             //! Reading is optional [identical to READ_IF_PRESENT]
@@ -260,25 +261,25 @@ public:
 
     // Checks
 
-        //- True if not (NO_READ)
+        //- True if any reading may be required (ie, != NO_READ)
         static bool isAnyRead(readOption opt) noexcept
         {
             return (opt != readOption::NO_READ);
         }
 
-        //- True if not (NO_READ)
+        //- True if any reading may be required(ie, != NO_READ)
         bool isAnyRead() const noexcept
         {
             return (readOpt_ != readOption::NO_READ);
         }
 
-        //- True if (MUST_READ | MUST_READ_IF_MODIFIED) bits are set
+        //- True if (MUST_READ | READ_MODIFIED) bits are set
         static bool isReadRequired(readOption opt) noexcept
         {
             return (opt & readOption::MUST_READ);
         }
 
-        //- True if (MUST_READ | MUST_READ_IF_MODIFIED) bits are set
+        //- True if (MUST_READ | READ_MODIFIED) bits are set
         bool isReadRequired() const noexcept
         {
             return (readOpt_ & readOption::MUST_READ);

From 5042d1296f55359dff58edc1fa14e28369d43065 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 19 Apr 2023 14:09:49 +0200
Subject: [PATCH 186/348] ENH: consistent UniformDimensionedField naming

- construct from components, or use word::null to ensure
  consistent avoid naming between IOobject vs dimensioned type.

- support construct with parameter ordering as per DimensionedField

ENH: instantiate a uniformDimensionedLabelField

- eg, for registering standalone integer counters
---
 .../fluid/createFluidFields.H                 |  2 +-
 .../fluid/createFluidFields.H                 |  2 +-
 .../fluid/initContinuityErrs.H                |  4 ++--
 .../fluid/createFluidFields.H                 |  2 +-
 .../fluid/initContinuityErrs.H                |  4 ++--
 .../UniformDimensionedField.C                 | 16 ++++++++++++++
 .../UniformDimensionedField.H                 | 22 ++++++++++++++-----
 .../uniformDimensionedFields.C                |  2 ++
 .../uniformDimensionedFieldsFwd.H             | 11 +++++++++-
 .../polyTopoChange/hexRef8/hexRef8Data.C      |  6 +----
 .../general/include/initContinuityErrs.H      |  4 ++--
 .../cfdTools/general/include/readhRef.H       |  4 ++--
 .../cfdTools/general/include/readpRef.H       |  4 ++--
 .../mappedPolyPatch/mappedPatchBaseI.H        | 20 ++++++++++-------
 14 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index 0047fb1606..ec6a70303a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -108,7 +108,7 @@ forAll(fluidRegions, i)
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE
             ),
-            dimensionedScalar("hRef", dimLength, Zero) // uses name
+            dimensionedScalar(word::null, dimLength, Zero)
         )
     );
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/createFluidFields.H
index 00e0f30b23..e7ca574f70 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/createFluidFields.H
@@ -221,7 +221,7 @@ forAll(fluidRegions, i)
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE
             ),
-            dimensionedScalar("hRef", dimLength, Zero)
+            dimensionedScalar(word::null, dimLength, Zero)
         )
     );
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H
index 99aaa1a674..0052d46536 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/initContinuityErrs.H
@@ -13,11 +13,11 @@ forAll(cumulativeContErrIO, i)
                 "cumulativeContErr",
                 runTime.timeName(),
                 "uniform",
-                mesh,
+                mesh.thisDb(),
                 IOobject::READ_IF_PRESENT,
                 IOobject::AUTO_WRITE
             ),
-            dimensionedScalar(dimless, Zero)
+            dimensionedScalar(word::null, dimless, Zero)
         )
     );
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 826e27720e..2dfd1d3146 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -112,7 +112,7 @@ forAll(fluidRegions, i)
                 IOobject::READ_IF_PRESENT,
                 IOobject::NO_WRITE
             ),
-            dimensionedScalar("hRef", dimLength, Zero) // uses name
+            dimensionedScalar(word::null, dimLength, Zero)
         )
     );
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
index 99aaa1a674..0052d46536 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
@@ -13,11 +13,11 @@ forAll(cumulativeContErrIO, i)
                 "cumulativeContErr",
                 runTime.timeName(),
                 "uniform",
-                mesh,
+                mesh.thisDb(),
                 IOobject::READ_IF_PRESENT,
                 IOobject::AUTO_WRITE
             ),
-            dimensionedScalar(dimless, Zero)
+            dimensionedScalar(word::null, dimless, Zero)
         )
     );
 }
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 5b6b012776..9a6ef06d7a 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -66,6 +66,22 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
 }
 
 
+template<class Type>
+Foam::UniformDimensionedField<Type>::UniformDimensionedField
+(
+    const IOobject& io,
+    const Type& val,
+    const dimensionSet& dims
+)
+:
+    regIOobject(io),
+    dimensioned<Type>(regIOobject::name(), dims, val)
+{
+    // Read value
+    readHeaderOk(IOstreamOption::BINARY, typeName);
+}
+
+
 template<class Type>
 Foam::UniformDimensionedField<Type>::UniformDimensionedField
 (
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
index 6523b551dd..0bd5ff35d3 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
@@ -79,6 +79,7 @@ public:
 
         //- Construct from components. Either reads or uses supplied value.
         //  The name of the IOobject defines the name of the field.
+        //  Parameter ordering as per dimensioned\<Type\>
         UniformDimensionedField
         (
             const IOobject& io,
@@ -86,6 +87,16 @@ public:
             const Type& val
         );
 
+        //- Construct from components. Either reads or uses supplied value.
+        //  The name of the IOobject defines the name of the field.
+        //  Parameter ordering as per DimensionedField\<Type\>
+        UniformDimensionedField
+        (
+            const IOobject& io,
+            const Type& val,
+            const dimensionSet& dims
+        );
+
         //- Construct as copy
         UniformDimensionedField(const UniformDimensionedField<Type>&);
 
@@ -99,17 +110,16 @@ public:
 
     // Member Functions
 
-        //- Name function provided to resolve the ambiguity between the
-        //- name functions in regIOobject and dimensioned<Type>
+        //- Use name from dimensioned\<Type\>, not from regIOobject
         virtual const word& name() const
         {
             return dimensioned<Type>::name();
         }
 
-        //- ReadData function required for regIOobject read operation
+        //- The readData method required for regIOobject read operation
         virtual bool readData(Istream&);
 
-        //- WriteData function required for regIOobject write operation
+        //- The writeData method required for regIOobject write operation
         bool writeData(Ostream&) const;
 
         //- Is object global
@@ -128,10 +138,10 @@ public:
 
     // Member Operators
 
-        //- Assign name, dimensions and value.
+        //- Assign name, dimensions and value of the dimensioned\<Type\>
         void operator=(const UniformDimensionedField<Type>& rhs);
 
-        //- Assign name, dimensions and value.
+        //- Assign name, dimensions and value to the dimensioned\<Type\>
         void operator=(const dimensioned<Type>& rhs);
 
         //- Return value
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
index 0e5c109484..3375fff3f5 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +35,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+defineTemplateTypeNameAndDebug(uniformDimensionedLabelField, 0);
 defineTemplateTypeNameAndDebug(uniformDimensionedScalarField, 0);
 defineTemplateTypeNameAndDebug(uniformDimensionedVectorField, 0);
 defineTemplateTypeNameAndDebug(uniformDimensionedSphericalTensorField, 0);
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFieldsFwd.H b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFieldsFwd.H
index ebbb87dc61..13b8d8c76f 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFieldsFwd.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFieldsFwd.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +48,10 @@ template<class Type> class UniformDimensionedField;
 
 // Typedefs
 
+typedef
+    UniformDimensionedField<label>
+    uniformDimensionedLabelField;
+
 typedef
     UniformDimensionedField<scalar>
     uniformDimensionedScalarField;
@@ -71,6 +75,11 @@ typedef
 
 // Global file status
 
+template<>
+inline bool typeGlobal<uniformDimensionedLabelField>()
+{
+    return true;
+}
 template<>
 inline bool typeGlobal<uniformDimensionedScalarField>()
 {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index ddd823ab10..38bba1898b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -271,11 +271,7 @@ void Foam::hexRef8Data::sync(const IOobject& io)
             rio.readOpt(IOobject::NO_READ);
             level0EdgePtr_.reset
             (
-                new uniformDimensionedScalarField
-                (
-                    rio,
-                    dimensionedScalar(rio.name(), dimLength, masterLen)
-                )
+                new uniformDimensionedScalarField(rio, dimLength, masterLen)
             );
         }
     }
diff --git a/src/finiteVolume/cfdTools/general/include/initContinuityErrs.H b/src/finiteVolume/cfdTools/general/include/initContinuityErrs.H
index 55e07915f4..3a823d35f1 100644
--- a/src/finiteVolume/cfdTools/general/include/initContinuityErrs.H
+++ b/src/finiteVolume/cfdTools/general/include/initContinuityErrs.H
@@ -44,11 +44,11 @@ uniformDimensionedScalarField cumulativeContErrIO
         "cumulativeContErr",
         runTime.timeName(),
         "uniform",
-        mesh,
+        mesh.thisDb(),
         IOobject::READ_IF_PRESENT,
         IOobject::AUTO_WRITE
     ),
-    dimensionedScalar(dimless, Zero)
+    dimensionedScalar(word::null, dimless, Zero)
 );
 scalar& cumulativeContErr = cumulativeContErrIO.value();
 
diff --git a/src/finiteVolume/cfdTools/general/include/readhRef.H b/src/finiteVolume/cfdTools/general/include/readhRef.H
index e938cc8cc9..6cca2d2ded 100644
--- a/src/finiteVolume/cfdTools/general/include/readhRef.H
+++ b/src/finiteVolume/cfdTools/general/include/readhRef.H
@@ -5,9 +5,9 @@
         (
             "hRef",
             runTime.constant(),
-            mesh,
+            mesh.thisDb(),
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE
         ),
-        dimensionedScalar(dimLength, Zero)
+        dimensionedScalar(word::null, dimLength, Zero)
     );
diff --git a/src/finiteVolume/cfdTools/general/include/readpRef.H b/src/finiteVolume/cfdTools/general/include/readpRef.H
index 29aa46ac83..88c08fd075 100644
--- a/src/finiteVolume/cfdTools/general/include/readpRef.H
+++ b/src/finiteVolume/cfdTools/general/include/readpRef.H
@@ -5,9 +5,9 @@
         (
             "pRef",
             runTime.constant(),
-            mesh,
+            mesh.thisDb(),
             IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE
         ),
-        dimensionedScalar(dimPressure, Zero)
+        dimensionedScalar(word::null, dimPressure, Zero)
     );
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index f84ed8e4b6..88551e4a90 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@@ -203,19 +203,21 @@ Foam::mappedPatchBase::updateSampleMeshTime() const
     {
         const auto& mesh = sampleMesh();
 
-        updateSampleMeshTimePtr_ =
-            autoPtr<uniformDimensionedScalarField>::New
+        updateSampleMeshTimePtr_.reset
+        (
+            new uniformDimensionedScalarField
             (
                 IOobject
                 (
                     "updateSampleMeshTime",
                     mesh.pointsInstance(),
-                    mesh,
+                    mesh.thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
                     IOobject::NO_REGISTER
                 )
-            );
+            )
+        );
     }
 
     return updateSampleMeshTimePtr_();
@@ -229,19 +231,21 @@ Foam::mappedPatchBase::updateMeshTime() const
     {
         const auto& mesh = patch_.boundaryMesh().mesh();
 
-        updateMeshTimePtr_ =
-            autoPtr<uniformDimensionedScalarField>::New
+        updateMeshTimePtr_.reset
+        (
+            new uniformDimensionedScalarField
             (
                 IOobject
                 (
                     "updateMeshTime",
                     mesh.pointsInstance(),
-                    mesh,
+                    mesh.thisDb(),
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
                     IOobject::NO_REGISTER
                 )
-            );
+            )
+        );
     }
 
     return updateMeshTimePtr_();

From a7c4c184b84d4e7d488bc212798450934f6e952b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 19 Apr 2023 19:49:41 +0200
Subject: [PATCH 187/348] ENH: respect value of dimensionSet::checking() for
 pow() function

STYLE: remove unused/meaningless pow(dimensionScalar, dimensionSet)
---
 src/OpenFOAM/dimensionSet/dimensionSet.C      |  30 +-
 src/OpenFOAM/dimensionSet/dimensionSet.H      |   3 +-
 .../dimensionedScalar/dimensionedScalar.C     |   8 +-
 .../DimensionedField/DimensionedField.C       |  13 +-
 .../DimensionedScalarField.C                  | 371 ++++++++++--------
 .../GeometricField/GeometricField.C           |  18 +-
 .../GeometricScalarField.C                    | 345 +++++++++-------
 7 files changed, 444 insertions(+), 344 deletions(-)

diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index 1751b6bd06..9c8ebcc5ae 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.C
@@ -336,39 +336,17 @@ Foam::dimensionSet Foam::pow(const dimensionSet& ds, const scalar p)
 Foam::dimensionSet Foam::pow
 (
     const dimensionSet& ds,
-    const dimensionedScalar& dS
+    const dimensionedScalar& p
 )
 {
-    if (dimensionSet::checking() && !dS.dimensions().dimensionless())
+    if (dimensionSet::checking() && !p.dimensions().dimensionless())
     {
         FatalErrorInFunction
             << "Exponent of pow is not dimensionless" << endl
             << abort(FatalError);
     }
 
-    return pow(ds, dS.value());
-}
-
-
-Foam::dimensionSet Foam::pow
-(
-    const dimensionedScalar& dS,
-    const dimensionSet& ds
-)
-{
-    if
-    (
-        dimensionSet::checking()
-     && !dS.dimensions().dimensionless()
-     && !ds.dimensionless()
-    )
-    {
-        FatalErrorInFunction
-            << "Argument or exponent of pow not dimensionless" << endl
-            << abort(FatalError);
-    }
-
-    return ds;
+    return pow(ds, p.value());
 }
 
 
@@ -484,6 +462,8 @@ Foam::dimensionSet Foam::inv(const dimensionSet& ds)
 {
     return dimensionSet
     (
+        // Avoid signed zero values by subtracting from zero (with rounding)
+        // instead of using a simple '-value'
         0.0-ds[dimensionSet::MASS],
         0.0-ds[dimensionSet::LENGTH],
         0.0-ds[dimensionSet::TIME],
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index 1c21e90f32..c82f97b813 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -364,8 +364,7 @@ dimensionSet cmptDivide(const dimensionSet& ds1, const dimensionSet& ds2);
 
 
 dimensionSet pow(const dimensionSet& ds, const scalar p);
-dimensionSet pow(const dimensionSet& ds, const dimensionedScalar& dS);
-dimensionSet pow(const dimensionedScalar& dS, const dimensionSet& ds);
+dimensionSet pow(const dimensionSet& ds, const dimensionedScalar& p);
 
 dimensionSet sqr(const dimensionSet& ds);
 dimensionSet pow2(const dimensionSet& ds);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
index 2dbe387c51..678ecab0c6 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
@@ -243,10 +243,10 @@ dimensionedScalar negPart(const dimensionedScalar& ds)
 #define transFunc(func)                                                        \
 dimensionedScalar func(const dimensionedScalar& ds)                            \
 {                                                                              \
-    if (!ds.dimensions().dimensionless())                                      \
+    if (dimensionSet::checking() && !ds.dimensions().dimensionless())          \
     {                                                                          \
         FatalErrorInFunction                                                   \
-            << "ds not dimensionless"                                          \
+            << "scalar is not dimensionless: " << ds.dimensions() << nl        \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \
@@ -287,10 +287,10 @@ transFunc(y1)
 #define transFunc(func)                                                        \
 dimensionedScalar func(const int n, const dimensionedScalar& ds)               \
 {                                                                              \
-    if (!ds.dimensions().dimensionless())                                      \
+    if (dimensionSet::checking() && !ds.dimensions().dimensionless())          \
     {                                                                          \
         FatalErrorInFunction                                                   \
-            << "ds not dimensionless"                                          \
+            << "scalar is not dimensionless: " << ds.dimensions() << nl        \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 44168d5024..dd290c3bb8 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -31,14 +31,15 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Check mesh for two fields
-#define checkField(df1, df2, op)                                    \
-if (&(df1).mesh() != &(df2).mesh())                                 \
+// Check that both fields use the same mesh
+#undef  checkField
+#define checkField(fld1, fld2, op)                                  \
+if (&(fld1).mesh() != &(fld2).mesh())                               \
 {                                                                   \
     FatalErrorInFunction                                            \
-        << "different mesh for fields "                             \
-        << (df1).name() << " and " << (df2).name()                  \
-        << " during operation " <<  op                              \
+        << "Different mesh for fields "                             \
+        << (fld1).name() << " and " << (fld2).name()                \
+        << " during operation " << op                               \
         << abort(FatalError);                                       \
 }
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 06011d431a..54ed8ed1c5 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,223 +103,265 @@ BINARY_TYPE_OPERATOR_SF(scalar, scalar, scalar, /, '|', divide)
 template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const DimensionedField<scalar, GeoMesh>& dsf1,
-    const DimensionedField<scalar, GeoMesh>& dsf2
+    const DimensionedField<scalar, GeoMesh>& f1,
+    const DimensionedField<scalar, GeoMesh>& f2
 )
 {
-    if (!dsf1.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base field is not dimensionless: " << dsf1.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!dsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << dsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    auto tres =
+    auto tresult =
         tmp<DimensionedField<scalar, GeoMesh>>::New
         (
             IOobject
             (
-                "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
-                dsf1.instance(),
-                dsf1.db()
+                "pow(" + f1.name() + ',' + f2.name() + ')',
+                f1.instance(),
+                f1.db()
             ),
-            dsf1.mesh(),
+            f1.mesh(),
             dimless
         );
 
-    pow(tres.ref().field(), dsf1.field(), dsf2.field());
+    pow(tresult.ref().field(), f1.field(), f2.field());
 
-    return tres;
+    return tresult;
 }
 
 
 template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
-    const DimensionedField<scalar, GeoMesh>& dsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tf1,
+    const DimensionedField<scalar, GeoMesh>& f2
 )
 {
-    const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
+    const auto& f1 = tf1();
 
-    if (!dsf1.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Base field is not dimensionless: " << dsf1.dimensions()
-            << exit(FatalError);
-    }
-
-    if (!dsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << dsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<DimensionedField<scalar, GeoMesh>> tres = New
+    if
     (
-        tdsf1,
-        "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
+    {
+        FatalErrorInFunction
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
+    }
+
+    tmp<DimensionedField<scalar, GeoMesh>> tresult = New
+    (
+        tf1,
+        "pow(" + f1.name() + ',' + f2.name() + ')',
         dimless
     );
 
-    pow(tres.ref().field(), dsf1.field(), dsf2.field());
+    pow(tresult.ref().field(), f1.field(), f2.field());
 
-    tdsf1.clear();
+    tf1.clear();
 
-    return tres;
+    return tresult;
 }
 
 
 template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const DimensionedField<scalar, GeoMesh>& dsf1,
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
+    const DimensionedField<scalar, GeoMesh>& f1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tf2
 )
 {
-    const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
+    const auto& f2 = tf2();
 
-    if (!dsf1.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Base field is not dimensionless: " << dsf1.dimensions()
-            << exit(FatalError);
-    }
-
-    if (!dsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << dsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<DimensionedField<scalar, GeoMesh>> tres = New
+    if
     (
-        tdsf2,
-        "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
+    {
+        FatalErrorInFunction
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
+    }
+
+    tmp<DimensionedField<scalar, GeoMesh>> tresult = New
+    (
+        tf2,
+        "pow(" + f1.name() + ',' + f2.name() + ')',
         dimless
     );
 
-    pow(tres.ref().field(), dsf1.field(), dsf2.field());
+    pow(tresult.ref().field(), f1.field(), f2.field());
 
-    tdsf2.clear();
+    tf2.clear();
 
-    return tres;
+    return tresult;
 }
 
 
 template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tf2
 )
 {
-    const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
-    const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
+    const auto& f1 = tf1();
+    const auto& f2 = tf2();
 
-    if (!dsf1.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base field is not dimensionless: " << dsf1.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!dsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << dsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    auto tres =
+    auto tresult =
         reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
         New
         (
-            tdsf1,
-            tdsf2,
-            "pow(" + dsf1.name() + ',' + dsf2.name() + ')',
+            tf1,
+            tf2,
+            "pow(" + f1.name() + ',' + f2.name() + ')',
             dimless
         );
 
-    pow(tres.ref().field(), dsf1.field(), dsf2.field());
+    pow(tresult.ref().field(), f1.field(), f2.field());
 
-    tdsf1.clear();
-    tdsf2.clear();
+    tf1.clear();
+    tf2.clear();
 
-    return tres;
+    return tresult;
 }
 
 
 template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const DimensionedField<scalar, GeoMesh>& dsf,
+    const DimensionedField<scalar, GeoMesh>& f1,
     const dimensionedScalar& ds
 )
 {
-    if (!ds.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Exponent is not dimensionless: " << ds.dimensions()
+            << "pow() expects dimensionless parameters, but found" << nl
+            << "    Exponent dimensions: " << ds.dimensions() << nl
             << exit(FatalError);
     }
 
-    auto tres =
+    auto tresult =
         tmp<DimensionedField<scalar, GeoMesh>>::New
         (
             IOobject
             (
-                "pow(" + dsf.name() + ',' + ds.name() + ')',
-                dsf.instance(),
-                dsf.db()
+                "pow(" + f1.name() + ',' + ds.name() + ')',
+                f1.instance(),
+                f1.db()
             ),
-            dsf.mesh(),
-            pow(dsf.dimensions(), ds)
+            f1.mesh(),
+            pow(f1.dimensions(), ds)
         );
 
-    pow(tres.ref().field(), dsf.field(), ds.value());
+    pow(tresult.ref().field(), f1.field(), ds.value());
 
-    return tres;
+    return tresult;
 }
 
 
 template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tf1,
     const dimensionedScalar& ds
 )
 {
-    if (!ds.dimensions().dimensionless())
+    const auto& f1 = tf1();
+
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Exponent is not dimensionless: " << ds.dimensions()
+            << "pow() expects dimensionless parameters, but found" << nl
+            << "    Exponent dimensions: " << ds.dimensions() << nl
             << exit(FatalError);
     }
 
-    const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
-
-    tmp<DimensionedField<scalar, GeoMesh>> tres = New
+    tmp<DimensionedField<scalar, GeoMesh>> tresult = New
     (
-        tdsf,
-        "pow(" + dsf.name() + ',' + ds.name() + ')',
-        pow(dsf.dimensions(), ds)
+        tf1,
+        "pow(" + f1.name() + ',' + ds.name() + ')',
+        pow(f1.dimensions(), ds)
     );
 
-    pow(tres.ref().field(), dsf.field(), ds.value());
+    pow(tresult.ref().field(), f1.field(), ds.value());
 
-    tdsf.clear();
+    tf1.clear();
 
-    return tres;
+    return tresult;
 }
 
 
@@ -349,39 +391,47 @@ template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const DimensionedField<scalar, GeoMesh>& dsf
+    const DimensionedField<scalar, GeoMesh>& f2
 )
 {
-    if (!ds.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base scalar is not dimensionless: " << ds.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!ds.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base scalar dimensions: " << ds.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!dsf.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << dsf.dimensions()
-            << exit(FatalError);
-    }
-
-    auto tres =
+    auto tresult =
         tmp<DimensionedField<scalar, GeoMesh>>::New
         (
             IOobject
             (
-                "pow(" + ds.name() + ',' + dsf.name() + ')',
-                dsf.instance(),
-                dsf.db()
+                "pow(" + ds.name() + ',' + f2.name() + ')',
+                f2.instance(),
+                f2.db()
             ),
-            dsf.mesh(),
+            f2.mesh(),
             dimless
         );
 
-    pow(tres.ref().field(), ds.value(), dsf.field());
+    pow(tresult.ref().field(), ds.value(), f2.field());
 
-    return tres;
+    return tresult;
 }
 
 
@@ -389,37 +439,46 @@ template<class GeoMesh>
 tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tf2
 )
 {
-    const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
+    const auto& f2 = tf2();
 
-    if (!ds.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Base scalar is not dimensionless: " << ds.dimensions()
-            << exit(FatalError);
-    }
-
-    if (!dsf.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << dsf.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<DimensionedField<scalar, GeoMesh>> tres = New
+    if
     (
-        tdsf,
-        "pow(" + ds.name() + ',' + dsf.name() + ')',
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
+    {
+        FatalErrorInFunction
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!ds.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base scalar dimensions: " << ds.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+
+        FatalError << exit(FatalError);
+    }
+
+    tmp<DimensionedField<scalar, GeoMesh>> tresult = New
+    (
+        tf2,
+        "pow(" + ds.name() + ',' + f2.name() + ')',
         dimless
     );
 
-    pow(tres.ref().field(), ds.value(), dsf.field());
+    pow(tresult.ref().field(), ds.value(), f2.field());
 
-    tdsf.clear();
+    tf2.clear();
 
-    return tres;
+    return tresult;
 }
 
 template<class GeoMesh>
@@ -738,10 +797,10 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
     const DimensionedField<scalar, GeoMesh>& dsf                               \
 )                                                                              \
 {                                                                              \
-    if (!dsf.dimensions().dimensionless())                                     \
+    if (dimensionSet::checking() && !dsf.dimensions().dimensionless())         \
     {                                                                          \
         FatalErrorInFunction                                                   \
-            << "dsf not dimensionless"                                         \
+            << "Field is not dimensionless: " << dsf.dimensions() << nl        \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \
@@ -771,12 +830,12 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
     const tmp<DimensionedField<scalar, GeoMesh>>& tdsf                         \
 )                                                                              \
 {                                                                              \
-    const DimensionedField<scalar, GeoMesh>& dsf = tdsf();                     \
+    const auto& dsf = tdsf();                                                  \
                                                                                \
-    if (!dsf.dimensions().dimensionless())                                     \
+    if (dimensionSet::checking() && !dsf.dimensions().dimensionless())         \
     {                                                                          \
         FatalErrorInFunction                                                   \
-            << " : dsf not dimensionless"                                      \
+            << "Field is not dimensionless: " << dsf.dimensions() << nl        \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 3756d2208e..8e12b480c9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -35,14 +35,16 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define checkField(gf1, gf2, op)                                               \
-if ((gf1).mesh() != (gf2).mesh())                                              \
-{                                                                              \
-    FatalErrorInFunction                                                       \
-        << "different mesh for fields "                                        \
-        << (gf1).name() << " and " << (gf2).name()                             \
-        << " during operation " <<  op                                         \
-        << abort(FatalError);                                                  \
+// Check that both fields use the same mesh
+#undef  checkField
+#define checkField(fld1, fld2, op)                                  \
+if (&(fld1).mesh() != &(fld2).mesh())                               \
+{                                                                   \
+    FatalErrorInFunction                                            \
+        << "Different mesh for fields "                             \
+        << (fld1).name() << " and " << (fld2).name()                \
+        << " during operation " << op                               \
+        << abort(FatalError);                                       \
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index c7acf54c2f..f6747c23d0 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -136,170 +137,202 @@ void pow
 template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf2
+    const GeometricField<scalar, PatchField, GeoMesh>& f1,
+    const GeometricField<scalar, PatchField, GeoMesh>& f2
 )
 {
-    if (!gsf1.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base field is not dimensionless: " << gsf1.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!gsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << gsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
             IOobject
             (
-                "pow(" + gsf1.name() + ',' + gsf2.name() + ')',
-                gsf1.instance(),
-                gsf1.db(),
+                "pow(" + f1.name() + ',' + f2.name() + ')',
+                f1.instance(),
+                f1.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            gsf1.mesh(),
+            f1.mesh(),
             dimless
         )
     );
 
-    pow(tPow.ref(), gsf1, gsf2);
+    pow(tresult.ref(), f1, f2);
 
-    return tPow;
+    return tresult;
 }
 
 
 template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tf1,
+    const GeometricField<scalar, PatchField, GeoMesh>& f2
 )
 {
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
+    const auto& f1 = tf1();
 
-    if (!gsf1.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base field is not dimensionless: " << gsf1.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!gsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << gsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         New
         (
-            tgsf1,
-            "pow(" + gsf1.name() + ',' + gsf2.name() + ')',
+            tf1,
+            "pow(" + f1.name() + ',' + f2.name() + ')',
             dimless
         )
     );
 
-    pow(tPow.ref(), gsf1, gsf2);
+    pow(tresult.ref(), f1, f2);
 
-    tgsf1.clear();
+    tf1.clear();
 
-    return tPow;
+    return tresult;
 }
 
 
 template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
+    const GeometricField<scalar, PatchField, GeoMesh>& f1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tf2
 )
 {
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
+    const auto& f2 = tf2();
 
-    if (!gsf1.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base field is not dimensionless: " << gsf1.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!gsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << gsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         New
         (
-            tgsf2,
-            "pow(" + gsf1.name() + ',' + gsf2.name() + ')',
+            tf2,
+            "pow(" + f1.name() + ',' + f2.name() + ')',
             dimless
         )
     );
 
-    pow(tPow.ref(), gsf1, gsf2);
+    pow(tresult.ref(), f1, f2);
 
-    tgsf2.clear();
+    tf2.clear();
 
-    return tPow;
+    return tresult;
 }
 
 template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tf2
 )
 {
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
+    const auto& f1 = tf1();
+    const auto& f2 = tf2();
 
-    if (!gsf1.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!f1.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base field is not dimensionless: " << gsf1.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!f1.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base field dimensions: " << f1.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!gsf2.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << gsf2.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         reuseTmpTmpGeometricField
             <scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
         (
-            tgsf1,
-            tgsf2,
-            "pow(" + gsf1.name() + ',' + gsf2.name() + ')',
+            tf1,
+            tf2,
+            "pow(" + f1.name() + ',' + f2.name() + ')',
             dimless
         )
     );
 
-    pow(tPow.ref(), gsf1, gsf2);
+    pow(tresult.ref(), f1, f2);
 
-    tgsf1.clear();
-    tgsf2.clear();
+    tf1.clear();
+    tf2.clear();
 
-    return tPow;
+    return tresult;
 }
 
 
@@ -319,70 +352,80 @@ void pow
 template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf,
+    const GeometricField<scalar, PatchField, GeoMesh>& f1,
     const dimensionedScalar& ds
 )
 {
-    if (!ds.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Exponent is not dimensionless: " << ds.dimensions()
+            << "pow() expects dimensionless parameters, but found" << nl
+            << "    Exponent dimensions: " << ds.dimensions() << nl
             << exit(FatalError);
     }
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
             IOobject
             (
-                "pow(" + gsf.name() + ',' + ds.name() + ')',
-                gsf.instance(),
-                gsf.db(),
+                "pow(" + f1.name() + ',' + ds.name() + ')',
+                f1.instance(),
+                f1.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            gsf.mesh(),
-            pow(gsf.dimensions(), ds)
+            f1.mesh(),
+            pow(f1.dimensions(), ds)
         )
     );
 
-    pow(tPow.ref(), gsf, ds);
+    pow(tresult.ref(), f1, ds);
 
-    return tPow;
+    return tresult;
 }
 
 template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tf1,
     const dimensionedScalar& ds
 )
 {
-    if (!ds.dimensions().dimensionless())
+    const auto& f1 = tf1();
+
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Exponent is not dimensionless: " << ds.dimensions()
+            << "pow() expects dimensionless parameters, but found" << nl
+            << "    Exponent dimensions: " << ds.dimensions() << nl
             << exit(FatalError);
     }
 
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         New
         (
-            tgsf,
-            "pow(" + gsf.name() + ',' + ds.name() + ')',
-            pow(gsf.dimensions(), ds)
+            tf1,
+            "pow(" + f1.name() + ',' + ds.name() + ')',
+            pow(f1.dimensions(), ds)
         )
     );
 
-    pow(tPow.ref(), gsf, ds);
+    pow(tresult.ref(), f1, ds);
 
-    tgsf.clear();
+    tf1.clear();
 
-    return tPow;
+    return tresult;
 }
 
 template<template<class> class PatchField, class GeoMesh>
@@ -423,43 +466,51 @@ template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf
+    const GeometricField<scalar, PatchField, GeoMesh>& f2
 )
 {
-    if (!ds.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base scalar is not dimensionless: " << ds.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!ds.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base scalar dimensions: " << ds.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!gsf.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << gsf.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
             IOobject
             (
-                "pow(" + ds.name() + ',' + gsf.name() + ')',
-                gsf.instance(),
-                gsf.db(),
+                "pow(" + ds.name() + ',' + f2.name() + ')',
+                f2.instance(),
+                f2.db(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            gsf.mesh(),
+            f2.mesh(),
             dimless
         )
     );
 
-    pow(tPow.ref(), ds, gsf);
+    pow(tresult.ref(), ds, f2);
 
-    return tPow;
+    return tresult;
 }
 
 
@@ -467,40 +518,48 @@ template<template<class> class PatchField, class GeoMesh>
 tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tf2
 )
 {
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
+    const auto& f2 = tf2();
 
-    if (!ds.dimensions().dimensionless())
+    if
+    (
+        dimensionSet::checking()
+     && (!ds.dimensions().dimensionless() || !f2.dimensions().dimensionless())
+    )
     {
         FatalErrorInFunction
-            << "Base scalar is not dimensionless: " << ds.dimensions()
-            << exit(FatalError);
+            << "pow() expects dimensionless parameters, but found" << nl;
+
+        if (!ds.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Base scalar dimensions: " << ds.dimensions() << nl;
+        }
+        if (!f2.dimensions().dimensionless())
+        {
+            FatalError
+                << "    Exponent field dimensions: " << f2.dimensions() << nl;
+        }
+        FatalError << exit(FatalError);
     }
 
-    if (!gsf.dimensions().dimensionless())
-    {
-        FatalErrorInFunction
-            << "Exponent field is not dimensionless: " << gsf.dimensions()
-            << exit(FatalError);
-    }
-
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
     (
         New
         (
-            tgsf,
-            "pow(" + ds.name() + ',' + gsf.name() + ')',
+            tf2,
+            "pow(" + ds.name() + ',' + f2.name() + ')',
             dimless
         )
     );
 
-    pow(tPow.ref(), ds, gsf);
+    pow(tresult.ref(), ds, f2);
 
-    tgsf.clear();
+    tf2.clear();
 
-    return tPow;
+    return tresult;
 }
 
 template<template<class> class PatchField, class GeoMesh>
@@ -906,10 +965,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
     const GeometricField<scalar, PatchField, GeoMesh>& gsf                     \
 )                                                                              \
 {                                                                              \
-    if (!gsf.dimensions().dimensionless())                                     \
+    if (dimensionSet::checking() && !gsf.dimensions().dimensionless())         \
     {                                                                          \
         FatalErrorInFunction                                                   \
-            << "gsf not dimensionless"                                         \
+            << "Field is not dimensionless: " << gsf.dimensions() << nl        \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \
@@ -942,12 +1001,12 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
     const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf               \
 )                                                                              \
 {                                                                              \
-    const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();           \
+    const auto& gsf = tgsf();                                                  \
                                                                                \
-    if (!gsf.dimensions().dimensionless())                                     \
+    if (dimensionSet::checking() && !gsf.dimensions().dimensionless())         \
     {                                                                          \
         FatalErrorInFunction                                                   \
-            << " : gsf not dimensionless"                                      \
+            << "Field is not dimensionless: " << gsf.dimensions() << nl        \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \

From ce282dfbbf26eafab8affe0211c2a7fc888fff92 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 20 Apr 2023 12:54:49 +0200
Subject: [PATCH 188/348] ENH: correct the selfComm procNo relative to world
 communicator

STYLE: qualify worldComm as UPstream instead Pstream

STYLE: PPCG::gSumMagProd() as static function
---
 .../test/parallel-comm2/Test-parallel-comm2.C | 15 ++++++-----
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 10 ++++---
 src/OpenFOAM/db/error/error.C                 |  4 +--
 .../matrices/LUscalarMatrix/LUscalarMatrix.C  | 26 +++++++++----------
 .../matrices/lduMatrix/solvers/PPCG/PPCG.C    |  6 ++---
 .../matrices/lduMatrix/solvers/PPCG/PPCG.H    |  4 +--
 src/Pstream/mpi/UPstream.C                    |  2 +-
 src/finiteArea/faMesh/faMesh.C                |  8 +++---
 8 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index ce01dc7cf9..660bc6fb94 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< nl
         << "parallel:" << UPstream::parRun()
-        << "nProcs = " << UPstream::nProcs()
+        << " nProcs = " << UPstream::nProcs()
         << " with " << UPstream::nComms() << " predefined comm(s)."
         << " proc:" << UPstream::myProcNo() << nl;
 
@@ -103,11 +103,14 @@ int main(int argc, char *argv[])
     {
         Info<< nl;
 
-        //- Process IDs within a given communicator
-        Info<< "procIDs: "
-            << flatOutput(UPstream::procID(UPstream::commWorld())) << endl;
-
-        rankInfo(UPstream::commWorld());
+        // Process IDs within a given communicator
+        for (label comm = 0; comm < UPstream::nComms(); ++comm)
+        {
+            Info<< "comm=" << comm
+                << " procIDs: " << flatOutput(UPstream::procID(comm)) << endl;
+            rankInfo(comm);
+            Pout<< nl;
+        }
         Pout<< endl;
     }
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index ae95f15daf..3d6dc38439 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -165,7 +165,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  UPstream::globalComm:" << UPstream::globalComm
+                << "  expected globalComm:" << UPstream::globalComm
                 << Foam::exit(FatalError);
         }
 
@@ -176,7 +176,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  UPstream::selfComm:" << UPstream::selfComm
+                << "  expected selfComm:" << UPstream::selfComm
                 << Foam::exit(FatalError);
         }
 
@@ -199,18 +199,20 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  UPstream::globalComm:" << UPstream::globalComm
+                << "  expected globalComm:" << UPstream::globalComm
                 << Foam::exit(FatalError);
         }
 
         // 1: selfComm
+        // - Processor number wrt world communicator
+        singleProc.front() = myProcNo(UPstream::globalComm);
         comm = allocateCommunicator(-2, singleProc, true);
         if (comm != UPstream::selfComm)
         {
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  UPstream::selfComm:" << UPstream::selfComm
+                << "  expected selfComm:" << UPstream::selfComm
                 << Foam::exit(FatalError);
         }
 
diff --git a/src/OpenFOAM/db/error/error.C b/src/OpenFOAM/db/error/error.C
index 4adfae5f42..5dce9fd6cd 100644
--- a/src/OpenFOAM/db/error/error.C
+++ b/src/OpenFOAM/db/error/error.C
@@ -33,7 +33,7 @@ Note
 #include "fileName.H"
 #include "dictionary.H"
 #include "JobInfo.H"
-#include "Pstream.H"
+#include "UPstream.H"
 #include "StringStream.H"
 #include "foamVersion.H"
 #include "OSspecific.H"
@@ -44,7 +44,7 @@ Note
 bool Foam::error::master(const label communicator)
 {
     // Trap negative value for comm as 'default'. This avoids direct use
-    // of Pstream::worldComm which may not have been initialised
+    // of UPstream::worldComm which may have not yet been initialised
 
     return
     (
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index 65468a617c..2d03159abe 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -44,14 +44,14 @@ namespace Foam
 
 Foam::LUscalarMatrix::LUscalarMatrix()
 :
-    comm_(Pstream::worldComm)
+    comm_(UPstream::worldComm)
 {}
 
 
 Foam::LUscalarMatrix::LUscalarMatrix(const scalarSquareMatrix& matrix)
 :
     scalarSquareMatrix(matrix),
-    comm_(Pstream::worldComm),
+    comm_(UPstream::worldComm),
     pivotIndices_(m())
 {
     LUDecompose(*this, pivotIndices_);
@@ -67,9 +67,9 @@ Foam::LUscalarMatrix::LUscalarMatrix
 :
     comm_(ldum.mesh().comm())
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
-        PtrList<procLduMatrix> lduMatrices(Pstream::nProcs(comm_));
+        PtrList<procLduMatrix> lduMatrices(UPstream::nProcs(comm_));
 
         label lduMatrixi = 0;
 
@@ -84,9 +84,9 @@ Foam::LUscalarMatrix::LUscalarMatrix
             )
         );
 
-        if (Pstream::master(comm_))
+        if (UPstream::master(comm_))
         {
-            for (const int proci : Pstream::subProcs(comm_))
+            for (const int proci : UPstream::subProcs(comm_))
             {
                 lduMatrices.set
                 (
@@ -95,10 +95,10 @@ Foam::LUscalarMatrix::LUscalarMatrix
                     (
                         IPstream
                         (
-                            Pstream::commsTypes::scheduled,
+                            UPstream::commsTypes::scheduled,
                             proci,
                             0,          // bufSize
-                            Pstream::msgType(),
+                            UPstream::msgType(),
                             comm_
                         )()
                     )
@@ -109,10 +109,10 @@ Foam::LUscalarMatrix::LUscalarMatrix
         {
             OPstream toMaster
             (
-                Pstream::commsTypes::scheduled,
-                Pstream::masterNo(),
+                UPstream::commsTypes::scheduled,
+                UPstream::masterNo(),
                 0,              // bufSize
-                Pstream::msgType(),
+                UPstream::msgType(),
                 comm_
             );
             procLduMatrix cldum
@@ -125,7 +125,7 @@ Foam::LUscalarMatrix::LUscalarMatrix
 
         }
 
-        if (Pstream::master(comm_))
+        if (UPstream::master(comm_))
         {
             label nCells = 0;
             forAll(lduMatrices, i)
@@ -146,7 +146,7 @@ Foam::LUscalarMatrix::LUscalarMatrix
         convert(ldum, interfaceCoeffs, interfaces);
     }
 
-    if (Pstream::master(comm_))
+    if (UPstream::master(comm_))
     {
         if (debug)
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
index 53c0900de0..ea88f04462 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
@@ -51,7 +51,7 @@ void Foam::PPCG::gSumMagProd
     const solveScalarField& sumMag,
     UPstream::Request& request,
     const label comm
-) const
+)
 {
     const label nCells = a.size();
 
@@ -63,14 +63,14 @@ void Foam::PPCG::gSumMagProd
         globalSum[2] += mag(sumMag[cell]);
     }
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         Foam::reduce
         (
             globalSum.data(),
             globalSum.size(),
             sumOp<solveScalar>(),
-            Pstream::msgType(),
+            UPstream::msgType(),  // (ignored): direct MPI call
             comm,
             request
         );
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
index a15bdf8ca2..964089a6d7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
@@ -69,7 +69,7 @@ class PPCG
     // Private Member Functions
 
         //- Non-blocking version of sum(a*b), sum(a*c), sum(mag(sumMag))
-        void gSumMagProd
+        static void gSumMagProd
         (
             FixedList<solveScalar, 3>& globalSum,
             const solveScalarField& a,
@@ -78,7 +78,7 @@ class PPCG
             const solveScalarField& sumMag,
             UPstream::Request& request,
             const label comm
-        ) const;
+        );
 
         //- No copy construct
         PPCG(const PPCG&) = delete;
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index b980948228..67acb35cbf 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -299,7 +299,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
         Pstream::gatherList(worlds, UPstream::msgType(), UPstream::globalComm);
 
         // Compact
-        if (Pstream::master(UPstream::globalComm))
+        if (UPstream::master(UPstream::globalComm))
         {
             DynamicList<word> worldNames(numprocs);
             worldIDs_.resize_nocopy(numprocs);
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index cf953b574c..b38b19ee3d 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -306,7 +306,7 @@ bool Foam::faMesh::init(const bool doInit)
     }
 
     // Create global mesh data
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         (void)globalData();
     }
@@ -378,7 +378,7 @@ Foam::faMesh::faMesh
         ),
         *this
     ),
-    comm_(Pstream::worldComm),
+    comm_(UPstream::worldComm),
     curTimeIndex_(time().timeIndex()),
 
     patchPtr_(nullptr),
@@ -484,7 +484,7 @@ Foam::faMesh::faMesh
         *this,
         label(0)
     ),
-    comm_(Pstream::worldComm),
+    comm_(UPstream::worldComm),
     curTimeIndex_(time().timeIndex()),
 
     patchPtr_(nullptr),
@@ -565,7 +565,7 @@ Foam::faMesh::faMesh
         *this,
         label(0)
     ),
-    comm_(Pstream::worldComm),
+    comm_(UPstream::worldComm),
     curTimeIndex_(time().timeIndex()),
 
     patchPtr_(nullptr),

From d9533e561bc73322b16f62ebacad56aab89f5735 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 21 Apr 2023 10:35:26 +0200
Subject: [PATCH 189/348] ENH: allow null pointer when reading binary block

- have read(nullptr, count) and readRaw(nullptr, count) act like a
  forward seek instead of failing.
  This lets it be used to advance through a file without needing to
  allocate (and discard) storage space etc.
---
 src/OpenFOAM/db/IOstreams/IOstreams/Istream.H | 14 +++++---
 .../db/IOstreams/Pstreams/UIPstream.H         |  7 +++-
 .../db/IOstreams/Pstreams/UIPstreamBase.C     | 13 +++++---
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C | 32 ++++++++++++++++---
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H | 10 ++++--
 5 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index 36a9f9a665..6cd20ba048 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -161,8 +161,10 @@ public:
             //- Read a double
             virtual Istream& read(double&) = 0;
 
-            //- Read binary block
-            virtual Istream& read(char*, std::streamsize) = 0;
+            //- Read binary block (with any possible block delimiters).
+            //- Reading into a null pointer shall ideally behave like a seek
+            //- operation.
+            virtual Istream& read(char* data, std::streamsize count) = 0;
 
             //- Start of low-level raw binary read
             virtual bool beginRawRead() = 0;
@@ -170,8 +172,10 @@ public:
             //- End of low-level raw binary read
             virtual bool endRawRead() = 0;
 
-            //- Low-level raw binary read
-            virtual Istream& readRaw(char*, std::streamsize) = 0;
+            //- Low-level raw binary read (without possible block delimiters).
+            //- Reading into a null pointer shall ideally behave like a seek
+            //- operation.
+            virtual Istream& readRaw(char* data, std::streamsize count) = 0;
 
             //- Rewind the stream so that it may be read again
             virtual void rewind() = 0;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index 68e3f26bdc..9a61d58f7f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -75,6 +75,7 @@ class UIPstreamBase
 
         //- Read count bytes of data from the receive buffer.
         //  Prior data alignment is done by prepareBuffer
+        //  Reading into a null pointer behaves like a forward seek
         inline void readFromBuffer(void* data, const size_t count);
 
         //- Read string length and string content
@@ -181,9 +182,13 @@ public:
             Istream& read(double& val);
 
             //- Read binary block with 8-byte alignment.
+            //- Reading into a null pointer behaves like a forward seek of
+            //- count characters.
             Istream& read(char* data, std::streamsize count);
 
-            //- Low-level raw binary read
+            //- Low-level raw binary read.
+            //- Reading into a null pointer behaves like a forward seek of
+            //- count characters.
             Istream& readRaw(char* data, std::streamsize count);
 
             //- Start of low-level raw binary read
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
index 97685b3022..db04620b71 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
@@ -106,12 +106,15 @@ inline void Foam::UIPstreamBase::readFromBuffer
     const size_t count
 )
 {
-    const char* const __restrict__ buf = &recvBuf_[recvBufPos_];
-    char* const __restrict__ output = reinterpret_cast<char*>(data);
-
-    for (size_t i = 0; i < count; ++i)
+    if (data)
     {
-        output[i] = buf[i];
+        const char* const __restrict__ buf = &recvBuf_[recvBufPos_];
+        char* const __restrict__ output = reinterpret_cast<char*>(data);
+
+        for (size_t i = 0; i < count; ++i)
+        {
+            output[i] = buf[i];
+        }
     }
 
     recvBufPos_ += count;
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 6f0aa24fb3..646a1cedac 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1018,19 +1018,41 @@ Foam::Istream& Foam::ISstream::read(double& val)
 }
 
 
-Foam::Istream& Foam::ISstream::read(char* buf, std::streamsize count)
+Foam::Istream& Foam::ISstream::read(char* data, std::streamsize count)
 {
     beginRawRead();
-    readRaw(buf, count);
+    readRaw(data, count);
     endRawRead();
 
     return *this;
 }
 
 
-Foam::Istream& Foam::ISstream::readRaw(char* buf, std::streamsize count)
+Foam::Istream& Foam::ISstream::readRaw(char* data, std::streamsize count)
 {
-    is_.read(buf, count);
+    if (count)
+    {
+        if (data)
+        {
+            is_.read(data, count);
+        }
+        else
+        {
+            // Forward seek
+            is_.seekg(is_.tellg() + count);
+
+            // Not sure if this is needed (as per rewind)
+            // some documentation indicates that ifstream needs
+            // seekg with values from a tellg
+            //
+            // stdStream().rdbuf()->pubseekpos
+            // (
+            //     count,
+            //     std::ios_base::seekdir::cur,
+            //     std::ios_base::in
+            // );
+        }
+    }
     syncState();
     return *this;
 }
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index 7b3fcb3b3d..9e31ba9a84 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -222,10 +222,14 @@ public:
             //- Read a double
             virtual Istream& read(double& val);
 
-            //- Read binary block
-            virtual Istream& read(char* buf, std::streamsize count);
+            //- Read binary block (with any possible block delimiters).
+            //- Reading into a null pointer behaves like a forward seek of
+            //- count characters.
+            virtual Istream& read(char* data, std::streamsize count);
 
-            //- Low-level raw binary read
+            //- Low-level raw binary read (without possible block delimiters).
+            //- Reading into a null pointer behaves like a forward seek of
+            //- count characters.
             virtual Istream& readRaw(char* data, std::streamsize count);
 
             //- Start of low-level raw binary read

From ee39e3d2761ecabd02d49e03d698f5bf5811bfa6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 24 Apr 2023 12:05:55 +0200
Subject: [PATCH 190/348] STYLE: use explicit REGISTER option when storing
 fields

---
 .../parLagrangianDistributorTemplates.C       |  5 +--
 .../db/dynamicLibrary/codedBase/codedBase.C   |  4 +--
 src/OpenFOAM/fields/cloud/cloudTemplates.C    | 22 ++++++------
 .../schemes/DEShybrid/DEShybrid.H             |  9 +++--
 .../ObukhovLength/ObukhovLength.C             |  3 ++
 .../atmPlantCanopyTurbSource.C                |  3 +-
 .../atmPlantCanopyUSource.C                   |  3 +-
 .../polyMeshFilter/polyMeshFilterTemplates.C  | 18 ++++------
 .../columnAverage/columnAverageTemplates.C    |  5 +--
 .../histogramModel/histogramModel.C           |  3 +-
 .../field/mapFields/mapFieldsTemplates.C      | 34 +++++++++----------
 .../proudmanAcousticPower.C                   |  9 ++---
 .../field/readFields/readFields.C             |  3 +-
 .../resolutionIndexModel.C                    |  5 +--
 .../resolutionIndexModelTemplates.C           |  3 +-
 .../stabilityBlendingFactor.C                 | 12 ++++---
 .../turbulenceFieldsTemplates.C               | 24 ++++++-------
 .../forces/forceCoeffs/forceCoeffs.C          |  6 ++--
 src/functionObjects/forces/forces/forces.C    |  6 ++--
 .../utilities/solverInfo/solverInfo.C         |  3 +-
 .../HeatTransferCoeff/HeatTransferCoeff.C     | 29 +++++++++-------
 .../KinematicReynoldsNumber.C                 | 29 +++++++++-------
 .../NusseltNumber/NusseltNumber.C             | 29 +++++++++-------
 .../ParticleDose/ParticleDose.C               | 28 ++++++++-------
 .../ThermoReynoldsNumber.C                    | 29 +++++++++-------
 .../WeberNumber/WeberNumberReacting.C         | 29 +++++++++-------
 .../triSurfaceMesh/triSurfaceMesh.C           |  3 +-
 .../cellCellStencil/cellCellStencil.C         | 19 +++++++----
 .../functionObjects/filmFlux/filmFlux.C       |  3 +-
 ...emperatureCoupledMixedFvPatchScalarField.C |  3 +-
 .../basic/basicThermo/basicThermo.C           |  3 +-
 .../speciesSorptionFvPatchScalarField.C       |  5 +--
 .../isoAdvection/isoAdvection.C               |  6 ++--
 .../angledDuct/implicit/system/sampling       | 21 +++++++-----
 .../setups.orig/common/system/controlDict     |  3 +-
 .../setups.orig/common/system/controlDict     |  3 +-
 .../setups.orig/common/system/controlDict     |  3 +-
 37 files changed, 239 insertions(+), 186 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
index 6bfb38094c..8cb5119bed 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributorTemplates.C
@@ -302,8 +302,9 @@ Foam::label Foam::parLagrangianDistributor::readFields
                 objectName,
                 cloud.time().timeName(),
                 cloud,
-                IOobject::READ_IF_PRESENT,
-                IOobject::NO_WRITE
+                IOobject::LAZY_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             label(0)
         );
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index bdf64d0597..c2e25c8b19 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -103,7 +103,7 @@ Foam::codedBase::codeDict
     const word& dictName
 )
 {
-    IOdictionary* dictptr = obr.getObjectPtr<IOdictionary>(dictName);
+    auto* dictptr = obr.getObjectPtr<IOdictionary>(dictName);
 
     if (!dictptr)
     {
@@ -114,7 +114,7 @@ Foam::codedBase::codeDict
                 dictName,
                 obr.time().system(),
                 obr,
-                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::READ_MODIFIED,
                 IOobject::NO_WRITE,
                 IOobject::REGISTER
             )
diff --git a/src/OpenFOAM/fields/cloud/cloudTemplates.C b/src/OpenFOAM/fields/cloud/cloudTemplates.C
index 3bdd332fbb..0bbe00f3b5 100644
--- a/src/OpenFOAM/fields/cloud/cloudTemplates.C
+++ b/src/OpenFOAM/fields/cloud/cloudTemplates.C
@@ -37,20 +37,18 @@ Foam::IOField<Type>& Foam::cloud::createIOField
     objectRegistry& obr
 )
 {
-    IOField<Type>* fieldPtr
+    IOField<Type>* fieldPtr = new IOField<Type>
     (
-        new IOField<Type>
+        IOobject
         (
-            IOobject
-            (
-                fieldName,
-                obr.time().timeName(),
-                obr,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            nParticle
-        )
+            fieldName,
+            obr.time().timeName(),
+            obr,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE,
+            IOobject::REGISTER
+        ),
+        nParticle
     );
 
     fieldPtr->store();
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
index ff82ef379b..62618f3260 100644
--- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
@@ -297,13 +297,14 @@ class DEShybrid
             const word factorName(IOobject::scopedName(typeName, "Factor"));
             const fvMesh& mesh = this->mesh();
 
-            const IOobject factorIO
+            IOobject factorIO
             (
                 factorName,
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             );
 
             if (blendedSchemeBaseName::debug)
@@ -335,7 +336,9 @@ class DEShybrid
             }
             else
             {
-                const volScalarField factor
+                factorIO.registerObject(IOobjectOption::NO_REGISTER);
+
+                volScalarField factor
                 (
                     factorIO,
                     max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_)
diff --git a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
index 399e940477..68e8d0eef7 100644
--- a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
+++ b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
@@ -80,7 +80,10 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
         );
 
         result1->store();
+    }
 
+    if (!result2)
+    {
         result2 = new volScalarField
         (
             IOobject
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
index 9ced80a9a1..ed01512dbd 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C
@@ -60,7 +60,8 @@ Foam::volScalarField& Foam::fv::atmPlantCanopyTurbSource::getOrReadField
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
index 158ac96647..89beb35193 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C
@@ -61,7 +61,8 @@ Foam::volScalarField& Foam::fv::atmPlantCanopyUSource::getOrReadField
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
index 1583757852..4d13814c23 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
@@ -83,24 +83,20 @@ void Foam::polyMeshFilter::copySets
     {
         const SetType& set = *iter();
 
-        SetType* origSet =
+        auto* setPtr =
             newMesh.objectRegistry::getObjectPtr<SetType>(set.name());
 
-        if (origSet)
+        if (setPtr)
         {
-            (*origSet) = set;
-            (*origSet).sync(newMesh);
+            (*setPtr) = set;
         }
         else
         {
-            SetType* newSet
-            (
-                new SetType(newMesh, set.name(), set, set.writeOpt())
-            );
-
-            newSet->store();
-            newSet->sync(newMesh);
+            setPtr = new SetType(newMesh, set.name(), set, set.writeOpt());
+            setPtr->store();
         }
+
+        setPtr->sync(newMesh);
     }
 }
 
diff --git a/src/functionObjects/field/columnAverage/columnAverageTemplates.C b/src/functionObjects/field/columnAverage/columnAverageTemplates.C
index ab95a2b48f..6a6b537500 100644
--- a/src/functionObjects/field/columnAverage/columnAverageTemplates.C
+++ b/src/functionObjects/field/columnAverage/columnAverageTemplates.C
@@ -47,7 +47,7 @@ bool Foam::functionObjects::columnAverage::columnAverageField
 
         const word resultName(averageName(fieldName));
 
-        fieldType* resPtr = obr_.getObjectPtr<fieldType>(resultName);
+        auto* resPtr = obr_.getObjectPtr<fieldType>(resultName);
 
         if (!resPtr)
         {
@@ -59,7 +59,8 @@ bool Foam::functionObjects::columnAverage::columnAverageField
                     fld.mesh().time().timeName(),
                     fld.mesh(),
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 fld
             );
diff --git a/src/functionObjects/field/histogram/histogramModels/histogramModel/histogramModel.C b/src/functionObjects/field/histogram/histogramModels/histogramModel/histogramModel.C
index 8bfb64ce1d..4e57b40e34 100644
--- a/src/functionObjects/field/histogram/histogramModels/histogramModel/histogramModel.C
+++ b/src/functionObjects/field/histogram/histogramModels/histogramModel/histogramModel.C
@@ -68,7 +68,8 @@ Foam::volScalarField& Foam::histogramModel::getOrReadField
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/functionObjects/field/mapFields/mapFieldsTemplates.C b/src/functionObjects/field/mapFields/mapFieldsTemplates.C
index 6de7cb7be0..aa35e00716 100644
--- a/src/functionObjects/field/mapFields/mapFieldsTemplates.C
+++ b/src/functionObjects/field/mapFields/mapFieldsTemplates.C
@@ -129,28 +129,28 @@ bool Foam::functionObjects::mapFields::mapFieldType() const
 
         const VolFieldType& field = lookupObject<VolFieldType>(fieldName);
 
-        if (!mapRegion.foundObject<VolFieldType>(fieldName))
+        auto* mapFieldPtr = mapRegion.getObjectPtr<VolFieldType>(fieldName);
+
+        if (!mapFieldPtr)
         {
-            VolFieldType* tmappedField =
-                new VolFieldType
+            mapFieldPtr = new VolFieldType
+            (
+                IOobject
                 (
-                    IOobject
-                    (
-                        fieldName,
-                        time_.timeName(),
-                        mapRegion,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
+                    fieldName,
+                    time_.timeName(),
                     mapRegion,
-                    dimensioned<Type>(field.dimensions(), Zero)
-                );
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
+                ),
+                mapRegion,
+                dimensioned<Type>(field.dimensions(), Zero)
+            );
 
-            tmappedField->store();
+            mapFieldPtr->store();
         }
-
-        VolFieldType& mappedField =
-            mapRegion.template lookupObjectRef<VolFieldType>(fieldName);
+        auto& mappedField = *mapFieldPtr;
 
         mappedField = interpPtr_->mapTgtToSrc(field);
 
diff --git a/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.C b/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.C
index dd11e31367..0718ae315f 100644
--- a/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.C
+++ b/src/functionObjects/field/proudmanAcousticPower/proudmanAcousticPower.C
@@ -94,8 +94,7 @@ Foam::functionObjects::proudmanAcousticPower::a() const
             (
                 scopedName("a"),
                 mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ
+                mesh_
             ),
             mesh_,
             aRef_
@@ -170,7 +169,8 @@ Foam::functionObjects::proudmanAcousticPower::proudmanAcousticPower
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimPower/dimVolume, Zero)
@@ -189,7 +189,8 @@ Foam::functionObjects::proudmanAcousticPower::proudmanAcousticPower
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
diff --git a/src/functionObjects/field/readFields/readFields.C b/src/functionObjects/field/readFields/readFields.C
index bd670217d3..ccd549b180 100644
--- a/src/functionObjects/field/readFields/readFields.C
+++ b/src/functionObjects/field/readFields/readFields.C
@@ -111,7 +111,8 @@ bool Foam::functionObjects::readFields::execute()
             mesh_.time().timeName(),
             mesh_,
             IOobject::MUST_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         );
 
         const bool ok =
diff --git a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
index 44baba6b55..bf21e27a23 100644
--- a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
+++ b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModel.C
@@ -99,8 +99,9 @@ bool Foam::resolutionIndexModel::read(const dictionary& dict)
                 resultName_,
                 mesh_.time().timeName(),
                 mesh_,
-                IOobject::READ_IF_PRESENT,
-                IOobject::NO_WRITE
+                IOobject::LAZY_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
diff --git a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModelTemplates.C b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModelTemplates.C
index 61e494e74a..cdbe29b3d6 100644
--- a/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModelTemplates.C
+++ b/src/functionObjects/field/resolutionIndex/resolutionIndexModels/resolutionIndexModel/resolutionIndexModelTemplates.C
@@ -48,7 +48,8 @@ GeoFieldType& Foam::resolutionIndexModel::getOrReadField
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 871367501b..63c976e07e 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -67,7 +67,8 @@ Foam::functionObjects::stabilityBlendingFactor::indicator()
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
@@ -558,7 +559,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
             mesh_.time().constant(),
             mesh_,
             IOobject::MUST_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         );
 
         if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
@@ -587,7 +589,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
             mesh_.time().constant(),
             mesh_,
             IOobject::MUST_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         );
 
         if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
@@ -614,7 +617,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
             mesh_.time().constant(),
             mesh_,
             IOobject::MUST_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         );
 
         if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
index 6d4cc90658..e30d45d522 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
@@ -49,21 +49,21 @@ void Foam::functionObjects::turbulenceFields::processField
     }
     else
     {
-        obr_.store
+        fldPtr = new FieldType
         (
-            new FieldType
+            IOobject
             (
-                IOobject
-                (
-                    localName,
-                    obr_.time().timeName(),
-                    obr_,
-                    IOobject::READ_IF_PRESENT,
-                    IOobject::NO_WRITE
-                ),
-                tvalue
-            )
+                localName,
+                obr_.time().timeName(),
+                obr_,
+                IOobject::LAZY_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            ),
+            tvalue
         );
+
+        obr_.store(fldPtr);
     }
 }
 
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 3c08879e90..39234240fa 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -76,7 +76,8 @@ Foam::volVectorField& Foam::functionObjects::forceCoeffs::forceCoeff()
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedVector(dimless, Zero)
@@ -104,7 +105,8 @@ Foam::volVectorField& Foam::functionObjects::forceCoeffs::momentCoeff()
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedVector(dimless, Zero)
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 2fe3e42352..7b420685da 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -101,7 +101,8 @@ Foam::volVectorField& Foam::functionObjects::forces::force()
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedVector(dimForce, Zero)
@@ -128,7 +129,8 @@ Foam::volVectorField& Foam::functionObjects::forces::moment()
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedVector(dimForce*dimLength, Zero)
diff --git a/src/functionObjects/utilities/solverInfo/solverInfo.C b/src/functionObjects/utilities/solverInfo/solverInfo.C
index 51942e72eb..361c8998e6 100644
--- a/src/functionObjects/utilities/solverInfo/solverInfo.C
+++ b/src/functionObjects/utilities/solverInfo/solverInfo.C
@@ -102,7 +102,8 @@ void Foam::functionObjects::solverInfo::createResidualField
                     mesh_.time().timeName(),
                     mesh_,
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 Field<scalar>(mesh_.nCells(), Zero)
             );
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
index 423b21dc97..63ba5bc3e0 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
@@ -64,25 +64,28 @@ void Foam::HeatTransferCoeff<CloudType>::postEvolve
     const auto& tc =
         static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c);
 
-    if (!c.template foundObject<IOField<scalar>>("htc"))
+    auto* htcPtr = c.template getObjectPtr<IOField<scalar>>("htc");
+
+    if (!htcPtr)
     {
-        auto* htcPtr =
-            new IOField<scalar>
+        htcPtr = new IOField<scalar>
+        (
+            IOobject
             (
-                IOobject
-                (
-                    "htc",
-                    c.time().timeName(),
-                    c,
-                    IOobject::NO_READ
-                )
-            );
+                "htc",
+                c.time().timeName(),
+                c,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         htcPtr->store();
     }
+    auto& htc = *htcPtr;
 
-    auto& htc = c.template lookupObjectRef<IOField<scalar>>("htc");
-    htc.setSize(c.size());
+    htc.resize(c.size());
 
     const auto& heatTransfer = tc.heatTransfer();
     typename parcelType::trackingData& nctd =
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
index ac2ca5a27a..9a8e5f0c4e 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
@@ -61,25 +61,28 @@ void Foam::KinematicReynoldsNumber<CloudType>::postEvolve
 {
     auto& c = this->owner();
 
-    if (!c.template foundObject<IOField<scalar>>("Re"))
+    auto* RePtr = c.template getObjectPtr<IOField<scalar>>("Re");
+
+    if (!RePtr)
     {
-        auto* RePtr =
-            new IOField<scalar>
+        RePtr = new IOField<scalar>
+        (
+            IOobject
             (
-                IOobject
-                (
-                    "Re",
-                    c.time().timeName(),
-                    c,
-                    IOobject::NO_READ
-                )
-            );
+                "Re",
+                c.time().timeName(),
+                c,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         RePtr->store();
     }
+    auto& Re = *RePtr;
 
-    auto& Re = c.template lookupObjectRef<IOField<scalar>>("Re");
-    Re.setSize(c.size());
+    Re.resize(c.size());
 
     label parceli = 0;
     forAllConstIters(c, parcelIter)
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
index ee8a3eba0e..573aaf7081 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
@@ -64,25 +64,28 @@ void Foam::NusseltNumber<CloudType>::postEvolve
     const auto& tc =
         static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c);
 
-    if (!c.template foundObject<IOField<scalar>>("Nu"))
+    auto* NuPtr = c.template getObjectPtr<IOField<scalar>>("Nu");
+
+    if (!NuPtr)
     {
-        auto* NuPtr =
-            new IOField<scalar>
+        NuPtr = new IOField<scalar>
+        (
+            IOobject
             (
-                IOobject
-                (
-                    "Nu",
-                    c.time().timeName(),
-                    c,
-                    IOobject::NO_READ
-                )
-            );
+                "Nu",
+                c.time().timeName(),
+                c,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         NuPtr->store();
     }
+    auto& Nu = *NuPtr;
 
-    auto& Nu = c.template lookupObjectRef<IOField<scalar>>("Nu");
-    Nu.setSize(c.size());
+    Nu.resize(c.size());
 
     const auto& heatTransfer = tc.heatTransfer();
     typename parcelType::trackingData& nctd =
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
index 31f60743dd..89339f87c1 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
@@ -64,24 +64,26 @@ void Foam::ParticleDose<CloudType>::postEvolve
 {
     auto& c = this->owner();
 
-    if (!c.template foundObject<IOField<scalar>>("D"))
+    auto* DPtr = c.template getObjectPtr<IOField<scalar>>("D");
+
+    if (!DPtr)
     {
-        auto* DPtr =
-            new IOField<scalar>
+        DPtr = new IOField<scalar>
+        (
+            IOobject
             (
-                IOobject
-                (
-                    "D",
-                    c.time().timeName(),
-                    c,
-                    IOobject::NO_READ
-                )
-            );
+                "D",
+                c.time().timeName(),
+                c,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         DPtr->store();
     }
-
-    auto& D = c.template lookupObjectRef<IOField<scalar>>("D");
+    auto& D = *DPtr;
 
     D.resize(c.size(), Zero);
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
index 45457d7706..6f06c372d8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
@@ -62,25 +62,28 @@ void Foam::ThermoReynoldsNumber<CloudType>::postEvolve
 {
     auto& c = this->owner();
 
-    if (!c.template foundObject<IOField<scalar>>("Re"))
+    auto* RePtr = c.template getObjectPtr<IOField<scalar>>("Re");
+
+    if (!RePtr)
     {
-        auto* RePtr =
-            new IOField<scalar>
+        RePtr = new IOField<scalar>
+        (
+            IOobject
             (
-                IOobject
-                (
-                    "Re",
-                    c.time().timeName(),
-                    c,
-                    IOobject::NO_READ
-                )
-            );
+                "Re",
+                c.time().timeName(),
+                c,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         RePtr->store();
     }
+    auto& Re = *RePtr;
 
-    auto& Re = c.template lookupObjectRef<IOField<scalar>>("Re");
-    Re.setSize(c.size());
+    Re.resize(c.size());
 
     typename parcelType::trackingData& nctd =
         const_cast<typename parcelType::trackingData&>(td);
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
index f596c0c330..307db42ec0 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
@@ -62,25 +62,28 @@ void Foam::WeberNumberReacting<CloudType>::postEvolve
 {
     const auto& c = this->owner();
 
-    if (!c.template foundObject<IOField<scalar>>("We"))
+    auto* WePtr = c.template getObjectPtr<IOField<scalar>>("We");
+
+    if (!WePtr)
     {
-        IOField<scalar>* WePtr =
-            new IOField<scalar>
+        WePtr = new IOField<scalar>
+        (
+            IOobject
             (
-                IOobject
-                (
-                    "We",
-                    c.time().timeName(),
-                    c,
-                    IOobject::NO_READ
-                )
-            );
+                "We",
+                c.time().timeName(),
+                c,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         WePtr->store();
     }
+    auto& We = *WePtr;
 
-    auto& We = c.template lookupObjectRef<IOField<scalar>>("We");
-    We.setSize(c.size());
+    We.resize(c.size());
 
     const auto& thermo = c.db().template lookupObject<SLGThermo>("SLGThermo");
     const auto& liquids = thermo.liquids();
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index dd5b041590..0cc6121635 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -1158,7 +1158,8 @@ void Foam::triSurfaceMesh::setField(const labelList& values)
                 meshSubDir,                         // local
                 *this,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             *this,
             dimless,
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
index b41f93a8e6..5a05dd3332 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
@@ -112,9 +112,11 @@ Foam::word Foam::cellCellStencil::baseName(const word& name)
 
 const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
 {
-    if (!mesh.foundObject<labelIOList>("zoneID"))
+    labelIOList* zoneIDPtr = mesh.getObjectPtr<labelIOList>("zoneID");
+
+    if (!zoneIDPtr)
     {
-        labelIOList* zoneIDPtr = new labelIOList
+        zoneIDPtr = new labelIOList
         (
             IOobject
             (
@@ -123,11 +125,15 @@ const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
                 polyMesh::meshSubDir,
                 mesh,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh.nCells()
         );
-        labelIOList& zoneID = *zoneIDPtr;
+
+        zoneIDPtr->store();
+
+        auto& zoneID = *zoneIDPtr;
 
         volScalarField volZoneID
         (
@@ -146,10 +152,9 @@ const Foam::labelIOList& Foam::cellCellStencil::zoneID(const fvMesh& mesh)
         {
             zoneID[celli] = label(volZoneID[celli]);
         }
-
-        zoneIDPtr->store();
     }
-    return mesh.lookupObject<labelIOList>("zoneID");
+
+    return *zoneIDPtr;
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C b/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
index aad394213e..305c579bf8 100644
--- a/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
+++ b/src/regionModels/surfaceFilmModels/functionObjects/filmFlux/filmFlux.C
@@ -101,7 +101,8 @@ bool Foam::functionObjects::filmFlux::execute()
                 time_.timeName(),
                 filmMesh,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             filmMesh,
             dimensionedScalar(dimMass/dimTime, Zero)
diff --git a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index ab879eda9b..d59610e575 100644
--- a/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -108,7 +108,8 @@ Foam::humidityTemperatureCoupledMixedFvPatchScalarField::thicknessField
                 mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh,
             dimensionedScalar(dimless, Zero)
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index 0c19e0b837..d994878872 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -256,7 +256,8 @@ Foam::volScalarField& Foam::basicThermo::lookupOrConstruct
                 mesh.time().timeName(),
                 mesh,
                 IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh
         );
diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
index f1275de1bc..26a4a27fd6 100644
--- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/speciesSorption/speciesSorptionFvPatchScalarField.C
@@ -121,9 +121,10 @@ Foam::speciesSorptionFvPatchScalarField::field
             (
                 fieldName,
                 mesh.time().timeName(),
-                mesh,
+                mesh.thisDb(),
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh,
             dimensionedScalar(dim, Zero)
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
index fc9e8746a3..27b94e3db3 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
@@ -156,10 +156,10 @@ Foam::isoAdvection::isoAdvection
 
     if (porosityEnabled_)
     {
-        if (mesh_.foundObject<volScalarField>("porosity"))
-        {
-            porosityPtr_ = mesh_.getObjectPtr<volScalarField>("porosity");
+        porosityPtr_ = mesh_.getObjectPtr<volScalarField>("porosity");
 
+        if (porosityPtr_)
+        {
             if
             (
                 gMin(porosityPtr_->primitiveField()) <= 0
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
index 63b567b833..5aa11fe99a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
@@ -25,8 +25,7 @@ cellZoneID
         // but is fairly low overhead anyhow
         volScalarField* getZoneField(const fvMesh& mesh)
         {
-            volScalarField* volZonePtr =
-                mesh.getObjectPtr<volScalarField>(fieldName);
+            auto* volZonePtr = mesh.getObjectPtr<volScalarField>(fieldName);
 
             const cellZoneMesh& zones = mesh.cellZones();
 
@@ -34,16 +33,22 @@ cellZoneID
             {
                 if (!volZonePtr)
                 {
-                    volZonePtr = &regIOobject::store
+                    volZonePtr = new volScalarField
                     (
-                        volScalarField::New
+                        IOobject
                         (
                             fieldName,
-                            mesh,
-                            dimless,
-                            fvPatchScalarField::zeroGradientType()
-                        )
+                            mesh.time().timeName(),
+                            mesh.thisDb(),
+                            IOobject::NO_READ,
+                            IOobject::AUTO_WRITE,
+                            IOobject::REGISTER
+                        ),
+                        mesh,
+                        dimless,
+                        fvPatchFieldBase::zeroGradientType()
                     );
+                    regIOobject::store(volZonePtr);
 
                     Info<< "Creating " << fieldName
                         << " field for postProcessing" << nl;
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
index 504020affd..929b6b6e83 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
@@ -89,7 +89,8 @@ functions
                         mesh().time().timeName(),
                         mesh(),
                         IOobject::NO_READ,
-                        IOobject::AUTO_WRITE
+                        IOobject::AUTO_WRITE,
+                        IOobject::REGISTER
                     ),
                     mesh(),
                     dimless
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
index 46abec5c2c..98f9267e3a 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
@@ -114,7 +114,8 @@ functions
                         mesh().time().timeName(),
                         mesh(),
                         IOobject::NO_READ,
-                        IOobject::AUTO_WRITE
+                        IOobject::AUTO_WRITE,
+                        IOobject::REGISTER
                     ),
                     mesh(),
                     sqr(dimLength)/pow3(dimTime)
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
index 922e76edd1..3411cc17b7 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
@@ -114,7 +114,8 @@ functions
                         mesh().time().timeName(),
                         mesh(),
                         IOobject::NO_READ,
-                        IOobject::AUTO_WRITE
+                        IOobject::AUTO_WRITE,
+                        IOobject::REGISTER
                     ),
                     mesh(),
                     sqr(dimLength)/pow3(dimTime)

From 7a5ecd70b8e8ffd2753b120f1163763b64a8f89d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 24 Apr 2023 10:21:51 +0200
Subject: [PATCH 191/348] BUG: misleading error message in finiteArea construct

- the default (uninitialised) value for edge connections of -1
  could be confused with a tagged finiteArea patch, which used
  (-patchid-1) encoding. This would lead to messages about erroneous
  processor-processor addressing, but is in fact an mismatched edge
  connection.

  Now tag the finiteArea patch as (-patchid-2) to avoid this ambiguity
  and correctly generate an "Undefined connection:" message instead.

  Properly flush the VTP writers before raising a FatalError
  to ensure that they are not prematurely truncated.

Open Point:

  The base problem of "Undefined connection:" is largely related to
  multiply-connected face edges (ie, from the underlying volume mesh).
  Not easily remedied in the finiteArea generation.

TUT: basic finiteArea setup on motorBike
---
 src/finiteArea/faMesh/faMesh.H                |  30 ++--
 src/finiteArea/faMesh/faMeshPatches.C         |  59 ++++---
 src/finiteArea/faMesh/faMeshTopology.C        | 154 ++++++++++++------
 .../motorBike/system/decomposeParDict-random  |  22 +++
 .../motorBike/system/faMeshDefinition         |  30 ++++
 .../simpleFoam/motorBike/system/faSchemes     |  32 ++++
 .../simpleFoam/motorBike/system/faSolution    |  19 +++
 7 files changed, 262 insertions(+), 84 deletions(-)
 create mode 100644 tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict-random
 create mode 100644 tutorials/incompressible/simpleFoam/motorBike/system/faMeshDefinition
 create mode 100644 tutorials/incompressible/simpleFoam/motorBike/system/faSchemes
 create mode 100644 tutorials/incompressible/simpleFoam/motorBike/system/faSolution

diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H
index 0c4d3f8890..f3173e6441 100644
--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@@ -101,11 +101,11 @@ class faMesh
 {
     // Private (internal) classes/structures
 
-        //- A (proc, patchi, patchEdgei) tuple used internally for managing
-        //- patch/patch bookkeeping during construction.
-        //  Finite-area patches are stored with negated indices, which makes
-        //  them readily identifiable and always sort before normal patches.
-        //  Note
+        //- A (proc, patchi, patchEdgei, meshFacei) tuple used internally
+        //- for managing patch/patch bookkeeping during construction.
+        //  Finite-area patches are stored with negated indices (offset -2),
+        //  which makes them readily identifiable and always sort before normal
+        //  patches.
         struct patchTuple
         :
             public FixedList<label, 4>
@@ -150,17 +150,17 @@ class faMesh
                 meshFacei(-1);
             }
 
-            //- Valid if proc and edge are non-negative
-            bool valid() const noexcept
+            //- Valid if proc and patch (or patch edge) are non-negative
+            bool valid() const
             {
-                return (procNo() >= 0 && patchEdgei() >= 0);
+                return (procNo() >= 0 && patchi() != -1);
             }
 
             // Processor is the first sort index
             label procNo() const { return (*this)[0]; }
             void procNo(label val) { (*this)[0] = val; }
 
-            // PatchId (-ve for finiteArea patches) is the second sort index
+            // PatchId is the second sort index (finiteArea patches are < -1)
             label patchi() const { return (*this)[1]; }
             void patchi(label val) { (*this)[1] = val; }
 
@@ -177,25 +177,25 @@ class faMesh
             label realPatchi() const
             {
                 const label id = patchi();
-                return (id < 0 ? -(id + 1) : id);
+                return (id < -1 ? -(id + 2) : id);
             }
 
             //- Set patchId as finiteArea
             void faPatchi(label val)
             {
-                patchi(-(val + 1));
+                patchi(-(val + 2));
             }
 
-            //- Considered to be finiteArea if patchi < 0
+            //- Considered to be finiteArea if (patchi < -1)
             bool is_finiteArea() const noexcept
             {
-                return (patchi() < 0);
+                return (patchi() < -1);
             }
 
             //- Considered to be processor local
-            bool is_localProc() const noexcept
+            bool is_localProc() const
             {
-                return (procNo() == Pstream::myProcNo());
+                return (procNo() == UPstream::myProcNo());
             }
         };
 
diff --git a/src/finiteArea/faMesh/faMeshPatches.C b/src/finiteArea/faMesh/faMeshPatches.C
index 2e8170db49..f04e67ad71 100644
--- a/src/finiteArea/faMesh/faMeshPatches.C
+++ b/src/finiteArea/faMesh/faMeshPatches.C
@@ -120,9 +120,7 @@ Foam::faPatchList Foam::faMesh::createPatchList
         const dictionary& patchDict = dEntry.dict();
 
         // Add entry
-        faPatchDefs.append(faPatchData());
-
-        auto& patchDef = faPatchDefs.last();
+        auto& patchDef = faPatchDefs.emplace_back();
         patchDef.name_ = dEntry.keyword();
         patchDef.type_ = patchDict.get<word>("type");
 
@@ -156,9 +154,7 @@ Foam::faPatchList Foam::faMesh::createPatchList
     // Additional empty placeholder patch?
     if (!emptyPatchName.empty())
     {
-        faPatchDefs.append(faPatchData());
-
-        auto& patchDef = faPatchDefs.last();
+        auto& patchDef = faPatchDefs.emplace_back();
         patchDef.name_ = emptyPatchName;
         patchDef.type_ = "empty";
     }
@@ -168,9 +164,7 @@ Foam::faPatchList Foam::faMesh::createPatchList
     // Placeholder for any undefined edges
     const label undefPatchIndex = faPatchDefs.size();
     {
-        faPatchDefs.append(faPatchData());
-
-        auto& patchDef = faPatchDefs.last();
+        auto& patchDef = faPatchDefs.emplace_back();
         patchDef.name_ = "undefined";
         patchDef.type_ = "patch";
 
@@ -207,7 +201,6 @@ Foam::faPatchList Foam::faMesh::createPatchList
     Map<labelHashSet> procConnections;
     labelHashSet patchDefsUsed;
 
-    label nBadEdges(0);
     labelHashSet badEdges(2*bndEdgeConnections.size());
 
     forAll(bndEdgeConnections, connecti)
@@ -218,17 +211,26 @@ Foam::faPatchList Foam::faMesh::createPatchList
 
         edge patchPair;
 
-        if (a.is_finiteArea())
+        if (!a.valid() || !b.valid())
+        {
+            // Skip checking pairs where either is not valid
+            continue;
+        }
+        else if (a.is_finiteArea())
         {
             if (b.is_finiteArea())
             {
-                // A processor-processor connection
+                // Expecting an inter-processor connection
+
                 if (a.procNo() == b.procNo())
                 {
+                    // An intra-processor connection (should not be possible)
                     FatalErrorInFunction
                         << "Processor-processor addressing error:" << nl
                         << "Both connections have the same processor: "
                         << a.procNo() << nl
+                        << "Connecting patches "
+                        << a.realPatchi() << " and " << b.realPatchi() << nl
                         << abort(FatalError);
                 }
                 else if (a.is_localProc())
@@ -323,22 +325,38 @@ Foam::faPatchList Foam::faMesh::createPatchList
                         << "(patch:" << a.realPatchi()
                         << " face:" << a.meshFacei()
                         << ") and (patch:" << b.realPatchi()
-                        << " face:" << b.meshFacei() << ") connects: "
-                        << pbm[a.realPatchi()].name() << " to "
-                        << pbm[b.realPatchi()].name() << nl;
+                        << " face:" << b.meshFacei() << ")  patch:"
+                        <<
+                        (
+                            a.realPatchi() >= 0
+                          ? pbm[a.realPatchi()].name()
+                          : word::null
+                        )
+                        << " and patch:"
+                        <<
+                        (
+                            b.realPatchi() >= 0
+                          ? pbm[b.realPatchi()].name()
+                          : word::null
+                        )
+                        << nl;
                 }
             }
         }
 
-        if ((nBadEdges = returnReduce(badEdges.size(), sumOp<label>())) != 0)
+        if (returnReduceOr(badEdges.size()))
         {
             // Report directly as Info, not InfoInFunction
             // since it can also be an expected result when
             // nWarnUndefinedPatch == 0
-            Info<< "Had " << nBadEdges << '/'
+            Info<< nl
+                << "Had "
+                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
                 << returnReduce(patch().nBoundaryEdges(), sumOp<label>())
                 << " undefined edge connections, added to defaultPatch: "
-                << faPatchDefs[undefPatchIndex].name_ << nl;
+                << faPatchDefs[undefPatchIndex].name_ << nl << nl
+                << "==> Could indicate a non-manifold patch geometry" << nl
+                << nl;
 
             if (nWarnUndefinedPatch)
             {
@@ -378,10 +396,9 @@ Foam::faPatchList Foam::faMesh::createPatchList
             procToDefLookup.insert(otherProci, patchDefi);
 
             // Add entry
-            faPatchDefs.append(faPatchData());
-            auto& patchDef = faPatchDefs.last();
+            auto& patchDef = faPatchDefs.emplace_back();
 
-            patchDef.assign_coupled(Pstream::myProcNo(), otherProci);
+            patchDef.assign_coupled(UPstream::myProcNo(), otherProci);
         }
     }
 
diff --git a/src/finiteArea/faMesh/faMeshTopology.C b/src/finiteArea/faMesh/faMeshTopology.C
index 4ab30bbfa6..f91f3ec23f 100644
--- a/src/finiteArea/faMesh/faMeshTopology.C
+++ b/src/finiteArea/faMesh/faMeshTopology.C
@@ -30,6 +30,7 @@ License
 #include "globalMeshData.H"
 #include "indirectPrimitivePatch.H"
 #include "edgeHashes.H"
+#include "syncTools.H"
 #include "foamVtkLineWriter.H"
 #include "foamVtkIndPatchWriter.H"
 
@@ -88,7 +89,6 @@ Foam::faMesh::getBoundaryEdgeConnections() const
     // Map edges (mesh numbering) back to a boundary index
     EdgeMap<label> edgeToBoundaryIndex(2*nBoundaryEdges);
 
-    label nBadEdges(0);
     labelHashSet badEdges(2*nBoundaryEdges);
 
     {
@@ -102,7 +102,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
 
             void clear()
             {
-                Foam::edge::clear();
+                Foam::edge::clear();  // ie, (-1, -1)
                 patchEdgei_ = -1;
                 meshFacei_ = -1;
             }
@@ -114,7 +114,6 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             << "Determining required boundary edge connections, "
             << "resolving locally attached boundary edges." << endl;
 
-
         // Pass 1:
         // - setup lookup (edge -> bnd index)
         // - add owner patch for each boundary edge
@@ -148,7 +147,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             {
                 auto& tuple = bndEdgeConnections[bndEdgei].first();
 
-                tuple.procNo(Pstream::myProcNo());
+                tuple.procNo(UPstream::myProcNo());
                 tuple.faPatchi(patchId);  // Tag as finiteArea patch
                 tuple.patchEdgei(patchEdgei);
                 tuple.meshFacei(meshFacei);
@@ -165,7 +164,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             }
         }
 
-        if ((nBadEdges = returnReduce(badEdges.size(), sumOp<label>())) != 0)
+        if (returnReduceOr(badEdges.size()))
         {
             edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
 
@@ -186,9 +185,15 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             writer.beginCellData();
             writer.writeProcIDs();
 
+            InfoInFunction
+                << "(debug) wrote " << writer.output().name() << nl;
+
+            writer.close();  // Flush writer before raising FatalError
+
             FatalErrorInFunction
                 << "Boundary edges not singly connected: "
-                << nBadEdges << '/' << nBoundaryEdges << nl;
+                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+                << nBoundaryEdges << nl;
 
             printPatchEdges
             (
@@ -197,9 +202,6 @@ Foam::faMesh::getBoundaryEdgeConnections() const
                 badEdges.sortedToc()
             );
 
-            InfoInFunction
-                << "(debug) wrote " << writer.output().name() << nl;
-
             FatalError << abort(FatalError);
         }
         badEdges.clear();
@@ -263,10 +265,12 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             }
         }
 
-        if ((nBadEdges = returnReduce(badEdges.size(), sumOp<label>())) != 0)
+        if (returnReduceOr(badEdges.size()))
         {
             FatalErrorInFunction
-                << "Had " << nBadEdges
+                << "Had "
+                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+                << nBoundaryEdges
                 << " boundary edges with missing or multiple edge connections"
                 << abort(FatalError);
         }
@@ -275,22 +279,36 @@ Foam::faMesh::getBoundaryEdgeConnections() const
         badEdges.clear();
         for (label bndEdgei = 0; bndEdgei < nBoundaryEdges; ++bndEdgei)
         {
+            // Primary bookkeeping
+            auto& tuple = bndEdgeConnections[bndEdgei].second();
+
+            // Local bookkeeping
             const auto& pairing = patchPairings[bndEdgei];
             const label nbrPatchi = pairing.second();
             const label nbrPatchEdgei = pairing.patchEdgei_;
             const label nbrMeshFacei = pairing.meshFacei_;
 
-            if (nbrMeshFacei >= 0)
+            if (nbrMeshFacei >= 0)  // Additional safety
             {
-                // Add into primary bookkeeping
-                auto& tuple = bndEdgeConnections[bndEdgei].second();
-
-                tuple.procNo(Pstream::myProcNo());
-                tuple.patchi(nbrPatchi);
-                tuple.patchEdgei(nbrPatchEdgei);
-                tuple.meshFacei(nbrMeshFacei);
+                if (nbrPatchi >= 0)
+                {
+                    // Local connection
+                    tuple.procNo(UPstream::myProcNo());
+                    tuple.patchi(nbrPatchi);
+                    tuple.patchEdgei(nbrPatchEdgei);
+                    tuple.meshFacei(nbrMeshFacei);
+                }
+                else
+                {
+                    // No local connection.
+                    // Is likely to be a processor connection
+                    tuple.procNo(UPstream::myProcNo());
+                    tuple.patchi(-1);
+                    tuple.patchEdgei(-1);
+                    tuple.meshFacei(-1);
+                }
             }
-            else if (!Pstream::parRun())
+            else if (!UPstream::parRun())
             {
                 badEdges.insert(nInternalEdges + bndEdgei);
             }
@@ -301,12 +319,11 @@ Foam::faMesh::getBoundaryEdgeConnections() const
     // ~~~~~~
     // Serial - can return already
     // ~~~~~~
-    if (!Pstream::parRun())
+    if (!UPstream::parRun())
     {
         // Verbose report of missing edges - in serial
 
-        nBadEdges = badEdges.size();
-        if (nBadEdges)
+        if (returnReduceOr(badEdges.size()))
         {
             edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
 
@@ -327,9 +344,15 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             writer.beginCellData();
             writer.writeProcIDs();
 
+            InfoInFunction
+                << "(debug) wrote " << writer.output().name() << nl;
+
+            writer.close();  // Flush writer before raising FatalError
+
             FatalErrorInFunction
                 << "Boundary edges with missing/invalid neighbours: "
-                << nBadEdges << '/' << nBoundaryEdges << nl;
+                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+                << nBoundaryEdges << nl;
 
             printPatchEdges
             (
@@ -338,9 +361,6 @@ Foam::faMesh::getBoundaryEdgeConnections() const
                 badEdges.sortedToc()
             );
 
-            InfoInFunction
-                << "(debug) wrote " << writer.output().name() << nl;
-
             FatalError << abort(FatalError);
         }
 
@@ -430,7 +450,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
                 auto& gathered = gatheredConnections[cppEdgei];
                 gathered.setCapacity(2);
                 gathered.resize(1);
-                auto& tuple = gathered.last();
+                auto& tuple = gathered.back();
 
                 tuple = bndEdgeConnections[bndEdgei].first();
             }
@@ -487,9 +507,9 @@ Foam::faMesh::getBoundaryEdgeConnections() const
                 auto& gathered = gatheredConnections[cppEdgei];
                 gathered.setCapacity(2);
                 gathered.resize(1);
-                auto& tuple = gathered.last();
+                auto& tuple = gathered.back();
 
-                tuple.procNo(Pstream::myProcNo());
+                tuple.procNo(UPstream::myProcNo());
                 tuple.patchi(patchi);
                 tuple.patchEdgei(patchEdgei);
                 tuple.meshFacei(meshFacei);
@@ -502,10 +522,11 @@ Foam::faMesh::getBoundaryEdgeConnections() const
         }
     }
 
-    if ((nBadEdges = returnReduce(badEdges.size(), sumOp<label>())) != 0)
+    if (returnReduceOr(badEdges.size()))
     {
         FatalErrorInFunction
-            << "Had " << nBadEdges << " coupled boundary edges"
+            << "Had " << returnReduce(badEdges.size(), sumOp<label>())
+            << " coupled boundary edges"
             << " with missing or multiple edge connections"
             << abort(FatalError);
     }
@@ -623,7 +644,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
     }
 
     // Verbose report of missing edges
-    if ((nBadEdges = returnReduce(badEdges.size(), sumOp<label>())) != 0)
+    if (returnReduceOr(badEdges.size()))
     {
         edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
 
@@ -644,9 +665,15 @@ Foam::faMesh::getBoundaryEdgeConnections() const
         writer.beginCellData();
         writer.writeProcIDs();
 
+        InfoInFunction
+            << "(debug) wrote " << writer.output().name() << nl;
+
+        writer.close();  // Flush writer before raising FatalError
+
         FatalErrorInFunction
             << "Boundary edges with missing/invalid neighbours: "
-            << nBadEdges << '/' << nBoundaryEdges << nl;
+            << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+            << nBoundaryEdges << nl;
 
         printPatchEdges
         (
@@ -655,9 +682,6 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             badEdges.sortedToc()
         );
 
-        InfoInFunction
-            << "(debug) wrote " << writer.output().name() << nl;
-
         FatalError << abort(FatalError);
     }
 
@@ -723,7 +747,7 @@ void Foam::faMesh::setBoundaryConnections
         }
     }
 
-    label nInvalid = 0;
+    label nInvalid(0);
     for (const auto& connection : bndConnect)
     {
         if (connection.first() < 0 || connection.second() < 0)
@@ -732,15 +756,49 @@ void Foam::faMesh::setBoundaryConnections
         }
     }
 
-    if (Pstream::parRun())
+    if (returnReduceOr(nInvalid))
     {
-        reduce(nInvalid, sumOp<label>());
-    }
+        labelHashSet badEdges(2*nInvalid);
+
+        forAll(bndConnect, bndEdgei)
+        {
+            if
+            (
+                bndConnect[bndEdgei].first() < 0
+             || bndConnect[bndEdgei].second() < 0
+            )
+            {
+                badEdges.insert(nInternalEdges + bndEdgei);
+            }
+        }
+
+        edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
+
+        vtk::lineWriter writer
+        (
+            patch().localPoints(),
+            dumpEdges,
+            fileName
+            (
+                mesh().time().globalPath()
+              / ("faMesh-construct.invalidMatches")
+            )
+        );
+
+        writer.writeGeometry();
+
+        // CellData
+        writer.beginCellData();
+        writer.writeProcIDs();
+
+        InfoInFunction
+            << "(debug) wrote " << writer.output().name() << nl;
+
+        writer.close();  // Flush writer before raising FatalError
 
-    if (nInvalid)
-    {
         FatalErrorInFunction
-            << "Did not properly match " << nInvalid
+            << "Did not properly match "
+            << returnReduce(nInvalid, sumOp<label>())
             << " boundary edges" << nl
             << abort(FatalError);
     }
@@ -759,7 +817,7 @@ Foam::labelList Foam::faMesh::boundaryProcs() const
 {
     const auto& connections = this->boundaryConnections();
 
-    labelHashSet procsUsed(2*Pstream::nProcs());
+    labelHashSet procsUsed(2*UPstream::nProcs());
 
     for (const labelPair& tuple : connections)
     {
@@ -767,7 +825,7 @@ Foam::labelList Foam::faMesh::boundaryProcs() const
     }
 
     procsUsed.erase(-1);  // placeholder value
-    procsUsed.erase(Pstream::myProcNo());
+    procsUsed.erase(UPstream::myProcNo());
 
     return procsUsed.sortedToc();
 }
@@ -777,14 +835,14 @@ Foam::List<Foam::labelPair> Foam::faMesh::boundaryProcSizes() const
 {
     const auto& connections = this->boundaryConnections();
 
-    Map<label> procCount(2*Pstream::nProcs());
+    Map<label> procCount(2*UPstream::nProcs());
 
     for (const labelPair& tuple : connections)
     {
         ++procCount(tuple.first());
     }
     procCount.erase(-1);  // placeholder value
-    procCount.erase(Pstream::myProcNo());
+    procCount.erase(UPstream::myProcNo());
 
     // Flatten as list
     List<labelPair> output(procCount.size());
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict-random b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict-random
new file mode 100644
index 0000000000..229f405370
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict-random
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 3;
+
+method          random;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/faMeshDefinition b/tutorials/incompressible/simpleFoam/motorBike/system/faMeshDefinition
new file mode 100644
index 0000000000..a41baa21fb
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/faMeshDefinition
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faMeshDefinition;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+polyMeshPatches   (motorBikeGroup);
+
+boundary
+{
+    bottom
+    {
+        type                patch;
+        // ownerPolyPatch      motorBikeGroup;
+        neighbourPolyPatch  lowerWall;
+    }
+}
+
+
+// ************************************************************************** //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/faSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/faSchemes
new file mode 100644
index 0000000000..cd6cbcafd9
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/faSchemes
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes {}
+
+gradSchemes {}
+
+divSchemes {}
+
+laplacianSchemes {}
+
+interpolationSchemes {}
+
+lnGradSchemes {}
+
+fluxRequired {}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/faSolution b/tutorials/incompressible/simpleFoam/motorBike/system/faSolution
new file mode 100644
index 0000000000..28c517f261
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/faSolution
@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      faSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers {}
+
+// ************************************************************************* //

From 09ce87135b8f61c498671af1de2fa644c65626eb Mon Sep 17 00:00:00 2001
From: Santiago Marquez Damian <>
Date: Wed, 26 Apr 2023 17:30:17 +0100
Subject: [PATCH 192/348] DOC: kOmega: correct literature reference (fixes
 #2766)

---
 .../turbulenceModels/RAS/kOmega/kOmega.H               | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
index 2a3aef70f9..a0ec068009 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,9 +36,11 @@ Description
 
     References:
     \verbatim
-        Wilcox, D. C. (1998).
-        Turbulence modeling for CFD
-        (Vol. 2, pp. 103-217). La Canada, CA: DCW industries.
+        Wilcox, D. C. (1988).
+        Reassessment of the scale-determining
+        equation for advanced turbulence models.
+        AIAA Journal, 26(11), 1299-1310.
+        DOI:10.2514/3.10041
     \endverbatim
 
     The default model coefficients are

From e967305ef29d16962e9495917a58f8d4aae761e5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 24 Apr 2023 16:18:05 +0200
Subject: [PATCH 193/348] STYLE: use calculatedType() and zeroGradientType()
 methods

---
 .../overRhoPimpleDyMFoam/correctPhi.H         |  2 +-
 .../overBuoyantPimpleDyMFoam/correctPhi.H     |  2 +-
 .../solid/createSolidFields.H                 |  2 +-
 .../heatTransfer/solidFoam/createFields.H     |  2 +-
 .../pimpleFoam/overPimpleDyMFoam/correctPhi.H |  2 +-
 .../DPMFoam/DPMDyMFoam/DPMDyMFoam.C           |  2 +-
 .../solvers/lagrangian/DPMFoam/DPMFoam.C      |  2 +-
 .../MPPICInterFoam/MPPICInterFoam.C           |  2 +-
 .../multiphase/MPPICInterFoam/createFields.H  |  5 +--
 .../cavitatingDyMFoam/createPcorrTypes.H      |  2 +-
 .../VoFSolidificationMeltingSource.C          |  2 +-
 ...incompressibleTwoPhaseInteractingMixture.C |  3 +-
 .../relativeVelocityModel.C                   |  2 +-
 .../incompressibleThreePhaseMixture.C         |  3 +-
 .../interFoam/overInterDyMFoam/correctPhi.H   |  2 +-
 .../multiphase/multiphaseEulerFoam/pEqn.H     |  2 +-
 .../test/fieldMapping/Test-fieldMapping.C     |  6 +--
 applications/test/hexRef8/Test-hexRef8.C      |  9 ++---
 .../test/mappedPatch/Test-MappedPatch.C       |  2 +-
 applications/test/volField/Test-volField.C    |  4 +-
 .../backgroundMeshDecomposition.C             |  4 +-
 .../conformalVoronoiMeshIO.C                  | 13 ++++---
 .../conformalVoronoiMeshTemplates.C           |  4 +-
 .../mesh/manipulation/checkMesh/writeFields.C | 39 +++++++------------
 .../createBaffles/createBaffles.C             |  2 +-
 .../manipulation/createPatch/createPatch.C    |  6 +--
 .../manipulation/renumberMesh/renumberMesh.C  | 23 +++--------
 .../splitMeshRegions/splitMeshRegions.C       |  7 ++--
 .../domainDecompositionDryRunWrite.C          |  7 ++--
 .../decomposePar/domainDecompositionWrite.C   |  7 ++--
 .../reconstructParMesh/reconstructParMesh.C   |  7 ++--
 .../redistributePar/redistributePar.C         |  7 ++--
 .../dataConversion/foamToEnsight/readFields.H |  4 +-
 .../applyBoundaryLayer/createFields.H         |  4 +-
 .../LES/LESdeltas/LESdelta/LESdelta.C         |  3 +-
 .../anisotropicFilter/anisotropicFilter.C     |  6 +--
 .../LESfilters/laplaceFilter/laplaceFilter.C  |  6 +--
 .../eddyViscosity/eddyViscosity.C             |  2 +-
 .../faMeshSubset/faMeshSubsetTemplates.C      |  4 +-
 .../EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C   |  2 +-
 .../EulerFaDdtScheme/EulerFaDdtScheme.C       |  2 +-
 .../backwardFaDdtScheme/backwardFaDdtScheme.C |  2 +-
 .../boundedBackwardFaDdtScheme.C              |  2 +-
 .../cfdTools/general/include/createRDeltaT.H  |  2 +-
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       |  4 +-
 .../EulerDdtScheme/EulerDdtScheme.C           |  2 +-
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  |  4 +-
 .../backwardDdtScheme/backwardDdtScheme.C     |  2 +-
 .../localEulerDdtScheme/localEulerDdtScheme.C |  2 +-
 .../finiteVolume/fvc/fvcCellReduce.C          |  2 +-
 .../finiteVolume/fvc/fvcReconstruct.C         |  2 +-
 .../finiteVolume/fvc/fvcReconstructMag.C      |  2 +-
 .../finiteVolume/fvc/fvcSimpleReconstruct.C   |  2 +-
 .../finiteVolume/fvc/fvcSurfaceIntegrate.C    |  4 +-
 .../LeastSquaresGrad/LeastSquaresGrad.C       |  2 +-
 .../gradSchemes/gaussGrad/gaussGrad.C         |  2 +-
 .../leastSquaresGrad/leastSquaresGrad.C       |  2 +-
 .../fvMeshSubset/fvMeshSubsetTemplates.C      |  6 +--
 .../singleCellFvMeshInterpolate.C             |  2 +-
 .../wallDist/nearWallDist/nearWallDist.C      |  4 +-
 .../nearWallDist/nearWallDistNoSearch.C       |  2 +-
 .../schemes/cellCoBlended/cellCoBlended.H     |  2 +-
 .../nearWallFields/nearWallFieldsTemplates.C  |  2 +-
 src/functionObjects/field/pressure/pressure.C |  2 +-
 .../regionSizeDistribution.C                  |  4 +-
 .../field/writeCellCentres/writeCellCentres.C |  6 +--
 .../field/writeCellVolumes/writeCellVolumes.C |  4 +-
 .../electricPotential/electricPotential.C     | 15 ++++---
 .../solidificationMeltingSource.C             |  2 +-
 .../KinematicCloud/KinematicCloudI.H          |  4 +-
 .../PatchCollisionDensity.C                   |  4 +-
 .../adjoint/global/createZeroField.H          |  2 +-
 .../decompose/fvFieldDecomposerTemplates.C    |  4 +-
 .../multiphaseSystem/phaseModel/phaseModel.C  |  2 +-
 .../multiphaseInterSystem.C                   |  3 +-
 .../MovingPhaseModel/MovingPhaseModel.C       |  2 +-
 .../twoPhaseSystem/phaseModel/phaseModel.C    |  2 +-
 .../liquidFilm/liquidFilmBase.C               | 12 ++----
 .../liquidFilmModel/liquidFilmModel.C         |  6 +--
 .../constantFilmThermo/constantFilmThermo.C   |  2 +-
 .../liquidFilmThermo/liquidFilmThermo.C       |  2 +-
 .../filmTurbulenceModel/laminar/laminar.C     |  2 +-
 src/sampling/meshToMesh/meshToMeshTemplates.C |  4 +-
 .../StandardChemistryModel.C                  |  4 +-
 .../greyMeanAbsorptionEmission.C              |  2 +-
 .../greyMeanSolidAbsorptionEmission.C         |  2 +-
 .../incompressibleTwoPhaseMixture.C           |  3 +-
 .../setups.orig/common/system/controlDict     |  9 ++---
 88 files changed, 165 insertions(+), 212 deletions(-)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
index 584be00b5e..a332be8284 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
@@ -29,7 +29,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
index a49eebc7ea..a206c943cd 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
@@ -29,7 +29,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index c67ccb8558..3561e0c21f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -57,7 +57,7 @@
                     ),
                     solidRegions[i],
                     dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-                    zeroGradientFvPatchSymmTensorField::typeName
+                    fvPatchFieldBase::zeroGradientType()
                 )
             );
 
diff --git a/applications/solvers/heatTransfer/solidFoam/createFields.H b/applications/solvers/heatTransfer/solidFoam/createFields.H
index 15f9bc5b89..85fc531010 100644
--- a/applications/solvers/heatTransfer/solidFoam/createFields.H
+++ b/applications/solvers/heatTransfer/solidFoam/createFields.H
@@ -34,7 +34,7 @@ if (!thermo.isotropic())
             ),
             mesh,
             dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-            zeroGradientFvPatchSymmTensorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     volSymmTensorField& aniAlpha = *taniAlpha;
diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
index ed9c1cf119..8c692c1378 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
@@ -24,7 +24,7 @@ if (mesh.changing())
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     // Set BCs of pcorr to fixed-value for patches at which p is fixed
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
index 15ad317bbd..e1181ad8e8 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
             ),
             mesh,
             dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 4cf685ac88..fd44a95fa2 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
             ),
             mesh,
             dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
diff --git a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
index b4fe66c5c4..c31a1ea19a 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
             ),
             mesh,
             dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
diff --git a/applications/solvers/multiphase/MPPICInterFoam/createFields.H b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
index d6ed1cee07..1c93103b6e 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
@@ -64,8 +64,7 @@ volScalarField mu
         mesh,
         IOobject::READ_IF_PRESENT
     ),
-    mixture.mu(),
-    calculatedFvPatchScalarField::typeName
+    mixture.mu()
 );
 
 
@@ -139,7 +138,7 @@ volScalarField alphac
     ),
     mesh,
     dimensionedScalar(dimless, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 alphac.oldTime();
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
index a602fd4843..0e23e02ebf 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
@@ -1,7 +1,7 @@
     wordList pcorrTypes
     (
         p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     for (label i=0; i<p.boundaryField().size(); i++)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 71e6bd708f..c468f145e9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -140,7 +140,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
         ),
         mesh,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     curTimeIndex_(-1)
 {
diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
index fe72321c03..bbec48e812 100644
--- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
+++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
@@ -105,8 +105,7 @@ incompressibleTwoPhaseInteractingMixture
             U_.db()
         ),
         U_.mesh(),
-        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero)
     )
 {
     correct();
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index 2cdf9d7626..dc36b96e6a 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -48,7 +48,7 @@ Foam::wordList Foam::relativeVelocityModel::UdmPatchFieldTypes() const
     wordList UdmTypes
     (
         U.boundaryField().size(),
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     forAll(U.boundaryField(), i)
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
index 8f49f07ad5..34bccb8193 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@@ -119,8 +119,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
             U.db()
         ),
         U.mesh(),
-        dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
     ),
 
     nuModel1_
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
index 658a8bcaf7..7df3631b04 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
@@ -27,7 +27,7 @@
     wordList pcorrTypes
     (
         p_rgh.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     for (label i=0; i<p_rgh.boundaryField().size(); i++)
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index f5c7886eb2..c0790b9698 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -76,7 +76,7 @@
                 mesh
             ),
             fluid.dragCoeff(phase, dragCoeffs())/phase.rho(),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         dragCoeffi.correctBoundaryConditions();
 
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index 2c4b032e15..1e2cec4467 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -41,7 +41,6 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "fvCFD.H"
-#include "zeroGradientFvPatchFields.H"
 #include "Random.H"
 
 using namespace Foam;
@@ -93,7 +92,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     Info<< "Writing one field "
         << one.name() << " in " << runTime.timeName() << endl;
@@ -131,8 +130,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
     );
     Info<< "Writing surface one field "
         << surfaceOne.name() << " in " << runTime.timeName() << endl;
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 80fe365213..dd34e6608d 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -41,7 +41,6 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "Random.H"
-#include "zeroGradientFvPatchFields.H"
 #include "calculatedPointPatchFields.H"
 #include "pointConstraints.H"
 #include "fvCFD.H"
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
     Info<< "Writing one field "
         << one.name() << " in " << runTime.timeName() << endl;
@@ -137,8 +136,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
     );
     Info<< "Writing surface one field "
         << surfaceOne.name() << " in " << runTime.timeName() << endl;
@@ -157,8 +155,7 @@ int main(int argc, char *argv[])
             IOobject::AUTO_WRITE
         ),
         pointMesh::New(mesh),
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedPointPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
     );
     pointX.primitiveFieldRef() = mesh.points().component(0);
     pointX.correctBoundaryConditions();
diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C
index b01995d89a..c54fb26426 100644
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     wordList patchFieldTypes
     (
         mesh.boundaryMesh().size(),
-        calculatedFvPatchVectorField::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     forAll(mesh.boundaryMesh(), patchi)
diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C
index 80960234ab..8979532bbd 100644
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensioned<symmTensor>(dimless, symmTensor::one),
-        zeroGradientFvPatchSymmTensorField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     volTensorField tensf
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
         ),
         mesh,
         dimensioned<tensor>(dimless, tensor(1,2,3,4,5,6,7,8,9)),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     );
 
     SolverPerformance<symmTensor> sP =
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index d2e9024d75..48c0a68a63 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -98,8 +98,8 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
             IOobject::NO_WRITE
         ),
         mesh_,
-        dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, 1.0),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     const conformationSurfaces& geometry = geometryToConformTo_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 02de7ee380..ce24d32602 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -1098,7 +1098,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
             ),
             mesh,
             dimensionedScalar(dimLength, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         scalarField& cellSize = targetCellSize.primitiveFieldRef();
@@ -1124,7 +1124,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar(dimLength, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
         // );
 
         // targetCellVolume.primitiveFieldRef() = pow3(cellSize);
@@ -1143,7 +1143,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar(dimVolume, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
         // );
 
         // actualCellVolume.primitiveFieldRef() = mesh.cellVolumes();
@@ -1162,7 +1162,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar(dimLength, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
         // );
 
         // equivalentCellSize.primitiveFieldRef() = pow
@@ -1240,11 +1240,12 @@ void Foam::conformalVoronoiMesh::writeCellAlignments
 //            mesh.polyMesh::instance(),
 //            mesh,
 //            IOobject::NO_READ,
-//            IOobject::AUTO_WRITE
+//            IOobject::NO_WRITE,
+//            IOobject::NO_REGISTER
 //        ),
 //        mesh,
 //        tensor::I,
-//        zeroGradientFvPatchTensorField::typeName
+//        fvPatchFieldBase::zeroGradientType()
 //    );
 //
 //    tensorField& cellAlignment = cellAlignments.primitiveFieldRef();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
index d229823c2b..e2bc74dfb6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
@@ -79,8 +79,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
                 IOobject::NO_WRITE
             ),
             bMesh,
-            dimensionedScalar("weight", dimless, 1e-2),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, 1e-2),
+            fvPatchFieldBase::zeroGradientType()
         );
 
         meshSearch cellSearch(bMesh, polyMesh::FACE_PLANES);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
index 690fba9c5e..c16334b9e3 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
@@ -2,7 +2,6 @@
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "polyMeshTools.H"
-#include "zeroGradientFvPatchFields.H"
 #include "syncTools.H"
 #include "tetrahedron.H"
 #include "regionSplit.H"
@@ -138,8 +137,7 @@ void writeSurfaceField
             IOobject::NO_REGISTER
         ),
         mesh,
-        dimensionedScalar(dimless, Zero),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar(dimless, Zero)
     );
     fld.primitiveFieldRef() = faceData;
     //fld.correctBoundaryConditions();
@@ -197,8 +195,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
         //- Take max
         maxFaceToCell(nonOrthoAngle, cellNonOrthoAngle);
@@ -235,7 +232,7 @@ void Foam::writeFields
             wordList                                // wanted bc types
             (
                 mesh.boundary().size(),
-                calculatedFvPatchScalarField::typeName
+                fvPatchFieldBase::calculatedType()
             ),
             mesh.weights().boundaryField().types()  // current bc types
         );
@@ -283,8 +280,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
         //- Take max
         maxFaceToCell(faceSkewness, cellSkewness);
@@ -321,7 +317,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         cellDeterminant.primitiveFieldRef() =
             primitiveMeshTools::cellDeterminant
@@ -356,7 +352,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
 
@@ -391,7 +387,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         aspectRatio.ref().field() = cellAspectRatio(mesh);
@@ -421,7 +417,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         const cellShapeList& cellShapes = mesh.cellShapes();
         forAll(cellShapes, cellI)
@@ -449,8 +445,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimVolume, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimVolume, Zero)
         );
         V.ref() = mesh.V();
         Info<< "    Writing cell volume to " << V.name() << endl;
@@ -480,8 +475,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
         //- Take min
         minFaceToCell(faceVolumeRatio, cellVolumeRatio);
@@ -516,7 +510,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar("minTetVolume", dimless, GREAT),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
 
@@ -582,7 +576,7 @@ void Foam::writeFields
             ),
             mesh,
             dimensionedScalar("minPyrVolume", dimless, GREAT),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         // Get owner and neighbour pyr volumes
@@ -654,8 +648,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
         );
 
         regionSplit rs(mesh);
@@ -705,8 +698,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(scalar(-1)),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1)
         );
 
         const cellZoneMesh& czs = mesh.cellZones();
@@ -744,8 +736,7 @@ void Foam::writeFields
                 IOobject::NO_REGISTER
             ),
             mesh,
-            dimensionedScalar(scalar(-1)),
-            calculatedFvsPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1)
         );
 
         faceZone.primitiveFieldRef() =
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 5cdc1a16c3..65203557dd 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -100,7 +100,7 @@ label addPatch
             mesh,
             pp,
             dictionary(),   // do not set specialised patchFields
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
             true            // parallel sync'ed addition
         );
     }
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index bdd0489184..f19b1f1b07 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -1028,7 +1028,7 @@ int main(int argc, char *argv[])
                                 mesh,
                                 ppPtr(),
                                 patchDict.subOrEmptyDict("patchFields"),
-                                calculatedFvPatchScalarField::typeName,
+                                fvPatchFieldBase::calculatedType(),
                                 true
                             );
                         }
@@ -1079,7 +1079,7 @@ int main(int argc, char *argv[])
                                 mesh,
                                 ppPtr(),
                                 patchDict.subOrEmptyDict("patchFields"),
-                                calculatedFvPatchScalarField::typeName,
+                                fvPatchFieldBase::calculatedType(),
                                 true
                             );
                         }
@@ -1108,7 +1108,7 @@ int main(int argc, char *argv[])
                         mesh,
                         ppPtr(),
                         patchDict.subOrEmptyDict("patchFields"),
-                        calculatedFvPatchScalarField::typeName,
+                        fvPatchFieldBase::calculatedType(),
                         true
                     );
                 }
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 48c28c3ce3..b35202a4ad 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -76,25 +76,14 @@ tmp<volScalarField> createScalarField
     const labelUList& elems
 )
 {
-    tmp<volScalarField> tfld
+    auto tfld = volScalarField::New
     (
-        new volScalarField
-        (
-            IOobject
-            (
-                name,
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                IOobject::NO_REGISTER
-            ),
-            mesh,
-            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
-        )
+        name,
+        mesh,
+        dimensionedScalar(dimless, Zero),
+        fvPatchFieldBase::zeroGradientType()
     );
-    volScalarField& fld = tfld.ref();
+    auto& fld = tfld.ref();
 
     forAll(fld, celli)
     {
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 5a8c6c5697..6dcd2f1199 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -114,7 +114,6 @@ Description
 #include "ReadFields.H"
 #include "mappedWallPolyPatch.H"
 #include "fvMeshTools.H"
-#include "zeroGradientFvPatchFields.H"
 #include "processorMeshes.H"
 
 using namespace Foam;
@@ -1055,7 +1054,7 @@ labelList addRegionPatches
             mesh,
             patch1,
             dictionary(),   //optional per field value
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
             true            //validBoundary
         );
 
@@ -1076,7 +1075,7 @@ labelList addRegionPatches
             mesh,
             patch2,
             dictionary(),   //optional per field value
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
             true            //validBoundary
         );
 
@@ -1433,7 +1432,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
             ),
             mesh,
             dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
         forAll(cellRegion, celli)
         {
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
index 3d0cae7c28..56924ebad3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 #include "domainDecompositionDryRun.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -51,8 +50,8 @@ void Foam::domainDecompositionDryRun::writeVolField
             IOobject::NO_REGISTER
         ),
         this->mesh(),
-        dimensionedScalar("cellDist", dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     forAll(procIds, celli)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
index 8b432d5032..eb93da2682 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 #include "domainDecomposition.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -52,8 +51,8 @@ void Foam::domainDecomposition::writeVolField
             IOobject::NO_REGISTER
         ),
         this->mesh(),
-        dimensionedScalar("cellDist", dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     forAll(procIds, celli)
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 9223893474..4f87ea6d94 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,7 +69,6 @@ Usage
 #include "faceCoupleInfo.H"
 #include "fvMeshAdder.H"
 #include "polyTopoChange.H"
-#include "zeroGradientFvPatchFields.H"
 #include "topoSet.H"
 #include "regionProperties.H"
 #include "fvMeshTools.H"
@@ -421,8 +420,8 @@ void writeDistribution
                 IOobject::NO_REGISTER
             ),
             masterMesh,
-            dimensionedScalar("cellDist", dimless, -1),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1),
+            fvPatchFieldBase::zeroGradientType()
         );
 
         forAll(cellDecomposition, celli)
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 5f960cf1a4..c29210a46f 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,7 +90,6 @@ Usage
 #include "globalIndex.H"
 #include "loadOrCreateMesh.H"
 #include "processorFvPatchField.H"
-#include "zeroGradientFvPatchFields.H"
 #include "topoSet.H"
 #include "regionProperties.H"
 
@@ -418,8 +417,8 @@ void writeDecomposition
             IOobject::NO_REGISTER
         ),
         mesh,
-        dimensionedScalar(name, dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
     );
 
     forAll(procCells, celli)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
index daa27d275e..fdf2e3d48d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
@@ -96,7 +96,7 @@ tmp<VolumeField<Type>> makeZeroGradientField
             df.mesh(),
             df.dimensions(),
             std::move(df.field()),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         tfield.ref().oriented() = df.oriented();
@@ -130,7 +130,7 @@ tmp<VolumeField<Type>> makeZeroGradientField
             df.mesh(),
             df.dimensions(),
             std::move(df.primitiveFieldRef(false)),  // No update accessTime
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
         );
 
         tfield.ref().oriented() = df.oriented();
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
index b5ca41b69e..7408c22c0b 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
@@ -52,7 +52,7 @@ volScalarField y
     ),
     mesh,
     dimensionedScalar(dimLength, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 y.primitiveFieldRef() = wallDist::New(mesh).y().primitiveField();
 y.correctBoundaryConditions();
@@ -88,7 +88,7 @@ volScalarField mask
     ),
     mesh,
     dimensionedScalar(dimless, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 4cf128963e..d4f8b7d985 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -57,8 +57,7 @@ Foam::LESdelta::LESdelta
             IOobject::NO_WRITE
         ),
         turbulence.mesh(),
-        dimensionedScalar(name, dimLength, SMALL),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimLength, SMALL)
     )
 {}
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index 038a037c73..f0b284fb76 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -59,8 +59,7 @@ Foam::anisotropicFilter::anisotropicFilter
             mesh
         ),
         mesh,
-        dimensionedVector(dimLength*dimLength, Zero),
-        calculatedFvPatchVectorField::typeName
+        dimensionedVector(dimLength*dimLength, Zero)
     )
 {
     for (direction d=0; d<vector::nComponents; d++)
@@ -99,8 +98,7 @@ Foam::anisotropicFilter::anisotropicFilter
             mesh
         ),
         mesh,
-        dimensionedVector(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedVector(dimLength*dimLength, Zero)
     )
 {
     for (direction d=0; d<vector::nComponents; d++)
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
index a9e2816eb8..d93867b016 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
@@ -55,8 +55,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff)
             mesh
         ),
         mesh,
-        dimensionedScalar(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimLength*dimLength, Zero)
     )
 {
     coeff_.ref() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
@@ -79,8 +78,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd)
             mesh
         ),
         mesh,
-        dimensionedScalar(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimLength*dimLength, Zero)
     )
 {
     coeff_.ref() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
index ad74cdb688..0a6a0b5d11 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@@ -99,7 +99,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
                 ->found(patchFieldTypes[i])
         )
         {
-            patchFieldTypes[i] = calculatedFvPatchField<symmTensor>::typeName;
+            patchFieldTypes[i] = fvPatchFieldBase::calculatedType();
         }
     }
 
diff --git a/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C b/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
index b6bcc5f85a..93340446e4 100644
--- a/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
+++ b/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
@@ -58,7 +58,7 @@ Foam::faMeshSubset::interpolate
             patchi,
             faPatchField<Type>::New
             (
-                calculatedFaPatchField<Type>::typeName,
+                faPatchFieldBase::calculatedType(),
                 sMesh.boundary()[patchi],
                 DimensionedField<Type, areaMesh>::null()
             )
@@ -165,7 +165,7 @@ Foam::faMeshSubset::interpolate
             patchi,
             faePatchField<Type>::New
             (
-                calculatedFaePatchField<Type>::typeName,
+                faePatchFieldBase::calculatedType(),
                 sMesh.boundary()[patchi],
                 DimensionedField<Type, edgeMesh>::null()
             )
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
index 9ab1276224..53eadce916 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
@@ -114,7 +114,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
                 d2dt2IOobject,
                 mesh(),
                 dimensioned<Type>(dt.dimensions()/dimTime/dimTime, Zero),
-                calculatedFaPatchField<Type>::typeName
+                faPatchFieldBase::calculatedType()
             )
         );
     }
diff --git a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
index cd75c7d092..e557edfc56 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
@@ -83,7 +83,7 @@ EulerFaDdtScheme<Type>::facDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchField<Type>::typeName
+        faPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
index da042c24e5..81a0178e61 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
@@ -122,7 +122,7 @@ backwardFaDdtScheme<Type>::facDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchField<Type>::typeName
+        faPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
index 140e452e3e..73b342d5df 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
@@ -105,7 +105,7 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
         ddtIOobject,
         mesh(),
         dimensionedScalar(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchScalarField::typeName
+        faPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
index 9553e0c365..f62a3dfc06 100644
--- a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
+++ b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
@@ -20,7 +20,7 @@ if (LTS)
             ),
             mesh,
             dimensionedScalar("one", dimless/dimTime, 1),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index b01c194353..2b16e0a36c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -59,7 +59,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
             ),
             mesh(),
             dimensionedScalar(cofrDeltaT.dimensions(), Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
@@ -189,7 +189,7 @@ CoEulerDdtScheme<Type>::fvcDdt
                 ddtIOobject,
                 mesh(),
                 dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-                calculatedFvPatchField<Type>::typeName
+                fvPatchFieldBase::calculatedType()
             )
         );
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 584b9b8426..b94f628cad 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -81,7 +81,7 @@ EulerDdtScheme<Type>::fvcDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index ecf7d1955f..61e3186cdf 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -109,7 +109,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
             ),
             mesh(),
             dimensionedScalar(dimless/dimTime, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
@@ -194,7 +194,7 @@ SLTSDdtScheme<Type>::fvcDdt
                 ddtIOobject,
                 mesh(),
                 dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-                calculatedFvPatchField<Type>::typeName
+                fvPatchFieldBase::calculatedType()
             )
         );
     }
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 3b2e28a08a..ef0f0aedf3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -122,7 +122,7 @@ backwardDdtScheme<Type>::fvcDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index df63268dd1..5050258462 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -74,7 +74,7 @@ localEulerDdtScheme<Type>::fvcDdt
         ddtIOobject,
         mesh(),
         dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 0e99366aa8..73488db5a0 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -60,7 +60,7 @@ Foam::fvc::cellReduce
             ),
             mesh,
             dimensioned<Type>("initialValue", ssf.dimensions(), nullValue),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index d5fab1f5fd..3c175eadf1 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -76,7 +76,7 @@ reconstruct
                 IOobject::NO_WRITE
             ),
             inv(surfaceSum(SfHat*mesh.Sf()))&surfaceSum(SfHat*ssf),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
index bef4d0cd20..593b8f8eeb 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
@@ -69,7 +69,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
             ),
             mesh,
             dimensionedScalar(ssf.dimensions()/dimArea, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     scalarField& rf = treconField.ref();
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
index 729e2f5d35..e587837083 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@@ -78,7 +78,7 @@ reconstruct
             ),
             mesh,
             dimensioned<GradType>(ssf.dimensions()/dimArea, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index 5627daadc8..e77a073169 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -101,7 +101,7 @@ surfaceIntegrate
             ),
             mesh,
             dimensioned<Type>(ssf.dimensions()/dimVol, Zero),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
@@ -152,7 +152,7 @@ surfaceSum
             ),
             mesh,
             dimensioned<Type>(ssf.dimensions(), Zero),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
index a97dab0be0..1376f122ff 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@@ -76,7 +76,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
             ),
             mesh,
             dimensioned<GradType>(vtf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GradFieldType& lsGrad = tlsGrad.ref();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index ac103096b9..5ca762df67 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -66,7 +66,7 @@ Foam::fv::gaussGrad<Type>::gradf
             ),
             mesh,
             dimensioned<GradType>(ssf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GradFieldType& gGrad = tgGrad.ref();
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 44e781ce2c..d492be0eb3 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -72,7 +72,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
             ),
             mesh,
             dimensioned<GradType>(vsf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
     GradFieldType& lsGrad = tlsGrad.ref();
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
index 32cf1d0013..8d5da86172 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
@@ -78,7 +78,7 @@ Foam::fvMeshSubset::interpolate
                 patchi,
                 fvPatchField<Type>::New
                 (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     sMesh.boundary()[patchi],
                     DimensionedField<Type, volMesh>::null()
                 )
@@ -259,7 +259,7 @@ Foam::fvMeshSubset::interpolate
                 patchi,
                 fvsPatchField<Type>::New
                 (
-                    calculatedFvsPatchField<Type>::typeName,
+                    fvsPatchFieldBase::calculatedType(),
                     sMesh.boundary()[patchi],
                     DimensionedField<Type, surfaceMesh>::null()
                 )
@@ -446,7 +446,7 @@ Foam::fvMeshSubset::interpolate
                 patchi,
                 pointPatchField<Type>::New
                 (
-                    calculatedPointPatchField<Type>::typeName,
+                    pointPatchFieldBase::calculatedType(),
                     sMesh.boundary()[patchi],
                     DimensionedField<Type, pointMesh>::null()
                 )
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index c2b3626511..767a08ff88 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@@ -53,7 +53,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
             patchi,
             fvPatchField<Type>::New
             (
-                calculatedFvPatchField<Type>::typeName,
+                fvPatchFieldBase::calculatedType(),
                 boundary()[patchi],
                 DimensionedField<Type, volMesh>::null()
             )
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
index ca2eee0c0f..e79ce51ac8 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
@@ -94,7 +94,7 @@ Foam::nearWallDist::nearWallDist(const Foam::fvMesh& mesh)
     (
         mesh.boundary(),
         mesh.V(),           // Dummy internal field,
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     mesh_(mesh)
 {
@@ -125,7 +125,7 @@ void Foam::nearWallDist::correct()
                 patchi,
                 fvPatchField<scalar>::New
                 (
-                    calculatedFvPatchScalarField::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     bnd[patchi],
                     V
                 )
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
index 497a1cb22d..825c54056e 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
@@ -82,7 +82,7 @@ Foam::nearWallDistNoSearch::nearWallDistNoSearch(const Foam::fvMesh& mesh)
     (
         mesh.boundary(),
         mesh.V(),           // Dummy internal field
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     mesh_(mesh)
 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 123ab26b0f..1ff282b22e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -235,7 +235,7 @@ public:
                 ),
                 mesh,
                 dimensionedScalar(dimless, Zero),
-                extrapolatedCalculatedFvPatchScalarField::typeName
+                fvPatchFieldBase::extrapolatedCalculatedType()
             );
 
             scalarField sumPhi
diff --git a/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C b/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
index 209a76b23a..aee5fecc8d 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
@@ -75,7 +75,7 @@ void Foam::functionObjects::nearWallFields::createFields
                         io,
                         fld,
                         patchSet_.toc(),
-                        calculatedFvPatchField<Type>::typeName
+                        fvPatchFieldBase::calculatedType()
                     )
                 );
 
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index 1ae36dff36..22861c8052 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -143,7 +143,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::rhoScale
                 IOobject::NO_REGISTER
             ),
             p,
-            fvPatchField<scalar>::calculatedType()
+            fvPatchFieldBase::calculatedType()
         );
     }
 
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 0a37d11ecb..3b55fda4d5 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -121,7 +121,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
             IOobject::NO_READ
         ),
         alpha,
-        fvPatchField<scalar>::calculatedType()
+        fvPatchFieldBase::calculatedType()
     );
 
     volScalarField backgroundAlpha
@@ -134,7 +134,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
             IOobject::NO_READ
         ),
         alpha,
-        fvPatchField<scalar>::calculatedType()
+        fvPatchFieldBase::calculatedType()
     );
 
 
diff --git a/src/functionObjects/field/writeCellCentres/writeCellCentres.C b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
index 6ab11c3956..430e2d726c 100644
--- a/src/functionObjects/field/writeCellCentres/writeCellCentres.C
+++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
@@ -77,7 +77,7 @@ bool Foam::functionObjects::writeCellCentres::write()
     (
         IOobject
         (
-            "C",
+            mesh_.C().name(),
             time_.timeName(),
             mesh_,
             IOobject::NO_READ,
@@ -85,11 +85,11 @@ bool Foam::functionObjects::writeCellCentres::write()
             IOobject::NO_REGISTER
         ),
         mesh_.C(),
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     Log << type() << " " << name() << " write:" << nl
-        << "    writing cell-volumes field " << C.name()
+        << "    writing cell-centres field " << C.name()
         << " to " << time_.timeName() << endl;
 
     C.write();
diff --git a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
index 3575033041..b805364f88 100644
--- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
+++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
@@ -86,11 +86,13 @@ bool Foam::functionObjects::writeCellVolumes::write()
         ),
         mesh_,
         dimensionedScalar(mesh_.V().dimensions(), Zero),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 
     V.ref() = mesh_.V();
 
+    // Without correctBoundaryConditions() - boundary faces have zero volume
+
     Log << type() << " " << name() << " write:" << nl
         << "    writing cell-volumes field " << V.name()
         << " to " << time_.timeName() << endl;
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index 0118ee1705..c13f858e35 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -28,7 +28,6 @@ License
 #include "electricPotential.H"
 #include "fvc.H"
 #include "fvm.H"
-#include "calculatedFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -95,7 +94,7 @@ Foam::functionObjects::electricPotential::sigma() const
         (
             sigmaIO,
             tsigma,
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
         );
     }
 
@@ -104,7 +103,7 @@ Foam::functionObjects::electricPotential::sigma() const
         sigmaIO,
         mesh_,
         sigma_,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
@@ -142,7 +141,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
         (
             epsilonrIO,
             epsilon0*tepsilonr,
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
         );
     }
 
@@ -151,7 +150,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
         epsilonrIO,
         mesh_,
         epsilon0*epsilonr_,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     );
 }
 
@@ -359,7 +358,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_REGISTER
             ),
             -fvc::grad(eV),
-            calculatedFvPatchField<vector>::typeName
+            fvPatchFieldBase::calculatedType()
         );
 
         Log << tab << E.name() << endl;
@@ -382,7 +381,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_REGISTER
             ),
             -tsigma*fvc::grad(eV),
-            calculatedFvPatchField<vector>::typeName
+            fvPatchFieldBase::calculatedType()
         );
 
         Log << tab << eJ().name() << endl;
@@ -405,7 +404,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_REGISTER
             ),
             fvc::div(tepsilonm*E),
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
         );
 
         Log << tab << erho().name() << endl;
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 63d6b54b97..6f891187c9 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -95,7 +95,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
                         dimEnergy/dimMass/dimTemperature,
                         CpRef
                     ),
-                    extrapolatedCalculatedFvPatchScalarField::typeName
+                    fvPatchFieldBase::extrapolatedCalculatedType()
                 );
             }
             else
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 48bc7d5acc..c8e1505048 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -533,7 +533,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
             ),
             mesh_,
             dimensionedScalar(dimless/dimTime, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
@@ -571,7 +571,7 @@ Foam::KinematicCloud<CloudType>::theta() const
             ),
             mesh_,
             dimensionedScalar(dimless, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
index e61404fb01..8cbf9c4693 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
@@ -91,13 +91,13 @@ Foam::PatchCollisionDensity<CloudType>::PatchCollisionDensity
     (
         this->owner().mesh().boundary(),
         volScalarField::Internal::null(),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     collisionDensity0_
     (
         this->owner().mesh().boundary(),
         volScalarField::Internal::null(),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
     ),
     time0_(this->owner().mesh().time().value())
 {
diff --git a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
index fbec058fd8..384f0f16f4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
+++ b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
@@ -110,7 +110,7 @@ createZeroBoundaryPtr
         (
             mesh.boundary(),
             mesh.V()*pTraits<Type>::zero,  // Dummy internal field,
-            wordList(bm.size(), calculatedFvPatchField<Type>::typeName),
+            wordList(bm.size(), fvPatchFieldBase::calculatedType()),
             actualPatchTypes
         )
     );
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
index b845b0c38f..caa7884053 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
@@ -87,7 +87,7 @@ Foam::fvFieldDecomposer::decomposeField
             patchi,
             fvPatchField<Type>::New
             (
-                calculatedFvPatchField<Type>::typeName,
+                fvPatchFieldBase::calculatedType(),
                 procMesh_.boundary()[patchi],
                 DimensionedField<Type, volMesh>::null()
             )
@@ -260,7 +260,7 @@ Foam::fvFieldDecomposer::decomposeField
             patchi,
             fvsPatchField<Type>::New
             (
-                calculatedFvsPatchField<Type>::typeName,
+                fvsPatchFieldBase::calculatedType(),
                 procMesh_.boundary()[patchi],
                 DimensionedField<Type, surfaceMesh>::null()
             )
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
index efe44cab08..7f1270c587 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
@@ -155,7 +155,7 @@ Foam::phaseModel::phaseModel
         wordList phiTypes
         (
             U_.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
         );
 
         forAll(U_.boundaryField(), i)
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
index fc654b05c1..69d2927d87 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
@@ -221,8 +221,7 @@ Foam::multiphaseInterSystem::multiphaseInterSystem
             mesh_
         ),
         mesh_,
-        dimensionedScalar(dimViscosity*dimDensity, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimViscosity*dimDensity, Zero)
     ),
     phaseNames_(get<wordList>("phases")),
     phi_
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index 9bd6eb3a1b..4e75adec97 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -85,7 +85,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
         wordList phiTypes
         (
             U.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
         );
 
         forAll(U.boundaryField(), i)
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
index 1538419c7d..195feedd54 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
@@ -154,7 +154,7 @@ Foam::phaseModel::phaseModel
         wordList phiTypes
         (
             U_.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
         );
 
         forAll(U_.boundaryField(), i)
diff --git a/src/regionFaModels/liquidFilm/liquidFilmBase.C b/src/regionFaModels/liquidFilm/liquidFilmBase.C
index 6ca3919b05..a10af1c3a8 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmBase.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmBase.C
@@ -188,8 +188,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedScalar(dimMass, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimMass, Zero)
     ),
 
     momentumSource_
@@ -201,8 +200,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedVector(dimPressure, Zero),
-        calculatedFvPatchField<vector>::typeName
+        dimensionedVector(dimPressure, Zero)
     ),
 
     pnSource_
@@ -214,8 +212,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedScalar(dimPressure, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimPressure, Zero)
     ),
 
     energySource_
@@ -227,8 +224,7 @@ liquidFilmBase::liquidFilmBase
             primaryMesh()
         ),
         primaryMesh(),
-        dimensionedScalar(dimEnergy, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimEnergy, Zero)
     ),
 
     addedMassTotal_(0),
diff --git a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
index 9ef569e71a..cb4f11c297 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
@@ -218,8 +218,7 @@ liquidFilmModel::liquidFilmModel
             IOobject::NO_WRITE
         ),
         primaryMesh(),
-        dimensionedScalar(dimMass, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimMass, Zero)
     ),
 
     cloudDiameterTrans_
@@ -233,8 +232,7 @@ liquidFilmModel::liquidFilmModel
             IOobject::NO_WRITE
         ),
         primaryMesh(),
-        dimensionedScalar(dimLength, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimLength, Zero)
     ),
 
     turbulence_(filmTurbulenceModel::New(*this, dict)),
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
index 548db2857f..92d35fc01f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@@ -275,7 +275,7 @@ tmp<volScalarField> constantFilmThermo::rho() const
             ),
             film().regionMesh(),
             dimensionedScalar(dimDensity, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index f5065fccdc..bded086e11 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -258,7 +258,7 @@ tmp<volScalarField> liquidFilmThermo::rho() const
             ),
             film().regionMesh(),
             dimensionedScalar(dimDensity, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index fd2bbc8de7..e91094ada8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -86,7 +86,7 @@ tmp<volVectorField> laminar::Us() const
             ),
             filmModel_.regionMesh(),
             dimensionedVector(dimVelocity, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 028801ca1b..adde5edb2d 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -634,7 +634,7 @@ Foam::meshToMesh::mapSrcToTgt
                 tgtPatchi,
                 fvPatchField<Type>::New
                 (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     tgtMesh.boundary()[tgtPatchi],
                     DimensionedField<Type, volMesh>::null()
                 )
@@ -865,7 +865,7 @@ Foam::meshToMesh::mapTgtToSrc
                 srcPatchi,
                 fvPatchField<Type>::New
                 (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                     srcMesh.boundary()[srcPatchi],
                     DimensionedField<Type, volMesh>::null()
                 )
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
index e7f3cd40c3..3b55b76d94 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
@@ -484,8 +484,8 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::tc() const
                 IOobject::NO_REGISTER
             ),
             this->mesh(),
-            dimensionedScalar("small", dimTime, SMALL),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimTime, SMALL),
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index c8072b8154..7aca57b922 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -208,7 +208,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
             ),
             mesh(),
             dimensionedScalar(dimless/dimLength, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index 031e67d69a..b4fc2fc425 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -156,7 +156,7 @@ calc(const label propertyId) const
             ),
             mesh(),
             dimensionedScalar(dimless/dimLength, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
         )
     );
 
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index 4ad68c9825..5275ca3017 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -113,8 +113,7 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
             U_.db()
         ),
         U_.mesh(),
-        dimensionedScalar(dimViscosity, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimViscosity, Zero)
     )
 {
     calcNu();
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
index cba71aeb3e..ff56a961d8 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
@@ -71,8 +71,7 @@ functions
                     IOobject::NO_READ
                 ),
                 mesh(),
-                dimensionedVector(dimless/dimLength, Zero),
-                calculatedFvPatchField<vector>::typeName
+                dimensionedVector(dimless/dimLength, Zero)
             );
 
             Cc2.primitiveFieldRef() = Cc.primitiveField();
@@ -102,8 +101,7 @@ functions
                     IOobject::NO_READ
                 ),
                 mesh(),
-                dimensionedScalar(dimless, Zero),
-                calculatedFvPatchField<scalar>::typeName
+                dimensionedScalar(dimless, Zero)
             );
 
             volScalarField magError
@@ -116,8 +114,7 @@ functions
                     IOobject::NO_READ
                 ),
                 mesh(),
-                dimensionedScalar(dimless, Zero),
-                calculatedFvPatchField<scalar>::typeName
+                dimensionedScalar(dimless, Zero)
             );
 
             const dimensionedScalar root2(dimless/sqr(dimLength), Foam::sqrt(2.0));

From 287025d2dfda37c999964c33daaa542222757ffb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 2 May 2023 10:46:59 +0200
Subject: [PATCH 194/348] COMP: remove explicit specialisations for CSV reading
 (fixes #2764)

- can use traits to distinguish label vs scalar types and
  setComponents to properly index into single or multi-component
  types without needing template specialisations for the task.

  This avoids the need for a concrete translation unit and the
  reported problem of multiply-defined specialisations when the header
  is included in different places.
---
 .../tableReaders/csv/csvTableReader.C         | 49 +++++++------------
 .../tableReaders/csv/csvTableReader.H         | 16 ++----
 .../primitives/functions/Function1/CSV/CSV.C  | 45 +++++++----------
 .../primitives/functions/Function1/CSV/CSV.H  | 23 ++++-----
 4 files changed, 47 insertions(+), 86 deletions(-)

diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 132b3677ca..8ad62055ab 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,41 +66,26 @@ Foam::labelList Foam::csvTableReader<Type>::getComponentColumns
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-namespace Foam
-{
-    template<>
-    label csvTableReader<label>::readValue
-    (
-        const List<string>& strings
-    ) const
-    {
-        return readLabel(strings[componentColumns_[0]]);
-    }
-
-
-    template<>
-    scalar csvTableReader<scalar>::readValue
-    (
-        const List<string>& strings
-    ) const
-    {
-        return readScalar(strings[componentColumns_[0]]);
-    }
-
-} // End namespace Foam
-
-
 template<class Type>
 Type Foam::csvTableReader<Type>::readValue
 (
-    const List<string>& strings
+    const UList<string>& strings
 ) const
 {
     Type result;
 
-    for (label i = 0; i < pTraits<Type>::nComponents; ++i)
+    if (std::is_integral<Type>::value)
     {
-        result[i] = readScalar(strings[componentColumns_[i]]);
+        // nComponents == 1
+        setComponent(result, 0) = readLabel(strings[componentColumns_[0]]);
+    }
+    else
+    {
+        for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+        {
+            setComponent(result, cmpt) =
+                readScalar(strings[componentColumns_[cmpt]]);
+        }
     }
 
     return result;
@@ -144,7 +129,7 @@ void Foam::csvTableReader<Type>::operator()
     // Skip header
     if (headerLine_)
     {
-        is.getLine(line);
+        is.getLine(nullptr);
         ++lineNo;
     }
 
@@ -171,12 +156,12 @@ void Foam::csvTableReader<Type>::operator()
 
             if (nPos == std::string::npos)
             {
-                strings.append(line.substr(pos));
+                strings.push_back(line.substr(pos));
                 pos = nPos;
             }
             else
             {
-                strings.append(line.substr(pos, nPos-pos));
+                strings.push_back(line.substr(pos, nPos-pos));
                 pos = nPos + 1;
             }
         }
@@ -198,7 +183,7 @@ void Foam::csvTableReader<Type>::operator()
         scalar x = readScalar(strings[refColumn_]);
         Type value = readValue(strings);
 
-        values.append(Tuple2<scalar,Type>(x, value));
+        values.emplace_back(x, value);
     }
 
     data.transfer(values);
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
index 7bc93dd3b1..401a9131bd 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef csvTableReader_H
-#define csvTableReader_H
+#ifndef Foam_csvTableReader_H
+#define Foam_csvTableReader_H
 
 #include "tableReader.H"
 #include "labelList.H"
@@ -81,7 +81,7 @@ class csvTableReader
         );
 
         //- Read component values from the split string
-        Type readValue(const List<string>& strings) const;
+        Type readValue(const UList<string>& strings) const;
 
 
 public:
@@ -133,14 +133,6 @@ public:
 };
 
 
-// Template specialisations
-template<>
-label csvTableReader<label>::readValue(const List<string>& strings) const;
-
-template<>
-scalar csvTableReader<scalar>::readValue(const List<string>& strings) const;
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index e7f89d95b8..19c962456e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,37 +64,26 @@ Foam::labelList Foam::Function1Types::CSV<Type>::getComponentColumns
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<>
-Foam::label Foam::Function1Types::CSV<Foam::label>::readValue
-(
-    const List<string>& strings
-) const
-{
-    return readLabel(strings[componentColumns_[0]]);
-}
-
-
-template<>
-Foam::scalar Foam::Function1Types::CSV<Foam::scalar>::readValue
-(
-    const List<string>& strings
-) const
-{
-    return readScalar(strings[componentColumns_[0]]);
-}
-
-
 template<class Type>
 Type Foam::Function1Types::CSV<Type>::readValue
 (
-    const List<string>& strings
+    const UList<string>& strings
 ) const
 {
     Type result;
 
-    for (label i = 0; i < pTraits<Type>::nComponents; ++i)
+    if (std::is_integral<Type>::value)
     {
-        result[i] = readScalar(strings[componentColumns_[i]]);
+        // nComponents == 1
+        setComponent(result, 0) = readLabel(strings[componentColumns_[0]]);
+    }
+    else
+    {
+        for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+        {
+            setComponent(result, cmpt) =
+                readScalar(strings[componentColumns_[cmpt]]);
+        }
     }
 
     return result;
@@ -124,7 +113,7 @@ void Foam::Function1Types::CSV<Type>::read()
     // Skip header
     for (label i = 0; i < nHeaderLine_; ++i)
     {
-        is.getLine(line);
+        is.getLine(nullptr);
         ++lineNo;
     }
 
@@ -169,12 +158,12 @@ void Foam::Function1Types::CSV<Type>::read()
 
             if (nPos == std::string::npos)
             {
-                strings.append(line.substr(pos));
+                strings.push_back(line.substr(pos));
                 pos = nPos;
             }
             else
             {
-                strings.append(line.substr(pos, nPos - pos));
+                strings.push_back(line.substr(pos, nPos - pos));
                 pos = nPos + 1;
             }
         }
@@ -196,7 +185,7 @@ void Foam::Function1Types::CSV<Type>::read()
         scalar x = readScalar(strings[refColumn_]);
         Type value = readValue(strings);
 
-        values.append(Tuple2<scalar,Type>(x, value));
+        values.emplace_back(x, value);
     }
 
     this->table_.transfer(values);
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index 700b2e81e0..486744c04f 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-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,8 +53,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Function1Types_CSV_H
-#define Function1Types_CSV_H
+#ifndef Foam_Function1Types_CSV_H
+#define Foam_Function1Types_CSV_H
 
 #include "Function1.H"
 #include "TableBase.H"
@@ -111,14 +111,17 @@ class CSV
         void read();
 
         //- Read component values from the split string
-        Type readValue(const List<string>& strings) const;
+        Type readValue(const UList<string>& strings) const;
+
+
+public:
+
+    // Generated Methods
 
         //- No copy assignment
         void operator=(const CSV<Type>&) = delete;
 
 
-public:
-
     //- Declare type-name, virtual type (with debug switch)
     TypeName("csvFile");
 
@@ -161,14 +164,6 @@ public:
 };
 
 
-// Template specialisations
-template<>
-label CSV<label>::readValue(const List<string>& strings) const;
-
-template<>
-scalar CSV<scalar>::readValue(const List<string>& strings) const;
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Function1Types

From b664eea712879e8a3a8d62ce829b68698e1da839 Mon Sep 17 00:00:00 2001
From: Yu Ankun <huawei>
Date: Thu, 20 Apr 2023 13:56:38 +0300
Subject: [PATCH 195/348] ENH: remove redundant distribution in backward sweep
 (symGaussSeidel)

---
 .../smoothers/symGaussSeidel/symGaussSeidelSmoother.C    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/smoothers/symGaussSeidel/symGaussSeidelSmoother.C b/src/OpenFOAM/matrices/lduMatrix/smoothers/symGaussSeidel/symGaussSeidelSmoother.C
index e9e26efa24..0082e63569 100644
--- a/src/OpenFOAM/matrices/lduMatrix/smoothers/symGaussSeidel/symGaussSeidelSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/smoothers/symGaussSeidel/symGaussSeidelSmoother.C
@@ -186,15 +186,12 @@ void Foam::symGaussSeidelSmoother::smooth
                 psii -= upperPtr[facei]*psiPtr[uPtr[facei]];
             }
 
+            // Note: do not need to distribute the neighbour side
+            // since these will not be revisited
+
             // Finish psi for this cell
             psii /= diagPtr[celli];
 
-            // Distribute the neighbour side using psi for this cell
-            for (label facei=fStart; facei<fEnd; facei++)
-            {
-                bPrimePtr[uPtr[facei]] -= lowerPtr[facei]*psii;
-            }
-
             psiPtr[celli] = psii;
         }
     }

From 47bb79cb7547f944de962e43d213fa680e6592af Mon Sep 17 00:00:00 2001
From: Yu Ankun <huawei>
Date: Thu, 20 Apr 2023 13:56:38 +0300
Subject: [PATCH 196/348] ENH: use residual method in GAMGSolverSolve: fuses
 Amul with b-Amul

---
 .../lduMatrix/solvers/GAMG/GAMGSolverSolve.C  | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index cdba91572e..ab54eb5ef9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -7,6 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
     Copyright (C) 2016-2021,2023 OpenCFD Ltd.
+    Copyright (C) 2023 Huawei (Yu Ankun)
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -222,16 +223,16 @@ void Foam::GAMGSolver::Vcycle
                     )
                 );
 
-                solveScalarField::subField ACf
-                (
-                    scratch1,
-                    coarseCorrFields[leveli].size()
-                );
-
                 // Scale coarse-grid correction field
                 // but not on the coarsest level because it evaluates to 1
                 if (scaleCorrection_ && leveli < coarsestLevel - 1)
                 {
+                    solveScalarField::subField ACf
+                    (
+                        scratch1,
+                        coarseCorrFields[leveli].size()
+                    );
+
                     scale
                     (
                         coarseCorrFields[leveli],
@@ -248,19 +249,16 @@ void Foam::GAMGSolver::Vcycle
                 }
 
                 // Correct the residual with the new solution
-                matrixLevels_[leveli].Amul
+                // residual can be used by fusing Amul with b-Amul
+                matrixLevels_[leveli].residual
                 (
-                    const_cast<solveScalarField&>
-                    (
-                        ACf.operator const solveScalarField&()
-                    ),
+                    coarseSources[leveli],
                     coarseCorrFields[leveli],
+                    coarseSources[leveli],
                     interfaceLevelsBouCoeffs_[leveli],
                     interfaceLevels_[leveli],
                     cmpt
                 );
-
-                coarseSources[leveli] -= ACf;
             }
 
             // Residual is equal to source
@@ -336,14 +334,14 @@ void Foam::GAMGSolver::Vcycle
             // Create A.psi for this coarse level as a sub-field of Apsi
             solveScalarField::subField ACf
             (
-               scratch1,
+                scratch1,
                 coarseCorrFields[leveli].size()
             );
             solveScalarField& ACfRef =
-                const_cast
-                <
-                    solveScalarField&
-                >(ACf.operator const solveScalarField&());
+                const_cast<solveScalarField&>
+                (
+                    ACf.operator const solveScalarField&()
+                );
 
             if (interpolateCorrection_) //&& leveli < coarsestLevel - 2)
             {

From 4f7aa70ad6b1bfdf85262f33f561d1b23c751fd2 Mon Sep 17 00:00:00 2001
From: Yu Ankun <huawei>
Date: Thu, 20 Apr 2023 13:56:38 +0300
Subject: [PATCH 197/348] ENH: new FPCG solver (faster PCG)

- this should be faster than the regular PCG on larger systems
  since it combines two global reductions
---
 src/OpenFOAM/Make/files                       |   1 +
 .../matrices/lduMatrix/solvers/FPCG/FPCG.C    | 269 ++++++++++++++++++
 .../matrices/lduMatrix/solvers/FPCG/FPCG.H    | 134 +++++++++
 .../matrices/lduMatrix/solvers/PCG/PCG.C      |   4 +-
 4 files changed, 406 insertions(+), 2 deletions(-)
 create mode 100644 src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C
 create mode 100644 src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 7753533552..9eb84d9243 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -431,6 +431,7 @@ $(lduMatrix)/solvers/smoothSolver/smoothSolver.C
 $(lduMatrix)/solvers/PCG/PCG.C
 $(lduMatrix)/solvers/PBiCG/PBiCG.C
 $(lduMatrix)/solvers/PBiCGStab/PBiCGStab.C
+$(lduMatrix)/solvers/FPCG/FPCG.C
 $(lduMatrix)/solvers/PPCG/PPCG.C
 $(lduMatrix)/solvers/PPCR/PPCR.C
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C
new file mode 100644
index 0000000000..36bcdc99d0
--- /dev/null
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C
@@ -0,0 +1,269 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2023 Huawei (Yu Ankun)
+-------------------------------------------------------------------------------
+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 "FPCG.H"
+#include "PrecisionAdaptor.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(FPCG, 0);
+
+    lduMatrix::solver::addsymMatrixConstructorToTable<FPCG>
+        addFPCGSymMatrixConstructorToTable_;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::FPCG::FPCG
+(
+    const word& fieldName,
+    const lduMatrix& matrix,
+    const FieldField<Field, scalar>& interfaceBouCoeffs,
+    const FieldField<Field, scalar>& interfaceIntCoeffs,
+    const lduInterfaceFieldPtrsList& interfaces,
+    const dictionary& solverControls
+)
+:
+    lduMatrix::solver
+    (
+        fieldName,
+        matrix,
+        interfaceBouCoeffs,
+        interfaceIntCoeffs,
+        interfaces,
+        solverControls
+    )
+{}
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+void Foam::FPCG::gSumMagProd
+(
+    FixedList<solveScalar, 2>& globalSum,
+    const solveScalarField& a,
+    const solveScalarField& b,
+    const label comm
+)
+{
+    const label nCells = a.size();
+
+    globalSum = 0.0;
+    for (label cell=0; cell<nCells; ++cell)
+    {
+        globalSum[0] += a[cell]*b[cell];    // sumProd(a, b)
+        globalSum[1] += mag(b[cell]);       // sumMag(b)
+    }
+
+    Foam::reduce
+    (
+        globalSum.data(),
+        globalSum.size(),
+        sumOp<solveScalar>(),
+        UPstream::msgType(),  // (ignored): direct MPI call
+        comm
+    );
+}
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::solverPerformance Foam::FPCG::scalarSolve
+(
+    solveScalarField& psi,
+    const solveScalarField& source,
+    const direction cmpt
+) const
+{
+    // --- Setup class containing solver performance data
+    solverPerformance solverPerf
+    (
+        lduMatrix::preconditioner::getName(controlDict_) + typeName,
+        fieldName_
+    );
+
+    label nCells = psi.size();
+
+    solveScalar* __restrict__ psiPtr = psi.begin();
+
+    solveScalarField pA(nCells);
+    solveScalar* __restrict__ pAPtr = pA.begin();
+
+    solveScalarField wA(nCells);
+    solveScalar* __restrict__ wAPtr = wA.begin();
+
+    solveScalar wArA = solverPerf.great_;
+    solveScalar wArAold = wArA;
+
+    // --- Calculate A.psi
+    matrix_.Amul(wA, psi, interfaceBouCoeffs_, interfaces_, cmpt);
+
+    // --- Calculate initial residual field
+    solveScalarField rA(source - wA);
+    solveScalar* __restrict__ rAPtr = rA.begin();
+
+    matrix().setResidualField
+    (
+        ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
+        fieldName_,
+        true
+    );
+
+    // --- Calculate normalisation factor
+    solveScalar normFactor = this->normFactor(psi, source, wA, pA);
+
+    if ((log_ >= 2) || (lduMatrix::debug >= 2))
+    {
+        Info<< "   Normalisation factor = " << normFactor << endl;
+    }
+
+    // --- Calculate normalised residual norm
+    solverPerf.initialResidual() =
+        gSumMag(rA, matrix().mesh().comm())
+       /normFactor;
+    solverPerf.finalResidual() = solverPerf.initialResidual();
+
+    // --- Check convergence, solve if not converged
+    if
+    (
+        minIter_ > 0
+     || !solverPerf.checkConvergence(tolerance_, relTol_, log_)
+    )
+    {
+        // --- Select and construct the preconditioner
+        autoPtr<lduMatrix::preconditioner> preconPtr =
+            lduMatrix::preconditioner::New
+            (
+                *this,
+                controlDict_
+            );
+
+        FixedList<solveScalar, 2> globalSum;
+
+        // --- Solver iteration
+        do
+        {
+            // --- Store previous wArA
+            wArAold = wArA;
+
+            // --- Precondition residual
+            preconPtr->precondition(wA, rA, cmpt);
+
+            // --- Update search directions and calculate residual:
+            gSumMagProd(globalSum, wA, rA, matrix().mesh().comm());
+
+            wArA = globalSum[0];
+
+            solverPerf.finalResidual() = globalSum[1]/normFactor;
+
+            // Check convergence (bypass if not enough iterations yet)
+            if
+            (
+                (minIter_ <= 0 || solverPerf.nIterations() >= minIter_)
+             && solverPerf.checkConvergence(tolerance_, relTol_, log_)
+            )
+            {
+                break;
+            }
+
+            if (solverPerf.nIterations() == 0)
+            {
+                for (label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell];
+                }
+            }
+            else
+            {
+                const solveScalar beta = wArA/wArAold;
+
+                for (label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell] + beta*pAPtr[cell];
+                }
+            }
+
+
+            // --- Update preconditioned residual
+            matrix_.Amul(wA, pA, interfaceBouCoeffs_, interfaces_, cmpt);
+
+            solveScalar wApA = gSumProd(wA, pA, matrix().mesh().comm());
+
+            // --- Test for singularity
+            if (solverPerf.checkSingularity(mag(wApA)/normFactor)) break;
+
+
+            // --- Update solution and residual:
+
+            const solveScalar alpha = wArA/wApA;
+
+            for (label cell=0; cell<nCells; cell++)
+            {
+                psiPtr[cell] += alpha*pAPtr[cell];
+                rAPtr[cell] -= alpha*wAPtr[cell];
+            }
+
+        } while
+        (
+            ++solverPerf.nIterations() < maxIter_
+        );
+    }
+
+    matrix().setResidualField
+    (
+        ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
+        fieldName_,
+        false
+    );
+
+    return solverPerf;
+}
+
+
+
+Foam::solverPerformance Foam::FPCG::solve
+(
+    scalarField& psi_s,
+    const scalarField& source,
+    const direction cmpt
+) const
+{
+    PrecisionAdaptor<solveScalar, scalar> tpsi(psi_s);
+    return scalarSolve
+    (
+        tpsi.ref(),
+        ConstPrecisionAdaptor<solveScalar, scalar>(source)(),
+        cmpt
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H
new file mode 100644
index 0000000000..16daa7b795
--- /dev/null
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2012 OpenFOAM Foundation
+    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2023 Huawei (Yu Ankun)
+-------------------------------------------------------------------------------
+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::FPCG
+
+Group
+    grpLduMatrixSolvers
+
+Description
+    A 'faster' preconditioned conjugate gradient solver for
+    symmetric lduMatrices using a run-time selectable preconditioner.
+
+    This is termed \em "faster" than the regular PCG since it combines
+    global reductions.
+
+SourceFiles
+    FPCG.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_FPCG_H
+#define Foam_FPCG_H
+
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                            Class FPCG Declaration
+\*---------------------------------------------------------------------------*/
+
+class FPCG
+:
+    public lduMatrix::solver
+{
+    // Private Member Functions
+
+        //- Blocking version of sum(a*b), sum(mag(b))
+        static void gSumMagProd
+        (
+            FixedList<solveScalar, 2>& globalSum,
+            const solveScalarField& a,
+            const solveScalarField& b,
+            const label comm
+        );
+
+        //- No copy construct
+        FPCG(const FPCG&) = delete;
+
+        //- No copy assignment
+        void operator=(const FPCG&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("FPCG");
+
+
+    // Constructors
+
+        //- Construct from matrix components and solver controls
+        FPCG
+        (
+            const word& fieldName,
+            const lduMatrix& matrix,
+            const FieldField<Field, scalar>& interfaceBouCoeffs,
+            const FieldField<Field, scalar>& interfaceIntCoeffs,
+            const lduInterfaceFieldPtrsList& interfaces,
+            const dictionary& solverControls
+        );
+
+
+    //- Destructor
+    virtual ~FPCG() = default;
+
+
+    // Member Functions
+
+        //- Solve the matrix with this solver
+        virtual solverPerformance scalarSolve
+        (
+            solveScalarField& psi,
+            const solveScalarField& source,
+            const direction cmpt=0
+        ) const;
+
+        //- Solve the matrix with this solver
+        virtual solverPerformance solve
+        (
+            scalarField& psi,
+            const scalarField& source,
+            const direction cmpt=0
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
index ce33493e17..98023fbf83 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
@@ -157,7 +157,7 @@ Foam::solverPerformance Foam::PCG::scalarSolve
             }
             else
             {
-                solveScalar beta = wArA/wArAold;
+                const solveScalar beta = wArA/wArAold;
 
                 for (label cell=0; cell<nCells; cell++)
                 {
@@ -177,7 +177,7 @@ Foam::solverPerformance Foam::PCG::scalarSolve
 
             // --- Update solution and residual:
 
-            solveScalar alpha = wArA/wApA;
+            const solveScalar alpha = wArA/wApA;
 
             for (label cell=0; cell<nCells; cell++)
             {

From b0b3ec0d8eca3bef3e929059499e639ededf847a Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Wed, 3 May 2023 19:04:10 +0000
Subject: [PATCH 198/348] ENH: parProfiling: profile linear solver only

---
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |  16 ++-
 .../lduMatrix/lduMatrix/lduMatrixSolver.C     |  38 +++--
 .../matrices/lduMatrix/solvers/PCG/PCG.C      |   1 -
 src/functionObjects/utilities/Make/files      |   1 +
 .../parProfiling/parProfilingSolver.C         | 127 +++++++++++++++++
 .../parProfiling/parProfilingSolver.H         | 132 ++++++++++++++++++
 tutorials/IO/cavity_parProfiling/0/U          |  41 ++++++
 tutorials/IO/cavity_parProfiling/0/p          |  40 ++++++
 tutorials/IO/cavity_parProfiling/Allclean     |  10 ++
 tutorials/IO/cavity_parProfiling/Allrun       |  27 ++++
 tutorials/IO/cavity_parProfiling/README.txt   |   3 +
 .../constant/transportProperties              |  20 +++
 .../cavity_parProfiling/system/blockMeshDict  |  72 ++++++++++
 .../IO/cavity_parProfiling/system/controlDict |  70 ++++++++++
 .../system/decomposeParDict                   |  27 ++++
 .../IO/cavity_parProfiling/system/fvSchemes   |  50 +++++++
 .../system/fvSolution.template                |  53 +++++++
 17 files changed, 717 insertions(+), 11 deletions(-)
 create mode 100644 src/functionObjects/utilities/parProfiling/parProfilingSolver.C
 create mode 100644 src/functionObjects/utilities/parProfiling/parProfilingSolver.H
 create mode 100644 tutorials/IO/cavity_parProfiling/0/U
 create mode 100644 tutorials/IO/cavity_parProfiling/0/p
 create mode 100755 tutorials/IO/cavity_parProfiling/Allclean
 create mode 100755 tutorials/IO/cavity_parProfiling/Allrun
 create mode 100644 tutorials/IO/cavity_parProfiling/README.txt
 create mode 100644 tutorials/IO/cavity_parProfiling/constant/transportProperties
 create mode 100644 tutorials/IO/cavity_parProfiling/system/blockMeshDict
 create mode 100644 tutorials/IO/cavity_parProfiling/system/controlDict
 create mode 100644 tutorials/IO/cavity_parProfiling/system/decomposeParDict
 create mode 100644 tutorials/IO/cavity_parProfiling/system/fvSchemes
 create mode 100644 tutorials/IO/cavity_parProfiling/system/fvSolution.template

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 3c5e88d714..87a1ccd2e1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -229,7 +229,19 @@ public:
 
         // Selectors
 
-            //- Return a new solver
+            //- Return a new solver of given type
+            static autoPtr<solver> New
+            (
+                const word& solverName,
+                const word& fieldName,
+                const lduMatrix& matrix,
+                const FieldField<Field, scalar>& interfaceBouCoeffs,
+                const FieldField<Field, scalar>& interfaceIntCoeffs,
+                const lduInterfaceFieldPtrsList& interfaces,
+                const dictionary& solverControls
+            );
+
+            //- Return a new solver given dictionary
             static autoPtr<solver> New
             (
                 const word& fieldName,
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index 1ffcf3bdb0..b2c7efcd2a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,10 +39,11 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
 (
+    const word& solverName,
     const word& fieldName,
     const lduMatrix& matrix,
     const FieldField<Field, scalar>& interfaceBouCoeffs,
@@ -51,8 +52,6 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
     const dictionary& solverControls
 )
 {
-    const word name(solverControls.get<word>("solver"));
-
     if (matrix.diagonal())
     {
         return autoPtr<lduMatrix::solver>
@@ -70,7 +69,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
     }
     else if (matrix.symmetric())
     {
-        auto* ctorPtr = symMatrixConstructorTable(name);
+        auto* ctorPtr = symMatrixConstructorTable(solverName);
 
         if (!ctorPtr)
         {
@@ -78,7 +77,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
             (
                 solverControls,
                 "symmetric matrix solver",
-                name,
+                solverName,
                 *symMatrixConstructorTablePtr_
             ) << exit(FatalIOError);
         }
@@ -98,7 +97,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
     }
     else if (matrix.asymmetric())
     {
-        auto* ctorPtr = asymMatrixConstructorTable(name);
+        auto* ctorPtr = asymMatrixConstructorTable(solverName);
 
         if (!ctorPtr)
         {
@@ -106,7 +105,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
             (
                 solverControls,
                 "asymmetric matrix solver",
-                name,
+                solverName,
                 *asymMatrixConstructorTablePtr_
             ) << exit(FatalIOError);
         }
@@ -134,6 +133,29 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
 }
 
 
+Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
+(
+    const word& fieldName,
+    const lduMatrix& matrix,
+    const FieldField<Field, scalar>& interfaceBouCoeffs,
+    const FieldField<Field, scalar>& interfaceIntCoeffs,
+    const lduInterfaceFieldPtrsList& interfaces,
+    const dictionary& solverControls
+)
+{
+    return New
+    (
+        solverControls.get<word>("solver"),
+        fieldName,
+        matrix,
+        interfaceBouCoeffs,
+        interfaceIntCoeffs,
+        interfaces,
+        solverControls
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::lduMatrix::solver::solver
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
index 98023fbf83..c3ce1b28ea 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
@@ -210,7 +210,6 @@ Foam::solverPerformance Foam::PCG::scalarSolve
 }
 
 
-
 Foam::solverPerformance Foam::PCG::solve
 (
     scalarField& psi_s,
diff --git a/src/functionObjects/utilities/Make/files b/src/functionObjects/utilities/Make/files
index ad0e87e374..bc759df937 100644
--- a/src/functionObjects/utilities/Make/files
+++ b/src/functionObjects/utilities/Make/files
@@ -15,6 +15,7 @@ multiRegion/multiRegion.C
 removeRegisteredObject/removeRegisteredObject.C
 
 parProfiling/parProfiling.C
+parProfiling/parProfilingSolver.C
 
 solverInfo/solverInfo.C
 timeInfo/timeInfo.C
diff --git a/src/functionObjects/utilities/parProfiling/parProfilingSolver.C b/src/functionObjects/utilities/parProfiling/parProfilingSolver.C
new file mode 100644
index 0000000000..ef58751ece
--- /dev/null
+++ b/src/functionObjects/utilities/parProfiling/parProfilingSolver.C
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "lduMatrix.H"
+#include "parProfilingSolver.H"
+#include "profilingPstream.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(parProfilingSolver, 0);
+
+    typedef lduMatrix::solver baseType;
+
+    addNamedToRunTimeSelectionTable
+    (
+        baseType,
+        parProfilingSolver,
+        symMatrix,
+        parProfiling
+    );
+
+    addNamedToRunTimeSelectionTable
+    (
+        baseType,
+        parProfilingSolver,
+        asymMatrix,
+        parProfiling
+    );
+}
+
+
+// Has been initialised
+static bool initialised_(false);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::parProfilingSolver::parProfilingSolver
+(
+    const word& fieldName,
+    const lduMatrix& matrix,
+    const FieldField<Field, scalar>& interfaceBouCoeffs,
+    const FieldField<Field, scalar>& interfaceIntCoeffs,
+    const lduInterfaceFieldPtrsList& interfaces,
+    const dictionary& solverControls
+)
+:
+    lduMatrix::solver
+    (
+        fieldName,
+        matrix,
+        interfaceBouCoeffs,
+        interfaceIntCoeffs,
+        interfaces,
+        solverControls
+    )
+{
+    if (!initialised_)
+    {
+        initialised_ = true;
+        profilingPstream::reset();
+        profilingPstream::suspend();
+    }
+
+    const word baseSolver(solverControls.get<word>("baseSolver"));
+
+    solvePtr_.reset
+    (
+        lduMatrix::solver::New
+        (
+            baseSolver,
+            fieldName,
+            matrix,
+            interfaceBouCoeffs,
+            interfaceIntCoeffs,
+            interfaces,
+            solverControls
+        )
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::solverPerformance Foam::parProfilingSolver::solve
+(
+    scalarField& psi_s,
+    const scalarField& source,
+    const direction cmpt
+) const
+{
+    profilingPstream::enable();
+    Foam::solverPerformance perf(solvePtr_->solve(psi_s, source, cmpt));
+    profilingPstream::suspend();
+
+    return perf;
+}
+
+
+// ************************************************************************* //
diff --git a/src/functionObjects/utilities/parProfiling/parProfilingSolver.H b/src/functionObjects/utilities/parProfiling/parProfilingSolver.H
new file mode 100644
index 0000000000..b18e00809c
--- /dev/null
+++ b/src/functionObjects/utilities/parProfiling/parProfilingSolver.H
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::parProfilingSolver
+
+Description
+    Wrapper to switch on parProfiling around a linear solver.
+
+    Used in combination with parProfiling functionObject.
+
+Usage
+    Example of linear solver specification in fvSolution:
+    \verbatim
+    solvers
+    {
+        p
+        {
+            solver          parProfiling;
+            // Actual solver to use
+            baseSolver      PCG;
+            preconditioner  DIC;
+            ..
+        }
+    }
+    \endverbatim
+
+SourceFiles
+    parProfiling.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_parProfilingSolver_H
+#define Foam_parProfilingSolver_H
+
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class parProfilingSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class parProfilingSolver
+:
+    public lduMatrix::solver
+{
+    // Private Data
+
+        //- Underlying solver
+        autoPtr<lduMatrix::solver> solvePtr_;
+
+
+    // Private Member Functions
+
+        //- No copy construct
+        parProfilingSolver(const parProfilingSolver&) = delete;
+
+        //- No copy assignment
+        void operator=(const parProfilingSolver&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("parProfilingSolver");
+
+
+    // Constructors
+
+        //- Construct from matrix components and solver controls
+        parProfilingSolver
+        (
+            const word& fieldName,
+            const lduMatrix& matrix,
+            const FieldField<Field, scalar>& interfaceBouCoeffs,
+            const FieldField<Field, scalar>& interfaceIntCoeffs,
+            const lduInterfaceFieldPtrsList& interfaces,
+            const dictionary& solverControls
+        );
+
+
+    //- Destructor
+    virtual ~parProfilingSolver() = default;
+
+
+    // Member Functions
+
+        //- Solve the matrix with forwarding to the base solver
+        virtual solverPerformance solve
+        (
+            scalarField& psi,
+            const scalarField& source,
+            const direction cmpt=0
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/0/U b/tutorials/IO/cavity_parProfiling/0/U
new file mode 100644
index 0000000000..7325fb400b
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/0/U
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    movingWall
+    {
+        type            fixedValue;
+        value           uniform (1 0 0);
+    }
+
+    fixedWalls
+    {
+        type            noSlip;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/0/p b/tutorials/IO/cavity_parProfiling/0/p
new file mode 100644
index 0000000000..13954fbcc8
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/0/p
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    movingWall
+    {
+        type            zeroGradient;
+    }
+
+    fixedWalls
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/Allclean b/tutorials/IO/cavity_parProfiling/Allclean
new file mode 100755
index 0000000000..0f428b265f
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase
+
+rm -f system/fvSolution
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/IO/cavity_parProfiling/Allrun b/tutorials/IO/cavity_parProfiling/Allrun
new file mode 100755
index 0000000000..cb13c1e0a6
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/Allrun
@@ -0,0 +1,27 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
+
+cp -f system/fvSolution.template system/fvSolution
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+#- Normal solver. Shows that sleep time is not included in profiling
+
+solver="PCG"
+foamDictionary -entry solvers/p/solver -set "$solver" system/fvSolution
+foamDictionary -entry solvers/pFinal/solver -set "$solver" system/fvSolution
+
+runParallel -s "$solver" $(getApplication)
+
+#- Run again with profiling
+solver="parProfiling"
+foamDictionary -entry solvers/p/solver -set "$solver" system/fvSolution
+foamDictionary -entry solvers/pFinal/solver -set "$solver" system/fvSolution
+
+runParallel -s "$solver" $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/IO/cavity_parProfiling/README.txt b/tutorials/IO/cavity_parProfiling/README.txt
new file mode 100644
index 0000000000..5c2fb30ae3
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/README.txt
@@ -0,0 +1,3 @@
+Testcase for parProfiling wrapper linear solver.
+
+It only activates parProfiling within the linear solver.
diff --git a/tutorials/IO/cavity_parProfiling/constant/transportProperties b/tutorials/IO/cavity_parProfiling/constant/transportProperties
new file mode 100644
index 0000000000..d3a7aaf7ed
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/constant/transportProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu              0.01;
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/system/blockMeshDict b/tutorials/IO/cavity_parProfiling/system/blockMeshDict
new file mode 100644
index 0000000000..3a2a8c4ac0
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/system/blockMeshDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale   0.1;
+
+vertices
+(
+    (0 0 0)
+    (1 0 0)
+    (1 1 0)
+    (0 1 0)
+    (0 0 0.1)
+    (1 0 0.1)
+    (1 1 0.1)
+    (0 1 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/system/controlDict b/tutorials/IO/cavity_parProfiling/system/controlDict
new file mode 100644
index 0000000000..9efc19bb59
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/system/controlDict
@@ -0,0 +1,70 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Can force loading of solver wrapper...
+libs            (utilityFunctionObjects);
+
+application     icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.1;
+
+deltaT          0.005;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+functions
+{
+    // Add some dummy time - shouldn't be seen in profiling
+    sleep
+    {
+        type    coded;
+        libs    (utilityFunctionObjects);
+        name    sleep;
+
+        codeExecute #{ sleep(1); #};
+    }
+
+    // Run parProfiling
+    profiling
+    {
+        #includeEtc "caseDicts/profiling/parallel.cfg"
+        detail  2;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/system/decomposeParDict b/tutorials/IO/cavity_parProfiling/system/decomposeParDict
new file mode 100644
index 0000000000..5eed9b045e
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/system/decomposeParDict
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  2;
+
+method  hierarchical;
+
+coeffs
+{
+    n   (2 1 1);
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/system/fvSchemes b/tutorials/IO/cavity_parProfiling/system/fvSchemes
new file mode 100644
index 0000000000..1fe4971e6b
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/system/fvSchemes
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear orthogonal;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         orthogonal;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/system/fvSolution.template b/tutorials/IO/cavity_parProfiling/system/fvSolution.template
new file mode 100644
index 0000000000..67ad6d913e
--- /dev/null
+++ b/tutorials/IO/cavity_parProfiling/system/fvSolution.template
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2306                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2;
+    format          ascii;
+    class           dictionary;
+    object          fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          parProfiling;
+        baseSolver      PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0.05;
+    }
+    pFinal
+    {
+        solver          parProfiling;
+        baseSolver      PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    U
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+
+// ************************************************************************* //

From 3e382aadea8e34af212a308ec2e4d9fc840ce996 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 5 May 2023 13:23:41 +0100
Subject: [PATCH 199/348] Revert "BUG: Fixing ray dAve and omega for 1D and 2D
 cases"

This reverts commit 5848b0afd5c931a3e85d673638bae6dab29ce62d.
---
 .../radiativeIntensityRay/radiativeIntensityRay.C | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index cc1a15a1e8..4fea2866a9 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -140,17 +140,6 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
 
     if (mesh_.nSolutionD() == 2)
     {
-        // Omega for 2D
-        omega_ = deltaPhi;
-
-        // dAve for 2D
-        dAve_ = vector
-        (
-            2*sinPhi*Foam::sin(0.5*deltaPhi),
-            2*cosPhi*Foam::sin(0.5*deltaPhi),
-            0
-        );
-
         vector meshDir(Zero);
         if (dom_.meshOrientation() != vector::zero)
         {
@@ -172,7 +161,6 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
 
         dAve_ = coordRot & dAve_;
         d_ = coordRot & d_;
-
     }
     else if (mesh_.nSolutionD() == 1)
     {
@@ -195,9 +183,6 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
 
         dAve_ = (dAve_ & normal)*meshDir;
         d_ = (d_ & normal)*meshDir;
-
-        // Omega normalization for 1D
-        omega_ /= 2;
     }
 
     autoPtr<volScalarField> IDefaultPtr;

From fd1a70f9337839f2ca37457cb2ed0862c91791ef Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Thu, 4 May 2023 11:53:52 +0100
Subject: [PATCH 200/348] BUG: effectivenessTable: fix the sign for secondary
 outlet temperature (fixes #2772)

---
 .../effectivenessTable/effectivenessTable.C                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fvOptions/sources/derived/heatExchangerSource/heatExchangerModels/effectivenessTable/effectivenessTable.C b/src/fvOptions/sources/derived/heatExchangerSource/heatExchangerModels/effectivenessTable/effectivenessTable.C
index 3d4ed55760..08af91be26 100644
--- a/src/fvOptions/sources/derived/heatExchangerSource/heatExchangerModels/effectivenessTable/effectivenessTable.C
+++ b/src/fvOptions/sources/derived/heatExchangerSource/heatExchangerModels/effectivenessTable/effectivenessTable.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -321,7 +321,7 @@ void Foam::heatExchangerModels::effectivenessTable::write
             // Secondary Cp as a function of the starting secondary temperature
             const scalar secondaryCp = secondaryCpPtr_->value(secondaryInletT_);
             const scalar secondaryOutletT =
-                Qt_/(secondaryMassFlowRate_*secondaryCp) + secondaryInletT_;
+                secondaryInletT_ - Qt_/(secondaryMassFlowRate_*secondaryCp);
 
             if (log)
             {

From d22c206226d595196f832b5fe3bc110c9d1e351e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 10:08:27 +0200
Subject: [PATCH 201/348] STYLE: fix truncated error message for non-constraint
 patch types

---
 .../fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C  | 1 +
 .../fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C | 1 +
 .../fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C   | 1 +
 .../fields/fvPatchFields/constraint/empty/emptyFvPatchField.C    | 1 +
 .../constraint/processorCyclic/processorCyclicFvPatchField.C     | 1 +
 .../fvPatchFields/constraint/symmetry/symmetryFvPatchField.C     | 1 +
 .../constraint/symmetryPlane/symmetryPlaneFvPatchField.C         | 1 +
 .../fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C    | 1 +
 8 files changed, 8 insertions(+)

diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 631665f914..0d6dac5c15 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -90,6 +90,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
     if (!isA<cyclicFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index 799007022d..388a74f540 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -113,6 +113,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
     if (!isA<cyclicACMIFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 8f983958ef..e2ba9698b8 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -99,6 +99,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
     if (!isA<cyclicAMIFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
index a1fc6d3641..846c33a216 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
@@ -55,6 +55,7 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
     if (!isType<emptyFvPatch>(p))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index a97da4c856..c03c65b744 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -102,6 +102,7 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
     if (!isType<processorCyclicFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
index bb68901608..e09ed95643 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
@@ -77,6 +77,7 @@ Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
     if (!isType<symmetryFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
index b1e2cf2fd9..53851b7e00 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
@@ -57,6 +57,7 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
     if (!isType<symmetryPlaneFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
index 2393afd5e3..8d63c8a5d8 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
@@ -59,6 +59,7 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
     if (!isType<wedgeFvPatch>(this->patch()))
     {
         FatalErrorInFunction
+            << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

From 9d2ae3da67aa9dee2f299aad3f39ef6f229b4952 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 10:08:43 +0200
Subject: [PATCH 202/348] CONFIG: remove optional 'value' entry from
 setConstraintTypes template

- processor types automatically handle a missing 'value' as
  patchInternalField, so no need having it in the setConstraintTypes
  template as well.
---
 etc/caseDicts/setConstraintTypes | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/etc/caseDicts/setConstraintTypes b/etc/caseDicts/setConstraintTypes
index 51f17fe28c..fe179553cd 100644
--- a/etc/caseDicts/setConstraintTypes
+++ b/etc/caseDicts/setConstraintTypes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -40,13 +40,11 @@ nonuniformTransformCyclic
 processor
 {
     type  processor;
-    value $internalField;
 }
 
 processorCyclic
 {
     type  processorCyclic;
-    value $internalField;
 }
 
 symmetryPlane

From 639b800049c9606a26f9017582824a3e90ce77f9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 5 May 2023 11:16:13 +0200
Subject: [PATCH 203/348] ENH: clearer separation of MPI initialize/finalize
 stages (#2774)

ENH: support transfer from a wrapped MPI request to global list

- allows coding with a list UPstream::Request and subsequently either
  retain that list or transfer into the global list.
---
 applications/test/FixedList/Test-FixedList.C  |  67 ++++++++--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  10 +-
 .../functionObjectList/functionObjectList.C   |   4 +-
 src/OpenFOAM/global/argList/argList.C         |   4 +-
 .../fileOperationInitialise.C                 |   2 +-
 src/Pstream/dummy/UPstreamRequest.C           |   2 +
 src/Pstream/mpi/UPstream.C                    | 126 ++++++++++--------
 src/Pstream/mpi/UPstreamRequest.C             |  21 ++-
 .../snappyHexMeshDriver/snappyLayerDriver.C   |   4 +-
 9 files changed, 165 insertions(+), 75 deletions(-)

diff --git a/applications/test/FixedList/Test-FixedList.C b/applications/test/FixedList/Test-FixedList.C
index b1976a2bfd..04f24d4959 100644
--- a/applications/test/FixedList/Test-FixedList.C
+++ b/applications/test/FixedList/Test-FixedList.C
@@ -112,13 +112,20 @@ int main(int argc, char *argv[])
     argList::addBoolOption("iter");
     argList::addBoolOption("swap");
     argList::addBoolOption("default", "reinstate default tests");
+    argList::addBoolOption("no-wait", "test with skipping request waits");
     argList::addNote("runs default tests or specified ones only");
 
     #include "setRootCase.H"
 
+    const bool optNowaiting = args.found("no-wait");
+
     // Run default tests, unless only specific tests are requested
     const bool defaultTests =
-        args.found("default") || args.options().empty();
+    (
+        args.found("default")
+     || args.options().empty()
+     || (optNowaiting && args.options().size())
+    );
 
 
     typedef FixedList<scalar,2> scalar2Type;
@@ -307,27 +314,53 @@ int main(int argc, char *argv[])
     List<FixedList<label, 2>> list6{{0, 1}, {2, 3}};
     Info<< "list6: " << list6 << nl;
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         // Fixed buffer would also work, but want to test using UList
         List<labelPair> buffer;
 
+        DynamicList<UPstream::Request> requests;
+
+        const label numProcs = UPstream::nProcs();
         const label startOfRequests = UPstream::nRequests();
 
-        if (Pstream::master())
+
+        // NOTE: also test a mix of local and global requests...
+        UPstream::Request singleRequest;
+
+        if (UPstream::master())
         {
-            buffer.resize(UPstream::nProcs());
+            // Use local requests here
+            requests.reserve(numProcs);
+
+            buffer.resize(numProcs);
             buffer[0] = labelPair(0, UPstream::myProcNo());
 
-            for (const int proci : Pstream::subProcs())
+            for (const int proci : UPstream::subProcs())
             {
                 UIPstream::read
                 (
-                    UPstream::commsTypes::nonBlocking,
+                    requests.emplace_back(),
                     proci,
                     buffer.slice(proci, 1)
                 );
             }
+
+            if (requests.size() > 1)
+            {
+                // Or just wait for as a single request...
+                singleRequest = requests.back();
+                requests.pop_back();
+            }
+
+            if (requests.size() > 2)
+            {
+                // Peel off a few from local -> global
+                // the order will not matter (is MPI_Waitall)
+
+                UPstream::addRequest(requests.back()); requests.pop_back();
+                UPstream::addRequest(requests.back()); requests.pop_back();
+            }
         }
         else
         {
@@ -336,16 +369,34 @@ int main(int argc, char *argv[])
 
             Perr<< "Sending to master: " << buffer << endl;
 
+            // Capture the request and transfer to the global list
+            // (for testing)
+
             UOPstream::write
             (
-                UPstream::commsTypes::nonBlocking,
+                singleRequest,
                 UPstream::masterNo(),
                 buffer.slice(0, 1)  // OK
                 /// buffer  // Also OK
             );
+
+            // if (singleRequest.good())
+            {
+                UPstream::addRequest(singleRequest);
+            }
         }
 
-        UPstream::waitRequests(startOfRequests);
+        Pout<< "Pending requests [" << numProcs << " procs] global="
+            << (UPstream::nRequests() - startOfRequests)
+            << " local=" << requests.size()
+            << " single=" << singleRequest.good() << nl;
+
+        if (!optNowaiting)
+        {
+            UPstream::waitRequests(startOfRequests);
+        }
+        UPstream::waitRequests(requests);
+        UPstream::waitRequest(singleRequest);
 
         Info<< "Gathered: " << buffer << endl;
     }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index e8daae4e31..babb0288ba 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -543,7 +543,11 @@ public:
         );
 
 
-    // Requests (non-blocking comms)
+    // Requests (non-blocking comms).
+    // Pending requests are usually handled as an internal (global) list,
+    // since this simplifies the overall tracking and provides a convenient
+    // wrapping to avoid exposing MPI-specific types, but can also handle
+    // with a wrapped UPstream::Request as well.
 
         //- Number of outstanding requests (on the internal list of requests)
         static label nRequests() noexcept;
@@ -553,6 +557,10 @@ public:
         //  A no-op for out-of-range values.
         static void resetRequests(const label n);
 
+        //- Transfer the (wrapped) MPI request to the internal global list.
+        //  A no-op for non-parallel. No special treatment for null requests.
+        static void addRequest(UPstream::Request& req);
+
         //- Wait until all requests (from position onwards) have finished.
         //- Corresponds to MPI_Waitall()
         //  A no-op if parRun() == false,
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 857dc3a315..b11d990703 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -79,11 +79,11 @@ namespace Foam
             error::printStack(Perr);
             std::abort();
         }
-        else if (Pstream::parRun())
+        else if (UPstream::parRun())
         {
             Perr<< nl << err << nl
                 << "\nFOAM parallel run exiting\n" << endl;
-            Pstream::exit(1);
+            UPstream::exit(1);
         }
         else
         {
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 2d53e33490..c8d2a498ee 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -958,7 +958,7 @@ Foam::argList::argList
                         << " -help-full' for extended usage" << nl
                         << nl;
 
-                    Pstream::exit(1);  // works for serial and parallel
+                    UPstream::exit(1);  // works for serial and parallel
                 }
 
                 commandLine_ += ' ';
@@ -1139,7 +1139,7 @@ void Foam::argList::parse
         foamVersion::printBuildInfo(Info.stdStream(), false);
         FatalError.write(Info, false);
 
-        Pstream::exit(1);  // works for serial and parallel
+        UPstream::exit(1);  // works for serial and parallel
     }
 
     if (initialise)
diff --git a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C b/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C
index 02b194628e..f934b4bd22 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C
@@ -78,7 +78,7 @@ Foam::fileOperations::fileOperationInitialise::fileOperationInitialise
                         << "Error: option '-ioRanks' requires a list of"
                            " IO ranks as argument" << nl << nl;
 
-                    //Pstream::exit(1);  // works for serial and parallel
+                    //UPstream::exit(1);  // works for serial and parallel
                 }
             }
         }
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index 09807e6e9b..551e766f37 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -53,6 +53,8 @@ Foam::label Foam::UPstream::nRequests() noexcept { return 0; }
 
 void Foam::UPstream::resetRequests(const label n) {}
 
+void Foam::UPstream::addRequest(UPstream::Request& req) {}
+
 void Foam::UPstream::waitRequests(const label pos, label len) {}
 void Foam::UPstream::waitRequests(UList<UPstream::Request>&) {}
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 67acb35cbf..457c1689f4 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -37,15 +37,16 @@ License
 #include <cstring>
 #include <cstdlib>
 #include <csignal>
+#include <memory>
 #include <numeric>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-// The min value and default for MPI buffers length
+// The min value and default for MPI buffer length
 constexpr int minBufLen = 20000000;
 
-// Track if we have attached MPI buffers
-static bool ourBuffers = false;
+// Track size of attached MPI buffer
+static int attachedBufLen = 0;
 
 // Track if we initialized MPI
 static bool ourMpi = false;
@@ -53,18 +54,18 @@ static bool ourMpi = false;
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
+// Attach user-defined send buffer
 static void attachOurBuffers()
 {
-    if (ourBuffers)
+#ifndef SGIMPI
+    if (attachedBufLen)
     {
         return;  // Already attached
     }
-    ourBuffers = true;
 
     // Use UPstream::mpiBufferSize (optimisationSwitch),
     // but allow override with MPI_BUFFER_SIZE env variable (int value)
 
-#ifndef SGIMPI
     int len = 0;
 
     const std::string str(Foam::getEnv("MPI_BUFFER_SIZE"));
@@ -78,14 +79,19 @@ static void attachOurBuffers()
         len = minBufLen;
     }
 
-    if (Foam::UPstream::debug)
-    {
-        Foam::Pout<< "UPstream::init : buffer-size " << len << '\n';
-    }
-
     char* buf = new char[len];
 
-    if (MPI_SUCCESS != MPI_Buffer_attach(buf, len))
+    if (MPI_SUCCESS == MPI_Buffer_attach(buf, len))
+    {
+        // Properly attached
+        attachedBufLen = len;
+
+        if (Foam::UPstream::debug)
+        {
+            Foam::Pout<< "UPstream::init : buffer-size " << len << '\n';
+        }
+    }
+    else
     {
         delete[] buf;
         Foam::Pout<< "UPstream::init : could not attach buffer\n";
@@ -94,26 +100,31 @@ static void attachOurBuffers()
 }
 
 
+// Remove an existing user-defined send buffer
 static void detachOurBuffers()
 {
-    if (!ourBuffers)
+#ifndef SGIMPI
+    if (!attachedBufLen)
     {
         return;  // Nothing to detach
     }
-    ourBuffers = false;
 
     // Some MPI notes suggest that the return code is MPI_SUCCESS when
     // no buffer is attached.
     // Be extra careful and require a non-zero size as well.
 
-#ifndef SGIMPI
-    int len = 0;
     char* buf = nullptr;
+    int len = 0;
 
     if (MPI_SUCCESS == MPI_Buffer_detach(&buf, &len) && len)
     {
+        // This was presumably the buffer that we attached
+        // and not someone else.
         delete[] buf;
     }
+
+    // Nothing attached
+    attachedBufLen = 0;
 #endif
 }
 
@@ -390,41 +401,49 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
 
 void Foam::UPstream::shutdown(int errNo)
 {
-    if (debug)
-    {
-        Pout<< "UPstream::shutdown\n";
-    }
-
     int flag = 0;
 
     MPI_Initialized(&flag);
     if (!flag)
     {
-        // No MPI initialized - we are done
+        // MPI not initialized - we have nothing to do
         return;
     }
 
     MPI_Finalized(&flag);
     if (flag)
     {
-        // Already finalized elsewhere?
+        // MPI already finalized - we have nothing to do
         if (ourMpi)
         {
             WarningInFunction
                 << "MPI was already finalized (by a connected program?)\n";
         }
-        else if (debug)
+        else if (debug && errNo == 0)
         {
             Pout<< "UPstream::shutdown : was already finalized\n";
         }
+        ourMpi = false;
+        return;
     }
-    else
+
+    if (!ourMpi)
     {
-        detachOurBuffers();
+        WarningInFunction
+            << "Finalizing MPI, but was initialized elsewhere\n";
+    }
+    ourMpi = false;
+
+
+    // Regular cleanup
+    // ---------------
+
+    if (debug)
+    {
+        Pout<< "UPstream::shutdown\n";
     }
 
-
-    // Warn about any outstanding requests
+    // Check for any outstanding requests
     {
         label nOutstanding = 0;
 
@@ -432,49 +451,40 @@ void Foam::UPstream::shutdown(int errNo)
         {
             if (MPI_REQUEST_NULL != request)
             {
+                // TBD: MPI_Cancel(&request); MPI_Request_free(&request);
                 ++nOutstanding;
             }
         }
 
-        PstreamGlobals::outstandingRequests_.clear();
-
         if (nOutstanding)
         {
             WarningInFunction
-                << "There were still " << nOutstanding
-                << " outstanding MPI requests." << nl
-                << "Which means your code exited before doing a "
-                << " UPstream::waitRequests()." << nl
-                << "This should not happen for a normal code exit."
-                << nl;
+                << "Still have " << nOutstanding
+                << " outstanding MPI requests."
+                << " Should not happen for a normal code exit."
+                << endl;
+        }
+
+        PstreamGlobals::outstandingRequests_.clear();
+    }
+
+    // TBD: skip these for errNo != 0 ?
+    {
+        detachOurBuffers();
+
+        forAllReverse(myProcNo_, communicator)
+        {
+            freeCommunicatorComponents(communicator);
         }
     }
 
-    // Clean mpi communicators
-    forAllReverse(myProcNo_, communicator)
+    if (errNo == 0)
     {
-        freeCommunicatorComponents(communicator);
+        MPI_Finalize();
     }
-
-    if (!flag)
+    else
     {
-        // MPI not already finalized
-
-        if (!ourMpi)
-        {
-            WarningInFunction
-                << "Finalizing MPI, but was initialized elsewhere\n";
-        }
-
-        if (errNo == 0)
-        {
-            MPI_Finalize();
-        }
-        else
-        {
-            // Abort only locally or world?
-            MPI_Abort(MPI_COMM_WORLD, errNo);
-        }
+        MPI_Abort(MPI_COMM_WORLD, errNo);
     }
 }
 
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index de3f611637..eb8cfc9251 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -69,6 +69,25 @@ void Foam::UPstream::resetRequests(const label n)
 }
 
 
+void Foam::UPstream::addRequest(UPstream::Request& req)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    // Transcribe as a MPI_Request
+    PstreamGlobals::outstandingRequests_.push_back
+    (
+        PstreamDetail::Request::get(req)
+    );
+
+    // Invalidate parameter
+    req = UPstream::Request(MPI_REQUEST_NULL);
+}
+
+
 void Foam::UPstream::waitRequests(const label pos, label len)
 {
     // No-op for non-parallel, no pending requests or out-of-range
@@ -128,9 +147,9 @@ void Foam::UPstream::waitRequests(const label pos, label len)
 
     profilingPstream::addWaitTime();
 
-    // ie, resetRequests(pos)
     if (trim)
     {
+        // Trim the length of outstanding requests
         PstreamGlobals::outstandingRequests_.resize(pos);
     }
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 235591b6c0..f2a038ba65 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -3897,10 +3897,10 @@ Foam::snappyLayerDriver::makeMeshMover
                 << errorMsg.c_str() << nl << nl
                 << "Exiting dry-run" << nl << endl;
 
-            if (Pstream::parRun())
+            if (UPstream::parRun())
             {
                 Perr<< "\nFOAM parallel run exiting\n" << endl;
-                Pstream::exit(0);
+                UPstream::exit(0);
             }
             else
             {

From 50f4d0444c33d251dca73d0b8b257a775c4919fe Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 08:03:40 +0200
Subject: [PATCH 204/348] ENH: avoid synchronization on UPstream::shutdown with
 error (#2774)

- UPstream exit with a non-zero return code is raised by things like
  exit(FatalError) which means there is no reason to believe that
  any/all of the buffered sends, requests etc have completed.

  Thus avoid detaching buffers, freeing communicators etc in this
  situation. This makes exit(1) behave much more like abort(), but
  without any stack trace. Should presumably help with avoiding
  deadlocks on exit.
---
 src/Pstream/mpi/UPstream.C | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 457c1689f4..cf04afdc17 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -101,6 +101,9 @@ static void attachOurBuffers()
 
 
 // Remove an existing user-defined send buffer
+// IMPORTANT:
+//     This operation will block until all messages currently in the
+//     buffer have been transmitted.
 static void detachOurBuffers()
 {
 #ifndef SGIMPI
@@ -435,6 +438,16 @@ void Foam::UPstream::shutdown(int errNo)
     ourMpi = false;
 
 
+    // Abort - stop now, without any final synchonization steps!
+    // -----
+
+    if (errNo != 0)
+    {
+        MPI_Abort(MPI_COMM_WORLD, errNo);
+        return;
+    }
+
+
     // Regular cleanup
     // ---------------
 
@@ -468,7 +481,7 @@ void Foam::UPstream::shutdown(int errNo)
         PstreamGlobals::outstandingRequests_.clear();
     }
 
-    // TBD: skip these for errNo != 0 ?
+
     {
         detachOurBuffers();
 
@@ -478,14 +491,8 @@ void Foam::UPstream::shutdown(int errNo)
         }
     }
 
-    if (errNo == 0)
-    {
-        MPI_Finalize();
-    }
-    else
-    {
-        MPI_Abort(MPI_COMM_WORLD, errNo);
-    }
+
+    MPI_Finalize();
 }
 
 

From 2eb1f5678d84d646dca0d5e4bcef769cf54e57a7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 09:13:25 +0200
Subject: [PATCH 205/348] ENH: use Improbe/Mrecv for NBX size exchange

- retains the queried message without secondary polling.
  Purported to be slightly faster. Better thread-safety.
---
 .../parallel-comm3a/Test-parallel-comm3a.C    |  10 +-
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 130 ++++++++++--------
 2 files changed, 81 insertions(+), 59 deletions(-)

diff --git a/applications/test/parallel-comm3a/Test-parallel-comm3a.C b/applications/test/parallel-comm3a/Test-parallel-comm3a.C
index 98e1577c73..26403bc256 100644
--- a/applications/test/parallel-comm3a/Test-parallel-comm3a.C
+++ b/applications/test/parallel-comm3a/Test-parallel-comm3a.C
@@ -131,14 +131,16 @@ int main(int argc, char *argv[])
     for (bool barrier_active = false, done = false; !done; /*nil*/)
     {
         int flag = 0;
+        MPI_Message message;
         MPI_Status status;
 
-        MPI_Iprobe
+        MPI_Improbe
         (
             MPI_ANY_SOURCE,
             tag,
             MPI_COMM_WORLD,
            &flag,
+           &message,
            &status
         );
 
@@ -153,14 +155,12 @@ int main(int argc, char *argv[])
             auto& buf = recvBufs(fromProci);
             buf.resize_nocopy(count);
 
-            MPI_Irecv
+            MPI_Imrecv
             (
                 buf.data_bytes(),
                 buf.size_bytes(),
                 MPI_BYTE,
-                fromProci,
-                tag,
-                MPI_COMM_WORLD,
+               &message,
                &recvRequests.emplace_back()
             );
         }
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 53695b43b1..f6d6769309 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -157,15 +157,12 @@ void Foam::PstreamDetail::allReduce
         error::printStack(Pout);
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -192,9 +189,8 @@ void Foam::PstreamDetail::allReduce
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -281,15 +277,12 @@ void Foam::PstreamDetail::allToAll
         return;
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -318,9 +311,8 @@ void Foam::PstreamDetail::allToAll
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -432,15 +424,12 @@ void Foam::PstreamDetail::allToAllv
         return;
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -470,9 +459,8 @@ void Foam::PstreamDetail::allToAllv
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -621,6 +609,19 @@ void Foam::PstreamDetail::allToAllConsensus
         int flag = 0;
         MPI_Status status;
 
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
+        MPI_Message message;
+        MPI_Improbe
+        (
+            MPI_ANY_SOURCE,
+            tag,
+            PstreamGlobals::MPICommunicators_[comm],
+           &flag,
+           &message,
+           &status
+        );
+#else
         MPI_Iprobe
         (
             MPI_ANY_SOURCE,
@@ -629,6 +630,7 @@ void Foam::PstreamDetail::allToAllConsensus
            &flag,
            &status
         );
+#endif
 
         if (flag)
         {
@@ -641,12 +643,24 @@ void Foam::PstreamDetail::allToAllConsensus
             if (count != 1)
             {
                 FatalErrorInFunction
-                    << "Incorrect message size. Expected 1 but had "
-                    << count << nl
+                    << "Incorrect message size from proc=" << proci
+                    << ". Expected 1 but had " << count << nl
                     << exit(FatalError);
             }
 
-            // Regular receive (the data are small)
+            // Regular blocking receive [the data are small]
+
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+            // MPI-3 : eg, openmpi-1.7 (2013) and later
+            MPI_Mrecv
+            (
+               &recvData[proci],
+                count,          // count=1 (see above)
+                datatype,
+               &message,
+                MPI_STATUS_IGNORE
+            );
+#else
             MPI_Recv
             (
                &recvData[proci],
@@ -657,6 +671,7 @@ void Foam::PstreamDetail::allToAllConsensus
                 PstreamGlobals::MPICommunicators_[comm],
                 MPI_STATUS_IGNORE
             );
+#endif
         }
 
         if (barrier_active)
@@ -800,6 +815,19 @@ void Foam::PstreamDetail::allToAllConsensus
         int flag = 0;
         MPI_Status status;
 
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
+        MPI_Message message;
+        MPI_Improbe
+        (
+            MPI_ANY_SOURCE,
+            tag,
+            PstreamGlobals::MPICommunicators_[comm],
+           &flag,
+           &message,
+           &status
+        );
+#else
         MPI_Iprobe
         (
             MPI_ANY_SOURCE,
@@ -808,6 +836,7 @@ void Foam::PstreamDetail::allToAllConsensus
            &flag,
            &status
         );
+#endif
 
         if (flag)
         {
@@ -821,14 +850,26 @@ void Foam::PstreamDetail::allToAllConsensus
             if (count != 1)
             {
                 FatalErrorInFunction
-                    << "Incorrect message size. Expected 1 but had "
-                    << count << nl
+                    << "Incorrect message size from proc=" << proci
+                    << ". Expected 1 but had " << count << nl
                     << exit(FatalError);
             }
 
             auto& recvData = recvBufs(proci);
 
-            // Regular receive [the data are small]
+            // Regular blocking receive [the data are small]
+
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+            // MPI-3 : eg, openmpi-1.7 (2013) and later
+            MPI_Mrecv
+            (
+               &recvData,
+                count,          // count=1 (see above)
+                datatype,
+               &message,
+                MPI_STATUS_IGNORE
+            );
+#else
             MPI_Recv
             (
                &recvData,
@@ -839,6 +880,7 @@ void Foam::PstreamDetail::allToAllConsensus
                 PstreamGlobals::MPICommunicators_[comm],
                 MPI_STATUS_IGNORE
             );
+#endif
         }
 
         if (barrier_active)
@@ -928,15 +970,12 @@ void Foam::PstreamDetail::gather
         error::printStack(Pout);
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -965,9 +1004,8 @@ void Foam::PstreamDetail::gather
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -1048,15 +1086,12 @@ void Foam::PstreamDetail::scatter
         error::printStack(Pout);
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -1085,9 +1120,8 @@ void Foam::PstreamDetail::scatter
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -1193,15 +1227,12 @@ void Foam::PstreamDetail::gatherv
         sendCount = 0;
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -1231,9 +1262,8 @@ void Foam::PstreamDetail::gatherv
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -1333,15 +1363,12 @@ void Foam::PstreamDetail::scatterv
             << Foam::abort(FatalError);
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -1371,9 +1398,8 @@ void Foam::PstreamDetail::scatterv
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 
@@ -1445,15 +1471,12 @@ void Foam::PstreamDetail::allGather
         error::printStack(Pout);
     }
 
-    bool handled(false);
 
 #if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
     if (immediate)
     {
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
         profilingPstream::beginTiming();
-
-        handled = true;
         MPI_Request request;
 
         if
@@ -1475,9 +1498,8 @@ void Foam::PstreamDetail::allGather
         PstreamGlobals::push_request(request, req, requestID);
         profilingPstream::addRequestTime();
     }
+    else
 #endif
-
-    if (!handled)
     {
         profilingPstream::beginTiming();
 

From c6f528588b83a593bc806e05d2a30013636ce64c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 09:53:06 +0200
Subject: [PATCH 206/348] ENH: use Mprobe/Mrecv for IPstream constructor

- retains the queried message without secondary polling.
---
 src/Pstream/mpi/UIPstreamRead.C | 253 ++++++++++++++++++++++----------
 1 file changed, 172 insertions(+), 81 deletions(-)

diff --git a/src/Pstream/mpi/UIPstreamRead.C b/src/Pstream/mpi/UIPstreamRead.C
index 20fed25c8d..c60f95bb87 100644
--- a/src/Pstream/mpi/UIPstreamRead.C
+++ b/src/Pstream/mpi/UIPstreamRead.C
@@ -31,83 +31,30 @@ License
 #include "profilingPstream.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
-void Foam::UIPstream::bufferIPCrecv()
-{
-    // Called by constructor
-    if (debug)
-    {
-        Pout<< "UIPstream IPC read buffer :"
-            << " from:" << fromProcNo_
-            << " tag:" << tag_ << " comm:" << comm_
-            << " wanted size:" << recvBuf_.capacity()
-            << Foam::endl;
-    }
-
-    // No buffer size allocated/specified - probe size of incoming message
-    if (!recvBuf_.capacity())
-    {
-        profilingPstream::beginTiming();
-
-        MPI_Status status;
-
-        MPI_Probe
-        (
-            fromProcNo_,
-            tag_,
-            PstreamGlobals::MPICommunicators_[comm_],
-            &status
-        );
-        MPI_Get_count(&status, MPI_BYTE, &messageSize_);
-
-        profilingPstream::addProbeTime();
-
-        recvBuf_.resize(messageSize_);
-
-        if (debug)
-        {
-            Pout<< "UIPstream::UIPstream : probed size:"
-                << messageSize_ << Foam::endl;
-        }
-    }
-
-    messageSize_ = UIPstream::read
-    (
-        commsType(),
-        fromProcNo_,
-        recvBuf_.data(),
-        recvBuf_.capacity(),
-        tag_,
-        comm_
-    );
-
-    // Set addressed size. Leave actual allocated memory intact.
-    recvBuf_.resize(messageSize_);
-
-    if (!messageSize_)
-    {
-        setEof();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::label Foam::UIPstream::read
+// General blocking/non-blocking MPI receive, optionally with probed
+// message information.
+static Foam::label UPstream_mpi_receive
 (
-    const UPstream::commsTypes commsType,
-    const int fromProcNo,
+    const Foam::UPstream::commsTypes commsType,
     char* buf,
     const std::streamsize bufSize,
+    const int fromProcNo,
     const int tag,
-    const label communicator,
-    UPstream::Request* req
+    const Foam::label communicator,
+    Foam::UPstream::Request* req
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
+    , MPI_Message* message = nullptr
+#endif
 )
 {
+    using namespace Foam;
+
     PstreamGlobals::reset_request(req);
 
-    if (debug)
+    if (UPstream::debug)
     {
         Pout<< "UIPstream::read : starting read from:" << fromProcNo
             << " tag:" << tag << " comm:" << communicator
@@ -134,11 +81,26 @@ Foam::label Foam::UIPstream::read
      || commsType == UPstream::commsTypes::scheduled
     )
     {
+        int returnCode = 0;
         MPI_Status status;
 
-        if
-        (
-            MPI_Recv
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
+        if (message)
+        {
+            returnCode = MPI_Mrecv
+            (
+                buf,
+                bufSize,
+                MPI_BYTE,
+                message,
+                &status
+            );
+        }
+        else
+#endif
+        {
+            returnCode = MPI_Recv
             (
                 buf,
                 bufSize,
@@ -147,8 +109,10 @@ Foam::label Foam::UIPstream::read
                 tag,
                 PstreamGlobals::MPICommunicators_[communicator],
                 &status
-            )
-        )
+            );
+        }
+
+        if (returnCode != MPI_SUCCESS)
         {
             FatalErrorInFunction
                 << "MPI_Recv cannot receive incoming message"
@@ -163,7 +127,7 @@ Foam::label Foam::UIPstream::read
         int messageSize;
         MPI_Get_count(&status, MPI_BYTE, &messageSize);
 
-        if (debug)
+        if (UPstream::debug)
         {
             Pout<< "UIPstream::read : finished read from:" << fromProcNo
                 << " tag:" << tag << " read size:" << label(bufSize)
@@ -184,11 +148,26 @@ Foam::label Foam::UIPstream::read
     }
     else if (commsType == UPstream::commsTypes::nonBlocking)
     {
+        int returnCode = 0;
         MPI_Request request;
 
-        if
-        (
-            MPI_Irecv
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
+        if (message)
+        {
+            returnCode = MPI_Imrecv
+            (
+                buf,
+                bufSize,
+                MPI_BYTE,
+                message,
+                &request
+            );
+        }
+        else
+#endif
+        {
+            returnCode = MPI_Irecv
             (
                 buf,
                 bufSize,
@@ -197,8 +176,10 @@ Foam::label Foam::UIPstream::read
                 tag,
                 PstreamGlobals::MPICommunicators_[communicator],
                 &request
-            )
-        )
+            );
+        }
+
+        if (returnCode != MPI_SUCCESS)
         {
             FatalErrorInFunction
                 << "MPI_Irecv cannot start non-blocking receive"
@@ -207,7 +188,7 @@ Foam::label Foam::UIPstream::read
             return 0;
         }
 
-        if (debug)
+        if (UPstream::debug)
         {
             Pout<< "UIPstream::read : started read from:" << fromProcNo
                 << " tag:" << tag << " read size:" << label(bufSize)
@@ -220,7 +201,7 @@ Foam::label Foam::UIPstream::read
         PstreamGlobals::push_request(request, req);
         profilingPstream::addRequestTime();
 
-        // Assume the message is completely received.
+        // Assume the message will be completely received.
         return bufSize;
     }
 
@@ -232,4 +213,114 @@ Foam::label Foam::UIPstream::read
 }
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::UIPstream::bufferIPCrecv()
+{
+    // Called by constructor
+    if (UPstream::debug)
+    {
+        Pout<< "UIPstream IPC read buffer :"
+            << " from:" << fromProcNo_
+            << " tag:" << tag_ << " comm:" << comm_
+            << " wanted size:" << recvBuf_.capacity()
+            << Foam::endl;
+    }
+
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+    // MPI-3 : eg, openmpi-1.7 (2013) and later
+    MPI_Message message;
+    MPI_Message* messagePtr = nullptr;
+#endif
+
+    // No buffer size allocated/specified - probe size of incoming message
+    if (!recvBuf_.capacity())
+    {
+        profilingPstream::beginTiming();
+
+        MPI_Status status;
+
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+        // MPI-3 : eg, openmpi-1.7 (2013) and later
+        messagePtr = &message;
+        MPI_Mprobe
+        (
+            fromProcNo_,
+            tag_,
+            PstreamGlobals::MPICommunicators_[comm_],
+           &message,
+           &status
+        );
+#else
+        MPI_Probe
+        (
+            fromProcNo_,
+            tag_,
+            PstreamGlobals::MPICommunicators_[comm_],
+           &status
+        );
+#endif
+        MPI_Get_count(&status, MPI_BYTE, &messageSize_);
+
+        profilingPstream::addProbeTime();
+
+        recvBuf_.resize(messageSize_);
+
+        if (UPstream::debug)
+        {
+            Pout<< "UIPstream::UIPstream : probed size:"
+                << messageSize_ << Foam::endl;
+        }
+    }
+
+    messageSize_ = UPstream_mpi_receive
+    (
+        commsType(),
+        recvBuf_.data(),
+        recvBuf_.capacity(),
+        fromProcNo_,
+        tag_,
+        comm_,
+        nullptr   // UPstream::Request
+#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
+        , messagePtr
+#endif
+    );
+
+    // Set addressed size. Leave actual allocated memory intact.
+    recvBuf_.resize(messageSize_);
+
+    if (!messageSize_)
+    {
+        setEof();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::UIPstream::read
+(
+    const UPstream::commsTypes commsType,
+    const int fromProcNo,
+    char* buf,
+    const std::streamsize bufSize,
+    const int tag,
+    const label communicator,
+    UPstream::Request* req
+)
+{
+    return UPstream_mpi_receive
+    (
+        commsType,
+        buf,
+        bufSize,
+        fromProcNo,
+        tag,
+        communicator,
+        req
+    );
+}
+
+
 // ************************************************************************* //

From 52b225b6d57542cd069b8bdd8afa5fb93d7328ef Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Tue, 9 May 2023 09:00:00 +0000
Subject: [PATCH 207/348] STYLE/COMP: include cyclic patch headers earlier

---
 .../constraint/cyclicAMI/cyclicAMIFvPatchField.H       |  2 +-
 .../constraint/cyclicAMI/cyclicAMIFvsPatchField.H      |  6 +++---
 .../fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H | 10 ++++------
 .../fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H  |  9 ++++-----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index 44efff7915..0a9e7e2bea 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -60,9 +60,9 @@ SourceFiles
 #ifndef Foam_cyclicAMIFvPatchField_H
 #define Foam_cyclicAMIFvPatchField_H
 
+#include "cyclicAMIFvPatch.H"
 #include "coupledFvPatchField.H"
 #include "cyclicAMILduInterfaceField.H"
-#include "cyclicAMIFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
index 20a8b5bf72..4846360f89 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H
@@ -34,11 +34,11 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicAMIFvsPatchField_H
-#define cyclicAMIFvsPatchField_H
+#ifndef Foam_cyclicAMIFvsPatchField_H
+#define Foam_cyclicAMIFvsPatchField_H
 
-#include "coupledFvsPatchField.H"
 #include "cyclicAMIFvPatch.H"
+#include "coupledFvsPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
index 0d272294ed..b32d23f953 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
@@ -35,12 +35,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicFvPatch_H
-#define cyclicFvPatch_H
+#ifndef Foam_cyclicFvPatch_H
+#define Foam_cyclicFvPatch_H
 
+#include "cyclicPolyPatch.H"
 #include "coupledFvPatch.H"
 #include "cyclicLduInterface.H"
-#include "cyclicPolyPatch.H"
 #include "fvBoundaryMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +57,7 @@ class cyclicFvPatch
     public coupledFvPatch,
     public cyclicLduInterface
 {
-    // Private data
+    // Private Data
 
         const cyclicPolyPatch& cyclicPolyPatch_;
 
@@ -88,7 +88,6 @@ public:
 
     // Member functions
 
-
         // Access
 
             //- Return local reference cast into the cyclic patch
@@ -173,7 +172,6 @@ public:
                 const Pstream::commsTypes commsType,
                 const labelUList& internalData
             ) const;
-
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
index 2a26e21658..ea902b98d7 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H
@@ -35,12 +35,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cyclicAMIFvPatch_H
-#define cyclicAMIFvPatch_H
+#ifndef Foam_cyclicAMIFvPatch_H
+#define Foam_cyclicAMIFvPatch_H
 
+#include "cyclicAMIPolyPatch.H"
 #include "coupledFvPatch.H"
 #include "cyclicAMILduInterface.H"
-#include "cyclicAMIPolyPatch.H"
 #include "fvBoundaryMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +57,7 @@ class cyclicAMIFvPatch
     public coupledFvPatch,
     public cyclicAMILduInterface
 {
-    // Private data
+    // Private Data
 
         const cyclicAMIPolyPatch& cyclicAMIPolyPatch_;
 
@@ -258,7 +258,6 @@ public:
                 const Pstream::commsTypes commsType,
                 const labelUList& internalData
             ) const;
-
 };
 
 

From 98c42479f693586404489a02fef06a8057a98fc8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 4 May 2023 17:45:58 +0200
Subject: [PATCH 208/348] ENH: relax processorField waiting requirements

- for interface polling previously required that both send and recv
  requests were completed before evaluating (values or matrix update).
  However, only the recv needs to be complete, which helps disentangle
  the inter-rank waiting.

  NB: this change is possible following (1f5cf3958bc8) that replaced
      UPstream::resetRequests() call in favour of UPstream::waitRequests()
---
 .../lduCalculatedProcessorField.C             |  32 +++--
 .../lduCalculatedProcessorField.H             |  90 ++++++-------
 .../lduPrimitiveProcessorInterface.C          |   1 +
 .../lduPrimitiveProcessorInterface.H          |  78 ++++++------
 .../lduInterfaceField/lduInterfaceField.H     |  65 +++++-----
 .../processor/processorFaPatchField.C         |  55 ++++----
 .../processor/processorFaPatchField.H         | 104 +++++++--------
 .../calculatedProcessorFvPatchField.C         |  35 ++++--
 .../calculatedProcessorFvPatchField.H         | 119 +++++++++---------
 .../processor/processorFvPatchField.C         |  67 +++++-----
 .../processor/processorFvPatchField.H         | 108 ++++++++--------
 11 files changed, 402 insertions(+), 352 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
index d60692571d..0fb082115b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.C
@@ -58,12 +58,25 @@ Foam::lduCalculatedProcessorField<Type>::lduCalculatedProcessorField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-bool Foam::lduCalculatedProcessorField<Type>::ready() const
+bool Foam::lduCalculatedProcessorField<Type>::all_ready() const
 {
     return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
+template<class Type>
+bool Foam::lduCalculatedProcessorField<Type>::ready() const
+{
+    const bool ok = UPstream::finishedRequest(recvRequest_);
+    if (ok)
+    {
+        recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
+    }
+    return ok;
+}
+
+
 template<class Type>
 void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
 (
@@ -77,10 +90,11 @@ void Foam::lduCalculatedProcessorField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
-    if (!this->ready())
+    if (!this->all_ready())
     {
         FatalErrorInFunction
-            << "Outstanding request."
+            << "Outstanding request(s) on interface "
+            //<< procInterface_.name()
             << abort(FatalError);
     }
 
@@ -167,12 +181,12 @@ void Foam::lduCalculatedProcessorField<Type>::updateInterfaceMatrix
         return;
     }
 
-    // Require receive data. Update the send request state.
-    // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
-    UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
-    if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
-
+    {
+        // Require receive data.
+        // Only update the send request state.
+        UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
+    }
 
     // Consume straight from receive buffer. Note use of our own
     // helper to avoid using fvPatch addressing
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
index bb2cba44e4..c9af9ec11d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduCalculatedProcessorField/lduCalculatedProcessorField.H
@@ -103,6 +103,9 @@ protected:
             const solveScalarField& vals
         ) const;
 
+        //- Receive and send requests have both completed
+        virtual bool all_ready() const;
+
 
 public:
 
@@ -112,14 +115,13 @@ public:
 
     // Constructors
 
-        //- Construct from patch and internal field
-        lduCalculatedProcessorField
+        //- Construct from ldu interface
+        explicit lduCalculatedProcessorField
         (
             const lduInterface& interface
-            //const Field<Type>&
         );
 
-        //- Construct as copy
+        //- Copy construct
         lduCalculatedProcessorField
         (
             const lduCalculatedProcessorField<Type>&
@@ -132,48 +134,9 @@ public:
 
     // Member Functions
 
-    // Access
-
-        //- Return communicator used for comms
-        virtual label comm() const
-        {
-            return procInterface_.comm();
-        }
-
-        //- Return processor number
-        virtual int myProcNo() const
-        {
-            return procInterface_.myProcNo();
-        }
-
-        //- Return neighbour processor number
-        virtual int neighbProcNo() const
-        {
-            return procInterface_.myProcNo();
-        }
-
-        //- Is the transform required
-        virtual bool doTransform() const
-        {
-            return false;
-        }
-
-        //- Return face transformation tensor
-        virtual const tensorField& forwardT() const
-        {
-            return procInterface_.forwardT();
-        }
-
-        //- Return rank of component for transform
-        virtual int rank() const
-        {
-            return pTraits<Type>::rank;
-        }
-
-
     // Evaluation
 
-        //- Is all data available
+        //- Are all (receive) data available?
         virtual bool ready() const;
 
         //- Initialise neighbour matrix update
@@ -231,6 +194,45 @@ public:
         {
             NotImplemented;
         }
+
+
+    // Processor coupled interface functions
+
+        //- Return communicator used for communication
+        virtual label comm() const
+        {
+            return procInterface_.comm();
+        }
+
+        //- Return processor number
+        virtual int myProcNo() const
+        {
+            return procInterface_.myProcNo();
+        }
+
+        //- Return neighbour processor number
+        virtual int neighbProcNo() const
+        {
+            return procInterface_.myProcNo();
+        }
+
+        //- Is the transform required
+        virtual bool doTransform() const
+        {
+            return false;
+        }
+
+        //- Return face transformation tensor
+        virtual const tensorField& forwardT() const
+        {
+            return procInterface_.forwardT();
+        }
+
+        //- Return rank of component for transform
+        virtual int rank() const
+        {
+            return pTraits<Type>::rank;
+        }
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.C
index 48074e2e3e..3f91831e90 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.C
@@ -136,4 +136,5 @@ Foam::lduPrimitiveProcessorInterface::internalFieldTransfer
     return processorLduInterface::receive<label>(commsType, faceCells_.size());
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H
index 7314557de6..57063c1f2d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduPrimitiveProcessorInterface.H
@@ -58,6 +58,7 @@ class lduPrimitiveProcessorInterface
 {
     // Private Data
 
+        //- Addressing
         const labelList faceCells_;
 
         //- My processor rank in communicator
@@ -76,19 +77,18 @@ class lduPrimitiveProcessorInterface
         const label comm_;
 
 
-    // Private Member Functions
-
-
-        //- No copy assignment
-        void operator=(const lduPrimitiveProcessorInterface&) = delete;
-
-
 public:
 
     //- Runtime type information
     TypeNameNoDebug("processorInterface");
 
 
+    // Generated Methods
+
+        //- No copy assignment
+        void operator=(const lduPrimitiveProcessorInterface&) = delete;
+
+
     // Constructors
 
         //- Construct from components
@@ -164,46 +164,46 @@ public:
             ) const;
 
 
-        // Processor interface functions
+    // Processor interface functions
 
-            //- Return communicator used for sending
-            virtual label comm() const
-            {
-                return comm_;
-            }
+        //- Return communicator used for sending
+        virtual label comm() const
+        {
+            return comm_;
+        }
 
-            //- Return processor number (rank in communicator)
-            virtual int myProcNo() const
-            {
-                return myProcNo_;
-            }
+        //- Return processor number (rank in communicator)
+        virtual int myProcNo() const
+        {
+            return myProcNo_;
+        }
 
-            //- Return neighbour processor number (rank in communicator)
-            virtual int neighbProcNo() const
-            {
-                return neighbProcNo_;
-            }
+        //- Return neighbour processor number (rank in communicator)
+        virtual int neighbProcNo() const
+        {
+            return neighbProcNo_;
+        }
 
-            //- Return face transformation tensor
-            virtual const tensorField& forwardT() const
-            {
-                return forwardT_;
-            }
+        //- Return face transformation tensor
+        virtual const tensorField& forwardT() const
+        {
+            return forwardT_;
+        }
 
-            //- Return message tag used for sending
-            virtual int tag() const
-            {
-                return tag_;
-            }
+        //- Return message tag used for sending
+        virtual int tag() const
+        {
+            return tag_;
+        }
 
 
-        // Edit
+    // Edit
 
-            //- Return message tag used for sending
-            int& tag()
-            {
-                return tag_;
-            }
+        //- Message tag used for sending (modifiable)
+        int& tag()
+        {
+            return tag_;
+        }
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index f61e43e1d7..3eac6cb2d6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -40,9 +40,9 @@ SourceFiles
 #define Foam_lduInterfaceField_H
 
 #include "lduInterface.H"
+#include "lduAddressing.H"
 #include "primitiveFieldsFwd.H"
 #include "Pstream.H"
-#include "lduAddressing.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -100,43 +100,44 @@ public:
 
     // Member Functions
 
-        // Access
+        //- Return the interface
+        const lduInterface& interface() const noexcept
+        {
+            return interface_;
+        }
 
-            //- Return the interface
-            const lduInterface& interface() const noexcept
-            {
-                return interface_;
-            }
+        //- Return the interface type
+        virtual const word& interfaceFieldType() const
+        {
+            return type();
+        }
 
-            //- Return the interface type
-            virtual const word& interfaceFieldType() const
-            {
-                return type();
-            }
+
+    // Coupled Interface
+
+        //- Are all (receive) data available?
+        virtual bool ready() const
+        {
+            return true;
+        }
+
+        //- Whether matrix has been updated
+        bool updatedMatrix() const noexcept
+        {
+            return updatedMatrix_;
+        }
+
+        //- Set matrix as update-to-date, return the previous value
+        bool updatedMatrix(bool flag) const noexcept
+        {
+            bool old(updatedMatrix_);
+            updatedMatrix_ = flag;
+            return old;
+        }
 
 
         // Coupled interface matrix update
 
-            //- Whether matrix has been updated
-            bool updatedMatrix() const noexcept
-            {
-                return updatedMatrix_;
-            }
-
-            //- Set matrix as update-to-date, return the previous value
-            bool updatedMatrix(bool flag) const noexcept
-            {
-                bool old(updatedMatrix_);
-                updatedMatrix_ = flag;
-                return old;
-            }
-
-            //- Is all data available
-            virtual bool ready() const
-            {
-                return true;
-            }
-
             //- Initialise neighbour matrix update.
             //- Add/subtract coupled contributions to matrix
             virtual void initInterfaceMatrixUpdate
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index 70935bcf79..fe31f3761c 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -84,10 +84,10 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
             << " in file " << this->internalField().objectPath()
             << exit(FatalError);
     }
-    if (debug && !ptf.ready())
+    if (debug && !ptf.all_ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name() << " outstanding request."
+            << "Outstanding request(s) on patch " << procPatch_.name()
             << abort(FatalError);
     }
 }
@@ -141,10 +141,10 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
     scalarSendBuf_(std::move(ptf.scalarSendBuf_)),
     scalarRecvBuf_(std::move(ptf.scalarRecvBuf_))
 {
-    if (debug && !ptf.ready())
+    if (debug && !ptf.all_ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name() << " outstanding request."
+            << "Outstanding request(s) on patch " << procPatch_.name()
             << abort(FatalError);
     }
 }
@@ -162,10 +162,10 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
     sendRequest_(-1),
     recvRequest_(-1)
 {
-    if (debug && !ptf.ready())
+    if (debug && !ptf.all_ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name() << " outstanding request."
+            << "Outstanding request(s) on patch " << procPatch_.name()
             << abort(FatalError);
     }
 }
@@ -174,12 +174,25 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-bool Foam::processorFaPatchField<Type>::ready() const
+bool Foam::processorFaPatchField<Type>::all_ready() const
 {
     return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
+template<class Type>
+bool Foam::processorFaPatchField<Type>::ready() const
+{
+    const bool ok = UPstream::finishedRequest(recvRequest_);
+    if (ok)
+    {
+        recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
+    }
+    return ok;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::processorFaPatchField<Type>::patchNeighbourField() const
@@ -187,8 +200,7 @@ Foam::processorFaPatchField<Type>::patchNeighbourField() const
     if (debug && !this->ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name()
-            << " outstanding request."
+            << "Outstanding request on patch " << procPatch_.name()
             << abort(FatalError);
     }
     return *this;
@@ -259,9 +271,8 @@ void Foam::processorFaPatchField<Type>::evaluate
         {
             // Fast path. Received into *this
 
-            // Require receive data. Update the send request state.
-            // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+            // Require receive data.
+            // Only update the send request state.
             UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
             if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
         }
@@ -303,11 +314,10 @@ void Foam::processorFaPatchField<Type>::initInterfaceMatrixUpdate
     if (commsType == UPstream::commsTypes::nonBlocking)
     {
         // Fast path.
-        if (debug && !this->ready())
+        if (debug && !this->all_ready())
         {
             FatalErrorInFunction
-                << "On patch " << procPatch_.name()
-                << " outstanding request."
+                << "Outstanding request(s) on patch " << procPatch_.name()
                 << abort(FatalError);
         }
 
@@ -368,9 +378,8 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
@@ -411,11 +420,10 @@ void Foam::processorFaPatchField<Type>::initInterfaceMatrixUpdate
     if (commsType == UPstream::commsTypes::nonBlocking)
     {
         // Fast path.
-        if (debug && !this->ready())
+        if (debug && !this->all_ready())
         {
             FatalErrorInFunction
-                << "On patch " << procPatch_.name()
-                << " outstanding request."
+                << "Outstanding request(s) on patch " << procPatch_.name()
                 << abort(FatalError);
         }
 
@@ -475,9 +483,8 @@ void Foam::processorFaPatchField<Type>::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
index 9d903ffb67..960b70a224 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
@@ -88,6 +88,12 @@ class processorFaPatchField
             mutable solveScalarField scalarRecvBuf_;
 
 
+    // Private Member Functions
+
+        //- Receive and send requests have both completed
+        virtual bool all_ready() const;
+
+
 public:
 
     //- Runtime type information
@@ -164,33 +170,30 @@ public:
     ~processorFaPatchField() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        // Access
+    // Coupling
 
-            //- Return true if running parallel
-            virtual bool coupled() const
-            {
-                return Pstream::parRun();
-            }
+        //- The patch field is coupled if running in parallel
+        virtual bool coupled() const { return UPstream::parRun(); }
 
-            //- Return neighbour field given internal field
-            tmp<Field<Type>> patchNeighbourField() const;
+        //- Are all (receive) data available?
+        virtual bool ready() const;
+
+        //- Return neighbour field given internal field
+        tmp<Field<Type>> patchNeighbourField() const;
 
 
-        // Evaluation functions
+    // Evaluation
 
-            //- Initialise the evaluation of the patch field
-            virtual void initEvaluate(const Pstream::commsTypes commsType);
+        //- Initialise the evaluation of the patch field
+        virtual void initEvaluate(const Pstream::commsTypes commsType);
 
-            //- Evaluate the patch field
-            virtual void evaluate(const Pstream::commsTypes commsType);
+        //- Evaluate the patch field
+        virtual void evaluate(const Pstream::commsTypes commsType);
 
-            //- Return patch-normal gradient
-            virtual tmp<Field<Type>> snGrad() const;
-
-            //- Is all data available
-            virtual bool ready() const;
+        //- Return patch-normal gradient
+        virtual tmp<Field<Type>> snGrad() const;
 
 
         // Coupled interface functionality
@@ -245,43 +248,44 @@ public:
                 const Pstream::commsTypes commsType
             ) const;
 
-        //- Processor coupled interface functions
 
-            //- Return communicator used for comms
-            virtual label comm() const
-            {
-                return UPstream::worldComm;
-            }
+    // Processor coupled interface functions
 
-            //- Return processor number
-            virtual int myProcNo() const
-            {
-                return procPatch_.myProcNo();
-            }
+        //- Return communicator used for communication
+        virtual label comm() const
+        {
+            return procPatch_.comm();
+        }
 
-            //- Return neighbour processor number
-            virtual int neighbProcNo() const
-            {
-                return procPatch_.neighbProcNo();
-            }
+        //- Return processor number
+        virtual int myProcNo() const
+        {
+            return procPatch_.myProcNo();
+        }
 
-            //- Does the patch field perform the transformation
-            virtual bool doTransform() const
-            {
-                return (pTraits<Type>::rank && !procPatch_.parallel());
-            }
+        //- Return neighbour processor number
+        virtual int neighbProcNo() const
+        {
+            return procPatch_.neighbProcNo();
+        }
 
-            //- Return face transformation tensor
-            virtual const tensorField& forwardT() const
-            {
-                return procPatch_.forwardT();
-            }
+        //- Does the patch field perform the transformation
+        virtual bool doTransform() const
+        {
+            return (pTraits<Type>::rank && !procPatch_.parallel());
+        }
 
-            //- Return rank of component for transform
-            virtual int rank() const
-            {
-                return pTraits<Type>::rank;
-            }
+        //- Return face transformation tensor
+        virtual const tensorField& forwardT() const
+        {
+            return procPatch_.forwardT();
+        }
+
+        //- Return rank of component for transform
+        virtual int rank() const
+        {
+            return pTraits<Type>::rank;
+        }
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
index 25e6ee5a23..6b346a2f9d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.C
@@ -74,12 +74,25 @@ Foam::calculatedProcessorFvPatchField<Type>::calculatedProcessorFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-bool Foam::calculatedProcessorFvPatchField<Type>::ready() const
+bool Foam::calculatedProcessorFvPatchField<Type>::all_ready() const
 {
     return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
+template<class Type>
+bool Foam::calculatedProcessorFvPatchField<Type>::ready() const
+{
+    const bool ok = UPstream::finishedRequest(recvRequest_);
+    if (ok)
+    {
+        recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
+    }
+    return ok;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::calculatedProcessorFvPatchField<Type>::patchNeighbourField() const
@@ -87,10 +100,10 @@ Foam::calculatedProcessorFvPatchField<Type>::patchNeighbourField() const
     if (!this->ready())
     {
         FatalErrorInFunction
-            << "On patch of size " << procInterface_.faceCells().size()
+            << "Outstanding request on patch of size "
+            << procInterface_.faceCells().size()
             << " between proc " << procInterface_.myProcNo()
             << " and " << procInterface_.neighbProcNo()
-            << " outstanding request."
             << abort(FatalError);
     }
     return *this;
@@ -160,9 +173,8 @@ void Foam::calculatedProcessorFvPatchField<Type>::evaluate
 {
     if (UPstream::parRun())
     {
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
@@ -182,11 +194,11 @@ void Foam::calculatedProcessorFvPatchField<Type>::initInterfaceMatrixUpdate
     const Pstream::commsTypes commsType
 ) const
 {
-    if (!this->ready())
+    if (!this->all_ready())
     {
         FatalErrorInFunction
-            << "On patch " //<< interface_.name()
-            << " outstanding request."
+            << "Outstanding request(s) on interface "
+            //<< interface_.name()
             << abort(FatalError);
     }
 
@@ -275,9 +287,8 @@ void Foam::calculatedProcessorFvPatchField<Type>::updateInterfaceMatrix
 
     if (UPstream::parRun())
     {
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
index 7367148a71..ef6807119e 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/calculatedProcessor/calculatedProcessorFvPatchField.H
@@ -68,7 +68,7 @@ class calculatedProcessorFvPatchField
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
          //- Local reference cast into the interface
          const lduPrimitiveProcessorInterface& procInterface_;
@@ -106,6 +106,10 @@ protected:
         ) const;
 
 
+        //- Receive and send requests have both completed
+        virtual bool all_ready() const;
+
+
 public:
 
     //- Runtime type information
@@ -161,73 +165,30 @@ public:
     virtual ~calculatedProcessorFvPatchField() = default;
 
 
-    // Member functions
+    // Member Functions
 
-        // processorLduInterfaceField implementation
+    // Coupling
 
-            //- Return communicator used for comms
-            virtual label comm() const
-            {
-                return procInterface_.comm();
-            }
+        //- The patch field is coupled if running in parallel
+        virtual bool coupled() const { return UPstream::parRun(); }
 
-            //- Return processor number
-            virtual int myProcNo() const
-            {
-                return procInterface_.myProcNo();
-            }
+        //- Are all (receive) data available?
+        virtual bool ready() const;
+
+        //- Return neighbour field of internal field
+        virtual tmp<Field<Type>> patchNeighbourField() const;
 
 
-            //- Return neighbour processor number
-            virtual int neighbProcNo() const
-            {
-                return procInterface_.myProcNo();
-            }
+    // Evaluation
 
-            //- Is the transform required
-            virtual bool doTransform() const
-            {
-                return false;
-            }
+        //- Initialise the evaluation of the patch field
+        virtual void initEvaluate(const Pstream::commsTypes commsType);
 
-            //- Return face transformation tensor
-            virtual const tensorField& forwardT() const
-            {
-                return procInterface_.forwardT();
-            }
-
-            //- Return rank of component for transform
-            virtual int rank() const
-            {
-                return pTraits<Type>::rank;
-            }
+        //- Evaluate the patch field
+        virtual void evaluate(const Pstream::commsTypes commsType);
 
 
-        // Access
-
-            //- Return true if this patch field is coupled.
-            //  Our field supplies coefficients to the fvMatrix so
-            //  should behave as a processorFvPatchField (in
-            //  addBoundarySource it should not add to the source)
-            virtual bool coupled() const
-            {
-                return Pstream::parRun();
-            }
-
-            //- Return neighbour field of internal field
-            virtual tmp<Field<Type>> patchNeighbourField() const;
-
-
-        // Evaluation functions
-
-            //- Is all data available
-            virtual bool ready() const;
-
-            //- Initialise the evaluation of the patch field
-            virtual void initEvaluate(const Pstream::commsTypes commsType);
-
-            //- Evaluate the patch field
-            virtual void evaluate(const Pstream::commsTypes commsType);
+        // Coupled interface functionality
 
             //- Initialise neighbour matrix update
             virtual void initInterfaceMatrixUpdate
@@ -285,8 +246,44 @@ public:
                 NotImplemented;
             }
 
-        //- Write
-        // virtual void write(Ostream& os) const;
+
+    // Processor coupled interface functions
+
+        //- Return communicator used for communication
+        virtual label comm() const
+        {
+            return procInterface_.comm();
+        }
+
+        //- Return processor number
+        virtual int myProcNo() const
+        {
+            return procInterface_.myProcNo();
+        }
+
+        //- Return neighbour processor number
+        virtual int neighbProcNo() const
+        {
+            return procInterface_.myProcNo();
+        }
+
+        //- Is the transform required
+        virtual bool doTransform() const
+        {
+            return false;
+        }
+
+        //- Return face transformation tensor
+        virtual const tensorField& forwardT() const
+        {
+            return procInterface_.forwardT();
+        }
+
+        //- Return rank of component for transform
+        virtual int rank() const
+        {
+            return pTraits<Type>::rank;
+        }
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 3fdec71d96..19da597026 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -118,10 +118,10 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
             << " in file " << this->internalField().objectPath()
             << exit(FatalError);
     }
-    if (debug && !ptf.ready())
+    if (debug && !ptf.all_ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name() << " outstanding request."
+            << "Outstanding request(s) on patch " << procPatch_.name()
             << abort(FatalError);
     }
 }
@@ -143,10 +143,10 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     scalarSendBuf_(std::move(ptf.scalarSendBuf_)),
     scalarRecvBuf_(std::move(ptf.scalarRecvBuf_))
 {
-    if (debug && !ptf.ready())
+    if (debug && !ptf.all_ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name() << " outstanding request."
+            << "Outstanding request(s) on patch " << procPatch_.name()
             << abort(FatalError);
     }
 }
@@ -164,10 +164,10 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     sendRequest_(-1),
     recvRequest_(-1)
 {
-    if (debug && !ptf.ready())
+    if (debug && !ptf.all_ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name() << " outstanding request."
+            << "Outstanding request(s) on patch " << procPatch_.name()
             << abort(FatalError);
     }
 }
@@ -176,12 +176,25 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-bool Foam::processorFvPatchField<Type>::ready() const
+bool Foam::processorFvPatchField<Type>::all_ready() const
 {
     return UPstream::finishedRequestPair(recvRequest_, sendRequest_);
 }
 
 
+template<class Type>
+bool Foam::processorFvPatchField<Type>::ready() const
+{
+    const bool ok = UPstream::finishedRequest(recvRequest_);
+    if (ok)
+    {
+        recvRequest_ = -1;
+        if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
+    }
+    return ok;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::processorFvPatchField<Type>::patchNeighbourField() const
@@ -189,8 +202,7 @@ Foam::processorFvPatchField<Type>::patchNeighbourField() const
     if (debug && !this->ready())
     {
         FatalErrorInFunction
-            << "On patch " << procPatch_.name()
-            << " outstanding request."
+            << "Outstanding request on patch " << procPatch_.name()
             << abort(FatalError);
     }
     return *this;
@@ -209,7 +221,7 @@ void Foam::processorFvPatchField<Type>::initEvaluate
 
         if
         (
-            commsType == Pstream::commsTypes::nonBlocking
+            commsType == UPstream::commsTypes::nonBlocking
          && (std::is_integral<Type>::value || !UPstream::floatTransfer)
         )
         {
@@ -263,15 +275,14 @@ void Foam::processorFvPatchField<Type>::evaluate
     {
         if
         (
-            commsType == Pstream::commsTypes::nonBlocking
+            commsType == UPstream::commsTypes::nonBlocking
          && (std::is_integral<Type>::value || !UPstream::floatTransfer)
         )
         {
             // Fast path: received into *this
 
-            // Require receive data. Update the send request state.
-            // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+            // Require receive data.
+            // Only update the send request state.
             UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
             if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
         }
@@ -324,16 +335,15 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
 
     if
     (
-        commsType == Pstream::commsTypes::nonBlocking
+        commsType == UPstream::commsTypes::nonBlocking
      && !UPstream::floatTransfer
     )
     {
         // Fast path.
-        if (debug && !this->ready())
+        if (debug && !this->all_ready())
         {
             FatalErrorInFunction
-                << "On patch " << procPatch_.name()
-                << " outstanding request."
+                << "Outstanding request(s) on patch " << procPatch_.name()
                 << abort(FatalError);
         }
 
@@ -392,15 +402,14 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
 
     if
     (
-        commsType == Pstream::commsTypes::nonBlocking
+        commsType == UPstream::commsTypes::nonBlocking
      && !UPstream::floatTransfer
     )
     {
         // Fast path: consume straight from receive buffer
 
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
@@ -447,16 +456,15 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
 
     if
     (
-        commsType == Pstream::commsTypes::nonBlocking
+        commsType == UPstream::commsTypes::nonBlocking
      && (std::is_integral<Type>::value || !UPstream::floatTransfer)
     )
     {
         // Fast path.
-        if (debug && !this->ready())
+        if (debug && !this->all_ready())
         {
             FatalErrorInFunction
-                << "On patch " << procPatch_.name()
-                << " outstanding request."
+                << "Outstanding request(s) on patch " << procPatch_.name()
                 << abort(FatalError);
         }
 
@@ -514,15 +522,14 @@ void Foam::processorFvPatchField<Type>::updateInterfaceMatrix
 
     if
     (
-        commsType == Pstream::commsTypes::nonBlocking
+        commsType == UPstream::commsTypes::nonBlocking
      && (std::is_integral<Type>::value || !UPstream::floatTransfer)
     )
     {
         // Fast path: consume straight from receive buffer
 
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 48e2f092ba..7c83568c3d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -96,6 +96,12 @@ class processorFvPatchField
             mutable solveScalarField scalarRecvBuf_;
 
 
+    // Private Member Functions
+
+        //- Receive and send requests have both completed
+        virtual bool all_ready() const;
+
+
 public:
 
     //- Runtime type information
@@ -174,34 +180,34 @@ public:
 
     // Member Functions
 
-        // Access
+    // Coupling
 
-            //- Return true if running parallel
-            virtual bool coupled() const
-            {
-                return Pstream::parRun();
-            }
+        //- The patch field is coupled if running in parallel
+        virtual bool coupled() const { return UPstream::parRun(); }
 
-            //- Return neighbour field given internal field
-            virtual tmp<Field<Type>> patchNeighbourField() const;
+        //- Are all (receive) data available?
+        virtual bool ready() const;
+
+        //- Return neighbour field given internal field
+        virtual tmp<Field<Type>> patchNeighbourField() const;
 
 
-        // Evaluation functions
+    // Evaluation
 
-            //- Initialise the evaluation of the patch field
-            virtual void initEvaluate(const Pstream::commsTypes commsType);
+        //- Initialise the evaluation of the patch field
+        virtual void initEvaluate(const Pstream::commsTypes commsType);
 
-            //- Evaluate the patch field
-            virtual void evaluate(const Pstream::commsTypes commsType);
+        //- Evaluate the patch field
+        virtual void evaluate(const Pstream::commsTypes commsType);
 
-            //- Return patch-normal gradient
-            virtual tmp<Field<Type>> snGrad
-            (
-                const scalarField& deltaCoeffs
-            ) const;
+        //- Return patch-normal gradient
+        virtual tmp<Field<Type>> snGrad
+        (
+            const scalarField& deltaCoeffs
+        ) const;
 
-            //- Is all data available
-            virtual bool ready() const;
+
+        // Coupled interface functionality
 
             //- Initialise neighbour matrix update
             virtual void initInterfaceMatrixUpdate
@@ -254,43 +260,43 @@ public:
             ) const;
 
 
-        //- Processor coupled interface functions
+    // Processor coupled interface functions
 
-            //- Return communicator used for comms
-            virtual label comm() const
-            {
-                return procPatch_.comm();
-            }
+        //- Return communicator used for communication
+        virtual label comm() const
+        {
+            return procPatch_.comm();
+        }
 
-            //- Return processor number
-            virtual int myProcNo() const
-            {
-                return procPatch_.myProcNo();
-            }
+        //- Return processor number
+        virtual int myProcNo() const
+        {
+            return procPatch_.myProcNo();
+        }
 
-            //- Return neighbour processor number
-            virtual int neighbProcNo() const
-            {
-                return procPatch_.neighbProcNo();
-            }
+        //- Return neighbour processor number
+        virtual int neighbProcNo() const
+        {
+            return procPatch_.neighbProcNo();
+        }
 
-            //- Does the patch field perform the transformation
-            virtual bool doTransform() const
-            {
-                return (pTraits<Type>::rank && !procPatch_.parallel());
-            }
+        //- Does the patch field perform the transformation
+        virtual bool doTransform() const
+        {
+            return (pTraits<Type>::rank && !procPatch_.parallel());
+        }
 
-            //- Return face transformation tensor
-            virtual const tensorField& forwardT() const
-            {
-                return procPatch_.forwardT();
-            }
+        //- Return face transformation tensor
+        virtual const tensorField& forwardT() const
+        {
+            return procPatch_.forwardT();
+        }
 
-            //- Return rank of component for transform
-            virtual int rank() const
-            {
-                return pTraits<Type>::rank;
-            }
+        //- Return rank of component for transform
+        virtual int rank() const
+        {
+            return pTraits<Type>::rank;
+        }
 };
 
 

From bddda09a08df4f4b296b9c8060a59579fc8d26fd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 17:41:47 +0200
Subject: [PATCH 209/348] ENH: earlier exit from interface polling in
 updateMatrixInterfaces

- exit the wait-some polling loop when no interfaces are left
  to be updated
---
 .../LduMatrixUpdateMatrixInterfaces.C         | 42 ++++++++++-----
 .../lduMatrixUpdateMatrixInterfaces.C         | 51 +++++++++++++------
 2 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index 5376a1947b..2bf5f533fe 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -128,28 +128,42 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
         // without waiting for all requests.
 
         DynamicList<int> indices;  // (work array)
-        while
+
+        for
         (
-            UPstream::nPollProcInterfaces < 0
-         && UPstream::waitSomeRequests(startRequest, &indices)
+            bool pollingActive = (UPstream::nPollProcInterfaces < 0);
+            (
+                pollingActive
+             && UPstream::waitSomeRequests(startRequest, &indices)
+            );
+            /*nil*/
         )
         {
+            pollingActive = false;
+
             forAll(interfaces_, interfacei)
             {
                 auto* intf = interfaces_.get(interfacei);
 
-                if (intf && !intf->updatedMatrix() && intf->ready())
+                if (intf && !intf->updatedMatrix())
                 {
-                    intf->updateInterfaceMatrix
-                    (
-                        result,
-                        add,
-                        lduMesh_.lduAddr(),
-                        interfacei,
-                        psiif,
-                        interfaceCoeffs[interfacei],
-                        commsType
-                    );
+                    if (intf->ready())
+                    {
+                        intf->updateInterfaceMatrix
+                        (
+                            result,
+                            add,
+                            lduMesh_.lduAddr(),
+                            interfacei,
+                            psiif,
+                            interfaceCoeffs[interfacei],
+                            commsType
+                        );
+                    }
+                    else
+                    {
+                        pollingActive = true;
+                    }
                 }
             }
         }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 1d20ed7023..17fbdc6043 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -131,29 +131,50 @@ void Foam::lduMatrix::updateMatrixInterfaces
         // without waiting for all requests.
 
         DynamicList<int> indices;  // (work array)
-        while
+
+        // const label maxPolling =
+        // (
+        //     (UPstream::nPollProcInterfaces < 0)
+        //   ? (UPstream::nRequests() - startRequest)
+        //   : UPstream::nPollProcInterfaces
+        // );
+
+        for
         (
-            UPstream::nPollProcInterfaces < 0
-         && UPstream::waitSomeRequests(startRequest, &indices)
+            bool pollingActive = (UPstream::nPollProcInterfaces < 0);
+            (
+                pollingActive
+             && UPstream::waitSomeRequests(startRequest, &indices)
+            );
+            /*nil*/
         )
         {
+            pollingActive = false;
+
             forAll(interfaces, interfacei)
             {
                 auto* intf = interfaces.get(interfacei);
 
-                if (intf && !intf->updatedMatrix() && intf->ready())
+                if (intf && !intf->updatedMatrix())
                 {
-                    intf->updateInterfaceMatrix
-                    (
-                        result,
-                        add,
-                        mesh().lduAddr(),
-                        interfacei,
-                        psiif,
-                        coupleCoeffs[interfacei],
-                        cmpt,
-                        commsType
-                    );
+                    if (intf->ready())
+                    {
+                        intf->updateInterfaceMatrix
+                        (
+                            result,
+                            add,
+                            mesh().lduAddr(),
+                            interfacei,
+                            psiif,
+                            coupleCoeffs[interfacei],
+                            cmpt,
+                            commsType
+                        );
+                    }
+                    else
+                    {
+                        pollingActive = true;
+                    }
                 }
             }
         }

From 16591012e90cd55c98c2da9fd427157c96e17ca5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 18:15:00 +0200
Subject: [PATCH 210/348] ENH: add -verbose option to surface conversion,
 cleanup

- by default, reduce the amount of output

ENH: support default text description for -verbose option

- simplifies use in more places.
---
 .../test/foamToEnsight-check/foamToEnsight-check.C    |  2 +-
 .../miscellaneous/foamHasLibrary/foamHasLibrary.C     |  5 +----
 .../foamRestoreFields/foamRestoreFields.C             |  5 +----
 .../parallelProcessing/decomposePar/decomposePar.C    |  2 +-
 .../reconstructPar/reconstructPar.C                   |  2 +-
 .../reconstructParMesh/reconstructParMesh.C           |  2 +-
 .../redistributePar/redistributePar.C                 |  2 +-
 .../dataConversion/foamToEnsight/foamToEnsight.C      |  2 +-
 .../dataConversion/foamToVTK/foamToVTK.C              |  2 +-
 .../lagrangian/particleTracks/particleTracks.C        |  2 +-
 .../steadyParticleTracks/steadyParticleTracks.C       |  2 +-
 .../lumped/lumpedPointZones/lumpedPointZones.C        |  5 +----
 .../smoothSurfaceData/smoothSurfaceData.C             |  2 +-
 .../utilities/surface/surfaceAdd/surfaceAdd.C         |  6 ++++--
 .../utilities/surface/surfaceCheck/surfaceCheck.C     |  5 +----
 .../utilities/surface/surfaceClean/surfaceClean.C     |  7 +++++--
 .../utilities/surface/surfaceConvert/surfaceConvert.C |  7 +++++--
 .../surface/surfaceMeshConvert/surfaceMeshConvert.C   |  8 +++++---
 .../surface/surfaceMeshExport/surfaceMeshExport.C     |  7 +++++--
 .../surface/surfaceMeshImport/surfaceMeshImport.C     |  7 +++++--
 src/OpenFOAM/global/argList/argList.C                 | 11 +++++++++--
 src/OpenFOAM/global/argList/argList.H                 |  4 ++--
 22 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/applications/test/foamToEnsight-check/foamToEnsight-check.C b/applications/test/foamToEnsight-check/foamToEnsight-check.C
index 8759fcf8db..18b0dbb131 100644
--- a/applications/test/foamToEnsight-check/foamToEnsight-check.C
+++ b/applications/test/foamToEnsight-check/foamToEnsight-check.C
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
 
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
 
     #include "addAllRegionOptions.H"
 
diff --git a/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C b/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C
index 523f892b3d..371cc46d6a 100644
--- a/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C
+++ b/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C
@@ -78,10 +78,7 @@ int main(int argc, char *argv[])
         "detail",
         "Additional detail"
     );
-    argList::addVerboseOption
-    (
-        "Additional verbosity"
-    );
+    argList::addVerboseOption();
 
     argList::addArgument("lib...");
     argList::noMandatoryArgs();  // Arguments are optional
diff --git a/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C b/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C
index 124b549f79..862329b6cd 100644
--- a/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C
+++ b/applications/utilities/miscellaneous/foamRestoreFields/foamRestoreFields.C
@@ -235,10 +235,7 @@ int main(int argc, char *argv[])
     (
         "Report action without moving/renaming"
     );
-    argList::addVerboseOption
-    (
-        "Additional verbosity"
-    );
+    argList::addVerboseOption();
 
     // Arguments are optional (non-mandatory)
     argList::noMandatoryArgs();
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 8916b01f6f..bd77c4096c 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
         "Test without writing the decomposition. "
         "Changes -cellDist to only write VTK output."
     );
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
     argList::addOption
     (
         "domains",
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 2ab54d02bd..bae8f635a5 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 
     #include "addAllRegionOptions.H"
 
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
     argList::addOption
     (
         "fields",
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 4f87ea6d94..feb14f0c40 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -594,7 +594,7 @@ int main(int argc, char *argv[])
 
     argList::noParallel();
 
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
     argList::addBoolOption
     (
         "addressing-only",
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index c29210a46f..b1ee6a5d71 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -1020,7 +1020,7 @@ int main(int argc, char *argv[])
     #include "addOverwriteOption.H"
     argList::addBoolOption("decompose", "Decompose case");
     argList::addBoolOption("reconstruct", "Reconstruct case");
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
     argList::addDryRunOption
     (
         "Test without writing the decomposition. "
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index f666628618..6f0cdc0dfc 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
 
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
 
     #include "addAllRegionOptions.H"
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 0e0b1b4f67..779d0de545 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
 
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
 
     argList::addBoolOption
     (
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 9d38c16dcc..6270c10a84 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
         "The writer format "
         "(default: vtk or 'setFormat' from dictionary)"
     );
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 26af769a45..ba7aa1c56f 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
         "file",
         "Alternative particleTrackDict dictionary"
     );
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
index d5cc691d79..09088046b3 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointZones/lumpedPointZones.C
@@ -72,10 +72,7 @@ int main(int argc, char *argv[])
         "Suppress calculation/display of point interpolators"
     );
 
-    argList::addVerboseOption
-    (
-        "Additional verbosity"
-    );
+    argList::addVerboseOption();
 
     #include "addRegionOption.H"
     #include "setRootCase.H"
diff --git a/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C b/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C
index 7ca090ed43..2e615ee8d8 100644
--- a/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C
+++ b/applications/utilities/preProcessing/smoothSurfaceData/smoothSurfaceData.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     );
 
     argList::noCheckProcessorDirectories();
-    argList::addVerboseOption("Additional verbosity");
+    argList::addVerboseOption();
 
     argList::addArgument("input", "The input surface file");
 
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 0db4feefd1..be8a3dd413 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,6 +80,7 @@ int main(int argc, char *argv[])
         "factor",
         "Geometry scaling factor on input surfaces"
     );
+    argList::addVerboseOption();
 
     argList args(argc, argv);
 
@@ -87,6 +88,7 @@ int main(int argc, char *argv[])
     const auto inFileName2 = args.get<fileName>(2);
     const auto outFileName = args.get<fileName>(3);
 
+    const int  optVerbose   = args.verbose();
     const bool addPoint     = args.found("points");
     const bool mergeRegions = args.found("mergeRegions");
 
@@ -284,7 +286,7 @@ int main(int argc, char *argv[])
     }
 
     // Merge all common points and do some checks
-    combinedSurf.cleanup(true);
+    combinedSurf.cleanup(optVerbose);
 
     Info<< "Merged surface:" << endl;
 
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 278b84825a..fd6e5dbbca 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -308,10 +308,7 @@ int main(int argc, char *argv[])
         "Split surface along non-manifold edges "
         "(default split is fully disconnected)"
     );
-    argList::addVerboseOption
-    (
-        "Additional verbosity"
-    );
+    argList::addVerboseOption();
     argList::addBoolOption
     (
         "blockMesh",
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index f1e6264231..8af8a1780c 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
         "Suppress surface checking/cleanup on the input surface"
     );
     argList::addOptionCompat("no-clean", {"noClean", -2006});
+    argList::addVerboseOption();
 
     argList::addOption
     (
@@ -87,6 +88,8 @@ int main(int argc, char *argv[])
     const auto minQuality = args.get<scalar>(3);
     const auto outFileName = args.get<fileName>(4);
 
+    const int optVerbose = args.verbose();
+
     Info<< "Reading surface " << inFileName << nl
         << "Collapsing all triangles with" << nl
         << "    edges or heights < " << minLen << nl
@@ -106,7 +109,7 @@ int main(int argc, char *argv[])
     if (!args.found("no-clean"))
     {
         Info<< "Removing duplicate and illegal triangles ..." << nl << endl;
-        surf.cleanup(true);
+        surf.cleanup(optVerbose);
     }
 
     Info<< "Collapsing triangles to edges ..." << nl << endl;
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index e9851a432f..58ccc167fb 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -144,6 +144,7 @@ int main(int argc, char *argv[])
         "The output precision"
     );
     argList::addOptionCompat("precision", {"writePrecision", 1812});
+    argList::addVerboseOption();
 
     argList args(argc, argv);
 
@@ -161,6 +162,8 @@ int main(int argc, char *argv[])
     const auto importName = args.get<fileName>(1);
     const auto exportName = args.get<fileName>(2);
 
+    const int optVerbose  = args.verbose();
+
     if (importName == exportName)
     {
         FatalError
@@ -207,7 +210,7 @@ int main(int argc, char *argv[])
     if (args.found("clean"))
     {
         Info<< "Cleaning up surface" << endl;
-        surf.cleanup(true);
+        surf.cleanup(optVerbose);
 
         Info<< "After cleaning up surface:" << endl;
         surf.writeStats(Info);
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 3b81e3545a..4466825513 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -127,6 +127,7 @@ int main(int argc, char *argv[])
         "clean",
         "Perform some surface checking/cleanup on the input surface"
     );
+    argList::addVerboseOption();
     argList::addOption
     (
         "read-format",
@@ -177,13 +178,14 @@ int main(int argc, char *argv[])
         "Triangulate surface"
     );
 
-
     argList args(argc, argv);
     Time runTime(args.rootPath(), args.caseName());
 
     const auto importName = args.get<fileName>(1);
     const auto exportName = args.get<fileName>(2);
 
+    const int optVerbose  = args.verbose();
+
     if (importName == exportName)
     {
         FatalError
@@ -298,7 +300,7 @@ int main(int argc, char *argv[])
 
         if (args.found("clean"))
         {
-            surf.cleanup(true);
+            surf.cleanup(optVerbose);
         }
 
         if (fromCsys)
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 260ae19217..57310daedb 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -105,6 +105,7 @@ int main(int argc, char *argv[])
         "clean",
         "Perform some surface checking/cleanup on the input surface"
     );
+    argList::addVerboseOption();
     argList::addOption
     (
         "name",
@@ -157,6 +158,8 @@ int main(int argc, char *argv[])
     const auto exportName = args.get<fileName>(1);
     const auto importName = args.getOrDefault<word>("name", "default");
 
+    const int optVerbose  = args.verbose();
+
     const word writeFileType
     (
         args.getOrDefault<word>("write-format", getExtension(exportName))
@@ -273,7 +276,7 @@ int main(int argc, char *argv[])
 
     if (args.found("clean"))
     {
-        surf.cleanup(true);
+        surf.cleanup(optVerbose);
     }
 
     if (fromCsys)
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 03cb91a96e..8ebae3ebfe 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -105,6 +105,7 @@ int main(int argc, char *argv[])
         "clean",
         "Perform some surface checking/cleanup on the input surface"
     );
+    argList::addVerboseOption();
     argList::addOption
     (
         "name",
@@ -169,6 +170,8 @@ int main(int argc, char *argv[])
     const auto importName = args.get<fileName>(1);
     const auto exportName = args.getOrDefault<word>("name", "default");
 
+    const int optVerbose  = args.verbose();
+
     const word readFileType
     (
         args.getOrDefault<word>("read-format", getExtension(importName))
@@ -268,7 +271,7 @@ int main(int argc, char *argv[])
 
     if (args.found("clean"))
     {
-        surf.cleanup(true);
+        surf.cleanup(optVerbose);
     }
 
     if (fromCsys)
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index c8d2a498ee..81e4d0403f 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -514,7 +514,14 @@ void Foam::argList::addVerboseOption
     bool advanced
 )
 {
-    argList::addBoolOption("verbose", usage, advanced);
+    if (usage.empty())
+    {
+        argList::addBoolOption("verbose", "Additional verbosity", advanced);
+    }
+    else
+    {
+        argList::addBoolOption("verbose", usage, advanced);
+    }
 }
 
 
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index ebc3bf836a..8a101e8781 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -628,7 +628,7 @@ public:
         //- Enable a 'verbose' bool option, with usage information
         static void addVerboseOption
         (
-            const string& usage,  //! usage information (expected)
+            const string& usage = "", //! usage information (optional)
             bool advanced = false
         );
 

From 8e32db2b5f076f1ea9aaba0b5029cab74fe019dc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 May 2023 13:34:24 +0200
Subject: [PATCH 211/348] STYLE: more explicit use of REGISTER when storing
 fields

ENH: add phaseScopedName convenience method

- unites IOobject::scopedName + phasePropertyName
---
 .../generation/snappyHexMesh/snappyHexMesh.C  |  3 +-
 .../surfaceRedistributePar.C                  |  3 +-
 .../expressions/base/fvExprDriver.C           |  4 ++-
 .../LimitedScheme/LimitedScheme.C             | 32 ++++++++---------
 .../field/CourantNo/CourantNo.C               | 23 ++++++-------
 .../field/DESModelRegions/DESModelRegions.C   |  3 +-
 .../field/blendingFactor/blendingFactor.C     |  3 +-
 .../field/ddt2/ddt2Templates.C                |  3 +-
 .../fieldAverage/fieldAverageTemplates.C      |  3 +-
 .../heatTransferCoeff/heatTransferCoeff.C     |  3 +-
 .../multiphaseInterHtcModel.C                 |  3 +-
 .../reactingEulerHtcModel.C                   |  3 +-
 .../field/momentumError/momentumError.C       |  6 ++--
 src/functionObjects/field/pressure/pressure.C |  3 +-
 .../field/processorField/processorField.C     | 12 ++++---
 .../stabilityBlendingFactor.C                 |  9 ++---
 .../field/streamFunction/streamFunction.C     |  7 ++--
 .../field/surfaceDistance/surfaceDistance.C   |  7 ++--
 .../field/wallHeatFlux/wallHeatFlux.C         |  3 +-
 .../field/wallShearStress/wallShearStress.C   |  3 +-
 src/functionObjects/field/yPlus/yPlus.C       |  3 +-
 .../zeroGradient/zeroGradientTemplates.C      |  3 +-
 .../hydrostaticPressure/hydrostaticPressure.C |  3 +-
 .../electricPotential/electricPotential.C     |  3 +-
 .../solvers/energyTransport/energyTransport.C |  3 +-
 .../solvers/scalarTransport/scalarTransport.C |  3 +-
 .../utilities/solverInfo/solverInfo.C         |  4 ++-
 .../HeatTransferCoeff/HeatTransferCoeff.C     | 10 +++---
 .../KinematicReynoldsNumber.C                 | 10 +++---
 .../NusseltNumber/NusseltNumber.C             | 10 +++---
 .../ParticleDose/ParticleDose.C               | 10 +++---
 .../ThermoReynoldsNumber.C                    | 10 +++---
 .../WeberNumber/WeberNumberReacting.C         | 10 +++---
 .../ParticleForces/Interface/InterfaceForce.C | 27 +++++++--------
 .../ParticleForces/Lift/LiftForce/LiftForce.C | 22 +++++-------
 .../PressureGradient/PressureGradientForce.C  | 24 ++++++-------
 ...edPointDisplacementPointPatchVectorField.C | 12 +++----
 .../mappedPatchBaseTemplates.C                | 12 ++++---
 .../regionModel/regionModel/regionModel.C     | 25 ++++++++------
 .../basic/basicThermo/basicThermo.H           | 34 +++++++++++++------
 .../BilgerMixtureFraction.C                   | 14 ++++----
 41 files changed, 211 insertions(+), 177 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index ed93bc7f4e..250ddc086a 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -899,7 +899,8 @@ int main(int argc, char *argv[])
                     runTime.system(),
                     runTime,
                     IOobject::MUST_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 args.getOrDefault<fileName>("decomposeParDict", "")
             )
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index d5d887d973..80f3bf8b18 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -171,7 +171,8 @@ int main(int argc, char *argv[])
                     runTime.system(),
                     runTime,
                     IOobject::MUST_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 args.getOrDefault<fileName>("decomposeParDict", "")
             )
diff --git a/src/finiteVolume/expressions/base/fvExprDriver.C b/src/finiteVolume/expressions/base/fvExprDriver.C
index 13ccbdfc03..0e9a3a7935 100644
--- a/src/finiteVolume/expressions/base/fvExprDriver.C
+++ b/src/finiteVolume/expressions/base/fvExprDriver.C
@@ -537,7 +537,9 @@ Foam::expressions::fvExprDriver::regionMesh
                 regionName,
                 mesh.time().constant(),
                 mesh.time(),
-                IOobject::MUST_READ
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             )
         );
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 266e061da1..aed48475eb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -151,30 +151,28 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
 
     if (this->mesh().cache("limiter"))
     {
-        if (!mesh.foundObject<surfaceScalarField>(limiterFieldName))
+        auto* fldptr = mesh.getObjectPtr<surfaceScalarField>(limiterFieldName);
+
+        if (!fldptr)
         {
-            surfaceScalarField* limiterField
+            fldptr = new surfaceScalarField
             (
-                new surfaceScalarField
+                IOobject
                 (
-                    IOobject
-                    (
-                        limiterFieldName,
-                        mesh.time().timeName(),
-                        mesh,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
+                    limiterFieldName,
+                    mesh.time().timeName(),
                     mesh,
-                    dimless
-                )
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
+                ),
+                mesh,
+                dimless
             );
 
-            mesh.objectRegistry::store(limiterField);
+            mesh.objectRegistry::store(fldptr);
         }
-
-        surfaceScalarField& limiterField =
-            mesh.lookupObjectRef<surfaceScalarField>(limiterFieldName);
+        auto& limiterField = *fldptr;
 
         calcLimiter(phi, limiterField);
 
diff --git a/src/functionObjects/field/CourantNo/CourantNo.C b/src/functionObjects/field/CourantNo/CourantNo.C
index 55ff252fb3..98aeb51a9c 100644
--- a/src/functionObjects/field/CourantNo/CourantNo.C
+++ b/src/functionObjects/field/CourantNo/CourantNo.C
@@ -78,17 +78,11 @@ bool Foam::functionObjects::CourantNo::calc()
             )
         );
 
-        if (foundObject<volScalarField>(resultName_, false))
-        {
-            volScalarField& Co =
-                lookupObjectRef<volScalarField>(resultName_);
+        auto* resultPtr = getObjectPtr<volScalarField>(resultName_);
 
-            Co.ref() = Coi();
-            Co.correctBoundaryConditions();
-        }
-        else
+        if (!resultPtr)
         {
-            auto tCo = tmp<volScalarField>::New
+            resultPtr = new volScalarField
             (
                 IOobject
                 (
@@ -96,16 +90,19 @@ bool Foam::functionObjects::CourantNo::calc()
                     mesh_.time().timeName(),
                     mesh_,
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 mesh_,
                 dimensionedScalar(dimless, Zero),
                 fvPatchFieldBase::zeroGradientType()
             );
-            tCo.ref().ref() = Coi();
-            tCo.ref().correctBoundaryConditions();
-            mesh_.objectRegistry::store(tCo.ptr());
+            mesh_.objectRegistry::store(resultPtr);
         }
+        auto& Co = *resultPtr;
+
+        Co.internalFieldRef() = Coi;
+        Co.correctBoundaryConditions();
 
         return true;
     }
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.C b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
index 07bc912eda..ce2e343942 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.C
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
@@ -80,7 +80,8 @@ Foam::functionObjects::DESModelRegions::DESModelRegions
             time_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         ),
         mesh_,
         dimensionedScalar(dimless, Zero)
diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C
index 81e0cc2307..aa93aa646b 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactor.C
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.C
@@ -92,7 +92,8 @@ Foam::functionObjects::blendingFactor::blendingFactor
             time_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
diff --git a/src/functionObjects/field/ddt2/ddt2Templates.C b/src/functionObjects/field/ddt2/ddt2Templates.C
index 187c0e4d24..e90f9c025c 100644
--- a/src/functionObjects/field/ddt2/ddt2Templates.C
+++ b/src/functionObjects/field/ddt2/ddt2Templates.C
@@ -66,7 +66,8 @@ int Foam::functionObjects::ddt2::apply(const word& inputName, int& state)
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dims, Zero)
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
index 95fc5bcc1d..9b612df9a8 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
@@ -143,7 +143,8 @@ void Foam::functionObjects::fieldAverage::restoreWindowFieldsType
             obr().time().timeName(obr().time().startTime().value()),
             obr(),
             IOobject::MUST_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         );
 
         if (io.typeHeaderOk<Type>(true))
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C
index dbc80d2ec7..5c33fcdc62 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C
@@ -82,7 +82,8 @@ Foam::functionObjects::heatTransferCoeff::heatTransferCoeff
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimPower/dimArea/dimTemperature, Zero)
diff --git a/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C b/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C
index 0c76e09930..0dc05eede6 100644
--- a/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C
+++ b/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C
@@ -138,7 +138,8 @@ Foam::functionObjects::multiphaseInterHtcModel::multiphaseInterHtcModel
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimPower/dimArea/dimTemperature, Zero)
diff --git a/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C b/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C
index 9b4267bf42..a4ebe4b2df 100644
--- a/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C
+++ b/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C
@@ -147,7 +147,8 @@ Foam::functionObjects::reactingEulerHtcModel::reactingEulerHtcModel
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimPower/dimArea/dimTemperature, Zero)
diff --git a/src/functionObjects/field/momentumError/momentumError.C b/src/functionObjects/field/momentumError/momentumError.C
index 4eceecaefc..6bbc1068fc 100644
--- a/src/functionObjects/field/momentumError/momentumError.C
+++ b/src/functionObjects/field/momentumError/momentumError.C
@@ -173,7 +173,8 @@ Foam::functionObjects::momentumError::momentumError
                 subMesh.time().timeName(),
                 subMesh,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             subMesh,
             dimensionedVector(momDims)
@@ -192,7 +193,8 @@ Foam::functionObjects::momentumError::momentumError
             time_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         ),
         mesh_,
         dimensionedVector(momDims)
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index 22861c8052..9b67f4c7ec 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -332,7 +332,8 @@ bool Foam::functionObjects::pressure::calc()
                 p.mesh().time().timeName(),
                 p.mesh(),
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             coeff(calcPressure(p, rhoScale(p)))
         );
diff --git a/src/functionObjects/field/processorField/processorField.C b/src/functionObjects/field/processorField/processorField.C
index 54abba4ed4..652001af0a 100644
--- a/src/functionObjects/field/processorField/processorField.C
+++ b/src/functionObjects/field/processorField/processorField.C
@@ -65,10 +65,11 @@ Foam::functionObjects::processorField::processorField
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
-            dimensionedScalar(dimless, Pstream::myProcNo())
+            dimensionedScalar(dimless, UPstream::myProcNo())
         )
     );
 
@@ -92,7 +93,7 @@ bool Foam::functionObjects::processorField::execute()
         mesh_.lookupObjectRef<volScalarField>("processorID");
 
     procField ==
-        dimensionedScalar("proci", dimless, Pstream::myProcNo());
+        dimensionedScalar("proci", dimless, UPstream::myProcNo());
 
     return true;
 }
@@ -123,10 +124,11 @@ void Foam::functionObjects::processorField::updateMesh(const mapPolyMesh& mpm)
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
-            dimensionedScalar(dimless, Pstream::myProcNo())
+            dimensionedScalar(dimless, UPstream::myProcNo())
         )
     );
 
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 63c976e07e..ef07ad51de 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -541,7 +541,8 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
             time_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         ),
         mesh_,
         dimensionedScalar(dimless, Zero)
@@ -565,7 +566,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
 
         if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
         {
-            volScalarField* vfPtr = new volScalarField(fieldHeader, mesh_);
+            auto* vfPtr = new volScalarField(fieldHeader, mesh_);
             mesh_.objectRegistry::store(vfPtr);
         }
         else
@@ -595,7 +596,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
 
         if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
         {
-            volScalarField* vfPtr = new volScalarField(fieldHeader, mesh_);
+            auto* vfPtr = new volScalarField(fieldHeader, mesh_);
             mesh_.objectRegistry::store(vfPtr);
         }
         else
@@ -623,7 +624,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
 
         if (fieldHeader.typeHeaderOk<volScalarField>(true, true, false))
         {
-            volScalarField* vfPtr(new volScalarField(fieldHeader, mesh_));
+            auto* vfPtr = new volScalarField(fieldHeader, mesh_);
             mesh_.objectRegistry::store(vfPtr);
         }
         else
diff --git a/src/functionObjects/field/streamFunction/streamFunction.C b/src/functionObjects/field/streamFunction/streamFunction.C
index 9bcd7a68ea..3329d20131 100644
--- a/src/functionObjects/field/streamFunction/streamFunction.C
+++ b/src/functionObjects/field/streamFunction/streamFunction.C
@@ -404,10 +404,11 @@ Foam::tmp<Foam::pointScalarField> Foam::functionObjects::streamFunction::calc
 
 bool Foam::functionObjects::streamFunction::calc()
 {
-    if (foundObject<surfaceScalarField>(fieldName_))
+    const auto* phiPtr = findObject<surfaceScalarField>(fieldName_);
+
+    if (phiPtr)
     {
-        const surfaceScalarField& phi =
-            mesh_.lookupObject<surfaceScalarField>(fieldName_);
+        const surfaceScalarField& phi = *phiPtr;
 
         return store(resultName_, calc(phi));
     }
diff --git a/src/functionObjects/field/surfaceDistance/surfaceDistance.C b/src/functionObjects/field/surfaceDistance/surfaceDistance.C
index 0a2e3133e8..682c30ae5b 100644
--- a/src/functionObjects/field/surfaceDistance/surfaceDistance.C
+++ b/src/functionObjects/field/surfaceDistance/surfaceDistance.C
@@ -53,7 +53,7 @@ Foam::functionObjects::surfaceDistance::surfaceDistance
 {
     read(dict);
 
-    volScalarField* procFieldPtr
+    volScalarField* distPtr
     (
         new volScalarField
         (
@@ -63,14 +63,15 @@ Foam::functionObjects::surfaceDistance::surfaceDistance
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimLength, Zero)
         )
     );
 
-    mesh_.objectRegistry::store(procFieldPtr);
+    mesh_.objectRegistry::store(distPtr);
 }
 
 
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
index c8e5ed9b86..ca638e238f 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
@@ -119,7 +119,8 @@ Foam::functionObjects::wallHeatFlux::wallHeatFlux
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimMass/pow3(dimTime), Zero)
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index 8f9ee5b751..43feefd219 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -106,7 +106,8 @@ Foam::functionObjects::wallShearStress::wallShearStress
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedVector(sqr(dimLength)/sqr(dimTime), Zero)
diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C
index b17622fa7f..68365a610e 100644
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@@ -87,7 +87,8 @@ Foam::functionObjects::yPlus::yPlus
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
diff --git a/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C b/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C
index 75505f24fe..0894b199d5 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradientTemplates.C
@@ -92,7 +92,8 @@ int Foam::functionObjects::zeroGradient::apply
                 time_.timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensioned<Type>(input.dimensions(), Zero),
diff --git a/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.C b/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.C
index 53b3870081..9bc7e256f0 100644
--- a/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.C
+++ b/src/functionObjects/initialisation/hydrostaticPressure/hydrostaticPressure.C
@@ -191,7 +191,8 @@ Foam::functionObjects::hydrostaticPressure::hydrostaticPressure
                     runTime.timeName(),
                     mesh_,
                     IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE // To enable restart
+                    IOobject::AUTO_WRITE,  // To enable restart
+                    IOobject::REGISTER
                 ),
                 mesh_
             );
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index c13f858e35..1a1f20118d 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -57,7 +57,8 @@ Foam::functionObjects::electricPotential::operandField()
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/functionObjects/solvers/energyTransport/energyTransport.C b/src/functionObjects/solvers/energyTransport/energyTransport.C
index 4df38d094a..255fce3636 100644
--- a/src/functionObjects/solvers/energyTransport/energyTransport.C
+++ b/src/functionObjects/solvers/energyTransport/energyTransport.C
@@ -67,7 +67,8 @@ Foam::volScalarField& Foam::functionObjects::energyTransport::transportedField()
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
+                IOobject::AUTO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 7e900da06f..7a93ae4bfd 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -69,7 +69,8 @@ Foam::volScalarField& Foam::functionObjects::scalarTransport::transportedField()
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_
         );
diff --git a/src/functionObjects/utilities/solverInfo/solverInfo.C b/src/functionObjects/utilities/solverInfo/solverInfo.C
index 361c8998e6..e9f151d2e6 100644
--- a/src/functionObjects/utilities/solverInfo/solverInfo.C
+++ b/src/functionObjects/utilities/solverInfo/solverInfo.C
@@ -91,7 +91,9 @@ void Foam::functionObjects::solverInfo::createResidualField
         IOobject::scopedName("initialResidual", fieldName)
     );
 
-    if (!mesh_.foundObject<IOField<scalar>>(residualName))
+    auto* fieldPtr = mesh_.getObjectPtr<IOField<scalar>>(residualName);
+
+    if (!fieldPtr)
     {
         auto* fieldPtr =
             new IOField<scalar>
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
index 63ba5bc3e0..51ae1bc7be 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
@@ -64,11 +64,11 @@ void Foam::HeatTransferCoeff<CloudType>::postEvolve
     const auto& tc =
         static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c);
 
-    auto* htcPtr = c.template getObjectPtr<IOField<scalar>>("htc");
+    auto* resultPtr = c.template getObjectPtr<IOField<scalar>>("htc");
 
-    if (!htcPtr)
+    if (!resultPtr)
     {
-        htcPtr = new IOField<scalar>
+        resultPtr = new IOField<scalar>
         (
             IOobject
             (
@@ -81,9 +81,9 @@ void Foam::HeatTransferCoeff<CloudType>::postEvolve
             )
         );
 
-        htcPtr->store();
+        resultPtr->store();
     }
-    auto& htc = *htcPtr;
+    auto& htc = *resultPtr;
 
     htc.resize(c.size());
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
index 9a8e5f0c4e..5193283ecf 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
@@ -61,11 +61,11 @@ void Foam::KinematicReynoldsNumber<CloudType>::postEvolve
 {
     auto& c = this->owner();
 
-    auto* RePtr = c.template getObjectPtr<IOField<scalar>>("Re");
+    auto* resultPtr = c.template getObjectPtr<IOField<scalar>>("Re");
 
-    if (!RePtr)
+    if (!resultPtr)
     {
-        RePtr = new IOField<scalar>
+        resultPtr = new IOField<scalar>
         (
             IOobject
             (
@@ -78,9 +78,9 @@ void Foam::KinematicReynoldsNumber<CloudType>::postEvolve
             )
         );
 
-        RePtr->store();
+        resultPtr->store();
     }
-    auto& Re = *RePtr;
+    auto& Re = *resultPtr;
 
     Re.resize(c.size());
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
index 573aaf7081..d2d785a10a 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
@@ -64,11 +64,11 @@ void Foam::NusseltNumber<CloudType>::postEvolve
     const auto& tc =
         static_cast<const ThermoCloud<KinematicCloud<Cloud<parcelType>>>&>(c);
 
-    auto* NuPtr = c.template getObjectPtr<IOField<scalar>>("Nu");
+    auto* resultPtr = c.template getObjectPtr<IOField<scalar>>("Nu");
 
-    if (!NuPtr)
+    if (!resultPtr)
     {
-        NuPtr = new IOField<scalar>
+        resultPtr = new IOField<scalar>
         (
             IOobject
             (
@@ -81,9 +81,9 @@ void Foam::NusseltNumber<CloudType>::postEvolve
             )
         );
 
-        NuPtr->store();
+        resultPtr->store();
     }
-    auto& Nu = *NuPtr;
+    auto& Nu = *resultPtr;
 
     Nu.resize(c.size());
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
index 89339f87c1..02bfd9f97c 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleDose/ParticleDose.C
@@ -64,11 +64,11 @@ void Foam::ParticleDose<CloudType>::postEvolve
 {
     auto& c = this->owner();
 
-    auto* DPtr = c.template getObjectPtr<IOField<scalar>>("D");
+    auto* resultPtr = c.template getObjectPtr<IOField<scalar>>("D");
 
-    if (!DPtr)
+    if (!resultPtr)
     {
-        DPtr = new IOField<scalar>
+        resultPtr = new IOField<scalar>
         (
             IOobject
             (
@@ -81,9 +81,9 @@ void Foam::ParticleDose<CloudType>::postEvolve
             )
         );
 
-        DPtr->store();
+        resultPtr->store();
     }
-    auto& D = *DPtr;
+    auto& D = *resultPtr;
 
     D.resize(c.size(), Zero);
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
index 6f06c372d8..090f37d518 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
@@ -62,11 +62,11 @@ void Foam::ThermoReynoldsNumber<CloudType>::postEvolve
 {
     auto& c = this->owner();
 
-    auto* RePtr = c.template getObjectPtr<IOField<scalar>>("Re");
+    auto* resultPtr = c.template getObjectPtr<IOField<scalar>>("Re");
 
-    if (!RePtr)
+    if (!resultPtr)
     {
-        RePtr = new IOField<scalar>
+        resultPtr = new IOField<scalar>
         (
             IOobject
             (
@@ -79,9 +79,9 @@ void Foam::ThermoReynoldsNumber<CloudType>::postEvolve
             )
         );
 
-        RePtr->store();
+        resultPtr->store();
     }
-    auto& Re = *RePtr;
+    auto& Re = *resultPtr;
 
     Re.resize(c.size());
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
index 307db42ec0..30a42b12ee 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/WeberNumber/WeberNumberReacting.C
@@ -62,11 +62,11 @@ void Foam::WeberNumberReacting<CloudType>::postEvolve
 {
     const auto& c = this->owner();
 
-    auto* WePtr = c.template getObjectPtr<IOField<scalar>>("We");
+    auto* resultPtr = c.template getObjectPtr<IOField<scalar>>("We");
 
-    if (!WePtr)
+    if (!resultPtr)
     {
-        WePtr = new IOField<scalar>
+        resultPtr = new IOField<scalar>
         (
             IOobject
             (
@@ -79,9 +79,9 @@ void Foam::WeberNumberReacting<CloudType>::postEvolve
             )
         );
 
-        WePtr->store();
+        resultPtr->store();
     }
-    auto& We = *WePtr;
+    auto& We = *resultPtr;
 
     We.resize(c.size());
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index 21f054122a..028bddae18 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -67,26 +67,28 @@ Foam::InterfaceForce<CloudType>::~InterfaceForce()
 template<class CloudType>
 void Foam::InterfaceForce<CloudType>::cacheFields(const bool store)
 {
-    static word fName("gradAlpha");
+    static word resultName("gradAlpha");
 
-    bool fieldExists =
-        this->mesh().template foundObject<volVectorField>(fName);
+    volVectorField* resultPtr =
+        this->mesh().template getObjectPtr<volVectorField>(resultName);
 
     if (store)
     {
-        if (!fieldExists)
+        if (!resultPtr)
         {
             const volScalarField& alpha = this->mesh().template
                 lookupObject<volScalarField>(alphaName_);
 
-            volVectorField* gradInterForcePtr =
-                new volVectorField(fName, fvc::grad(alpha*(1-alpha)));
+            resultPtr = new volVectorField
+            (
+                resultName,
+                fvc::grad(alpha*(1-alpha))
+            );
 
-            gradInterForcePtr->store();
+            resultPtr->store();
         }
 
-        const volVectorField& gradInterForce = this->mesh().template
-            lookupObject<volVectorField>(fName);
+        const volVectorField& gradInterForce = *resultPtr;
 
         gradInterForceInterpPtr_.reset
         (
@@ -101,12 +103,9 @@ void Foam::InterfaceForce<CloudType>::cacheFields(const bool store)
     {
         gradInterForceInterpPtr_.clear();
 
-        if (fieldExists)
+        if (resultPtr)
         {
-            volVectorField& gradInterForce =
-                this->mesh().template lookupObjectRef<volVectorField>(fName);
-
-            gradInterForce.checkOut();
+            resultPtr->checkOut();
         }
     }
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
index 55b6478a79..89bb5818aa 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
@@ -84,25 +84,24 @@ Foam::LiftForce<CloudType>::~LiftForce()
 template<class CloudType>
 void Foam::LiftForce<CloudType>::cacheFields(const bool store)
 {
-    static word fName("curlUcDt");
+    static word resultName("curlUcDt");
 
-    bool fieldExists = this->mesh().template foundObject<volVectorField>(fName);
+    volVectorField* resultPtr =
+        this->mesh().template getObjectPtr<volVectorField>(resultName);
 
     if (store)
     {
-        if (!fieldExists)
+        if (!resultPtr)
         {
             const volVectorField& Uc = this->mesh().template
                 lookupObject<volVectorField>(UName_);
 
-            volVectorField* curlUcPtr =
-                new volVectorField(fName, fvc::curl(Uc));
+            resultPtr = new volVectorField(resultName, fvc::curl(Uc));
 
-            curlUcPtr->store();
+            resultPtr->store();
         }
 
-        const volVectorField& curlUc = this->mesh().template
-            lookupObject<volVectorField>(fName);
+        const volVectorField& curlUc = *resultPtr;
 
         curlUcInterpPtr_.reset
         (
@@ -117,12 +116,9 @@ void Foam::LiftForce<CloudType>::cacheFields(const bool store)
     {
         curlUcInterpPtr_.clear();
 
-        if (fieldExists)
+        if (resultPtr)
         {
-            volVectorField& curlUc =
-                this->mesh().template lookupObjectRef<volVectorField>(fName);
-
-            curlUc.checkOut();
+            resultPtr->checkOut();
         }
     }
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
index e0d0aa3bea..a39a3d6138 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
@@ -71,28 +71,27 @@ Foam::PressureGradientForce<CloudType>::~PressureGradientForce()
 template<class CloudType>
 void Foam::PressureGradientForce<CloudType>::cacheFields(const bool store)
 {
-    static word fName("DUcDt");
+    static word resultName("DUcDt");
 
-    bool fieldExists = this->mesh().template foundObject<volVectorField>(fName);
+    volVectorField* resultPtr =
+        this->mesh().template getObjectPtr<volVectorField>(resultName);
 
     if (store)
     {
-        if (!fieldExists)
+        if (!resultPtr)
         {
             const volVectorField& Uc = this->mesh().template
                 lookupObject<volVectorField>(UName_);
 
-            volVectorField* DUcDtPtr = new volVectorField
+            resultPtr = new volVectorField
             (
-                fName,
+                resultName,
                 fvc::ddt(Uc) + (Uc & fvc::grad(Uc))
             );
 
-            DUcDtPtr->store();
+            resultPtr->store();
         }
-
-        const volVectorField& DUcDt = this->mesh().template
-            lookupObject<volVectorField>(fName);
+        const volVectorField& DUcDt = *resultPtr;
 
         DUcDtInterpPtr_.reset
         (
@@ -107,12 +106,9 @@ void Foam::PressureGradientForce<CloudType>::cacheFields(const bool store)
     {
         DUcDtInterpPtr_.clear();
 
-        if (fieldExists)
+        if (resultPtr)
         {
-            volVectorField& DUcDt =
-                this->mesh().template lookupObjectRef<volVectorField>(fName);
-
-            DUcDt.checkOut();
+            resultPtr->checkOut();
         }
     }
 }
diff --git a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
index b2fad27088..6a6814fc6f 100644
--- a/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
+++ b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
@@ -186,15 +186,15 @@ Foam::lumpedPointDisplacementPointPatchVectorField::movement() const
     lumpedPointIOMovement* ptr =
         lumpedPointIOMovement::getMovementObject(obr);
 
-    if (ptr)
+    if (!ptr)
     {
-        return *ptr; // Already exists
+        // Create and register with this patch as the owner
+        ptr = lumpedPointIOMovement::New(obr, this->patch().index()).ptr();
+
+        objectRegistry::store(ptr);
     }
 
-    // Create and register with this patch as the owner
-    ptr = lumpedPointIOMovement::New(obr, this->patch().index()).ptr();
-
-    return objectRegistry::store(ptr);
+    return *ptr;
 }
 
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
index e4ee68ab43..7429ae88e5 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
@@ -292,7 +292,7 @@ bool Foam::mappedPatchBase::constructIOField
 
     if (tok.isCompound() && tok.compoundToken().type() == tag)
     {
-        IOField<Type>* fldPtr = obr.findObject<IOField<Type>>(name);
+        IOField<Type>* fldPtr = obr.getObjectPtr<IOField<Type>>(name);
         if (fldPtr)
         {
             fldPtr->transfer
@@ -305,14 +305,15 @@ bool Foam::mappedPatchBase::constructIOField
         }
         else
         {
-            IOField<Type>* fldPtr = new IOField<Type>
+            fldPtr = new IOField<Type>
             (
                 IOobject
                 (
                     name,
                     obr,
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::REGISTER
                 ),
                 label(0)
             );
@@ -342,7 +343,7 @@ void Foam::mappedPatchBase::storeField
     const Field<Type>& values
 )
 {
-    IOField<Type>* fldPtr = obr.findObject<IOField<Type>>(fieldName);
+    IOField<Type>* fldPtr = obr.getObjectPtr<IOField<Type>>(fieldName);
     if (fldPtr)
     {
         *fldPtr = values;
@@ -356,7 +357,8 @@ void Foam::mappedPatchBase::storeField
                 fieldName,
                 obr,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             values
         );
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index d0d6f58ab7..6f8440339e 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -47,19 +47,22 @@ namespace regionModels
 
 void Foam::regionModels::regionModel::constructMeshObjects()
 {
-    if (!time_.foundObject<fvMesh>(regionName_))
+    fvMesh* regionMeshPtr = time_.getObjectPtr<fvMesh>(regionName_);
+
+    if (!regionMeshPtr)
     {
-        fvMesh* regionMeshPtr =
-            new fvMesh
+        regionMeshPtr = new fvMesh
+        (
+            IOobject
             (
-                IOobject
-                (
-                    regionName_,
-                    time_.timeName(),
-                    time_,
-                    IOobject::MUST_READ
-                )
-            );
+                regionName_,
+                time_.timeName(),
+                time_,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
+            )
+        );
 
         regionMeshPtr->objectRegistry::store();
     }
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 54dc0061d0..24d7e23493 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,8 +43,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef basicThermo_H
-#define basicThermo_H
+#ifndef Foam_basicThermo_H
+#define Foam_basicThermo_H
 
 #include "volFields.H"
 #include "typeInfo.H"
@@ -219,7 +219,7 @@ public:
         static autoPtr<Thermo> New
         (
             const fvMesh&,
-            const word& phaseName=word::null
+            const word& phaseName = word::null
         );
 
         //- Generic New for each of the related thermodynamics packages
@@ -228,7 +228,7 @@ public:
         (
             const fvMesh&,
             const dictionary&,
-            const word& phaseName=word::null
+            const word& phaseName = word::null
         );
 
         //- Generic New for each of the related thermodynamics packages
@@ -244,7 +244,7 @@ public:
         static autoPtr<basicThermo> New
         (
             const fvMesh&,
-            const word& phaseName=word::null
+            const word& phaseName = word::null
         );
 
 
@@ -254,22 +254,34 @@ public:
 
     // Member Functions
 
+        //- The dictionary name ("thermophysicalProperties")
         static const word dictName;
 
-        static word phasePropertyName
-        (
-            const word& name,
-            const word& phaseName
-        )
+        //- The phase property name as property.phase
+        //- \sa IOobject::groupName
+        static word phasePropertyName(const word& name, const word& phaseName)
         {
             return IOobject::groupName(name, phaseName);
         }
 
+        //- The phase property name as property.phase (using phaseName_)
+        //- \sa IOobject::groupName
         word phasePropertyName(const word& name) const
         {
             return IOobject::groupName(name, phaseName_);
         }
 
+        //- The phase property name scoped as scope:property.phase
+        //- \sa IOobject::groupName and \sa IOobject::scopedName
+        word phaseScopedName(const std::string& scope, const word& name) const
+        {
+            return IOobject::groupName
+            (
+                IOobject::scopedName(scope, name),
+                phaseName_
+            );
+        }
+
         static const basicThermo& lookupThermo(const fvPatchScalarField& pf);
 
         //- Print (filtered) table of thermo names, splits on \c " ,<>"
diff --git a/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C b/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C
index 2db2a51f07..3deae52445 100644
--- a/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C
+++ b/src/thermophysicalModels/chemistryModel/functionObjects/BilgerMixtureFraction/BilgerMixtureFraction.C
@@ -58,9 +58,11 @@ namespace functionObjects
 
 void Foam::functionObjects::BilgerMixtureFraction::calcBilgerMixtureFraction()
 {
-    if (!mesh_.foundObject<volScalarField>(resultName_, false))
+    auto* resultPtr = mesh_.getObjectPtr<volScalarField>(resultName_);
+
+    if (!resultPtr)
     {
-        auto tCo = tmp<volScalarField>::New
+        resultPtr = new volScalarField
         (
             IOobject
             (
@@ -68,15 +70,15 @@ void Foam::functionObjects::BilgerMixtureFraction::calcBilgerMixtureFraction()
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                IOobject::REGISTER
             ),
             mesh_,
             dimensionedScalar(dimless, Zero)
         );
-        mesh_.objectRegistry::store(tCo.ptr());
+        mesh_.objectRegistry::store(resultPtr);
     }
-
-    auto& f_Bilger = mesh_.lookupObjectRef<volScalarField>(resultName_);
+    auto& f_Bilger = *resultPtr;
 
     auto& Y = thermo_.Y();
 

From 2df90880d629c190a8edeca96b465e5ac1baac2d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 3 May 2023 19:55:40 +0200
Subject: [PATCH 212/348] ENH: consistent use of name scoping for turbulence
 fields

- with IOobject::scopedName instead of literal ':' for future
  transitioning of separators
---
 .../Base/kOmegaSST/kOmegaSSTBase.H            | 24 +++++++++----------
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |  2 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.C  |  4 ++--
 .../strainRateFunction/strainRateFunction.C   | 11 ++++-----
 .../turbulenceModels/turbulenceModel.H        |  8 +++----
 .../atmAmbientTurbSourceTemplates.C           |  4 ++--
 .../atmBuoyancyTurbSourceTemplates.C          | 10 ++++----
 .../atmLengthScaleTurbSourceTemplates.C       | 10 ++++----
 .../atmPlantCanopyTurbSourceTemplates.C       |  6 ++---
 .../buoyancyTurbSource/buoyancyTurbSource.C   |  4 ++--
 .../interRegionHeatTransferModel.C            | 14 +++--------
 .../SuppressionCollision.C                    |  9 +++++--
 .../adjointkOmegaSST/adjointkOmegaSST.C       |  2 +-
 .../adjointkOmegaSST/adjointkOmegaSST.H       | 12 +++++-----
 .../RAS/kOmegaSST/kOmegaSST.C                 |  4 +++-
 .../driftModels/phaseChange/phaseChange.C     |  2 +-
 16 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
index 05d32cffe5..1a37f53c04 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
     Copyright (C) 2022 Upstream CFD GmbH
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,15 +131,6 @@ class kOmegaSSTBase
 :
     public BasicEddyViscosityModel
 {
-    // Private Member Functions
-
-        //- No copy construct
-        kOmegaSSTBase(const kOmegaSSTBase&) = delete;
-
-        //- No copy assignment
-        void operator=(const kOmegaSSTBase&) = delete;
-
-
 protected:
 
     // Protected Data
@@ -239,7 +230,7 @@ protected:
         {
             return tmp<volScalarField::Internal>::New
             (
-                this->type() + ":beta",
+                IOobject::scopedName(this->type(), "beta"),
                 blend(F1, beta1_, beta2_)
             );
         }
@@ -251,7 +242,7 @@ protected:
         {
             return tmp<volScalarField::Internal>::New
             (
-                this->type() + ":gamma",
+                IOobject::scopedName(this->type(), "gamma"),
                 blend(F1, gamma1_, gamma2_)
             );
         }
@@ -313,6 +304,15 @@ public:
     typedef typename BasicEddyViscosityModel::transportModel transportModel;
 
 
+    // Generated Methods
+
+        //- No copy construct
+        kOmegaSSTBase(const kOmegaSSTBase&) = delete;
+
+        //- No copy assignment
+        void operator=(const kOmegaSSTBase&) = delete;
+
+
     // Constructors
 
         //- Construct from components
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index bfe502275b..a3f8a1ecdd 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -264,7 +264,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
     tmp<volTensorField> tgradU = fvc::grad(U);
     const volScalarField::Internal GbyNu
     (
-        this->type() + ":GbyNu",
+        IOobject::scopedName(this->type(), "GbyNu"),
         tgradU().v() && dev(twoSymm(tgradU().v()))
     );
     tgradU.clear();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index 547d4cf47b..4fc4215d2d 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -245,7 +245,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
     tmp<volTensorField> tgradU = fvc::grad(U);
     const volScalarField::Internal GbyNu
     (
-        this->type() + ":GbyNu",
+        IOobject::scopedName(this->type(), "GbyNu"),
         tgradU().v() && dev(twoSymm(tgradU().v()))
     );
     const volScalarField::Internal G(this->GName(), nut()*GbyNu);
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C
index e86523348a..04d3792a9d 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C
@@ -103,12 +103,11 @@ nu
     const volScalarField& strainRate
 ) const
 {
-    auto tnu =
-        volScalarField::New
-        (
-            IOobject::groupName(type() + ":nu", nu0.group()),
-            nu0.mesh(),
-            dimensionedScalar(dimViscosity, Zero)
+    auto tnu = volScalarField::New
+    (
+        IOobject::scopedName(type(), IOobject::groupName("nu", nu0.group())),
+        nu0.mesh(),
+        dimensionedScalar(dimViscosity, Zero)
     );
 
     tnu.ref().primitiveFieldRef() = strainRateFunction_->value(strainRate);
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
index 3e7a07eccb..03b68befa2 100644
--- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulenceModel_H
-#define turbulenceModel_H
+#ifndef Foam_turbulenceModel_H
+#define Foam_turbulenceModel_H
 
 #include "IOdictionary.H"
 #include "primitiveFieldsFwd.H"
@@ -138,7 +138,7 @@ public:
         //- Helper function to return the name of the turbulence G field
         inline word GName() const
         {
-            return word(type() + ":G");
+            return IOobject::scopedName(type(), "G");
         }
 
         //- Access function to velocity field
diff --git a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSourceTemplates.C b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSourceTemplates.C
index 600e411a15..e1dcf80748 100644
--- a/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSourceTemplates.C
+++ b/src/atmosphericModels/fvOptions/atmAmbientTurbSource/atmAmbientTurbSourceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd
+    Copyright (C) 2020-2023 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,7 +71,7 @@ void Foam::fv::atmAmbientTurbSource::atmAmbientTurbSourceOmega
     const volScalarField::Internal& beta =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":beta")
+            IOobject::scopedName(turbPtr->type(), "beta")
         );
 
     // (RS:Eq. 4, rhs-term:5)
diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSourceTemplates.C b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSourceTemplates.C
index 054d2ec09c..468266ee3e 100644
--- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSourceTemplates.C
+++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSourceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +52,7 @@ void Foam::fv::atmBuoyancyTurbSource::atmBuoyancyTurbSourceEpsilon
     const volScalarField::Internal& GbyNu =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":GbyNu")
+            IOobject::scopedName(turbPtr->type(), "GbyNu")
         );
     const volScalarField::Internal G(GbyNu*Cmu_*sqr(k())/epsilon());
 
@@ -82,18 +82,18 @@ void Foam::fv::atmBuoyancyTurbSource::atmBuoyancyTurbSourceOmega
     const volScalarField::Internal& GbyNu =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":GbyNu")
+            IOobject::scopedName(turbPtr->type(), "GbyNu")
         );
     const volScalarField::Internal G(GbyNu*Cmu_*k()/omega());
     const volScalarField::Internal& gamma =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":gamma")
+            IOobject::scopedName(turbPtr->type(), "gamma")
         );
     const volScalarField::Internal& beta =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":beta")
+            IOobject::scopedName(turbPtr->type(), "beta")
         );
 
     // (ARAL:Eq. 5, rhs-term:3)
diff --git a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSourceTemplates.C b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSourceTemplates.C
index 507bbd3578..8b9354df62 100644
--- a/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSourceTemplates.C
+++ b/src/atmosphericModels/fvOptions/atmLengthScaleTurbSource/atmLengthScaleTurbSourceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd
+    Copyright (C) 2020-2023 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +52,7 @@ void Foam::fv::atmLengthScaleTurbSource::atmLengthScaleTurbSourceEpsilon
     const volScalarField::Internal& GbyNu =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":GbyNu")
+            IOobject::scopedName(turbPtr->type(), "GbyNu")
         );
 
     eqn += alpha()*rho()*calcC1Star(k, epsilon)*GbyNu*Cmu_*k;
@@ -80,17 +80,17 @@ void Foam::fv::atmLengthScaleTurbSource::atmLengthScaleTurbSourceOmega
     const volScalarField::Internal& GbyNu =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":GbyNu")
+            IOobject::scopedName(turbPtr->type(), "GbyNu")
         );
     const volScalarField::Internal& gamma =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":gamma")
+            IOobject::scopedName(turbPtr->type(), "gamma")
         );
     const volScalarField::Internal& beta =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":beta")
+            IOobject::scopedName(turbPtr->type(), "beta")
         );
 
     eqn += alpha()*rho()*calcGammaStar(k, omega, gamma, beta)*GbyNu;
diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSourceTemplates.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSourceTemplates.C
index 0f95c35536..0627313a52 100644
--- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSourceTemplates.C
+++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSourceTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,12 +71,12 @@ void Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSourceOmega
     const volScalarField::Internal& gamma =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":gamma")
+            IOobject::scopedName(turbPtr->type(), "gamma")
         );
     const volScalarField::Internal& beta =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":beta")
+            IOobject::scopedName(turbPtr->type(), "beta")
         );
 
     eqn -= fvm::Sp(alpha()*rho()*(gamma - beta)*calcPlantCanopyTerm(U), omega);
diff --git a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
index 742c1617da..844da73278 100644
--- a/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
+++ b/src/fvOptions/sources/derived/buoyancyTurbSource/buoyancyTurbSource.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,7 +103,7 @@ void Foam::fv::buoyancyTurbSource::buoyancyTurbSourceOmega
     const auto& gamma =
         mesh_.lookupObjectRef<volScalarField::Internal>
         (
-            word(turbPtr->type() + ":gamma")
+            IOobject::scopedName(turbPtr->type(), "gamma")
         );
 
     // (Heuristic approximation to BMA:Eq. 6)
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 5a729f981f..fa14a61899 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -131,7 +131,7 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel
     (
         IOobject
         (
-            type() + ":htc",
+            IOobject::scopedName(type(), "htc"),
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -169,19 +169,11 @@ void Foam::fv::interRegionHeatTransferModel::addSup
 
     const auto& T = mesh_.lookupObject<volScalarField>(TName_);
 
-    auto tTmapped = tmp<volScalarField>::New
+    auto tTmapped = volScalarField::New
     (
-        IOobject
-        (
-            type() + ":Tmapped",
-            mesh_.time().timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
+        IOobject::scopedName(type(), "Tmapped"),
         T
     );
-
     auto& Tmapped = tTmapped.ref();
 
     const auto& nbrMesh = mesh_.time().lookupObject<fvMesh>(nbrRegionName_);
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C
index 53d29080ea..3137b2fbdf 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C
@@ -43,9 +43,14 @@ void Foam::SuppressionCollision<CloudType>::collide
         lookupObject<kinematicCloud>(suppressionCloud_);
 
     volScalarField vDotSweep(sc.vDotSweep());
-
     dimensionedScalar Dt("dt", dimTime, dt);
-    volScalarField P(type() + ":p", 1.0 - exp(-vDotSweep*Dt));
+
+    auto tP = volScalarField::New
+    (
+        IOobject::scopedName(type(), "p"),
+        1.0 - exp(-vDotSweep*Dt)
+    );
+    const auto& P = tP();
 
     for (typename CloudType::parcelType& p : this->owner())
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
index 82ad7014cf..0a8a370015 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
@@ -1066,7 +1066,7 @@ void adjointkOmegaSST::updatePrimalRelatedFields()
         (
             IOobject
             (
-                type() + ":G",
+                IOobject::scopedName(type(), "G"),
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.H
index 479595936b..7b8ec749ee 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.H
@@ -50,8 +50,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef adjointkOmegaSST_H
-#define adjointkOmegaSST_H
+#ifndef Foam_adjointkOmegaSST_H
+#define Foam_adjointkOmegaSST_H
 
 #include "adjointRASModel.H"
 #include "wallDist.H"
@@ -247,7 +247,7 @@ protected:
             {
                 return tmp<volScalarField::Internal>::New
                 (
-                    this->type() + ":beta",
+                    IOobject::scopedName(this->type(), "beta"),
                     blend(F1, beta1_, beta2_)
                 );
             }
@@ -259,7 +259,7 @@ protected:
             {
                 return tmp<volScalarField>::New
                 (
-                    this->type() + ":beta",
+                    IOobject::scopedName(this->type(), "beta"),
                     blend(F1, beta1_, beta2_)
                 );
             }
@@ -271,7 +271,7 @@ protected:
             {
                 return tmp<volScalarField::Internal>::New
                 (
-                    this->type() + ":gamma",
+                    IOobject::scopedName(this->type(), "gamma"),
                     blend(F1, gamma1_, gamma2_)
                 );
             }
@@ -283,7 +283,7 @@ protected:
             {
                 return tmp<volScalarField>::New
                 (
-                    this->type() + ":gamma",
+                    IOobject::scopedName(this->type(), "gamma"),
                     blend(F1, gamma1_, gamma2_)
                 );
             }
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
index 1d393e3113..12c386a526 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
@@ -113,9 +113,11 @@ tmp<volScalarField::Internal> kOmegaSST::computeG()
     tmp<volTensorField> tgradU = fvc::grad(U);
     volScalarField::Internal GbyNu0
     (
-        this->type() + ":GbyNu",
+        IOobject::scopedName(this->type(), "GbyNu"),
         (tgradU() && dev(twoSymm(tgradU())))
     );
+
+    // NB: leave tmp registered (for correctBoundaryConditions)
     auto tG =
         tmp<volScalarField::Internal>::New
         (
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
index 4ec234f049..994b90ac3e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
@@ -72,7 +72,7 @@ Foam::diameterModels::driftModels::phaseChange::phaseChange
             (
                 IOobject
                 (
-                    IOobject::groupName(type() + ":W", pair.name()),
+                    IOobject::scopedName(type(), IOobject::groupName("W", pair.name())),
                     popBal_.mesh().time().timeName(),
                     popBal_.mesh()
                 ),

From 1685e8e4180a1ae1b19033ccf72a54aa112aa66a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Mar 2023 15:25:07 +0100
Subject: [PATCH 213/348] INT: objectRegistry: optionally caching temporary
 objects (#2723)

- functionality introduced by openfoam.org to support selective
  caching of temporary fields. The purpose is two-fold: to enable
  diagnostics and to allow more places to use unregistered fields by
  default.

  For example to cache the grad(k) field in

    cacheTemporaryObjects
    (
        grad(k)
    );

  If the name of a field which in never constructed is added to the
  cacheTemporaryObjects list a waning message is generated which
  includes a useful list of ALL the temporary fields constructed
  during the time step

  Multiple regions are also supported by specifying individual region
  names in a cacheTemporaryObjects dictionary.

    cacheTemporaryObjects
    {
        porous
        (
            porosityBlockage:UNbr
        );
    }

    functions
    {
        writePorousObjects
        {
            type        writeObjects;
            libs        (utilityFunctionObjects);

            region      porous;
            writeControl writeTime;
            writeOption anyWrite;

            objects     (porosityBlockage:UNbr);
        }
    }
---
 src/OpenFOAM/Make/files                       |   1 +
 src/OpenFOAM/db/Time/Time.C                   |  14 ++
 src/OpenFOAM/db/Time/Time.H                   |   7 +-
 .../db/objectRegistry/objectRegistry.C        |  45 ++++-
 .../db/objectRegistry/objectRegistry.H        |  49 ++++-
 .../db/objectRegistry/objectRegistryCache.C   | 183 ++++++++++++++++++
 .../objectRegistry/objectRegistryTemplates.C  |  50 ++++-
 src/OpenFOAM/db/regIOobject/regIOobject.C     |   3 +
 .../DimensionedField/DimensionedFieldNew.C    |  49 +++--
 .../GeometricField/GeometricFieldNew.C        |  70 +++++--
 .../utilities/writeObjects/writeObjects.C     |  17 +-
 11 files changed, 441 insertions(+), 47 deletions(-)
 create mode 100644 src/OpenFOAM/db/objectRegistry/objectRegistryCache.C

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 9eb84d9243..f9bb85e565 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -361,6 +361,7 @@ $(regIOobject)/regIOobjectWrite.C
 
 db/IOobjectList/IOobjectList.C
 db/objectRegistry/objectRegistry.C
+db/objectRegistry/objectRegistryCache.C
 db/CallbackRegistry/CallbackRegistryName.C
 
 dll = db/dynamicLibrary
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 878413360b..a35e9d7b0c 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -459,6 +459,7 @@ Foam::Time::Time
     writeStreamOption_(IOstreamOption::ASCII),
     graphFormat_("raw"),
     runTimeModifiable_(false),
+    cacheTemporaryObjects_(true),
     functionObjects_(*this, false)
 {
     if (enableFunctionObjects)
@@ -525,6 +526,7 @@ Foam::Time::Time
     writeStreamOption_(IOstreamOption::ASCII),
     graphFormat_("raw"),
     runTimeModifiable_(false),
+    cacheTemporaryObjects_(true),
     functionObjects_(*this, false)
 {
     // Functions
@@ -609,6 +611,7 @@ Foam::Time::Time
     writeStreamOption_(IOstreamOption::ASCII),
     graphFormat_("raw"),
     runTimeModifiable_(false),
+    cacheTemporaryObjects_(true),
     functionObjects_(*this, false)
 {
     if (enableFunctionObjects)
@@ -683,6 +686,7 @@ Foam::Time::Time
     writeStreamOption_(IOstreamOption::ASCII),
     graphFormat_("raw"),
     runTimeModifiable_(false),
+    cacheTemporaryObjects_(true),
     functionObjects_(*this, false)
 {
     if (enableFunctionObjects)
@@ -885,6 +889,11 @@ bool Foam::Time::run() const
                 addProfiling(fo, "functionObjects.end()");
                 functionObjects_.end();
             }
+
+            if (cacheTemporaryObjects_)
+            {
+                cacheTemporaryObjects_ = checkCacheTemporaryObjects();
+            }
         }
     }
 
@@ -915,6 +924,11 @@ bool Foam::Time::run() const
             {
                 const_cast<Time&>(*this).readModifiedObjects();
             }
+
+            if (cacheTemporaryObjects_)
+            {
+                cacheTemporaryObjects_ = checkCacheTemporaryObjects();
+            }
         }
 
         // Update the "is-running" status following the
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index f9a410114f..ad28409a43 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -5,8 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2011-2019 OpenFOAM Foundation
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -215,6 +215,9 @@ private:
         //- Is runtime modification of dictionaries allowed?
         Switch runTimeModifiable_;
 
+        //- Is temporary object cache enabled?
+        mutable bool cacheTemporaryObjects_;
+
         //- Function objects executed at start and on ++, +=
         mutable functionObjectList functionObjects_;
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 13f1b5f16e..9e33ec1fe1 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2011-2019 OpenFOAM Foundation
     Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,10 @@ Foam::objectRegistry::objectRegistry(const Time& t, const label nObjects)
     time_(t),
     parent_(t),
     dbDir_(name()),
-    event_(1)
+    event_(1),
+    cacheTemporaryObjectsActive_(false),
+    cacheTemporaryObjects_(0),
+    temporaryObjects_(0)
 {}
 
 
@@ -109,7 +112,10 @@ Foam::objectRegistry::objectRegistry(const IOobject& io, const label nObjects)
     time_(io.time()),
     parent_(io.db()),
     dbDir_(parent_.dbDir()/local()/name()),
-    event_(1)
+    event_(1),
+    cacheTemporaryObjectsActive_(false),
+    cacheTemporaryObjects_(0),
+    temporaryObjects_(0)
 {
     writeOpt(IOobject::AUTO_WRITE);
 }
@@ -249,6 +255,8 @@ bool Foam::objectRegistry::checkIn(regIOobject* io) const
 {
     if (!io) return false;
 
+    objectRegistry& obr = const_cast<objectRegistry&>(*this);
+
     if (objectRegistry::debug)
     {
         Pout<< "objectRegistry::checkIn : "
@@ -257,7 +265,36 @@ bool Foam::objectRegistry::checkIn(regIOobject* io) const
             << endl;
     }
 
-    objectRegistry& obr = const_cast<objectRegistry&>(*this);
+    // Delete cached object if it has the same name as io, and in the
+    // cacheTemporaryObjects list
+    if (!cacheTemporaryObjects_.empty())
+    {
+        auto cacheIter = cacheTemporaryObjects_.find(io->name());
+
+        if (cacheIter.good())
+        {
+            iterator iter = obr.find(io->name());
+
+            if
+            (
+                iter.good()
+             && iter.val() != io
+             && iter.val()->ownedByRegistry()
+            )
+            {
+                if (objectRegistry::debug)
+                {
+                    Pout<< "objectRegistry::checkIn : "
+                        << name() << " : deleting cached object "
+                        << io->name() << endl;
+                }
+
+                cacheIter.val().first() = false;
+                deleteCachedObject(iter.val());
+            }
+        }
+    }
+
 
     bool ok = obr.insert(io->name(), io);
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index f0cff91d5c..5216ce223d 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -5,8 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2011-2019 OpenFOAM Foundation
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,6 +44,7 @@ SourceFiles
 #include "UPtrList.H"
 #include "regIOobject.H"
 #include "wordRes.H"
+#include "Pair.H"
 
 // Historically included by objectRegistryTemplates (until NOV-2018),
 // but not used by objectRegistry directly.
@@ -78,6 +79,17 @@ class objectRegistry
         //- Current event
         mutable label event_;
 
+        //- State of cacheTemporaryObjects_, set true after reading
+        mutable bool cacheTemporaryObjectsActive_;
+
+        //- Names of temporary object with current state
+        mutable HashTable<Pair<bool>> cacheTemporaryObjects_;
+
+        //- Accumulated list of temporary objects available to cache
+        //  Used to provide diagnostics in case the requested object is not
+        //  available
+        mutable wordHashSet temporaryObjects_;
+
 
     // Private Member Functions
 
@@ -85,6 +97,13 @@ class objectRegistry
         //  Used to terminate searching within the ancestors
         bool parentNotTime() const noexcept;
 
+        //- Read the cacheTemporaryObjects list from Time controlDict
+        void readCacheTemporaryObjects() const;
+
+        //- Delete the cached object. Eg, before caching a new object
+        //- A nullptr is ignored.
+        void deleteCachedObject(regIOobject* io) const;
+
         //- Templated implementation for count()
         //  The number of items with a matching class
         template<class MatchPredicate1, class MatchPredicate2>
@@ -559,6 +578,30 @@ public:
         virtual void rename(const word& newName);
 
 
+    // Temporaries
+
+        //FUTURE //- Add given name to the set of temporary objects to cache
+        //FUTURE void addTemporaryObject(const word& name) const;
+
+        //- True if given name is in the cacheTemporaryObjects set
+        bool cacheTemporaryObject(const word& name) const;
+
+        //- Cache the given object. Moves content and stores
+        template<class Type>
+        bool cacheTemporaryObject(Type& obj) const;
+
+        //- Reset the cache state of the given object (nullptr is ignored)
+        void resetCacheTemporaryObject(const regIOobject* io) const;
+
+        //- Reset the cache state of the given object
+        //  in the cacheTemporaryObjects set
+        void resetCacheTemporaryObject(const regIOobject& io) const;
+
+        //- Check that all objects specified in the cacheTemporaryObjects
+        //- were also cached
+        bool checkCacheTemporaryObjects() const;
+
+
     // Reading
 
         //- Return true if any of the object's files have been modified
@@ -573,7 +616,7 @@ public:
 
     // Writing
 
-        //- writeData function required by regIOobject but not used.
+        //- The writeData function is required by regIOobject but not used.
         //  For this class, write is used instead
         virtual bool writeData(Ostream&) const
         {
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryCache.C b/src/OpenFOAM/db/objectRegistry/objectRegistryCache.C
new file mode 100644
index 0000000000..891431c937
--- /dev/null
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryCache.C
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2019 OpenFOAM Foundation
+    Copyright (C) 2023 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 "objectRegistry.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::objectRegistry::readCacheTemporaryObjects() const
+{
+    if (cacheTemporaryObjectsActive_) return;
+
+    const auto* eptr = time_.controlDict().findEntry
+    (
+        "cacheTemporaryObjects",
+        keyType::LITERAL
+    );
+
+    if (eptr)
+    {
+        cacheTemporaryObjectsActive_ = true;
+
+        // Clear old cache?
+        // cacheTemporaryObjects_.clear();
+
+        wordList objectNames;
+
+        if (eptr->isDict())
+        {
+            // Per region (sub-dictionary syntax)
+            eptr->dict().readIfPresent(name(), objectNames);
+        }
+        else
+        {
+            // All regions
+            eptr->readEntry(objectNames);
+        }
+
+        for (const word& objName : objectNames)
+        {
+            cacheTemporaryObjects_.emplace(objName, false, false);
+        }
+    }
+}
+
+
+void Foam::objectRegistry::deleteCachedObject(regIOobject* io) const
+{
+    if (io)
+    {
+        io->release();     // Relinquish any ownership by registry
+        io->checkOut();
+        delete io;
+    }
+}
+
+
+// FUTURE: (currently not needed)
+// void Foam::objectRegistry::addTemporaryObject
+// (
+//     const word& name
+// ) const
+// {
+//     cacheTemporaryObjects_.emplace(name, false, false);
+// }
+
+
+bool Foam::objectRegistry::cacheTemporaryObject
+(
+    const word& name
+) const
+{
+    return cacheTemporaryObjects_.found(name);
+}
+
+
+void Foam::objectRegistry::resetCacheTemporaryObject
+(
+    const regIOobject* io
+) const
+{
+    if (io && !cacheTemporaryObjects_.empty())
+    {
+        auto iter = cacheTemporaryObjects_.find(io->name());
+
+        // Reset the cached flag
+        if (iter.good())
+        {
+            iter.val().first() = false;
+        }
+    }
+}
+
+
+void Foam::objectRegistry::resetCacheTemporaryObject
+(
+    const regIOobject& io
+) const
+{
+    resetCacheTemporaryObject(&io);
+}
+
+
+bool Foam::objectRegistry::checkCacheTemporaryObjects() const
+{
+    bool enabled = cacheTemporaryObjects_.size();
+
+    forAllConstIters(*this, iter)
+    {
+        const auto* subObr = dynamic_cast<const objectRegistry*>(iter.val());
+
+        // Protect against re-searching the top-level registry
+        if (subObr && subObr != this)
+        {
+            enabled = subObr->checkCacheTemporaryObjects() || enabled;
+        }
+    }
+
+    if (enabled)
+    {
+        OSstream* emitWarning = nullptr;
+
+        forAllIters(cacheTemporaryObjects_, iter)
+        {
+            if (!iter.val().second())
+            {
+                if (!emitWarning)
+                {
+                    emitWarning = &(Foam::Warning.stream());
+
+                    *emitWarning
+                        << "objectRegistry '"
+                        << name() << "' has missing temporary objects:" << nl;
+                }
+
+                *emitWarning<< "    " << iter.key() << nl;
+            }
+            else
+            {
+                iter.val().second() = false;
+            }
+        }
+
+        if (emitWarning)
+        {
+            *emitWarning
+                << "Available temporary objects: "
+                << temporaryObjects_.sortedToc() << endl;
+        }
+
+        temporaryObjects_.clear();
+    }
+
+    return enabled;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index a4cb56253d..9204516b5d 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -5,8 +5,8 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2011-2019 OpenFOAM Foundation
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -595,4 +595,50 @@ Type& Foam::objectRegistry::lookupObjectRef
 }
 
 
+template<class Type>
+bool Foam::objectRegistry::cacheTemporaryObject(Type& obj) const
+{
+    bool ok = false;
+
+    readCacheTemporaryObjects();
+
+    if (cacheTemporaryObjects_.size())
+    {
+        temporaryObjects_.insert(obj.name());
+
+        auto iter = cacheTemporaryObjects_.find(obj.name());
+
+        // Cache object if is in the cacheTemporaryObjects list
+        // and hasn't been cached yet
+        if (iter.good() && iter.val().first() == false)
+        {
+            iter.val().first() = true;
+            iter.val().second() = true;
+
+            Type* cachedPtr = obj.db().template getObjectPtr<Type>(obj.name());
+
+            // Remove any name collisions from the cache
+            if (cachedPtr && cachedPtr != &obj && cachedPtr->ownedByRegistry())
+            {
+                deleteCachedObject(cachedPtr);
+            }
+
+            if (debug)
+            {
+                Info<< "Caching " << obj.name()
+                    << " of type " << obj.type() << endl;
+            }
+
+            obj.release();
+            obj.checkOut();
+            regIOobject::store(new Type(std::move(obj)));
+
+            ok = true;
+        }
+    }
+
+    return ok;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 2d3294016a..25711b8729 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -178,6 +178,9 @@ Foam::regIOobject::~regIOobject()
     //    checkOut(). By being 'unowned', the registry will not attempt a
     //    second deletion when the object name is removed from the registry.
 
+    // Reset the cache state (if any)
+    db().resetCacheTemporaryObject(this);
+
     // Revoke any registry ownership: we are already deleting
     ownedByRegistry_ = false;
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C
index 2c57d75fd9..9b724d5a68 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldNew.C
@@ -37,8 +37,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const Field<Type>& iField
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -46,7 +49,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         dims,
@@ -65,8 +68,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     Field<Type>&& iField
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -74,7 +80,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         dims,
@@ -92,8 +98,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const dimensionSet& dims
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -101,7 +110,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         dims,
@@ -120,8 +129,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const dimensionSet& dims
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -129,7 +141,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         value,
@@ -166,8 +178,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const tmp<DimensionedField<Type, GeoMesh>>& tfld
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = tfld().db().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -176,7 +191,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             tfld().db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         tfld
     );
@@ -193,8 +208,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const dimensionSet& dims
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = fld.db().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -202,7 +220,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             fld.db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         fld.mesh(),
         dims
@@ -220,8 +238,11 @@ Foam::DimensionedField<Type, GeoMesh>::New
     const dimensioned<Type>& dt
 )
 {
-    return tmp<DimensionedField<Type, GeoMesh>>::New
+    const bool caching = fld.db().cacheTemporaryObject(name);
+
+    return tmp<DimensionedField<Type, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -229,7 +250,7 @@ Foam::DimensionedField<Type, GeoMesh>::New
             fld.db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         fld.mesh(),
         dt.value(),
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C
index 8aa3f79d7f..b222d2960f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldNew.C
@@ -38,8 +38,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -47,7 +50,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         dims,
@@ -67,8 +70,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -76,7 +82,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         dims,
@@ -97,8 +103,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -106,7 +115,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         dims,
@@ -127,8 +136,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -136,7 +148,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         value,
@@ -158,8 +170,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const wordList& actualPatchTypes
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = mesh.thisDb().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -167,7 +182,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             mesh.thisDb(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         mesh,
         value,
@@ -231,8 +246,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = tgf().db().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -241,7 +259,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             tgf().db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         tgf,
         patchFieldType
@@ -257,8 +275,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = tgf().db().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -267,7 +288,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             tgf().db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         tgf
     );
@@ -284,8 +305,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const wordList& actualPatchTypes
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = tgf().db().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -294,7 +318,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             tgf().db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         tgf,
         patchFieldTypes,
@@ -314,8 +338,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = fld.db().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -323,7 +350,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             fld.db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         fld.mesh(),
         dims,
@@ -343,8 +370,11 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
     const word& patchFieldType
 )
 {
-    return tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    const bool caching = fld.db().cacheTemporaryObject(name);
+
+    return tmp<GeometricField<Type, PatchField, GeoMesh>>::NewImmovable
     (
+        caching,        // (true: immovable, false: movable)
         IOobject
         (
             name,
@@ -352,7 +382,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::New
             fld.db(),
             IOobjectOption::NO_READ,
             IOobjectOption::NO_WRITE,
-            IOobjectOption::NO_REGISTER
+            caching     // (true: REGISTER, false: NO_REGISTER)
         ),
         fld.mesh(),
         dt.value(),
diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.C b/src/functionObjects/utilities/writeObjects/writeObjects.C
index 4d796125d8..6dd5944ca9 100644
--- a/src/functionObjects/utilities/writeObjects/writeObjects.C
+++ b/src/functionObjects/utilities/writeObjects/writeObjects.C
@@ -219,9 +219,22 @@ bool Foam::functionObjects::writeObjects::write()
         }
         else
         {
-            Log << "    writing object " << obj.name() << endl;
+            // TBD:
+            // If the object is a temporary field expression wrap with tmp<...>
 
-            obj.write();
+            // if (obj.db().cacheTemporaryObject(objName))
+            // {
+            //     obj.IOobject::rename("tmp<" + objName + ">");
+            //
+            //     Log << "    writing object " << obj.name() << endl;
+            //     obj.write();
+            //     obj.IOobject::rename(objName);
+            // }
+            // else
+            {
+                Log << "    writing object " << obj.name() << endl;
+                obj.write();
+            }
         }
     }
 

From dfa5c05a1664ab2ccd5ce87a2341a9f31f8a233d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 17 Mar 2023 15:35:38 +0100
Subject: [PATCH 214/348] ENH: use New factory methods for
 Dimensioned/Geometric functions (#2723)

---
 .../DimensionedField/DimensionedField.C       |  18 +--
 .../DimensionedFieldReuseFunctions.H          |  65 ++------
 .../DimensionedScalarField.C                  |  72 ++-------
 .../GeometricField/GeometricField.C           |  18 +--
 .../GeometricFieldReuseFunctions.H            |  65 ++------
 .../GeometricScalarField.C                    | 144 ++++--------------
 .../transformGeometricField.C                 |  46 ++----
 7 files changed, 95 insertions(+), 333 deletions(-)

diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index dd290c3bb8..5fd20ff64e 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -391,14 +391,9 @@ Foam::DimensionedField<Type, GeoMesh>::component
     const direction d
 ) const
 {
-    auto tresult = tmp<DimensionedField<cmptType, GeoMesh>>::New
+    auto tresult = DimensionedField<cmptType, GeoMesh>::New
     (
-        IOobject
-        (
-            name() + ".component(" + ::Foam::name(d) + ')',
-            instance(),
-            db()
-        ),
+        name() + ".component(" + ::Foam::name(d) + ')',
         mesh_,
         dimensions_
     );
@@ -445,14 +440,9 @@ template<class Type, class GeoMesh>
 Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
 Foam::DimensionedField<Type, GeoMesh>::T() const
 {
-    auto tresult = tmp<DimensionedField<Type, GeoMesh>>::New
+    auto tresult = DimensionedField<Type, GeoMesh>::New
     (
-        IOobject
-        (
-            name() + ".T()",
-            instance(),
-            db()
-        ),
+        name() + ".T()",
         mesh_,
         dimensions_
     );
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index c1aae8ca0a..a4647cb1c8 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -48,14 +48,9 @@ struct reuseTmpDimensionedField
         const dimensionSet& dimensions
     )
     {
-        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        return DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -71,14 +66,9 @@ struct reuseTmpDimensionedField
     {
         const auto& f1 = tf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        return DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -110,21 +100,16 @@ struct reuseTmpDimensionedField<TypeR, TypeR, GeoMesh>
 
         const auto& f1 = tf1();
 
-        auto tresult = tmp<DimensionedField<TypeR, GeoMesh>>::New
+        auto tresult = DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
 
         if (initCopy)
         {
-            tresult.ref().field() = tf1().field();
+            tresult.ref().field() = f1.field();
         }
 
         return tresult;
@@ -165,14 +150,9 @@ struct reuseTmpTmpDimensionedField
     {
         const auto& f1 = tf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        return DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -202,14 +182,9 @@ struct reuseTmpTmpDimensionedField<TypeR, Type1, Type12, TypeR, GeoMesh>
 
         const auto& f1 = tf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        return DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -239,14 +214,9 @@ struct reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, Type2, GeoMesh>
 
         const auto& f1 = tf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        return DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -284,14 +254,9 @@ struct reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, TypeR, GeoMesh>
 
         const auto& f1 = tf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh>>::New
+        return DimensionedField<TypeR, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 54ed8ed1c5..5d7ea4df67 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -46,14 +46,9 @@ tmp<DimensionedField<scalar, GeoMesh>> stabilise
 )
 {
     auto tres =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "stabilise(" + dsf.name() + ',' + ds.name() + ')',
-                dsf.instance(),
-                dsf.db()
-            ),
+            "stabilise(" + dsf.name() + ',' + ds.name() + ')',
             dsf.mesh(),
             dsf.dimensions() + ds.dimensions()
         );
@@ -130,14 +125,9 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
     }
 
     auto tresult =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "pow(" + f1.name() + ',' + f2.name() + ')',
-                f1.instance(),
-                f1.db()
-            ),
+            "pow(" + f1.name() + ',' + f2.name() + ')',
             f1.mesh(),
             dimless
         );
@@ -311,14 +301,9 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
     }
 
     auto tresult =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "pow(" + f1.name() + ',' + ds.name() + ')',
-                f1.instance(),
-                f1.db()
-            ),
+            "pow(" + f1.name() + ',' + ds.name() + ')',
             f1.mesh(),
             pow(f1.dimensions(), ds)
         );
@@ -417,14 +402,9 @@ tmp<DimensionedField<scalar, GeoMesh>> pow
     }
 
     auto tresult =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "pow(" + ds.name() + ',' + f2.name() + ')',
-                f2.instance(),
-                f2.db()
-            ),
+            "pow(" + ds.name() + ',' + f2.name() + ')',
             f2.mesh(),
             dimless
         );
@@ -512,14 +492,9 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 )
 {
     auto tres =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "atan2(" + dsf1.name() + ',' + dsf2.name() + ')',
-                dsf1.instance(),
-                dsf1.db()
-            ),
+            "atan2(" + dsf1.name() + ',' + dsf2.name() + ')',
             dsf1.mesh(),
             atan2(dsf1.dimensions(), dsf2.dimensions())
         );
@@ -614,14 +589,9 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 )
 {
     auto tres =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "atan2(" + dsf.name() + ',' + ds.name() + ')',
-                dsf.instance(),
-                dsf.db()
-            ),
+            "atan2(" + dsf.name() + ',' + ds.name() + ')',
             dsf.mesh(),
             atan2(dsf.dimensions(), ds)
         );
@@ -683,14 +653,9 @@ tmp<DimensionedField<scalar, GeoMesh>> atan2
 )
 {
     auto tres =
-        tmp<DimensionedField<scalar, GeoMesh>>::New
+        DimensionedField<scalar, GeoMesh>::New
         (
-            IOobject
-            (
-                "atan2(" + ds.name() + ',' + dsf.name() + ')',
-                dsf.instance(),
-                dsf.db()
-            ),
+            "atan2(" + ds.name() + ',' + dsf.name() + ')',
             dsf.mesh(),
             atan2(ds, dsf.dimensions())
         );
@@ -805,14 +770,9 @@ tmp<DimensionedField<scalar, GeoMesh>> func                                    \
     }                                                                          \
                                                                                \
     auto tres =                                                                \
-        tmp<DimensionedField<scalar, GeoMesh>>::New                            \
+        DimensionedField<scalar, GeoMesh>::New                                 \
         (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #func "(" + name(n) + ',' + dsf.name() + ')',                  \
-                dsf.instance(),                                                \
-                dsf.db()                                                       \
-            ),                                                                 \
+            #func "(" + name(n) + ',' + dsf.name() + ')',                      \
             dsf.mesh(),                                                        \
             dimless                                                            \
         );                                                                     \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 8e12b480c9..752d06eb9a 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -1214,14 +1214,9 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
 Foam::GeometricField<Type, PatchField, GeoMesh>::T() const
 {
-    auto tresult = tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    auto tresult = GeometricField<Type, PatchField, GeoMesh>::New
     (
-        IOobject
-        (
-            this->name() + ".T()",
-            this->instance(),
-            this->db()
-        ),
+        this->name() + ".T()",
         this->mesh(),
         this->dimensions()
     );
@@ -1248,14 +1243,9 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::component
     const direction d
 ) const
 {
-    auto tresult = tmp<GeometricField<cmptType, PatchField, GeoMesh>>::New
+    auto tresult = GeometricField<cmptType, PatchField, GeoMesh>::New
     (
-        IOobject
-        (
-            this->name() + ".component(" + Foam::name(d) + ')',
-            this->instance(),
-            this->db()
-        ),
+        this->name() + ".component(" + Foam::name(d) + ')',
         this->mesh(),
         this->dimensions()
     );
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index afe8d4b65b..edc15dea5a 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -95,14 +95,9 @@ struct reuseTmpGeometricField
         const dimensionSet& dimensions
     )
     {
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        return GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -118,14 +113,9 @@ struct reuseTmpGeometricField
     {
         const auto& f1 = tf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        return GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -157,21 +147,16 @@ struct reuseTmpGeometricField<TypeR, TypeR, PatchField, GeoMesh>
 
         const auto& f1 = tf1();
 
-        auto tresult = tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        auto tresult = GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
 
         if (initCopy)
         {
-            tresult.ref() == f1;
+            tresult.ref() == tf1();
         }
 
         return tresult;
@@ -223,14 +208,9 @@ struct reuseTmpTmpGeometricField
     {
         const auto& f1 = tf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        return GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -270,14 +250,9 @@ struct reuseTmpTmpGeometricField
 
         const auto& f1 = tf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        return GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -316,14 +291,9 @@ struct reuseTmpTmpGeometricField
 
         const auto& f1 = tf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        return GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
@@ -364,14 +334,9 @@ struct reuseTmpTmpGeometricField
 
         const auto& f1 = tf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>::New
+        return GeometricField<TypeR, PatchField, GeoMesh>::New
         (
-            IOobject
-            (
-                name,
-                f1.instance(),
-                f1.db()
-            ),
+            name,
             f1.mesh(),
             dimensions
         );
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index f6747c23d0..981e3056e9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -58,21 +58,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
     const dimensioned<scalar>& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
+    auto tRes = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "stabilise(" + gsf.name() + ',' + ds.name() + ')',
-                gsf.instance(),
-                gsf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gsf.mesh(),
-            ds.dimensions() + gsf.dimensions()
-        )
+        "stabilise(" + gsf.name() + ',' + ds.name() + ')',
+        gsf.mesh(),
+        ds.dimensions() + gsf.dimensions()
     );
 
     stabilise(tRes.ref(), gsf, ds);
@@ -163,21 +153,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         FatalError << exit(FatalError);
     }
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
+    auto tresult = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "pow(" + f1.name() + ',' + f2.name() + ')',
-                f1.instance(),
-                f1.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            f1.mesh(),
-            dimless
-        )
+        "pow(" + f1.name() + ',' + f2.name() + ')',
+        f1.mesh(),
+        dimless
     );
 
     pow(tresult.ref(), f1, f2);
@@ -368,21 +348,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
             << exit(FatalError);
     }
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
+    auto tresult = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "pow(" + f1.name() + ',' + ds.name() + ')',
-                f1.instance(),
-                f1.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            f1.mesh(),
-            pow(f1.dimensions(), ds)
-        )
+        "pow(" + f1.name() + ',' + ds.name() + ')',
+        f1.mesh(),
+        pow(f1.dimensions(), ds)
     );
 
     pow(tresult.ref(), f1, ds);
@@ -491,21 +461,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
         FatalError << exit(FatalError);
     }
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tresult
+    auto tresult = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "pow(" + ds.name() + ',' + f2.name() + ')',
-                f2.instance(),
-                f2.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            f2.mesh(),
-            dimless
-        )
+        "pow(" + ds.name() + ',' + f2.name() + ')',
+        f2.mesh(),
+        dimless
     );
 
     pow(tresult.ref(), ds, f2);
@@ -615,21 +575,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
+    auto tAtan2 = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "atan2(" + gsf1.name() + ',' + gsf2.name() + ')',
-                gsf1.instance(),
-                gsf1.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gsf1.mesh(),
-            atan2(gsf1.dimensions(), gsf2.dimensions())
-        )
+        "atan2(" + gsf1.name() + ',' + gsf2.name() + ')',
+        gsf1.mesh(),
+        atan2(gsf1.dimensions(), gsf2.dimensions())
     );
 
     atan2(tAtan2.ref(), gsf1, gsf2);
@@ -742,21 +692,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
     const dimensionedScalar& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
+    auto tAtan2 = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "atan2(" + gsf.name() + ',' + ds.name() + ')',
-                gsf.instance(),
-                gsf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gsf.mesh(),
-            atan2(gsf.dimensions(), ds)
-        )
+        "atan2(" + gsf.name() + ',' + ds.name() + ')',
+        gsf.mesh(),
+        atan2(gsf.dimensions(), ds)
     );
 
     atan2(tAtan2.ref(), gsf, ds);
@@ -831,21 +771,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
+    auto tAtan2 = GeometricField<scalar, PatchField, GeoMesh>::New
     (
-        new GeometricField<scalar, PatchField, GeoMesh>
-        (
-            IOobject
-            (
-                "atan2(" + ds.name() + ',' + gsf.name() + ')',
-                gsf.instance(),
-                gsf.db(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            gsf.mesh(),
-            atan2(ds, gsf.dimensions())
-        )
+        "atan2(" + ds.name() + ',' + gsf.name() + ')',
+        gsf.mesh(),
+        atan2(ds, gsf.dimensions())
     );
 
     atan2(tAtan2.ref(), ds, gsf);
@@ -972,21 +902,11 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func                          \
             << abort(FatalError);                                              \
     }                                                                          \
                                                                                \
-    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                     \
+    auto tFunc = GeometricField<scalar, PatchField, GeoMesh>::New              \
     (                                                                          \
-        new GeometricField<scalar, PatchField, GeoMesh>                        \
-        (                                                                      \
-            IOobject                                                           \
-            (                                                                  \
-                #func "(" + gsf.name() + ')',                                  \
-                gsf.instance(),                                                \
-                gsf.db(),                                                      \
-                IOobject::NO_READ,                                             \
-                IOobject::NO_WRITE                                             \
-            ),                                                                 \
-            gsf.mesh(),                                                        \
-            dimless                                                            \
-        )                                                                      \
+        #func "(" + gsf.name() + ')',                                          \
+        gsf.mesh(),                                                            \
+        dimless                                                                \
     );                                                                         \
                                                                                \
     func(tFunc.ref(), n, gsf);                                                 \
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
index 94f5ad2f30..0804f14b03 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,16 +90,9 @@ Foam::transform
     const GeometricField<Type, PatchField, GeoMesh>& fld
 )
 {
-    auto tresult = tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    auto tresult = GeometricField<Type, PatchField, GeoMesh>::New
     (
-        IOobject
-        (
-            "transform(" + rot.name() + ',' + fld.name() + ')',
-            fld.instance(),
-            fld.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
+        "transform(" + rot.name() + ',' + fld.name() + ')',
         fld.mesh(),
         fld.dimensions()
     );
@@ -161,16 +154,9 @@ Foam::transform
     const GeometricField<Type, PatchField, GeoMesh>& fld
 )
 {
-    auto tresult = tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    auto tresult = GeometricField<Type, PatchField, GeoMesh>::New
     (
-        IOobject
-        (
-            "transform(" + rot.name() + ',' + fld.name() + ')',
-            fld.instance(),
-            fld.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
+        "transform(" + rot.name() + ',' + fld.name() + ')',
         fld.mesh(),
         fld.dimensions()
     );
@@ -251,16 +237,9 @@ Foam::invTransform
     const GeometricField<Type, PatchField, GeoMesh>& fld
 )
 {
-    auto tresult = tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    auto tresult = GeometricField<Type, PatchField, GeoMesh>::New
     (
-        IOobject
-        (
-            "invTransform(" + rot.name() + ',' + fld.name() + ')',
-            fld.instance(),
-            fld.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
+        "invTransform(" + rot.name() + ',' + fld.name() + ')',
         fld.mesh(),
         fld.dimensions()
     );
@@ -322,16 +301,9 @@ Foam::invTransform
     const GeometricField<Type, PatchField, GeoMesh>& fld
 )
 {
-    auto tresult = tmp<GeometricField<Type, PatchField, GeoMesh>>::New
+    auto tresult = GeometricField<Type, PatchField, GeoMesh>::New
     (
-        IOobject
-        (
-            "invTransform(" + rot.name() + ',' + fld.name() + ')',
-            fld.instance(),
-            fld.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
+        "invTransform(" + rot.name() + ',' + fld.name() + ')',
         fld.mesh(),
         fld.dimensions()
     );

From f462a850cee7653a33db352ce396c7d03c19fe0d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 May 2023 10:22:29 +0200
Subject: [PATCH 215/348] ENH: added polyBoundaryMesh patchID(meshFacei) method

- this complements the whichPatch(meshFacei) method [binary search]
  and the list of patchID() by adding internal range checks.

  eg,
     Before
     ~~~~~~
     if (facei >= mesh.nInternalFaces() && facei < mesh.nFaces())
     {
         patchi = pbm.patchID()[facei - mesh.nInternalFaces()];
         ...
     }

     After
     ~~~~~
     patchi = pbm.patchID(facei);

     if (patchi >= 0)
     {
         ...
     }
---
 .../foamToTetDualMesh/foamToTetDualMesh.C     |  7 +--
 .../preProcessing/setFields/setFields.C       |  2 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       | 60 ++++++++++++++-----
 .../polyBoundaryMesh/polyBoundaryMesh.H       | 23 +++++--
 .../polyMeshTetDecomposition.C                | 14 ++---
 src/finiteArea/faMesh/faMeshTopology.C        |  5 +-
 ...InletVelocityFvPatchVectorFieldTemplates.C | 26 ++++----
 .../interpolationCellPatchConstrained.C       | 12 ++--
 ...irectionalPressureGradientExplicitSource.C |  4 +-
 .../basic/InteractionLists/InteractionLists.C | 17 ++----
 .../FacePostProcessing/FacePostProcessing.C   | 12 ++--
 .../RemoveParcels/RemoveParcels.C             |  7 +--
 .../snappyHexMeshDriver/snappyLayerDriver.C   |  4 +-
 .../snappyHexMeshDriver/snappyRefineDriver.C  | 21 ++-----
 .../trackingInverseDistance/voxelMeshSearch.C |  4 +-
 .../isoAdvection/isoAdvection.C               |  9 ++-
 .../isoAdvection/isoAdvectionTemplates.C      |  5 +-
 17 files changed, 123 insertions(+), 109 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 72b8877c7a..6dcc567e19 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -106,11 +106,10 @@ void ReadAndMapFields
             }
             else if (index < 0)
             {
-                label facei = -index-1;
-                label bFacei = facei - mesh.nInternalFaces();
-                if (bFacei >= 0)
+                const label facei = -index-1;
+                const label patchi = mesh.boundaryMesh().patchID(facei);
+                if (patchi >= 0)
                 {
-                    label patchi = mesh.boundaryMesh().patchID()[bFacei];
                     label localFacei = mesh.boundaryMesh()[patchi].whichFace
                     (
                         facei
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index a5c984cfad..2865c0e1df 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -391,7 +391,7 @@ bool setFaceFieldType
             }
             else
             {
-                label patchi = mesh.boundaryMesh().patchID()[bFacei];
+                const label patchi = mesh.boundaryMesh().patchID()[bFacei];
 
                 allBoundaryValues[bFacei] = fieldValue;
                 ++nChanged[patchi];
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 2f2ce8a568..4dca521071 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -450,6 +450,31 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const
 }
 
 
+Foam::label Foam::polyBoundaryMesh::patchID(const label meshFacei) const
+{
+    const label bndFacei = (meshFacei - mesh_.nInternalFaces());
+
+    return
+    (
+        (bndFacei >= 0 && bndFacei < mesh_.nBoundaryFaces())
+      ? this->patchID()[bndFacei]
+      : -1
+    );
+}
+
+
+Foam::labelList
+Foam::polyBoundaryMesh::patchID(const labelUList& meshFaceIndices) const
+{
+    labelList output(meshFaceIndices.size());
+    forAll(meshFaceIndices, i)
+    {
+        output[i] = patchID(meshFaceIndices[i]);
+    }
+    return output;
+}
+
+
 const Foam::HashTable<Foam::labelList>&
 Foam::polyBoundaryMesh::groupPatchIDs() const
 {
@@ -789,22 +814,22 @@ Foam::label Foam::polyBoundaryMesh::findPatchID
 
 
 Foam::labelPair
-Foam::polyBoundaryMesh::whichPatchFace(const label faceIndex) const
+Foam::polyBoundaryMesh::whichPatchFace(const label meshFacei) const
 {
-    if (faceIndex < mesh().nInternalFaces())
+    if (meshFacei < mesh().nInternalFaces())
     {
         // Internal face: return (-1, meshFace)
-        return labelPair(-1, faceIndex);
+        return labelPair(-1, meshFacei);
     }
-    else if (faceIndex >= mesh().nFaces())
+    else if (meshFacei >= mesh().nFaces())
     {
         // Bounds error: abort
         FatalErrorInFunction
-            << "Face " << faceIndex
+            << "Face " << meshFacei
             << " out of bounds. Number of geometric faces " << mesh().nFaces()
             << abort(FatalError);
 
-        return labelPair(-1, faceIndex);
+        return labelPair(-1, meshFacei);
     }
 
 
@@ -812,44 +837,47 @@ Foam::polyBoundaryMesh::whichPatchFace(const label faceIndex) const
     // Find out which patch index and local patch face the specified
     // mesh face belongs to by comparing label with patch start labels.
 
+
+    // TBD: use patchIDPtr_ if it exists?
+
     const polyPatchList& patches = *this;
 
     const label patchi =
         findLower
         (
             patches,
-            faceIndex,
+            meshFacei,
             0,
             // Must include the start in the comparison
             [](const polyPatch& p, label val) { return (p.start() <= val); }
         );
 
-    if (patchi < 0 || !patches[patchi].range().found(faceIndex))
+    if (patchi < 0 || !patches[patchi].range().contains(meshFacei))
     {
         // If not in any of above, it is trouble!
         FatalErrorInFunction
-            << "Face " << faceIndex << " not found in any of the patches "
+            << "Face " << meshFacei << " not found in any of the patches "
             << flatOutput(names()) << nl
             << "The patches appear to be inconsistent with the mesh :"
             << " internalFaces:" << mesh().nInternalFaces()
             << " total number of faces:" << mesh().nFaces()
             << abort(FatalError);
 
-        return labelPair(-1, faceIndex);
+        return labelPair(-1, meshFacei);
     }
 
     // (patch, local face index)
-    return labelPair(patchi, faceIndex - patches[patchi].start());
+    return labelPair(patchi, meshFacei - patches[patchi].start());
 }
 
 
 Foam::labelPairList
-Foam::polyBoundaryMesh::whichPatchFace(const labelUList& faceIndices) const
+Foam::polyBoundaryMesh::whichPatchFace(const labelUList& meshFaceIndices) const
 {
-    labelPairList output(faceIndices.size());
-    forAll(faceIndices, i)
+    labelPairList output(meshFaceIndices.size());
+    forAll(meshFaceIndices, i)
     {
-        output[i] = whichPatchFace(faceIndices[i]);
+        output[i] = whichPatchFace(meshFaceIndices[i]);
     }
     return output;
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 8787136c47..fa2b321a8c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -247,20 +247,31 @@ public:
 
         //- Lookup mesh face index and return (patchi, patchFacei) tuple
         //- or (-1, meshFacei) for internal faces
-        labelPair whichPatchFace(const label faceIndex) const;
+        labelPair whichPatchFace(const label meshFacei) const;
 
         //- Lookup mesh face indices and return (patchi, patchFacei) tuples
-        labelPairList whichPatchFace(const labelUList& faceIndices) const;
+        labelPairList whichPatchFace(const labelUList& meshFaceIndices) const;
 
-        //- Return patch index for a given mesh face index
-        label whichPatch(const label faceIndex) const
+        //- Return patch index for a given mesh face index.
+        //- Uses binary search.
+        label whichPatch(const label meshFacei) const
         {
-            return whichPatchFace(faceIndex).first();
+            return whichPatchFace(meshFacei).first();
         }
 
         //- Per boundary face label the patch index
         const labelList& patchID() const;
 
+        //- Return patch index for a given mesh face index.
+        //- Uses direct lookup into patchID() list.
+        //- Returns -1 for internal or out-of-range faces
+        label patchID(const label meshFacei) const;
+
+        //- Lookup mesh face indices and return patch indices.
+        //- Uses direct lookup into patchID() list.
+        //- Returns values of -1 for internal or out-of-range faces
+        labelList patchID(const labelUList& meshFaceIndices) const;
+
         //- The patch indices per patch group
         const HashTable<labelList>& groupPatchIDs() const;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
index 717fde2a0e..36a98b990b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
@@ -268,14 +268,14 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts
         fI++, bFI++
     )
     {
-        label patchi = mesh.boundaryMesh().patchID()[bFI];
+        const label patchi = mesh.boundaryMesh().patchID()[bFI];
 
         if (patches[patchi].coupled())
         {
-            const coupledPolyPatch& pp =
+            const coupledPolyPatch& cpp =
                 refCast<const coupledPolyPatch>(patches[patchi]);
 
-            if (pp.owner())
+            if (cpp.owner())
             {
                 boundaryFaceTetBasePtIs[bFI] = findSharedBasePoint
                 (
@@ -340,11 +340,11 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts
             continue;
         }
 
-        label patchi = mesh.boundaryMesh().patchID()[bFI];
+        const label patchi = mesh.boundaryMesh().patchID()[bFI];
 
         if (patches[patchi].coupled())
         {
-            const coupledPolyPatch& pp =
+            const coupledPolyPatch& cpp =
                 refCast<const coupledPolyPatch>(patches[patchi]);
 
             // Calculated base points on coupled faces are those of
@@ -369,7 +369,7 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts
             // +: 6 - 1 = 5
             // #: 6 - 2 = 4
 
-            if (!pp.owner())
+            if (!cpp.owner())
             {
                 bFTetBasePtI = mesh.faces()[fI].size() - bFTetBasePtI;
             }
@@ -476,7 +476,7 @@ bool Foam::polyMeshTetDecomposition::checkFaceTets
         }
         else
         {
-            label patchi = patches.patchID()[facei - mesh.nInternalFaces()];
+            const label patchi = patches.patchID(facei);
 
             if (patches[patchi].coupled())
             {
diff --git a/src/finiteArea/faMesh/faMeshTopology.C b/src/finiteArea/faMesh/faMeshTopology.C
index f91f3ec23f..daa5ac9131 100644
--- a/src/finiteArea/faMesh/faMeshTopology.C
+++ b/src/finiteArea/faMesh/faMeshTopology.C
@@ -138,10 +138,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
 
             const label patchFacei = edgeFaces[0];
             const label meshFacei = faceLabels_[patchFacei];
-            const label bndFacei = (meshFacei - mesh().nInternalFaces());
-
-            /// const label patchId = pbm.whichPatch(meshFacei);
-            const label patchId = pbm.patchID()[bndFacei];
+            const label patchId = pbm.patchID(meshFacei);
 
             // Primary bookkeeping
             {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
index 7c30a117c6..b594bd28b5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
@@ -39,7 +39,8 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage
     Type& average
 ) const
 {
-    const fvMesh& mesh(patch().boundaryMesh().mesh());
+    const fvMesh& mesh = patch().boundaryMesh().mesh();
+    const auto& pbm = mesh.boundaryMesh();
 
     bitSet isMasterFace(syncTools::getInternalOrMasterFaces(mesh));
 
@@ -48,33 +49,30 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage
     area = 0;
     average = Type(Zero);
 
-    forAll(zone, faceI)
+    for (const label meshFacei : zone)
     {
-        const label f(zone[faceI]);
-
-        if (mesh.isInternalFace(f))
+        if (mesh.isInternalFace(meshFacei))
         {
-            const scalar da(mesh.magSf()[f]);
+            const scalar da = mesh.magSf()[meshFacei];
 
             area += da;
-            average += da*field[f];
+            average += da*field[meshFacei];
         }
-        else if (isMasterFace[f])
+        else if (isMasterFace[meshFacei])
         {
-            const label bf(f-mesh.nInternalFaces());
-            const label patchID = mesh.boundaryMesh().patchID()[bf];
-            const label lf(mesh.boundaryMesh()[patchID].whichFace(f));
-            const scalar da(mesh.magSf().boundaryField()[patchID][lf]);
+            const label patchi = pbm.patchID(meshFacei);
+            const label patchFacei = pbm[patchi].whichFace(meshFacei);
+            const scalar da = mesh.magSf().boundaryField()[patchi][patchFacei];
 
             area += da;
-            average += da*field.boundaryField()[patchID][lf];
+            average += da*field.boundaryField()[patchi][patchFacei];
         }
     }
 
     reduce(area, sumOp<scalar>());
     reduce(average, sumOp<Type>());
 
-    average /= area;
+    average /= (area + VSMALL);
 }
 
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
index f5dd0c9519..354c7c2706 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C
@@ -50,13 +50,13 @@ Type Foam::interpolationCellPatchConstrained<Type>::interpolate
     const label facei
 ) const
 {
-    if (facei >= 0 && facei >= this->psi_.mesh().nInternalFaces())
-    {
-        // Use boundary value
-        const polyBoundaryMesh& pbm = this->psi_.mesh().boundaryMesh();
-        label patchi = pbm.patchID()[facei-this->psi_.mesh().nInternalFaces()];
-        label patchFacei = pbm[patchi].whichFace(facei);
+    const auto& pbm = this->psi_.mesh().boundaryMesh();
+    const label patchi = pbm.patchID(facei);
 
+    if (patchi >= 0)
+    {
+        // Boundary value
+        const label patchFacei = pbm[patchi].whichFace(facei);
         return this->psi_.boundaryField()[patchi][patchFacei];
     }
     else
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
index df48d608ef..d436078a18 100644
--- a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -412,7 +412,7 @@ void Foam::fv::directionalPressureGradientExplicitSource::correct
             }
             else if (fZone.flipMap()[i])
             {
-                label patchI = pbm.patchID()[faceI-mesh_.nInternalFaces()];
+                const label patchI = pbm.patchID(faceI);
                 label localFaceI = pbm[patchI].whichFace(faceI);
 
                 scalar w = mesh_.magSf().boundaryField()[patchI][localFaceI];
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index bd3ccbbd56..28609e9891 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -522,10 +522,7 @@ void Foam::InteractionLists<ParticleType>::buildInteractionLists()
 
         const face& f = mesh_.faces()[wallFaceIndex];
 
-        label patchi = mesh_.boundaryMesh().patchID()
-        [
-            wallFaceIndex - mesh_.nInternalFaces()
-        ];
+        const label patchi = mesh_.boundaryMesh().patchID(wallFaceIndex);
 
         referredWallFaces_[rWFI] = referredWallFace
         (
@@ -945,14 +942,10 @@ void Foam::InteractionLists<ParticleType>::prepareWallDataToRefer()
             globalTransforms.transformIndex(wfiat)
         );
 
-        label patchi = mesh_.boundaryMesh().patchID()
-        [
-            wallFaceIndex - mesh_.nInternalFaces()
-        ];
+        const label patchi = mesh_.boundaryMesh().patchID(wallFaceIndex);
 
-        label patchFacei =
-            wallFaceIndex
-          - mesh_.boundaryMesh()[patchi].start();
+        const label patchFacei =
+            mesh_.boundaryMesh()[patchi].whichFace(wallFaceIndex);
 
         // Need to transform velocity when tensor transforms are
         // supported
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index e358155e50..1240702ee8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -275,10 +275,12 @@ Foam::FacePostProcessing<CloudType>::FacePostProcessing
     const faceZoneMesh& fzm = owner.mesh().faceZones();
     const surfaceScalarField& magSf = owner.mesh().magSf();
     const polyBoundaryMesh& pbm = owner.mesh().boundaryMesh();
+
     forAll(faceZoneNames, i)
     {
         const word& zoneName = faceZoneNames[i];
         label zoneI = fzm.findZoneID(zoneName);
+
         if (zoneI != -1)
         {
             zoneIDs.append(zoneI);
@@ -291,17 +293,15 @@ Foam::FacePostProcessing<CloudType>::FacePostProcessing
             Info<< "        " << zoneName << " faces: " << nFaces << nl;
 
             scalar totArea = 0.0;
-            forAll(fz, j)
+            for (const label facei : fz)
             {
-                label facei = fz[j];
                 if (facei < owner.mesh().nInternalFaces())
                 {
-                    totArea += magSf[fz[j]];
+                    totArea += magSf[facei];
                 }
                 else
                 {
-                    label bFacei = facei - owner.mesh().nInternalFaces();
-                    label patchi = pbm.patchID()[bFacei];
+                    const label patchi = pbm.patchID(facei);
                     const polyPatch& pp = pbm[patchi];
 
                     if
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C
index dd92c540d5..3dad8bb247 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/RemoveParcels/RemoveParcels.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -195,7 +195,7 @@ Foam::RemoveParcels<CloudType>::RemoveParcels
             Info<< "        " << zoneName << " faces: " << nFaces << nl;
 
             scalar totArea = 0.0;
-            for (label facei : fz)
+            for (const label facei : fz)
             {
                 if (facei < owner.mesh().nInternalFaces())
                 {
@@ -203,8 +203,7 @@ Foam::RemoveParcels<CloudType>::RemoveParcels
                 }
                 else
                 {
-                    label bFacei = facei - owner.mesh().nInternalFaces();
-                    label patchi = pbm.patchID()[bFacei];
+                    const label patchi = pbm.patchID(facei);
                     const polyPatch& pp = pbm[patchi];
 
                     if
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index f2a038ba65..fb84d4622b 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -843,7 +843,7 @@ void Foam::snappyLayerDriver::handleWarpedFaces
     {
         const face& f = pp[i];
         label faceI = pp.addressing()[i];
-        label patchI = patches.patchID()[faceI-mesh.nInternalFaces()];
+        label patchI = patches.patchID(faceI);
 
         // It is hard to calculate some length scale if not in relative
         // mode so disable this check.
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index d0c67cef8e..c56eb54fad 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1029,23 +1029,14 @@ Foam::label Foam::snappyRefineDriver::danglingCellRefine
 
             forAll(cells, celli)
             {
-                const cell& cFaces = cells[celli];
-
                 label nIntFaces = 0;
-                forAll(cFaces, i)
+                for (const label meshFacei : cells[celli])
                 {
-                    label bFacei = cFaces[i]-mesh.nInternalFaces();
-                    if (bFacei < 0)
+                    const label patchi = pbm.patchID(meshFacei);
+
+                    if (patchi < 0 || pbm[patchi].coupled())
                     {
-                        nIntFaces++;
-                    }
-                    else
-                    {
-                        label patchi = pbm.patchID()[bFacei];
-                        if (pbm[patchi].coupled())
-                        {
-                            nIntFaces++;
-                        }
+                        ++nIntFaces;
                     }
                 }
 
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C b/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C
index ea5106b4cf..b56b6700ae 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -211,7 +211,7 @@ Foam::label Foam::voxelMeshSearch::searchProcPatch
     const pointField& cellCentres = mesh_.cellCentres();
     const polyBoundaryMesh& bMeshes = mesh_.boundaryMesh();
 
-    label patchi = bMeshes.patchID()[faceID-mesh_.nInternalFaces()];
+    const label patchi = bMeshes.patchID(faceID);
     const polyPatch& bMeshPatch = bMeshes[patchi];
 
     if (!isA<processorPolyPatch>(bMeshPatch))
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
index 27b94e3db3..d9b3f75e15 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
@@ -368,19 +368,18 @@ void Foam::isoAdvection::timeIntegratedFlux()
     const surfaceScalarField::Boundary& phib = phi_.boundaryField();
     const surfaceScalarField::Boundary& magSfb = mesh_.magSf().boundaryField();
     surfaceScalarField::Boundary& dVfb = dVf_.boundaryFieldRef();
-    const label nInternalFaces = mesh_.nInternalFaces();
 
     // Loop through boundary surface faces
     forAll(bsFaces_, i)
     {
         // Get boundary face index (in the global list)
         const label facei = bsFaces_[i];
-        const label patchi = boundaryMesh.patchID()[facei - nInternalFaces];
-        const label start = boundaryMesh[patchi].start();
+        const label patchi = boundaryMesh.patchID(facei);
 
         if (!phib[patchi].empty())
         {
-            const label patchFacei = facei - start;
+            const label patchFacei = boundaryMesh[patchi].whichFace(facei);
+
             const scalar phiP = phib[patchi][patchFacei];
 
             if (phiP >= 0)
@@ -601,7 +600,7 @@ void Foam::isoAdvection::checkIfOnProcPatch(const label facei)
     if (!mesh_.isInternalFace(facei))
     {
         const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
-        const label patchi = pbm.patchID()[facei - mesh_.nInternalFaces()];
+        const label patchi = pbm.patchID(facei);
 
         if (isA<processorPolyPatch>(pbm[patchi]) && !pbm[patchi].empty())
         {
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C
index cf2d4c0d4a..e51b4c9246 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C
@@ -50,7 +50,7 @@ Type Foam::isoAdvection::faceValue
         const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
         // Boundary face. Find out which face of which patch
-        const label patchi = pbm.patchID()[facei - mesh_.nInternalFaces()];
+        const label patchi = pbm.patchID(facei);
 
         if (patchi < 0 || patchi >= pbm.size())
         {
@@ -89,7 +89,7 @@ void Foam::isoAdvection::setFaceValue
         const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
         // Boundary face. Find out which face of which patch
-        const label patchi = pbm.patchID()[facei - mesh_.nInternalFaces()];
+        const label patchi = pbm.patchID(facei);
 
         if (patchi < 0 || patchi >= pbm.size())
         {
@@ -106,7 +106,6 @@ void Foam::isoAdvection::setFaceValue
         }
 
         const label patchFacei = pp.whichFace(facei);
-
         f.boundaryFieldRef()[patchi][patchFacei] = value;
     }
 }

From 31600c96d4465643c96649d74a89d617384ced82 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 18:55:23 +0200
Subject: [PATCH 216/348] ENH: output finiteArea patchID with foamToVTK
 -with-ids

- can be quite useful for debugging/orientation with complex
  geometries
---
 .../foamToVTK/convertAreaFields.H             | 20 ++++++++++++++-----
 .../foamToVTK/convertLagrangian.H             |  6 +++---
 .../foamToVTK/convertProcessorPatches.H       | 17 ++++++++--------
 .../foamToVTK/convertSurfaceFields.H          |  8 ++++----
 .../dataConversion/foamToVTK/convertTopoSet.H |  4 ++--
 .../foamToVTK/convertVolumeFields.H           |  8 ++++----
 .../dataConversion/foamToVTK/foamToVTK.C      |  8 ++++----
 7 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
index d72c251c27..bdfe96ceb5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -52,7 +52,7 @@ if (doFiniteArea)
                 outputDir/regionDir/"finite-area"
               / "finiteArea" + timeDesc
             ),
-            Pstream::parRun()
+            UPstream::parRun()
         );
         Info<< "    Area      : "
             << args.relativePath(writer.output()) << nl;
@@ -62,10 +62,10 @@ if (doFiniteArea)
         writer.writeTimeValue(timeValue);
         writer.writeGeometry();
 
-        // Optionally with (cellID, faceLabels, procID) fields
+        // Optionally with (cellID, patchID, faceLabels, procID) fields
         writer.beginCellData
         (
-            (withMeshIds ? 2 + (writer.parallel() ? 1 : 0) : 0)
+            (withMeshIds ? 3 + (writer.parallel() ? 1 : 0) : 0)
           + nAreaFields
         );
 
@@ -76,6 +76,16 @@ if (doFiniteArea)
             // Use global indexed values for the 'cell' ids
             writer.writeCellData("cellID", identity(procAddr.range()));
 
+            // The patch ids can also be quite useful
+            const polyBoundaryMesh& pbm = areaMesh.mesh().boundaryMesh();
+
+            labelList patchIds
+            (
+                areaMesh.mesh().boundaryMesh().patchID(areaMesh.faceLabels())
+            );
+
+            writer.writeCellData("patchID", patchIds);
+
             // Use proc-local data for faceLabels
             // (confusing enough already without renumbering)
             writer.writeCellData("faceLabels", areaMesh.faceLabels());
@@ -95,7 +105,7 @@ if (doFiniteArea)
 
         writer.close();
 
-        if (Pstream::master())
+        if (UPstream::master())
         {
             // Add to file-series and emit as JSON
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
index 7233b0cacf..cc533e3a9b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
@@ -30,7 +30,7 @@ if (doLagrangian)
         nameOp<fileName>()
     );
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         // Synchronise cloud names
         Pstream::combineReduce(cloudNames, ListOps::uniqueEqOp<word>());
@@ -78,7 +78,7 @@ if (doLagrangian)
                 outputDir/regionDir/cloud::prefix
               / cloudName/cloudName + timeDesc
             ),
-            Pstream::parRun()
+            UPstream::parRun()
         );
 
         Info<< "    Lagrangian: "
@@ -101,7 +101,7 @@ if (doLagrangian)
 
         writer.close();
 
-        if (Pstream::master())
+        if (UPstream::master())
         {
             // Add to file-series and emit as JSON
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
index a220bfecdc..32198a6eb9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H
@@ -71,9 +71,8 @@ Description
 
     label nPatchWriters = 0;
 
-    List<wordList> procPatchNames(Pstream::nProcs());
-
-    procPatchNames[Pstream::myProcNo()].resize(patchIds.size());
+    List<wordList> procPatchNames(UPstream::nProcs());
+    procPatchNames[UPstream::myProcNo()].resize(patchIds.size());
 
     for (const label patchId : patchIds)
     {
@@ -87,13 +86,13 @@ Description
             nearCellValue,
             (
                 vtmOutputBase
-              / subDirNaming(Pstream::myProcNo())
+              / subDirNaming(UPstream::myProcNo())
               / pp.name()
             ),
             false  // This MUST be non-parallel (serial only)
         );
 
-        procPatchNames[Pstream::myProcNo()][nPatchWriters] = pp.name();
+        procPatchNames[UPstream::myProcNo()][nPatchWriters] = pp.name();
 
         writer->writeTimeValue(timeValue);
         writer->writeGeometry();
@@ -111,10 +110,10 @@ Description
         for (vtk::patchWriter& writer : patchWriters)
         {
             // Optionally with patchID, procID, neighID fields
-            // - use Pstream::parRun() not writer.parallel() !!
+            // - use UPstream::parRun() not writer.parallel() !!
             writer.beginCellData
             (
-                (withMeshIds ? 1 + (Pstream::parRun() ? 2 : 0) : 0)
+                (withMeshIds ? 1 + (UPstream::parRun() ? 2 : 0) : 0)
               + nVolFields
             );
 
@@ -158,10 +157,10 @@ Description
 
     const label nProcPatches = returnReduce(nPatchWriters, sumOp<label>());
 
-    if (Pstream::master() && nProcPatches)
+    if (UPstream::master() && nProcPatches)
     {
         Info<< "Wrote " << nProcPatches << " processor boundaries from "
-            << Pstream::nProcs() << " processes" << nl;
+            << UPstream::nProcs() << " processes" << nl;
 
 
         // Collect individual boundaries into a vtm file
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H
index e44966991e..90fd1df8d8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H
@@ -82,7 +82,7 @@ Description
                     outputDir/regionDir
                   / "surface-fields"/"surfaceFields" + timeDesc
                 ),
-                Pstream::parRun()
+                UPstream::parRun()
             );
 
             Info<< "    Surface   : "
@@ -103,7 +103,7 @@ Description
 
             writer.close();
 
-            if (Pstream::master())
+            if (UPstream::master())
             {
                 // Add to file-series and emit as JSON
 
@@ -173,7 +173,7 @@ Description
                   / (meshProxy.useSubMesh() ? meshProxy.name() : fz.name())
                   + timeDesc
                 ),
-                Pstream::parRun()
+                UPstream::parRun()
             );
 
             Info<< "    FaceZone  : "
@@ -199,7 +199,7 @@ Description
 
             writer.close();
 
-            if (Pstream::master())
+            if (UPstream::master())
             {
                 // Add to file-series and emit as JSON
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H
index 547f5b0e8e..7ef617cc9f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H
@@ -39,7 +39,7 @@ if (faceSetName.size())
         set,
         writeOpts,
         outputName,
-        Pstream::parRun()
+        UPstream::parRun()
     );
 
     wroteTopoSet = true;
@@ -67,7 +67,7 @@ if (pointSetName.size())
         set,
         writeOpts,
         outputName,
-        Pstream::parRun()
+        UPstream::parRun()
     );
 
     wroteTopoSet = true;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
index 90e5be85cb..150e19f45e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H
@@ -103,7 +103,7 @@ Description
               ? vtmOutputBase
               : (vtmOutputBase / "internal")
             ),
-            Pstream::parRun()
+            UPstream::parRun()
         );
 
         // No sub-block for internal
@@ -158,7 +158,7 @@ Description
                 )
               : (vtmOutputBase / "boundary")
             ),
-            Pstream::parRun()
+            UPstream::parRun()
         );
 
         // No sub-block for one-patch
@@ -213,7 +213,7 @@ Description
                     )
                   : (vtmOutputBase / "boundary" / pp.name())
                 ),
-                Pstream::parRun()
+                UPstream::parRun()
             );
 
             if (!nPatchWriters)
@@ -432,7 +432,7 @@ Description
 
     // Collective output
 
-    if (Pstream::master())
+    if (UPstream::master())
     {
         // Naming for vtm, file series etc.
         fileName outputName(vtmOutputBase);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 779d0de545..15cbd5ecff 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -203,7 +203,7 @@ labelList getSelectedPatches
         {
             continue;
         }
-        else if (Pstream::parRun() && bool(isA<processorPolyPatch>(pp)))
+        else if (UPstream::parRun() && bool(isA<processorPolyPatch>(pp)))
         {
             break; // No processor patches for parallel output
         }
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
 
     if (args.found("processor-fields"))
     {
-        if (!Pstream::parRun())
+        if (!UPstream::parRun())
         {
             Info<< "Ignoring processor patch writing in serial"
                 << nl << endl;
@@ -689,7 +689,7 @@ int main(int argc, char *argv[])
 
     const fileName outputDir(args.globalPath()/vtkDirName);
 
-    if (Pstream::master())
+    if (UPstream::master())
     {
         // Overwrite or create the VTK/regionName directories.
         // For the default region, this is simply "VTK/"
@@ -832,7 +832,7 @@ int main(int argc, char *argv[])
         }
 
         // Emit multi-region vtm
-        if (Pstream::master() && regionNames.size() > 1)
+        if (UPstream::master() && regionNames.size() > 1)
         {
             fileName outputName
             (

From 1bef57d018c04f14a8008329e26cd971fc3cc0ba Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 4 May 2023 14:36:29 +0200
Subject: [PATCH 217/348] ENH: optional saving of illegal edges in patch
 surfaceType() check

- reduce some intermediate storage in looping

STYLE: explicit iterator dereference in syncTools
---
 .../polyMesh/syncTools/dummyTransform.H       |   4 +-
 .../meshes/polyMesh/syncTools/syncTools.H     |  12 +-
 .../polyMesh/syncTools/syncToolsTemplates.C   |  78 ++++----
 .../PatchTools/PatchToolsGatherAndMerge.C     |   6 +-
 .../PrimitivePatch/PrimitivePatch.H           |  21 ++-
 .../PrimitivePatch/PrimitivePatchCheck.C      | 171 ++++++++++--------
 .../PrimitivePatch/PrimitivePatchEdgeLoops.C  |  79 ++++----
 .../PrimitivePatch/PrimitivePatchMeshData.C   |   2 +-
 .../PrimitivePatchPointAddressing.C           |   2 +-
 9 files changed, 189 insertions(+), 186 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
index 3f803d7847..355c5f9e9c 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
@@ -32,8 +32,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dummyTransform_H
-#define dummyTransform_H
+#ifndef Foam_dummyTransform_H
+#define Foam_dummyTransform_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index be8f76ef98..43b5fb8af4 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef syncTools_H
-#define syncTools_H
+#ifndef Foam_syncTools_H
+#define Foam_syncTools_H
 
 #include "Pstream.H"
 #include "edgeHashes.H"
@@ -170,7 +170,7 @@ public:
                 UList<T>& faceValues,
                 const CombineOp& cop,
                 const TransformOp& top,
-                const bool parRun = Pstream::parRun()
+                const bool parRun = UPstream::parRun()
             );
 
 
@@ -609,7 +609,7 @@ public:
                 const bool isBoundaryOnly,
                 PackedList<Width>& faceValues,
                 const CombineOp& cop,
-                const bool parRun = Pstream::parRun()
+                const bool parRun = UPstream::parRun()
             );
 
             //- Synchronize mesh face values from PackedList/bitSet
@@ -619,7 +619,7 @@ public:
                 const polyMesh& mesh,
                 PackedList<Width>& faceValues,
                 const CombineOp& cop,
-                const bool parRun = Pstream::parRun()
+                const bool parRun = UPstream::parRun()
             );
 
             //- Synchronize boundary face values from PackedList/bitSet
@@ -629,7 +629,7 @@ public:
                 const polyMesh& mesh,
                 PackedList<Width>& faceValues,
                 const CombineOp& cop,
-                const bool parRun = Pstream::parRun()
+                const bool parRun = UPstream::parRun()
             );
 
             //- Swap coupled face values. Uses eqOp
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index ac4015a8ec..f24116864f 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,7 +48,7 @@ void Foam::syncTools::combine
 
     if (iter.good())
     {
-        cop(*iter, val);
+        cop(iter.val(), val);
     }
     else
     {
@@ -70,7 +70,7 @@ void Foam::syncTools::combine
 
     if (iter.good())
     {
-        cop(*iter, val);
+        cop(iter.val(), val);
     }
     else
     {
@@ -118,17 +118,17 @@ void Foam::syncTools::syncPointMap
                     sharedPointValues,
                     cop,
                     sharedPtAddr[i],    // index
-                    *fnd                // value
+                    fnd.val()           // value
                 );
             }
         }
     }
 
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         DynamicList<label> neighbProcs;
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
         // Send
         for (const polyPatch& pp : patches)
@@ -140,7 +140,7 @@ void Foam::syncTools::syncPointMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                neighbProcs.append(nbrProci);
+                neighbProcs.push_back(nbrProci);
 
                 // Get data per patchPoint in neighbouring point numbers.
 
@@ -157,7 +157,7 @@ void Foam::syncTools::syncPointMap
 
                     if (iter.good())
                     {
-                        patchInfo.insert(nbrPts[i], *iter);
+                        patchInfo.insert(nbrPts[i], iter.val());
                     }
                 }
 
@@ -300,14 +300,14 @@ void Foam::syncTools::syncPointMap
 
         // Reduce on master.
 
-        if (Pstream::parRun())
+        if (UPstream::parRun())
         {
-            if (Pstream::master())
+            if (UPstream::master())
             {
                 // Receive the edges using shared points from other procs
-                for (const int proci : Pstream::subProcs())
+                for (const int proci : UPstream::subProcs())
                 {
-                    IPstream fromProc(Pstream::commsTypes::scheduled, proci);
+                    IPstream fromProc(UPstream::commsTypes::scheduled, proci);
                     Map<T> nbrValues(fromProc);
 
                     // Merge neighbouring values with my values
@@ -328,8 +328,8 @@ void Foam::syncTools::syncPointMap
                 // Send to master
                 OPstream toMaster
                 (
-                    Pstream::commsTypes::scheduled,
-                    Pstream::masterNo()
+                    UPstream::commsTypes::scheduled,
+                    UPstream::masterNo()
                 );
                 toMaster << sharedPointValues;
             }
@@ -355,7 +355,7 @@ void Foam::syncTools::syncPointMap
 
             if (sharedFnd.good())
             {
-                pointValues.set(*iter, *sharedFnd);
+                pointValues.set(iter.val(), sharedFnd.val());
             }
         }
     }
@@ -381,10 +381,10 @@ void Foam::syncTools::syncEdgeMap
     // Swap proc patch info
     // ~~~~~~~~~~~~~~~~~~~~
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         DynamicList<label> neighbProcs;
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
         // Send
         for (const polyPatch& pp : patches)
@@ -396,7 +396,7 @@ void Foam::syncTools::syncEdgeMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                neighbProcs.append(nbrProci);
+                neighbProcs.push_back(nbrProci);
 
                 // Get data per patch edge in neighbouring edge.
 
@@ -408,14 +408,14 @@ void Foam::syncTools::syncEdgeMap
 
                 for (const edge& e : edges)
                 {
-                    const edge meshEdge(meshPts[e[0]], meshPts[e[1]]);
+                    const edge meshEdge(meshPts, e);
 
                     const auto iter = edgeValues.cfind(meshEdge);
 
                     if (iter.good())
                     {
-                        const edge nbrEdge(nbrPts[e[0]], nbrPts[e[1]]);
-                        patchInfo.insert(nbrEdge, *iter);
+                        const edge nbrEdge(nbrPts, e);
+                        patchInfo.insert(nbrEdge, iter.val());
                     }
                 }
 
@@ -515,7 +515,7 @@ void Foam::syncTools::syncEdgeMap
 
                     if (iter.good())
                     {
-                        half0Values.insert(edgei, *iter);
+                        half0Values.insert(edgei, iter.val());
                     }
                 }
                 {
@@ -526,7 +526,7 @@ void Foam::syncTools::syncEdgeMap
 
                     if (iter.good())
                     {
-                        half1Values.insert(edgei, *iter);
+                        half1Values.insert(edgei, iter.val());
                     }
                 }
             }
@@ -653,14 +653,14 @@ void Foam::syncTools::syncEdgeMap
     //  shared edge).
     // Reduce this on the master.
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
-        if (Pstream::master())
+        if (UPstream::master())
         {
             // Receive the edges using shared points from other procs
-            for (const int proci : Pstream::subProcs())
+            for (const int proci : UPstream::subProcs())
             {
-                IPstream fromProc(Pstream::commsTypes::scheduled, proci);
+                IPstream fromProc(UPstream::commsTypes::scheduled, proci);
                 EdgeMap<T> nbrValues(fromProc);
 
                 // Merge neighbouring values with my values
@@ -682,8 +682,8 @@ void Foam::syncTools::syncEdgeMap
             {
                 OPstream toMaster
                 (
-                    Pstream::commsTypes::scheduled,
-                    Pstream::masterNo()
+                    UPstream::commsTypes::scheduled,
+                    UPstream::masterNo()
                 );
                 toMaster << sharedEdgeValues;
             }
@@ -772,7 +772,7 @@ void Foam::syncTools::syncPointList
 
         if (iter.good())
         {
-            cppFld[*iter] = pointValues[i];
+            cppFld[iter.val()] = pointValues[i];
         }
     }
 
@@ -793,7 +793,7 @@ void Foam::syncTools::syncPointList
 
         if (iter.good())
         {
-            pointValues[i] = cppFld[*iter];
+            pointValues[i] = cppFld[iter.val()];
         }
     }
 }
@@ -1028,7 +1028,7 @@ void Foam::syncTools::syncBoundaryFaceList
         if
         (
             is_contiguous<T>::value
-         && Pstream::defaultCommsType == Pstream::commsTypes::nonBlocking
+         && UPstream::defaultCommsType == UPstream::commsTypes::nonBlocking
         )
         {
             const label startRequest = UPstream::nRequests();
@@ -1054,7 +1054,7 @@ void Foam::syncTools::syncBoundaryFaceList
 
                     UIPstream::read
                     (
-                        Pstream::commsTypes::nonBlocking,
+                        UPstream::commsTypes::nonBlocking,
                         procPatch.neighbProcNo(),
                         fld.data_bytes(),
                         fld.size_bytes()
@@ -1080,7 +1080,7 @@ void Foam::syncTools::syncBoundaryFaceList
 
                     UOPstream::write
                     (
-                        Pstream::commsTypes::nonBlocking,
+                        UPstream::commsTypes::nonBlocking,
                         procPatch.neighbProcNo(),
                         fld.cdata_bytes(),
                         fld.size_bytes()
@@ -1126,7 +1126,7 @@ void Foam::syncTools::syncBoundaryFaceList
         else
         {
             DynamicList<label> neighbProcs;
-            PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+            PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
             // Send
             for (const polyPatch& pp : patches)
@@ -1138,7 +1138,7 @@ void Foam::syncTools::syncBoundaryFaceList
                     const auto& procPatch = *ppp;
                     const label nbrProci = procPatch.neighbProcNo();
 
-                    neighbProcs.append(nbrProci);
+                    neighbProcs.push_back(nbrProci);
 
                     const SubList<T> fld
                     (
@@ -1289,7 +1289,7 @@ void Foam::syncTools::syncFaceList
 
                 UIPstream::read
                 (
-                    Pstream::commsTypes::nonBlocking,
+                    UPstream::commsTypes::nonBlocking,
                     procPatch.neighbProcNo(),
                     recvInfo.data_bytes(),
                     recvInfo.size_bytes()
@@ -1324,7 +1324,7 @@ void Foam::syncTools::syncFaceList
 
                 UOPstream::write
                 (
-                    Pstream::commsTypes::nonBlocking,
+                    UPstream::commsTypes::nonBlocking,
                     procPatch.neighbProcNo(),
                     sendInfo.cdata_bytes(),
                     sendInfo.size_bytes()
@@ -1333,7 +1333,7 @@ void Foam::syncTools::syncFaceList
         }
 
         // Wait for all comms to finish
-        Pstream::waitRequests(startRequest);
+        UPstream::waitRequests(startRequest);
 
         // Combine with existing data
         for (const polyPatch& pp : patches)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
index d4dff1f351..750d148387 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
@@ -92,7 +92,7 @@ void Foam::PatchTools::gatherAndMerge
 
     labelList boundaryPoints;
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         const globalIndex localPointAddr
         (
@@ -117,7 +117,7 @@ void Foam::PatchTools::gatherAndMerge
     }
 
 
-    if (Pstream::parRun() && Pstream::master())
+    if (UPstream::parRun() && UPstream::master())
     {
         labelList pointToUnique;
 
@@ -206,7 +206,7 @@ void Foam::PatchTools::gatherAndMerge
 {
     typedef typename FaceList::value_type FaceType;
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         // Renumber the points/faces into unique points
         globalPointsPtr = mesh.globalData().mergePoints
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 0c83b4c273..95046da8f4 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -111,6 +111,7 @@ public:
     // Public Data Types
 
         //- Enumeration defining the surface type. Used in check routines.
+        //  Ordered from 'good' to 'bad'
         enum surfaceTopo
         {
             MANIFOLD,
@@ -242,10 +243,10 @@ private:
         void visitPointRegion
         (
             const label pointi,
-            const labelList& pFaces,
+            const labelUList& pFaces,
             const label startFacei,
-            const label startEdgeI,
-            boolList& pFacesHad
+            const label startEdgei,
+            UList<bool>& pFacesVisited
         ) const;
 
 
@@ -525,12 +526,14 @@ public:
 
     // Check
 
-        //- Calculate surface type formed by patch.
-        //  Types:
+        //- Calculate surface type formed by patch,
+        //- optionally recording the indices of illegal edges.
+        //
+        //  Return types:
         //  - all edges have two neighbours (manifold)
         //  - some edges have more than two neighbours (illegal)
         //  - other (open)
-        surfaceTopo surfaceType() const;
+        surfaceTopo surfaceType(labelHashSet* badEdgesPtr = nullptr) const;
 
         //- Check surface formed by patch for manifoldness (see above).
         //  Return true if any incorrect edges are found.
@@ -538,7 +541,7 @@ public:
         bool checkTopology
         (
             const bool report = false,
-            labelHashSet* setPtr = nullptr
+            labelHashSet* pointSetPtr = nullptr
         ) const;
 
         //- Checks primitivePatch for faces sharing point but not edge.
@@ -550,7 +553,7 @@ public:
         bool checkPointManifold
         (
             const bool report = false,
-            labelHashSet* setPtr = nullptr
+            labelHashSet* pointSetPtr = nullptr
         ) const;
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
index ff1fef3f3c..d8c7454e50 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ Description
 
 #include "PrimitivePatch.H"
 #include "Map.H"
-#include "ListOps.H"
+#include "DynamicList.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -40,60 +40,54 @@ void
 Foam::PrimitivePatch<FaceList, PointField>::visitPointRegion
 (
     const label pointi,
-    const labelList& pFaces,
+    const labelUList& pFaces,
     const label startFacei,
-    const label startEdgeI,
-    boolList& pFacesHad
+    const label startEdgei,
+    UList<bool>& pFacesVisited
 ) const
 {
-    label index = pFaces.find(startFacei);
+    const label index = pFaces.find(startFacei);
 
-    if (!pFacesHad[index])
+    if (index >= 0 && !pFacesVisited[index])
     {
-        // Mark face as been visited.
-        pFacesHad[index] = true;
+        // Mark face as visited
+        pFacesVisited[index] = true;
 
         // Step to next edge on face which is still using pointi
-        const labelList& fEdges = faceEdges()[startFacei];
+        label nextEdgei = -1;
 
-        label nextEdgeI = -1;
-
-        forAll(fEdges, i)
+        for (const label faceEdgei : faceEdges()[startFacei])
         {
-            label edgeI = fEdges[i];
+            const edge& e = edges()[faceEdgei];
 
-            const edge& e = edges()[edgeI];
-
-            if (edgeI != startEdgeI && (e[0] == pointi || e[1] == pointi))
+            if (faceEdgei != startEdgei && e.contains(pointi))
             {
-                nextEdgeI = edgeI;
-
+                nextEdgei = faceEdgei;
                 break;
             }
         }
 
-        if (nextEdgeI == -1)
+        if (nextEdgei == -1)
         {
             FatalErrorInFunction
-                << "Problem: cannot find edge out of " << fEdges
+                << "Problem: cannot find edge out of "
+                << faceEdges()[startFacei]
                 << "on face " << startFacei << " that uses point " << pointi
-                << " and is not edge " << startEdgeI << abort(FatalError);
+                << " and is not edge " << startEdgei << abort(FatalError);
         }
 
         // Walk to next face(s) across edge.
-        const labelList& eFaces = edgeFaces()[nextEdgeI];
-
-        forAll(eFaces, i)
+        for (const label edgeFacei : edgeFaces()[nextEdgei])
         {
-            if (eFaces[i] != startFacei)
+            if (edgeFacei != startFacei)
             {
                 visitPointRegion
                 (
                     pointi,
                     pFaces,
-                    eFaces[i],
-                    nextEdgeI,
-                    pFacesHad
+                    edgeFacei,
+                    nextEdgei,
+                    pFacesVisited
                 );
             }
         }
@@ -105,33 +99,56 @@ Foam::PrimitivePatch<FaceList, PointField>::visitPointRegion
 
 template<class FaceList, class PointField>
 typename Foam::PrimitivePatch<FaceList, PointField>::surfaceTopo
-Foam::PrimitivePatch<FaceList, PointField>::surfaceType() const
+Foam::PrimitivePatch<FaceList, PointField>::surfaceType
+(
+    labelHashSet* badEdgesPtr
+) const
 {
-    DebugInFunction << "Calculating patch topology" << nl;
+    if (badEdgesPtr)
+    {
+        badEdgesPtr->clear();
+    }
+
+    bool foundError = false;
+
+    surfaceTopo pType = surfaceTopo::MANIFOLD;
 
     const labelListList& edgeFcs = edgeFaces();
 
-    surfaceTopo pType = MANIFOLD;
-
-    forAll(edgeFcs, edgeI)
+    forAll(edgeFcs, edgei)
     {
-        label nNbrs = edgeFcs[edgeI].size();
+        const label nNbrs = edgeFcs[edgei].size();
 
         if (nNbrs < 1 || nNbrs > 2)
         {
-            pType = ILLEGAL;
+            // Surface is illegal
+            foundError = true;
 
-            // Can exit now. Surface is illegal.
-            return pType;
+            if (badEdgesPtr)
+            {
+                // Record and continue
+                if (nNbrs > 2)
+                {
+                    badEdgesPtr->insert(edgei);
+                }
+            }
+            else
+            {
+                // Early exit when not recording bad edges
+                break;
+            }
         }
         else if (nNbrs == 1)
         {
             // Surface might be open or illegal so keep looping.
-            pType = OPEN;
+            pType = surfaceTopo::OPEN;
         }
     }
 
-    DebugInFunction << "Calculated patch topology" << nl;
+    if (foundError)
+    {
+        return surfaceTopo::ILLEGAL;
+    }
 
     return pType;
 }
@@ -142,45 +159,40 @@ bool
 Foam::PrimitivePatch<FaceList, PointField>::checkTopology
 (
     const bool report,
-    labelHashSet* setPtr
+    labelHashSet* pointSetPtr
 ) const
 {
-    DebugInFunction << "Checking patch topology" << nl;
-
     // Check edgeFaces
 
+    bool foundError = false;
+
     const labelListList& edgeFcs = edgeFaces();
 
-    bool illegalTopo = false;
-
-    forAll(edgeFcs, edgeI)
+    forAll(edgeFcs, edgei)
     {
-        label nNbrs = edgeFcs[edgeI].size();
+        const label nNbrs = edgeFcs[edgei].size();
 
         if (nNbrs < 1 || nNbrs > 2)
         {
-            illegalTopo = true;
+            foundError = true;
 
             if (report)
             {
-                Info<< "Edge " << edgeI << " with vertices:" << edges()[edgeI]
-                    << " has " << nNbrs << " face neighbours"
-                    << endl;
+                Info<< "Edge " << edgei << " with vertices:" << edges()[edgei]
+                    << " has " << nNbrs << " face neighbours" << endl;
             }
 
-            if (setPtr)
+            if (pointSetPtr)
             {
-                const edge& e = edges()[edgeI];
+                const edge& e = edges()[edgei];
 
-                setPtr->insert(meshPoints()[e.start()]);
-                setPtr->insert(meshPoints()[e.end()]);
+                pointSetPtr->insert(meshPoints()[e.first()]);
+                pointSetPtr->insert(meshPoints()[e.second()]);
             }
         }
     }
 
-    DebugInFunction << "Checked patch topology" << nl;
-
-    return illegalTopo;
+    return foundError;
 }
 
 
@@ -189,7 +201,7 @@ bool
 Foam::PrimitivePatch<FaceList, PointField>::checkPointManifold
 (
     const bool report,
-    labelHashSet* setPtr
+    labelHashSet* pointSetPtr
 ) const
 {
     const labelListList& pf = pointFaces();
@@ -199,47 +211,48 @@ Foam::PrimitivePatch<FaceList, PointField>::checkPointManifold
 
     bool foundError = false;
 
+    // Visited faces (as indices into pFaces)
+    DynamicList<bool> pFacesVisited;
+
     forAll(pf, pointi)
     {
         const labelList& pFaces = pf[pointi];
 
-        // Visited faces (as indices into pFaces)
-        boolList pFacesHad(pFaces.size(), false);
+        pFacesVisited.resize_nocopy(pFaces.size());
+        pFacesVisited = false;
 
         // Starting edge
         const labelList& pEdges = pe[pointi];
-        label startEdgeI = pEdges[0];
+        const label startEdgei = pEdges[0];
 
-        const labelList& eFaces = ef[startEdgeI];
+        const labelList& eFaces = ef[startEdgei];
 
-        forAll(eFaces, i)
+        for (const label edgeFacei : eFaces)
         {
             // Visit all faces using pointi, starting from eFaces[i] and
-            // startEdgeI. Mark off all faces visited in pFacesHad.
+            // startEdgei. Mark off all faces visited in pFacesVisited.
             this->visitPointRegion
             (
                 pointi,
                 pFaces,
-                eFaces[i],  // starting face for walk
-                startEdgeI, // starting edge for walk
-                pFacesHad
+                edgeFacei,  // starting face for walk
+                startEdgei, // starting edge for walk
+                pFacesVisited
             );
         }
 
         // After this all faces using pointi should have been visited and
-        // marked off in pFacesHad.
+        // marked off in pFacesVisited.
 
-        label unset = pFacesHad.find(false);
-
-        if (unset != -1)
+        if (pFacesVisited.contains(false))
         {
             foundError = true;
 
-            label meshPointi = mp[pointi];
+            const label meshPointi = mp[pointi];
 
-            if (setPtr)
+            if (pointSetPtr)
             {
-                setPtr->insert(meshPointi);
+                pointSetPtr->insert(meshPointi);
             }
 
             if (report)
@@ -251,18 +264,18 @@ Foam::PrimitivePatch<FaceList, PointField>::checkPointManifold
                     << " is multiply connected at this point" << nl
                     << "Connected (patch) faces:" << nl;
 
-                forAll(pFacesHad, i)
+                forAll(pFacesVisited, i)
                 {
-                    if (pFacesHad[i])
+                    if (pFacesVisited[i])
                     {
                         Info<< "    " << pFaces[i] << endl;
                     }
                 }
 
                 Info<< nl << "Unconnected (patch) faces:" << nl;
-                forAll(pFacesHad, i)
+                forAll(pFacesVisited, i)
                 {
-                    if (!pFacesHad[i])
+                    if (!pFacesVisited[i])
                     {
                         Info<< "    " << pFaces[i] << endl;
                     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
index 8b19fb5320..6d15926d6f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,7 +50,7 @@ Foam::PrimitivePatch<FaceList, PointField>::calcEdgeLoops() const
 
     const edgeList& patchEdges = edges();
     const label nIntEdges = nInternalEdges();
-    const label nBdryEdges = patchEdges.size() - nIntEdges;
+    const label nBdryEdges = (patchEdges.size() - nIntEdges);
 
     // Size return list plenty big
     edgeLoopsPtr_.reset(new labelListList(nBdryEdges));
@@ -68,74 +68,61 @@ Foam::PrimitivePatch<FaceList, PointField>::calcEdgeLoops() const
     // Walk point-edge-point and assign loop number
     //
 
-    // Loop per (boundary) edge.
-    labelList loopNumber(nBdryEdges, -1);
+    // Temporary storage for vertices of current loop
+    DynamicList<label> loop(nBdryEdges);
 
-    // Current loop number.
-    label loopI = 0;
+    // In a loop? - per boundary edge
+    boolList unvisited(nBdryEdges, true);
 
-    while (true)
+    // Current loop number
+    label numLoops = 0;
+
+    // Walk all boundary edges not yet in a loop
+    for
+    (
+        label bndEdgei = -1;
+        (bndEdgei = unvisited.find(true)) >= 0;
+        /*nil*/
+    )
     {
-        // Find edge not yet given a loop number.
-        label currentEdgeI = -1;
-
-        for (label edgeI = nIntEdges; edgeI < patchEdges.size(); edgeI++)
-        {
-            if (loopNumber[edgeI-nIntEdges] == -1)
-            {
-                currentEdgeI = edgeI;
-                break;
-            }
-        }
-
-        if (currentEdgeI == -1)
-        {
-            // Did not find edge not yet assigned a loop number so done all.
-            break;
-        }
-
-        // Temporary storage for vertices of current loop
-        DynamicList<label> loop(nBdryEdges);
+        label currentEdgei = (bndEdgei + nIntEdges);
 
         // Walk from first all the way round, assigning loops
-        label currentVertI = patchEdges[currentEdgeI].start();
+        label currentVerti = patchEdges[currentEdgei].first();
+
+        loop.clear();
 
         do
         {
-            loop.append(currentVertI);
+            loop.push_back(currentVerti);
 
-            loopNumber[currentEdgeI - nIntEdges] = loopI;
+            unvisited[currentEdgei - nIntEdges] = false;
 
             // Step to next vertex
-            currentVertI = patchEdges[currentEdgeI].otherVertex(currentVertI);
+            currentVerti = patchEdges[currentEdgei].otherVertex(currentVerti);
 
             // Step to next (unmarked, boundary) edge.
-            const labelList& curEdges = patchPointEdges[currentVertI];
+            currentEdgei = -1;
 
-            currentEdgeI = -1;
-
-            forAll(curEdges, pI)
+            for (const label edgei : patchPointEdges[currentVerti])
             {
-                label edgeI = curEdges[pI];
-
-                if (edgeI >= nIntEdges && (loopNumber[edgeI - nIntEdges] == -1))
+                if (edgei >= nIntEdges && unvisited[edgei - nIntEdges])
                 {
-                    // Unassigned boundary edge.
-                    currentEdgeI = edgeI;
-
+                    // Unvisited boundary edge
+                    currentEdgei = edgei;
                     break;
                 }
             }
         }
-        while (currentEdgeI != -1);
+        while (currentEdgei != -1);
 
-        // Done all for current loop. Transfer to edgeLoops.
-        edgeLoops[loopI].transfer(loop);
+        // Done all for current loop - copy to edgeLoops
+        edgeLoops[numLoops] = loop;
 
-        loopI++;
+        ++numLoops;
     }
 
-    edgeLoops.setSize(loopI);
+    edgeLoops.resize(numLoops);
 
     DebugInFunction << "Calculated boundary edge loops" << nl;
 }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
index a58efd3385..c75900e850 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
@@ -90,7 +90,7 @@ Foam::PrimitivePatch<FaceList, PointField>::calcMeshData() const
         {
             if (markedPoints.insert(pointi, meshPoints.size()))
             {
-                meshPoints.append(pointi);
+                meshPoints.push_back(pointi);
             }
         }
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index 97add49b7a..66072a42db 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -82,7 +82,7 @@ Foam::PrimitivePatch<FaceList, PointField>::calcPointFaces() const
     {
         for (const label pointi : locFcs[facei])
         {
-            pointFcs[pointi].append(facei);
+            pointFcs[pointi].push_back(facei);
         }
     }
 

From 783934ccad7f971d4be70af569110a3bc0b8d5cb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 3 May 2023 16:01:59 +0200
Subject: [PATCH 218/348] ENH: add global topology check in checkMesh and
 makeFaMesh (#2771)

- detect when boundary patches are multiply connected across edges

STYLE: initialize some faMesh values
---
 .../makeFaMesh/checkPatchTopology.H           | 164 +++++++++
 .../finiteArea/makeFaMesh/decomposeFaFields.H |  12 +-
 .../makeFaMesh/faMeshWriteEdgesOBJ.H          |   4 +-
 .../finiteArea/makeFaMesh/makeFaMesh.C        |   6 +-
 .../manipulation/checkMesh/checkTopology.C    | 348 +++++++++++++++---
 .../manipulation/checkMesh/checkTopology.H    | 105 ++++--
 src/finiteArea/faMesh/faMesh.C                |  21 +-
 src/finiteArea/faMesh/faMeshTopology.C        |  75 +++-
 8 files changed, 619 insertions(+), 116 deletions(-)
 create mode 100644 applications/utilities/finiteArea/makeFaMesh/checkPatchTopology.H

diff --git a/applications/utilities/finiteArea/makeFaMesh/checkPatchTopology.H b/applications/utilities/finiteArea/makeFaMesh/checkPatchTopology.H
new file mode 100644
index 0000000000..5fdf2c255b
--- /dev/null
+++ b/applications/utilities/finiteArea/makeFaMesh/checkPatchTopology.H
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+
+Description
+    Check topology of poly patches used for finite-area.
+
+Input
+    mesh (polyMesh)
+    meshDefDict (system/faMeshDefintion)
+
+\*---------------------------------------------------------------------------*/
+
+// Preliminary checks
+{
+    typedef typename uindirectPrimitivePatch::surfaceTopo TopoType;
+
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    wordRes polyPatchNames;
+    meshDefDict.readIfPresent("polyMeshPatches", polyPatchNames);
+
+    const labelList patchIDs
+    (
+        pbm.patchSet
+        (
+            polyPatchNames,
+            false,  // warnNotFound
+            true    // useGroups
+        ).sortedToc()
+    );
+
+    label nFaceLabels = 0;
+    for (const label patchi : patchIDs)
+    {
+        nFaceLabels += pbm[patchi].size();
+    }
+
+    labelList faceLabels(nFaceLabels);
+
+    nFaceLabels = 0;
+    for (const label patchi : patchIDs)
+    {
+        for (const label facei : pbm[patchi].range())
+        {
+            faceLabels[nFaceLabels] = facei;
+            ++nFaceLabels;
+        }
+    }
+
+    uindirectPrimitivePatch pp
+    (
+        UIndirectList<face>(mesh.faces(), faceLabels),
+        mesh.points()
+    );
+
+    // Non-manifold
+    labelHashSet badEdges(pp.nEdges()/20);
+
+    labelHashSet* pointSetPtr = nullptr;
+    labelHashSet* badEdgesPtr = &badEdges;
+
+    bool foundError = false;
+
+    if (returnReduceAnd(pp.empty()))
+    {
+        // Empty
+    }
+    else if (UPstream::parRun())
+    {
+        const labelList meshEdges
+        (
+            pp.meshEdges(mesh.edges(), mesh.pointEdges())
+        );
+
+        // Parallel - use mesh edges
+        // - no check for point-pinch
+        // - no check for consistent orientation (if that is posible to
+        //   check?)
+
+        // Count number of edge/face connections (globally)
+        labelList nEdgeConnections(mesh.nEdges(), Zero);
+
+        const labelListList& edgeFaces = pp.edgeFaces();
+
+        forAll(edgeFaces, edgei)
+        {
+            nEdgeConnections[meshEdges[edgei]] = edgeFaces[edgei].size();
+        }
+
+        // Synchronise across coupled edges
+        syncTools::syncEdgeList
+        (
+            mesh,
+            nEdgeConnections,
+            plusEqOp<label>(),
+            label(0)            // null value
+        );
+
+        label labelTyp = TopoType::MANIFOLD;
+        forAll(meshEdges, edgei)
+        {
+            const label meshEdgei = meshEdges[edgei];
+            const label numNbrs = nEdgeConnections[meshEdgei];
+            if (numNbrs == 1)
+            {
+                //if (pointSetPtr) pointSetPtr->insert(mesh.edges()[meshEdgei]);
+                labelTyp = max(labelTyp, TopoType::OPEN);
+            }
+            else if (numNbrs == 0 || numNbrs > 2)
+            {
+                if (pointSetPtr) pointSetPtr->insert(mesh.edges()[meshEdgei]);
+                if (badEdgesPtr) badEdgesPtr->insert(edgei);
+                labelTyp = max(labelTyp, TopoType::ILLEGAL);
+            }
+        }
+        reduce(labelTyp, maxOp<label>());
+
+        foundError = (labelTyp == TopoType::ILLEGAL);
+    }
+    else
+    {
+        const TopoType pTyp = pp.surfaceType(badEdgesPtr);
+
+        foundError = (pTyp == TopoType::ILLEGAL);
+    }
+
+    if (foundError)
+    {
+        edgeList dumpEdges(pp.edges(), badEdges.sortedToc());
+
+        vtk::lineWriter writer
+        (
+            pp.localPoints(),
+            dumpEdges,
+            fileName
+            (
+                mesh.time().globalPath()
+              / ("faMesh-construct.illegalEdges")
+            )
+        );
+
+        writer.writeGeometry();
+
+        // CellData
+        writer.beginCellData();
+        writer.writeProcIDs();
+
+        Info<< "Wrote "
+            << returnReduce(dumpEdges.size(), sumOp<label>())
+            << " bad edges: " << writer.output().name() << nl;
+        writer.close();
+    }
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H b/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H
index 27d1f4d0f0..f1a595e3b0 100644
--- a/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H
+++ b/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H
@@ -16,10 +16,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 // Embed do-while to support early termination
-if (doDecompose && Pstream::parRun())
+if (doDecompose && UPstream::parRun())
 do
 {
-    faMeshReconstructor reconstructor(aMesh, IOobjectOption::READ_IF_PRESENT);
+    faMeshReconstructor reconstructor(aMesh, IOobjectOption::LAZY_READ);
 
     if (!reconstructor.good())
     {
@@ -61,16 +61,16 @@ do
         auto oldHandler = fileHandler(fileOperation::NewUncollated());
         fileHandler().distributed(true);
 
-        if (Pstream::master())
+        if (UPstream::master())
         {
-            haveMeshOnProc.set(Pstream::myProcNo());
+            haveMeshOnProc.set(UPstream::myProcNo());
             subsetter.reset(new faMeshSubset(serialMesh));
 
-            const bool oldParRun = Pstream::parRun(false);
+            const bool oldParRun = UPstream::parRun(false);
 
             objects = IOobjectList(serialMesh.time(), runTime.timeName());
 
-            Pstream::parRun(oldParRun);
+            UPstream::parRun(oldParRun);
         }
 
         // Restore old settings
diff --git a/applications/utilities/finiteArea/makeFaMesh/faMeshWriteEdgesOBJ.H b/applications/utilities/finiteArea/makeFaMesh/faMeshWriteEdgesOBJ.H
index a5f4192d39..20e3a29e86 100644
--- a/applications/utilities/finiteArea/makeFaMesh/faMeshWriteEdgesOBJ.H
+++ b/applications/utilities/finiteArea/makeFaMesh/faMeshWriteEdgesOBJ.H
@@ -21,12 +21,12 @@ Description
 
     word outputName("finiteArea-edges.obj");
 
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         outputName = word
         (
             "finiteArea-edges-proc"
-          + Foam::name(Pstream::myProcNo())
+          + Foam::name(UPstream::myProcNo())
           + ".obj"
         );
     }
diff --git a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
index 9fcd6e5c0e..2d96b0d1b5 100644
--- a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
+++ b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,9 @@ Original Authors
 #include "faMeshReconstructor.H"
 #include "faMeshSubset.H"
 #include "PtrListOps.H"
+#include "foamVtkLineWriter.H"
 #include "foamVtkIndPatchWriter.H"
+#include "syncTools.H"
 #include "OBJstream.H"
 
 using namespace Foam;
@@ -128,6 +130,8 @@ int main(int argc, char *argv[])
         meshDefDict.add("emptyPatch", patchName, true);
     }
 
+    // Preliminary checks
+    #include "checkPatchTopology.H"
 
     // Create
     faMesh aMesh(mesh, meshDefDict);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 61dd8c1b51..4bd5054911 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,6 +36,7 @@ License
 #include "IOmanip.H"
 #include "emptyPolyPatch.H"
 #include "processorPolyPatch.H"
+#include "foamVtkLineWriter.H"
 #include "vtkCoordSetWriter.H"
 #include "vtkSurfaceWriter.H"
 #include "checkTools.H"
@@ -44,24 +45,34 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// NEWER CODE
+// ~~~~~~~~~~
+// Return true on error
 template<class PatchType>
-void Foam::checkPatch
+bool Foam::checkPatch
 (
     const bool allGeometry,
-    const word& name,
+    const std::string& name,
     const polyMesh& mesh,
     const PatchType& pp,
-    const labelList& meshFaces,
-    const labelList& meshEdges,
-    pointSet& points
+    const labelUList& meshEdges,
+    labelHashSet* pointSetPtr,
+    labelHashSet* badEdgesPtr
 )
 {
+    if (badEdgesPtr)
+    {
+        badEdgesPtr->clear();
+    }
+
     typedef typename PatchType::surfaceTopo TopoType;
 
+    bool foundError = false;
+
     const label globalSize = returnReduce(pp.size(), sumOp<label>());
 
     Info<< "    "
-        << setw(20) << name
+        << setw(20) << name.c_str()
         << setw(9) << globalSize
         << setw(9) << returnReduce(pp.nPoints(), sumOp<label>());
 
@@ -69,13 +80,169 @@ void Foam::checkPatch
     {
         Info<< setw(34) << "ok (empty)";
     }
-    else if (Pstream::parRun())
+    else if (UPstream::parRun())
     {
         // Parallel - use mesh edges
         // - no check for point-pinch
         // - no check for consistent orientation (if that is posible to
         //   check?)
 
+        // Count number of edge/face connections (globally)
+        labelList nEdgeConnections(mesh.nEdges(), Zero);
+
+        const labelListList& edgeFaces = pp.edgeFaces();
+
+        forAll(edgeFaces, edgei)
+        {
+            nEdgeConnections[meshEdges[edgei]] = edgeFaces[edgei].size();
+        }
+
+        // Synchronise across coupled edges
+        syncTools::syncEdgeList
+        (
+            mesh,
+            nEdgeConnections,
+            plusEqOp<label>(),
+            label(0)            // null value
+        );
+
+        label labelTyp = TopoType::MANIFOLD;
+        forAll(meshEdges, edgei)
+        {
+            const label meshEdgei = meshEdges[edgei];
+            const label numNbrs = nEdgeConnections[meshEdgei];
+            if (numNbrs == 1)
+            {
+                //if (pointSetPtr) pointSetPtr->insert(mesh.edges()[meshEdgei]);
+                labelTyp = max(labelTyp, TopoType::OPEN);
+            }
+            else if (numNbrs == 0 || numNbrs > 2)
+            {
+                if (pointSetPtr) pointSetPtr->insert(mesh.edges()[meshEdgei]);
+                if (badEdgesPtr) badEdgesPtr->insert(edgei);
+                labelTyp = max(labelTyp, TopoType::ILLEGAL);
+            }
+        }
+        reduce(labelTyp, maxOp<label>());
+
+        if (labelTyp == TopoType::MANIFOLD)
+        {
+            Info<< setw(34) << "ok (closed singly connected)";
+        }
+        else if (labelTyp == TopoType::OPEN)
+        {
+            Info<< setw(34) << "ok (non-closed singly connected)";
+        }
+        else
+        {
+            Info<< setw(34) << "multiply connected (shared edge)";
+        }
+
+        foundError = (labelTyp == TopoType::ILLEGAL);
+    }
+    else
+    {
+        const TopoType pTyp = pp.surfaceType(badEdgesPtr);
+
+        if (pTyp == TopoType::MANIFOLD)
+        {
+            if (pp.checkPointManifold(true, pointSetPtr))
+            {
+                Info<< setw(34) << "multiply connected (shared point)";
+            }
+            else
+            {
+                Info<< setw(34) << "ok (closed singly connected)";
+            }
+
+            if (pointSetPtr)
+            {
+                // Add points on non-manifold edges to make set complete
+                pp.checkTopology(false, pointSetPtr);
+            }
+        }
+        else
+        {
+            if (pointSetPtr)
+            {
+                pp.checkTopology(false, pointSetPtr);
+            }
+
+            if (pTyp == TopoType::OPEN)
+            {
+                Info<< setw(34) << "ok (non-closed singly connected)";
+            }
+            else
+            {
+                Info<< setw(34) << "multiply connected (shared edge)";
+            }
+        }
+
+        foundError = (pTyp == TopoType::ILLEGAL);
+    }
+
+    if (allGeometry)
+    {
+        boundBox bb(pp.box());
+        bb.reduce();
+
+        if (bb.good())
+        {
+            Info<< ' ' << bb;
+        }
+    }
+
+    return foundError;
+}
+
+
+// OLDER CODE
+// ~~~~~~~~~~
+// Return true on error
+template<class PatchType>
+bool Foam::checkPatch
+(
+    const bool allGeometry,
+    const std::string& name,
+    const polyMesh& mesh,
+    const PatchType& pp,
+    const labelUList& meshFaces,
+    const labelUList& meshEdges,
+    labelHashSet* pointSetPtr,
+    labelHashSet* badEdgesPtr
+)
+{
+    if (badEdgesPtr)
+    {
+        badEdgesPtr->clear();
+    }
+
+    typedef typename PatchType::surfaceTopo TopoType;
+
+    bool foundError = false;
+
+    const label globalSize = returnReduce(pp.size(), sumOp<label>());
+
+    Info<< "    "
+        << setw(20) << name.c_str()
+        << setw(9) << globalSize
+        << setw(9) << returnReduce(pp.nPoints(), sumOp<label>());
+
+    if (globalSize == 0)
+    {
+        Info<< setw(34) << "ok (empty)";
+    }
+    else if (UPstream::parRun())
+    {
+        // Parallel - use mesh edges
+        // - no check for point-pinch
+        // - no check for consistent orientation (if that is posible to
+        //   check?)
+
+        // OLDER CODE
+        // ~~~~~~~~~~
+        // Synchronise connected faces using global face numbering
+        //
         // (see addPatchCellLayer::globalEdgeFaces)
         // From mesh edge to global face labels. Non-empty sublists only for
         // pp edges.
@@ -88,12 +255,12 @@ void Foam::checkPatch
 
         forAll(edgeFaces, edgei)
         {
-            label meshEdgei = meshEdges[edgei];
+            const label meshEdgei = meshEdges[edgei];
             const labelList& eFaces = edgeFaces[edgei];
 
             // Store face and processor as unique tag.
             labelList& globalEFaces = globalEdgeFaces[meshEdgei];
-            globalEFaces.setSize(eFaces.size());
+            globalEFaces.resize(eFaces.size());
             forAll(eFaces, i)
             {
                 globalEFaces[i] = globalFaces.toGlobal(meshFaces[eFaces[i]]);
@@ -104,29 +271,30 @@ void Foam::checkPatch
             //    << endl;
         }
 
-        // Synchronise across coupled edges.
+        // Synchronise across coupled edges
         syncTools::syncEdgeList
         (
             mesh,
             globalEdgeFaces,
             ListOps::uniqueEqOp<label>(),
-            labelList()             // null value
+            labelList()         // null value
         );
 
-
         label labelTyp = TopoType::MANIFOLD;
         forAll(meshEdges, edgei)
         {
             const label meshEdgei = meshEdges[edgei];
             const labelList& globalEFaces = globalEdgeFaces[meshEdgei];
-            if (globalEFaces.size() == 1)
+            const label numNbrs = globalEFaces.size();
+            if (numNbrs == 1)
             {
-                //points.insert(mesh.edges()[meshEdgei]);
+                //if (pointSetPtr) pointSetPtr->insert(mesh.edges()[meshEdgei]);
                 labelTyp = max(labelTyp, TopoType::OPEN);
             }
-            else if (globalEFaces.size() == 0 || globalEFaces.size() > 2)
+            else if (numNbrs == 0 || numNbrs > 2)
             {
-                points.insert(mesh.edges()[meshEdgei]);
+                if (pointSetPtr) pointSetPtr->insert(mesh.edges()[meshEdgei]);
+                if (badEdgesPtr) badEdgesPtr->insert(edgei);
                 labelTyp = max(labelTyp, TopoType::ILLEGAL);
             }
         }
@@ -138,61 +306,68 @@ void Foam::checkPatch
         }
         else if (labelTyp == TopoType::OPEN)
         {
-            Info<< setw(34)
-                << "ok (non-closed singly connected)";
+            Info<< setw(34) << "ok (non-closed singly connected)";
         }
         else
         {
-            Info<< setw(34)
-                << "multiply connected (shared edge)";
+            Info<< setw(34) << "multiply connected (shared edge)";
         }
+
+        foundError = (labelTyp == TopoType::ILLEGAL);
     }
     else
     {
-        TopoType pTyp = pp.surfaceType();
+        const TopoType pTyp = pp.surfaceType(badEdgesPtr);
 
         if (pTyp == TopoType::MANIFOLD)
         {
-            if (pp.checkPointManifold(true, &points))
+            if (pp.checkPointManifold(true, pointSetPtr))
             {
-                Info<< setw(34)
-                    << "multiply connected (shared point)";
+                Info<< setw(34) << "multiply connected (shared point)";
             }
             else
             {
                 Info<< setw(34) << "ok (closed singly connected)";
             }
 
-            // Add points on non-manifold edges to make set complete
-            pp.checkTopology(false, &points);
+            if (pointSetPtr)
+            {
+                // Add points on non-manifold edges to make set complete
+                pp.checkTopology(false, pointSetPtr);
+            }
         }
         else
         {
-            pp.checkTopology(false, &points);
+            if (pointSetPtr)
+            {
+                pp.checkTopology(false, pointSetPtr);
+            }
 
             if (pTyp == TopoType::OPEN)
             {
-                Info<< setw(34)
-                    << "ok (non-closed singly connected)";
+                Info<< setw(34) << "ok (non-closed singly connected)";
             }
             else
             {
-                Info<< setw(34)
-                    << "multiply connected (shared edge)";
+                Info<< setw(34) << "multiply connected (shared edge)";
             }
         }
+
+        foundError = (pTyp == TopoType::ILLEGAL);
     }
 
     if (allGeometry)
     {
-        const labelList& mp = pp.meshPoints();
+        boundBox bb(pp.box());
+        bb.reduce();
 
-        if (returnReduceOr(mp.size()))
+        if (bb.good())
         {
-            boundBox bb(pp.points(), mp, true); // reduce
             Info<< ' ' << bb;
         }
     }
+
+    return foundError;
 }
 
 
@@ -524,7 +699,7 @@ Foam::label Foam::checkTopology
                 << mesh.time().timeName()/"cellToRegion"
                 << endl;
 
-            labelIOList ctr
+            IOListRef<label>
             (
                 IOobject
                 (
@@ -532,11 +707,11 @@ Foam::label Foam::checkTopology
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
                 rs
-            );
-            ctr.write();
+            ).write();
 
 
             // Points in multiple regions
@@ -651,7 +826,7 @@ Foam::label Foam::checkTopology
     }
 
     // Non-manifold points
-    pointSet points
+    pointSet nonManifoldPoints
     (
         mesh,
         "nonManifoldPoints",
@@ -670,17 +845,15 @@ Foam::label Foam::checkTopology
             << setw(20) << "Patch"
             << setw(9) << "Faces"
             << setw(9) << "Points"
-            << "Surface topology";
+            << "  Surface topology";
         if (allGeometry)
         {
-            Info<< " Bounding box";
+            Info<< "  Bounding box";
         }
         Info<< endl;
 
-        forAll(patches, patchi)
+        for (const polyPatch& pp : patches)
         {
-            const polyPatch& pp = patches[patchi];
-
             if (!isA<processorPolyPatch>(pp))
             {
                 checkPatch
@@ -689,14 +862,78 @@ Foam::label Foam::checkTopology
                     pp.name(),
                     mesh,
                     pp,
-                    identity(pp.size(), pp.start()),
+                    // identity(pp.size(), pp.start()),
                     pp.meshEdges(),
-                    points
+                   &nonManifoldPoints
                 );
                 Info<< endl;
             }
         }
 
+        // All non-processor boundary patches
+        {
+            labelList faceLabels
+            (
+                identity
+                (
+                    (
+                        patches.range(patches.nNonProcessor()-1).end_value()
+                      - patches.start()
+                    ),
+                    patches.start()
+                )
+            );
+
+            uindirectPrimitivePatch pp
+            (
+                UIndirectList<face>(mesh.faces(), faceLabels),
+                mesh.points()
+            );
+
+            // Non-manifold
+            labelHashSet badEdges(pp.nEdges()/20);
+
+            bool hadBadEdges = checkPatch
+            (
+                allGeometry,
+                "## ALL BOUNDARIES ##",
+                 mesh,
+                pp,
+                // faceLabels,
+                pp.meshEdges(mesh.edges(), mesh.pointEdges()),
+                nullptr,  // No point set
+               &badEdges
+            );
+            Info<< nl << endl;
+
+            if (hadBadEdges)
+            {
+                edgeList dumpEdges(pp.edges(), badEdges.sortedToc());
+
+                vtk::lineWriter writer
+                (
+                    pp.localPoints(),
+                    dumpEdges,
+                    fileName
+                    (
+                        mesh.time().globalPath()
+                      / ("checkMesh-illegal-edges")
+                    )
+                );
+
+                writer.writeGeometry();
+
+                // CellData
+                writer.beginCellData();
+                writer.writeProcIDs();
+
+                Info<< "Wrote "
+                    << returnReduce(dumpEdges.size(), sumOp<label>())
+                    << " bad edges: " << writer.output().name() << nl;
+                writer.close();
+            }
+        }
+
         //Info.setf(ios_base::right);
     }
 
@@ -729,9 +966,9 @@ Foam::label Foam::checkTopology
                     fz.name(),
                     mesh,
                     fz(),           // patch
-                    fz,             // mesh face labels
+                    // fz,             // mesh face labels
                     fz.meshEdges(), // mesh edge labels
-                    points
+                   &nonManifoldPoints
                 );
                 Info<< endl;
             }
@@ -761,17 +998,20 @@ Foam::label Foam::checkTopology
         }
     }
 
-    const label nPoints = returnReduce(points.size(), sumOp<label>());
+
+    const label nPoints =
+        returnReduce(nonManifoldPoints.size(), sumOp<label>());
 
     if (nPoints)
     {
         Info<< "  <<Writing " << nPoints
-            << " conflicting points to set " << points.name() << endl;
-        points.instance() = mesh.pointsInstance();
-        points.write();
+            << " conflicting points to set " << nonManifoldPoints.name()
+            << endl;
+        nonManifoldPoints.instance() = mesh.pointsInstance();
+        nonManifoldPoints.write();
         if (setWriter && setWriter->enabled())
         {
-            mergeAndWrite(*setWriter, points);
+            mergeAndWrite(*setWriter, nonManifoldPoints);
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
index 0ebf1e7497..d80a7d9315 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
@@ -1,3 +1,20 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+
+Description
+    Global functions for topology checking
+
+\*---------------------------------------------------------------------------*/
+
 #include "labelList.H"
 #include "autoPtr.H"
 #include "ZoneMesh.H"
@@ -5,38 +22,62 @@
 
 namespace Foam
 {
-    // Forward Declarations
-    class polyMesh;
-    class pointSet;
-    class coordSetWriter;
-    class surfaceWriter;
 
-    template<class PatchType>
-    void checkPatch
-    (
-        const bool allGeometry,
-        const word& name,
-        const polyMesh& mesh,
-        const PatchType& pp,
-        const labelList& meshFaces,
-        const labelList& meshEdges,
-        pointSet& points
-    );
+// Forward Declarations
+class polyMesh;
+class pointSet;
+class coordSetWriter;
+class surfaceWriter;
 
-    template<class Zone>
-    label checkZones
-    (
-        const polyMesh& mesh,
-        const ZoneMesh<Zone, polyMesh>& zones,
-        topoSet& set
-    );
 
-    label checkTopology
-    (
-        const polyMesh& mesh,
-        const bool allTopology,
-        const bool allGeometry,
-        autoPtr<surfaceWriter>& surfWriter,
-        autoPtr<coordSetWriter>& setWriter
-    );
-}
+// Check patch topology.
+// In parallel, uses count of edge connections
+template<class PatchType>
+bool checkPatch
+(
+    const bool allGeometry,
+    const std::string& name,
+    const polyMesh& mesh,
+    const PatchType& pp,
+    const labelUList& meshEdges,
+    labelHashSet* pointSetPtr = nullptr,
+    labelHashSet* badEdgesPtr = nullptr
+);
+
+// OLDER CODE
+// ~~~~~~~~~~
+// Check patch topology.
+// In parallel, uses mesh face ids and global face numbering
+template<class PatchType>
+bool checkPatch
+(
+    const bool allGeometry,
+    const std::string& name,
+    const polyMesh& mesh,
+    const PatchType& pp,
+    const labelUList& meshFaces,
+    const labelUList& meshEdges,
+    labelHashSet* pointSetPtr = nullptr,
+    labelHashSet* badEdgesPtr = nullptr
+);
+
+template<class Zone>
+label checkZones
+(
+    const polyMesh& mesh,
+    const ZoneMesh<Zone, polyMesh>& zones,
+    topoSet& set
+);
+
+label checkTopology
+(
+    const polyMesh& mesh,
+    const bool allTopology,
+    const bool allGeometry,
+    autoPtr<surfaceWriter>& surfWriter,
+    autoPtr<coordSetWriter>& setWriter
+);
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index b38b19ee3d..c164959cca 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -163,6 +163,11 @@ void Foam::faMesh::initPatch() const
             mesh().points()
         )
     );
+    // Could set some basic primitive data here...
+    // nEdges_ = patchPtr_->nEdges();
+    // nInternalEdges_ = patchPtr_->nInternalEdges();
+    // nFaces_ = patchPtr_->size();
+    // nPoints_ = patchPtr_->nPoints();
     bndConnectPtr_.reset(nullptr);
     haloMapPtr_.reset(nullptr);
     haloFaceCentresPtr_.reset(nullptr);
@@ -512,7 +517,13 @@ Foam::faMesh::faMesh
     haloMapPtr_(nullptr),
     haloFaceCentresPtr_(nullptr),
     haloFaceNormalsPtr_(nullptr)
-{}
+{
+    // Not yet much for primitive mesh data possible...
+    nPoints_ = 0;
+    nEdges_ = 0;
+    nInternalEdges_ = 0;
+    nFaces_ = faceLabels_.size();
+}
 
 
 Foam::faMesh::faMesh
@@ -593,7 +604,13 @@ Foam::faMesh::faMesh
     haloMapPtr_(nullptr),
     haloFaceCentresPtr_(nullptr),
     haloFaceNormalsPtr_(nullptr)
-{}
+{
+    // Not yet much for primitive mesh data possible...
+    nPoints_ = 0;
+    nEdges_ = 0;
+    nInternalEdges_ = 0;
+    nFaces_ = faceLabels_.size();
+}
 
 
 Foam::faMesh::faMesh(const polyPatch& pp, const bool doInit)
diff --git a/src/finiteArea/faMesh/faMeshTopology.C b/src/finiteArea/faMesh/faMeshTopology.C
index daa5ac9131..00552896a2 100644
--- a/src/finiteArea/faMesh/faMeshTopology.C
+++ b/src/finiteArea/faMesh/faMeshTopology.C
@@ -445,9 +445,9 @@ Foam::faMesh::getBoundaryEdgeConnections() const
                 // A boundary finiteEdge edge (known from this side)
 
                 auto& gathered = gatheredConnections[cppEdgei];
-                gathered.setCapacity(2);
-                gathered.resize(1);
-                auto& tuple = gathered.back();
+                gathered.setCapacity_nocopy(2);
+                gathered.resize_nocopy(1);
+                auto& tuple = gathered.front();
 
                 tuple = bndEdgeConnections[bndEdgei].first();
             }
@@ -502,9 +502,9 @@ Foam::faMesh::getBoundaryEdgeConnections() const
                 const label meshFacei = patchFacei + pp.start();
 
                 auto& gathered = gatheredConnections[cppEdgei];
-                gathered.setCapacity(2);
-                gathered.resize(1);
-                auto& tuple = gathered.back();
+                gathered.setCapacity_nocopy(2);
+                gathered.resize_nocopy(1);
+                auto& tuple = gathered.front();
 
                 tuple.procNo(UPstream::myProcNo());
                 tuple.patchi(patchi);
@@ -545,6 +545,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
         << "Collating sync information" << endl;
 
     // Pick out gathered connections and add into primary bookkeeping
+    badEdges.clear();
     for (label cppEdgei = 0; cppEdgei < nCoupledEdges; ++cppEdgei)
     {
         const auto& gathered = gatheredConnections[cppEdgei];
@@ -552,25 +553,61 @@ Foam::faMesh::getBoundaryEdgeConnections() const
         const label bndEdgei =
             edgeToBoundaryIndex.lookup(cpp.meshEdge(cppEdgei), -1);
 
-        if
-        (
-            // A boundary finiteEdge edge (known from this side)
-            bndEdgei != -1
-
-            // Gathered a one-to-one connection
-         && gathered.size() == 2
-        )
+        if (bndEdgei != -1)
         {
-            const auto& a = gathered[0];
-            const auto& b = gathered[1];
-
-            // Copy second side of connection
+            // A boundary finiteEdge edge (known from this side)
             auto& connection = bndEdgeConnections[bndEdgei];
 
-            connection.second() = (connection.first() == b) ? a : b;
+            if (gathered.size() == 2)
+            {
+                // Copy second side of connection
+                const auto& a = gathered[0];
+                const auto& b = gathered[1];
+
+                connection.second() = (connection.first() == b) ? a : b;
+            }
+            else if (gathered.size() > 2)
+            {
+                // Multiply connected!! - this needs to be addressed
+                badEdges.insert(cppEdgei);
+            }
         }
     }
 
+    if (returnReduceOr(badEdges.size()))
+    {
+        WarningInFunction
+            << nl << "Multiply connected edges detected" << endl;
+
+        // Print out edges as point pairs
+        // These are globally synchronised - so only output on master
+        constexpr label maxOutput = 10;
+
+        label nOutput = 0;
+
+        for (const label cppEdgei : badEdges.sortedToc())
+        {
+            const edge e(cpp.meshEdge(cppEdgei));
+
+            const auto& gathered = gatheredConnections[cppEdgei];
+
+            Info<< "connection: ";
+            gathered.writeList(Info) << nl;
+
+            Info<<"    edge  : "
+                << cpp.points()[e.first()] << ' '
+                << cpp.points()[e.second()] << nl;
+
+            ++nOutput;
+            if (maxOutput > 0 && nOutput >= maxOutput)
+            {
+                Info<< " ... suppressing further output" << nl;
+                break;
+            }
+        }
+    }
+
+
     // Check missing/invalid
     badEdges.clear();
     for (label bndEdgei = 0; bndEdgei < nBoundaryEdges; ++bndEdgei)

From b62e4b06fa0816bf0f32cccb64585726f8bd1675 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 8 May 2023 10:26:22 +0200
Subject: [PATCH 219/348] ENH: add finite-area 'ignore' boundary condition

- this is a placeholder boundary BC for using with bad or illegal
  edges. It is currently functionally identical to zero-gradient.
  Naming and definition still subject to change.
---
 src/finiteArea/Make/files                     |   2 +
 .../faMesh/faPatches/faPatch/faPatchData.C    |   8 +-
 .../faMesh/faPatches/faPatch/faPatchData.H    |   9 +-
 .../faPatches/other/ignore/ignoreFaPatch.C    | 110 ++++++++++++
 .../faPatches/other/ignore/ignoreFaPatch.H    | 144 +++++++++++++++
 .../derived/ignore/ignoreFaPatchField.C       |  90 ++++++++++
 .../derived/ignore/ignoreFaPatchField.H       | 165 ++++++++++++++++++
 .../derived/ignore/ignoreFaPatchFields.C      |  45 +++++
 .../derived/ignore/ignoreFaPatchFields.H      |  50 ++++++
 .../faReconstruct/faMeshReconstructor.C       |  24 ++-
 10 files changed, 640 insertions(+), 7 deletions(-)
 create mode 100644 src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.C
 create mode 100644 src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.H

diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index ea3eb312b9..039386be84 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -24,6 +24,7 @@ $(faPatches)/constraint/processor/processorFaPatch.C
 $(faPatches)/constraint/wedge/wedgeFaPatch.C
 $(faPatches)/constraint/cyclic/cyclicFaPatch.C
 $(faPatches)/constraint/symmetry/symmetryFaPatch.C
+$(faPatches)/other/ignore/ignoreFaPatch.C
 
 distributed/faMeshDistributor.C
 distributed/faMeshDistributorNew.C
@@ -68,6 +69,7 @@ $(derivedFaPatchFields)/slip/slipFaPatchFields.C
 $(derivedFaPatchFields)/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
 $(derivedFaPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
 $(derivedFaPatchFields)/uniformFixedValue/uniformFixedValueFaPatchFields.C
+$(derivedFaPatchFields)/ignore/ignoreFaPatchFields.C
 $(derivedFaPatchFields)/clampedPlate/clampedPlateFaPatchFields.C
 
 faePatchFields = fields/faePatchFields
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.C
index 00ad7d679c..5be8760611 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.C
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,6 +74,12 @@ Foam::dictionary Foam::faPatchData::dict(const bool withEdgeLabels) const
 }
 
 
+bool Foam::faPatchData::good() const
+{
+    return (!name_.empty() && !type_.empty());
+}
+
+
 void Foam::faPatchData::clear()
 {
     name_.clear();
diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.H b/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.H
index ee90a80522..137af00328 100644
--- a/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.H
+++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatchData.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,8 +33,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faPatchData_H
-#define faPatchData_H
+#ifndef Foam_faPatchData_H
+#define Foam_faPatchData_H
 
 #include "labelList.H"
 #include "labelPair.H"
@@ -92,6 +92,9 @@ public:
 
     // Other Functions
 
+        //- Has name/type etc
+        bool good() const;
+
         //- Reset data
         void clear();
 
diff --git a/src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.C b/src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.C
new file mode 100644
index 0000000000..2c34bb23f4
--- /dev/null
+++ b/src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.C
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "ignoreFaPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Patch name
+defineTypeNameAndDebug(ignoreFaPatch, 0);
+
+// Add the patch constructor functions to the hash tables
+addToRunTimeSelectionTable(faPatch, ignoreFaPatch, dictionary);
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::ignoreFaPatch::ignoreFaPatch
+(
+    const word& name,
+    const label index,
+    const faBoundaryMesh& bm,
+    const label nbrPolyPatchi,
+    const word& patchType
+)
+:
+    ignoreFaPatch(name, labelList(), index, bm, nbrPolyPatchi, patchType)
+{}
+
+
+Foam::ignoreFaPatch::ignoreFaPatch
+(
+    const word& name,
+    const labelUList& edgeLabels,
+    const label index,
+    const faBoundaryMesh& bm,
+    const label nbrPolyPatchi,
+    const word& patchType
+)
+:
+    faPatch(name, edgeLabels, index, bm, nbrPolyPatchi, patchType)
+{}
+
+
+Foam::ignoreFaPatch::ignoreFaPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const faBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    faPatch(name, dict, index, bm, patchType)
+{}
+
+
+Foam::ignoreFaPatch::ignoreFaPatch
+(
+    const ignoreFaPatch& p,
+    const faBoundaryMesh& bm
+)
+:
+    faPatch(p, bm)
+{}
+
+
+Foam::ignoreFaPatch::ignoreFaPatch
+(
+    const ignoreFaPatch& p,
+    const faBoundaryMesh& bm,
+    const label index,
+    const labelUList& edgeLabels,
+    const label nbrPolyPatchi
+)
+:
+    faPatch(p, bm, index, edgeLabels, nbrPolyPatchi)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.H b/src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.H
new file mode 100644
index 0000000000..fa5e3f6eae
--- /dev/null
+++ b/src/finiteArea/faMesh/faPatches/other/ignore/ignoreFaPatch.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::ignoreFaPatch
+
+Description
+    A patch which will not exist in the faMesh. Typical example is a front and
+    back plane of a 2-D geometry
+
+SourceFiles
+    ignoreFaPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_ignoreFaPatch_H
+#define Foam_ignoreFaPatch_H
+
+#include "faPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class ignoreFaPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class ignoreFaPatch
+:
+    public faPatch
+{
+public:
+
+    //- Runtime type information
+    TypeName("ignore");
+
+
+    // Constructors
+
+        //- Minimal construct from components
+        ignoreFaPatch
+        (
+            const word& name,
+            const label index,
+            const faBoundaryMesh& bm,
+            const label nbrPolyPatchi = -1,
+            const word& patchType = typeName
+        );
+
+        //- Construct from components
+        ignoreFaPatch
+        (
+            const word& name,
+            const labelUList& edgeLabels,
+            const label index,
+            const faBoundaryMesh& bm,
+            const label nbrPolyPatchi = -1,
+            const word& patchType = typeName
+        );
+
+        //- Construct from dictionary
+        ignoreFaPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const faBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Copy construct, resetting the boundary mesh
+        ignoreFaPatch(const ignoreFaPatch& p, const faBoundaryMesh& bm);
+
+        //- Copy construct, resetting boundary mesh and addressing
+        ignoreFaPatch
+        (
+            const ignoreFaPatch& p,
+            const faBoundaryMesh& bm,
+            const label index,
+            const labelUList& edgeLabels,
+            const label nbrPolyPatchi = -1
+        );
+
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<faPatch> clone(const faBoundaryMesh& bm) const
+        {
+            return autoPtr<faPatch>(new ignoreFaPatch(*this, bm));
+        }
+
+        //- Construct and return a clone, resetting the edge list
+        //  and boundary mesh
+        virtual autoPtr<faPatch> clone
+        (
+            const faBoundaryMesh& bm,
+            const labelUList& edgeLabels,
+            const label index,
+            const label nbrPolyPatchi = -1
+        ) const
+        {
+            return autoPtr<faPatch>
+            (
+                new ignoreFaPatch(*this, bm, index, edgeLabels, nbrPolyPatchi)
+            );
+        }
+
+
+    // Member Functions
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.C
new file mode 100644
index 0000000000..f10e594b74
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.C
@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "ignoreFaPatchField.H"
+#include "faPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::ignoreFaPatchField<Type>::ignoreFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    zeroGradientFaPatchField<Type>(p, iF)
+{}
+
+
+template<class Type>
+Foam::ignoreFaPatchField<Type>::ignoreFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    zeroGradientFaPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::ignoreFaPatchField<Type>::ignoreFaPatchField
+(
+    const ignoreFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    zeroGradientFaPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::ignoreFaPatchField<Type>::ignoreFaPatchField
+(
+    const ignoreFaPatchField<Type>& ptf
+)
+:
+    zeroGradientFaPatchField<Type>(ptf)
+{}
+
+
+template<class Type>
+Foam::ignoreFaPatchField<Type>::ignoreFaPatchField
+(
+    const ignoreFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    zeroGradientFaPatchField<Type>(ptf, iF)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.H
new file mode 100644
index 0000000000..6d83692442
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.H
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::ignoreFaPatchField
+
+Description
+    A boundary condition for invalid edges which should be ignored.
+    Currently functionally identical to a zero-gradient condition.
+
+Usage
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        // Mandatory entries (unmodifiable)
+        type    ignore;
+
+        // Mandatory/Optional (inherited) entries
+        ...
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property | Description               | Type  | Reqd | Dflt
+      type     | Type name: ignore         | word  | yes  | -
+    \endtable
+
+    The inherited entries are elaborated in:
+      - \link faPatchFields.H \endlink
+
+SourceFiles
+    ignoreFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_ignoreFaPatchField_H
+#define Foam_ignoreFaPatchField_H
+
+#include "zeroGradientFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class ignoreFaPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class ignoreFaPatchField
+:
+    public zeroGradientFaPatchField<Type>
+{
+public:
+
+    //- Runtime type information
+    TypeName("ignore");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        ignoreFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        ignoreFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping the given patch field onto a new patch
+        ignoreFaPatchField
+        (
+            const ignoreFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        ignoreFaPatchField
+        (
+            const ignoreFaPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new ignoreFaPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        ignoreFaPatchField
+        (
+            const ignoreFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new ignoreFaPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~ignoreFaPatchField() = default;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ignoreFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.C
new file mode 100644
index 0000000000..36d8b600b1
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "ignoreFaPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "areaFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makeFaPatchFields(ignore);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.H
new file mode 100644
index 0000000000..a97edf8e3c
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_ignoreFaPatchFields_H
+#define Foam_ignoreFaPatchFields_H
+
+#include "ignoreFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(ignore);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
index 14f834ec56..332480a5b3 100644
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ License
 #include "globalIndex.H"
 #include "globalMeshData.H"
 #include "edgeHashes.H"
+#include "ignoreFaPatch.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -371,6 +372,12 @@ void Foam::faMeshReconstructor::calcAddressing
     {
         const faPatch& fap = procMesh_.boundary()[patchi];
 
+        if (isA<ignoreFaPatch>(fap))
+        {
+            // These are not real edges
+            continue;
+        }
+
         labelList& patchEdgeLabels = singlePatchEdgeLabels_[patchi];
         patchEdgeLabels = fap.edgeLabels();
 
@@ -490,27 +497,38 @@ void Foam::faMeshReconstructor::createMesh()
 
     // Add in non-processor boundary patches
     faPatchList completePatches(singlePatchEdgeLabels_.size());
+    label nPatches = 0;
     forAll(completePatches, patchi)
     {
         const labelList& patchEdgeLabels = singlePatchEdgeLabels_[patchi];
 
         const faPatch& fap = procMesh_.boundary()[patchi];
 
+        if (isA<ignoreFaPatch>(fap))
+        {
+            // These are not real edges
+            continue;
+        }
+
         const label neiPolyPatchId = fap.ngbPolyPatchIndex();
 
         completePatches.set
         (
-            patchi,
+            nPatches,
             fap.clone
             (
                 completeMesh.boundary(),
                 patchEdgeLabels,
-                patchi,  // index
+                nPatches,  // index
                 neiPolyPatchId
             )
         );
+
+        ++nPatches;
     }
 
+    completePatches.resize(nPatches);
+
     // Serial mesh - no parallel communication
 
     const bool oldParRun = Pstream::parRun(false);

From b3fa59db92c84c77186478812c1a80859492a242 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 5 May 2023 15:49:43 +0200
Subject: [PATCH 220/348] ENH: additional handling for multiply-connected
 finite-area edges (#2771)

- multiply-connected edges can arise at the centre of a "star"
  connection or because the patch faces are actually baffles.

- In the serial case these internal edges are also rather dubious in
  terms of modelling. However, when they are split across multiple
  processors there can only be a single processor-to-processor
  connectivity.

  We don't necessary have enough information to know how things should
  be connected, so connect pair-wise as the first remedial solution

- Any extra dangle edges are relegated to an 'ignore' faPatch
  to tag as needing different handling.
---
 src/finiteArea/faMesh/faMeshPatches.C  | 201 ++++++++++++++++---
 src/finiteArea/faMesh/faMeshTopology.C | 261 +++++++++++++++++--------
 2 files changed, 351 insertions(+), 111 deletions(-)

diff --git a/src/finiteArea/faMesh/faMeshPatches.C b/src/finiteArea/faMesh/faMeshPatches.C
index f04e67ad71..91708caa1a 100644
--- a/src/finiteArea/faMesh/faMeshPatches.C
+++ b/src/finiteArea/faMesh/faMeshPatches.C
@@ -28,10 +28,47 @@ License
 
 #include "faMesh.H"
 #include "faPatchData.H"
-#include "processorPolyPatch.H"
+#include "emptyFaPatch.H"
+#include "ignoreFaPatch.H"
 #include "processorFaPatch.H"
+#include "processorPolyPatch.H"
 #include "foamVtkLineWriter.H"
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Write edges in VTK format
+template<class PatchType>
+static void vtkWritePatchEdges
+(
+    const PatchType& p,
+    const labelList& selectEdges,
+    const fileName& outputPath,
+    const word& outputName
+)
+{
+    edgeList dumpEdges(p.edges(), selectEdges);
+
+    vtk::lineWriter writer
+    (
+        p.localPoints(),
+        dumpEdges,
+        outputPath/outputName
+    );
+
+    writer.writeGeometry();
+
+    // CellData
+    writer.beginCellData();
+    writer.writeProcIDs();
+    writer.close();
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::faMesh::addFaPatches
@@ -156,7 +193,7 @@ Foam::faPatchList Foam::faMesh::createPatchList
     {
         auto& patchDef = faPatchDefs.emplace_back();
         patchDef.name_ = emptyPatchName;
-        patchDef.type_ = "empty";
+        patchDef.type_ = emptyFaPatch::typeName_();
     }
 
     label nWarnUndefinedPatch(5);
@@ -183,6 +220,14 @@ Foam::faPatchList Foam::faMesh::createPatchList
         }
     }
 
+    // Placeholder for any undefined edges
+    const label ignorePatchIndex = faPatchDefs.size();
+    {
+        auto& patchDef = faPatchDefs.emplace_back();
+        patchDef.name_ = "_ignore_edges_";
+        patchDef.type_ = ignoreFaPatch::typeName_();
+    }
+
     // ----------------------------------------------------------------------
 
     // Get edge connections (in globally consistent ordering)
@@ -213,7 +258,9 @@ Foam::faPatchList Foam::faMesh::createPatchList
 
         if (!a.valid() || !b.valid())
         {
-            // Skip checking pairs where either is not valid
+            // If either is invalid, mark as an 'ignore' edge
+            patchDefLookup[connecti] = ignorePatchIndex;
+            patchDefsUsed.insert(ignorePatchIndex);
             continue;
         }
         else if (a.is_finiteArea())
@@ -289,17 +336,34 @@ Foam::faPatchList Foam::faMesh::createPatchList
         patchDefsUsed.insert(bestPatchDefi);
     }
 
-    // Remove undefPatchIndex if not actually needed anywhere
+
+    bool reportBadEdges = false;
+
+    // Skip undefPatchIndex if not actually needed anywhere
     if (!returnReduceOr(patchDefsUsed.found(undefPatchIndex)))
     {
-        faPatchDefs.remove(undefPatchIndex);
+        faPatchDefs[undefPatchIndex].clear();
     }
     else
     {
         patchDefsUsed.insert(undefPatchIndex);  // Parallel consistency
+        reportBadEdges = true;
+    }
 
-        // Report locations of undefined edges
+    // Skip ignorePatchIndex if not actually needed anywhere
+    if (!returnReduceOr(patchDefsUsed.found(ignorePatchIndex)))
+    {
+        faPatchDefs[ignorePatchIndex].clear();
+    }
+    else
+    {
+        patchDefsUsed.insert(ignorePatchIndex);  // Parallel consistency
+        reportBadEdges = true;
+    }
 
+    // Report locations of undefined edges
+    if (reportBadEdges)
+    {
         badEdges.clear();
         forAll(patchDefLookup, connecti)
         {
@@ -324,8 +388,11 @@ Foam::faPatchList Foam::faMesh::createPatchList
                     Pout<< "Undefined connection: "
                         << "(patch:" << a.realPatchi()
                         << " face:" << a.meshFacei()
+                        << " proc:" << a.procNo()
                         << ") and (patch:" << b.realPatchi()
-                        << " face:" << b.meshFacei() << ")  patch:"
+                        << " face:" << b.meshFacei()
+                        << " proc:" << b.procNo()
+                        << ")  patch:"
                         <<
                         (
                             a.realPatchi() >= 0
@@ -360,27 +427,102 @@ Foam::faPatchList Foam::faMesh::createPatchList
 
             if (nWarnUndefinedPatch)
             {
-                edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
+                labelList selectEdges(badEdges.sortedToc());
+                word outputName("faMesh-construct.undefEdges");
 
-                vtk::lineWriter writer
+                vtkWritePatchEdges
                 (
-                    patch().localPoints(),
-                    dumpEdges,
-                    fileName
-                    (
-                        mesh().time().globalPath()
-                      / ("faMesh-construct.undefEdges")
-                    )
+                    patch(),
+                    selectEdges,
+                    mesh().time().globalPath(),
+                    outputName
                 );
 
-                writer.writeGeometry();
+                InfoInFunction
+                    << "(debug) wrote " << outputName << nl;
+            }
+        }
+    }
 
-                // CellData
-                writer.beginCellData();
-                writer.writeProcIDs();
+    // Report locations of undefined edges
+    if (reportBadEdges)
+    {
+        badEdges.clear();
+        forAll(patchDefLookup, connecti)
+        {
+            if (patchDefLookup[connecti] == ignorePatchIndex)
+            {
+                const auto& connection = bndEdgeConnections[connecti];
+
+                const auto& a = connection.first();
+                const auto& b = connection.second();
+
+                if (a.is_localProc() && a.is_finiteArea())
+                {
+                    badEdges.insert(a.patchEdgei());
+                }
+                else if (b.is_localProc() && b.is_finiteArea())
+                {
+                    badEdges.insert(b.patchEdgei());
+                }
+
+                if (badEdges.size() <= nWarnUndefinedPatch)
+                {
+                    Pout<< "Illegal connection: "
+                        << "(patch:" << a.realPatchi()
+                        << " face:" << a.meshFacei()
+                        << " proc:" << a.procNo()
+                        << ") and (patch:" << b.realPatchi()
+                        << " face:" << b.meshFacei()
+                        << " proc:" << b.procNo()
+                        << ") patch:"
+                        <<
+                        (
+                            a.realPatchi() >= 0
+                          ? pbm[a.realPatchi()].name()
+                          : word::null
+                        )
+                        << " and patch:"
+                        <<
+                        (
+                            b.realPatchi() >= 0
+                          ? pbm[b.realPatchi()].name()
+                          : word::null
+                        )
+                        << nl;
+                }
+            }
+        }
+
+        if (returnReduceOr(badEdges.size()))
+        {
+            // Report directly as Info, not InfoInFunction
+            // since it can also be an expected result when
+            // nWarnUndefinedPatch == 0
+            Info<< nl
+                << "Had "
+                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+                << returnReduce(patch().nBoundaryEdges(), sumOp<label>())
+                << " illegal edge connections, added to "
+                << faPatchDefs[ignorePatchIndex].name_ << nl << nl
+                << "==> Could indicate a non-manifold patch geometry" << nl
+                << nl;
+
+            if (nWarnUndefinedPatch)
+            {
+                labelList selectEdges(badEdges.sortedToc());
+                word outputName("faMesh-construct.ignoreEdges");
+
+                vtkWritePatchEdges
+                (
+                    patch(),
+                    selectEdges,
+                    mesh().time().globalPath(),
+                    outputName
+                );
 
                 InfoInFunction
-                    << "(debug) wrote " << writer.output().name() << nl;
+                    << "(debug) wrote " << outputName << nl;
             }
         }
     }
@@ -426,13 +568,13 @@ Foam::faPatchList Foam::faMesh::createPatchList
 
                 if (a.is_localProc() && a.is_finiteArea())
                 {
-                    selectEdges.append(a.patchEdgei());
+                    selectEdges.push_back(a.patchEdgei());
                 }
                 else if (b.is_localProc() && b.is_finiteArea())
                 {
-                    selectEdges.append(b.patchEdgei());
+                    selectEdges.push_back(b.patchEdgei());
                 }
-                else
+                else if (a.valid() && b.valid())
                 {
                     FatalErrorInFunction
                         << "Error in programming logic" << nl
@@ -486,11 +628,11 @@ Foam::faPatchList Foam::faMesh::createPatchList
 
             if (a.is_localProc())
             {
-                selectEdges.append(a.patchEdgei());
+                selectEdges.push_back(a.patchEdgei());
             }
             else if (b.is_localProc())
             {
-                selectEdges.append(b.patchEdgei());
+                selectEdges.push_back(b.patchEdgei());
             }
             else
             {
@@ -516,6 +658,11 @@ Foam::faPatchList Foam::faMesh::createPatchList
 
     for (faPatchData& patchDef : faPatchDefs)
     {
+        if (!patchDef.good())
+        {
+            continue;
+        }
+
         newPatches.set
         (
             nPatches,
@@ -532,7 +679,7 @@ Foam::faPatchList Foam::faMesh::createPatchList
         newPatches[nPatches].resetEdges(std::move(patchDef.edgeLabels_));
         ++nPatches;
     }
-
+    newPatches.resize(nPatches);
 
     if (debug > 1)
     {
diff --git a/src/finiteArea/faMesh/faMeshTopology.C b/src/finiteArea/faMesh/faMeshTopology.C
index 00552896a2..8453514639 100644
--- a/src/finiteArea/faMesh/faMeshTopology.C
+++ b/src/finiteArea/faMesh/faMeshTopology.C
@@ -68,6 +68,34 @@ static void printPatchEdges
     }
 }
 
+
+// Write edges in VTK format
+template<class PatchType>
+static void vtkWritePatchEdges
+(
+    const PatchType& p,
+    const labelList& selectEdges,
+    const fileName& outputPath,
+    const word& outputName
+)
+{
+    edgeList dumpEdges(p.edges(), selectEdges);
+
+    vtk::lineWriter writer
+    (
+        p.localPoints(),
+        dumpEdges,
+        outputPath/outputName
+    );
+
+    writer.writeGeometry();
+
+    // CellData
+    writer.beginCellData();
+    writer.writeProcIDs();
+    writer.close();
+}
+
 } // End namespace Foam
 
 
@@ -90,6 +118,7 @@ Foam::faMesh::getBoundaryEdgeConnections() const
     EdgeMap<label> edgeToBoundaryIndex(2*nBoundaryEdges);
 
     labelHashSet badEdges(2*nBoundaryEdges);
+    labelHashSet danglingEdges(2*nBoundaryEdges);
 
     {
         // Local collection structure for accounting of patch pairs.
@@ -163,40 +192,30 @@ Foam::faMesh::getBoundaryEdgeConnections() const
 
         if (returnReduceOr(badEdges.size()))
         {
-            edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
+            labelList selectEdges(badEdges.sortedToc());
+            word outputName("faMesh-construct.nonManifoldEdges");
 
-            vtk::lineWriter writer
+            vtkWritePatchEdges
             (
-                patch().localPoints(),
-                dumpEdges,
-                fileName
-                (
-                    mesh().time().globalPath()
-                  / ("faMesh-construct.nonManifoldEdges")
-                )
+                patch(),
+                selectEdges,
+                mesh().time().globalPath(),
+                outputName
             );
 
-            writer.writeGeometry();
-
-            // CellData
-            writer.beginCellData();
-            writer.writeProcIDs();
-
             InfoInFunction
-                << "(debug) wrote " << writer.output().name() << nl;
-
-            writer.close();  // Flush writer before raising FatalError
+                << "(debug) wrote " << outputName << nl;
 
             FatalErrorInFunction
                 << "Boundary edges not singly connected: "
-                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+                << returnReduce(selectEdges.size(), sumOp<label>()) << '/'
                 << nBoundaryEdges << nl;
 
             printPatchEdges
             (
                 FatalError,
                 patch(),
-                badEdges.sortedToc()
+                selectEdges
             );
 
             FatalError << abort(FatalError);
@@ -322,40 +341,30 @@ Foam::faMesh::getBoundaryEdgeConnections() const
 
         if (returnReduceOr(badEdges.size()))
         {
-            edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
+            labelList selectEdges(badEdges.sortedToc());
+            word outputName("faMesh-construct.invalidEdges");
 
-            vtk::lineWriter writer
+            vtkWritePatchEdges
             (
-                patch().localPoints(),
-                dumpEdges,
-                fileName
-                (
-                    mesh().time().globalPath()
-                  / ("faMesh-construct.invalidEdges")
-                )
+                patch(),
+                selectEdges,
+                mesh().time().globalPath(),
+                outputName
             );
 
-            writer.writeGeometry();
-
-            // CellData
-            writer.beginCellData();
-            writer.writeProcIDs();
-
             InfoInFunction
-                << "(debug) wrote " << writer.output().name() << nl;
-
-            writer.close();  // Flush writer before raising FatalError
+                << "(debug) wrote " << outputName << nl;
 
             FatalErrorInFunction
                 << "Boundary edges with missing/invalid neighbours: "
-                << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+                << returnReduce(selectEdges.size(), sumOp<label>()) << '/'
                 << nBoundaryEdges << nl;
 
             printPatchEdges
             (
                 FatalError,
                 patch(),
-                badEdges.sortedToc()
+                selectEdges
             );
 
             FatalError << abort(FatalError);
@@ -546,9 +555,10 @@ Foam::faMesh::getBoundaryEdgeConnections() const
 
     // Pick out gathered connections and add into primary bookkeeping
     badEdges.clear();
+    danglingEdges.clear();
     for (label cppEdgei = 0; cppEdgei < nCoupledEdges; ++cppEdgei)
     {
-        const auto& gathered = gatheredConnections[cppEdgei];
+        auto& gathered = gatheredConnections[cppEdgei];
 
         const label bndEdgei =
             edgeToBoundaryIndex.lookup(cpp.meshEdge(cppEdgei), -1);
@@ -558,7 +568,12 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             // A boundary finiteEdge edge (known from this side)
             auto& connection = bndEdgeConnections[bndEdgei];
 
-            if (gathered.size() == 2)
+            if (gathered.size() == 1)
+            {
+                // Dangling edge!!
+                danglingEdges.insert(cppEdgei);
+            }
+            else if (gathered.size() == 2)
             {
                 // Copy second side of connection
                 const auto& a = gathered[0];
@@ -568,7 +583,57 @@ Foam::faMesh::getBoundaryEdgeConnections() const
             }
             else if (gathered.size() > 2)
             {
-                // Multiply connected!! - this needs to be addressed
+                // Multiply connected!!
+                // ++nUnresolved;
+
+                // Extra safety (but should already be consistently ordered)
+                Foam::sort(gathered);
+
+                // These connections can arise at the centre of a
+                // "star" connection, or because the patch faces are
+                // actually baffles.
+
+                // We don't necessary have enough information to know how
+                // things should be connected, so connect pair-wise
+                // as the first remedial solution
+
+                const label myProci = UPstream::myProcNo();
+
+                label myIndex = -1;
+                label otherIndex = -1;
+
+                forAll(gathered, sloti)
+                {
+                    if (gathered[sloti].procNo() == myProci)
+                    {
+                        myIndex = sloti;
+                        otherIndex =
+                        (
+                            (sloti % 2)
+                          ? (sloti - 1)     // ie, connect (1 -> 0)
+                          : (sloti + 1)     // ie, connect (0 -> 1)
+                        );
+                        break;
+                    }
+                }
+
+                if
+                (
+                    myIndex >= 0
+                 && otherIndex >= 0
+                 && otherIndex < gathered.size()
+                )
+                {
+                    // Copy second side of connection
+                    const auto& a = gathered[myIndex];
+                    const auto& b = gathered[otherIndex];
+
+                    connection.second() = (connection.first() == b) ? a : b;
+                }
+
+                // Mark as 'bad' even if somehow resolved. If we fail
+                // to make any connection, these will still be
+                // flagged later.
                 badEdges.insert(cppEdgei);
             }
         }
@@ -607,6 +672,53 @@ Foam::faMesh::getBoundaryEdgeConnections() const
         }
     }
 
+    if (returnReduceOr(danglingEdges.size()))
+    {
+        WarningInFunction
+            << nl << "Dangling edges detected" << endl;
+
+        // Print out edges as point pairs
+        // These are globally synchronised - so only output on master
+        constexpr label maxOutput = 10;
+
+        label nOutput = 0;
+
+        for (const label cppEdgei : danglingEdges.sortedToc())
+        {
+            const edge e(cpp.meshEdge(cppEdgei));
+
+            const auto& gathered = gatheredConnections[cppEdgei];
+
+            Info<< "connection: ";
+            gathered.writeList(Info) << nl;
+
+            Info<<"    edge  : "
+                << cpp.points()[e.first()] << ' '
+                << cpp.points()[e.second()] << nl;
+
+            ++nOutput;
+            if (maxOutput > 0 && nOutput >= maxOutput)
+            {
+                Info<< " ... suppressing further output" << nl;
+                break;
+            }
+        }
+
+        labelList selectEdges(danglingEdges.sortedToc());
+        word outputName("faMesh-construct.danglingEdges");
+
+        vtkWritePatchEdges
+        (
+            cpp,
+            selectEdges,
+            mesh().time().globalPath(),
+            outputName
+        );
+
+        InfoInFunction
+            << "(debug) wrote " << outputName << nl;
+    }
+
 
     // Check missing/invalid
     badEdges.clear();
@@ -680,43 +792,33 @@ Foam::faMesh::getBoundaryEdgeConnections() const
     // Verbose report of missing edges
     if (returnReduceOr(badEdges.size()))
     {
-        edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
+        labelList selectEdges(badEdges.sortedToc());
+        word outputName("faMesh-construct.invalidEdges");
 
-        vtk::lineWriter writer
+        vtkWritePatchEdges
         (
-            patch().localPoints(),
-            dumpEdges,
-            fileName
-            (
-                mesh().time().globalPath()
-              / ("faMesh-construct.invalidEdges")
-            )
+            patch(),
+            selectEdges,
+            mesh().time().globalPath(),
+            outputName
         );
 
-        writer.writeGeometry();
-
-        // CellData
-        writer.beginCellData();
-        writer.writeProcIDs();
-
         InfoInFunction
-            << "(debug) wrote " << writer.output().name() << nl;
-
-        writer.close();  // Flush writer before raising FatalError
+            << "(debug) wrote " << outputName << nl;
 
         FatalErrorInFunction
             << "Boundary edges with missing/invalid neighbours: "
-            << returnReduce(badEdges.size(), sumOp<label>()) << '/'
+            << returnReduce(selectEdges.size(), sumOp<label>()) << '/'
             << nBoundaryEdges << nl;
 
         printPatchEdges
         (
             FatalError,
             patch(),
-            badEdges.sortedToc()
+            selectEdges
         );
 
-        FatalError << abort(FatalError);
+        // Delay until later... FatalError << abort(FatalError);
     }
 
 
@@ -806,35 +908,26 @@ void Foam::faMesh::setBoundaryConnections
             }
         }
 
-        edgeList dumpEdges(patch().edges(), badEdges.sortedToc());
+        labelList selectEdges(badEdges.sortedToc());
+        word outputName("faMesh-construct.invalidMatches");
 
-        vtk::lineWriter writer
+        vtkWritePatchEdges
         (
-            patch().localPoints(),
-            dumpEdges,
-            fileName
-            (
-                mesh().time().globalPath()
-              / ("faMesh-construct.invalidMatches")
-            )
+            patch(),
+            selectEdges,
+            mesh().time().globalPath(),
+            outputName
         );
 
-        writer.writeGeometry();
-
-        // CellData
-        writer.beginCellData();
-        writer.writeProcIDs();
-
         InfoInFunction
-            << "(debug) wrote " << writer.output().name() << nl;
-
-        writer.close();  // Flush writer before raising FatalError
+            << "(debug) wrote " << outputName << nl;
 
         FatalErrorInFunction
             << "Did not properly match "
             << returnReduce(nInvalid, sumOp<label>())
-            << " boundary edges" << nl
-            << abort(FatalError);
+            << " boundary edges" << nl;
+
+        // Delay until later... FatalError << abort(FatalError);
     }
 }
 

From 3d091a0d6a09b4e4b8bfd39ab8898be5a2f37697 Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Tue, 9 May 2023 09:00:00 +0000
Subject: [PATCH 221/348] ENH: separate nonBlocking send/receive mapDistribute
 (#2775)

---
 .../mapDistribute/mapDistributeBase.H         |  71 ++++-
 .../mapDistributeBaseTemplates.C              | 256 +++++++++++++++++-
 2 files changed, 321 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
index a92dd574c7..e6bf8960d1 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,7 +87,6 @@ namespace Foam
 {
 
 // Forward Declarations
-
 class bitSet;
 class dictionary;
 class globalIndex;
@@ -954,9 +953,71 @@ public:
             void receive(PstreamBuffers& pBufs, List<T>& field) const;
 
 
-            //- Debug: print layout. Can only be used on maps with sorted
-            //  storage (local data first, then non-local data)
-            void printLayout(Ostream& os) const;
+        // Low-level. Non-blocking. TBD: receive map is usually contiguous
+        // - receive into slices
+
+            //- Start all sends and receives (always non-blocking)
+            template<class T, class negateOp>
+            static void send
+            (
+                const labelListList& subMap,
+                const bool subHasFlip,
+                const labelListList& constructMap,
+                const bool constructHasFlip,
+                const UList<T>& field,
+                labelRange& requests,
+                PtrList<List<T>>& sendFields,
+                PtrList<List<T>>& recvFields,
+                const negateOp& negOp,
+                const int tag,
+                const label comm
+            );
+
+            //- Start all sends and receives (always non-blocking)
+            template<class T>
+            void send
+            (
+                const UList<T>& field,
+                labelRange& requests,
+                PtrList<List<T>>& sendFields,
+                PtrList<List<T>>& recvFields,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Wait for requests to finish and consume
+            template<class T, class CombineOp, class negateOp>
+            static void receive
+            (
+                const label constructSize,
+                const labelListList& constructMap,
+                const bool constructHasFlip,
+                const UPtrList<List<T>>& sendFields,
+                const UPtrList<List<T>>& recvFields,
+                const labelRange& requests,
+                List<T>& field,
+                const CombineOp& cop,
+                const negateOp& negOp,
+                const int tag,
+                const label comm
+            );
+
+            //- Wait for requests to finish and consume
+            template<class T>
+            void receive
+            (
+                const labelRange& requests,
+                const UPtrList<List<T>>& sendFields,
+                const UPtrList<List<T>>& recvFields,
+                List<T>& field,
+                const int tag = UPstream::msgType()
+            ) const;
+
+
+    // Other
+
+        //- Debug: print layout. Can only be used on maps with sorted
+        //  storage (local data first, then non-local data)
+        void printLayout(Ostream& os) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 6ab2260ce3..9f6bdaf50d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -160,6 +160,260 @@ Foam::List<T> Foam::mapDistributeBase::accessAndFlip
 }
 
 
+template<class T, class negateOp>
+void Foam::mapDistributeBase::send
+(
+    const labelListList& subMap,
+    const bool subHasFlip,
+    const labelListList& constructMap,
+    const bool constructHasFlip,
+    const UList<T>& field,
+    labelRange& requests,
+    PtrList<List<T>>& sendFields,
+    PtrList<List<T>>& recvFields,
+    const negateOp& negOp,
+    const int tag,
+    const label comm
+)
+{
+    if (!is_contiguous<T>::value)
+    {
+        FatalErrorInFunction
+            << "Only contiguous is currently supported"
+            << exit(FatalError);
+    }
+
+    const label myRank = UPstream::myProcNo(comm);
+    const label nProcs = UPstream::nProcs(comm);
+
+    requests.start() = UPstream::nRequests();
+    requests.size() = 0;
+
+    // Set up receives from neighbours
+
+    recvFields.clear();
+    recvFields.resize(nProcs);
+
+    for (const int domain : UPstream::allProcs(comm))
+    {
+        const labelList& map = constructMap[domain];
+
+        if (domain != myRank && map.size())
+        {
+            recvFields.set(domain, new List<T>(map.size()));
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                domain,
+                recvFields[domain].data_bytes(),
+                recvFields[domain].size_bytes(),
+                tag,
+                comm
+            );
+        }
+    }
+
+    // TDB: save where recv finish and send start
+    // const label endRecvRequests = UPstream::nRequests();
+
+
+    // Set up sends to neighbours
+
+    sendFields.clear();
+    sendFields.resize(nProcs);
+
+    for (const int domain : UPstream::allProcs(comm))
+    {
+        const labelList& map = subMap[domain];
+
+        if (domain != myRank && map.size())
+        {
+            sendFields.set(domain, new List<T>(map.size()));
+            List<T>& subField = sendFields[domain];
+            forAll(map, i)
+            {
+                subField[i] = accessAndFlip
+                (
+                    field,
+                    map[i],
+                    subHasFlip,
+                    negOp
+                );
+            }
+
+            UOPstream::write
+            (
+                UPstream::commsTypes::nonBlocking,
+                domain,
+                subField.cdata_bytes(),
+                subField.size_bytes(),
+                tag,
+                comm
+            );
+        }
+    }
+
+    // Set up 'send' to myself
+
+    {
+        const labelList& map = subMap[myRank];
+
+        sendFields.set(myRank, new List<T>(map.size()));
+        List<T>& subField = sendFields[myRank];
+        forAll(map, i)
+        {
+            subField[i] = accessAndFlip
+            (
+                field,
+                map[i],
+                subHasFlip,
+                negOp
+            );
+        }
+    }
+
+    requests.size() = (UPstream::nRequests() - requests.start());
+}
+
+
+template<class T>
+void Foam::mapDistributeBase::send
+(
+    const UList<T>& field,
+    labelRange& requests,
+    PtrList<List<T>>& sendFields,
+    PtrList<List<T>>& recvFields,
+    const int tag
+) const
+{
+    send
+    (
+        subMap_,
+        subHasFlip_,
+        constructMap_,
+        constructHasFlip_,
+        field,
+        requests,
+        sendFields,
+        recvFields,
+        flipOp(),
+        tag,
+        comm_
+    );
+}
+
+
+template<class T, class CombineOp, class negateOp>
+void Foam::mapDistributeBase::receive
+(
+    const label constructSize,
+    const labelListList& constructMap,
+    const bool constructHasFlip,
+    const UPtrList<List<T>>& sendFields,
+    const UPtrList<List<T>>& recvFields,
+    const labelRange& requests,
+    List<T>& field,
+    const CombineOp& cop,
+    const negateOp& negOp,
+    const int tag,
+    const label comm
+)
+{
+    if (!is_contiguous<T>::value)
+    {
+        FatalErrorInFunction
+            << "Only contiguous is currently supported"
+            << exit(FatalError);
+    }
+
+    const label myRank = UPstream::myProcNo(comm);
+
+    // Combine bits. Note that can reuse field storage
+
+    field.resize(constructSize);
+
+
+    // Receive sub field from myself (sendFields[myRank])
+    if (sendFields.set(myRank))
+    {
+        const labelList& map = constructMap[myRank];
+        const List<T>& subField = sendFields[myRank];
+
+        flipAndCombine
+        (
+            map,
+            constructHasFlip,
+            subField,
+            cop,
+            negOp,
+            field
+        );
+    }
+
+
+    // Wait for all to finish
+    // TBD. sliced-range (ie, only wait for receives)
+    UPstream::waitRequests(requests.start(), requests.size());
+
+    // Collect neighbour fields
+    for (const int domain : UPstream::allProcs(comm))
+    {
+        const labelList& map = constructMap[domain];
+
+        if (domain != myRank && map.size())
+        {
+            if (!recvFields.set(domain))
+            {
+                FatalErrorInFunction
+                    << "Unallocated receive field from rank:" << domain
+                    << exit(FatalError);
+            }
+
+            const List<T>& subField = recvFields[domain];
+
+            checkReceivedSize(domain, map.size(), subField.size());
+
+            flipAndCombine
+            (
+                map,
+                constructHasFlip,
+                subField,
+                cop,
+                negOp,
+                field
+            );
+        }
+    }
+}
+
+
+template<class T>
+void Foam::mapDistributeBase::receive
+(
+    const labelRange& requests,
+    const UPtrList<List<T>>& sendFields,
+    const UPtrList<List<T>>& recvFields,
+    List<T>& field,
+    const int tag
+) const
+{
+    receive
+    (
+        constructSize_,
+        constructMap_,
+        constructHasFlip_,
+        sendFields,
+        recvFields,
+        requests,
+        field,
+        eqOp<T>(),
+        flipOp(),
+        tag,
+        comm_
+    );
+}
+
+
 template<class T, class NegateOp>
 void Foam::mapDistributeBase::distribute
 (

From e8bcf4cb1be2978a04f3266203e25bbc81547b1d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 17:09:17 +0100
Subject: [PATCH 222/348] ENH: additional uniform boundary conditions (#2703)

- provide uniformMixed conditions for finite-area and finite-volume.

  These are intended to replace the exprMixed condition but allow
  the full range of different PatchFunction1 and Function1 types.

- add uniformFixedGradient to finite-area for completeness.

Note:
   - still some possible difficulties with the order of evaluation.
   - eg, using an expression within the 'U' field that depends
     of the surface 'phi' field before that is constructed.
     In this case, the 'value' entry is really needed.
---
 src/finiteArea/Make/files                     |   2 +
 .../uniformFixedGradientFaPatchField.C        | 161 ++++++++++++
 .../uniformFixedGradientFaPatchField.H        | 188 ++++++++++++++
 .../uniformFixedGradientFaPatchFields.C       |  40 +++
 .../uniformFixedGradientFaPatchFields.H       |  50 ++++
 .../uniformFixedValueFaPatchField.C           |   6 +-
 .../uniformMixed/uniformMixedFaPatchField.C   | 245 ++++++++++++++++++
 .../uniformMixed/uniformMixedFaPatchField.H   | 210 +++++++++++++++
 .../uniformMixed/uniformMixedFaPatchFields.C  |  40 +++
 .../uniformMixed/uniformMixedFaPatchFields.H  |  50 ++++
 src/finiteVolume/Make/files                   |   1 +
 .../uniformFixedGradientFvPatchField.C        |  31 ++-
 .../uniformFixedGradientFvPatchField.H        |  10 +-
 .../uniformFixedValueFvPatchField.C           |  15 +-
 .../uniformFixedValueFvPatchField.H           |   2 +-
 .../uniformMixed/uniformMixedFvPatchField.C   | 235 +++++++++++++++++
 .../uniformMixed/uniformMixedFvPatchField.H   | 213 +++++++++++++++
 .../uniformMixed/uniformMixedFvPatchFields.C  |  39 +++
 .../uniformMixed/uniformMixedFvPatchFields.H  |  50 ++++
 .../uniformFixedValuePointPatchField.C        |  23 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/0/U    |  16 +-
 21 files changed, 1589 insertions(+), 38 deletions(-)
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C
 create mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H

diff --git a/src/finiteArea/Make/files b/src/finiteArea/Make/files
index 039386be84..803c8df34f 100644
--- a/src/finiteArea/Make/files
+++ b/src/finiteArea/Make/files
@@ -68,7 +68,9 @@ $(derivedFaPatchFields)/outletInlet/outletInletFaPatchFields.C
 $(derivedFaPatchFields)/slip/slipFaPatchFields.C
 $(derivedFaPatchFields)/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
 $(derivedFaPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
+$(derivedFaPatchFields)/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
 $(derivedFaPatchFields)/uniformFixedValue/uniformFixedValueFaPatchFields.C
+$(derivedFaPatchFields)/uniformMixed/uniformMixedFaPatchFields.C
 $(derivedFaPatchFields)/ignore/ignoreFaPatchFields.C
 $(derivedFaPatchFields)/clampedPlate/clampedPlateFaPatchFields.C
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C
new file mode 100644
index 0000000000..f74667880c
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformFixedGradientFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    fixedGradientFaPatchField<Type>(p, iF),
+    refGradFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Field<Type>& fld
+)
+:
+    fixedGradientFaPatchField<Type>(p, iF, fld),
+    refGradFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFaPatchField<Type>(p, iF),  // Bypass dictionary constructor
+    refGradFunc_
+    (
+        Function1<Type>::New
+        (
+            /* p.patch(), */
+            "uniformGradient",
+            dict
+        )
+    )
+{
+    this->evaluate();
+}
+
+
+template<class Type>
+Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
+(
+    const uniformFixedGradientFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    fixedGradientFaPatchField<Type>(ptf, p, iF, mapper),
+    refGradFunc_(ptf.refGradFunc_.clone(/*p.patch()*/))
+{}
+
+
+template<class Type>
+Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
+(
+    const uniformFixedGradientFaPatchField<Type>& ptf
+)
+:
+    fixedGradientFaPatchField<Type>(ptf),
+    refGradFunc_(ptf.refGradFunc_.clone(/*p.patch()*/))
+{}
+
+
+template<class Type>
+Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
+(
+    const uniformFixedGradientFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    fixedGradientFaPatchField<Type>(ptf, iF),
+    refGradFunc_(ptf.refGradFunc_.clone(/*this->patch().patch()*/))
+{
+    // Evaluate the profile if defined
+    if (refGradFunc_)
+    {
+        this->evaluate();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformFixedGradientFaPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const scalar t = this->db().time().timeOutputValue();
+
+    // Extra safety on the evaluation
+    if (refGradFunc_)
+    {
+        this->gradient() = refGradFunc_->value(t);
+    }
+    else
+    {
+        this->gradient() = Zero;
+    }
+
+    fixedGradientFaPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::uniformFixedGradientFaPatchField<Type>::write(Ostream& os) const
+{
+    fixedGradientFaPatchField<Type>::write(os);
+    if (refGradFunc_)
+    {
+        refGradFunc_->writeData(os);
+    }
+    faPatchField<Type>::writeValueEntry(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H
new file mode 100644
index 0000000000..52e0f026b6
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H
@@ -0,0 +1,188 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::uniformFixedGradientFaPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition provides a uniform fixed gradient condition.
+
+Usage
+    \table
+        Property     | Description                  | Required | Default
+        uniformGradient | uniform gradient          | yes |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            uniformFixedGradient;
+        uniformGradient constant 0.2;
+    }
+    \endverbatim
+
+Note
+    The uniformGradient entry is a Function1 type.
+    The example above gives the usage for supplying a constant value.
+
+See also
+    Foam::Function1Types
+    Foam::fixedGradientFaPatchField
+
+SourceFiles
+    uniformFixedGradientFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformFixedGradientFaPatchField_H
+#define Foam_uniformFixedGradientFaPatchField_H
+
+#include "fixedGradientFaPatchField.H"
+#include "PatchFunction1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+              Class uniformFixedGradientFaPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class uniformFixedGradientFaPatchField
+:
+    public fixedGradientFaPatchField<Type>
+{
+    // Private Data
+
+        //- Function providing the gradient
+        autoPtr<Function1<Type>> refGradFunc_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformFixedGradient");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        uniformFixedGradientFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        uniformFixedGradientFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Field<Type>& fld
+        );
+
+        //- Construct from patch, internal field and dictionary
+        uniformFixedGradientFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping onto a new patch
+        uniformFixedGradientFaPatchField
+        (
+            const uniformFixedGradientFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        uniformFixedGradientFaPatchField
+        (
+            const uniformFixedGradientFaPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new uniformFixedGradientFaPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        uniformFixedGradientFaPatchField
+        (
+            const uniformFixedGradientFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new uniformFixedGradientFaPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "uniformFixedGradientFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
new file mode 100644
index 0000000000..2e6a854e5c
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformFixedGradientFaPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "areaFields.H"
+#include "edgeFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaPatchFields(uniformFixedGradient);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H
new file mode 100644
index 0000000000..7e7a2973d6
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformFixedGradientFaPatchFields_H
+#define Foam_uniformFixedGradientFaPatchFields_H
+
+#include "uniformFixedGradientFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(uniformFixedGradient);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
index a02dd23823..804b049a5f 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
@@ -73,11 +73,7 @@ Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
         )
     )
 {
-    if (this->readValueEntry(dict))
-    {
-        // Full restart
-    }
-    else
+    if (!this->readValueEntry(dict))
     {
         this->evaluate();
     }
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
new file mode 100644
index 0000000000..82ee838495
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
@@ -0,0 +1,245 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformMixedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    mixedFaPatchField<Type>(p, iF),
+    refValueFunc_(nullptr),
+    refGradFunc_(nullptr),
+    valueFractionFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Field<Type>& fld
+)
+:
+    mixedFaPatchField<Type>(p, iF, fld),
+    refValueFunc_(nullptr),
+    refGradFunc_(nullptr),
+    valueFractionFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    refValueFunc_
+    (
+        Function1<Type>::NewIfPresent
+        (
+            /* p.patch(), */
+            "uniformValue",
+            dict
+        )
+    ),
+    refGradFunc_
+    (
+        Function1<Type>::NewIfPresent
+        (
+            // p.patch(),
+            "uniformGradient",
+            dict
+        )
+    ),
+    valueFractionFunc_(nullptr)
+{
+    if (refValueFunc_)
+    {
+        if (refGradFunc_)
+        {
+            // Both value + gradient: needs valueFraction
+            valueFractionFunc_.reset
+            (
+                Function1<scalar>::New
+                (
+                    /* p.patch(), */
+                    "uniformValueFraction",
+                    dict
+                )
+            );
+        }
+    }
+    else if (!refGradFunc_)
+    {
+        // Missing both value and gradient: FatalIOError
+        FatalIOErrorInFunction(dict)
+            << "For " << this->internalField().name() << " on "
+            << this->patch().name() << nl
+            << "Require either or both: uniformValue and uniformGradient"
+            << " (possibly uniformValueFraction as well)" << nl
+            << exit(FatalIOError);
+    }
+
+    // Use restart value if provided...
+    if (!this->readValueEntry(dict))
+    {
+        this->evaluate();
+    }
+}
+
+
+template<class Type>
+Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
+(
+    const uniformMixedFaPatchField<Type>& ptf,
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const faPatchFieldMapper& mapper
+)
+:
+    mixedFaPatchField<Type>(ptf, p, iF, mapper),
+    refValueFunc_(ptf.refValueFunc_.clone(/*p.patch()*/)),
+    refGradFunc_(ptf.refGradFunc_.clone(/*p.patch()*/)),
+    valueFractionFunc_(ptf.valueFractionFunc_.clone(/*p.patch()*/))
+{}
+
+
+template<class Type>
+Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
+(
+    const uniformMixedFaPatchField<Type>& ptf
+)
+:
+    mixedFaPatchField<Type>(ptf),
+    refValueFunc_(ptf.refValueFunc_.clone(/*this->patch().patch()*/)),
+    refGradFunc_(ptf.refGradFunc_.clone(/*this->patch().patch()*/)),
+    valueFractionFunc_(ptf.valueFractionFunc_.clone(/*this->patch().patch()*/))
+{}
+
+
+template<class Type>
+Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
+(
+    const uniformMixedFaPatchField<Type>& ptf,
+    const DimensionedField<Type, areaMesh>& iF
+)
+:
+    mixedFaPatchField<Type>(ptf, iF),
+    refValueFunc_(ptf.refValueFunc_.clone(/*this->patch().patch()*/)),
+    refGradFunc_(ptf.refGradFunc_.clone(/*this->patch().patch()*/)),
+    valueFractionFunc_(ptf.valueFractionFunc_.clone(/*this->patch().patch()*/))
+{
+    // Evaluate the profile if defined
+    if (ptf.refValueFunc_ || ptf.refGradFunc_)
+    {
+        this->evaluate();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformMixedFaPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const scalar t = this->db().time().timeOutputValue();
+
+    if (refValueFunc_)
+    {
+        this->refValue() = refValueFunc_->value(t);
+
+        if (refGradFunc_)
+        {
+            // Both value + gradient: has valueFraction too
+            this->valueFraction() = valueFractionFunc_->value(t);
+        }
+        else
+        {
+            // Has value only
+            this->valueFraction() = 1;
+        }
+    }
+    else
+    {
+        this->refValue() = Zero;
+        this->valueFraction() = 0;
+    }
+    if (refGradFunc_)
+    {
+        this->refGrad() = refGradFunc_->value(t);
+    }
+    else
+    {
+        this->refGrad() = Zero;
+    }
+
+    // Missing both value and gradient is caught as an error in
+    // dictionary constructor, but treated as zero-gradient here.
+
+    mixedFaPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::uniformMixedFaPatchField<Type>::write(Ostream& os) const
+{
+    faPatchField<Type>::write(os);
+
+    if (refValueFunc_)
+    {
+        refValueFunc_->writeData(os);
+    }
+    if (refGradFunc_)
+    {
+        refGradFunc_->writeData(os);
+    }
+    if (valueFractionFunc_)
+    {
+        valueFractionFunc_->writeData(os);
+    }
+
+    // Eg, for visualisation
+    faPatchField<Type>::writeValueEntry(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H
new file mode 100644
index 0000000000..bd2819f6f4
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::uniformMixedFaPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition provides 'mixed' type boundary condition
+    that mix a \em uniform fixed value and a \em uniform patch-normal
+    gradient condition. The term "uniform" is a legacy name since the
+    prescribed values were previously spatially uniform across that patch.
+
+Usage
+    \table
+        Property     | Description                      | Required | Default
+        uniformValue | uniform value                    | partly | 0
+        uniformGradient | uniform gradient              | partly | 0
+        uniformValueFraction | uniform valueFraction    | partly | depends
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            uniformMixed;
+        uniformValue    constant 0.2;
+        uniformGradient constant 0.2;
+        uniformValueFraction
+        {
+            type  sine;
+            ...
+        }
+    }
+    \endverbatim
+
+Note
+    This boundary condition allows \em lazier definitions so that either
+    or both: \c uniformValue and \c uniformGradient must be defined.
+    If only of these entries is defined, the value fraction is automatically
+    treated appropriately (ie, 0 with \c uniformGradient and 1 with
+    uniformValue).
+    If both \c uniformValue and \c uniformGradient are defined,
+    the \c uniformValueFraction must also be defined.
+
+See also
+    Foam::Function1Types
+    Foam::mixedFaPatchField
+
+SourceFiles
+    uniformMixedFaPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformMixedFaPatchField_H
+#define Foam_uniformMixedFaPatchField_H
+
+#include "mixedFaPatchField.H"
+#include "Function1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class uniformMixedFaPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class uniformMixedFaPatchField
+:
+    public mixedFaPatchField<Type>
+{
+    // Private Data
+
+        //- Function providing the value
+        autoPtr<Function1<Type>> refValueFunc_;
+
+        //- Function providing the gradient
+        autoPtr<Function1<Type>> refGradFunc_;
+
+        //- Function providing the value-fraction
+        autoPtr<Function1<scalar>> valueFractionFunc_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformMixed");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        uniformMixedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        uniformMixedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Field<Type>& fld
+        );
+
+        //- Construct from patch, internal field and dictionary
+        uniformMixedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping onto a new patch
+        uniformMixedFaPatchField
+        (
+            const uniformMixedFaPatchField<Type>&,
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const faPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        uniformMixedFaPatchField
+        (
+            const uniformMixedFaPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new uniformMixedFaPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        uniformMixedFaPatchField
+        (
+            const uniformMixedFaPatchField<Type>&,
+            const DimensionedField<Type, areaMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<faPatchField<Type>> clone
+        (
+            const DimensionedField<Type, areaMesh>& iF
+        ) const
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new uniformMixedFaPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "uniformMixedFaPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C
new file mode 100644
index 0000000000..d7f518c1a1
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformMixedFaPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "areaFields.H"
+#include "edgeFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeFaPatchFields(uniformMixed);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H
new file mode 100644
index 0000000000..4f91619e41
--- /dev/null
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformMixedFaPatchFields_H
+#define Foam_uniformMixedFaPatchFields_H
+
+#include "uniformMixedFaPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeFaPatchTypeFieldTypedefs(uniformMixed);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index aa58f5991c..dca1ff2d9f 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -227,6 +227,7 @@ $(derivedFvPatchFields)/turbulentIntensityKineticEnergyInlet/turbulentIntensityK
 $(derivedFvPatchFields)/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/uniformFixedGradient/uniformFixedGradientFvPatchFields.C
 $(derivedFvPatchFields)/uniformFixedValue/uniformFixedValueFvPatchFields.C
+$(derivedFvPatchFields)/uniformMixed/uniformMixedFvPatchFields.C
 $(derivedFvPatchFields)/uniformInletOutlet/uniformInletOutletFvPatchFields.C
 $(derivedFvPatchFields)/uniformJump/uniformJumpFvPatchFields.C
 $(derivedFvPatchFields)/uniformJumpAMI/uniformJumpAMIFvPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index 9be8715829..d265cadd19 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(p, iF),
-    uniformGradient_(nullptr)
+    refGradFunc_(nullptr)
 {}
 
 
@@ -51,7 +51,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(p, iF, fld),
-    uniformGradient_(nullptr)
+    refGradFunc_(nullptr)
 {}
 
 
@@ -64,7 +64,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(p, iF),  // Bypass dictionary constructor
-    uniformGradient_
+    refGradFunc_
     (
         PatchFunction1<Type>::New(p.patch(), "uniformGradient", dict)
     )
@@ -84,7 +84,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf, p, iF, mapper),
-    uniformGradient_(ptf.uniformGradient_.clone())
+    refGradFunc_(ptf.refGradFunc_.clone())
 {}
 
 
@@ -95,7 +95,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf),
-    uniformGradient_(ptf.uniformGradient_.clone())
+    refGradFunc_(ptf.refGradFunc_.clone())
 {}
 
 
@@ -107,10 +107,10 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf, iF),
-    uniformGradient_(ptf.uniformGradient_.clone())
+    refGradFunc_(ptf.refGradFunc_.clone())
 {
     // Evaluate the profile if defined
-    if (ptf.uniformGradient_)
+    if (refGradFunc_)
     {
         this->evaluate();
     }
@@ -128,7 +128,15 @@ void Foam::uniformFixedGradientFvPatchField<Type>::updateCoeffs()
     }
 
     const scalar t = this->db().time().timeOutputValue();
-    this->gradient() = uniformGradient_->value(t);
+    // Extra safety on the evaluation
+    if (refGradFunc_)
+    {
+        this->gradient() = refGradFunc_->value(t);
+    }
+    else
+    {
+        this->gradient() = Zero;
+    }
 
     fixedGradientFvPatchField<Type>::updateCoeffs();
 }
@@ -138,7 +146,10 @@ template<class Type>
 void Foam::uniformFixedGradientFvPatchField<Type>::write(Ostream& os) const
 {
     fixedGradientFvPatchField<Type>::write(os);
-    uniformGradient_->writeData(os);
+    if (refGradFunc_)
+    {
+        refGradFunc_->writeData(os);
+    }
     fvPatchField<Type>::writeValueEntry(os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index 0cce531299..34bdbb50a0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,8 +62,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef uniformFixedGradientFvPatchField_H
-#define uniformFixedGradientFvPatchField_H
+#ifndef Foam_uniformFixedGradientFvPatchField_H
+#define Foam_uniformFixedGradientFvPatchField_H
 
 #include "fixedGradientFvPatchFields.H"
 #include "PatchFunction1.H"
@@ -84,8 +84,8 @@ class uniformFixedGradientFvPatchField
 {
     // Private Data
 
-        //- Gradient
-        autoPtr<PatchFunction1<Type>> uniformGradient_;
+        //- Function providing the gradient
+        autoPtr<PatchFunction1<Type>> refGradFunc_;
 
 
 public:
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index c1ba993d44..4e876b1a07 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -134,12 +134,12 @@ void Foam::uniformFixedValueFvPatchField<Type>::autoMap
     if (refValueFunc_)
     {
         refValueFunc_().autoMap(mapper);
-    }
 
-    if (refValueFunc_().constant())
-    {
-        // If mapper is not dependent on time we're ok to evaluate
-        this->evaluate();
+        if (refValueFunc_().constant())
+        {
+            // If mapper is not dependent on time we're ok to evaluate
+            this->evaluate();
+        }
     }
 }
 
@@ -156,7 +156,7 @@ void Foam::uniformFixedValueFvPatchField<Type>::rmap
     const uniformFixedValueFvPatchField& tiptf =
         refCast<const uniformFixedValueFvPatchField>(ptf);
 
-    if (refValueFunc_)
+    if (refValueFunc_ && tiptf.refValueFunc_)
     {
         refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
     }
@@ -172,6 +172,7 @@ void Foam::uniformFixedValueFvPatchField<Type>::updateCoeffs()
     }
 
     const scalar t = this->db().time().timeOutputValue();
+
     fvPatchField<Type>::operator==(refValueFunc_->value(t));
     fixedValueFvPatchField<Type>::updateCoeffs();
 }
@@ -181,12 +182,10 @@ template<class Type>
 void Foam::uniformFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
-
     if (refValueFunc_)
     {
         refValueFunc_->writeData(os);
     }
-
     fvPatchField<Type>::writeValueEntry(os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index f36be7f976..fa5f8a3442 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
new file mode 100644
index 0000000000..c73934f4ec
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformMixedFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    mixedFvPatchField<Type>(p, iF),
+    refValueFunc_(nullptr),
+    refGradFunc_(nullptr),
+    valueFractionFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const Field<Type>& fld
+)
+:
+    mixedFvPatchField<Type>(p, iF, fld),
+    refValueFunc_(nullptr),
+    refGradFunc_(nullptr),
+    valueFractionFunc_(nullptr)
+{}
+
+
+template<class Type>
+Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    refValueFunc_
+    (
+        PatchFunction1<Type>::NewIfPresent(p.patch(), "uniformValue", dict)
+    ),
+    refGradFunc_
+    (
+        PatchFunction1<Type>::NewIfPresent(p.patch(), "uniformGradient", dict)
+    ),
+    valueFractionFunc_(nullptr)
+{
+    if (refValueFunc_)
+    {
+        if (refGradFunc_)
+        {
+            // Both value + gradient: needs valueFraction
+            valueFractionFunc_.reset
+            (
+                PatchFunction1<scalar>::New
+                (
+                    p.patch(),
+                    "uniformValueFraction",
+                    dict
+                )
+            );
+        }
+    }
+    else if (!refGradFunc_)
+    {
+        // Missing both value and gradient: FatalIOError
+        FatalIOErrorInFunction(dict)
+            << "For " << this->internalField().name() << " on "
+            << this->patch().name() << nl
+            << "Require either or both: uniformValue and uniformGradient"
+            << " (possibly uniformValueFraction as well)" << nl
+            << exit(FatalIOError);
+    }
+
+    // Use restart value if provided...
+    if (!this->readValueEntry(dict))
+    {
+        this->evaluate();
+    }
+}
+
+
+template<class Type>
+Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
+(
+    const uniformMixedFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(ptf, p, iF, mapper),
+    refValueFunc_(ptf.refValueFunc_.clone(p.patch())),
+    refGradFunc_(ptf.refGradFunc_.clone(p.patch())),
+    valueFractionFunc_(ptf.valueFractionFunc_.clone(p.patch()))
+{}
+
+
+template<class Type>
+Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
+(
+    const uniformMixedFvPatchField<Type>& ptf
+)
+:
+    mixedFvPatchField<Type>(ptf),
+    refValueFunc_(ptf.refValueFunc_.clone(this->patch().patch())),
+    refGradFunc_(ptf.refGradFunc_.clone(this->patch().patch())),
+    valueFractionFunc_(ptf.valueFractionFunc_.clone(this->patch().patch()))
+{}
+
+
+template<class Type>
+Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
+(
+    const uniformMixedFvPatchField<Type>& ptf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    mixedFvPatchField<Type>(ptf, iF),
+    refValueFunc_(ptf.refValueFunc_.clone(this->patch().patch())),
+    refGradFunc_(ptf.refGradFunc_.clone(this->patch().patch())),
+    valueFractionFunc_(ptf.valueFractionFunc_.clone(this->patch().patch()))
+{
+    // Evaluate the profile if defined
+    if (ptf.refValueFunc_ || ptf.refGradFunc_)
+    {
+        this->evaluate();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformMixedFvPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const scalar t = this->db().time().timeOutputValue();
+
+    if (refValueFunc_)
+    {
+        this->refValue() = refValueFunc_->value(t);
+
+        if (refGradFunc_)
+        {
+            // Both value + gradient: has valueFraction too
+            this->valueFraction() = valueFractionFunc_->value(t);
+        }
+        else
+        {
+            // Has value only
+            this->valueFraction() = 1;
+        }
+    }
+    else
+    {
+        this->refValue() = Zero;
+        this->valueFraction() = 0;
+    }
+    if (refGradFunc_)
+    {
+        this->refGrad() = refGradFunc_->value(t);
+    }
+    else
+    {
+        this->refGrad() = Zero;
+    }
+
+    // Missing both value and gradient is caught as an error in
+    // dictionary constructor, but treated as zero-gradient here.
+
+    mixedFvPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::uniformMixedFvPatchField<Type>::write(Ostream& os) const
+{
+    fvPatchField<Type>::write(os);
+
+    if (refValueFunc_)
+    {
+        refValueFunc_->writeData(os);
+    }
+    if (refGradFunc_)
+    {
+        refGradFunc_->writeData(os);
+    }
+    if (valueFractionFunc_)
+    {
+        valueFractionFunc_->writeData(os);
+    }
+
+    // Eg, for visualisation
+    fvPatchField<Type>::writeValueEntry(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H
new file mode 100644
index 0000000000..ccaa055b31
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::uniformMixedFvPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition provides 'mixed' type boundary condition
+    that mix a \em uniform fixed value and a \em uniform patch-normal
+    gradient condition. The term "uniform" is a legacy name since the
+    prescribed values were previously spatially uniform across that patch.
+
+    In the meantime, a PatchFunction1 is used, which can have both
+    spatial and temporal dependencies.
+
+Usage
+    \table
+        Property     | Description                      | Required | Default
+        uniformValue | uniform value                    | partly | 0
+        uniformGradient | uniform gradient              | partly | 0
+        uniformValueFraction | uniform valueFraction    | partly | depends
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            uniformMixed;
+        uniformValue    constant 0.2;
+        uniformGradient constant 0.2;
+        uniformValueFraction
+        {
+            type  sine;
+            ...
+        }
+    }
+    \endverbatim
+
+Note
+    This boundary condition allows \em lazier definitions so that either
+    or both: \c uniformValue and \c uniformGradient must be defined.
+    If only of these entries is defined, the value fraction is automatically
+    treated appropriately (ie, 0 with \c uniformGradient and 1 with
+    uniformValue).
+    If both \c uniformValue and \c uniformGradient are defined,
+    the \c uniformValueFraction must also be defined.
+
+See also
+    Foam::Function1Types
+    Foam::mixedFvPatchField
+
+SourceFiles
+    uniformMixedFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformMixedFvPatchField_H
+#define Foam_uniformMixedFvPatchField_H
+
+#include "mixedFvPatchField.H"
+#include "PatchFunction1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class uniformMixedFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class uniformMixedFvPatchField
+:
+    public mixedFvPatchField<Type>
+{
+    // Private Data
+
+        //- Function providing the value
+        autoPtr<PatchFunction1<Type>> refValueFunc_;
+
+        //- Function providing the gradient
+        autoPtr<PatchFunction1<Type>> refGradFunc_;
+
+        //- Function providing the value-fraction
+        autoPtr<PatchFunction1<scalar>> valueFractionFunc_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformMixed");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        uniformMixedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        uniformMixedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const Field<Type>& fld
+        );
+
+        //- Construct from patch, internal field and dictionary
+        uniformMixedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping onto a new patch
+        uniformMixedFvPatchField
+        (
+            const uniformMixedFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        uniformMixedFvPatchField
+        (
+            const uniformMixedFvPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type>> clone() const
+        {
+            return tmp<fvPatchField<Type>>
+            (
+                new uniformMixedFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        uniformMixedFvPatchField
+        (
+            const uniformMixedFvPatchField<Type>&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type>> clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type>>
+            (
+                new uniformMixedFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "uniformMixedFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C
new file mode 100644
index 0000000000..e307da0c65
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "uniformMixedFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchFields(uniformMixed);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H
new file mode 100644
index 0000000000..25eac16d84
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_uniformMixedFvPatchFields_H
+#define Foam_uniformMixedFvPatchFields_H
+
+#include "uniformMixedFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(uniformMixed);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
index 5708eab900..2f291298c0 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -152,12 +152,16 @@ void Foam::uniformFixedValuePointPatchField<Type>::autoMap
 )
 {
     fixedValuePointPatchField<Type>::autoMap(mapper);
-    refValueFunc_().autoMap(mapper);
 
-    if (refValueFunc_().constant())
+    if (refValueFunc_)
     {
-        // If mapper is not dependent on time we're ok to evaluate
-        this->evaluate();
+        refValueFunc_().autoMap(mapper);
+
+        if (refValueFunc_().constant())
+        {
+            // If mapper is not dependent on time we're ok to evaluate
+            this->evaluate();
+        }
     }
 }
 
@@ -174,7 +178,10 @@ void Foam::uniformFixedValuePointPatchField<Type>::rmap
     const uniformFixedValuePointPatchField& tiptf =
         refCast<const uniformFixedValuePointPatchField>(ptf);
 
-    refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
+    if (refValueFunc_ && tiptf.refValueFunc_)
+    {
+        refValueFunc_().rmap(tiptf.refValueFunc_(), addr);
+    }
 }
 
 
@@ -186,6 +193,7 @@ void Foam::uniformFixedValuePointPatchField<Type>::updateCoeffs()
         return;
     }
     const scalar t = this->db().time().timeOutputValue();
+
     fixedValuePointPatchField<Type>::operator==(refValueFunc_->value(t));
     fixedValuePointPatchField<Type>::updateCoeffs();
 }
@@ -197,7 +205,10 @@ write(Ostream& os) const
 {
     // Note: write value
     fixedValuePointPatchField<Type>::write(os);
-    refValueFunc_->writeData(os);
+    if (refValueFunc_)
+    {
+        refValueFunc_->writeData(os);
+    }
 }
 
 
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/U
index 6f72b041f0..10a031b688 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -35,9 +35,19 @@ boundaryField
 
     outlet2
     {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
+        // A do-it-yourself inletOutlet (for demonstration purposes)
+        // Need 'value' entry to avoid evaluation (with phi) on startup
+        type            uniformMixed;
         value           uniform (0 0 0);
+
+        uniformValue    zero;
+        uniformGradient zero;
+
+        uniformValueFraction
+        {
+            type        expression;
+            expression  "neg(phi)";
+        }
     }
 
     defaultFaces

From 139a8fc6ff0f5eeb9c59f6d7863b24734874a425 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Feb 2023 17:30:04 +0100
Subject: [PATCH 223/348] STYLE: use SPDX-style for scripts

---
 bin/foamCheckJobs                                 | 15 +--------------
 bin/foamCloneCase                                 | 15 +--------------
 bin/foamCopySettings                              | 15 +--------------
 bin/foamCreateVideo                               | 15 +--------------
 bin/foamEndJob                                    | 15 +--------------
 bin/foamGetDict                                   | 15 +--------------
 bin/foamLog                                       | 15 +--------------
 bin/foamMonitor                                   | 15 +--------------
 bin/foamNew                                       | 15 +--------------
 bin/foamNewApp                                    | 15 +--------------
 bin/foamNewBC                                     | 15 +--------------
 bin/foamNewCase                                   | 15 +--------------
 bin/foamNewFunctionObject                         | 15 +--------------
 bin/foamPrintJobs                                 | 15 +--------------
 bin/foamSearch                                    |  3 +--
 bin/foamSequenceVTKFiles                          | 15 +--------------
 bin/foamSolverSweeps                              | 15 +--------------
 bin/tools/MakefileDirs                            | 15 +--------------
 bin/tools/doxyFilter                              | 15 +--------------
 bin/tools/doxyFilter-ignore.awk                   | 15 +--------------
 bin/tools/doxyFilter-top.awk                      | 15 +--------------
 bin/tools/doxyFilter.awk                          | 15 +--------------
 bin/tools/findEmptyMake                           | 15 +--------------
 bin/tools/foamCreateManpage                       |  3 +--
 bin/tools/foamGrepExeTargets                      | 15 +--------------
 bin/tools/foamUpdateCaseFileHeader                | 15 +--------------
 bin/tools/pre-commit-hook                         | 15 +--------------
 bin/tools/pre-receive-hook                        | 15 +--------------
 etc/codeTemplates/foamScript                      | 15 +--------------
 etc/codeTemplates/source/foamNewSource            | 15 +--------------
 etc/codeTemplates/template/foamNewTemplate        | 15 +--------------
 .../fields/fieldExprLemonParserMacros.m4          |  3 +--
 32 files changed, 32 insertions(+), 412 deletions(-)

diff --git a/bin/foamCheckJobs b/bin/foamCheckJobs
index 54bc2531c8..87a48ee7cf 100755
--- a/bin/foamCheckJobs
+++ b/bin/foamCheckJobs
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamCheckJobs
diff --git a/bin/foamCloneCase b/bin/foamCloneCase
index 55688839c0..58fc79452d 100755
--- a/bin/foamCloneCase
+++ b/bin/foamCloneCase
@@ -9,20 +9,7 @@
 #     Copyright (C) 2015 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamCloneCase
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index 887c8e3b6f..b1f0b75269 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011-2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamCopySettings
diff --git a/bin/foamCreateVideo b/bin/foamCreateVideo
index 93bb7dcf2d..63fb620cc8 100755
--- a/bin/foamCreateVideo
+++ b/bin/foamCreateVideo
@@ -10,20 +10,7 @@
 #     Copyright (C) 2018-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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamCreateVideo
diff --git a/bin/foamEndJob b/bin/foamEndJob
index d224d20c5a..90c6409a55 100755
--- a/bin/foamEndJob
+++ b/bin/foamEndJob
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011-2014 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamEndJob
diff --git a/bin/foamGetDict b/bin/foamGetDict
index a6cbaa9c36..1001354b3e 100755
--- a/bin/foamGetDict
+++ b/bin/foamGetDict
@@ -10,20 +10,7 @@
 #     Copyright (C) 2019-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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamGetDict
diff --git a/bin/foamLog b/bin/foamLog
index 25908fee22..7d79f74775 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -10,20 +10,7 @@
 #     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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamLog
diff --git a/bin/foamMonitor b/bin/foamMonitor
index 5a4f736a0b..3998fa3a4c 100755
--- a/bin/foamMonitor
+++ b/bin/foamMonitor
@@ -10,20 +10,7 @@
 #    Copyright (C) 2019-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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamMonitor
diff --git a/bin/foamNew b/bin/foamNew
index e82f9121f5..4e6aa4fc73 100755
--- a/bin/foamNew
+++ b/bin/foamNew
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNew
diff --git a/bin/foamNewApp b/bin/foamNewApp
index 9590a55199..7f6f65cbf8 100755
--- a/bin/foamNewApp
+++ b/bin/foamNewApp
@@ -10,20 +10,7 @@
 #     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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNewApp
diff --git a/bin/foamNewBC b/bin/foamNewBC
index 67bfad41ac..2af9dc5ce0 100755
--- a/bin/foamNewBC
+++ b/bin/foamNewBC
@@ -10,20 +10,7 @@
 #     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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNewBC
diff --git a/bin/foamNewCase b/bin/foamNewCase
index 5c736a897d..bb5fa6fcd2 100755
--- a/bin/foamNewCase
+++ b/bin/foamNewCase
@@ -10,20 +10,7 @@
 #     Copyright (C) 2018-2019 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNewCase
diff --git a/bin/foamNewFunctionObject b/bin/foamNewFunctionObject
index 50763f8f66..5f0dc54151 100755
--- a/bin/foamNewFunctionObject
+++ b/bin/foamNewFunctionObject
@@ -10,20 +10,7 @@
 #     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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNewFunctionObject
diff --git a/bin/foamPrintJobs b/bin/foamPrintJobs
index 9e9fb20f0b..78f583b2af 100755
--- a/bin/foamPrintJobs
+++ b/bin/foamPrintJobs
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamPrintJobs
diff --git a/bin/foamSearch b/bin/foamSearch
index 1f0045d84b..f0bab6c10b 100755
--- a/bin/foamSearch
+++ b/bin/foamSearch
@@ -10,8 +10,7 @@
 #     Copyright (C) 2018 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamSearch
diff --git a/bin/foamSequenceVTKFiles b/bin/foamSequenceVTKFiles
index 3515c11f69..53bd8407f2 100755
--- a/bin/foamSequenceVTKFiles
+++ b/bin/foamSequenceVTKFiles
@@ -10,20 +10,7 @@
 #     Copyright (C) 2020 DLR
 #------------------------------------------------------------------------------
 # 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamSequenceVTKFiles
diff --git a/bin/foamSolverSweeps b/bin/foamSolverSweeps
index b643f1de45..07821fdb76 100755
--- a/bin/foamSolverSweeps
+++ b/bin/foamSolverSweeps
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamSolverSweeps
diff --git a/bin/tools/MakefileDirs b/bin/tools/MakefileDirs
index 9c544e4209..682ad7da81 100644
--- a/bin/tools/MakefileDirs
+++ b/bin/tools/MakefileDirs
@@ -8,20 +8,7 @@
 #     Copyright (C) 2011-2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # File
 #     MakefileDirs
diff --git a/bin/tools/doxyFilter b/bin/tools/doxyFilter
index 1ff3ca11b7..881bb7ab8d 100755
--- a/bin/tools/doxyFilter
+++ b/bin/tools/doxyFilter
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011-2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     doxyFilter
diff --git a/bin/tools/doxyFilter-ignore.awk b/bin/tools/doxyFilter-ignore.awk
index e01a978798..be8f7506f5 100644
--- a/bin/tools/doxyFilter-ignore.awk
+++ b/bin/tools/doxyFilter-ignore.awk
@@ -8,20 +8,7 @@
 #     Copyright (C) 2011-2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     doxyFilter-ignore.awk
diff --git a/bin/tools/doxyFilter-top.awk b/bin/tools/doxyFilter-top.awk
index 4d9ec3cadf..dd01430398 100644
--- a/bin/tools/doxyFilter-top.awk
+++ b/bin/tools/doxyFilter-top.awk
@@ -8,20 +8,7 @@
 #     Copyright (C) 2011-2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     doxyFilter-top.awk
diff --git a/bin/tools/doxyFilter.awk b/bin/tools/doxyFilter.awk
index 17a1eee955..9d6f63abdd 100644
--- a/bin/tools/doxyFilter.awk
+++ b/bin/tools/doxyFilter.awk
@@ -9,20 +9,7 @@
 #     Copyright (C) 2017 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     doxyFilter.awk
diff --git a/bin/tools/findEmptyMake b/bin/tools/findEmptyMake
index 3a6ce0f5b7..65e28c6459 100755
--- a/bin/tools/findEmptyMake
+++ b/bin/tools/findEmptyMake
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011-2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     findEmptyMake
diff --git a/bin/tools/foamCreateManpage b/bin/tools/foamCreateManpage
index 615a16208a..e8dad150de 100755
--- a/bin/tools/foamCreateManpage
+++ b/bin/tools/foamCreateManpage
@@ -9,8 +9,7 @@
 #     Copyright (C) 2018-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamCreateManpage
diff --git a/bin/tools/foamGrepExeTargets b/bin/tools/foamGrepExeTargets
index f5cbec5dd2..081692305e 100755
--- a/bin/tools/foamGrepExeTargets
+++ b/bin/tools/foamGrepExeTargets
@@ -9,20 +9,7 @@
 #     Copyright (C) 2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamGrepExeTargets
diff --git a/bin/tools/foamUpdateCaseFileHeader b/bin/tools/foamUpdateCaseFileHeader
index 7fe6514d78..54f8b25adb 100755
--- a/bin/tools/foamUpdateCaseFileHeader
+++ b/bin/tools/foamUpdateCaseFileHeader
@@ -10,20 +10,7 @@
 #     Copyright (C) 2018-2019 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamUpdateCaseFileHeader
diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook
index 8d806c4fc9..c6bfe4d5c5 100755
--- a/bin/tools/pre-commit-hook
+++ b/bin/tools/pre-commit-hook
@@ -10,20 +10,7 @@
 #     Copyright (C) 2016 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     pre-commit-hook
diff --git a/bin/tools/pre-receive-hook b/bin/tools/pre-receive-hook
index 383f6238ef..0b8c575d14 100755
--- a/bin/tools/pre-receive-hook
+++ b/bin/tools/pre-receive-hook
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     pre-receive-hook
diff --git a/etc/codeTemplates/foamScript b/etc/codeTemplates/foamScript
index a7f86bbfdc..456f6566fa 100755
--- a/etc/codeTemplates/foamScript
+++ b/etc/codeTemplates/foamScript
@@ -9,20 +9,7 @@
 #     Copyright (C) YEAR AUTHOR,AFFILIATION
 #------------------------------------------------------------------------------
 # 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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #
diff --git a/etc/codeTemplates/source/foamNewSource b/etc/codeTemplates/source/foamNewSource
index 2cadec2d84..cf0a5de155 100755
--- a/etc/codeTemplates/source/foamNewSource
+++ b/etc/codeTemplates/source/foamNewSource
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011-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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNewSource
diff --git a/etc/codeTemplates/template/foamNewTemplate b/etc/codeTemplates/template/foamNewTemplate
index 38180f93f7..2ca375aff8 100755
--- a/etc/codeTemplates/template/foamNewTemplate
+++ b/etc/codeTemplates/template/foamNewTemplate
@@ -9,20 +9,7 @@
 #     Copyright (C) 2011-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/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Script
 #     foamNewTemplate
diff --git a/src/OpenFOAM/expressions/fields/fieldExprLemonParserMacros.m4 b/src/OpenFOAM/expressions/fields/fieldExprLemonParserMacros.m4
index 03298d11d2..2269f5b2ca 100644
--- a/src/OpenFOAM/expressions/fields/fieldExprLemonParserMacros.m4
+++ b/src/OpenFOAM/expressions/fields/fieldExprLemonParserMacros.m4
@@ -9,8 +9,7 @@ divert(-1)dnl
 #     Copyright (C) 2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
-#     This file is part of OpenFOAM, licensed under GNU General Public License
-#     <http://www.gnu.org/licenses/>.
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
 #
 # Description
 #     Driver-specific m4/lemon macros for field expressions.

From 62a68eeea0c3c1307f4462797bb2c7d482c34499 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 May 2023 14:02:13 +0200
Subject: [PATCH 224/348] ENH: free/nullify of PtrList and UPtrList

- Allows clearing or freeing pointers without touching the underlying
  list size. Was previously only for PtrDynList, but now available on
  UPtrList, PtrList as well.

- add transfer() method to PtrDynList to avoid potential slicing.
---
 .../PtrLists/PtrDynList/PtrDynList.H          | 12 ++++--
 .../PtrLists/PtrDynList/PtrDynListI.H         | 38 +++++++++++++++++++
 .../containers/PtrLists/PtrList/PtrList.H     |  5 ++-
 .../containers/PtrLists/PtrList/PtrListI.H    | 25 ++++++------
 .../containers/PtrLists/UPtrList/UPtrList.H   |  3 ++
 .../containers/PtrLists/UPtrList/UPtrListI.H  |  7 ++++
 .../mapDistributeBaseTemplates.C              |  4 +-
 .../polyBoundaryMesh/polyBoundaryMesh.C       | 21 ++++++----
 .../polyBoundaryMesh/polyBoundaryMesh.H       | 25 ++++++------
 src/OpenFOAM/meshes/polyMesh/polyMeshClear.C  |  2 -
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C     |  2 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.C   | 11 ++----
 .../faMesh/faBoundaryMesh/faBoundaryMesh.C    |  9 +++++
 .../faMesh/faBoundaryMesh/faBoundaryMesh.H    | 20 ++++++----
 .../sampledSet/sampledSets/sampledSets.C      |  2 +-
 15 files changed, 131 insertions(+), 55 deletions(-)

diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index f0850dd8c7..8528bb6382 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -126,9 +126,6 @@ public:
 
     // Edit
 
-        //- Delete the allocated entries, but retain the list size.
-        using PtrList<T>::free;
-
         //- Squeeze out intermediate nullptr entries in the list of pointers
         //- and adjust the addressable size accordingly.
         //  \return the number of non-null entries
@@ -138,6 +135,13 @@ public:
         template<int AnySizeMin>
         inline void swap(PtrDynList<T, AnySizeMin>& other);
 
+        //- Transfer contents of the argument PtrList into this.
+        inline void transfer(PtrList<T>& list);
+
+        //- Transfer contents of any sized PtrDynList into this.
+        template<int AnySizeMin>
+        inline void transfer(PtrDynList<T, AnySizeMin>& list);
+
         //- Construct an element at the end of the list,
         //- return reference to the new list element
         template<class... Args>
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index 0320636bd6..841456774f 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -216,6 +216,44 @@ inline void Foam::PtrDynList<T, SizeMin>::swap
 }
 
 
+template<class T, int SizeMin>
+inline void Foam::PtrDynList<T, SizeMin>::transfer(PtrList<T>& other)
+{
+    if
+    (
+        static_cast<const PtrList<T>*>(this)
+     == static_cast<const PtrList<T>*>(&other)
+    )
+    {
+        return;  // Self assignment is a no-op
+    }
+
+    UPtrList<T>::swap(other);
+    other.clear();
+}
+
+
+template<class T, int SizeMin>
+template<int AnySizeMin>
+inline void Foam::PtrDynList<T, SizeMin>::transfer
+(
+    PtrDynList<T, AnySizeMin>& other
+)
+{
+    if
+    (
+        static_cast<const PtrList<T>*>(this)
+     == static_cast<const PtrList<T>*>(&other)
+    )
+    {
+        return;  // Self assignment is a no-op
+    }
+
+    this->swap(other);
+    other.clear();
+}
+
+
 template<class T, int SizeMin>
 template<class... Args>
 inline T& Foam::PtrDynList<T, SizeMin>::emplace_back(Args&&... args)
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 80374047f0..24a72273d1 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -78,8 +78,6 @@ protected:
         template<class INew>
         void readIstream(Istream& is, const INew& inew);
 
-        //- Delete the allocated entries, but retain the list size.
-        inline void free();
 
 public:
 
@@ -142,6 +140,9 @@ public:
         //- Clear the PtrList. Delete allocated entries and set size to zero.
         inline void clear();
 
+        //- Free memory and nullify all entries. Does not change the list size.
+        inline void free();
+
         //- Adjust size of PtrList.
         //  New entries are initialized to nullptr, removed entries are deleted
         void resize(const label newLen);
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
index 150b2825af..5d2ce629fc 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H
@@ -30,15 +30,6 @@ License
 #include "refPtr.H"
 #include "tmp.H"
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-template<class T>
-inline void Foam::PtrList<T>::free()
-{
-    (this->ptrs_).free(); // free old pointers
-}
-
-
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T>
@@ -96,11 +87,18 @@ inline Foam::PtrList<T>::PtrList
 template<class T>
 inline void Foam::PtrList<T>::clear()
 {
-    (this->ptrs_).free(); // free old pointers
+    (this->ptrs_).free();  // Free and nullify old pointers
     UPtrList<T>::clear();
 }
 
 
+template<class T>
+inline void Foam::PtrList<T>::free()
+{
+    (this->ptrs_).free();  // Free and nullify old pointers
+}
+
+
 template<class T>
 template<class... Args>
 inline T& Foam::PtrList<T>::emplace_back(Args&&... args)
@@ -260,7 +258,12 @@ inline Foam::autoPtr<T> Foam::PtrList<T>::release(const label i)
 template<class T>
 inline void Foam::PtrList<T>::transfer(PtrList<T>& list)
 {
-    (this->ptrs_).free(); // free old pointers
+    if (this == &list)
+    {
+        return;  // Self-assignment is a no-op
+    }
+
+    (this->ptrs_).free();  // Free and nullify old pointers
     UPtrList<T>::transfer(list);
 }
 
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index 0dd1967be3..dcf622ba69 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -295,6 +295,9 @@ public:
         //- Set list size to zero.
         inline void clear();
 
+        //- Nullify all entries. Does not change the list size.
+        inline void free();
+
         //- Change the size of the list.
         //  New entries are initialized to nullptr.
         inline void resize(const label newLen);
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index 9180af1668..7782845cbe 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -205,6 +205,13 @@ inline void Foam::UPtrList<T>::clear()
 }
 
 
+template<class T>
+inline void Foam::UPtrList<T>::free()
+{
+    ptrs_.setNull();
+}
+
+
 template<class T>
 inline void Foam::UPtrList<T>::swap(UPtrList<T>& list)
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 9f6bdaf50d..a4fed62e7d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -191,7 +191,7 @@ void Foam::mapDistributeBase::send
 
     // Set up receives from neighbours
 
-    recvFields.clear();
+    recvFields.free();
     recvFields.resize(nProcs);
 
     for (const int domain : UPstream::allProcs(comm))
@@ -219,7 +219,7 @@ void Foam::mapDistributeBase::send
 
     // Set up sends to neighbours
 
-    sendFields.clear();
+    recvFields.free();
     sendFields.resize(nProcs);
 
     for (const int domain : UPstream::allProcs(comm))
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 4dca521071..a4d40ccc17 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -206,6 +206,13 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
+void Foam::polyBoundaryMesh::clear()
+{
+    polyPatchList::clear();
+    clearAddressing();
+}
+
+
 void Foam::polyBoundaryMesh::clearGeom()
 {
     polyPatchList& patches = *this;
@@ -219,9 +226,9 @@ void Foam::polyBoundaryMesh::clearGeom()
 
 void Foam::polyBoundaryMesh::clearAddressing()
 {
-    neighbourEdgesPtr_.clear();
-    patchIDPtr_.clear();
-    groupIDsPtr_.clear();
+    neighbourEdgesPtr_.reset(nullptr);
+    patchIDPtr_.reset(nullptr);
+    groupIDsPtr_.reset(nullptr);
 
     polyPatchList& patches = *this;
 
@@ -493,7 +500,7 @@ void Foam::polyBoundaryMesh::setGroup
     const labelUList& patchIDs
 )
 {
-    groupIDsPtr_.clear();
+    groupIDsPtr_.reset(nullptr);
 
     polyPatchList& patches = *this;
 
@@ -1179,9 +1186,9 @@ void Foam::polyBoundaryMesh::movePoints(const pointField& p)
 
 void Foam::polyBoundaryMesh::updateMesh()
 {
-    neighbourEdgesPtr_.clear();
-    patchIDPtr_.clear();
-    groupIDsPtr_.clear();
+    neighbourEdgesPtr_.reset(nullptr);
+    patchIDPtr_.reset(nullptr);
+    groupIDsPtr_.reset(nullptr);
 
     PstreamBuffers pBufs(Pstream::defaultCommsType);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index fa2b321a8c..c747c780e3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -94,23 +94,24 @@ class polyBoundaryMesh
         //- Read if IOobject flags set. Return true if read.
         bool readContents(const bool allowReadIfPresent);
 
-        //- No copy construct
-        polyBoundaryMesh(const polyBoundaryMesh&) = delete;
-
-        //- No copy assignment
-        void operator=(const polyBoundaryMesh&) = delete;
-
-
 public:
 
     //- Declare friendship with polyMesh
     friend class polyMesh;
 
-
     //- Runtime type information
     TypeName("polyBoundaryMesh");
 
 
+    // Generated Methods
+
+        //- No copy construct
+        polyBoundaryMesh(const polyBoundaryMesh&) = delete;
+
+        //- No copy assignment
+        void operator=(const polyBoundaryMesh&) = delete;
+
+
     // Constructors
 
         //- Read constructor given IOobject and a polyMesh reference
@@ -142,15 +143,17 @@ public:
     ~polyBoundaryMesh() = default;
 
 
+    // Member Functions
+
+        //- Clear the patch list and all demand-driven data
+        void clear();
+
         //- Clear geometry at this level and at patches
         void clearGeom();
 
         //- Clear addressing at this level and at patches
         void clearAddressing();
 
-
-    // Member Functions
-
         //- Return the mesh reference
         const polyMesh& mesh() const noexcept
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index e657ee38a6..ca445ea9d4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -40,9 +40,7 @@ void Foam::polyMesh::removeBoundary()
 {
     DebugInFunction << "Removing boundary patches." << endl;
 
-    // Remove the point zones
     boundary_.clear();
-    boundary_.setSize(0);
 
     clearOut();
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 914d11d736..cab91b77bd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -212,7 +212,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                 << "unexpected consequences.  Proceed with care." << endl;
 
             boundary_.clear();
-            boundary_.setSize(newBoundary.size());
+            boundary_.resize(newBoundary.size());
 
             forAll(newBoundary, patchi)
             {
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index c98d1c6dbe..a478b7e5ca 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -462,8 +462,7 @@ void Foam::boundaryMesh::clearOut()
 void Foam::boundaryMesh::read(const polyMesh& mesh)
 {
     patches_.clear();
-
-    patches_.setSize(mesh.boundaryMesh().size());
+    patches_.resize(mesh.boundaryMesh().size());
 
     // Number of boundary faces
     const label nBFaces = mesh.nBoundaryFaces();
@@ -630,7 +629,7 @@ void Foam::boundaryMesh::readTriSurface(const fileName& fName)
         // There are as many surface patches as region numbers in triangles
         // so use the surface patches
 
-        patches_.setSize(surfPatches.size());
+        patches_.resize(surfPatches.size());
 
         // Take over patches, setting size to 0 for now.
         forAll(surfPatches, patchi)
@@ -655,7 +654,7 @@ void Foam::boundaryMesh::readTriSurface(const fileName& fName)
     {
         // There are not enough surface patches. Make up my own.
 
-        patches_.setSize(regionToBoundaryPatch.size());
+        patches_.resize(regionToBoundaryPatch.size());
 
         forAll(patches_, patchi)
         {
@@ -1627,9 +1626,7 @@ void Foam::boundaryMesh::deletePatch(const word& patchName)
         newPatches.set(patchi - 1, patches_[patchi].clone());
     }
 
-    patches_.clear();
-
-    patches_ = newPatches;
+    patches_ = std::move(newPatches);
 
     if (debug)
     {
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index 47fc2ff480..1906cca5ab 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -176,6 +176,15 @@ Foam::faBoundaryMesh::faBoundaryMesh
 {}
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+void Foam::faBoundaryMesh::clear()
+{
+    faPatchList::clear();
+    groupIDsPtr_.reset(nullptr);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::faBoundaryMesh::calcGeometry()
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
index ca64a6380c..5e399a3a21 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,12 +90,6 @@ class faBoundaryMesh
         //- Read if IOobject flags set. Return true if read.
         bool readContents(const bool allowReadIfPresent);
 
-        //- No copy construct
-        faBoundaryMesh(const faBoundaryMesh&) = delete;
-
-        //- No copy assignment
-        void operator=(const faBoundaryMesh&) = delete;
-
 
 public:
 
@@ -103,6 +97,15 @@ public:
     TypeName("faBoundaryMesh");
 
 
+    // Generated Methods
+
+        //- No copy construct
+        faBoundaryMesh(const faBoundaryMesh&) = delete;
+
+        //- No copy assignment
+        void operator=(const faBoundaryMesh&) = delete;
+
+
     // Constructors
 
         //- Construct from faMesh
@@ -127,6 +130,9 @@ public:
 
     // Member Functions
 
+        //- Clear the patch list and all demand-driven data
+        void clear();
+
         //- Return the mesh reference
         const faMesh& mesh() const noexcept
         {
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 12242b7421..cfebcab812 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -155,7 +155,7 @@ void Foam::sampledSets::gatherAllSets()
 
     const PtrList<sampledSet>& localSets = *this;
 
-    gatheredSets_.clear();
+    gatheredSets_.free();
     gatheredSets_.resize(localSets.size());
     gatheredSorting_.resize_nocopy(localSets.size());
     globalIndices_.resize_nocopy(localSets.size());

From c7fc4891ae9f58ce7892a077739163d6fd5e8dfc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 May 2023 14:52:24 +0200
Subject: [PATCH 225/348] COMP: adapt solveScalar to scalar for GAMG residual
 calculation

STYLE: use tmp<xyz>::New factory in matrix operations

COMP: fix bad non-access tmp access (in unused faceH method)
---
 .../matrices/LduMatrix/LduMatrix/LduMatrixATmul.C   |  2 +-
 .../LduMatrix/LduMatrix/LduMatrixOperations.C       |  4 ++--
 .../matrices/lduMatrix/lduMatrix/lduMatrixATmul.C   |  2 +-
 .../lduMatrix/lduMatrix/lduMatrixTemplates.C        | 13 ++++---------
 .../pairGAMGAgglomeration/pairGAMGAgglomerate.C     |  4 ++--
 .../lduMatrix/solvers/GAMG/GAMGSolverSolve.C        |  5 ++++-
 .../cyclicGAMGInterface/cyclicGAMGInterface.C       |  4 ++--
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index 50cbf806b2..1033042213 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -261,7 +261,7 @@ Foam::tmp<Foam::Field<Type>> Foam::LduMatrix<Type, DType, LUType>::residual
     const Field<Type>& psi
 ) const
 {
-    tmp<Field<Type>> trA(new Field<Type>(psi.size()));
+    auto trA = tmp<Field<Type>>::New(psi.size());
     residual(trA.ref(), psi);
     return trA;
 }
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index 7524e15f06..7fa0cd403c 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -142,8 +142,8 @@ Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
     const labelUList& l = lduAddr().lowerAddr();
     const labelUList& u = lduAddr().upperAddr();
 
-    tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
-    Field<Type> & faceHpsi = tfaceHpsi();
+    auto tfaceHpsi = tmp<Field<Type>>::New(Lower.size());
+    auto& faceHpsi = tfaceHpsi.ref();
 
     for (label face=0; face<l.size(); face++)
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index c0e05719fa..91f6f45027 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -297,7 +297,7 @@ Foam::tmp<Foam::Field<Foam::solveScalar>> Foam::lduMatrix::residual
     const direction cmpt
 ) const
 {
-    tmp<solveScalarField> trA(new solveScalarField(psi.size()));
+    auto trA = tmp<solveScalarField>::New(psi.size());
     residual(trA.ref(), psi, source, interfaceBouCoeffs, interfaces, cmpt);
     return trA;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index d17855b89b..cafd283abb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -35,16 +35,11 @@ Description
 template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::lduMatrix::H(const Field<Type>& psi) const
 {
-    tmp<Field<Type>> tHpsi
-    (
-        new Field<Type>(lduAddr().size(), Zero)
-    );
+    auto tHpsi = tmp<Field<Type>>::New(lduAddr().size(), Zero);
 
     if (lowerPtr_ || upperPtr_)
     {
-        Field<Type> & Hpsi = tHpsi.ref();
-
-        Type* __restrict__ HpsiPtr = Hpsi.begin();
+        Type* __restrict__ HpsiPtr = tHpsi.ref().begin();
 
         const Type* __restrict__ psiPtr = psi.begin();
 
@@ -88,8 +83,8 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
         const labelUList& l = lduAddr().lowerAddr();
         const labelUList& u = lduAddr().upperAddr();
 
-        tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
-        Field<Type> & faceHpsi = tfaceHpsi.ref();
+        auto tfaceHpsi = tmp<Field<Type>>::New(Lower.size());
+        auto& faceHpsi = tfaceHpsi.ref();
 
         for (label face=0; face<l.size(); face++)
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 0d44f20186..19981c5764 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -194,8 +194,8 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
 
     // go through the faces and create clusters
 
-    tmp<labelField> tcoarseCellMap(new labelField(nFineCells, -1));
-    labelField& coarseCellMap = tcoarseCellMap.ref();
+    auto tcoarseCellMap = tmp<labelField>::New(nFineCells, -1);
+    auto& coarseCellMap = tcoarseCellMap.ref();
 
     nCoarseCells = 0;
     label celli;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index ab54eb5ef9..964ecfefa6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -254,7 +254,10 @@ void Foam::GAMGSolver::Vcycle
                 (
                     coarseSources[leveli],
                     coarseCorrFields[leveli],
-                    coarseSources[leveli],
+                    ConstPrecisionAdaptor<scalar, solveScalar>
+                    (
+                        coarseSources[leveli]
+                    )(),
                     interfaceLevelsBouCoeffs_[leveli],
                     interfaceLevels_[leveli],
                     cmpt
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 994c8792f8..9b9f190ec3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -173,8 +173,8 @@ Foam::tmp<Foam::labelField> Foam::cyclicGAMGInterface::internalFieldTransfer
     const cyclicGAMGInterface& nbr = neighbPatch();
     const labelUList& nbrFaceCells = nbr.faceCells();
 
-    tmp<labelField> tpnf(new labelField(size()));
-    labelField& pnf = tpnf.ref();
+    auto tpnf = tmp<labelField>::New(size());
+    auto& pnf = tpnf.ref();
 
     forAll(pnf, facei)
     {

From d069ffa16a980d54105c2cc96e9cb1d96b390f17 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 May 2023 18:11:05 +0200
Subject: [PATCH 226/348] SUBMODULE: removed catalyst handling for paraview 5.5
 and earlier

---
 modules/visualization | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/visualization b/modules/visualization
index b74339ad0b..8c0c81f563 160000
--- a/modules/visualization
+++ b/modules/visualization
@@ -1 +1 @@
-Subproject commit b74339ad0b56dd0a3ec06bd30761a0a1a9c09b2a
+Subproject commit 8c0c81f5631794f878a858a176ccb4da40aa96c5

From e9160673a14a1c79f4df226930ec420d731fb39f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 May 2023 18:11:21 +0200
Subject: [PATCH 227/348] CONFIG: update paraview patch version. From 5.11.0 to
 5.11.1

---
 etc/config.csh/paraview | 4 ++--
 etc/config.sh/paraview  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index 253a549fa7..932feaca9f 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2022 OpenCFD Ltd.
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -52,7 +52,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-set ParaView_VERSION=5.11.0
+set ParaView_VERSION=5.11.1
 set ParaView_QT=qt-system
 
 # END OF (NORMAL) USER EDITABLE PART
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 789e920d60..900dbbebb1 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2022 OpenCFD Ltd.
+#     Copyright (C) 2016-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -57,7 +57,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-ParaView_VERSION=5.11.0
+ParaView_VERSION=5.11.1
 ParaView_QT=qt-system
 
 # END OF (NORMAL) USER EDITABLE PART

From d92583f4b6c69e8608a3952be6a1f8b9e89c5afa Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 15 May 2023 16:17:27 +0100
Subject: [PATCH 228/348] BUG: extrudePatchMesh: disable walking across
 non-manifold. See #2780

This code can be removed if nInternalEdges excludes non-manifold ones
---
 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index 6ce607ba98..1e8a59d802 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -165,6 +165,12 @@ void Foam::extrudePatchMesh::extrudeMesh(polyPatchList& regionPatches)
             {
                 nonManifoldEdge.set(edgeI);
             }
+            else if (extrudedPatch_.edgeFaces()[edgeI].size() > 2)
+            {
+                // TBD: issue #2780 : non-manifold edges get seen as internal
+                // This bit of code can be removed once #2780 is solved.
+                nonManifoldEdge.set(edgeI);
+            }
         }
 
         autoPtr<extrudeModel> model_(extrudeModel::New(dict_));

From 7269cc1d3b46ae3cc810b6f774b390db98b55fc6 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Wed, 11 Jan 2023 11:48:39 +0000
Subject: [PATCH 229/348] ENH: electricPotential: replace operandField with
 getOrReadField

---
 .../electricPotential/electricPotential.C     | 26 +++++++++++--------
 .../electricPotential/electricPotential.H     |  8 +++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index 1a1f20118d..13766c9063 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,16 +44,20 @@ namespace functionObjects
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::volScalarField&
-Foam::functionObjects::electricPotential::operandField()
+Foam::volScalarField& Foam::functionObjects::electricPotential::getOrReadField
+(
+    const word& fieldName
+) const
 {
-    if (!foundObject<volScalarField>(fieldName_))
+    auto* ptr = mesh_.getObjectPtr<volScalarField>(fieldName);
+
+    if (!ptr)
     {
-        auto tfldPtr = tmp<volScalarField>::New
+        ptr = new volScalarField
         (
             IOobject
             (
-                fieldName_,
+                fieldName,
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::MUST_READ,
@@ -62,10 +66,10 @@ Foam::functionObjects::electricPotential::operandField()
             ),
             mesh_
         );
-        store(fieldName_, tfldPtr);
+        mesh_.objectRegistry::store(ptr);
     }
 
-    return lookupObjectRef<volScalarField>(fieldName_);
+    return *ptr;
 }
 
 
@@ -212,7 +216,7 @@ Foam::functionObjects::electricPotential::electricPotential
 
     // Force creation of transported field so any BCs using it can
     // look it up
-    volScalarField& eV = operandField();
+    volScalarField& eV = getOrReadField(fieldName_);
     eV.correctBoundaryConditions();
 }
 
@@ -316,7 +320,7 @@ bool Foam::functionObjects::electricPotential::execute()
     tmp<volScalarField> tsigma = this->sigma();
     const volScalarField& sigma = tsigma();
 
-    volScalarField& eV = operandField();
+    volScalarField& eV = getOrReadField(fieldName_);
 
     for (label i = 1; i <= nCorr_; ++i)
     {
@@ -342,7 +346,7 @@ bool Foam::functionObjects::electricPotential::write()
         << tab << fieldName_
         << endl;
 
-    volScalarField& eV = operandField();
+    volScalarField& eV = getOrReadField(fieldName_);
 
     if (writeDerivedFields_)
     {
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.H b/src/functionObjects/solvers/electricPotential/electricPotential.H
index 83fdfbd7b2..171e668512 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.H
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -212,8 +212,10 @@ class electricPotential
 
     // Private Member Functions
 
-        //- Return reference to the registered operand field
-        volScalarField& operandField();
+        //- Return requested field from the object registry
+        //- or read+register the field to the object registry
+        volScalarField& getOrReadField(const word& fieldName) const;
+
 
         //- Return the isotropic electrical conductivity field of the mixture
         tmp<volScalarField> sigma() const;

From efe8220a26e6110292393bc7838da8a23fedac66 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 21 Apr 2023 10:30:10 +0100
Subject: [PATCH 230/348] STYLE: electricPotential: simplify read function

- change 'fieldName' to 'Vname' for better clarity
---
 .../electricPotential/electricPotential.C     | 138 +++++++++---------
 .../electricPotential/electricPotential.H     |  14 +-
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index 13766c9063..37aeb615a2 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -201,11 +201,11 @@ Foam::functionObjects::electricPotential::electricPotential
             )
         )
     ),
-    fieldName_
+    Vname_
     (
         dict.getOrDefault<word>
         (
-            "field",
+            "V",
             IOobject::scopedName(typeName, "V")
         )
     ),
@@ -216,7 +216,7 @@ Foam::functionObjects::electricPotential::electricPotential
 
     // Force creation of transported field so any BCs using it can
     // look it up
-    volScalarField& eV = getOrReadField(fieldName_);
+    volScalarField& eV = getOrReadField(Vname_);
     eV.correctBoundaryConditions();
 }
 
@@ -225,88 +225,88 @@ Foam::functionObjects::electricPotential::electricPotential
 
 bool Foam::functionObjects::electricPotential::read(const dictionary& dict)
 {
-    if (fvMeshFunctionObject::read(dict))
+    if (!fvMeshFunctionObject::read(dict))
     {
-        Log << type() << " read: " << name() << endl;
+        return false;
+    }
 
-        dict.readIfPresent("sigma", sigma_);
-        dict.readIfPresent("epsilonr", epsilonr_);
-        dict.readIfPresent("nCorr", nCorr_);
-        dict.readIfPresent("writeDerivedFields", writeDerivedFields_);
+    Log << type() << " read: " << name() << endl;
 
-        // If flow is multiphase
-        if (!phasesDict_.empty())
+    dict.readIfPresent("sigma", sigma_);
+    dict.readIfPresent("epsilonr", epsilonr_);
+    dict.readIfPresent("nCorr", nCorr_);
+    dict.readIfPresent("writeDerivedFields", writeDerivedFields_);
+
+    // If flow is multiphase
+    if (!phasesDict_.empty())
+    {
+        phaseNames_.setSize(phasesDict_.size());
+        phases_.setSize(phasesDict_.size());
+        sigmas_.setSize(phasesDict_.size());
+
+        if (writeDerivedFields_)
         {
-            phaseNames_.setSize(phasesDict_.size());
-            phases_.setSize(phasesDict_.size());
-            sigmas_.setSize(phasesDict_.size());
+            epsilonrs_.setSize(phasesDict_.size());
+        }
+
+        label phasei = 0;
+        for (const entry& dEntry : phasesDict_)
+        {
+            const word& key = dEntry.keyword();
+
+            if (!dEntry.isDict())
+            {
+                FatalIOErrorInFunction(phasesDict_)
+                    << "Entry " << key << " is not a dictionary" << nl
+                    << exit(FatalIOError);
+            }
+
+            const dictionary& subDict = dEntry.dict();
+
+            phaseNames_[phasei] = key;
+
+            sigmas_.set
+            (
+                phasei,
+                new dimensionedScalar
+                (
+                    sqr(dimCurrent)*pow3(dimTime)/(dimMass*pow3(dimLength)),
+                    subDict.getCheck<scalar>
+                    (
+                        "sigma",
+                        scalarMinMax::ge(SMALL)
+                    )
+                )
+            );
 
             if (writeDerivedFields_)
             {
-                epsilonrs_.setSize(phasesDict_.size());
-            }
-
-            label phasei = 0;
-            for (const entry& dEntry : phasesDict_)
-            {
-                const word& key = dEntry.keyword();
-
-                if (!dEntry.isDict())
-                {
-                    FatalIOErrorInFunction(phasesDict_)
-                        << "Entry " << key << " is not a dictionary" << nl
-                        << exit(FatalIOError);
-                }
-
-                const dictionary& subDict = dEntry.dict();
-
-                phaseNames_[phasei] = key;
-
-                sigmas_.set
+                epsilonrs_.set
                 (
                     phasei,
                     new dimensionedScalar
                     (
-                        sqr(dimCurrent)*pow3(dimTime)/(dimMass*pow3(dimLength)),
+                        dimless,
                         subDict.getCheck<scalar>
                         (
-                            "sigma",
+                            "epsilonr",
                             scalarMinMax::ge(SMALL)
                         )
                     )
                 );
-
-                if (writeDerivedFields_)
-                {
-                    epsilonrs_.set
-                    (
-                        phasei,
-                        new dimensionedScalar
-                        (
-                            dimless,
-                            subDict.getCheck<scalar>
-                            (
-                                "epsilonr",
-                                scalarMinMax::ge(SMALL)
-                            )
-                        )
-                    );
-                }
-
-                ++phasei;
             }
 
-            forAll(phaseNames_, i)
-            {
-                phases_.set
-                (
-                    i,
-                    mesh_.getObjectPtr<volScalarField>(phaseNames_[i])
-                );
-            }
+            ++phasei;
         }
 
-        return true;
+        forAll(phaseNames_, i)
+        {
+            phases_.set
+            (
+                i,
+                mesh_.getObjectPtr<volScalarField>(phaseNames_[i])
+            );
+        }
     }
 
     return false;
@@ -318,11 +318,11 @@ bool Foam::functionObjects::electricPotential::execute()
     Log << type() << " execute: " << name() << endl;
 
     tmp<volScalarField> tsigma = this->sigma();
-    const volScalarField& sigma = tsigma();
+    const auto& sigma = tsigma();
 
-    volScalarField& eV = getOrReadField(fieldName_);
+    volScalarField& eV = getOrReadField(Vname_);
 
-    for (label i = 1; i <= nCorr_; ++i)
+    for (int i = 1; i <= nCorr_; ++i)
     {
         fvScalarMatrix eVEqn
         (
@@ -343,10 +343,10 @@ bool Foam::functionObjects::electricPotential::execute()
 bool Foam::functionObjects::electricPotential::write()
 {
     Log << type() << " write: " << name() << nl
-        << tab << fieldName_
+        << tab << Vname_
         << endl;
 
-    volScalarField& eV = getOrReadField(fieldName_);
+    volScalarField& eV = getOrReadField(Vname_);
 
     if (writeDerivedFields_)
     {
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.H b/src/functionObjects/solvers/electricPotential/electricPotential.H
index 171e668512..f29472c283 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.H
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.H
@@ -118,9 +118,9 @@ Usage
             }
 
         // Optional entries
-        nCorr                 <label>;
+        nCorr                 <int>;
         writeDerivedFields    <bool>;
-        fieldName             <word>;
+        V                     <word>;
 
         // Inherited entries
         ...
@@ -134,9 +134,9 @@ Usage
       libs      | Library name: solverFunctionObjects | word | yes  | -
       sigma     | Isotropic electrical conductivity of phase | scalar | yes | -
       epsilonr  | Isotropic relative permittivity of phase   | scalar | no  | -
-      nCorr     | Number of corrector iterations     | label | no   | 1
+      nCorr     | Number of corrector iterations      | int  | no   | 1
       writeDerivedFields | Flag to write extra fields | bool | no   | false
-      fieldName | Name of operand field   | word | no | electricPotential:V
+      V    | Name of electric potential field | word | no | electricPotential:V
     \endtable
 
     The inherited entries are elaborated in:
@@ -199,11 +199,11 @@ class electricPotential
         //- Isotropic relative permittivity of a single phase
         dimensionedScalar epsilonr_;
 
-        //- Name of the operand field
-        word fieldName_;
+        //- Name of electric potential field
+        word Vname_;
 
         //- Number of corrector iterations
-        label nCorr_;
+        int nCorr_;
 
         //- Flag to write derived fields of
         //- electric field, current density and free-charge density

From c7e5e7f4a2c5f65fc0bba7156e6885378a40e831 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 21 Apr 2023 10:32:28 +0100
Subject: [PATCH 231/348] ENH: electricPotential: enable electric field
 calculations

---
 .../electricPotential/electricPotential.C     | 64 +++++++++++++------
 .../electricPotential/electricPotential.H     | 11 +++-
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C
index 37aeb615a2..676658d2c5 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@@ -209,8 +209,17 @@ Foam::functionObjects::electricPotential::electricPotential
             IOobject::scopedName(typeName, "V")
         )
     ),
+    Ename_
+    (
+        dict.getOrDefault<word>
+        (
+            "E",
+            IOobject::scopedName(typeName, "E")
+        )
+    ),
     nCorr_(1),
-    writeDerivedFields_(false)
+    writeDerivedFields_(false),
+    electricField_(false)
 {
     read(dict);
 
@@ -218,6 +227,28 @@ Foam::functionObjects::electricPotential::electricPotential
     // look it up
     volScalarField& eV = getOrReadField(Vname_);
     eV.correctBoundaryConditions();
+
+    if (electricField_)
+    {
+        auto* ptr = getObjectPtr<volVectorField>(Ename_);
+
+        if (!ptr)
+        {
+            ptr = new volVectorField
+            (
+                IOobject
+                (
+                    Ename_,
+                    mesh_.time().timeName(),
+                    mesh_,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                -fvc::grad(eV)
+            );
+            mesh_.objectRegistry::store(ptr);
+        }
+    }
 }
 
 
@@ -236,6 +267,7 @@ bool Foam::functionObjects::electricPotential::read(const dictionary& dict)
     dict.readIfPresent("epsilonr", epsilonr_);
     dict.readIfPresent("nCorr", nCorr_);
     dict.readIfPresent("writeDerivedFields", writeDerivedFields_);
+    dict.readIfPresent("electricField", electricField_);
 
     // If flow is multiphase
     if (!phasesDict_.empty())
@@ -334,6 +366,12 @@ bool Foam::functionObjects::electricPotential::execute()
         eVEqn.solve();
     }
 
+    if (electricField_)
+    {
+        auto& E = lookupObjectRef<volVectorField>(Ename_);
+        E == -fvc::grad(eV);
+    }
+
     Log << endl;
 
     return true;
@@ -348,29 +386,17 @@ bool Foam::functionObjects::electricPotential::write()
 
     volScalarField& eV = getOrReadField(Vname_);
 
-    if (writeDerivedFields_)
+    if (electricField_)
     {
-        // Write the electric field
-        const volVectorField E
-        (
-            IOobject
-            (
-                IOobject::scopedName(typeName, "E"),
-                mesh_.time().timeName(),
-                mesh_.time(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
-                IOobject::NO_REGISTER
-            ),
-            -fvc::grad(eV),
-            fvPatchFieldBase::calculatedType()
-        );
+        const auto& E = lookupObject<volVectorField>(Ename_);
 
         Log << tab << E.name() << endl;
 
         E.write();
+    }
 
-
+    if (writeDerivedFields_)
+    {
         // Write the current density field
         tmp<volScalarField> tsigma = this->sigma();
 
@@ -408,7 +434,7 @@ bool Foam::functionObjects::electricPotential::write()
                 IOobject::NO_WRITE,
                 IOobject::NO_REGISTER
             ),
-            fvc::div(tepsilonm*E),
+            fvc::div(tepsilonm*(-fvc::grad(eV))),
             fvPatchFieldBase::calculatedType()
         );
 
diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.H b/src/functionObjects/solvers/electricPotential/electricPotential.H
index f29472c283..027867fddc 100644
--- a/src/functionObjects/solvers/electricPotential/electricPotential.H
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.H
@@ -121,6 +121,8 @@ Usage
         nCorr                 <int>;
         writeDerivedFields    <bool>;
         V                     <word>;
+        electricField         <bool>;
+        E                     <word>;
 
         // Inherited entries
         ...
@@ -137,6 +139,8 @@ Usage
       nCorr     | Number of corrector iterations      | int  | no   | 1
       writeDerivedFields | Flag to write extra fields | bool | no   | false
       V    | Name of electric potential field | word | no | electricPotential:V
+      electricField | Flag to calculate electric field  | bool | no | false
+      E    | Name of electric field           | word | no | electricPotential:E
     \endtable
 
     The inherited entries are elaborated in:
@@ -145,7 +149,6 @@ Usage
     Fields written out when the \c writeDerivedFields entry is \c true:
     \table
       Operand         | Type             | Location
-      Electric field  | volVectorField   | \<time\>/electricPotential:E
       Current density | volVectorField   | \<time\>/electricPotential:J
       Charge density  | volScalarField   | \<time\>/electricPotential:rho
     \endtable
@@ -202,6 +205,9 @@ class electricPotential
         //- Name of electric potential field
         word Vname_;
 
+        //- Name of electric field
+        word Ename_;
+
         //- Number of corrector iterations
         int nCorr_;
 
@@ -209,6 +215,9 @@ class electricPotential
         //- electric field, current density and free-charge density
         bool writeDerivedFields_;
 
+        //- Flag to calculate electric field
+        bool electricField_;
+
 
     // Private Member Functions
 

From 8dee60319300b6aba23cac71dc28115da351ca5f Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 21 Apr 2023 10:12:56 +0100
Subject: [PATCH 232/348] ENH: Coulomb: new particle electric force model
 calculating Coulomb forces

---
 .../parcels/include/makeParcelForces.H        |   5 +-
 .../parcels/include/makeThermoParcelForces.H  |   5 +-
 .../ParticleForces/Coulomb/CoulombForce.C     | 144 +++++++++++
 .../ParticleForces/Coulomb/CoulombForce.H     | 224 ++++++++++++++++++
 4 files changed, 376 insertions(+), 2 deletions(-)
 create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.C
 create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.H

diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
index eebc43b54b..3f5fc61506 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,6 +47,7 @@ License
 #include "SRFForce.H"
 #include "VirtualMassForce.H"
 #include "InterfaceForce.H"
+#include "CoulombForce.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,7 +67,8 @@ License
     makeParticleForceModelType(PressureGradientForce, CloudType);              \
     makeParticleForceModelType(SRFForce, CloudType);                           \
     makeParticleForceModelType(VirtualMassForce, CloudType);                   \
-    makeParticleForceModelType(InterfaceForce, CloudType);
+    makeParticleForceModelType(InterfaceForce, CloudType);                     \
+    makeParticleForceModelType(CoulombForce, CloudType);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
index f3f17230b4..2efc413d19 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,6 +43,7 @@ License
 #include "PressureGradientForce.H"
 #include "SRFForce.H"
 #include "VirtualMassForce.H"
+#include "CoulombForce.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,7 +59,8 @@ License
     makeParticleForceModelType(ParamagneticForce, CloudType);                  \
     makeParticleForceModelType(PressureGradientForce, CloudType);              \
     makeParticleForceModelType(SRFForce, CloudType);                           \
-    makeParticleForceModelType(VirtualMassForce, CloudType);
+    makeParticleForceModelType(VirtualMassForce, CloudType);                   \
+    makeParticleForceModelType(CoulombForce, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.C
new file mode 100644
index 0000000000..36e4b0da60
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.C
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "CoulombForce.H"
+#include "demandDrivenData.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::volVectorField& Foam::CoulombForce<CloudType>::getOrReadField
+(
+    const word& fieldName
+) const
+{
+    auto* ptr = this->mesh().template getObjectPtr<volVectorField>(fieldName);
+
+    if (!ptr)
+    {
+        ptr = new volVectorField
+        (
+            IOobject
+            (
+                fieldName,
+                this->mesh().time().timeName(),
+                this->mesh(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE
+            ),
+            this->mesh()
+        );
+        this->mesh().objectRegistry::store(ptr);
+    }
+
+    return *ptr;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CoulombForce<CloudType>::CoulombForce
+(
+    CloudType& owner,
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+:
+    ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
+    qPtr_
+    (
+        Function1<scalar>::New("q", this->coeffs(), &mesh)
+    ),
+    Ename_(this->coeffs().template getOrDefault<word>("E", "E")),
+    EInterpPtr_(nullptr)
+{}
+
+
+template<class CloudType>
+Foam::CoulombForce<CloudType>::CoulombForce
+(
+    const CoulombForce& pf
+)
+:
+    ParticleForce<CloudType>(pf),
+    qPtr_(pf.qPtr_.clone()),
+    Ename_(pf.Ename_),
+    EInterpPtr_(nullptr)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::CoulombForce<CloudType>::cacheFields(const bool store)
+{
+    if (store)
+    {
+        const volVectorField& E = getOrReadField(Ename_);
+
+        EInterpPtr_.reset
+        (
+            interpolation<vector>::New
+            (
+                this->owner().solution().interpolationSchemes(),
+                E
+            ).ptr()
+        );
+    }
+    else
+    {
+        EInterpPtr_.reset(nullptr);
+    }
+}
+
+
+template<class CloudType>
+Foam::forceSuSp Foam::CoulombForce<CloudType>::calcNonCoupled
+(
+    const typename CloudType::parcelType& p,
+    const typename CloudType::parcelType::trackingData& td,
+    const scalar dt,
+    const scalar mass,
+    const scalar Re,
+    const scalar muc
+) const
+{
+    const interpolation<vector>& EInterp = *EInterpPtr_;
+
+    const scalar q = qPtr_->value(p.d());
+
+    // (YSSD:Eq. 6 - left term)
+    return forceSuSp
+    (
+        q*EInterp.interpolate(p.coordinates(), p.currentTetIndices()),
+        Zero
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.H
new file mode 100644
index 0000000000..c25aaf515d
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Coulomb/CoulombForce.H
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::CoulombForce
+
+Group
+    grpLagrangianIntermediateForceSubModels
+
+Description
+    Particle electric force model involving the Coulomb force calculation.
+
+    \f[
+        \vec{F}_\mathrm{E} = q \, \vec{E}
+    \f]
+
+    where
+
+    \vartable
+        \vec{F}_\mathrm{E}  | Coulomb force                 [kg m s^{-2}]
+        q                   | Electric charge of particle   [A s]
+        \vec{E}             | Electric field    [kg m^2 A^{-1} s^{-3} m^{-1}]
+    \endvartable
+
+    References:
+    \verbatim
+        Governing equations (tag:YSSD):
+            Ye, Q., Steigleder, T., Scheibe, A., & Domnick, J. (2002).
+            Numerical simulation of the electrostatic powder coating process
+            with a corona spray gun. Journal of Electrostatics, 54(2), 189-205.
+            DOI:10.1016/S0304-3886(01)00181-4
+    \endverbatim
+
+Usage
+    Minimal example by using \c constant/cloudProperties:
+    \verbatim
+    subModels
+    {
+        solution
+        {
+            interpolationSchemes
+            {
+                <Ename>     <interpolationScheme>;
+            }
+        }
+
+        particleForces
+        {
+            Coulomb
+            {
+                q       <Function1<scalar>>;
+                E       <word>;
+            }
+        }
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property | Description                       | Type | Reqd | Deflt
+      type     | Type name: Coulomb                | word | yes  | -
+      q        | Electric charge of particles | \<Function1\<scalar\> | yes | -
+      E        | Name of electric field            | word | no   | E
+    \endtable
+
+Note
+  - Particle electric charge can be input as a function of particle diameter:
+    \verbatim
+        particleForces
+        {
+            Coulomb
+            {
+                q   table
+                (
+                    // d [m]           q [C = A s]
+                    (1e-06             -5.0e-11)
+                    (1e-05             -1.0e-10)
+                );
+                E   electricPotential:E;
+            }
+        }
+    \endverbatim
+
+SourceFiles
+    CoulombForce.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_CoulombForce_H
+#define Foam_CoulombForce_H
+
+#include "ParticleForce.H"
+#include "Function1.H"
+#include "interpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward Declarations
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                       Class CoulombForce Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class CoulombForce
+:
+    public ParticleForce<CloudType>
+{
+    // Private Data
+
+        //- Particle electric charge
+        autoPtr<Function1<scalar>> qPtr_;
+
+        //- Name of electric field
+        const word Ename_;
+
+        //- Electric-field interpolator
+        mutable std::unique_ptr<interpolation<vector>> EInterpPtr_;
+
+
+    // Private Member Functions
+
+        //- Return requested volVectorField from the object registry
+        //- or read+register the field to the object registry
+        volVectorField& getOrReadField(const word& fieldName) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("Coulomb");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        CoulombForce
+        (
+            CloudType& owner,
+            const fvMesh& mesh,
+            const dictionary& dict
+        );
+
+        //- Copy construct
+        CoulombForce(const CoulombForce& gf);
+
+        //- No copy assignment
+        void operator=(const CoulombForce<CloudType>&) = delete;
+
+        //- Construct and return a clone
+        virtual autoPtr<ParticleForce<CloudType>> clone() const
+        {
+            return autoPtr<ParticleForce<CloudType>>
+            (
+                new CoulombForce<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~CoulombForce() = default;
+
+
+    // Member Functions
+
+        // Evaluation
+
+        //- Cache fields
+        virtual void cacheFields(const bool store);
+
+        //- Calculate the non-coupled force
+        virtual forceSuSp calcNonCoupled
+        (
+            const typename CloudType::parcelType& p,
+            const typename CloudType::parcelType::trackingData& td,
+            const scalar dt,
+            const scalar mass,
+            const scalar Re,
+            const scalar muc
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "CoulombForce.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From f98ecb38dc0109f3e4c247b1100942af33f78032 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Tue, 21 Mar 2023 14:20:24 +0000
Subject: [PATCH 233/348] ENH: forces: avoid redundant volumetric operations

---
 src/functionObjects/forces/forces/forces.C | 115 +++++++++++++--------
 src/functionObjects/forces/forces/forces.H |  14 ++-
 2 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 7b420685da..448a2640f0 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -197,47 +197,60 @@ void Foam::functionObjects::forces::reset()
 
     auto& force = this->force();
     auto& moment = this->moment();
-    force == dimensionedVector(force.dimensions(), Zero);
-    moment == dimensionedVector(moment.dimensions(), Zero);
+
+    if (porosity_)
+    {
+        force == dimensionedVector(force.dimensions(), Zero);
+        moment == dimensionedVector(moment.dimensions(), Zero);
+    }
+    else
+    {
+        constexpr bool updateAccessTime = false;
+        for (const label patchi : patchSet_)
+        {
+            force.boundaryFieldRef(updateAccessTime)[patchi] = Zero;
+            moment.boundaryFieldRef(updateAccessTime)[patchi] = Zero;
+        }
+    }
 }
 
 
-Foam::tmp<Foam::volSymmTensorField>
-Foam::functionObjects::forces::devRhoReff() const
+Foam::tmp<Foam::symmTensorField>
+Foam::functionObjects::forces::devRhoReff
+(
+    const tensorField& gradUp,
+    const label patchi
+) const
 {
-    typedef compressible::turbulenceModel cmpTurbModel;
     typedef incompressible::turbulenceModel icoTurbModel;
+    typedef compressible::turbulenceModel cmpTurbModel;
 
-    if (foundObject<cmpTurbModel>(cmpTurbModel::propertiesName))
-    {
-        const auto& turb =
-            lookupObject<cmpTurbModel>(cmpTurbModel::propertiesName);
-
-        return turb.devRhoReff();
-    }
-    else if (foundObject<icoTurbModel>(icoTurbModel::propertiesName))
+    if (foundObject<icoTurbModel>(icoTurbModel::propertiesName))
     {
         const auto& turb =
             lookupObject<icoTurbModel>(icoTurbModel::propertiesName);
 
-        return rho()*turb.devReff();
+        return -rho(patchi)*turb.nuEff(patchi)*dev(twoSymm(gradUp));
+    }
+    else if (foundObject<cmpTurbModel>(cmpTurbModel::propertiesName))
+    {
+        const auto& turb =
+            lookupObject<cmpTurbModel>(cmpTurbModel::propertiesName);
+
+        return -turb.muEff(patchi)*dev(twoSymm(gradUp));
     }
     else if (foundObject<fluidThermo>(fluidThermo::dictName))
     {
         const auto& thermo = lookupObject<fluidThermo>(fluidThermo::dictName);
 
-        const auto& U = lookupObject<volVectorField>(UName_);
-
-        return -thermo.mu()*dev(twoSymm(fvc::grad(U)));
+        return -thermo.mu(patchi)*dev(twoSymm(gradUp));
     }
     else if (foundObject<transportModel>("transportProperties"))
     {
         const auto& laminarT =
             lookupObject<transportModel>("transportProperties");
 
-        const auto& U = lookupObject<volVectorField>(UName_);
-
-        return -rho()*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
+        return -rho(patchi)*laminarT.nu(patchi)*dev(twoSymm(gradUp));
     }
     else if (foundObject<dictionary>("transportProperties"))
     {
@@ -246,9 +259,7 @@ Foam::functionObjects::forces::devRhoReff() const
 
         const dimensionedScalar nu("nu", dimViscosity, transportProperties);
 
-        const auto& U = lookupObject<volVectorField>(UName_);
-
-        return -rho()*nu*dev(twoSymm(fvc::grad(U)));
+        return -rho(patchi)*nu.value()*dev(twoSymm(gradUp));
     }
     else
     {
@@ -317,6 +328,23 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::forces::rho() const
 }
 
 
+Foam::tmp<Foam::scalarField>
+Foam::functionObjects::forces::rho(const label patchi) const
+{
+    if (rhoName_ == "rhoInf")
+    {
+        return tmp<scalarField>::New
+        (
+            mesh_.boundary()[patchi].size(),
+            rhoRef_
+        );
+    }
+
+    const auto& rho = lookupObject<volScalarField>(rhoName_);
+    return rho.boundaryField()[patchi];
+}
+
+
 Foam::scalar Foam::functionObjects::forces::rho(const volScalarField& p) const
 {
     if (p.dimensions() == dimPressure)
@@ -343,16 +371,18 @@ void Foam::functionObjects::forces::addToPatchFields
     const vectorField& fV
 )
 {
+    constexpr bool updateAccessTime = false;
+
     sumPatchForcesP_ += sum(fP);
     sumPatchForcesV_ += sum(fV);
-    force().boundaryFieldRef()[patchi] += fP + fV;
+    force().boundaryFieldRef(updateAccessTime)[patchi] += fP + fV;
 
     const vectorField mP(Md^fP);
     const vectorField mV(Md^fV);
 
     sumPatchMomentsP_ += sum(mP);
     sumPatchMomentsV_ += sum(mV);
-    moment().boundaryFieldRef()[patchi] += mP + mV;
+    moment().boundaryFieldRef(updateAccessTime)[patchi] += mP + mV;
 }
 
 
@@ -666,28 +696,27 @@ void Foam::functionObjects::forces::calcForcesMoments()
     if (directForceDensity_)
     {
         const auto& fD = lookupObject<volVectorField>(fDName_);
+        const auto& fDb = fD.boundaryField();
 
         const auto& Sfb = mesh_.Sf().boundaryField();
+        const auto& magSfb = mesh_.magSf().boundaryField();
+        const auto& Cb = mesh_.C().boundaryField();
 
         for (const label patchi : patchSet_)
         {
-            const vectorField& d = mesh_.C().boundaryField()[patchi];
-
-            const vectorField Md(d - origin);
-
-            const scalarField sA(mag(Sfb[patchi]));
+            const vectorField Md(Cb[patchi] - origin);
 
             // Pressure force = surfaceUnitNormal*(surfaceNormal & forceDensity)
             const vectorField fP
             (
-                Sfb[patchi]/sA
+                Sfb[patchi]/magSfb[patchi]
                *(
-                    Sfb[patchi] & fD.boundaryField()[patchi]
+                    Sfb[patchi] & fDb[patchi]
                 )
             );
 
             // Viscous force (total force minus pressure fP)
-            const vectorField fV(sA*fD.boundaryField()[patchi] - fP);
+            const vectorField fV(magSfb[patchi]*fDb[patchi] - fP);
 
             addToPatchFields(patchi, Md, fP, fV);
         }
@@ -695,11 +724,15 @@ void Foam::functionObjects::forces::calcForcesMoments()
     else
     {
         const auto& p = lookupObject<volScalarField>(pName_);
+        const auto& pb = p.boundaryField();
 
         const auto& Sfb = mesh_.Sf().boundaryField();
+        const auto& Cb = mesh_.C().boundaryField();
 
-        tmp<volSymmTensorField> tdevRhoReff = devRhoReff();
-        const auto& devRhoReffb = tdevRhoReff().boundaryField();
+        const auto& U = lookupObject<volVectorField>(UName_);
+        tmp<volTensorField> tgradU = fvc::grad(U);
+        const volTensorField& gradU = tgradU();
+        const auto& gradUb = gradU.boundaryField();
 
         // Scale pRef by density for incompressible simulations
         const scalar rhoRef = rho(p);
@@ -707,17 +740,15 @@ void Foam::functionObjects::forces::calcForcesMoments()
 
         for (const label patchi : patchSet_)
         {
-            const vectorField& d = mesh_.C().boundaryField()[patchi];
+            const vectorField Md(Cb[patchi] - origin);
 
-            const vectorField Md(d - origin);
+            const vectorField fP(rhoRef*Sfb[patchi]*(pb[patchi] - pRef));
 
-            const vectorField fP
+            const vectorField fV
             (
-                rhoRef*Sfb[patchi]*(p.boundaryField()[patchi] - pRef)
+                Sfb[patchi] & devRhoReff(gradUb[patchi], patchi)
             );
 
-            const vectorField fV(Sfb[patchi] & devRhoReffb[patchi]);
-
             addToPatchFields(patchi, Md, fP, fV);
         }
     }
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index 257b01f5cd..0611bf33d6 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -287,10 +287,15 @@ protected:
         //- Reset containers and fields
         void reset();
 
+
     // Evaluation
 
-        //- Return the effective stress (viscous + turbulent)
-        tmp<volSymmTensorField> devRhoReff() const;
+        //- Return the effective stress (viscous + turbulent) for patch
+        tmp<symmTensorField> devRhoReff
+        (
+            const tensorField& gradUp,
+            const label patchi
+        ) const;
 
         //- Return dynamic viscosity field
         tmp<volScalarField> mu() const;
@@ -298,6 +303,9 @@ protected:
         //- Return rho if specified otherwise rhoRef
         tmp<volScalarField> rho() const;
 
+        //- Return rho if specified otherwise rhoRef for patch
+        tmp<scalarField> rho(const label patchi) const;
+
         //- Return rhoRef if the pressure field is
         //- dynamic (i.e. p/rho), otherwise return 1
         scalar rho(const volScalarField& p) const;

From 59b1cf080e33aa8f3fa2e709428da1a05480b53a Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Wed, 22 Mar 2023 10:34:28 +0000
Subject: [PATCH 234/348] ENH: Tensor/SymmTensor: add devSymm and devTwoSymm
 funcs to avoid intermediates

---
 applications/solvers/combustion/XiFoam/bEqn.H |  2 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   |  4 +--
 .../DimensionedSymmTensorField.C              |  3 ++
 .../DimensionedSymmTensorField.H              |  3 ++
 .../DimensionedTensorField.C                  |  4 ++-
 .../DimensionedTensorField.H                  |  4 ++-
 .../symmTensorFieldField.C                    |  4 ++-
 .../symmTensorFieldField.H                    |  4 ++-
 .../tensorFieldField/tensorFieldField.C       |  4 ++-
 .../tensorFieldField/tensorFieldField.H       |  4 ++-
 .../Fields/symmTensorField/symmTensorField.H  |  4 ++-
 .../fields/Fields/tensorField/tensorField.C   |  4 ++-
 .../fields/Fields/tensorField/tensorField.H   |  4 ++-
 .../GeometricSymmTensorField.C                |  4 ++-
 .../GeometricSymmTensorField.H                |  4 ++-
 .../GeometricTensorField.C                    |  4 ++-
 .../GeometricTensorField.H                    |  4 ++-
 .../primitives/SymmTensor/SymmTensorI.H       | 16 ++++++++++
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 30 +++++++++++++++++++
 .../RAS/LienCubicKE/LienCubicKE.C             |  4 +--
 .../RAS/ShihQuadraticKE/ShihQuadraticKE.C     |  4 +--
 .../RAS/kkLOmega/kkLOmega.C                   |  4 +--
 .../continuousGasKEpsilon.C                   |  4 +--
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.C     |  6 ++--
 .../Base/kOmegaSST/kOmegaSSTBase.C            |  4 +--
 .../turbulenceModels/LES/WALE/WALE.C          |  4 +--
 .../LES/dynamicKEqn/dynamicKEqn.C             |  6 ++--
 .../LES/dynamicLagrangian/dynamicLagrangian.C |  8 ++---
 .../turbulenceModels/LES/kEqn/kEqn.C          |  4 +--
 .../turbulenceModels/LES/sigma/sigma.C        |  4 +--
 .../turbulenceModels/RAS/EBRSM/EBRSM.C        |  4 +--
 .../turbulenceModels/RAS/LRR/LRR.C            |  4 +--
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     |  4 +--
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |  4 +--
 .../turbulenceModels/RAS/SSG/SSG.C            |  4 +--
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.C  |  2 +-
 .../turbulenceModels/RAS/kOmega/kOmega.C      |  4 +--
 .../RAS/realizableKE/realizableKE.C           | 10 +++----
 .../ReynoldsStress/ReynoldsStress.C           |  6 ++--
 .../eddyViscosity/eddyViscosity.C             |  3 +-
 .../laminar/Maxwell/Maxwell.C                 |  4 +--
 .../linearViscousStress/linearViscousStress.C |  3 +-
 .../kEpsilonLopesdaCosta.C                    |  4 +--
 .../turbulenceModels/RAS/kL/kL.C              |  4 +--
 .../ReynoldsAnalogy/ReynoldsAnalogy.C         |  8 ++---
 src/functionObjects/forces/forces/forces.C    | 10 +++----
 .../objectiveForce/objectiveForce.C           |  4 +--
 .../objectiveMoment/objectiveMoment.C         |  4 +--
 .../adjointLaminar/adjointLaminar.C           |  4 +--
 .../adjointSpalartAllmaras.C                  |  4 +--
 .../adjointkOmegaSST/adjointkOmegaSST.C       |  6 ++--
 .../RAS/RASModelVariables/RASModelVariables.C |  4 +--
 .../RAS/kOmegaSST/kOmegaSST.C                 |  4 +--
 .../kineticTheoryModel/kineticTheoryModel.C   |  6 ++--
 .../kineticTheoryModel/kineticTheoryModel.C   |  6 ++--
 .../filmTurbulenceModel/filmTurbulenceModel.C |  8 ++---
 56 files changed, 185 insertions(+), 105 deletions(-)

diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index 91d211ae2a..7843b331ab 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/bEqn.H
@@ -223,7 +223,7 @@ if (ign.ignited())
         volScalarField R(Gstar*XiEqStar/(XiEqStar - scalar(1)));
         volScalarField G(R*(XiEq - scalar(1.001))/XiEq);
 
-        //R *= (Gstar + 2*mag(dev(symm(fvc::grad(U)))))/Gstar;
+        //R *= (Gstar + 2*mag(devSymm(fvc::grad(U))))/Gstar;
 
         // Solve for the flame wrinkling
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 06b6275fa8..f685cf7128 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -326,7 +326,7 @@ int main(int argc, char *argv[])
         volScalarField nut(calcNut(mesh, U));
 
         // Blend nut using boundary layer profile
-        volScalarField S("S", mag(dev(symm(fvc::grad(U)))));
+        volScalarField S("S", mag(devSymm(fvc::grad(U))));
         nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
 
         // Do not correct BC - wall functions will 'undo' manipulation above
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C
index bf608858f1..37f8e2dfdc 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +46,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, symm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform)
 UNARY_FUNCTION(scalar, symmTensor, det, pow3)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H
index e66715427b..00908841cc 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,6 +58,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, symm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform)
 UNARY_FUNCTION(scalar, symmTensor, det, transform)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C
index 015b61fafe..6f85cf3031 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,8 @@ UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm, transform)
 UNARY_FUNCTION(tensor, tensor, skew, transform)
 UNARY_FUNCTION(tensor, tensor, dev, transform)
 UNARY_FUNCTION(tensor, tensor, dev2, transform)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
index 4ed25cefa0..2f5e2c69f0 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,6 +56,8 @@ UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm, transform)
 UNARY_FUNCTION(tensor, tensor, skew, transform)
 UNARY_FUNCTION(tensor, tensor, dev, transform)
 UNARY_FUNCTION(tensor, tensor, dev2, transform)
diff --git a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
index 9692042a69..d6845c978a 100644
--- a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -205,6 +205,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
 UNARY_FUNCTION(symmTensor, symmTensor, symm)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm)
 UNARY_FUNCTION(symmTensor, symmTensor, dev)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2)
 UNARY_FUNCTION(scalar, symmTensor, det)
diff --git a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
index 37cb8f67de..f1341ba414 100644
--- a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,6 +155,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
 UNARY_FUNCTION(symmTensor, symmTensor, symm)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm)
 UNARY_FUNCTION(symmTensor, symmTensor, dev)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2)
 UNARY_FUNCTION(scalar, symmTensor, det)
diff --git a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.C b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.C
index f6e5c647f5..bfb7153d11 100644
--- a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -208,6 +208,8 @@ UNARY_FUNCTION(scalar, tensor, tr)
 UNARY_FUNCTION(sphericalTensor, tensor, sph)
 UNARY_FUNCTION(symmTensor, tensor, symm)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm)
+UNARY_FUNCTION(symmTensor, tensor, devSymm)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm)
 UNARY_FUNCTION(tensor, tensor, skew)
 UNARY_FUNCTION(tensor, tensor, dev)
 UNARY_FUNCTION(tensor, tensor, dev2)
diff --git a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
index ac20dffdda..11b60e5334 100644
--- a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -160,6 +160,8 @@ UNARY_FUNCTION(scalar, tensor, tr)
 UNARY_FUNCTION(sphericalTensor, tensor, sph)
 UNARY_FUNCTION(symmTensor, tensor, symm)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm)
+UNARY_FUNCTION(symmTensor, tensor, devSymm)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm)
 UNARY_FUNCTION(tensor, tensor, skew)
 UNARY_FUNCTION(tensor, tensor, dev)
 UNARY_FUNCTION(tensor, tensor, dev2)
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.H b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.H
index 342b483d18..55378a9b0f 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.H
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -200,6 +200,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
 UNARY_FUNCTION(symmTensor, symmTensor, symm)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm)
 UNARY_FUNCTION(symmTensor, symmTensor, dev)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2)
 UNARY_FUNCTION(scalar, symmTensor, det)
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 9b343fa5a0..261f2c563e 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,6 +44,8 @@ UNARY_FUNCTION(scalar, tensor, tr)
 UNARY_FUNCTION(sphericalTensor, tensor, sph)
 UNARY_FUNCTION(symmTensor, tensor, symm)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm)
+UNARY_FUNCTION(symmTensor, tensor, devSymm)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm)
 UNARY_FUNCTION(tensor, tensor, skew)
 UNARY_FUNCTION(tensor, tensor, dev)
 UNARY_FUNCTION(tensor, tensor, dev2)
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.H b/src/OpenFOAM/fields/Fields/tensorField/tensorField.H
index 607f01f683..1d8404462b 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.H
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -184,6 +184,8 @@ UNARY_FUNCTION(scalar, tensor, tr)
 UNARY_FUNCTION(sphericalTensor, tensor, sph)
 UNARY_FUNCTION(symmTensor, tensor, symm)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm)
+UNARY_FUNCTION(symmTensor, tensor, devSymm)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm)
 UNARY_FUNCTION(tensor, tensor, skew)
 UNARY_FUNCTION(tensor, tensor, dev)
 UNARY_FUNCTION(tensor, tensor, dev2)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C
index 162987ef8f..e180372ff1 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -257,6 +257,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, symm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform)
 UNARY_FUNCTION(scalar, symmTensor, det, pow3)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
index 402eeadd90..2cb406b370 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -156,6 +156,8 @@ UNARY_FUNCTION(scalar, symmTensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, symm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, devTwoSymm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform)
 UNARY_FUNCTION(scalar, symmTensor, det, transform)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
index 9bbda4c3f2..dc49e7609e 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -261,6 +261,8 @@ UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm, transform)
 UNARY_FUNCTION(tensor, tensor, skew, transform)
 UNARY_FUNCTION(tensor, tensor, dev, transform)
 UNARY_FUNCTION(tensor, tensor, dev2, transform)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
index 345919de23..6589661334 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -160,6 +160,8 @@ UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)
 UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devSymm, transform)
+UNARY_FUNCTION(symmTensor, tensor, devTwoSymm, transform)
 UNARY_FUNCTION(tensor, tensor, skew, transform)
 UNARY_FUNCTION(tensor, tensor, dev, transform)
 UNARY_FUNCTION(tensor, tensor, dev2, transform)
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 5c28c6c2bc..3b654f175f 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -473,6 +473,22 @@ inline SymmTensor<Cmpt> twoSymm(const SymmTensor<Cmpt>& st)
 }
 
 
+//- Return the deviatoric part of the symmetric part of a SymmTensor
+template<class Cmpt>
+inline SymmTensor<Cmpt> devSymm(const SymmTensor<Cmpt>& st)
+{
+    return dev(st);
+}
+
+
+//- Return the deviatoric part of twice the symmetric part of a SymmTensor
+template<class Cmpt>
+inline SymmTensor<Cmpt> devTwoSymm(const SymmTensor<Cmpt>& st)
+{
+    return dev2(st);
+}
+
+
 //- Return the deviatoric part of a SymmTensor
 template<class Cmpt>
 inline SymmTensor<Cmpt> dev(const SymmTensor<Cmpt>& st)
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index b389f12ee1..a2b47628e6 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -760,6 +760,36 @@ inline SymmTensor<Cmpt> twoSymm(const Tensor<Cmpt>& t)
 }
 
 
+//- Return the deviatoric part of the symmetric part of a Tensor
+template<class Cmpt>
+inline SymmTensor<Cmpt> devSymm(const Tensor<Cmpt>& t)
+{
+    const Cmpt sph(tr(t)/3.0);
+
+    return SymmTensor<Cmpt>
+    (
+        t.xx() - sph, 0.5*(t.xy() + t.yx()), 0.5*(t.xz() + t.zx()),
+                      t.yy() - sph,          0.5*(t.yz() + t.zy()),
+                                             t.zz() - sph
+    );
+}
+
+
+//- Return the deviatoric part of twice the symmetric part of a Tensor
+template<class Cmpt>
+inline SymmTensor<Cmpt> devTwoSymm(const Tensor<Cmpt>& t)
+{
+    const Cmpt sph((2.0/3.0)*tr(t));
+
+    return SymmTensor<Cmpt>
+    (
+        2*t.xx() - sph, (t.xy() + t.yx()), (t.xz() + t.zx()),
+                        2*t.yy() - sph,    (t.yz() + t.zy()),
+                                           2*t.zz() - sph
+    );
+}
+
+
 //- Return the skew-symmetric part of a Tensor
 template<class Cmpt>
 inline Tensor<Cmpt> skew(const Tensor<Cmpt>& t)
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
index b1c9393255..cc03139c53 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,7 +107,7 @@ void LienCubicKE::correctNonlinearStress(const volTensorField& gradU)
            *(
                 Cbeta1_*dev(innerSqr(S))
               + Cbeta2_*twoSymm(S&W)
-              + Cbeta3_*dev(symm(W&W))
+              + Cbeta3_*devSymm(W&W)
             )
 
             // Cubic terms
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
index 53cebf634b..727ee0ddef 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,7 +71,7 @@ void ShihQuadraticKE::correctNonlinearStress(const volTensorField& gradU)
        *(
            Cbeta1_*dev(innerSqr(S))
          + Cbeta2_*twoSymm(S&W)
-         + Cbeta3_*dev(symm(W&W))
+         + Cbeta3_*devSymm(W&W)
         );
 }
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
index 7cb08f8398..149940e33c 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -626,7 +626,7 @@ void kkLOmega::correct()
 
     const volScalarField Omega(sqrt(2.0)*mag(skew(gradU)));
 
-    const volScalarField S2(2.0*magSqr(dev(symm(gradU))));
+    const volScalarField S2(2.0*magSqr(devSymm(gradU)));
 
     const volScalarField ktS(fSS(Omega)*fw*kt_);
 
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
index 8b049d3ec1..a7360fb71f 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -292,7 +292,7 @@ continuousGasKEpsilon<BasicTurbulenceModel>::R() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            ((2.0/3.0)*I)*tk() - (nutEff_)*dev(twoSymm(fvc::grad(this->U_))),
+            ((2.0/3.0)*I)*tk() - (nutEff_)*devTwoSymm(fvc::grad(this->U_)),
             tk().boundaryField().types()
         )
     );
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
index ab153b6641..b2c743253c 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -612,7 +612,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
             new volScalarField
             (
                 this->GName(),
-                nutl*(tgradUl() && dev(twoSymm(tgradUl())))
+                nutl*(tgradUl() && devTwoSymm(tgradUl()))
             )
         );
         tgradUl.clear();
@@ -632,7 +632,7 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
             new volScalarField
             (
                 this->GName(),
-                nutg*(tgradUg() && dev(twoSymm(tgradUg())))
+                nutg*(tgradUg() && devTwoSymm(tgradUg()))
             )
         );
         tgradUg.clear();
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
index ea031c6769..80f5bfa87a 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
     Copyright (C) 2022 Upstream CFD GmbH
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -174,7 +174,7 @@ tmp<volScalarField::Internal> kOmegaSSTBase<BasicEddyViscosityModel>::GbyNu0
     return tmp<volScalarField::Internal>::New
     (
         IOobject::scopedName(this->type(), "GbyNu"),
-        gradU() && dev(twoSymm(gradU()))
+        gradU() && devTwoSymm(gradU())
     );
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
index 655057bfe8..b80431c189 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ tmp<volSymmTensorField> WALE<BasicTurbulenceModel>::Sd
     const volTensorField& gradU
 ) const
 {
-    return dev(symm(gradU & gradU));
+    return devSymm(gradU & gradU);
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
index bdfc9ef03a..8a25b36b68 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -96,7 +96,7 @@ volScalarField dynamicKEqn<BasicTurbulenceModel>::Ce
 template<class BasicTurbulenceModel>
 volScalarField dynamicKEqn<BasicTurbulenceModel>::Ce() const
 {
-    const volSymmTensorField D(dev(symm(fvc::grad(this->U_))));
+    const volSymmTensorField D(devSymm(fvc::grad(this->U_)));
 
     volScalarField KK
     (
@@ -240,7 +240,7 @@ void dynamicKEqn<BasicTurbulenceModel>::correct()
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
     tmp<volTensorField> tgradU(fvc::grad(U));
-    const volSymmTensorField D(dev(symm(tgradU())));
+    const volSymmTensorField D(devSymm(tgradU()));
     const volScalarField G(this->GName(), 2.0*nut*(tgradU() && D));
     tgradU.clear();
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
index 09a292f300..1fe8fe751f 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ void dynamicLagrangian<BasicTurbulenceModel>::correctNut
     const tmp<volTensorField>& gradU
 )
 {
-    this->nut_ = (flm_/fmm_)*sqr(this->delta())*mag(dev(symm(gradU)));
+    this->nut_ = (flm_/fmm_)*sqr(this->delta())*mag(devSymm(gradU));
     this->nut_.correctBoundaryConditions();
     fv::options::New(this->mesh_).correct(this->nut_);
 
@@ -171,11 +171,11 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct()
     tmp<volTensorField> tgradU(fvc::grad(U));
     const volTensorField& gradU = tgradU();
 
-    volSymmTensorField S(dev(symm(gradU)));
+    volSymmTensorField S(devSymm(gradU));
     volScalarField magS(mag(S));
 
     volVectorField Uf(filter_(U));
-    volSymmTensorField Sf(dev(symm(fvc::grad(Uf))));
+    volSymmTensorField Sf(devSymm(fvc::grad(Uf)));
     volScalarField magSf(mag(Sf));
 
     volSymmTensorField L(dev(filter_(sqr(U)) - (sqr(filter_(U)))));
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
index 72517115a5..50fb5f029f 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -160,7 +160,7 @@ void kEqn<BasicTurbulenceModel>::correct()
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
     tmp<volTensorField> tgradU(fvc::grad(U));
-    volScalarField G(this->GName(), nut*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G(this->GName(), nut*(tgradU() && devTwoSymm(tgradU())));
     tgradU.clear();
 
     tmp<fvScalarMatrix> kEqn
diff --git a/src/TurbulenceModels/turbulenceModels/LES/sigma/sigma.C b/src/TurbulenceModels/turbulenceModels/LES/sigma/sigma.C
index b806ab0719..7e00c1f589 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/sigma/sigma.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/sigma/sigma.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2022 Upstream CFD GmbH
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -141,7 +141,7 @@ tmp<volScalarField> sigma<BasicTurbulenceModel>::k() const
         IOobject::groupName("k", this->U_.group()),
         (2.0*Ck_/this->Ce_)
        *sqr(this->delta())
-       *magSqr(dev(symm(fvc::grad(this->U_))))
+       *magSqr(devSymm(fvc::grad(this->U_)))
     );
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C b/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C
index fa969b6e97..db19a5deff 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -524,7 +524,7 @@ void EBRSM<BasicTurbulenceModel>::correct()
                 k_
                *(
                     (g3_ - g3star_*mag(B))*S
-                  + g4_*dev(twoSymm(B & S))
+                  + g4_*devTwoSymm(B & S)
                   + g5_*twoSymm(B & W.T())
                 );
         }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
index ec75293aa1..cb20f989b8 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -365,7 +365,7 @@ void LRR<BasicTurbulenceModel>::correct()
 
         REqn.ref() +=
             ((3*pow(Cmu_, 0.75)/kappa_)*(alpha*rho*sqrt(k_)/y_))
-           *dev(symm((n_ & reflect)*n_));
+           *devSymm((n_ & reflect)*n_);
     }
 
     REqn.ref().relax();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 92c53833de..f0a84979f4 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -262,7 +262,7 @@ void LaunderSharmaKE<BasicTurbulenceModel>::correct()
     volScalarField D(2.0*this->nu()*magSqr(fvc::grad(sqrt(k_))));
 
     tmp<volTensorField> tgradU = fvc::grad(U);
-    volScalarField G(this->GName(), nut*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G(this->GName(), nut*(tgradU() && devTwoSymm(tgradU())));
     tgradU.clear();
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index a3f8a1ecdd..c70797140b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -265,7 +265,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
     const volScalarField::Internal GbyNu
     (
         IOobject::scopedName(this->type(), "GbyNu"),
-        tgradU().v() && dev(twoSymm(tgradU().v()))
+        tgradU().v() && devTwoSymm(tgradU().v())
     );
     tgradU.clear();
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
index 4b0f5f5b3f..721d7b86b5 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd
+    Copyright (C) 2018-2023 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -366,7 +366,7 @@ void SSG<BasicTurbulenceModel>::correct()
       + alpha*rho*k_
        *(
             (C3_ - C3s_*mag(b))*dev(S)
-          + C4_*dev(twoSymm(b&S))
+          + C4_*devTwoSymm(b&S)
           + C5_*twoSymm(b&Omega)
         )
       + fvOptions(alpha, rho, R)
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index 4fc4215d2d..62e3aa813b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -246,7 +246,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
     const volScalarField::Internal GbyNu
     (
         IOobject::scopedName(this->type(), "GbyNu"),
-        tgradU().v() && dev(twoSymm(tgradU().v()))
+        tgradU().v() && devTwoSymm(tgradU().v())
     );
     const volScalarField::Internal G(this->GName(), nut()*GbyNu);
     tgradU.clear();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
index a70d2c59e6..0035d5c666 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -204,7 +204,7 @@ void kOmega<BasicTurbulenceModel>::correct()
     tmp<volTensorField> tgradU = fvc::grad(U);
     const volScalarField::Internal GbyNu
     (
-        tgradU().v() && dev(twoSymm(tgradU().v()))
+        tgradU().v() && devTwoSymm(tgradU().v())
     );
     const volScalarField::Internal G(this->GName(), nut()*GbyNu);
     tgradU.clear();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index f519ce37f0..633ec4e00b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ tmp<volScalarField> realizableKE<BasicTurbulenceModel>::rCmu
     const volScalarField& magS
 )
 {
-    tmp<volSymmTensorField> tS = dev(symm(gradU));
+    tmp<volSymmTensorField> tS = devSymm(gradU);
     const volSymmTensorField& S = tS();
 
     volScalarField W
@@ -92,7 +92,7 @@ template<class BasicTurbulenceModel>
 void realizableKE<BasicTurbulenceModel>::correctNut()
 {
     tmp<volTensorField> tgradU = fvc::grad(this->U_);
-    volScalarField S2(2*magSqr(dev(symm(tgradU()))));
+    volScalarField S2(2*magSqr(devSymm(tgradU())));
     volScalarField magS(sqrt(S2));
     correctNut(tgradU(), S2, magS);
 }
@@ -266,13 +266,13 @@ void realizableKE<BasicTurbulenceModel>::correct()
     volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
 
     tmp<volTensorField> tgradU = fvc::grad(U);
-    volScalarField S2(2*magSqr(dev(symm(tgradU()))));
+    volScalarField S2(2*magSqr(devSymm(tgradU())));
     volScalarField magS(sqrt(S2));
 
     volScalarField eta(magS*k_/epsilon_);
     volScalarField C1(max(eta/(scalar(5) + eta), scalar(0.43)));
 
-    volScalarField G(this->GName(), nut*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G(this->GName(), nut*(tgradU() && devTwoSymm(tgradU())));
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
index b71be0e31f..39db48b8ea 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -93,7 +93,7 @@ void Foam::ReynoldsStress<BasicTurbulenceModel>::correctWallShearStress
                 // Set the wall Reynolds-stress to the near-wall shear-stress
                 // Note: the spherical part of the normal stress is included in
                 // the pressure
-                Rw[facei] = -nutw[facei]*2*dev(symm(gradUw));
+                Rw[facei] = -nutw[facei]*2*devSymm(gradUw);
             }
         }
     }
@@ -288,7 +288,7 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::devRhoReff
             ),
             this->alpha_*this->rho_*R_
           - (this->alpha_*this->rho_*this->nu())
-           *dev(twoSymm(fvc::grad(U)))
+           *devTwoSymm(fvc::grad(U))
         )
     );
 }
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
index 0a6a0b5d11..47a4e601b6 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,7 +117,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
                 IOobject::NO_WRITE,
                 IOobject::NO_REGISTER
             ),
-            ((2.0/3.0)*I)*tk() - (nut_)*dev(twoSymm(fvc::grad(this->U_))),
+            ((2.0/3.0)*I)*tk() - (nut_)*devTwoSymm(fvc::grad(this->U_)),
             patchFieldTypes
         )
     );
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
index 6c03e0eb00..adb68b0cb6 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -139,7 +139,7 @@ Maxwell<BasicTurbulenceModel>::devRhoReff(const volVectorField& U) const
             ),
             this->alpha_*this->rho_*sigma_
           - (this->alpha_*this->rho_*this->nu())
-           *dev(twoSymm(fvc::grad(U)))
+           *devTwoSymm(fvc::grad(U))
         )
     );
 }
diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
index b71797502b..057720d682 100644
--- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
+++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -95,7 +96,7 @@ Foam::linearViscousStress<BasicTurbulenceModel>::devRhoReff
                 IOobject::NO_WRITE
             ),
             (-(this->alpha_*this->rho_*this->nuEff()))
-           *dev(twoSymm(fvc::grad(U)))
+           *devTwoSymm(fvc::grad(U))
         )
     );
 }
diff --git a/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
index 0506ee878b..ffda9c451e 100644
--- a/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
+++ b/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2018 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -415,7 +415,7 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::correct()
     volScalarField::Internal G
     (
         this->GName(),
-        nut.v()*(dev(twoSymm(tgradU().v())) && tgradU().v())
+        nut.v()*(devTwoSymm(tgradU().v()) && tgradU().v())
     );
     tgradU.clear();
 
diff --git a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C
index 5f9222a233..982e3cc705 100644
--- a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C
+++ b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -430,7 +430,7 @@ void kL<BasicTurbulenceModel>::correct()
     const volScalarField::Internal G
     (
         this->GName(),
-        nut.v()*2*magSqr(dev(symm(tgradU.cref().v())))
+        nut.v()*2*magSqr(devSymm(tgradU.cref().v()))
     );
     tgradU.clear();
 
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
index 237cff487f..a0e5a63b67 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -126,7 +126,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::devReff() const
 
         const auto& U = mesh_.lookupObject<volVectorField>(UName_);
 
-        return -thermo.nu()*dev(twoSymm(fvc::grad(U)));
+        return -thermo.nu()*devTwoSymm(fvc::grad(U));
     }
     else if (mesh_.foundObject<transportModel>("transportProperties"))
     {
@@ -135,7 +135,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::devReff() const
 
         const auto& U = mesh_.lookupObject<volVectorField>(UName_);
 
-        return -laminarT.nu()*dev(twoSymm(fvc::grad(U)));
+        return -laminarT.nu()*devTwoSymm(fvc::grad(U));
     }
     else if (mesh_.foundObject<dictionary>("transportProperties"))
     {
@@ -146,7 +146,7 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::devReff() const
 
         const auto& U = mesh_.lookupObject<volVectorField>(UName_);
 
-        return -nu*dev(twoSymm(fvc::grad(U)));
+        return -nu*devTwoSymm(fvc::grad(U));
     }
 
     FatalErrorInFunction
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 448a2640f0..4870f5a50c 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -230,27 +230,27 @@ Foam::functionObjects::forces::devRhoReff
         const auto& turb =
             lookupObject<icoTurbModel>(icoTurbModel::propertiesName);
 
-        return -rho(patchi)*turb.nuEff(patchi)*dev(twoSymm(gradUp));
+        return -rho(patchi)*turb.nuEff(patchi)*devTwoSymm(gradUp);
     }
     else if (foundObject<cmpTurbModel>(cmpTurbModel::propertiesName))
     {
         const auto& turb =
             lookupObject<cmpTurbModel>(cmpTurbModel::propertiesName);
 
-        return -turb.muEff(patchi)*dev(twoSymm(gradUp));
+        return -turb.muEff(patchi)*devTwoSymm(gradUp);
     }
     else if (foundObject<fluidThermo>(fluidThermo::dictName))
     {
         const auto& thermo = lookupObject<fluidThermo>(fluidThermo::dictName);
 
-        return -thermo.mu(patchi)*dev(twoSymm(gradUp));
+        return -thermo.mu(patchi)*devTwoSymm(gradUp);
     }
     else if (foundObject<transportModel>("transportProperties"))
     {
         const auto& laminarT =
             lookupObject<transportModel>("transportProperties");
 
-        return -rho(patchi)*laminarT.nu(patchi)*dev(twoSymm(gradUp));
+        return -rho(patchi)*laminarT.nu(patchi)*devTwoSymm(gradUp);
     }
     else if (foundObject<dictionary>("transportProperties"))
     {
@@ -259,7 +259,7 @@ Foam::functionObjects::forces::devRhoReff
 
         const dimensionedScalar nu("nu", dimViscosity, transportProperties);
 
-        return -rho(patchi)*nu.value()*dev(twoSymm(gradUp));
+        return -rho(patchi)*nu.value()*devTwoSymm(gradUp);
     }
     else
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForce/objectiveForce.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForce/objectiveForce.C
index 74cdec6b1f..393f792ca1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForce/objectiveForce.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForce/objectiveForce.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2007-2019, 2022 PCOpt/NTUA
     Copyright (C) 2013-2019, 2022 FOSS GP
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -242,7 +242,7 @@ void objectiveForce::update_dxdbMultiplier()
 void objectiveForce::update_boundarydJdnut()
 {
     const volVectorField& U = vars_.U();
-    volSymmTensorField devGradU(dev(twoSymm(fvc::grad(U))));
+    volSymmTensorField devGradU(devTwoSymm(fvc::grad(U)));
 
     for (const label patchI : forcePatches_)
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveMoment/objectiveMoment.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveMoment/objectiveMoment.C
index f89e72203c..52765b47e1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveMoment/objectiveMoment.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveMoment/objectiveMoment.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2007-2019, 2022 PCOpt/NTUA
     Copyright (C) 2013-2019, 2022 FOSS GP
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -294,7 +294,7 @@ void objectiveMoment::update_dxdbDirectMultiplier()
 void objectiveMoment::update_boundarydJdnut()
 {
     const volVectorField& U = vars_.U();
-    volSymmTensorField devGradU(dev(twoSymm(fvc::grad(U))));
+    volSymmTensorField devGradU(devTwoSymm(fvc::grad(U)));
 
     for (const label patchI : momentPatches_)
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointLaminar/adjointLaminar.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointLaminar/adjointLaminar.C
index d79320f848..e2430dfeef 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointLaminar/adjointLaminar.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointLaminar/adjointLaminar.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2007-2019 PCOpt/NTUA
     Copyright (C) 2013-2019 FOSS GP
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -92,7 +92,7 @@ tmp<volSymmTensorField> adjointLaminar::devReff
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-           -nu()*dev(twoSymm(fvc::grad(U)))
+           -nu()*devTwoSymm(fvc::grad(U))
         )
     );
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
index 1dfef0240d..3ea09efc90 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2007-2021 PCOpt/NTUA
     Copyright (C) 2013-2021 FOSS GP
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -723,7 +723,7 @@ tmp<volSymmTensorField> adjointSpalartAllmaras::devReff
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-           -nuEff()*dev(twoSymm(fvc::grad(U)))
+           -nuEff()*devTwoSymm(fvc::grad(U))
         );
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
index 0a8a370015..67ef142d34 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
@@ -1052,7 +1052,7 @@ void adjointkOmegaSST::updatePrimalRelatedFields()
         S2_ = 2*magSqr(symm(gradU_))
             + dimensionedScalar(dimless/sqr(dimTime), 1.e-21);
         S_ = sqrt(S2_);
-        GbyNu0_ = gradU_ && dev(twoSymm(gradU_));
+        GbyNu0_ = gradU_ && devTwoSymm(gradU_);
 
         // Instead of computing G directly here, delegate to RASModelVariables
         // to make sure G is computed consistently when the primal fields are
@@ -1808,7 +1808,7 @@ tmp<volSymmTensorField> adjointkOmegaSST::devReff
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-           -nuEff()*dev(twoSymm(fvc::grad(U)))
+           -nuEff()*devTwoSymm(fvc::grad(U))
         );
 }
 
@@ -2320,7 +2320,7 @@ tmp<volTensorField> adjointkOmegaSST::FISensitivityTerm()
       + (
             case_1_GPrime_*wa()*gamma_
           + case_1_Pk_*ka()*nutRef()
-        )*2.*T(gradU_ & dev(twoSymm(gradU_)))*zeroFirstCell_
+        )*2.*T(gradU_ & devTwoSymm(gradU_))*zeroFirstCell_
         // S2 (includes contribution from nut in UEqn as well)
       + (
             dR_dnut()*a1_*k()/(b1_*S_*S_*S_*F2_)
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
index 5816590841..e74372f425 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2007-2019 PCOpt/NTUA
     Copyright (C) 2013-2019 FOSS GP
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -436,7 +436,7 @@ tmp<volSymmTensorField> RASModelVariables::devReff
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-      - (laminarTransport.nu() + nutRef())*dev(twoSymm(fvc::grad(U)))
+      - (laminarTransport.nu() + nutRef())*devTwoSymm(fvc::grad(U))
     );
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
index 12c386a526..b4ba121b47 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2007-2019 PCOpt/NTUA
     Copyright (C) 2013-2019 FOSS GP
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,7 +114,7 @@ tmp<volScalarField::Internal> kOmegaSST::computeG()
     volScalarField::Internal GbyNu0
     (
         IOobject::scopedName(this->type(), "GbyNu"),
-        (tgradU() && dev(twoSymm(tgradU())))
+        (tgradU() && devTwoSymm(tgradU()))
     );
 
     // NB: leave tmp registered (for correctBoundaryConditions)
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index cab9367831..9ac98b1c21 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -256,7 +256,7 @@ Foam::RASModels::kineticTheoryModel::R() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-          - (nut_)*dev(twoSymm(fvc::grad(U_)))
+          - (nut_)*devTwoSymm(fvc::grad(U_))
           - (lambda_*fvc::div(phi_))*symmTensor::I
         )
     );
@@ -335,7 +335,7 @@ Foam::RASModels::kineticTheoryModel::devRhoReff
                 IOobject::NO_WRITE
             ),
           - (rho_*nut_)
-           *dev(twoSymm(fvc::grad(U)))
+           *devTwoSymm(fvc::grad(U))
           - ((rho_*lambda_)*fvc::div(phi_))*symmTensor::I
         )
     );
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 010322104d..53f76222a6 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -256,7 +256,7 @@ Foam::RASModels::kineticTheoryModel::R() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-          - (nut_)*dev(twoSymm(fvc::grad(U_)))
+          - (nut_)*devTwoSymm(fvc::grad(U_))
           - (lambda_*fvc::div(phi_))*symmTensor::I
         )
     );
@@ -335,7 +335,7 @@ Foam::RASModels::kineticTheoryModel::devRhoReff
                 IOobject::NO_WRITE
             ),
           - (rho_*nut_)
-           *dev(twoSymm(fvc::grad(U)))
+           *devTwoSymm(fvc::grad(U))
           - ((rho_*lambda_)*fvc::div(phi_))*symmTensor::I
         )
     );
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
index 486ab4767c..f89cb18063 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -328,14 +328,14 @@ tmp<Foam::volSymmTensorField> filmTurbulenceModel::devRhoReff() const
         const auto& thermo =
             m.lookupObject<fluidThermo>(fluidThermo::dictName);
 
-        return -thermo.mu()*dev(twoSymm(fvc::grad(U)));
+        return -thermo.mu()*devTwoSymm(fvc::grad(U));
     }
     else if (m.foundObject<transportModel>("transportProperties"))
     {
         const auto& laminarT =
             m.lookupObject<transportModel>("transportProperties");
 
-        return -rho()*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
+        return -rho()*laminarT.nu()*devTwoSymm(fvc::grad(U));
     }
     else if (m.foundObject<dictionary>("transportProperties"))
     {
@@ -344,7 +344,7 @@ tmp<Foam::volSymmTensorField> filmTurbulenceModel::devRhoReff() const
 
         const dimensionedScalar nu("nu", dimViscosity, transportProperties);
 
-        return -rho()*nu*dev(twoSymm(fvc::grad(U)));
+        return -rho()*nu*devTwoSymm(fvc::grad(U));
     }
     else
     {

From 687a9528b0f3d91a062d7a118bb66be4ff20fa51 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 11:37:41 +0200
Subject: [PATCH 235/348] DOC: include 'Environment' as filtered doxygen
 paragraph

---
 bin/tools/doxyFilter.sed | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/bin/tools/doxyFilter.sed b/bin/tools/doxyFilter.sed
index 8e739c5b5d..38343d8650 100644
--- a/bin/tools/doxyFilter.sed
+++ b/bin/tools/doxyFilter.sed
@@ -1,4 +1,17 @@
 #------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | www.openfoam.com
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+#     Copyright (C) 2011-2016 OpenFOAM Foundation
+#     Copyright (C) 2017-2023 OpenCFD Ltd.
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+#
+#------------------------------------------------------------------------------
 # Script
 #     doxyFilter.sed
 #
@@ -117,6 +130,13 @@ s/^    //
 }
 
 
+/^Environment *$/,/^[^ ]/{
+/^Environment/c\
+\\par Environment
+s/^    //
+}
+
+
 /^See *[Aa]lso *$/,/^[^ ]/{
 /^See *[Aa]lso/c\
 \\see

From 521043094ea9c999ab6a1a523b80e6d7af85e001 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 May 2023 14:14:35 +0200
Subject: [PATCH 236/348] ENH: replace autoPtr<bool> with Switch (#2777)

- initialise with Switch::INVALID and then test if good() to
  trigger the initial update.

  This avoids some overhead, but primarily avoids ambiguity with
  implicit casting to a 'bool' that autoPtr<bool> has.
---
 .../adjointBoundaryCondition.C                         | 10 +++++-----
 .../adjointBoundaryCondition.H                         | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
index 0e49b2815e..9523408d2d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.C
@@ -172,11 +172,11 @@ adjointBoundaryCondition<Type>::computePatchGrad(word name)
 template<class Type>
 bool adjointBoundaryCondition<Type>::addATCUaGradUTerm()
 {
-    if (!addATCUaGradUTerm_)
+    if (!addATCUaGradUTerm_.good())
     {
-        addATCUaGradUTerm_.reset(new bool(isA<ATCUaGradU>(getATC())));
+        addATCUaGradUTerm_ = bool(isA<ATCUaGradU>(getATC()));
     }
-    return addATCUaGradUTerm_();
+    return addATCUaGradUTerm_;
 }
 
 
@@ -202,7 +202,7 @@ adjointBoundaryCondition<Type>::adjointBoundaryCondition
             adjointBC.patch_
         )
     ),
-    addATCUaGradUTerm_(adjointBC.addATCUaGradUTerm_)
+    addATCUaGradUTerm_(Switch::INVALID)
 {}
 
 
@@ -221,7 +221,7 @@ adjointBoundaryCondition<Type>::adjointBoundaryCondition
     adjointSolverName_(solverName),
     simulationType_("incompressible"),
     boundaryContrPtr_(nullptr),
-    addATCUaGradUTerm_(nullptr)
+    addATCUaGradUTerm_(Switch::INVALID)
 {
     // Set the boundaryContribution pointer
     setBoundaryContributionPtr();
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.H b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.H
index dd2f92c98d..9d30c4bc77 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.H
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryCondition.H
@@ -39,6 +39,7 @@ Description
 
 #include "boundaryAdjointContribution.H"
 #include "ATCModel.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,11 +74,10 @@ protected:
         //- to the adjoint boundary conditions
         autoPtr<boundaryAdjointContribution> boundaryContrPtr_;
 
-
-        //- Whether to add the extra term from the UaGradU formulation
-        //  autoPtr since ATCModel has not been allocated at the time
-        //  adjointBoundaryConditions are constructed
-        autoPtr<bool> addATCUaGradUTerm_;
+        //- Whether to add the extra term from the UaGradU formulation.
+        //  As a Switch with delayed evaluation since ATCModel
+        //  has not been allocated at the time of construction
+        Switch addATCUaGradUTerm_;
 
 
     // Protected Member Functions

From a581a8cb8d64dd63bb452dc7ed1dd92cfaee1425 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 May 2023 14:14:35 +0200
Subject: [PATCH 237/348] ENH: disallow implicit cast of autoPtr to non-const
 pointer

- permitting a cast to a non-const pointer adds uncertainty of
  ownership.

- adjust PtrDynList transfer. Remove the unused 'PtrDynList::remove()'
  method, which is better handled with pop().
---
 applications/test/PtrList/Test-PtrList.C      | 16 +++++
 .../PtrLists/PtrDynList/PtrDynList.H          |  9 +--
 .../PtrLists/PtrDynList/PtrDynListI.H         | 69 ++++---------------
 .../containers/PtrLists/PtrList/PtrList.H     | 13 ++--
 .../functionObjectList/functionObjectList.C   |  2 +-
 src/OpenFOAM/memory/autoPtr/autoPtr.H         |  9 ++-
 6 files changed, 49 insertions(+), 69 deletions(-)

diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index 5125a2309f..47510f1a8d 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -325,6 +325,22 @@ int main(int argc, char *argv[])
     {
         list1.set(i, new Scalar(1.3*i));
     }
+    {
+        auto ptr = autoPtr<Scalar>::New(10);
+
+        Info<< "add: " << Foam::name(ptr.get());
+        list1.set(0, ptr);
+
+        Info<< "ptrlist: " << Foam::name(list1.get(0)) << nl;
+        Info<< "now: " << Foam::name(ptr.get()) << nl;
+
+        ptr = autoPtr<Scalar>::New(20);
+
+        list1.append(ptr);
+        // Delete method:  list1.push_back(ptr);
+        // list1.push_back(std::move(ptr));
+    }
+
 
     PtrList<Scalar> list2(15);
     Info<< "Emplace set " << list2.size() << " values" << nl;
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index 8528bb6382..42847f0b51 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -172,9 +172,6 @@ public:
         //- Reduce size by 1 or more elements. Can be called on an empty list.
         inline void pop_back(label n = 1);
 
-        //- Remove and return the top element. Can be called on an empty list.
-        inline autoPtr<T> remove();
-
         //- Construct and set a new element at given position,
         //- (discard old element at that location).
         //- Return reference to the new list element.
@@ -230,10 +227,14 @@ public:
 
     // Housekeeping
 
+        //- Disallow push_back with autoPtr without std::move
+        void push_back(autoPtr<T>& ptr) = delete;
+
         //- Set element to given autoPtr and return old element
+        //FOAM_DEPRECATED_FOR(2022-10, "set(autoPtr&&))")
         autoPtr<T> set(const label i, autoPtr<T>& ptr)
         {
-            return this->set(i, std::move(ptr));
+            return this->set(i, ptr.release());
         }
 
         //- Same as resize()
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index 841456774f..d052e57f3b 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -217,19 +217,20 @@ inline void Foam::PtrDynList<T, SizeMin>::swap
 
 
 template<class T, int SizeMin>
-inline void Foam::PtrDynList<T, SizeMin>::transfer(PtrList<T>& other)
+inline void Foam::PtrDynList<T, SizeMin>::transfer(PtrList<T>& list)
 {
     if
     (
         static_cast<const PtrList<T>*>(this)
-     == static_cast<const PtrList<T>*>(&other)
+     == static_cast<const PtrList<T>*>(&list)
     )
     {
         return;  // Self assignment is a no-op
     }
 
-    UPtrList<T>::swap(other);
-    other.clear();
+    // Take over storage, clear addressing for list
+    capacity_ = list.size();
+    PtrList<T>::transfer(list);
 }
 
 
@@ -237,20 +238,22 @@ template<class T, int SizeMin>
 template<int AnySizeMin>
 inline void Foam::PtrDynList<T, SizeMin>::transfer
 (
-    PtrDynList<T, AnySizeMin>& other
+    PtrDynList<T, AnySizeMin>& list
 )
 {
     if
     (
         static_cast<const PtrList<T>*>(this)
-     == static_cast<const PtrList<T>*>(&other)
+     == static_cast<const PtrList<T>*>(&list)
     )
     {
         return;  // Self assignment is a no-op
     }
 
-    this->swap(other);
-    other.clear();
+    // Take over storage as-is (without shrink, without using SizeMin)
+    capacity_ = list.capacity();
+    PtrList<T>::transfer(list);
+    list.clearStorage();  // Ensure capacity=0
 }
 
 
@@ -364,25 +367,6 @@ inline void Foam::PtrDynList<T, SizeMin>::pop_back(label n)
 }
 
 
-template<class T, int SizeMin>
-inline Foam::autoPtr<T> Foam::PtrDynList<T, SizeMin>::remove()
-{
-    // Location of last element and simultaneously the new size
-    const label idx = (this->size() - 1);
-
-    if (idx < 0)
-    {
-        return nullptr;  // List is empty
-    }
-
-    autoPtr<T> old(this->ptrs_[idx]);
-    this->ptrs_[idx] = nullptr;
-    PtrList<T>::setAddressableSize(idx);
-
-    return old;
-}
-
-
 template<class T, int SizeMin>
 template<class... Args>
 inline T& Foam::PtrDynList<T, SizeMin>::emplace
@@ -528,14 +512,7 @@ inline void Foam::PtrDynList<T, SizeMin>::operator=
     PtrList<T>&& list
 )
 {
-    if (this == &list)
-    {
-        return;  // Self-assignment is a no-op
-    }
-
-    PtrList<T>::transfer(list);
-    capacity_ = PtrList<T>::size();
-    list.clearStorage();
+    this->transfer(list);
 }
 
 
@@ -545,14 +522,7 @@ inline void Foam::PtrDynList<T, SizeMin>::operator=
     PtrDynList<T, SizeMin>&& list
 )
 {
-    if (this == &list)
-    {
-        return;  // Self-assignment is a no-op
-    }
-
-    PtrList<T>::transfer(list);
-    capacity_ = list.capacity();
-    list.clearStorage();
+    this->transfer(list);
 }
 
 
@@ -563,18 +533,7 @@ inline void Foam::PtrDynList<T, SizeMin>::operator=
     PtrDynList<T, AnySizeMin>&& list
 )
 {
-    if
-    (
-        static_cast<const PtrList<T>*>(this)
-     == static_cast<const PtrList<T>*>(&list)
-    )
-    {
-        return;  // Self-assignment is a no-op
-    }
-
-    PtrList<T>::transfer(list);
-    capacity_ = list.capacity();
-    list.clearStorage();
+    this->transfer(list);
 }
 
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 24a72273d1..48c29e0089 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -223,17 +223,22 @@ public:
 
     // Housekeeping
 
+        //- Disallow push_back with autoPtr without std::move
+        void push_back(autoPtr<T>& ptr) = delete;
+
         //- Set element to given autoPtr and return old element
+        //FOAM_DEPRECATED_FOR(2022-10, "set(autoPtr&&))")
         autoPtr<T> set(const label i, autoPtr<T>& ptr)
         {
-            return this->set(i, std::move(ptr));
+            return this->set(i, ptr.release());
         }
 
         //- Same as resize()
         void setSize(const label newLen) { this->resize(newLen); }
 
         //- Move append an element to the end of the list
-        void append(autoPtr<T>& ptr) { this->push_back(std::move(ptr)); }
+        //FOAM_DEPRECATED_FOR(2022-10, "push_back()")
+        void append(autoPtr<T>& ptr) { this->push_back(ptr.release()); }
 
         //- Append an element to the end of the list
         //FOAM_DEPRECATED_FOR(2022-10, "push_back()")
@@ -243,12 +248,12 @@ public:
         //FOAM_DEPRECATED_FOR(2022-10, "push_back()")
         void append(std::unique_ptr<T>&& ptr)
         {
-            this->push_back(std::move(ptr));
+            this->push_back(ptr.release());
         }
 
         //- Move append an element to the end of the list
         //FOAM_DEPRECATED_FOR(2022-10, "push_back()")
-        void append(autoPtr<T>&& ptr) { this->push_back(std::move(ptr)); }
+        void append(autoPtr<T>&& ptr) { this->push_back(ptr.release()); }
 
         //- Move or clone append a tmp to the end of the list
         //FOAM_DEPRECATED_FOR(2022-10, "push_back()")
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index b11d990703..d1e4105d0a 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -1185,7 +1185,7 @@ bool Foam::functionObjectList::read()
             // Insert active functionObject into the list
             if (objPtr)
             {
-                newPtrs.set(nFunc, objPtr);
+                newPtrs.set(nFunc, std::move(objPtr));
                 newIndices.insert(key, nFunc);
                 ++nFunc;
             }
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index b879e85c0e..b7579a9ad0 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -261,12 +261,11 @@ public:
         //- True if pointer/reference is non-null. Same as good()
         explicit operator bool() const noexcept { return bool(ptr_); }
 
-        //- Cast to pointer type
+        //- Implicit cast to \em const pointer type.
+        //  \note no cast to non-const pointer,
+        //  since this would add uncertainty of ownership.
         operator const T*() const noexcept { return ptr_; }
 
-        //- Cast to pointer type
-        operator T*() noexcept { return ptr_; }
-
         //- Deprecated(2019-01) Automatic cast conversion to underlying type
         //  FatalError if no pointer is managed
         //  \deprecated(2019-01) Can result in inadvertent conversions

From f7a7f1c14c05b89efc136350a8346cdfec155380 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 May 2023 10:16:38 +0200
Subject: [PATCH 238/348] ENH: reduced warnings about createBaffles on
 processor patches (#2781)

- coupled patches are treated distinctly and independently of
  internalFacesOnly, it makes little sense to report them with a
  warning about turning off boundary faces (which would not work
  anyhow).

STYLE: update code style for createBaffles
---
 .../createBaffles/createBaffles.C             | 175 +++++++++---------
 1 file changed, 85 insertions(+), 90 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 65203557dd..c7e2bbc77b 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -139,7 +139,7 @@ void filterPatches(fvMesh& mesh, const wordHashSet& addedPatchNames)
             (
                 isA<coupledPolyPatch>(pp)
              || returnReduceOr(pp.size())
-             || addedPatchNames.found(pp.name())
+             || addedPatchNames.contains(pp.name())
             )
             {
                 // Coupled (and unknown size) or uncoupled and used
@@ -248,8 +248,8 @@ void createFaces
     const bool internalFacesOnly,
     const fvMesh& mesh,
     const faceZone& fZone,
-    const labelList& newMasterPatches,
-    const labelList& newSlavePatches,
+    const labelUList& newMasterPatches,
+    const labelUList& newSlavePatches,
     polyTopoChange& meshMod,
     bitSet& modifiedFace,
     label& nModified
@@ -259,12 +259,15 @@ void createFaces
 
     forAll(newMasterPatches, i)
     {
+        const label newMasterPatchi = newMasterPatches[i];
+        const label newSlavePatchi = newSlavePatches[i];
+
         // Pass 1. Do selected side of zone
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
+        for (label facei = 0; facei < mesh.nInternalFaces(); ++facei)
         {
-            label zoneFacei = fZone.whichFace(facei);
+            const label zoneFacei = fZone.whichFace(facei);
 
             if (zoneFacei != -1)
             {
@@ -278,7 +281,7 @@ void createFaces
                         facei,                  // label of face
                         mesh.faceOwner()[facei],// owner
                         false,                  // face flip
-                        newMasterPatches[i],    // patch for face
+                        newMasterPatchi,        // patch for face
                         fZone.index(),          // zone for face
                         false,                  // face flip in zone
                         modifiedFace            // modify or add status
@@ -297,14 +300,14 @@ void createFaces
                         facei,                      // label of face
                         mesh.faceNeighbour()[facei],// owner
                         true,                       // face flip
-                        newMasterPatches[i],        // patch for face
+                        newMasterPatchi,            // patch for face
                         fZone.index(),              // zone for face
                         false,                      // face flip in zone
                         modifiedFace                // modify or add status
                     );
                 }
 
-                nModified++;
+                ++nModified;
             }
         }
 
@@ -312,9 +315,9 @@ void createFaces
         // Pass 2. Do other side of zone
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
+        for (label facei = 0; facei < mesh.nInternalFaces(); ++facei)
         {
-            label zoneFacei = fZone.whichFace(facei);
+            const label zoneFacei = fZone.whichFace(facei);
 
             if (zoneFacei != -1)
             {
@@ -328,7 +331,7 @@ void createFaces
                         facei,                          // label of face
                         mesh.faceNeighbour()[facei],    // owner
                         true,                           // face flip
-                        newSlavePatches[i],             // patch for face
+                        newSlavePatchi,                 // patch for face
                         fZone.index(),                  // zone for face
                         true,                           // face flip in zone
                         modifiedFace                    // modify or add
@@ -344,7 +347,7 @@ void createFaces
                         facei,                  // label of face
                         mesh.faceOwner()[facei],// owner
                         false,                  // face flip
-                        newSlavePatches[i],     // patch for face
+                        newSlavePatchi,         // patch for face
                         fZone.index(),          // zone for face
                         true,                   // face flip in zone
                         modifiedFace            // modify or add status
@@ -371,13 +374,11 @@ void createFaces
         forAll(pbm, patchi)
         {
             const polyPatch& pp = pbm[patchi];
-
-            const label newMasterPatchi = newMasterPatches[i];
-            const label newSlavePatchi = newSlavePatches[i];
+            const bool isCoupled = pp.coupled();
 
             if
             (
-                pp.coupled()
+                isCoupled
              && (
                     pbm[newMasterPatchi].coupled()
                  || pbm[newSlavePatchi].coupled()
@@ -387,7 +388,7 @@ void createFaces
                 // Do not allow coupled faces to be moved to different
                 // coupled patches.
             }
-            else if (pp.coupled() || !internalFacesOnly)
+            else if (isCoupled || !internalFacesOnly)
             {
                 forAll(pp, i)
                 {
@@ -397,16 +398,14 @@ void createFaces
 
                     if (zoneFacei != -1)
                     {
-                        if (patchWarned.insert(patchi))
+                        if (!isCoupled && patchWarned.insert(patchi))
                         {
                             WarningInFunction
-                                << "Found boundary face (in patch "
-                                << pp.name()
+                                << "Found boundary face (patch " << pp.name()
                                 << ") in faceZone " << fZone.name()
                                 << " to convert to baffle patches "
                                 << pbm[newMasterPatchi].name() << "/"
-                                << pbm[newSlavePatchi].name()
-                                << endl
+                                << pbm[newSlavePatchi].name() << nl
                                 << "    Set internalFacesOnly to true in the"
                                 << " createBaffles control dictionary if you"
                                 << " don't wish to convert boundary faces."
@@ -428,7 +427,7 @@ void createFaces
                             modifiedFace                // modify or add
                         );
 
-                        nModified++;
+                        ++nModified;
                     }
                 }
             }
@@ -547,21 +546,16 @@ int main(int argc, char *argv[])
     // Creating (if necessary) faceZones
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    forAll(selectors, selectorI)
+    for (const faceSelection& selector : selectors)
     {
-        const word& name = selectors[selectorI].name();
+        const word& name = selector.name();
 
         if (mesh.faceZones().findZoneID(name) == -1)
         {
             mesh.faceZones().clearAddressing();
             const label zoneID = mesh.faceZones().size();
 
-            mesh.faceZones().setSize(zoneID+1);
-            mesh.faceZones().set
-            (
-                zoneID,
-                new faceZone(name, labelList(), false, zoneID, mesh.faceZones())
-            );
+            mesh.faceZones().emplace_back(name, zoneID, mesh.faceZones());
         }
     }
 
@@ -572,29 +566,28 @@ int main(int argc, char *argv[])
     //- Per face zoneID it is in and flip status.
     labelList faceToZoneID(mesh.nFaces(), -1);
     boolList faceToFlip(mesh.nFaces(), false);
-    forAll(selectors, selectorI)
+    for (faceSelection& selector : selectors)
     {
-        const word& name = selectors[selectorI].name();
-        label zoneID = mesh.faceZones().findZoneID(name);
+        const word& name = selector.name();
+        const label zoneID = mesh.faceZones().findZoneID(name);
 
-        selectors[selectorI].select(zoneID, faceToZoneID, faceToFlip);
+        selector.select(zoneID, faceToZoneID, faceToFlip);
     }
 
     // Add faces to faceZones
     labelList nFaces(mesh.faceZones().size(), Zero);
-    forAll(faceToZoneID, facei)
+    for (const label zoneID : faceToZoneID)
     {
-        label zoneID = faceToZoneID[facei];
         if (zoneID != -1)
         {
-            nFaces[zoneID]++;
+            ++nFaces[zoneID];
         }
     }
 
-    forAll(selectors, selectorI)
+    for (const faceSelection& selector : selectors)
     {
-        const word& name = selectors[selectorI].name();
-        label zoneID = mesh.faceZones().findZoneID(name);
+        const word& name = selector.name();
+        const label zoneID = mesh.faceZones().findZoneID(name);
 
         label& n = nFaces[zoneID];
         labelList addr(n);
@@ -635,13 +628,15 @@ int main(int argc, char *argv[])
     // ~~~~~~~~~~~~~~~~~~~~
     wordHashSet bafflePatches;
     {
-        forAll(selectors, selectorI)
+        for (const faceSelection& selector : selectors)
         {
-            const dictionary& dict = selectors[selectorI].dict();
+            const dictionary& dict = selector.dict();
+            const word& groupName = selector.name();
+            const dictionary* patchesDictPtr = dict.findDict("patches");
 
-            if (dict.found("patches"))
+            if (patchesDictPtr)
             {
-                for (const entry& dEntry : dict.subDict("patches"))
+                for (const entry& dEntry : *patchesDictPtr)
                 {
                     const word patchName(dEntry.dict().get<word>("name"));
 
@@ -650,10 +645,10 @@ int main(int argc, char *argv[])
             }
             else
             {
-                const word masterName = selectors[selectorI].name() + "_master";
+                const word masterName(groupName + "_master");
                 bafflePatches.insert(masterName);
 
-                const word slaveName = selectors[selectorI].name() + "_slave";
+                const word slaveName(groupName + "_slave");
                 bafflePatches.insert(slaveName);
             }
         }
@@ -679,14 +674,15 @@ int main(int argc, char *argv[])
     // wordHashSet addedPatches;
     {
         const polyBoundaryMesh& pbm = mesh.boundaryMesh();
-        forAll(selectors, selectorI)
+        for (const faceSelection& selector : selectors)
         {
-            const dictionary& dict = selectors[selectorI].dict();
-            const word& groupName = selectors[selectorI].name();
+            const dictionary& dict = selector.dict();
+            const word& groupName = selector.name();
+            const dictionary* patchesDictPtr = dict.findDict("patches");
 
-            if (dict.found("patches"))
+            if (patchesDictPtr)
             {
-                for (const entry& dEntry : dict.subDict("patches"))
+                for (const entry& dEntry : *patchesDictPtr)
                 {
                     const dictionary& dict = dEntry.dict();
 
@@ -717,8 +713,8 @@ int main(int argc, char *argv[])
             else
             {
                 const dictionary& patchSource = dict.subDict("patchPairs");
-                const word masterName = groupName + "_master";
-                const word slaveName = groupName + "_slave";
+                const word masterName(groupName + "_master");
+                const word slaveName(groupName + "_slave");
 
                 word groupNameMaster = groupName;
                 word groupNameSlave = groupName;
@@ -776,22 +772,23 @@ int main(int argc, char *argv[])
     bitSet modifiedFace(mesh.nFaces());
     label nModified = 0;
 
-    forAll(selectors, selectorI)
+    for (const faceSelection& selector : selectors)
     {
-        const word& name = selectors[selectorI].name();
-        label zoneID = mesh.faceZones().findZoneID(name);
-        const faceZone& fZone = mesh.faceZones()[zoneID];
+        const word& groupName = selector.name();
+        const dictionary& dict = selector.dict();
+        const dictionary* patchesDictPtr = dict.findDict("patches");
 
-        const dictionary& dict = selectors[selectorI].dict();
+        const label zoneID = mesh.faceZones().findZoneID(groupName);
+        const faceZone& fZone = mesh.faceZones()[zoneID];
 
         DynamicList<label> newMasterPatches;
         DynamicList<label> newSlavePatches;
 
-        if (dict.found("patches"))
+        if (patchesDictPtr)
         {
             bool master = true;
 
-            for (const entry& dEntry : dict.subDict("patches"))
+            for (const entry& dEntry : *patchesDictPtr)
             {
                 const word patchName(dEntry.dict().get<word>("name"));
 
@@ -799,22 +796,22 @@ int main(int argc, char *argv[])
 
                 if (master)
                 {
-                    newMasterPatches.append(patchi);
+                    newMasterPatches.push_back(patchi);
                 }
                 else
                 {
-                    newSlavePatches.append(patchi);
+                    newSlavePatches.push_back(patchi);
                 }
                 master = !master;
             }
         }
         else
         {
-            const word masterName = selectors[selectorI].name() + "_master";
-            newMasterPatches.append(pbm.findPatchID(masterName));
+            const word masterName(groupName + "_master");
+            newMasterPatches.push_back(pbm.findPatchID(masterName));
 
-            const word slaveName = selectors[selectorI].name() + "_slave";
-            newSlavePatches.append(pbm.findPatchID(slaveName));
+            const word slaveName(groupName + "_slave");
+            newSlavePatches.push_back(pbm.findPatchID(slaveName));
         }
 
 
@@ -881,26 +878,26 @@ int main(int argc, char *argv[])
 
     {
         const polyBoundaryMesh& pbm = mesh.boundaryMesh();
-        forAll(selectors, selectorI)
+        for (const faceSelection& selector : selectors)
         {
-            const dictionary& dict = selectors[selectorI].dict();
-            if (dict.found("patches"))
+            const dictionary& dict = selector.dict();
+            const word& groupName = selector.name();
+            const dictionary* patchesDict = dict.findDict("patches");
+
+            if (patchesDict)
             {
-                for (const entry& dEntry : dict.subDict("patches"))
+                for (const entry& dEntry : *patchesDict)
                 {
                     const dictionary& dict = dEntry.dict();
-
                     const word patchName(dict.get<word>("name"));
+                    const label patchi = pbm.findPatchID(patchName);
 
-                    label patchi = pbm.findPatchID(patchName);
+                    const dictionary* patchFieldsDictPtr
+                        = dict.findDict("patchFields");
 
-                    if (dEntry.dict().found("patchFields"))
+                    if (patchFieldsDictPtr)
                     {
-                        const dictionary& patchFieldsDict =
-                            dEntry.dict().subDict
-                            (
-                                "patchFields"
-                            );
+                        const dictionary& patchFieldsDict = *patchFieldsDictPtr;
 
                         fvMeshTools::setPatchFields
                         (
@@ -918,14 +915,13 @@ int main(int argc, char *argv[])
                 const bool sameGroup =
                     patchSource.getOrDefault("sameGroup", true);
 
-                const word& groupName = selectors[selectorI].name();
+                const dictionary* patchFieldsDictPtr
+                    = dict.findDict("patchFields");
 
-                if (patchSource.found("patchFields"))
+                if (patchFieldsDictPtr)
                 {
-                    dictionary patchFieldsDict = patchSource.subDict
-                    (
-                        "patchFields"
-                    );
+                    // Work on a copy
+                    dictionary patchFieldsDict(*patchFieldsDictPtr);
 
                     if (sameGroup)
                     {
@@ -939,15 +935,14 @@ int main(int argc, char *argv[])
                             }
                         }
 
-                        const labelList& patchIDs =
-                            pbm.groupPatchIDs()[groupName];
+                        const labelList& patchIDs = pbm.groupPatchIDs()[groupName];
 
-                        forAll(patchIDs, i)
+                        for (const label patchi : patchIDs)
                         {
                             fvMeshTools::setPatchFields
                             (
                                 mesh,
-                                patchIDs[i],
+                                patchi,
                                 patchFieldsDict
                             );
                         }

From a0005c3a54e8ea7e8ba2e5802ce21261250c8623 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 08:55:16 +0200
Subject: [PATCH 239/348] ENH: make InfoProxy noexcept, add 'operator*'
 dereference

- conforms better to general use of '*' dereference.
---
 src/OpenFOAM/db/IOstreams/IOstreams/INew.H    |  2 +-
 .../db/IOstreams/IOstreams/InfoProxy.H        | 34 +++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/INew.H b/src/OpenFOAM/db/IOstreams/IOstreams/INew.H
index b41d3f48df..0ff5cf328d 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/INew.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/INew.H
@@ -55,7 +55,7 @@ class INew
 public:
 
     //- Default construct
-    INew() = default;
+    INew() noexcept = default;
 
     //- New from Istream
     autoPtr<T> operator()(Istream& is) const
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
index b8190bab0d..7cd91520d1 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,15 +56,34 @@ class InfoProxy
 {
 public:
 
-    const T& t_;
+    // Data
 
-    InfoProxy(const T& t)
-    :
-        t_(t)
-    {}
+        //- The captured object reference
+        const T& t_;
 
-    friend Ostream& operator<< <T>
-    (Ostream&, const InfoProxy<T>&);
+
+    // Constructors
+
+        //- Implicit construct from object reference
+        InfoProxy(const T& item) noexcept
+        :
+            t_(item)
+        {}
+
+
+    // Member Functions
+
+        //- Return const reference to the object
+        const T& operator*() const noexcept { return t_; }
+
+        // // TBD: Dereference const pointer to the object
+        // const T* operator->() const noexcept { return &t_; }
+
+
+    // Output Functions
+
+        //- Output information to stream
+        friend Ostream& operator<< <T> (Ostream&, const InfoProxy<T>&);
 };
 
 

From a5d9ad3a5c309bf27d796d0c529a14b9daf2857c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 09:34:09 +0200
Subject: [PATCH 240/348] STYLE: use noexcept creation of InfoProxy and
 dereference as '*iproxy'

- this removes the 'magic' use of the exposed t_ member in favour
  of a generic dereference
---
 .../indexedCell/indexedCell.C                 |  4 +--
 .../indexedCell/indexedCell.H                 |  7 ++--
 .../indexedVertex/indexedVertex.C             |  4 +--
 .../indexedVertex/indexedVertex.H             |  5 +--
 .../PDR/pdrFields/obstacles/PDRobstacle.C     |  2 +-
 .../PDR/pdrFields/obstacles/PDRobstacle.H     |  9 +++---
 .../containers/Bits/PackedList/PackedList.H   |  5 +--
 .../containers/Bits/PackedList/PackedListIO.C |  2 +-
 src/OpenFOAM/containers/Bits/bitSet/bitSet.H  |  7 ++--
 .../containers/Bits/bitSet/bitSetIO.C         |  4 +--
 src/OpenFOAM/db/IOobject/IOobject.H           | 19 ++++++-----
 src/OpenFOAM/db/IOobject/IOobjectIO.C         |  8 +++--
 .../db/IOstreams/IOstreams/IOstream.C         |  8 +++--
 .../db/IOstreams/IOstreams/IOstream.H         | 22 ++++++-------
 src/OpenFOAM/db/IOstreams/token/token.H       | 10 +++---
 src/OpenFOAM/db/IOstreams/token/tokenIO.C     | 16 +++++++---
 .../dictionaryEntry/dictionaryEntry.H         | 30 ++++++++---------
 .../dictionaryEntry/dictionaryEntryIO.C       | 10 ++++--
 .../dictionaryListEntry/dictionaryListEntry.H | 32 ++++++++-----------
 .../dictionaryListEntryIO.C                   | 10 ++++--
 .../primitiveEntry/primitiveEntry.H           | 22 ++++++-------
 .../primitiveEntry/primitiveEntryIO.C         |  6 ++--
 .../dlLibraryTable/dlLibraryTable.C           |  4 +--
 .../dlLibraryTable/dlLibraryTable.H           | 16 ++++------
 .../matrices/lduMatrix/lduMatrix/lduMatrix.C  |  8 +++--
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  | 15 ++++-----
 src/OpenFOAM/meshes/lduMesh/lduMesh.C         | 11 +++++--
 src/OpenFOAM/meshes/lduMesh/lduMesh.H         | 11 +++----
 .../meshes/meshShapes/cellModel/cellModel.H   | 24 ++++++--------
 .../meshes/meshShapes/cellModel/cellModelIO.C |  8 +++--
 .../meshes/meshShapes/cellShape/cellShape.H   | 17 ++++------
 .../meshes/meshShapes/cellShape/cellShapeIO.C | 10 ++++--
 .../mapDistribute/mapDistributeBase.H         | 14 ++++----
 .../mapDistribute/mapDistributeBaseIO.C       |  4 +--
 .../mapDistribute/mapDistributePolyMesh.H     | 14 ++++----
 .../mapDistribute/mapDistributePolyMeshIO.C   |  4 +--
 .../ensight/part/cells/ensightCells.H         |  6 ++--
 .../ensight/part/cells/ensightCellsIO.C       |  4 +--
 .../ensight/part/faces/ensightFaces.H         |  6 ++--
 .../ensight/part/faces/ensightFacesIO.C       |  4 +--
 .../wallBoundedParticle.C                     |  4 +--
 .../wallBoundedParticle.H                     | 28 ++++++++--------
 .../blockDescriptor/blockDescriptor.C         |  2 +-
 .../blockDescriptor/blockDescriptor.H         | 27 ++++++++--------
 .../coordSet/writers/common/coordSetWriter.C  |  4 +--
 .../coordSet/writers/common/coordSetWriter.H  |  5 +--
 .../surfaceLocation/surfaceLocation.C         |  4 +--
 .../surfaceLocation/surfaceLocation.H         | 20 ++++--------
 .../cellCellStencil/cellCellStencil.C         |  7 ++--
 .../cellCellStencil/cellCellStencil.H         | 26 ++++++++-------
 src/surfMesh/writers/common/surfaceWriter.C   |  4 +--
 src/surfMesh/writers/common/surfaceWriter.H   |  7 ++--
 52 files changed, 287 insertions(+), 273 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
index 982cfec4a4..6d677dd175 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
@@ -33,10 +33,10 @@ template<class Gt, class Cb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedCell<Gt, Cb>>& p
+    const InfoProxy<CGAL::indexedCell<Gt, Cb>>& iproxy
 )
 {
-    const CGAL::indexedCell<Gt, Cb>& iv = p.t_;
+    const auto& iv = *iproxy;
 
     os  << "Cell: ";
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index 8c0c4aa351..4204698777 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -249,9 +249,9 @@ public:
 
     // Info
 
-        //- Return info proxy.
-        //  Used to print indexedCell information to a stream
-        Foam::InfoProxy<indexedCell<Gt, Cb>> info() const
+        //- Return info proxy,
+        //- used to print information to a stream
+        Foam::InfoProxy<indexedCell<Gt, Cb>> info() const noexcept
         {
             return *this;
         }
@@ -261,7 +261,6 @@ public:
             Foam::Ostream&,
             const Foam::InfoProxy<indexedCell<Gt, Cb>>&
         );
-
 };
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
index 3fe2c9b2be..8aed0c418a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
@@ -156,10 +156,10 @@ template<class Gt, class Vb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedVertex<Gt, Vb>>& p
+    const InfoProxy<CGAL::indexedVertex<Gt, Vb>>& iproxy
 )
 {
-    const CGAL::indexedVertex<Gt, Vb>& iv = p.t_;
+    const auto& iv = *iproxy;
 
     const Foam::point pt
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index 320144f3b3..55277a708b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -313,8 +313,9 @@ public:
 
     // IOstream Operators
 
-        //- Info proxy, to print information to a stream
-        Foam::InfoProxy<indexedVertex<Gt, Vb>> info() const
+        //- Return info proxy,
+        //- used to print information to a stream
+        Foam::InfoProxy<indexedVertex<Gt, Vb>> info() const noexcept
         {
             return *this;
         }
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.C b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.C
index 0bdd2ea866..b416c08ed6 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.C
@@ -654,7 +654,7 @@ Foam::Ostream& Foam::operator<<
     const InfoProxy<PDRobstacle>& iproxy
 )
 {
-    const PDRobstacle& obs = iproxy.t_;
+    const auto& obs = *iproxy;
 
     switch (obs.typeId)
     {
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H
index d0dede5418..f9ffd85653 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/PDRobstacle.H
@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PDRobstacle_H
-#define PDRobstacle_H
+#ifndef Foam_PDRobstacle_H
+#define Foam_PDRobstacle_H
 
 #include "InfoProxy.H"
 #include "labelPair.H"
@@ -290,8 +290,9 @@ public:
 
     // IOstream Operators
 
-        //- Return info proxy.
-        InfoProxy<PDRobstacle> info() const
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<PDRobstacle> info() const noexcept
         {
             return *this;
         }
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
index 872911dfe6..0ff679b541 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
@@ -510,8 +510,9 @@ public:
 
     // IOstream Operators
 
-        //- Return info proxy.
-        InfoProxy<PackedList<Width>> info() const
+        //- Return info proxy,
+        //- used to print information to  a stream
+        InfoProxy<PackedList<Width>> info() const noexcept
         {
             return *this;
         }
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C b/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C
index 03943c5e3f..d7cf404f04 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedListIO.C
@@ -271,7 +271,7 @@ Foam::Ostream& Foam::operator<<
     const InfoProxy<PackedList<Width>>& iproxy
 )
 {
-    const PackedList<Width>& list = iproxy.t_;
+    const auto& list = *iproxy;
 
     os  << "PackedList<" << Width
         << "> size=" << list.size() << "/" << list.capacity()
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
index b6f11d469c..75b7477744 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSet.H
@@ -604,8 +604,9 @@ public:
 
     // IOstream Operators
 
-        //- Return info proxy
-        InfoProxy<bitSet> info() const
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<bitSet> info() const noexcept
         {
             return *this;
         }
@@ -634,7 +635,7 @@ template<> struct Hash<bitSet> : bitSet::hasher {};
 Ostream& operator<<(Ostream& os, const bitSet& bitset);
 
 //- Output bitset information
-Ostream& operator<<(Ostream& os, const InfoProxy<bitSet>& info);
+Ostream& operator<<(Ostream& os, const InfoProxy<bitSet>& iproxy);
 
 
 //- Bitset complement, returns a copy of the bitset with all its bits flipped
diff --git a/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C b/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C
index a8a59d263f..b5465e815c 100644
--- a/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C
+++ b/src/OpenFOAM/containers/Bits/bitSet/bitSetIO.C
@@ -42,10 +42,10 @@ Foam::Ostream& Foam::operator<<
     const InfoProxy<bitSet>& iproxy
 )
 {
-    const bitSet& bitset = iproxy.t_;
+    const auto& bitset = *iproxy;
 
     os  << "bitSet<" << bitSet::elem_per_block
-        << "> size=" << bitset.size() << "/" << bitset.capacity()
+        << "> size=" << bitset.size() << '/' << bitset.capacity()
         << " count=" << bitset.count()
         << nl;
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 016032a180..6510da3c78 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -101,8 +101,8 @@ SourceFiles
 #include "fileName.H"
 #include "typeInfo.H"
 #include "autoPtr.H"
-#include "InfoProxy.H"
 #include "Enum.H"
+#include "InfoProxy.H"
 #include "IOobjectOption.H"
 #include "IOstreamOption.H"
 
@@ -115,6 +115,11 @@ namespace Foam
 class Time;
 class dictionary;
 class objectRegistry;
+class IOobject;
+
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<IOobject>&);
+
 
 /*---------------------------------------------------------------------------*\
                            Class IOobject Declaration
@@ -646,11 +651,9 @@ public:
 
     // Info
 
-        //- Return info proxy, for printing information to a stream
-        InfoProxy<IOobject> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- for printing information to a stream
+        InfoProxy<IOobject> info() const noexcept { return *this; }
 
 
     // Member Operators
@@ -668,10 +671,6 @@ inline bool IOobject::isHeaderClass<void>() const
 }
 
 
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip);
-
-
 //- Template function for obtaining global vs. local status
 template<class T>
 inline bool typeGlobal()
diff --git a/src/OpenFOAM/db/IOobject/IOobjectIO.C b/src/OpenFOAM/db/IOobject/IOobjectIO.C
index 2a190537eb..f81501358c 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectIO.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectIO.C
@@ -31,9 +31,13 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOobject>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<IOobject>& iproxy
+)
 {
-    const IOobject& io = ip.t_;
+    const auto& io = *iproxy;
 
     os  << "IOobject: "
         << io.type() << ' ' << io.name()
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
index 983c3a7275..a627e382bf 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
@@ -138,9 +138,13 @@ void Foam::IOstream::print(Ostream& os, const int streamState) const
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<>
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOstream>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<IOstream>& iproxy
+)
 {
-    ip.t_.print(os);
+    (*iproxy).print(os);
     return os;
 }
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 58d3d6a88a..b05e073cb3 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -73,6 +73,13 @@ using std::cout;
 namespace Foam
 {
 
+// Forward Declarations
+class IOstream;
+
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<IOstream>&);
+
+
 /*---------------------------------------------------------------------------*\
                            Class IOstream Declaration
 \*---------------------------------------------------------------------------*/
@@ -405,21 +412,12 @@ public:
 
     // Info
 
-        //- Return info proxy.
-        //  Used to print IOstream information to a stream
-        InfoProxy<IOstream> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- used to print IOstream information to a stream
+        InfoProxy<IOstream> info() const noexcept { return *this; }
 };
 
 
-// Ostream Operator
-
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<IOstream>& ip);
-
-
 // --------------------------------------------------------------------
 // ------ Manipulators (not taking arguments)
 // --------------------------------------------------------------------
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 70a22c1b97..ec2fa135be 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -583,11 +583,9 @@ public:
 
     // Info
 
-        //- Return info proxy for printing token information to a stream
-        InfoProxy<token> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- for printing token information to a stream
+        InfoProxy<token> info() const noexcept { return *this; }
 
 
     // Member Operators
@@ -658,7 +656,7 @@ public:
         friend Ostream& operator<<(Ostream& os, const punctuationToken& pt);
         friend ostream& operator<<(ostream& os, const punctuationToken& pt);
 
-        friend ostream& operator<<(ostream& os, const InfoProxy<token>& ct);
+        friend ostream& operator<<(ostream& os, const InfoProxy<token>& ip);
 
 
     // Housekeeping
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenIO.C b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
index a37a37cec3..31eabb4e49 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenIO.C
+++ b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
@@ -260,16 +260,24 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token::compound& ct)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-ostream& Foam::operator<<(ostream& os, const InfoProxy<token>& ip)
+ostream& Foam::operator<<
+(
+    ostream& os,
+    const InfoProxy<token>& iproxy
+)
 {
-    return printTokenInfo(os, ip.t_);
+    return printTokenInfo(os, *iproxy);
 }
 
 
 template<>
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<token>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<token>& iproxy
+)
 {
-    return printTokenInfo(os, ip.t_);
+    return printTokenInfo(os, *iproxy);
 }
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
index 1380f427d6..fd35fd2b9d 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dictionaryEntry_H
-#define dictionaryEntry_H
+#ifndef Foam_dictionaryEntry_H
+#define Foam_dictionaryEntry_H
 
 #include "entry.H"
 #include "dictionary.H"
@@ -54,10 +54,13 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class dictionaryEntry;
 Ostream& operator<<(Ostream& os, const dictionaryEntry& e);
 
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<dictionaryEntry>&);
+
 
 /*---------------------------------------------------------------------------*\
                        Class dictionaryEntry Declaration
@@ -68,14 +71,14 @@ class dictionaryEntry
     public entry,
     public dictionary
 {
-    // Private Member Functions
+public:
+
+    // Generated Methods
 
         //- No copy construct
         dictionaryEntry(const dictionaryEntry&) = delete;
 
 
-public:
-
     // Constructors
 
         //- Construct from the parent dictionary and Istream.
@@ -158,24 +161,17 @@ public:
         //- Write
         virtual void write(Ostream& os) const;
 
-        //- Return info proxy.
-        //  Used to print token information to a stream
-        InfoProxy<dictionaryEntry> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- used to print token information to a stream
+        InfoProxy<dictionaryEntry> info() const noexcept { return *this; }
 
 
-    // Ostream Operator
+    // Ostream Operators
 
         friend Ostream& operator<<(Ostream& os, const dictionaryEntry& e);
 };
 
 
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<dictionaryEntry>& ip);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
index 383d0603df..00fd3b5d4c 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
@@ -68,7 +68,11 @@ void Foam::dictionaryEntry::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * Ostream operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const dictionaryEntry& e)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const dictionaryEntry& e
+)
 {
     e.write(os);
     return os;
@@ -79,10 +83,10 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<dictionaryEntry>& ip
+    const InfoProxy<dictionaryEntry>& iproxy
 )
 {
-    const dictionaryEntry& e = ip.t_;
+    const auto& e = *iproxy;
 
     os  << "    dictionaryEntry '" << e.keyword() << "'" << endl;
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
index a5b0e7fa08..f605257f0f 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dictionaryListEntry_H
-#define dictionaryListEntry_H
+#ifndef Foam_dictionaryListEntry_H
+#define Foam_dictionaryListEntry_H
 
 #include "dictionaryEntry.H"
 
@@ -52,11 +52,14 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward Declarations
 
 class dictionaryListEntry;
 Ostream& operator<<(Ostream& os, const dictionaryListEntry& e);
 
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<dictionaryListEntry>&);
+
 
 /*---------------------------------------------------------------------------*\
                      Class dictionaryListEntry Declaration
@@ -66,14 +69,14 @@ class dictionaryListEntry
 :
     public dictionaryEntry
 {
-    // Private Member Functions
+public:
+
+    // Generated Methods
 
         //- No copy construct
         dictionaryListEntry(const dictionaryListEntry&) = delete;
 
 
-public:
-
     // Constructors
 
         //- Construct from the parent dictionary and Istream
@@ -92,29 +95,22 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
         //- Write
         virtual void write(Ostream& os) const;
 
-        //- Return info proxy.
-        //  Used to print token information to a stream
-        InfoProxy<dictionaryListEntry> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- used to print token information to a stream
+        InfoProxy<dictionaryListEntry> info() const noexcept { return *this; }
 
 
-    // Ostream operator
+    // Ostream Operator
 
         friend Ostream& operator<<(Ostream& os, const dictionaryListEntry& e);
 };
 
 
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<dictionaryListEntry>& ip);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C
index 72a06b2bb6..74aad8eacd 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C
@@ -132,7 +132,11 @@ void Foam::dictionaryListEntry::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * Ostream operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const dictionaryListEntry& e)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const dictionaryListEntry& e
+)
 {
     e.write(os);
     return os;
@@ -143,10 +147,10 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<dictionaryListEntry>& ip
+    const InfoProxy<dictionaryListEntry>& iproxy
 )
 {
-    const dictionaryListEntry& e = ip.t_;
+    const auto& e = *iproxy;
 
     os  << "    dictionaryListEntry '" << e.keyword() << "'" << endl;
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 14e0dfb5ba..3e8236a330 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef primitiveEntry_H
-#define primitiveEntry_H
+#ifndef Foam_primitiveEntry_H
+#define Foam_primitiveEntry_H
 
 #include "entry.H"
 #include "ITstream.H"
@@ -56,6 +56,11 @@ namespace Foam
 
 // Forward Declarations
 class dictionary;
+class primitiveEntry;
+
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<primitiveEntry>&);
+
 
 /*---------------------------------------------------------------------------*\
                        Class primitiveEntry Declaration
@@ -193,19 +198,12 @@ public:
         //- Write, optionally with contents only (no keyword, etc)
         void write(Ostream& os, const bool contentsOnly) const;
 
-        //- Return info proxy.
-        //  Used to print token information to a stream
-        InfoProxy<primitiveEntry> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- to print token information to a stream
+        InfoProxy<primitiveEntry> info() const noexcept { return *this; }
 };
 
 
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<primitiveEntry>& ip);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index 713351dc12..5987f0b83a 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -313,14 +313,14 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<primitiveEntry>& ip
+    const InfoProxy<primitiveEntry>& iproxy
 )
 {
-    const primitiveEntry& e = ip.t_;
+    const auto& e = *iproxy;
 
     e.print(os);
 
-    const label nPrintTokens = 10;
+    constexpr label nPrintTokens = 10;
 
     os  << "    primitiveEntry '" << e.keyword() << "' comprises ";
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
index a3d690ab94..8a52f4f806 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
@@ -611,10 +611,10 @@ bool Foam::dlLibraryTable::open
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<dlLibraryTable>& ip
+    const InfoProxy<dlLibraryTable>& iproxy
 )
 {
-    const dlLibraryTable& tbl = ip.t_;
+    const auto& tbl = *iproxy;
 
     os << token::BEGIN_LIST << nl;
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
index 8fa2f99a02..737d46c020 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
@@ -40,8 +40,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dlLibraryTable_H
-#define dlLibraryTable_H
+#ifndef Foam_dlLibraryTable_H
+#define Foam_dlLibraryTable_H
 
 #include "DynamicList.H"
 #include "fileName.H"
@@ -55,7 +55,8 @@ namespace Foam
 
 // Forward Declarations
 class dlLibraryTable;
-Ostream& operator<<(Ostream& os, const InfoProxy<dlLibraryTable>& info);
+Ostream& operator<<(Ostream&, const InfoProxy<dlLibraryTable>&);
+
 
 /*---------------------------------------------------------------------------*\
                        Class dlLibraryTable Declaration
@@ -308,12 +309,9 @@ public:
 
     // Info
 
-        //- Return info proxy.
-        //  Used to print library table information to a stream
-        InfoProxy<dlLibraryTable> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- used to print library table information to a stream
+        InfoProxy<dlLibraryTable> info() const noexcept { return *this; }
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index 3ebbdb5c63..83a759352b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -407,9 +407,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const lduMatrix& ldum)
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<lduMatrix>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<lduMatrix>& iproxy
+)
 {
-    const lduMatrix& ldum = ip.t_;
+    const auto& ldum = *iproxy;
 
     Switch hasLow = ldum.hasLower();
     Switch hasDiag = ldum.hasDiag();
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 87a1ccd2e1..287f68fc6f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -788,17 +788,14 @@ public:
             tmp<Field<Type>> faceH(const tmp<Field<Type>>&) const;
 
 
-        // Info
+    // Info
 
-            //- Return info proxy.
-            //  Used to print matrix information to a stream
-            InfoProxy<lduMatrix> info() const
-            {
-                return *this;
-            }
+        //- Return info proxy,
+        //- used to print matrix information to a stream
+        InfoProxy<lduMatrix> info() const noexcept { return *this; }
 
 
-    // Member operators
+    // Member Operators
 
         void operator=(const lduMatrix&);
 
@@ -811,7 +808,7 @@ public:
         void operator*=(scalar);
 
 
-    // Ostream operator
+    // Ostream Operators
 
         friend Ostream& operator<<(Ostream&, const lduMatrix&);
         friend Ostream& operator<<(Ostream&, const InfoProxy<lduMatrix>&);
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.C b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
index 5011b4f88f..16e73ddf7c 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
@@ -33,7 +33,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(lduMesh, 0);
+    defineTypeNameAndDebug(lduMesh, 0);
 }
 
 
@@ -49,9 +49,13 @@ const Foam::objectRegistry& Foam::lduMesh::thisDb() const
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<lduMesh>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<lduMesh>& iproxy
+)
 {
-    const lduMesh& ldum = ip.t_;
+    const auto& ldum = *iproxy;
     const lduAddressing& addr = ldum.lduAddr();
     const lduInterfacePtrsList interfaces = ldum.interfaces();
 
@@ -62,6 +66,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<lduMesh>& ip)
         << " interfaces:" << interfaces.size()
         << " comm:" << ldum.comm()
         << endl;
+
     label nCouples = 0;
     forAll(interfaces, i)
     {
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
index 85e33ed605..493bbcaabc 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
@@ -98,14 +98,11 @@ public:
             ) const;
 
 
-        // Info
+    // Info
 
-            //- Return info proxy.
-            //  Used to print mesh information to a stream
-            InfoProxy<lduMesh> info() const
-            {
-                return *this;
-            }
+        //- Return info proxy,
+        //- used to print mesh information to a stream
+        InfoProxy<lduMesh> info() const noexcept { return *this; }
 
 
     // Ostream Operator
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
index 59490311d2..118589f3a5 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
@@ -46,8 +46,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellModel_H
-#define cellModel_H
+#ifndef Foam_cellModel_H
+#define Foam_cellModel_H
 
 #include "pointField.H"
 #include "edgeList.H"
@@ -66,6 +66,10 @@ namespace Foam
 class cellModel;
 Ostream& operator<<(Ostream& os, const cellModel& cm);
 
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<cellModel>&);
+
+
 /*---------------------------------------------------------------------------*\
                           Class cellModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -228,12 +232,10 @@ public:
             const UList<point>& points
         ) const;
 
-        //- Return info proxy.
-        //  Used to print information to a stream
-        InfoProxy<cellModel> info() const
-        {
-            return *this;
-        }
+
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<cellModel> info() const noexcept { return *this; }
 
         //- The writeData member function required by regIOobject
         bool writeData(Ostream& os) const
@@ -249,12 +251,6 @@ public:
 };
 
 
-// Ostream Operators
-
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip);
-
-
 // Global Operators
 
 //- Equality: true when model pointers are identical
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
index 464b12ce35..c57f0a1516 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
@@ -59,9 +59,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const cellModel& cm)
 
 
 template<>
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<cellModel>& iproxy
+)
 {
-    const cellModel& cm = ip.t_;
+    const auto& cm = *iproxy;
 
     os  << "name = " << cm.name() << ", "
         << "index = " << cm.index() << ", "
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
index 7356f77ddf..193cee691e 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
@@ -62,6 +62,9 @@ bool operator==(const cellShape& a, const cellShape& b);
 Istream& operator>>(Istream& is, cellShape& s);
 Ostream& operator<<(Ostream& os, const cellShape& s);
 
+template<>
+Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip);
+
 
 /*---------------------------------------------------------------------------*\
                           Class cellShape Declaration
@@ -212,11 +215,9 @@ public:
         //- Collapse shape to correct one after removing duplicate vertices
         void collapse();
 
-        //- Return info proxy, to print information to a stream
-        Foam::InfoProxy<cellShape> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<cellShape> info() const noexcept { return *this; }
 
 
     // Friend Operators
@@ -224,17 +225,13 @@ public:
         friend bool operator==(const cellShape& a, const cellShape& b);
 
 
-    // IOstream operators
+    // IOstream Operators
 
         friend Istream& operator>>(Istream& is, cellShape& s);
         friend Ostream& operator<<(Ostream& os, const cellShape& s);
 };
 
 
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
index d9d92114f8..d8c737b7e9 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
@@ -115,9 +115,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const cellShape& s)
 
 
 template<>
-Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<cellShape>& iproxy
+)
 {
-    const cellShape& cs = ip.t_;
+    const auto& cs = *iproxy;
 
     if (isNull(cs.model()))
     {
@@ -125,7 +129,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
     }
     else
     {
-        os  << cs.model().info() << endl;
+        os  << cs.model().info() << nl;
     }
 
     os  << "\tGeom:\tpoint\tlabel\txyz\n";
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
index e6bf8960d1..a86b0d2beb 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
@@ -97,6 +97,9 @@ class mapDistributeBase;
 Istream& operator>>(Istream&, mapDistributeBase&);
 Ostream& operator<<(Ostream&, const mapDistributeBase&);
 
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<mapDistributeBase>&);
+
 
 /*---------------------------------------------------------------------------*\
                            Class mapDistributeBase Declaration
@@ -1031,8 +1034,9 @@ public:
 
     // IOstream Operators
 
-        //- Info proxy to print summary information to a stream
-        InfoProxy<mapDistributeBase> info() const
+        //- Return info proxy,
+        //- used to print summary information to a stream
+        InfoProxy<mapDistributeBase> info() const noexcept
         {
             return *this;
         }
@@ -1079,12 +1083,6 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<mapDistributeBase>& ip);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseIO.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseIO.C
index f04368a55c..be60fb8d75 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseIO.C
@@ -171,10 +171,10 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<mapDistributeBase>& ip
+    const InfoProxy<mapDistributeBase>& iproxy
 )
 {
-    const auto& map = ip.t_;
+    const auto& map = *iproxy;
 
     // Output as compact pseudo dictionary entries
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
index e1d1fc5253..4a132748ec 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
@@ -59,6 +59,9 @@ class mapDistributePolyMesh;
 Istream& operator>>(Istream&, mapDistributePolyMesh&);
 Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
 
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<mapDistributePolyMesh>&);
+
 
 /*---------------------------------------------------------------------------*\
                      Class mapDistributePolyMesh Declaration
@@ -308,8 +311,9 @@ public:
 
     // IOstream Operators
 
-        //- Info proxy to print summary information to a stream
-        InfoProxy<mapDistributePolyMesh> info() const
+        //- Return info proxy,
+        //- used to print summary information to a stream
+        InfoProxy<mapDistributePolyMesh> info() const noexcept
         {
             return *this;
         }
@@ -351,12 +355,6 @@ public:
 };
 
 
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<mapDistributePolyMesh>& ip);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMeshIO.C
index 50e1663f03..a3ee7783da 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMeshIO.C
@@ -187,10 +187,10 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<mapDistributePolyMesh>& ip
+    const InfoProxy<mapDistributePolyMesh>& iproxy
 )
 {
-    const auto& map = ip.t_;
+    const auto& map = *iproxy;
 
     os.beginBlock("cellMap");
     os.writeEntry("oldSize", map.nOldCells());
diff --git a/src/fileFormats/ensight/part/cells/ensightCells.H b/src/fileFormats/ensight/part/cells/ensightCells.H
index 928399f45e..ac64cd0d81 100644
--- a/src/fileFormats/ensight/part/cells/ensightCells.H
+++ b/src/fileFormats/ensight/part/cells/ensightCells.H
@@ -254,8 +254,9 @@ public:
 
     // Output
 
-        //- Return info proxy
-        InfoProxy<ensightCells> info() const { return *this; }
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<ensightCells> info() const noexcept { return *this; }
 
 
         //- Globally unique mesh points. Required when writing point fields.
@@ -281,6 +282,7 @@ public:
 };
 
 
+//- Print information via proxy
 template<>
 Ostream& operator<<(Ostream&, const InfoProxy<ensightCells>&);
 
diff --git a/src/fileFormats/ensight/part/cells/ensightCellsIO.C b/src/fileFormats/ensight/part/cells/ensightCellsIO.C
index 467a0b51e3..f45f70a417 100644
--- a/src/fileFormats/ensight/part/cells/ensightCellsIO.C
+++ b/src/fileFormats/ensight/part/cells/ensightCellsIO.C
@@ -336,10 +336,10 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<ensightCells>& ip
+    const InfoProxy<ensightCells>& iproxy
 )
 {
-    const ensightCells& part = ip.t_;
+    const auto& part = *iproxy;
 
     os << part.name().c_str();
 
diff --git a/src/fileFormats/ensight/part/faces/ensightFaces.H b/src/fileFormats/ensight/part/faces/ensightFaces.H
index 8b4cff2819..0243ba510e 100644
--- a/src/fileFormats/ensight/part/faces/ensightFaces.H
+++ b/src/fileFormats/ensight/part/faces/ensightFaces.H
@@ -247,8 +247,9 @@ public:
 
     // Output
 
-        //- Return info proxy
-        InfoProxy<ensightFaces> info() const { return *this; }
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<ensightFaces> info() const noexcept { return *this; }
 
 
         //- Globally unique mesh points.
@@ -274,6 +275,7 @@ public:
 };
 
 
+//- Print information via proxy
 template<>
 Ostream& operator<<(Ostream&, const InfoProxy<ensightFaces>&);
 
diff --git a/src/fileFormats/ensight/part/faces/ensightFacesIO.C b/src/fileFormats/ensight/part/faces/ensightFacesIO.C
index b23a5b9afa..66723c144e 100644
--- a/src/fileFormats/ensight/part/faces/ensightFacesIO.C
+++ b/src/fileFormats/ensight/part/faces/ensightFacesIO.C
@@ -141,10 +141,10 @@ template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<ensightFaces>& ip
+    const InfoProxy<ensightFaces>& iproxy
 )
 {
-    const ensightFaces& part = ip.t_;
+    const auto& part = *iproxy;
 
     os << part.name().c_str();
 
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
index ecdef223fa..5ddb6f5b23 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
@@ -508,10 +508,10 @@ Foam::Ostream& Foam::operator<<
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<wallBoundedParticle>& ip
+    const InfoProxy<wallBoundedParticle>& iproxy
 )
 {
-    const wallBoundedParticle& p = ip.t_;
+    const auto& p = *iproxy;
 
     tetPointRef tpr(p.currentTetIndices().tet(p.mesh()));
 
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
index 6fe5ff6bb7..9a49d00b16 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
@@ -260,25 +260,25 @@ public:
                 );
 
 
-        // Info
+    // Info
 
-            //- Return info proxy.
-            //  Used to print particle information to a stream
-            inline InfoProxy<wallBoundedParticle> info() const
-            {
-                return *this;
-            }
+        //- Return info proxy,
+        //- used to print particle information to a stream
+        InfoProxy<wallBoundedParticle> info() const noexcept
+        {
+            return *this;
+        }
 
 
-        // I-O
+    // I-O
 
-            //- Read
-            template<class CloudType>
-            static void readFields(CloudType&);
+        //- Read
+        template<class CloudType>
+        static void readFields(CloudType&);
 
-            //- Write
-            template<class CloudType>
-            static void writeFields(const CloudType&);
+        //- Write
+        template<class CloudType>
+        static void writeFields(const CloudType&);
 
 
     // Ostream Operator
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
index a5a66a23de..e54593589b 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -496,7 +496,7 @@ Foam::Ostream& Foam::operator<<
     const InfoProxy<blockDescriptor>& iproxy
 )
 {
-    const blockDescriptor& bd = iproxy.t_;
+    const auto& bd = *iproxy;
 
     os  << "Dimensions:" << bd.density()
         << " nPoints:" << bd.nPoints()
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index 9c04e352a6..da0a97906e 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -55,8 +55,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef blockDescriptor_H
-#define blockDescriptor_H
+#ifndef Foam_blockDescriptor_H
+#define Foam_blockDescriptor_H
 
 #include "ijkMesh.H"
 #include "cellShape.H"
@@ -72,6 +72,14 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
+class blockDescriptor;
+
+Ostream& operator<<(Ostream&, const blockDescriptor&);
+
+Ostream& operator<<(Ostream&, const InfoProxy<blockDescriptor>&);
+
+
 /*---------------------------------------------------------------------------*\
                        Class blockDescriptor Declaration
 \*---------------------------------------------------------------------------*/
@@ -261,21 +269,12 @@ public:
         //- Write block index with dictionary lookup
         static void write(Ostream&, const label blocki, const dictionary&);
 
-        //- Return info proxy
-        InfoProxy<blockDescriptor> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<blockDescriptor> info() const noexcept { return *this; }
 };
 
 
-//- Output Operator
-Ostream& operator<<(Ostream& os, const blockDescriptor& bd);
-
-//- Info output
-Ostream& operator<<(Ostream& os, const InfoProxy<blockDescriptor>& info);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/meshTools/coordSet/writers/common/coordSetWriter.C b/src/meshTools/coordSet/writers/common/coordSetWriter.C
index 35e53056b0..d3e7c5cae4 100644
--- a/src/meshTools/coordSet/writers/common/coordSetWriter.C
+++ b/src/meshTools/coordSet/writers/common/coordSetWriter.C
@@ -461,10 +461,10 @@ bool Foam::coordSetWriter::merge() const
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<coordSetWriter>& ip
+    const InfoProxy<coordSetWriter>& iproxy
 )
 {
-    const coordSetWriter& w = ip.t_;
+    const auto& w = *iproxy;
 
     os  << "coordSetWriter:"
         << " upToDate: " << w.upToDate_
diff --git a/src/meshTools/coordSet/writers/common/coordSetWriter.H b/src/meshTools/coordSet/writers/common/coordSetWriter.H
index 05b2f43170..f98cf887b1 100644
--- a/src/meshTools/coordSet/writers/common/coordSetWriter.H
+++ b/src/meshTools/coordSet/writers/common/coordSetWriter.H
@@ -538,7 +538,8 @@ public:
 
     // Other
 
-        //- Return info proxy.
+        //- Return info proxy,
+        //- used to print information to a stream
         virtual InfoProxy<coordSetWriter> info() const
         {
             return *this;
@@ -548,7 +549,7 @@ public:
         friend Ostream& operator<<
         (
             Ostream& os,
-            const InfoProxy<coordSetWriter>& ip
+            const InfoProxy<coordSetWriter>& iproxy
         );
 
 
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
index a8eb28fb10..ebb03bd03c 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
@@ -111,10 +111,10 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfaceLocation& sl)
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<surfaceLocation>& ip
+    const InfoProxy<surfaceLocation>& iproxy
 )
 {
-    const surfaceLocation& sl = ip.t_;
+    const auto& sl = *iproxy;
 
     os  << "coord:" << sl.point();
 
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H
index 6516da4fa0..d9ee0baa91 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.H
@@ -45,8 +45,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfaceLocation_H
-#define surfaceLocation_H
+#ifndef Foam_surfaceLocation_H
+#define Foam_surfaceLocation_H
 
 #include "pointIndexHit.H"
 #include "triangle.H"
@@ -63,8 +63,10 @@ class triSurface;
 
 Istream& operator>>(Istream&, surfaceLocation&);
 Ostream& operator<<(Ostream&, const surfaceLocation&);
+
 Ostream& operator<<(Ostream&, const InfoProxy<surfaceLocation>&);
 
+
 /*---------------------------------------------------------------------------*\
                        Class surfaceLocation Declaration
 \*---------------------------------------------------------------------------*/
@@ -139,11 +141,9 @@ public:
         //- Normal. Approximate for points.
         vector normal(const triSurface& s) const;
 
-        //- Return info proxy, to print information to a stream
-        InfoProxy<surfaceLocation> info() const
-        {
-            return *this;
-        }
+        //- Return info proxy,
+        //- to print information to a stream
+        InfoProxy<surfaceLocation> info() const noexcept { return *this; }
 
         //- Write info about selected face index to a stream
         void write(Ostream& os, const triSurface& s) const;
@@ -154,12 +154,6 @@ public:
         friend Istream& operator>>(Istream& is, surfaceLocation& sl);
 
         friend Ostream& operator<<(Ostream& os, const surfaceLocation& sl);
-
-        friend Ostream& operator<<
-        (
-            Ostream& os,
-            const InfoProxy<surfaceLocation>& ip
-        );
 };
 
 
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
index 5a05dd3332..37395777ed 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.C
@@ -741,16 +741,16 @@ void Foam::cellCellStencil::walkFront
 }
 
 
-// * * * * * * * * * * * * * Ostream operator  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * * //
 
 template<>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<cellCellStencil>& ic
+    const InfoProxy<cellCellStencil>& iproxy
 )
 {
-    const cellCellStencil& e = ic.t_;
+    const auto& e = *iproxy;
 
     const labelUList& cellTypes = e.cellTypes();
     const labelUList& interpolationCells = e.interpolationCells();
@@ -825,4 +825,5 @@ Foam::Ostream& Foam::operator<<
     return os;
 }
 
+
 // ************************************************************************* //
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
index b106addad8..8191a3df72 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
@@ -40,8 +40,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellCellStencil_H
-#define cellCellStencil_H
+#ifndef Foam_cellCellStencil_H
+#define Foam_cellCellStencil_H
 
 #include "scalarList.H"
 #include "mapDistribute.H"
@@ -53,8 +53,14 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
+class cellCellStencil;
 class mapDistribute;
 
+template<>
+Ostream& operator<<(Ostream&, const InfoProxy<cellCellStencil>&);
+
+
 /*---------------------------------------------------------------------------*\
                      Class cellCellStencil Declaration
 \*---------------------------------------------------------------------------*/
@@ -265,13 +271,6 @@ public:
         template<class GeoField, class SuppressBC>
         static void correctBoundaryConditions(GeoField& psi);
 
-        //- Return info proxy.
-        //- Used to print stencil information to a stream
-        InfoProxy<cellCellStencil> info() const
-        {
-            return *this;
-        }
-
         //- Surround holes with layer(s) of interpolated cells
         void walkFront
         (
@@ -310,10 +309,15 @@ public:
             bitSet& isFront,
             scalarField& fraction
         ) const;
+
+
+    // Write
+
+        //- Return info proxy,
+        //- used to print stencil information to a stream
+        InfoProxy<cellCellStencil> info() const noexcept { return *this; }
 };
 
-template<>
-Ostream& operator<<(Ostream& os, const InfoProxy<cellCellStencil>& ic);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/surfMesh/writers/common/surfaceWriter.C b/src/surfMesh/writers/common/surfaceWriter.C
index 74dea7f2c9..963aaa63c6 100644
--- a/src/surfMesh/writers/common/surfaceWriter.C
+++ b/src/surfMesh/writers/common/surfaceWriter.C
@@ -744,10 +744,10 @@ defineSurfaceFieldMethods(Foam::surfaceWriter, Foam::tensor)
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<surfaceWriter>& ip
+    const InfoProxy<surfaceWriter>& iproxy
 )
 {
-    const surfaceWriter& w = ip.t_;
+    const auto& w = *iproxy;
 
     os  << "surfaceWriter:"
         << " upToDate: " << w.upToDate_
diff --git a/src/surfMesh/writers/common/surfaceWriter.H b/src/surfMesh/writers/common/surfaceWriter.H
index ea3692cd41..94df1ee659 100644
--- a/src/surfMesh/writers/common/surfaceWriter.H
+++ b/src/surfMesh/writers/common/surfaceWriter.H
@@ -611,8 +611,9 @@ public:
 
     // Other IO
 
-        //- Return info proxy.
-        virtual InfoProxy<surfaceWriter> info() const
+        //- Return info proxy,
+        //- used to print information to a stream
+        virtual InfoProxy<surfaceWriter> info() const noexcept
         {
             return *this;
         }
@@ -621,7 +622,7 @@ public:
         friend Ostream& operator<<
         (
             Ostream& os,
-            const InfoProxy<surfaceWriter>& ip
+            const InfoProxy<surfaceWriter>& iproxy
         );
 
 

From 87cb811db29c4d01a0dbd5ef5af0859ee3ca35d2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 18 May 2023 18:53:40 +0200
Subject: [PATCH 241/348] COMP: fix library linkage (#2784), silence some
 unused variable warnings

---
 .../mesh/conversion/kivaToFoam/readKivaGrid.H |  8 ++---
 .../DelaunayMesh/DelaunayMeshIO.C             | 36 +++++++++----------
 .../DelaunayMesh/DistributedDelaunayMesh.C    |  4 +--
 .../cellShapeControl/cellShapeControl.C       | 28 +++++++--------
 .../controlMeshRefinement.C                   |  4 +--
 .../featurePointConformerSpecialisations.C    |  8 ++---
 .../foamToVTK/convertAreaFields.H             |  2 +-
 .../surfaceBooleanFeatures.C                  | 10 +++---
 .../surface/surfaceClean/collapseBase.C       |  4 +--
 src/conversion/starcd/STARCDMeshReader.C      |  3 +-
 src/fileFormats/vtk/part/foamVtuSizingImpl.C  |  4 +--
 .../cfdTools/general/MRF/MRFZone.C            |  8 ++---
 .../regionSizeDistribution.C                  |  6 ++--
 .../utilities/vtkWrite/vtkWriteImpl.C         |  2 --
 .../MGridGenGamgAgglomeration/Make/options    |  7 ++++
 .../pairPatchAgglomeration/Make/options       | 12 ++++---
 .../pairPatchAgglomeration.H                  |  4 +--
 .../displacementMotionSolverMeshMover.C       |  4 +--
 .../meshRefinement/meshRefinementBaffles.C    | 10 +++---
 .../meshRefinementProblemCells.C              | 28 +++++++--------
 .../refinementSurfaces/refinementSurfaces.C   |  4 +--
 .../extendedEdgeMesh/extendedEdgeMesh.C       |  8 ++---
 src/meshTools/regionSplit/localPointRegion.C  |  4 +--
 .../cellSources/regionToCell/regionToCell.C   |  9 +++--
 .../inverseDistanceCellCellStencil.C          |  4 +--
 .../oversetAdjustPhi/oversetAdjustPhi.C       |  4 +++
 src/overset/oversetFvMesh/oversetFvMeshBase.C | 21 ++++-------
 .../oversetFvMeshBaseTemplates.C              |  4 +--
 src/overset/regionsToCell/regionsToCell.C     | 10 +++---
 .../distributedTriSurfaceMesh.C               | 10 +++---
 .../exact/exactPatchDistMethod.C              |  4 +--
 31 files changed, 139 insertions(+), 135 deletions(-)

diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index ca08396837..3aabf9614a 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -42,7 +42,7 @@ for (label i=0; i<nPoints; i++)
 labelList i1tab(nPoints), i3tab(nPoints), i8tab(nPoints), idreg(nPoints),
       f(nPoints), bcl(nPoints), bcf(nPoints), bcb(nPoints);
 
-label nBfaces = 0;
+// label nBfaces = 0;
 
 for (label i=0; i<nPoints; i++)
 {
@@ -65,9 +65,9 @@ for (label i=0; i<nPoints; i++)
     bcf[i] = label(fbcf);
     bcb[i] = label(fbcb);
 
-    if (bcl[i] > 0 && bcl[i] != 4) nBfaces++;
-    if (bcf[i] > 0 && bcf[i] != 4) nBfaces++;
-    if (bcb[i] > 0 && bcb[i] != 4) nBfaces++;
+    // if (bcl[i] > 0 && bcl[i] != 4) ++nBfaces;
+    // if (bcf[i] > 0 && bcf[i] != 4) ++nBfaces;
+    // if (bcb[i] > 0 && bcb[i] != 4) ++nBfaces;
 }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 2dc3f59928..4f73231286 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -170,23 +170,23 @@ template<class Triangulation>
 void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
 {
     label nInternal = 0;
-    label nInternalRef = 0;
+    //label nInternalRef = 0;
     label nUnassigned = 0;
-    label nUnassignedRef = 0;
+    //label nUnassignedRef = 0;
     label nInternalNearBoundary = 0;
-    label nInternalNearBoundaryRef = 0;
+    //label nInternalNearBoundaryRef = 0;
     label nInternalSurface = 0;
-    label nInternalSurfaceRef = 0;
+    //label nInternalSurfaceRef = 0;
     label nInternalFeatureEdge = 0;
-    label nInternalFeatureEdgeRef = 0;
+    //label nInternalFeatureEdgeRef = 0;
     label nInternalFeaturePoint = 0;
-    label nInternalFeaturePointRef = 0;
+    //label nInternalFeaturePointRef = 0;
     label nExternalSurface = 0;
-    label nExternalSurfaceRef = 0;
+    //label nExternalSurfaceRef = 0;
     label nExternalFeatureEdge = 0;
-    label nExternalFeatureEdgeRef = 0;
+    //label nExternalFeatureEdgeRef = 0;
     label nExternalFeaturePoint = 0;
-    label nExternalFeaturePointRef = 0;
+    //label nExternalFeaturePointRef = 0;
     label nFar = 0;
     label nReferred = 0;
 
@@ -202,7 +202,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nInternalRef++;
+                //++nInternalRef;
             }
 
             nInternal++;
@@ -212,7 +212,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nUnassignedRef++;
+                //++nUnassignedRef;
             }
 
             nUnassigned++;
@@ -222,7 +222,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nInternalNearBoundaryRef++;
+                //++nInternalNearBoundaryRef;
             }
 
             nInternalNearBoundary++;
@@ -232,7 +232,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nInternalSurfaceRef++;
+                //++nInternalSurfaceRef;
             }
 
             nInternalSurface++;
@@ -242,7 +242,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nInternalFeatureEdgeRef++;
+                //++nInternalFeatureEdgeRef;
             }
 
             nInternalFeatureEdge++;
@@ -252,7 +252,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nInternalFeaturePointRef++;
+                //++nInternalFeaturePointRef;
             }
 
             nInternalFeaturePoint++;
@@ -262,7 +262,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nExternalSurfaceRef++;
+                //++nExternalSurfaceRef;
             }
 
             nExternalSurface++;
@@ -272,7 +272,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nExternalFeatureEdgeRef++;
+                //++nExternalFeatureEdgeRef;
             }
 
             nExternalFeatureEdge++;
@@ -282,7 +282,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
             if (vit->referred())
             {
                 nReferred++;
-                nExternalFeaturePointRef++;
+                //++nExternalFeaturePointRef;
             }
 
             nExternalFeaturePoint++;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 01c14c7060..2c50d6c462 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -853,7 +853,7 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
     typename Triangulation::Locate_type lt;
     int li, lj;
 
-    label nNotInserted = 0;
+    //label nNotInserted = 0;
 
     labelPairHashSet uninserted
     (
@@ -979,7 +979,7 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
         else
         {
             uninserted.insert(labelPair(vert.procIndex(), vert.index()));
-            nNotInserted++;
+            //++nNotInserted;
         }
     }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index 8b5d394e19..cb7a6208c6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -104,7 +104,7 @@ Foam::scalar Foam::cellShapeControl::cellSize(const point& pt) const
     }
     else if (shapeControlMesh_.is_infinite(ch))
     {
-//        if (nFarPoints != 0)
+//        if (nFarPoints)
 //        {
 //            for (label pI = 0; pI < 4; ++pI)
 //            {
@@ -136,11 +136,11 @@ Foam::scalar Foam::cellShapeControl::cellSize(const point& pt) const
         {
             if (ch->vertex(pI)->farPoint())
             {
-                nFarPoints++;
+                ++nFarPoints;
             }
         }
 
-        if (nFarPoints != 0)
+        if (nFarPoints)
         {
             for (label pI = 0; pI < 4; ++pI)
             {
@@ -179,16 +179,16 @@ Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
     }
     else
     {
-        label nFarPoints = 0;
-        for (label pI = 0; pI < 4; ++pI)
-        {
-            if (ch->vertex(pI)->farPoint())
-            {
-                nFarPoints++;
-            }
-        }
+        // label nFarPoints = 0;
+        // for (label pI = 0; pI < 4; ++pI)
+        // {
+        //     if (ch->vertex(pI)->farPoint())
+        //     {
+        //         ++nFarPoints;
+        //     }
+        // }
 
-//        if (nFarPoints != 0)
+//        if (nFarPoints)
 //        {
 //            for (label pI = 0; pI < 4; ++pI)
 //            {
@@ -259,11 +259,11 @@ void Foam::cellShapeControl::cellSizeAndAlignment
         {
             if (ch->vertex(pI)->farPoint())
             {
-                nFarPoints++;
+                ++nFarPoints;
             }
         }
 
-        if (nFarPoints != 0)
+        if (nFarPoints)
         {
             for (label pI = 0; pI < 4; ++pI)
             {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
index 313a039a7b..3aee2b3433 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
@@ -82,11 +82,11 @@ bool Foam::controlMeshRefinement::detectEdge
 
     Foam::point midPoint = (a + b)/2.0;
 
-    label nIterations = 0;
+    //label nIterations = 0;
 
     while (true)
     {
-        nIterations++;
+        //++nIterations;
 
         if
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index bd274824f3..3f8d6f104a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -74,7 +74,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
             return false;
         }
 
-        label nVert = foamyHexMesh_.number_of_vertices();
+        //label nVert = foamyHexMesh_.number_of_vertices();
 
         const label initialNumOfPoints = pts.size();
 
@@ -267,7 +267,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
 
                 // Remove points that have just been added before returning
                 pts.pop_back(2);
-                nVert -= 2;
+                //nVert -= 2;
 
                 return false;
             }
@@ -503,7 +503,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
             return false;
         }
 
-        label nVert = foamyHexMesh_.number_of_vertices();
+        //label nVert = foamyHexMesh_.number_of_vertices();
 
         const label initialNumOfPoints = pts.size();
 
@@ -700,7 +700,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
 
                 // Remove points that have just been added before returning
                 pts.pop_back(2);
-                nVert -= 2;
+                //nVert -= 2;
 
                 return false;
             }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
index bdfe96ceb5..7d8f467ab7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertAreaFields.H
@@ -81,7 +81,7 @@ if (doFiniteArea)
 
             labelList patchIds
             (
-                areaMesh.mesh().boundaryMesh().patchID(areaMesh.faceLabels())
+                pbm.patchID(areaMesh.faceLabels())
             );
 
             writer.writeCellData("patchID", patchIds);
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 5cc5d909e5..b7f2715b25 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -1408,7 +1408,7 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
     label nIntOrExt = 0;
     label nFlat = 0;
     label nOpen = 0;
-    label nMultiple = 0;
+    // label nMultiple = 0;
 
     forAll(edgeNormals, eI)
     {
@@ -1432,10 +1432,10 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
                 nIntOrExt++;
             }
         }
-        else if (nEdNorms > 2)
-        {
-            nMultiple++;
-        }
+        // else if (nEdNorms > 2)
+        // {
+        //     ++nMultiple;
+        // }
     }
 
     if (action == booleanSurface::UNION)
diff --git a/applications/utilities/surface/surfaceClean/collapseBase.C b/applications/utilities/surface/surfaceClean/collapseBase.C
index 5c5572c23b..7ba52a0010 100644
--- a/applications/utilities/surface/surfaceClean/collapseBase.C
+++ b/applications/utilities/surface/surfaceClean/collapseBase.C
@@ -775,7 +775,7 @@ label collapseBase
 {
     label nTotalSplit = 0;
 
-    label iter = 0;
+    // label iter = 0;
 
     while (true)
     {
@@ -980,7 +980,7 @@ label collapseBase
         //    surf.write(fName);
         //}
 
-        iter++;
+        // ++iter;
     }
 
     // Remove any unused vertices
diff --git a/src/conversion/starcd/STARCDMeshReader.C b/src/conversion/starcd/STARCDMeshReader.C
index b17252ac7d..d69fcdc46a 100644
--- a/src/conversion/starcd/STARCDMeshReader.C
+++ b/src/conversion/starcd/STARCDMeshReader.C
@@ -697,7 +697,8 @@ void Foam::fileFormats::STARCDMeshReader::readBoundary
     // keep empty patch region in reserve
     ++nPatches;
     Info<< "Number of patches = " << nPatches
-        << " (including extra for missing)" << endl;
+        << " (including extra for missing) with "
+        << nFaces << " faces" << endl;
 
     // resize
     origRegion.setSize(nPatches);
diff --git a/src/fileFormats/vtk/part/foamVtuSizingImpl.C b/src/fileFormats/vtk/part/foamVtuSizingImpl.C
index ea83469251..b1d763d2c4 100644
--- a/src/fileFormats/vtk/part/foamVtuSizingImpl.C
+++ b/src/fileFormats/vtk/part/foamVtuSizingImpl.C
@@ -756,7 +756,7 @@ void Foam::vtk::vtuSizing::populateArrays
 
     const label nInputCells = shapes.size();
 
-    label nIgnored = 0;
+    // label nIgnored = 0;
 
     for
     (
@@ -852,7 +852,7 @@ void Foam::vtk::vtuSizing::populateArrays
             // Silent here.
             // - already complained (and skipped) during initial sizing
             --cellIndex;
-            ++nIgnored;
+            // ++nIgnored;
         }
     }
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 90e91ede07..4244ee7f79 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -75,14 +75,14 @@ void Foam::MRFZone::setMRFFaces()
     }
 
 
-    label nZoneFaces = 0;
+    // label nZoneFaces = 0;
 
     for (label facei = 0; facei < mesh_.nInternalFaces(); facei++)
     {
         if (zoneCell[own[facei]] || zoneCell[nei[facei]])
         {
             faceType[facei] = 1;
-            nZoneFaces++;
+            // ++nZoneFaces;
         }
     }
 
@@ -102,7 +102,7 @@ void Foam::MRFZone::setMRFFaces()
                 if (zoneCell[own[facei]])
                 {
                     faceType[facei] = 2;
-                    nZoneFaces++;
+                    // ++nZoneFaces;
                 }
             }
         }
@@ -115,7 +115,7 @@ void Foam::MRFZone::setMRFFaces()
                 if (zoneCell[own[facei]])
                 {
                     faceType[facei] = 1;
-                    nZoneFaces++;
+                    // ++nZoneFaces;
                 }
             }
         }
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 3b55fda4d5..ebdf67cf78 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -474,7 +474,7 @@ bool Foam::functionObjects::regionSizeDistribution::write()
 
     // Determine blocked faces
     boolList blockedFace(mesh_.nFaces(), false);
-    label nBlocked = 0;
+    // label nBlocked = 0;
 
     {
         for (label facei = 0; facei < mesh_.nInternalFaces(); facei++)
@@ -489,7 +489,7 @@ bool Foam::functionObjects::regionSizeDistribution::write()
             )
             {
                 blockedFace[facei] = true;
-                nBlocked++;
+                // ++nBlocked;
             }
         }
 
@@ -518,7 +518,7 @@ bool Foam::functionObjects::regionSizeDistribution::write()
                     )
                     {
                         blockedFace[start+i] = true;
-                        nBlocked++;
+                        // ++nBlocked;
                     }
                 }
             }
diff --git a/src/functionObjects/utilities/vtkWrite/vtkWriteImpl.C b/src/functionObjects/utilities/vtkWrite/vtkWriteImpl.C
index 450cd6fcef..66400af4be 100644
--- a/src/functionObjects/utilities/vtkWrite/vtkWriteImpl.C
+++ b/src/functionObjects/utilities/vtkWrite/vtkWriteImpl.C
@@ -58,12 +58,10 @@ Foam::label Foam::functionObjects::vtkWrite::writeVolFieldsImpl
         }
 
         // Boundary
-        label writeri = 0;
         for (vtk::patchWriter& writer : patchWriters)
         {
             ok = true;
             writer.write(field);
-            ++writeri;
         }
 
         if (ok)
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
index 7fd6b0ae76..a64d63749e 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
@@ -1,6 +1,13 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(MGRIDGEN_INC_DIR)
 
 LIB_LIBS = \
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools \
+    -lfiniteVolume \
     -L$(MGRIDGEN_LIB_DIR) -lmgrid
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
index 7063a63df5..440b98532e 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
@@ -1,9 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
-    -lOpenFOAM \
-    -lfiniteVolume \
-    -lmeshTools
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools \
+    -lfiniteVolume
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
index ac564b2b91..9733c48f8f 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pairPatchAgglomeration_H
-#define pairPatchAgglomeration_H
+#ifndef Foam_pairPatchAgglomeration_H
+#define Foam_pairPatchAgglomeration_H
 
 #include "mathematicalConstants.H"
 #include "indirectPrimitivePatch.H"
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
index 070d73e2c7..89d08776ed 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
@@ -275,13 +275,13 @@ bool Foam::displacementMotionSolverMeshMover::move
         );
 
 
-        scalar resid = 0;
+        // scalar resid = 0;
 
         forAll(displacement, patchPointI)
         {
             const label pointI(adaptPatchPtr_().meshPoints()[patchPointI]);
 
-            resid += mag(pointDisplacement()[pointI]-displacement[patchPointI]);
+            // resid += mag(pointDisplacement()[pointI]-displacement[patchPointI]);
 
             pointDisplacement()[pointI] = displacement[patchPointI];
         }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index c36580ced6..781dd60d09 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -3941,14 +3941,14 @@ Foam::label Foam::meshRefinement::markPatchZones
 
     // Protect all non-manifold edges
     {
-        label nProtected = 0;
+        // label nProtected = 0;
 
         forAll(nMasterFacesPerEdge, edgeI)
         {
             if (nMasterFacesPerEdge[edgeI] > 2)
             {
                 allEdgeInfo[edgeI] = edgeTopoDistanceData<label>(0, -2);
-                nProtected++;
+                // ++nProtected;
             }
         }
         //Info<< "Protected from visiting "
@@ -4097,7 +4097,7 @@ void Foam::meshRefinement::consistentOrientation
     // - slaves of coupled faces
     // - non-manifold edges
     {
-        label nProtected = 0;
+        // label nProtected = 0;
 
         forAll(patch.addressing(), faceI)
         {
@@ -4113,7 +4113,7 @@ void Foam::meshRefinement::consistentOrientation
             {
                 // Slave side. Mark so doesn't get visited.
                 allFaceInfo[faceI] = orientedSurface::NOFLIP;
-                nProtected++;
+                // ++nProtected;
             }
         }
         //Info<< "Protected from visiting "
@@ -4128,7 +4128,7 @@ void Foam::meshRefinement::consistentOrientation
             if (nMasterFacesPerEdge[edgeI] > 2)
             {
                 allEdgeInfo[edgeI] = orientedSurface::NOFLIP;
-                nProtected++;
+                ++nProtected;
             }
         }
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index 48f333495a..0c1c50ba69 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -655,7 +655,7 @@ void Foam::meshRefinement::markFacesOnProblemCells
         // Get number of anchor points (pointLevel <= cellLevel)
 
         label nBoundaryAnchors = 0;
-        label nNonAnchorBoundary = 0;
+        // label nNonAnchorBoundary = 0;
         label nonBoundaryAnchor = -1;
 
         for (const label pointi : cPoints)
@@ -673,10 +673,10 @@ void Foam::meshRefinement::markFacesOnProblemCells
                     nonBoundaryAnchor = pointi;
                 }
             }
-            else if (isBoundaryPoint[pointi])
-            {
-                nNonAnchorBoundary++;
-            }
+            // else if (isBoundaryPoint[pointi])
+            // {
+            //     ++nNonAnchorBoundary;
+            // }
         }
 
         if (nBoundaryAnchors == 8)
@@ -684,15 +684,15 @@ void Foam::meshRefinement::markFacesOnProblemCells
             const cell& cFaces = mesh_.cells()[celli];
 
             // Count boundary faces.
-            label nBfaces = 0;
-
-            forAll(cFaces, cFacei)
-            {
-                if (isBoundaryFace[cFaces[cFacei]])
-                {
-                    nBfaces++;
-                }
-            }
+            // label nBfaces = 0;
+            //
+            // forAll(cFaces, cFacei)
+            // {
+            //     if (isBoundaryFace[cFaces[cFacei]])
+            //     {
+            //         ++nBfaces;
+            //     }
+            // }
 
             // If nBfaces > 1 make all non-boundary non-baffle faces baffles.
             // We assume that this situation is where there is a single
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 29c101a33c..8c31035de5 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -64,13 +64,13 @@ Foam::labelList Foam::refinementSurfaces::findHigherLevel
         // 3. uncached : use region 0 value
 
         DynamicList<label> retestSet;
-        label nHits = 0;
+        // label nHits = 0;
 
         forAll(intersectionInfo, i)
         {
             if (intersectionInfo[i].hit())
             {
-                nHits++;
+                // ++nHits;
 
                 // Check if minLevelField for this surface.
                 if (minLevelField.size())
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index f65587e9f7..4b71f44950 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -2109,7 +2109,7 @@ void Foam::extendedEdgeMesh::sortedOrder
     label nConvex = 0;
     label nConcave = 0;
     label nMixed = 0;
-    label nNonFeat = 0;
+    // label nNonFeat = 0;
 
     forAll(pointStat, pointI)
     {
@@ -2128,7 +2128,7 @@ void Foam::extendedEdgeMesh::sortedOrder
             break;
 
             case extendedEdgeMesh::NONFEATURE:
-                nNonFeat++;
+                // ++nNonFeat;
             break;
 
             default:
@@ -2179,7 +2179,7 @@ void Foam::extendedEdgeMesh::sortedOrder
     label nInternal = 0;
     label nFlat = 0;
     label nOpen = 0;
-    label nMultiple = 0;
+    // label nMultiple = 0;
 
     forAll(edgeStat, edgeI)
     {
@@ -2202,7 +2202,7 @@ void Foam::extendedEdgeMesh::sortedOrder
             break;
 
             case extendedEdgeMesh::MULTIPLE:
-                nMultiple++;
+                // ++nMultiple;
             break;
 
             case extendedEdgeMesh::NONE:
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index 36e8eaadce..02d2e8aea3 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -554,7 +554,7 @@ Foam::labelList Foam::localPointRegion::findDuplicateFaces
     );
 
     labelList duplicateFace(allPatch.size(), -1);
-    label nDuplicateFaces = 0;
+    // label nDuplicateFaces = 0;
 
     // Find all duplicate faces.
     forAll(allPatch, bFacei)
@@ -611,7 +611,7 @@ Foam::labelList Foam::localPointRegion::findDuplicateFaces
 
                     duplicateFace[bFacei] = otherFacei;
                     duplicateFace[otherFacei] = bFacei;
-                    nDuplicateFaces++;
+                    // ++nDuplicateFaces;
                 }
             }
         }
diff --git a/src/meshTools/topoSet/cellSources/regionToCell/regionToCell.C b/src/meshTools/topoSet/cellSources/regionToCell/regionToCell.C
index 45d6c98709..0089668c73 100644
--- a/src/meshTools/topoSet/cellSources/regionToCell/regionToCell.C
+++ b/src/meshTools/topoSet/cellSources/regionToCell/regionToCell.C
@@ -232,14 +232,13 @@ void Foam::regionToCell::shrinkRegions
                 if (selectedCell[celli])
                 {
                     selectedCell[celli] = false;
-                    nChanged++;
+                    ++nChanged;
                 }
             }
         }
     }
     Info<< "    Eroded "
-        << returnReduce(nChanged, sumOp<label>())
-        << " cells." << endl;
+        << returnReduce(nChanged, sumOp<label>()) << " cells." << endl;
 }
 
 
@@ -308,7 +307,7 @@ void Foam::regionToCell::erode
 
         // Select all cells using these points
 
-        label nChanged = 0;
+        // label nChanged = 0;
         forAll(boundaryPoint, pointi)
         {
             if (boundaryPoint[pointi])
@@ -320,7 +319,7 @@ void Foam::regionToCell::erode
                     if (!removeCell[celli])
                     {
                         removeCell[celli] = true;
-                        nChanged++;
+                        // ++nChanged;
                     }
                 }
             }
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index a6eeba364a..530b5ac215 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -1166,14 +1166,14 @@ void Foam::cellCellStencils::inverseDistance::findHoles
 
 
     // See which regions have not been visited (regionType == 1)
-    label count = 0;
+    // label count = 0;
     forAll(cellRegion, cellI)
     {
         label type = regionType[cellRegion[cellI]];
         if (type == 1 && cellTypes[cellI] != HOLE)
         {
             cellTypes[cellI] = HOLE;
-            count++;
+            // ++count;
         }
     }
 }
diff --git a/src/overset/oversetAdjustPhi/oversetAdjustPhi.C b/src/overset/oversetAdjustPhi/oversetAdjustPhi.C
index d25999f620..4b858ab40c 100644
--- a/src/overset/oversetAdjustPhi/oversetAdjustPhi.C
+++ b/src/overset/oversetAdjustPhi/oversetAdjustPhi.C
@@ -244,6 +244,7 @@ bool Foam::oversetAdjustPhi
 
 
     // Check correction
+    #ifdef FULLDEBUG
     if (fv::debug)
     {
         scalar massOutCheck = 0;
@@ -287,7 +288,10 @@ bool Foam::oversetAdjustPhi
                 }
             }
         }
+
+        Info<< "mass in:" << massInCheck << " out:" << massOutCheck << nl;
     }
+    #endif  /* FULLDEBUG */
 
     return true;
 }
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.C b/src/overset/oversetFvMesh/oversetFvMeshBase.C
index 8182a1f927..bdf08b1fbb 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.C
@@ -372,8 +372,7 @@ Foam::scalar Foam::oversetFvMeshBase::cellAverage
     const cell& cFaces = mesh_.cells()[celli];
 
     scalar avg = 0.0;
-    label n = 0;
-    label nFront = 0;
+    label nTotal = 0;
     for (const label facei : cFaces)
     {
         if (mesh_.isInternalFace(facei))
@@ -382,38 +381,32 @@ Foam::scalar Foam::oversetFvMeshBase::cellAverage
             if (norm[nbrCelli] == -GREAT)
             {
                 // Invalid neighbour. Add to front
-                if (isFront.set(facei))
-                {
-                    nFront++;
-                }
+                isFront.set(facei);
             }
             else
             {
                 // Valid neighbour. Add to average
                 avg += norm[nbrCelli];
-                n++;
+                ++nTotal;
             }
         }
         else
         {
             if (nbrNorm[facei-mesh_.nInternalFaces()] == -GREAT)
             {
-                if (isFront.set(facei))
-                {
-                    nFront++;
-                }
+                isFront.set(facei);
             }
             else
             {
                 avg += nbrNorm[facei-mesh_.nInternalFaces()];
-                n++;
+                ++nTotal;
             }
         }
     }
 
-    if (n > 0)
+    if (nTotal)
     {
-        return avg/n;
+        return avg/nTotal;
     }
     else
     {
diff --git a/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C b/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C
index 4805fec67e..faa741cafe 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBaseTemplates.C
@@ -165,14 +165,14 @@ Foam::tmp<Foam::scalarField> Foam::oversetFvMeshBase::normalisation
         const cellCellStencilObject& overlap = Stencil::New(mesh_);
         const labelUList& types = overlap.cellTypes();
 
-        label nHoles = 0;
+        // label nHoles = 0;
         scalarField extrapolatedNorm(norm);
         forAll(types, celli)
         {
             if (types[celli] == cellCellStencil::HOLE)
             {
                 extrapolatedNorm[celli] = -GREAT;
-                nHoles++;
+                // ++nHoles;
             }
         }
 
diff --git a/src/overset/regionsToCell/regionsToCell.C b/src/overset/regionsToCell/regionsToCell.C
index b3e71e810f..996743d394 100644
--- a/src/overset/regionsToCell/regionsToCell.C
+++ b/src/overset/regionsToCell/regionsToCell.C
@@ -261,13 +261,13 @@ void Foam::regionsToCell::shrinkRegions
                 if (selectedCell[cellI])
                 {
                     selectedCell[cellI] = false;
-                    nChanged++;
+                    ++nChanged;
                 }
             }
         }
     }
-    Info<< "    Eroded " << returnReduce(nChanged, sumOp<label>())
-        << " cells." << endl;
+    Info<< "    Eroded "
+        << returnReduce(nChanged, sumOp<label>()) << " cells." << endl;
 }
 
 
@@ -338,7 +338,7 @@ void Foam::regionsToCell::erode
 
         // Select all cells using these points
 
-        label nChanged = 0;
+        // label nChanged = 0;
         forAll(boundaryPoint, pointI)
         {
             if (boundaryPoint[pointI])
@@ -350,7 +350,7 @@ void Foam::regionsToCell::erode
                     if (!removeCell[cellI])
                     {
                         removeCell[cellI] = true;
-                        nChanged++;
+                        // ++nChanged;
                     }
                 }
             }
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index c338498f01..1c77ad3f96 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -3297,7 +3297,7 @@ void Foam::distributedTriSurfaceMesh::findNearest
         // Work array - whether processor bb overlaps the bounding sphere.
         boolList procBbOverlaps(Pstream::nProcs());
 
-        label nFound = 0;
+        // label nFound = 0;
 
         forAll(nearestInfo, samplei)
         {
@@ -3305,10 +3305,10 @@ void Foam::distributedTriSurfaceMesh::findNearest
             const nearestAndDist& ni = nearestInfo[samplei];
             const pointIndexHit& info = ni.first();
 
-            if (info.hit())
-            {
-                nFound++;
-            }
+            // if (info.hit())
+            // {
+            //     nFound++;
+            // }
 
             scalar d2 =
             (
diff --git a/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C b/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C
index 991a43b162..73fe2e15fe 100644
--- a/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C
+++ b/src/parallel/distributed/patchDistMethods/exact/exactPatchDistMethod.C
@@ -170,14 +170,14 @@ bool Foam::patchDistMethods::exact::correct
     );
 
     // Take over hits
-    label nHits = 0;
+    // label nHits = 0;
     forAll(info, celli)
     {
         if (info[celli].hit())
         {
             const point& cc = mesh_.cellCentres()[celli];
             y[celli] = info[celli].point().dist(cc);
-            nHits++;
+            // ++nHits;
         }
         //else
         //{

From bdd384c767d32e93529a5bb144104b88ab359f28 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 May 2023 16:09:08 +0200
Subject: [PATCH 242/348] ENH: reset headerClassName within typeHeaderOk

- ensures that read failures can be properly detected

COMP: include refPtr.H instead of autoPtr.H in IOobject.H

- ensures inclusion of autoPtr/refPtr/tmp/stdFoam

ENH: add IOobject::resetHeader() method

- when re-using an IOobject for repeated read operations it enforces
  resetting of headerClassName, scalar/label sizes etc prior to
  reading. Permits convenient resetting of the name too (optional).

  Example,

      IOobject rio("none", ..., IOobject::LAZY_READ);

      rio.resetHeader("U")
      if (returnReduceOr(rio.typeHeaderOk<volVectorField>(false)))
          ...

      io.resetHeader("p")
      if (returnReduceOr(rio.typeHeaderOk<volScalarField>(false)))
         ...
---
 src/OpenFOAM/db/IOobject/IOobject.C                | 14 ++++++++++++++
 src/OpenFOAM/db/IOobject/IOobject.H                |  9 +++++++--
 src/OpenFOAM/db/IOobject/IOobjectTemplates.C       | 11 +++++++----
 src/OpenFOAM/db/IOobjects/IOField/IOField.H        |  1 -
 src/OpenFOAM/db/IOobjects/IOList/IOList.H          |  1 -
 src/OpenFOAM/db/regIOobject/regIOobject.H          |  6 +-----
 .../mapDistribute/IOmapDistributePolyMesh.H        |  1 -
 7 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 191fa68e6c..4fb2ae1e39 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -551,6 +551,20 @@ void Foam::IOobject::setBad(const string& s)
 }
 
 
+void Foam::IOobject::resetHeader(const word& newName)
+{
+    if (!newName.empty())
+    {
+        name_ = newName;
+    }
+    objState_ = objectState::GOOD;
+    sizeofLabel_ = static_cast<unsigned char>(sizeof(label));
+    sizeofScalar_ = static_cast<unsigned char>(sizeof(scalar));
+    headerClassName_.clear();
+    note_.clear();
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::IOobject::operator=(const IOobject& io)
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 6510da3c78..7ff2b2a724 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -45,7 +45,7 @@ Description
         Object must be read from Istream on construction. \n
         Error if Istream does not exist or cannot be read.
         Does not check timestamp or re-read.
-      - \par MUST_READ_IF_MODIFIED
+      - \par READ_MODIFIED (MUST_READ_IF_MODIFIED)
         Object must be read from Istream on construction. \n
         Error if Istream does not exist or cannot be read. If object is
         registered its timestamp will be checked every timestep and possibly
@@ -100,7 +100,7 @@ SourceFiles
 
 #include "fileName.H"
 #include "typeInfo.H"
-#include "autoPtr.H"
+#include "refPtr.H"  // For autoPtr, refPtr, tmp, stdFoam
 #include "Enum.H"
 #include "InfoProxy.H"
 #include "IOobjectOption.H"
@@ -497,6 +497,11 @@ public:
         //- The sizeof (scalar) in bytes, possibly read from the header
         inline unsigned scalarByteSize() const noexcept;
 
+        //- Clear various bits (headerClassName, note, sizeof...)
+        //- that would be obtained when reading from a file.
+        //  \param newName if non-null, optionally rename the IOobject
+        void resetHeader(const word& newName = word::null);
+
 
     // Checks
 
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
index 444d219dc5..d8218133bf 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,6 +42,9 @@ bool Foam::IOobject::typeHeaderOk
     const bool verbose
 )
 {
+    // Mark as not yet read. cf, IOobject::readHeader()
+    headerClassName_.clear();
+
     // Everyone check or just master
     const bool masterOnly
     (
@@ -58,7 +61,7 @@ bool Foam::IOobject::typeHeaderOk
     bool ok = false;
     fileName fName;
 
-    if (!masterOnly || Pstream::master())
+    if (!masterOnly || UPstream::master())
     {
         fName = typeFilePath<Type>(*this, search);
         ok = fp.readHeader(*this, fName, Type::typeName);
@@ -89,11 +92,11 @@ bool Foam::IOobject::typeHeaderOk
 template<class Type>
 void Foam::IOobject::warnNoRereading() const
 {
-    if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    if (readOpt() == IOobjectOption::READ_MODIFIED)
     {
         WarningInFunction
             << Type::typeName << ' ' << name()
-            << " constructed with MUST_READ_IF_MODIFIED but "
+            << " constructed with READ_MODIFIED but "
             << Type::typeName << " does not support automatic rereading."
             << endl;
     }
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index 3132244c2b..4956086238 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -40,7 +40,6 @@ SourceFiles
 
 #include "Field.H"
 #include "regIOobject.H"
-#include "refPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index d621655476..1f30fc4863 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -40,7 +40,6 @@ SourceFiles
 
 #include "List.H"
 #include "regIOobject.H"
-#include "refPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index ea84d29dc3..48553c2400 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -42,10 +42,6 @@ SourceFiles
 #define Foam_regIOobject_H
 
 #include "IOobject.H"
-#include "refPtr.H"
-#include "tmp.H"
-#include "typeInfo.H"
-#include "stdFoam.H"
 #include "OSspecific.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,8 +51,8 @@ namespace Foam
 {
 
 // Forward Declarations
-
 class dictionary;
+class regIOobject;
 
 namespace functionEntries
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
index a3afb0f245..5dd4a45b11 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistributePolyMesh.H
@@ -42,7 +42,6 @@ SourceFiles
 
 #include "mapDistributePolyMesh.H"
 #include "regIOobject.H"
-#include "refPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From f41d1879b9d65d65aa72640b7413a6f853a00749 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2023 10:08:17 +0200
Subject: [PATCH 243/348] STYLE: prefer isHeaderClass<Type>() check instead of
 Type::typeName

- use typeHeaderOk<regIOobject>(false) for some generic file existence
  checks. Often had something like labelIOField as a placeholder, but
  that may be construed to have a particular something.
---
 .../foamFormatConvert/foamFormatConvert.C     | 52 +++++++++---------
 .../helpBoundary/helpBoundaryTemplates.C      | 10 ++--
 .../patchSummary/patchSummaryTemplates.C      |  2 +-
 .../steadyParticleTracks.C                    | 12 ++---
 .../lumpedPointForces/lumpedPointForces.C     |  4 +-
 .../setExprBoundaryFields/readFields.H        |  5 +-
 .../preProcessing/setExprFields/readFields.H  |  5 +-
 .../setExprFields/setExprFields.C             |  3 +-
 src/OpenFOAM/db/IOobjectList/IOobjectList.C   |  3 +-
 .../expressions/base/fvExprDriverIO.C         |  2 +-
 .../field/expressions/fvExpressionField.C     |  3 +-
 .../field/readFields/readFields.C             |  3 +-
 .../field/readFields/readFieldsTemplates.C    |  4 +-
 src/lagrangian/basic/Cloud/CloudIO.C          |  2 +-
 .../tools/lumpedPointTools.C                  | 54 ++++++++++---------
 15 files changed, 80 insertions(+), 84 deletions(-)

diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index e95503d021..443d4d32d8 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -218,7 +218,7 @@ bool writeOptionalMeshObject
     );
 
     bool writeOk = false;
-    const bool haveFile = io.typeHeaderOk<IOField<label>>(false);
+    const bool haveFile = io.typeHeaderOk<regIOobject>(false);
 
     // Make sure all know if there is a valid class name
     wordList classNames(1, io.headerClassName());
@@ -375,41 +375,41 @@ int main(int argc, char *argv[])
 
         forAllConstIters(objects, iter)
         {
-            const word& headerClassName = (*iter)->headerClassName();
+            const IOobject& io = *(iter.val());
 
             if
             (
-                headerClassName == volScalarField::typeName
-             || headerClassName == volVectorField::typeName
-             || headerClassName == volSphericalTensorField::typeName
-             || headerClassName == volSymmTensorField::typeName
-             || headerClassName == volTensorField::typeName
+                io.isHeaderClass<volScalarField>()
+             || io.isHeaderClass<volVectorField>()
+             || io.isHeaderClass<volSphericalTensorField>()
+             || io.isHeaderClass<volSymmTensorField>()
+             || io.isHeaderClass<volTensorField>()
 
-             || headerClassName == surfaceScalarField::typeName
-             || headerClassName == surfaceVectorField::typeName
-             || headerClassName == surfaceSphericalTensorField::typeName
-             || headerClassName == surfaceSymmTensorField::typeName
-             || headerClassName == surfaceTensorField::typeName
+             || io.isHeaderClass<surfaceScalarField>()
+             || io.isHeaderClass<surfaceVectorField>()
+             || io.isHeaderClass<surfaceSphericalTensorField>()
+             || io.isHeaderClass<surfaceSymmTensorField>()
+             || io.isHeaderClass<surfaceTensorField>()
 
-             || headerClassName == pointScalarField::typeName
-             || headerClassName == pointVectorField::typeName
-             || headerClassName == pointSphericalTensorField::typeName
-             || headerClassName == pointSymmTensorField::typeName
-             || headerClassName == pointTensorField::typeName
+             || io.isHeaderClass<pointScalarField>()
+             || io.isHeaderClass<pointVectorField>()
+             || io.isHeaderClass<pointSphericalTensorField>()
+             || io.isHeaderClass<pointSymmTensorField>()
+             || io.isHeaderClass<pointTensorField>()
 
-             || headerClassName == volScalarField::Internal::typeName
-             || headerClassName == volVectorField::Internal::typeName
-             || headerClassName == volSphericalTensorField::Internal::typeName
-             || headerClassName == volSymmTensorField::Internal::typeName
-             || headerClassName == volTensorField::Internal::typeName
+             || io.isHeaderClass<volScalarField::Internal>()
+             || io.isHeaderClass<volVectorField::Internal>()
+             || io.isHeaderClass<volSphericalTensorField::Internal>()
+             || io.isHeaderClass<volSymmTensorField::Internal>()
+             || io.isHeaderClass<volTensorField::Internal>()
             )
             {
-                Info<< "        Reading " << headerClassName
-                    << " : " << (*iter)->name() << endl;
+                Info<< "        Reading " << io.headerClassName()
+                    << " : " << io.name() << endl;
 
-                fieldDictionary fDict(*iter(), headerClassName);
+                fieldDictionary fDict(io, io.headerClassName());
 
-                Info<< "        Writing " << (*iter)->name() << endl;
+                Info<< "        Writing " << io.name() << endl;
                 fDict.regIOobject::write();
             }
         }
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
index 9a51d225f7..b528954050 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
@@ -39,9 +39,9 @@ Foam::wordList Foam::helpTypes::helpBoundary::fieldConditions
     const bool write
 ) const
 {
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+    typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    if (io.headerClassName() == fieldType::typeName)
+    if (io.isHeaderClass<VolFieldType>())
     {
         wordList types
         (
@@ -74,6 +74,8 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
     const IOobject& io
 ) const
 {
+    typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
+
     wordList types(fieldConditions<Type>(io, false));
 
     if (!types.size())
@@ -81,11 +83,9 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
         return;
     }
 
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
-
     const fvMesh& mesh = dynamic_cast<const fvMesh&>(io.db());
 
-    fieldType fld
+    VolFieldType fld
     (
         IOobject
         (
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
index 1eb569fa57..96ec1ead4e 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
@@ -39,7 +39,7 @@ void Foam::addToFieldList
     const typename GeoField::Mesh& mesh
 )
 {
-    if (obj.headerClassName() == GeoField::typeName)
+    if (obj.isHeaderClass<GeoField>())
     {
         fieldList.set
         (
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index ba7aa1c56f..bde1b627af 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -107,12 +107,12 @@ IOobjectList preFilterFields
             if
             (
                 //OR: fieldTypes::basic.found(io.headerClassName())
-                io.headerClassName() == IOField<label>::typeName
-             || io.headerClassName() == IOField<scalar>::typeName
-             || io.headerClassName() == IOField<vector>::typeName
-             || io.headerClassName() == IOField<sphericalTensor>::typeName
-             || io.headerClassName() == IOField<symmTensor>::typeName
-             || io.headerClassName() == IOField<tensor>::typeName
+                io.isHeaderClass<IOField<label>>()
+             || io.isHeaderClass<IOField<scalar>>()
+             || io.isHeaderClass<IOField<vector>>()
+             || io.isHeaderClass<IOField<sphericalTensor>>()
+             || io.isHeaderClass<IOField<symmTensor>>()
+             || io.isHeaderClass<IOField<tensor>>()
             )
             {
                 // Transfer from cloudObjects -> filteredObjects
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C b/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
index 0ba2b9a0b3..86d43bd3bb 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
+++ b/applications/utilities/postProcessing/lumped/lumpedPointForces/lumpedPointForces.C
@@ -52,9 +52,9 @@ autoPtr<GeoFieldType> loadField
     const IOobject* io
 )
 {
-    if (io && io->headerClassName() == GeoFieldType::typeName)
+    if (io && io->isHeaderClass<GeoFieldType>())
     {
-        Info<< "Reading " << GeoFieldType::typeName
+        Info<< "Reading " << io->headerClassName()
             << ' ' << io->name() << endl;
 
         return autoPtr<GeoFieldType>::New
diff --git a/applications/utilities/preProcessing/setExprBoundaryFields/readFields.H b/applications/utilities/preProcessing/setExprBoundaryFields/readFields.H
index ae294ebc27..07e0bb443e 100644
--- a/applications/utilities/preProcessing/setExprBoundaryFields/readFields.H
+++ b/applications/utilities/preProcessing/setExprBoundaryFields/readFields.H
@@ -121,15 +121,14 @@ class readFieldsHandler
                 (
                     fieldName,
                     mesh_.time().timeName(),
-                    mesh_,
+                    mesh_.thisDb(),
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE
                 );
 
                 const bool ok =
                 (
-                    io.typeHeaderOk<regIOobject>(false) // Preload header info
-                 && io.hasHeaderClass()                 // Extra safety
+                    io.typeHeaderOk<regIOobject>(false)
                  &&
                     (
                         loadField<scalar>(io)
diff --git a/applications/utilities/preProcessing/setExprFields/readFields.H b/applications/utilities/preProcessing/setExprFields/readFields.H
index 2eb63699ba..8ab2063ed9 100644
--- a/applications/utilities/preProcessing/setExprFields/readFields.H
+++ b/applications/utilities/preProcessing/setExprFields/readFields.H
@@ -121,15 +121,14 @@ class readFieldsHandler
                 (
                     fieldName,
                     mesh_.time().timeName(),
-                    mesh_,
+                    mesh_.thisDb(),
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE
                 );
 
                 const bool ok =
                 (
-                    io.typeHeaderOk<regIOobject>(false) // Preload header info
-                 && io.hasHeaderClass()                 // Extra safety
+                    io.typeHeaderOk<regIOobject>(false)
                  &&
                     (
                         loadField<scalar>(io)
diff --git a/applications/utilities/preProcessing/setExprFields/setExprFields.C b/applications/utilities/preProcessing/setExprFields/setExprFields.C
index 9704b34ab0..59c180c551 100644
--- a/applications/utilities/preProcessing/setExprFields/setExprFields.C
+++ b/applications/utilities/preProcessing/setExprFields/setExprFields.C
@@ -270,9 +270,8 @@ void evaluate
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         );
-        io.typeHeaderOk<IOobject>(false);
 
-        if (!io.hasHeaderClass() || io.isHeaderClass<IOobject>())
+        if (!io.typeHeaderOk<regIOobject>(false))
         {
             FatalErrorInFunction
                 << "Field '" << fieldName
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 9cf21f9022..8ae7d52a5f 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -28,7 +28,6 @@ License
 
 #include "IOobjectList.H"
 #include "Time.H"
-#include "IOList.H"
 #include "predicates.H"
 #include "OSspecific.H"
 
@@ -135,7 +134,7 @@ Foam::IOobjectList::IOobjectList
         try
         {
             // Use object with local scope and current instance (no searching)
-            ok = objectPtr->typeHeaderOk<IOList<label>>(false, false);
+            ok = objectPtr->typeHeaderOk<regIOobject>(false, false);
         }
         catch (const Foam::IOerror& err)
         {
diff --git a/src/finiteVolume/expressions/base/fvExprDriverIO.C b/src/finiteVolume/expressions/base/fvExprDriverIO.C
index 323de163e3..500ac1c772 100644
--- a/src/finiteVolume/expressions/base/fvExprDriverIO.C
+++ b/src/finiteVolume/expressions/base/fvExprDriverIO.C
@@ -199,7 +199,7 @@ Foam::word Foam::expressions::fvExprDriver::getHeaderClassName
         IOobject::MUST_READ,
         IOobject::NO_WRITE
     );
-    io.typeHeaderOk<IOobject>(false);
+    io.typeHeaderOk<regIOobject>(false);
 
     DebugInfo
         << "Registry: " << mesh.path()
diff --git a/src/functionObjects/field/expressions/fvExpressionField.C b/src/functionObjects/field/expressions/fvExpressionField.C
index df11c2e10d..7b3444f6f8 100644
--- a/src/functionObjects/field/expressions/fvExpressionField.C
+++ b/src/functionObjects/field/expressions/fvExpressionField.C
@@ -191,8 +191,7 @@ Foam::label Foam::functionObjects::fvExpressionField::loadFields
 
         const bool ok =
         (
-            io.typeHeaderOk<regIOobject>(false) // Preload header info
-         && io.hasHeaderClass()                 // Extra safety
+            io.typeHeaderOk<regIOobject>(false)
          &&
             (
                 loadField<scalar>(io)
diff --git a/src/functionObjects/field/readFields/readFields.C b/src/functionObjects/field/readFields/readFields.C
index ccd549b180..571c6ad59a 100644
--- a/src/functionObjects/field/readFields/readFields.C
+++ b/src/functionObjects/field/readFields/readFields.C
@@ -117,8 +117,7 @@ bool Foam::functionObjects::readFields::execute()
 
         const bool ok =
         (
-            io.typeHeaderOk<regIOobject>(false) // Preload header info
-         && io.hasHeaderClass()                 // Extra safety
+            io.typeHeaderOk<regIOobject>(false)
          &&
             (
                 loadField<scalar>(io)
diff --git a/src/functionObjects/field/readFields/readFieldsTemplates.C b/src/functionObjects/field/readFields/readFieldsTemplates.C
index 42415c4c56..2ce668755f 100644
--- a/src/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/functionObjects/field/readFields/readFieldsTemplates.C
@@ -36,11 +36,11 @@ License
 template<class FieldType>
 bool Foam::functionObjects::readFields::loadAndStore(const IOobject& io)
 {
-    if (FieldType::typeName == io.headerClassName())
+    if (io.isHeaderClass<FieldType>())
     {
         // Store field on mesh database
         Log << "    Reading " << io.name()
-            << " (" << FieldType::typeName << ')' << endl;
+            << " (" << io.headerClassName() << ')' << endl;
 
         mesh_.objectRegistry::store(new FieldType(io, mesh_));
         return true;
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index ad8d0574ea..42ceecd762 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -251,7 +251,7 @@ bool Foam::Cloud<ParticleType>::readStoreFile
     const IOobject& ioNew
 ) const
 {
-    if (io.headerClassName() == IOField<Type>::typeName)
+    if (io.isHeaderClass<IOField<Type>>())
     {
         IOField<Type> fld(io);
         auto* fldNewPtr = new IOField<Type>(ioNew, std::move(fld));
diff --git a/src/lumpedPointMotion/tools/lumpedPointTools.C b/src/lumpedPointMotion/tools/lumpedPointTools.C
index d58b0c4420..eba1d49d05 100644
--- a/src/lumpedPointMotion/tools/lumpedPointTools.C
+++ b/src/lumpedPointMotion/tools/lumpedPointTools.C
@@ -35,38 +35,40 @@ License
 
 namespace Foam
 {
-    template<class GeoFieldType>
-    static autoPtr<GeoFieldType> loadPointField
-    (
-        const pointMesh::Mesh& mesh,
-        const IOobject* io
-    )
+
+template<class GeoFieldType>
+static autoPtr<GeoFieldType> loadPointField
+(
+    const pointMesh::Mesh& mesh,
+    const IOobject* io
+)
+{
+    if (io && io->isHeaderClass<GeoFieldType>())
     {
-        if (io && io->headerClassName() == GeoFieldType::typeName)
-        {
-            Info<< "Reading " << GeoFieldType::typeName
-                << ' ' << io->name() << endl;
+        Info<< "Reading " << io->headerClassName()
+            << ' ' << io->name() << endl;
 
-            return autoPtr<GeoFieldType>::New
+        return autoPtr<GeoFieldType>::New
+        (
+            IOobject
             (
-                IOobject
-                (
-                    io->name(),
-                    io->instance(),
-                    io->local(),
-                    io->db(),
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE,
-                    io->registerObject()
-                ),
-                mesh
-            );
-        }
-
-        return nullptr;
+                io->name(),
+                io->instance(),
+                io->local(),
+                io->db(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE,
+                io->registerObject()
+            ),
+            mesh
+        );
     }
+
+    return nullptr;
 }
 
+} // End namespace Foam
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 28ac15f9333a85b7715382fc32f92d61948f87c5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2023 16:12:09 +0200
Subject: [PATCH 244/348] ENH: minor adjustment to BitOps and PackedList

- extend toc/sortedToc wrappers to bitSet and labelHashSet to allow
  use of BitOps::toc(...) in templated code

- size_data() method to return the number of addressed integer blocks
  similar to size_bytes() does, but for int instead of char.
---
 src/OpenFOAM/containers/Bits/BitOps/BitOps.C  | 26 ++++++++++++++++++-
 src/OpenFOAM/containers/Bits/BitOps/BitOps.H  | 24 ++++++++++++++++-
 .../containers/Bits/PackedList/PackedList.H   |  5 +++-
 .../containers/Bits/PackedList/PackedListI.H  |  7 +++++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/containers/Bits/BitOps/BitOps.C b/src/OpenFOAM/containers/Bits/BitOps/BitOps.C
index da0eedc7d6..83f052543c 100644
--- a/src/OpenFOAM/containers/Bits/BitOps/BitOps.C
+++ b/src/OpenFOAM/containers/Bits/BitOps/BitOps.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -205,6 +205,30 @@ Foam::List<Foam::label> Foam::BitOps::sortedToc(const UList<bool>& bools)
 }
 
 
+Foam::List<Foam::label> Foam::BitOps::toc(const bitSet& bitset)
+{
+    return bitset.toc();
+}
+
+
+Foam::List<Foam::label> Foam::BitOps::sortedToc(const bitSet& bitset)
+{
+    return bitset.sortedToc();
+}
+
+
+Foam::List<Foam::label> Foam::BitOps::toc(const labelHashSet& hashset)
+{
+    return hashset.sortedToc();
+}
+
+
+Foam::List<Foam::label> Foam::BitOps::sortedToc(const labelHashSet& hashset)
+{
+    return hashset.sortedToc();
+}
+
+
 // * * * * * * * * * * * * * * * * BitSetOps * * * * * * * * * * * * * * * * //
 
 Foam::bitSet Foam::BitSetOps::create
diff --git a/src/OpenFOAM/containers/Bits/BitOps/BitOps.H b/src/OpenFOAM/containers/Bits/BitOps/BitOps.H
index 79ae909c50..fb0e1688fb 100644
--- a/src/OpenFOAM/containers/Bits/BitOps/BitOps.H
+++ b/src/OpenFOAM/containers/Bits/BitOps/BitOps.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -163,6 +163,28 @@ List<label> toc(const UList<bool>& bools);
 List<label> sortedToc(const UList<bool>& bools);
 
 
+//- Forward to bitSet::toc(), the sorted values of the 'on' entries.
+//
+//  \return a List of labels
+List<label> toc(const bitSet& bitset);
+
+//- Forward to bitSet::sortedToc(), the sorted values of the 'on' entries.
+//
+//  \return a List of labels
+List<label> sortedToc(const bitSet& bitset);
+
+
+//- Forward to labelHashSet::sortedToc(), the sorted values of the 'on' entries.
+//
+//  \return a List of labels
+List<label> toc(const labelHashSet& hashset);
+
+//- Forward to labelHashSet::sortedToc(), the sorted values of the 'on' entries.
+//
+//  \return a List of labels
+List<label> sortedToc(const labelHashSet& hashset);
+
+
 //- Count arbitrary number of bits (of an integral type)
 template<class UIntType>
 inline unsigned int bit_count(UIntType x)
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
index 0ff679b541..39d679c024 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -409,6 +409,9 @@ public:
         //- A pointer to the raw storage, reinterpreted as byte data
         inline char* data_bytes() noexcept;
 
+        //- The number of integer blocks addressed in the raw storage
+        inline std::streamsize size_data() const noexcept;
+
         //- The number of bytes used in the raw storage
         //- including any unused padding.
         inline std::streamsize size_bytes() const noexcept;
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H b/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H
index 216ea59b7d..aac5b0a9cc 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedListI.H
@@ -571,6 +571,13 @@ inline char* Foam::PackedList<Width>::data_bytes() noexcept
 }
 
 
+template<unsigned Width>
+inline std::streamsize Foam::PackedList<Width>::size_data() const noexcept
+{
+    return num_blocks(size());
+}
+
+
 template<unsigned Width>
 inline std::streamsize Foam::PackedList<Width>::size_bytes() const noexcept
 {

From bc51caac323524b8502dbdc513b4512844ba1acf Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 14:26:05 +0200
Subject: [PATCH 245/348] ENH: remove sign from SHA1Digest cdata_bytes(),
 data_bytes()

- this refinement of commit 81807646ca7c makes these methods
  consistent with other objects/containers.

  The 'unsigned char' access is still available via cdata()
---
 .../test/parallel-comm2/Test-parallel-comm2.C     |  4 ++--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C     |  4 +---
 src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H  | 15 +++++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 660bc6fb94..7ccd11cf29 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -261,11 +261,11 @@ int main(int argc, char *argv[])
         }
 
         {
-            const SHA1Digest myHostDigest(SHA1(hostName()).digest());
+            const SHA1Digest myDigest(SHA1(hostName()).digest());
 
             UPstream::mpiGather
             (
-                reinterpret_cast<const char*>(myHostDigest.cdata_bytes()),
+                myDigest.cdata_bytes(),     // Send
                 SHA1Digest::max_size(),     // Num send per proc
                 digests.data_bytes(),       // Recv
                 SHA1Digest::max_size(),     // Num recv per proc
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 3d6dc38439..ac967f1a1e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -88,11 +88,9 @@ static List<int> getHostGroupIds(const label parentCommunicator)
     SHA1Digest myDigest(SHA1(hostName()).digest());
 
     // The fixed-length digest allows use of MPI_Gather
-    // and avoids Pstream::gatherList() during setup...
-
     UPstream::mpiGather
     (
-        reinterpret_cast<const char*>(myDigest.cdata_bytes()),
+        myDigest.cdata_bytes(),     // Send
         SHA1Digest::max_size(),     // Num send per proc
         digests.data_bytes(),       // Recv
         SHA1Digest::max_size(),     // Num recv per proc
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
index f3b3535f5b..77a065e11f 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.H
@@ -128,16 +128,19 @@ public:
         //- Raw digest data (20 bytes) - const access
         const unsigned char* cdata() const noexcept { return dig_.data(); }
 
-        //- Raw digest data (20 bytes) - const access
-        const unsigned char* cdata_bytes() const noexcept
+        //- Raw digest char data (20 bytes) - const access.
+        //- For consistency with other objects, these are \em not unsigned.
+        const char* cdata_bytes() const noexcept
         {
-            return dig_.data();
+            return reinterpret_cast<const char*>(dig_.data());
         }
 
-        //- Raw digest data (20 bytes) - non-const access. Use with caution!
-        unsigned char* data_bytes() noexcept
+        //- Raw digest char data (20 bytes) - non-const access.
+        //- For consistency with other objects, these are \em not unsigned.
+        //- Use with caution - generally for broadcasting only.
+        char* data_bytes() noexcept
         {
-            return dig_.data();
+            return reinterpret_cast<char*>(dig_.data());
         }
 
         //- The number of bytes in digest (20)

From 6d76b31f29b52fc2435575ddc171269e93495ee8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 23:28:19 +0200
Subject: [PATCH 246/348] TUT: provide more git history context for
 tutorials/Alltest

- sometimes the last commit is not enough information about
  the tested state (especially with extensive rebasing).
  Also provide the short context of some previous commits.
---
 tutorials/Alltest | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/tutorials/Alltest b/tutorials/Alltest
index 53c16758c7..ba8682578b 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2017-2022 OpenCFD Ltd.
+#     Copyright (C) 2017-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -291,21 +291,41 @@ then
     ( cd "$TEST_RUN_DIR" && tar -xf - )
 
     # How the tutorials were created
-    # - use full commit information since the SHA1 changes if rebased
-    echo "# Tutorials based on following commit:" >| "$TEST_RUN_DIR/commit-info"
-    echo >> "$TEST_RUN_DIR/commit-info"
+    # - provide full commit information since the SHA1 changes if rebased
+cat << '__HEADER_TEXT__' >| "$TEST_RUN_DIR/commit-info"
+# ===================================
+# Tutorials based on following commit
+# ===================================
+
+__HEADER_TEXT__
     git log -1 >> "$TEST_RUN_DIR/commit-info"
-    echo >> "$TEST_RUN_DIR/commit-info"
-    echo "# end-of-file" >> "$TEST_RUN_DIR/commit-info"
+
+    # - some additional context about previous commits
+cat << '__CONTEXT_TEXT__' >> "$TEST_RUN_DIR/commit-info"
+
+# ==============
+# within context
+# ==============
+
+__CONTEXT_TEXT__
+    git log --oneline -8 >> "$TEST_RUN_DIR/commit-info"
+cat << '__FOOTER_TEXT__' >> "$TEST_RUN_DIR/commit-info"
+
+# ===========
+# end-of-file
+# ===========
+__FOOTER_TEXT__
 
 else
     echo "Copying the tutorials directory" 1>&2
     cp -a "$rootDir" "$TEST_RUN_DIR"
 
     # How the tutorials were created
-    echo "# Tutorials copied from disk" >| "$TEST_RUN_DIR/commit-info"
-    echo >> "$TEST_RUN_DIR/commit-info"
-    echo "# end-of-file" >> "$TEST_RUN_DIR/commit-info"
+cat << '__HEADER_TEXT__' >| "$TEST_RUN_DIR/commit-info"
+# ==========================
+# Tutorials copied from disk
+# ==========================
+__HEADER_TEXT__
 fi
 
 cd "$TEST_RUN_DIR" || exit

From 302eb7b560e44f45579daa7f7c15bad7565d478e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 20 May 2023 17:52:46 +0200
Subject: [PATCH 247/348] REGRESSION: createBaffles : incorrect dictionary
 lookup

- was introduced with f7a7f1c14c05, only affected very recent develop
---
 .../createBaffles/createBaffles.C             | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index c7e2bbc77b..f1aedb25a1 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -882,11 +882,11 @@ int main(int argc, char *argv[])
         {
             const dictionary& dict = selector.dict();
             const word& groupName = selector.name();
-            const dictionary* patchesDict = dict.findDict("patches");
+            const dictionary* patchesDictPtr = dict.findDict("patches");
 
-            if (patchesDict)
+            if (patchesDictPtr)
             {
-                for (const entry& dEntry : *patchesDict)
+                for (const entry& dEntry : *patchesDictPtr)
                 {
                     const dictionary& dict = dEntry.dict();
                     const word patchName(dict.get<word>("name"));
@@ -897,13 +897,11 @@ int main(int argc, char *argv[])
 
                     if (patchFieldsDictPtr)
                     {
-                        const dictionary& patchFieldsDict = *patchFieldsDictPtr;
-
                         fvMeshTools::setPatchFields
                         (
                             mesh,
                             patchi,
-                            patchFieldsDict
+                            *patchFieldsDictPtr
                         );
                     }
                 }
@@ -916,15 +914,15 @@ int main(int argc, char *argv[])
                     patchSource.getOrDefault("sameGroup", true);
 
                 const dictionary* patchFieldsDictPtr
-                    = dict.findDict("patchFields");
+                    = patchSource.findDict("patchFields");
 
                 if (patchFieldsDictPtr)
                 {
-                    // Work on a copy
-                    dictionary patchFieldsDict(*patchFieldsDictPtr);
-
                     if (sameGroup)
                     {
+                        // Make a copy
+                        dictionary patchFieldsDict(*patchFieldsDictPtr);
+
                         // Add coupleGroup to all entries
                         for (entry& dEntry : patchFieldsDict)
                         {
@@ -935,9 +933,11 @@ int main(int argc, char *argv[])
                             }
                         }
 
-                        const labelList& patchIDs = pbm.groupPatchIDs()[groupName];
-
-                        for (const label patchi : patchIDs)
+                        for
+                        (
+                            const label patchi
+                          : pbm.groupPatchIDs()[groupName]
+                        )
                         {
                             fvMeshTools::setPatchFields
                             (
@@ -959,14 +959,14 @@ int main(int argc, char *argv[])
                         (
                             mesh,
                             patchiMaster,
-                            patchFieldsDict
+                            *patchFieldsDictPtr
                         );
 
                         fvMeshTools::setPatchFields
                         (
                             mesh,
                             patchiSlave,
-                            patchFieldsDict
+                            *patchFieldsDictPtr
                         );
                     }
                 }

From a64357983c93c3983c09830d07a6c56b3cb3581d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 22 May 2023 11:27:46 +0200
Subject: [PATCH 248/348] BUG: uniformMixed fields not always full initialised
 (#2703)

- calling the mixed BC dictionary construct with NO_READ leaves the
  fields properly sized, but not initialised.

ENH: add mixed BC constructor zero initialise
---
 .../basic/mixed/mixedFaPatchField.C              | 15 +++++++++++++++
 .../basic/mixed/mixedFaPatchField.H              |  9 +++++++++
 .../uniformMixed/uniformMixedFaPatchField.C      |  5 ++++-
 .../basic/mixed/mixedFvPatchField.C              | 16 ++++++++++++++++
 .../basic/mixed/mixedFvPatchField.H              |  9 +++++++++
 .../mappedMixed/mappedMixedFvPatchField.C        |  7 +++++--
 .../uniformMixed/uniformMixedFvPatchField.C      |  5 ++++-
 7 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
index bcc81e72e7..c90344dd19 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.C
@@ -93,6 +93,21 @@ Foam::mixedFaPatchField<Type>::mixedFaPatchField
 {}
 
 
+template<class Type>
+Foam::mixedFaPatchField<Type>::mixedFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Foam::zero
+)
+:
+    faPatchField<Type>(p, iF),
+    refValue_(p.size(), Zero),
+    refGrad_(p.size(), Zero),
+    valueFraction_(p.size(), Zero)
+{}
+
+
 template<class Type>
 Foam::mixedFaPatchField<Type>::mixedFaPatchField
 (
diff --git a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
index 5109e64920..f4d0bdbab5 100644
--- a/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
@@ -109,6 +109,15 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
+        //- Construct from patch and internal field,
+        //- initialise as zero-gradient
+        mixedFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Foam::zero
+        );
+
         //- Construct from patch, internal field and dictionary
         mixedFaPatchField
         (
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
index 82ee838495..cf9c1dd88d 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
@@ -66,7 +66,8 @@ Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
     const dictionary& dict
 )
 :
-    mixedFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    // Bypass dict constructor, default initialise as zero-gradient
+    mixedFaPatchField<Type>(p, iF, Foam::zero{}),
     refValueFunc_
     (
         Function1<Type>::NewIfPresent
@@ -87,6 +88,8 @@ Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
     ),
     valueFractionFunc_(nullptr)
 {
+    faPatchFieldBase::readDict(dict);  // Consistent with a dict constructor
+
     if (refValueFunc_)
     {
         if (refGradFunc_)
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 80dd0a9718..812bd19471 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -94,6 +94,22 @@ Foam::mixedFvPatchField<Type>::mixedFvPatchField
 {}
 
 
+template<class Type>
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const Foam::zero
+)
+:
+    fvPatchField<Type>(p, iF),
+    refValue_(p.size(), Zero),
+    refGrad_(p.size(), Zero),
+    valueFraction_(p.size(), Zero),
+    source_(p.size(), Zero)
+{}
+
+
 template<class Type>
 Foam::mixedFvPatchField<Type>::mixedFvPatchField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
index 143df47f4f..7c43a6ca22 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
@@ -133,6 +133,15 @@ public:
             const DimensionedField<Type, volMesh>&
         );
 
+        //- Construct from patch and internal field,
+        //- initialise as zero-gradient
+        mixedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const Foam::zero
+        );
+
         //- Construct from patch, internal field and dictionary
         mixedFvPatchField
         (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C
index da6886a505..4249c7d443 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedMixed/mappedMixedFvPatchField.C
@@ -61,8 +61,9 @@ Foam::mappedMixedFvPatchField<Type>::mappedMixedFvPatchField
     const dictionary& dict
 )
 :
-    // Reading of mixed entries handled later...
-    mixedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    // Bypass dictionary constructor (all reading handled later)
+    // but cannot use NO_READ since will still trigger an evaluate()
+    mixedFvPatchField<Type>(p, iF),
     mappedPatchFieldBase<Type>
     (
         mappedFixedValueFvPatchField<Type>::mapper(p, iF),
@@ -71,6 +72,8 @@ Foam::mappedMixedFvPatchField<Type>::mappedMixedFvPatchField
     ),
     weightFieldName_(dict.getOrDefault<word>("weightField", word::null))
 {
+    fvPatchFieldBase::readDict(dict);  // Consistent with a dict constructor
+
     this->readValueEntry(dict, IOobjectOption::MUST_READ);
 
     if (this->readMixedEntries(dict))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
index c73934f4ec..ca2817148a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
@@ -66,7 +66,8 @@ Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
     const dictionary& dict
 )
 :
-    mixedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    // Bypass dict constructor, default initialise as zero-gradient
+    mixedFvPatchField<Type>(p, iF, Foam::zero{}),
     refValueFunc_
     (
         PatchFunction1<Type>::NewIfPresent(p.patch(), "uniformValue", dict)
@@ -77,6 +78,8 @@ Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
     ),
     valueFractionFunc_(nullptr)
 {
+    fvPatchFieldBase::readDict(dict);  // Consistent with a dict constructor
+
     if (refValueFunc_)
     {
         if (refGradFunc_)

From b45ea8c2aa3a17f1cf89cbccb22c4e2365884159 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 14:26:05 +0200
Subject: [PATCH 249/348] ENH: centralise communicator clearing (GAMG)

---
 .../GAMGProcAgglomeration.C                   | 18 ++++++++-
 .../GAMGProcAgglomeration.H                   | 40 ++++++++++---------
 .../eagerGAMGProcAgglomeration.C              | 21 ++++------
 .../eagerGAMGProcAgglomeration.H              | 32 +++++----------
 .../manualGAMGProcAgglomeration.C             | 20 ++++------
 .../manualGAMGProcAgglomeration.H             | 35 ++++++----------
 .../masterCoarsestGAMGProcAgglomeration.C     | 17 +++-----
 .../masterCoarsestGAMGProcAgglomeration.H     | 37 +++++++----------
 .../procFacesGAMGProcAgglomeration.C          | 17 +++-----
 .../procFacesGAMGProcAgglomeration.H          | 29 +++++---------
 10 files changed, 110 insertions(+), 156 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index 48512f5842..247f72fb50 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -380,7 +380,21 @@ Foam::autoPtr<Foam::GAMGProcAgglomeration> Foam::GAMGProcAgglomeration::New
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::GAMGProcAgglomeration::~GAMGProcAgglomeration()
-{}
+{
+    clearCommunicators();
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::GAMGProcAgglomeration::clearCommunicators()
+{
+    forAllReverse(comms_, i)
+    {
+        UPstream::freeCommunicator(comms_[i]);
+    }
+    comms_.clear();
+}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
index 999a474fc2..07381d98a1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2014 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,19 +35,22 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef GAMGProcAgglomeration_H
-#define GAMGProcAgglomeration_H
+#ifndef Foam_GAMGProcAgglomeration_H
+#define Foam_GAMGProcAgglomeration_H
 
 #include "runTimeSelectionTables.H"
 #include "labelList.H"
+#include "DynamicList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward Declarations
 class GAMGAgglomeration;
 class lduMesh;
+class lduPrimitiveMesh;
 
 /*---------------------------------------------------------------------------*\
                     Class GAMGProcAgglomeration Declaration
@@ -54,14 +58,17 @@ class lduMesh;
 
 class GAMGProcAgglomeration
 {
-
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Reference to agglomeration
         GAMGAgglomeration& agglom_;
 
+        //- Allocated communicators
+        DynamicList<label> comms_;
+
+
     // Protected Member Functions
 
         //- Debug: write agglomeration info
@@ -80,17 +87,8 @@ protected:
         //- Debug: calculate global cell-cells
         static labelListList globalCellCells(const lduMesh&);
 
-private:
-
-    // Private data
-
-    // Private Member Functions
-
-        //- No copy construct
-        GAMGProcAgglomeration(const GAMGProcAgglomeration&) = delete;
-
-        //- No copy assignment
-        void operator=(const GAMGProcAgglomeration&) = delete;
+        //- Clear/free allocated communicators
+        void clearCommunicators();
 
 
 public:
@@ -118,6 +116,13 @@ public:
         );
 
 
+    //- No copy construct
+    GAMGProcAgglomeration(const GAMGProcAgglomeration&) = delete;
+
+    //- No copy assignment
+    void operator=(const GAMGProcAgglomeration&) = delete;
+
+
     // Constructors
 
         //- Construct given agglomerator and controls
@@ -139,15 +144,14 @@ public:
         );
 
 
-    //- Destructor
+    //- Destructor. Clears allocated communicators
     virtual ~GAMGProcAgglomeration();
 
 
     // Member Functions
 
-        //- Modify agglomeration. Return true if modified
+        //- Modify agglomeration. \returns True if modified
         virtual bool agglomerate() = 0;
-
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
index 3866554614..33139bb24c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,14 +60,8 @@ Foam::eagerGAMGProcAgglomeration::eagerGAMGProcAgglomeration
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::eagerGAMGProcAgglomeration::
-~eagerGAMGProcAgglomeration()
-{
-    forAllReverse(comms_, i)
-    {
-        UPstream::freeCommunicator(comms_[i]);
-    }
-}
+Foam::eagerGAMGProcAgglomeration::~eagerGAMGProcAgglomeration()
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -122,9 +116,8 @@ bool Foam::eagerGAMGProcAgglomeration::agglomerate()
                         agglomProcIDs
                     );
 
-                    // Allocate a communicator for the processor-agglomerated
-                    // matrix
-                    comms_.append
+                    // Communicator for the processor-agglomerated matrix
+                    comms_.push_back
                     (
                         UPstream::allocateCommunicator
                         (
@@ -135,7 +128,7 @@ bool Foam::eagerGAMGProcAgglomeration::agglomerate()
 
                     // Use processor agglomeration maps to do the actual
                     // collecting.
-                    if (Pstream::myProcNo(levelComm) != -1)
+                    if (UPstream::myProcNo(levelComm) != -1)
                     {
                         GAMGProcAgglomeration::agglomerate
                         (
@@ -143,7 +136,7 @@ bool Foam::eagerGAMGProcAgglomeration::agglomerate()
                             procAgglomMap,
                             masterProcs,
                             agglomProcIDs,
-                            comms_.last()
+                            comms_.back()
                         );
                     }
                 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
index 784723e08b..48969a34cb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,19 +37,16 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef eagerGAMGProcAgglomeration_H
-#define eagerGAMGProcAgglomeration_H
+#ifndef Foam_eagerGAMGProcAgglomeration_H
+#define Foam_eagerGAMGProcAgglomeration_H
 
 #include "GAMGProcAgglomeration.H"
-#include "DynamicList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class GAMGAgglomeration;
-
 /*---------------------------------------------------------------------------*\
               Class eagerGAMGProcAgglomeration Declaration
 \*---------------------------------------------------------------------------*/
@@ -57,30 +55,23 @@ class eagerGAMGProcAgglomeration
 :
     public GAMGProcAgglomeration
 {
-    // Private data
+    // Private Data
 
         //- Agglpmeration level
         const label mergeLevels_;
 
-        DynamicList<label> comms_;
-
-    // Private Member Functions
-
-        //- No copy construct
-        eagerGAMGProcAgglomeration
-        (
-            const eagerGAMGProcAgglomeration&
-        ) = delete;
-
-        //- No copy assignment
-        void operator=(const eagerGAMGProcAgglomeration&) = delete;
-
 
 public:
 
     //- Runtime type information
     TypeName("eager");
 
+    //- No copy construct
+    eagerGAMGProcAgglomeration(const eagerGAMGProcAgglomeration&) = delete;
+
+    //- No copy assignment
+    void operator=(const eagerGAMGProcAgglomeration&) = delete;
+
 
     // Constructors
 
@@ -98,9 +89,8 @@ public:
 
     // Member Functions
 
-       //- Modify agglomeration. Return true if modified
+        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
-
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
index a5d266015f..34bb3274fe 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,14 +60,8 @@ Foam::manualGAMGProcAgglomeration::manualGAMGProcAgglomeration
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::manualGAMGProcAgglomeration::
-~manualGAMGProcAgglomeration()
-{
-    forAllReverse(comms_, i)
-    {
-        UPstream::freeCommunicator(comms_[i]);
-    }
-}
+Foam::manualGAMGProcAgglomeration::~manualGAMGProcAgglomeration()
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -165,9 +160,8 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
                     }
 
 
-                    // Allocate a communicator for the processor-agglomerated
-                    // matrix
-                    comms_.append
+                    // Communicator for the processor-agglomerated matrix
+                    comms_.push_back
                     (
                         UPstream::allocateCommunicator
                         (
@@ -178,7 +172,7 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
 
                     // Use processor agglomeration maps to do the actual
                     // collecting
-                    if (Pstream::myProcNo(levelMesh.comm()) != -1)
+                    if (UPstream::myProcNo(levelMesh.comm()) != -1)
                     {
                         GAMGProcAgglomeration::agglomerate
                         (
@@ -186,7 +180,7 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
                             procAgglomMap,
                             coarseToMaster,
                             agglomProcIDs,
-                            comms_.last()
+                            comms_.back()
                         );
                     }
                 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
index 71e0bad423..28485fd53a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,11 +59,10 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef manualGAMGProcAgglomeration_H
-#define manualGAMGProcAgglomeration_H
+#ifndef Foam_manualGAMGProcAgglomeration_H
+#define Foam_manualGAMGProcAgglomeration_H
 
 #include "GAMGProcAgglomeration.H"
-#include "DynamicList.H"
 #include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -70,8 +70,6 @@ SourceFiles
 namespace Foam
 {
 
-class GAMGAgglomeration;
-
 /*---------------------------------------------------------------------------*\
               Class manualGAMGProcAgglomeration Declaration
 \*---------------------------------------------------------------------------*/
@@ -80,26 +78,11 @@ class manualGAMGProcAgglomeration
 :
     public GAMGProcAgglomeration
 {
-    // Private data
+    // Private Data
 
         //- Per level the agglomeration map
         const List<Tuple2<label, List<labelList>>> procAgglomMaps_;
 
-        //- Any allocated communicators
-        DynamicList<label> comms_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        manualGAMGProcAgglomeration
-        (
-            const manualGAMGProcAgglomeration&
-        ) = delete;
-
-        //- No copy assignment
-        void operator=(const manualGAMGProcAgglomeration&) = delete;
-
 
 public:
 
@@ -107,6 +90,13 @@ public:
     TypeName("manual");
 
 
+    //- No copy construct
+    manualGAMGProcAgglomeration(const manualGAMGProcAgglomeration&) = delete;
+
+    //- No copy assignment
+    void operator=(const manualGAMGProcAgglomeration&) = delete;
+
+
     // Constructors
 
         //- Construct given agglomerator and controls
@@ -123,9 +113,8 @@ public:
 
     // Member Functions
 
-       //- Modify agglomeration. Return true if modified
+        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
-
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
index 180ef2d385..721913d170 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2014 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,12 +101,7 @@ Foam::masterCoarsestGAMGProcAgglomeration::masterCoarsestGAMGProcAgglomeration
 
 Foam::masterCoarsestGAMGProcAgglomeration::
 ~masterCoarsestGAMGProcAgglomeration()
-{
-    forAllReverse(comms_, i)
-    {
-        UPstream::freeCommunicator(comms_[i]);
-    }
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -192,8 +187,8 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                 }
 
 
-                // Allocate a communicator for the processor-agglomerated matrix
-                comms_.append
+                // Communicator for the processor-agglomerated matrix
+                comms_.push_back
                 (
                     UPstream::allocateCommunicator
                     (
@@ -203,7 +198,7 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                 );
 
                 // Use processor agglomeration maps to do the actual collecting.
-                if (Pstream::myProcNo(levelComm) != -1)
+                if (UPstream::myProcNo(levelComm) != -1)
                 {
                     GAMGProcAgglomeration::agglomerate
                     (
@@ -211,7 +206,7 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                         procAgglomMap,
                         masterProcs,
                         agglomProcIDs,
-                        comms_.last()
+                        comms_.back()
                     );
                 }
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
index 8daaafa685..8d0a0de15a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,19 +57,16 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef masterCoarsestGAMGProcAgglomeration_H
-#define masterCoarsestGAMGProcAgglomeration_H
+#ifndef Foam_masterCoarsestGAMGProcAgglomeration_H
+#define Foam_masterCoarsestGAMGProcAgglomeration_H
 
 #include "GAMGProcAgglomeration.H"
-#include "DynamicList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class GAMGAgglomeration;
-
 /*---------------------------------------------------------------------------*\
               Class masterCoarsestGAMGProcAgglomeration Declaration
 \*---------------------------------------------------------------------------*/
@@ -78,30 +75,25 @@ class masterCoarsestGAMGProcAgglomeration
 :
     public GAMGProcAgglomeration
 {
-    // Private data
+    // Private Data
 
         label nProcessorsPerMaster_;
 
-        DynamicList<label> comms_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        masterCoarsestGAMGProcAgglomeration
-        (
-            const masterCoarsestGAMGProcAgglomeration&
-        ) = delete;
-
-        //- No copy assignment
-        void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
-
 
 public:
 
     //- Runtime type information
     TypeName("masterCoarsest");
 
+    //- No copy construct
+    masterCoarsestGAMGProcAgglomeration
+    (
+        const masterCoarsestGAMGProcAgglomeration&
+    ) = delete;
+
+    //- No copy assignment
+    void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
+
 
     // Constructors
 
@@ -119,9 +111,8 @@ public:
 
     // Member Functions
 
-       //- Modify agglomeration. Return true if modified
+        //- Modify agglomeration. Return true if modified
         virtual bool agglomerate();
-
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 3fe22a5e2f..d537dae584 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -231,12 +231,7 @@ Foam::procFacesGAMGProcAgglomeration::procFacesGAMGProcAgglomeration
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::procFacesGAMGProcAgglomeration::~procFacesGAMGProcAgglomeration()
-{
-    forAllReverse(comms_, i)
-    {
-        UPstream::freeCommunicator(comms_[i]);
-    }
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -289,9 +284,8 @@ bool Foam::procFacesGAMGProcAgglomeration::agglomerate()
                         agglomProcIDs
                     );
 
-                    // Allocate a communicator for the processor-agglomerated
-                    // matrix
-                    comms_.append
+                    // Communicator for the processor-agglomerated matrix
+                    comms_.push_back
                     (
                         UPstream::allocateCommunicator
                         (
@@ -300,7 +294,6 @@ bool Foam::procFacesGAMGProcAgglomeration::agglomerate()
                         )
                     );
 
-
                     // Use processor agglomeration maps to do the actual
                     // collecting.
                     GAMGProcAgglomeration::agglomerate
@@ -309,7 +302,7 @@ bool Foam::procFacesGAMGProcAgglomeration::agglomerate()
                         procAgglomMap,
                         masterProcs,
                         agglomProcIDs,
-                        comms_.last()
+                        comms_.back()
                     );
                 }
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
index 7847a5c70d..eef59de0f0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,11 +40,10 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef procFacesGAMGProcAgglomeration_H
-#define procFacesGAMGProcAgglomeration_H
+#ifndef Foam_procFacesGAMGProcAgglomeration_H
+#define Foam_procFacesGAMGProcAgglomeration_H
 
 #include "GAMGProcAgglomeration.H"
-#include "DynamicList.H"
 #include "labelField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,11 +51,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward Declarations
-class GAMGAgglomeration;
-class lduMesh;
-class lduPrimitiveMesh;
-
 /*---------------------------------------------------------------------------*\
                     Class procFacesGAMGProcAgglomeration Declaration
 \*---------------------------------------------------------------------------*/
@@ -69,8 +64,6 @@ class procFacesGAMGProcAgglomeration
         //- When to processor agglomerate
         const label nAgglomeratingCells_;
 
-        //- Allocated communicators
-        DynamicList<label> comms_;
 
     // Private Member Functions
 
@@ -90,21 +83,19 @@ class procFacesGAMGProcAgglomeration
         //- Do we need to agglomerate across processors?
         bool doProcessorAgglomeration(const lduMesh&) const;
 
-        //- No copy construct
-        procFacesGAMGProcAgglomeration
-        (
-            const procFacesGAMGProcAgglomeration&
-        ) = delete;
-
-        //- No copy assignment
-        void operator=(const procFacesGAMGProcAgglomeration&) = delete;
-
 
 public:
 
     //- Runtime type information
     TypeName("procFaces");
 
+    //- No copy construct
+    procFacesGAMGProcAgglomeration(const procFacesGAMGProcAgglomeration&)
+        = delete;
+
+    //- No copy assignment
+    void operator=(const procFacesGAMGProcAgglomeration&) = delete;
+
 
     // Constructors
 

From b687c4927c592f232f0c89373875df4bac95813a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 14:26:05 +0200
Subject: [PATCH 250/348] ENH: update UPstream communicator handling

UPstream::allocateCommunicator
  - with contiguous sub-procs. Simpler, more compact handling, ranks
    are guaranteed to be monotonic

UPstream::commWorld(label)
  - ignore placeholder values, prevents accidental negative values

- make communicator non-optional for UPstream::broadcast(), which
  means it has three mandatory parameters and thus always fully
  disambiguated from Pstream::broadcast().

ENH: relax size checking on gatherList/scatterList

- only fatal if the List size is less than nProcs.
  Can silent ignore any trailing elements: they will be untouched.
---
 .../db/IOstreams/Pstreams/PstreamBuffers.H    | 20 ++---
 .../db/IOstreams/Pstreams/PstreamGatherList.C | 16 ++--
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 81 ++++++++++++++++---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 67 +++++++++++----
 .../collatedFileOperation/OFstreamCollator.C  |  4 +-
 src/Pstream/mpi/UIPBstreamRead.C              |  2 +-
 src/Pstream/mpi/UOPstreamWrite.C              | 23 +++---
 src/Pstream/mpi/UPstream.C                    | 16 ++--
 src/Pstream/mpi/UPstreamBroadcast.C           |  6 +-
 src/Pstream/mpi/UPstreamWrappingTemplates.C   |  6 +-
 10 files changed, 169 insertions(+), 72 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 68a3c81d32..b5fb6d9ed4 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -38,11 +38,11 @@ Description
 
     Example usage:
     \code
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
-        for (const int proci : Pstream::allProcs())
+        for (const int proci : UPstream::allProcs())
         {
-            if (proci != Pstream::myProcNo())
+            if (proci != UPstream::myProcNo())
             {
                 someObject vals;
 
@@ -53,9 +53,9 @@ Description
 
         pBufs.finishedSends();   // no-op for blocking
 
-        for (const int proci : Pstream::allProcs())
+        for (const int proci : UPstream::allProcs())
         {
-            if (proci != Pstream::myProcNo())
+            if (proci != UPstream::myProcNo())
             {
                 UIPstream recv(proci, pBufs);
                 someObject vals(recv);
@@ -68,12 +68,12 @@ Description
     one-to-all and all-to-one communication patterns.
     For example,
     \code
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
-        if (Pstream::master())
+        if (UPstream::master())
         {
             someObject vals;
-            for (const int proci : Pstream::subProcs())
+            for (const int proci : UPstream::subProcs())
             {
                 UOPstream send(proci, pBufs);
                 send << vals;
@@ -82,9 +82,9 @@ Description
 
         pBufs.finishedScatters();
 
-        if (!Pstream::master())
+        if (!UPstream::master())
         {
-            UIPstream recv(Pstream::masterNo(), pBufs);
+            UIPstream recv(UPstream::masterNo(), pBufs);
             someObject vals(recv);
         }
     \endcode
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
index ef4a344692..44d94933d6 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
@@ -53,11 +53,11 @@ void Foam::Pstream::gatherList
 {
     if (UPstream::is_parallel(comm))
     {
-        if (values.size() != UPstream::nProcs(comm))
+        if (values.size() < UPstream::nProcs(comm))
         {
             FatalErrorInFunction
-                << "Size of list:" << values.size() << " != numProcs:"
-                << UPstream::nProcs(comm)
+                << "List of values is too small:" << values.size()
+                << " vs numProcs:" << UPstream::nProcs(comm) << nl
                 << Foam::abort(FatalError);
         }
 
@@ -195,18 +195,17 @@ void Foam::Pstream::scatterList
     const label comm
 )
 {
-    // Apart from the additional (size == nProcs) check, the only difference
+    // Apart from the additional size check, the only difference
     // between scatterList() and using broadcast(List<T>&) or a regular
     // scatter(List<T>&) is that processor-local data is skipped.
 
     if (UPstream::is_parallel(comm))
     {
-        if (values.size() != UPstream::nProcs(comm))
+        if (values.size() < UPstream::nProcs(comm))
         {
             FatalErrorInFunction
-                << "Size of list:" << values.size()
-                << " does not equal the number of processors:"
-                << UPstream::nProcs(comm)
+                << "List of values is too small:" << values.size()
+                << " vs numProcs:" << UPstream::nProcs(comm) << nl
                 << Foam::abort(FatalError);
         }
 
@@ -328,6 +327,7 @@ void Foam::Pstream::gatherList
 }
 
 
+// Unused - slate for removal? (MAY-2023)
 template<class T>
 void Foam::Pstream::scatterList
 (
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index ac967f1a1e..331cf4da77 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -141,7 +141,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
     haveThreads_ = haveThreads;
 
     label comm = -1;
-    labelList singleProc(Foam::one{}, 0);
+    labelRange singleProc(1);
 
     // Redo communicators that were created during static initialisation.
     // When parRun == true, redo with MPI components
@@ -156,7 +156,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         freeCommunicator(UPstream::selfComm);
         freeCommunicator(UPstream::globalComm);
 
-        // 0: worldComm
+        // 0: worldComm/globalComm
         comm = allocateCommunicator(-1, singleProc, false);
         if (comm != UPstream::globalComm)
         {
@@ -190,8 +190,8 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         freeCommunicator(UPstream::selfComm);
         freeCommunicator(UPstream::globalComm);
 
-        // 0: worldComm
-        comm = allocateCommunicator(-1, identity(nProcs), true);
+        // 0: worldComm/globalComm
+        comm = allocateCommunicator(-1, labelRange(nProcs), true);
         if (comm != UPstream::globalComm)
         {
             // Failed sanity check
@@ -203,7 +203,7 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
 
         // 1: selfComm
         // - Processor number wrt world communicator
-        singleProc.front() = myProcNo(UPstream::globalComm);
+        singleProc.start() = UPstream::myProcNo(UPstream::globalComm);
         comm = allocateCommunicator(-2, singleProc, true);
         if (comm != UPstream::selfComm)
         {
@@ -265,7 +265,7 @@ Foam::label Foam::UPstream::getAvailableCommIndex(const label parentIndex)
 Foam::label Foam::UPstream::allocateCommunicator
 (
     const label parentIndex,
-    const labelUList& subRanks,
+    const labelRange& subRanks,
     const bool withComponents
 )
 {
@@ -283,6 +283,67 @@ Foam::label Foam::UPstream::allocateCommunicator
     // overwritten by allocateCommunicatorComponents
     myProcNo_[index] = UPstream::masterNo();
 
+    // The selected sub-ranks.
+    // - transcribe from label to int
+    // - already in incremental order
+    auto& procIds = procIDs_[index];
+    procIds.resize_nocopy(subRanks.size());
+
+    label numSubRanks = 0;
+    for (const label subRanki : subRanks)
+    {
+        procIds[numSubRanks] = subRanki;
+        ++numSubRanks;
+    }
+
+    // Sizing and filling are demand-driven
+    linearCommunication_[index].clear();
+    treeCommunication_[index].clear();
+
+    if (withComponents && parRun())
+    {
+        allocateCommunicatorComponents(parentIndex, index);
+
+        // Could 'remember' locations of uninvolved ranks
+        /// if (myProcNo_[index] < 0 && parentIndex >= 0)
+        /// {
+        ///     // As global rank
+        ///     myProcNo_[index] = -(myProcNo_[worldComm]+1);
+        ///
+        /// OR:
+        ///     // As parent rank number
+        ///     if (myProcNo_[parentIndex] >= 0)
+        ///     {
+        ///         myProcNo_[index] = -(myProcNo_[parentIndex]+1);
+        ///     }
+        /// }
+    }
+
+    return index;
+}
+
+
+Foam::label Foam::UPstream::allocateCommunicator
+(
+    const label parentIndex,
+    const labelUList& subRanks,
+    const bool withComponents
+)
+{
+    const label index = getAvailableCommIndex(parentIndex);
+
+    if (debug)
+    {
+        Pout<< "Allocating communicator " << index << nl
+            << "    parent : " << parentIndex << nl
+            << "    procs  : " << flatOutput(subRanks) << nl
+            << endl;
+    }
+
+    // Initially treat as master,
+    // overwritten by allocateCommunicatorComponents
+    myProcNo_[index] = UPstream::masterNo();
+
     // The selected sub-ranks.
     // - transcribe from label to int. Treat negative values as 'ignore'
     // - enforce incremental order (so index is rank in next communicator)
@@ -705,13 +766,11 @@ Foam::label Foam::UPstream::warnComm(-1);
 // These are overwritten in parallel mode (by UPstream::setParRun())
 const Foam::label nPredefinedComm = []()
 {
-    const Foam::labelList singleProc(Foam::one{}, 0);
-
-    // 0: worldComm
-    (void) Foam::UPstream::allocateCommunicator(-1, singleProc, false);
+    // 0: worldComm/globalComm
+    (void) Foam::UPstream::allocateCommunicator(-1, Foam::labelRange(1), false);
 
     // 1: selfComm
-    (void) Foam::UPstream::allocateCommunicator(-2, singleProc, false);
+    (void) Foam::UPstream::allocateCommunicator(-2, Foam::labelRange(1), false);
 
     return Foam::UPstream::nComms();
 }();
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index babb0288ba..9e22089d9d 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -326,18 +326,18 @@ public:
         //- Communicator for all ranks (respecting any local worlds)
         static label commWorld() noexcept { return worldComm; }
 
-        //- Alter value of world communicator
-        //  \returns the previous value
+        //- Set world communicator. Negative values are a no-op.
+        //  \returns old world communicator index
         static label commWorld(const label communicator) noexcept
         {
             label old(worldComm);
-            worldComm = communicator;
+            if (communicator >= 0) worldComm = communicator;
             return old;
         }
 
         //- Alter communicator debugging setting.
         //- Warns for use of any communicator differing from specified.
-        //  \returns the previous warn communicator
+        //  \returns the previous warn index
         static label commWarn(const label communicator) noexcept
         {
             label old(warnComm);
@@ -384,7 +384,21 @@ public:
 
     // Member Functions
 
-        //- Allocate a new communicator with subRanks of parent communicator
+        //- Allocate new communicator with contiguous sub-ranks
+        //- on the parent communicator.
+        static label allocateCommunicator
+        (
+            //! The parent communicator
+            const label parent,
+
+            //! The contiguous sub-ranks of parent to use
+            const labelRange& subRanks,
+
+            //! Call allocateCommunicatorComponents()
+            const bool withComponents = true
+        );
+
+        //- Allocate new communicator with sub-ranks on the parent communicator
         static label allocateCommunicator
         (
             //! The parent communicator
@@ -418,7 +432,8 @@ public:
         );
 
 
-        //- Wrapper class for allocating/freeing communicators
+        //- Wrapper class for allocating/freeing communicators. Always invokes
+        //- allocateCommunicatorComponents() and freeCommunicatorComponents()
         class communicator
         {
             label comm_;
@@ -437,6 +452,19 @@ public:
             //- Move construct, takes ownership
             communicator(communicator&& c) : comm_(c.comm_) { c.comm_ = -1; }
 
+            //- Allocate communicator for contiguous sub-ranks on given parent
+            communicator
+            (
+                //! The parent communicator
+                const label parentComm,
+
+                //! The contiguous sub-ranks of parent to use
+                const labelRange& subRanks
+            )
+            :
+                comm_(UPstream::allocateCommunicator(parentComm, subRanks))
+            {}
+
             //- Allocate communicator for sub-ranks on given parent
             communicator
             (
@@ -450,7 +478,7 @@ public:
                 comm_(UPstream::allocateCommunicator(parentComm, subRanks))
             {}
 
-            //- Free allocated communicator and group
+            //- Free allocated communicator
             ~communicator() { UPstream::freeCommunicator(comm_); }
 
             //- True if communicator is non-negative (ie, was allocated)
@@ -459,17 +487,24 @@ public:
             //- The communicator label
             label comm() const noexcept { return comm_; }
 
-            //- Free allocated communicator and group
+            //- Free allocated communicator
             void reset() { UPstream::freeCommunicator(comm_); comm_ = -1; }
 
-            //- Allocate with subRanks of parent communicator
+            //- Allocate with contiguous sub-ranks of parent communicator
+            void reset(label parent, const labelRange& subRanks)
+            {
+                UPstream::freeCommunicator(comm_);
+                comm_ = UPstream::allocateCommunicator(parent, subRanks);
+            }
+
+            //- Allocate with sub-ranks of parent communicator
             void reset(label parent, const labelUList& subRanks)
             {
                 UPstream::freeCommunicator(comm_);
                 comm_ = UPstream::allocateCommunicator(parent, subRanks);
             }
 
-            //- Take ownership, free allocated communicator and group.
+            //- Take ownership, free allocated communicator
             void reset(communicator&& c)
             {
                 if (comm_ != c.comm_) UPstream::freeCommunicator(comm_);
@@ -974,8 +1009,10 @@ public:
         /*! \brief Receive identically-sized \c Native data from all ranks */ \
         static void mpiGather                                                 \
         (                                                                     \
+            /*! On rank: individual value to send */                          \
             const Native* sendData,                                           \
             int sendCount,                                                    \
+            /*! On master: receive buffer with all values */                  \
             Native* recvData,                                                 \
             int recvCount,                                                    \
             const label communicator = worldComm                              \
@@ -984,8 +1021,10 @@ public:
         /*! \brief Send identically-sized \c Native data to all ranks */      \
         static void mpiScatter                                                \
         (                                                                     \
+            /*! On master: send buffer with all values */                     \
             const Native* sendData,                                           \
             int sendCount,                                                    \
+            /*! On rank: individual value to receive */                       \
             Native* recvData,                                                 \
             int recvCount,                                                    \
             const label communicator = worldComm                              \
@@ -1068,7 +1107,7 @@ public:
 
     // Broadcast Functions
 
-        //- Broadcast buffer contents to all processes in communicator.
+        //- Broadcast buffer contents to all processes in given communicator.
         //- The sizes must match on all processes.
         //  For \b non-parallel : do nothing.
         //  \return True on success
@@ -1076,14 +1115,14 @@ public:
         (
             char* buf,
             const std::streamsize bufSize,
-            const label communicator = worldComm,
+            const label communicator,
             const int rootProcNo = masterNo()
         );
 
 
     // Logical reductions
 
-        //- Logical (and) reduction (cf. MPI AllReduce)
+        //- Logical (and) reduction (MPI_AllReduce)
         //  For \b non-parallel : do nothing
         static void reduceAnd
         (
@@ -1091,7 +1130,7 @@ public:
             const label communicator = worldComm
         );
 
-        //- Logical (or) reduction (cf. MPI AllReduce)
+        //- Logical (or) reduction (MPI_AllReduce)
         //  For \b non-parallel : do nothing
         static void reduceOr
         (
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
index 0ba8849772..29e5675fd7 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
@@ -295,7 +295,7 @@ Foam::OFstreamCollator::OFstreamCollator(const off_t maxBufferSize)
         UPstream::allocateCommunicator
         (
             localComm_,
-            identity(UPstream::nProcs(localComm_))
+            labelRange(UPstream::nProcs(localComm_))
         )
     )
 {}
@@ -315,7 +315,7 @@ Foam::OFstreamCollator::OFstreamCollator
         UPstream::allocateCommunicator
         (
             localComm_,
-            identity(UPstream::nProcs(localComm_))
+            labelRange(UPstream::nProcs(localComm_))
         )
     )
 {}
diff --git a/src/Pstream/mpi/UIPBstreamRead.C b/src/Pstream/mpi/UIPBstreamRead.C
index 2cb5dd78bf..f384c391eb 100644
--- a/src/Pstream/mpi/UIPBstreamRead.C
+++ b/src/Pstream/mpi/UIPBstreamRead.C
@@ -58,7 +58,7 @@ void Foam::UIPBstream::bufferIPCrecv()
             << Foam::abort(FatalError);
     }
 
-    if (debug)
+    if (UPstream::debug)
     {
         Pout<< "UOPBstream IPC read buffer :"
             << " root:" << fromProcNo_
diff --git a/src/Pstream/mpi/UOPstreamWrite.C b/src/Pstream/mpi/UOPstreamWrite.C
index 944b09ed71..c1086fd94c 100644
--- a/src/Pstream/mpi/UOPstreamWrite.C
+++ b/src/Pstream/mpi/UOPstreamWrite.C
@@ -62,7 +62,7 @@ bool Foam::UOPstream::write
 {
     PstreamGlobals::reset_request(req);
 
-    if (debug)
+    if (UPstream::debug)
     {
         Pout<< "UOPstream::write : starting write to:" << toProcNo
             << " tag:" << tag
@@ -83,14 +83,13 @@ bool Foam::UOPstream::write
 
     PstreamGlobals::checkCommunicator(communicator, toProcNo);
 
-
-    bool failed = true;
+    int returnCode = MPI_ERR_UNKNOWN;
 
     profilingPstream::beginTiming();
 
     if (commsType == UPstream::commsTypes::blocking)
     {
-        failed = MPI_Bsend
+        returnCode = MPI_Bsend
         (
             const_cast<char*>(buf),
             bufSize,
@@ -103,7 +102,7 @@ bool Foam::UOPstream::write
         // Assume these are from scatters ...
         profilingPstream::addScatterTime();
 
-        if (debug)
+        if (UPstream::debug)
         {
             Pout<< "UOPstream::write : finished write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
@@ -115,7 +114,7 @@ bool Foam::UOPstream::write
     {
         if (UPstream::sendModes::sync == sendMode)
         {
-            failed = MPI_Ssend
+            returnCode = MPI_Ssend
             (
                 const_cast<char*>(buf),
                 bufSize,
@@ -127,7 +126,7 @@ bool Foam::UOPstream::write
         }
         else
         {
-            failed = MPI_Send
+            returnCode = MPI_Send
             (
                 const_cast<char*>(buf),
                 bufSize,
@@ -141,7 +140,7 @@ bool Foam::UOPstream::write
         // Assume these are from scatters ...
         profilingPstream::addScatterTime();
 
-        if (debug)
+        if (UPstream::debug)
         {
             Pout<< "UOPstream::write : finished write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
@@ -155,7 +154,7 @@ bool Foam::UOPstream::write
 
         if (UPstream::sendModes::sync == sendMode)
         {
-            failed = MPI_Issend
+            returnCode = MPI_Issend
             (
                 const_cast<char*>(buf),
                 bufSize,
@@ -168,7 +167,7 @@ bool Foam::UOPstream::write
         }
         else
         {
-            failed = MPI_Isend
+            returnCode = MPI_Isend
             (
                 const_cast<char*>(buf),
                 bufSize,
@@ -180,7 +179,7 @@ bool Foam::UOPstream::write
             );
         }
 
-        if (debug)
+        if (UPstream::debug)
         {
             Pout<< "UOPstream::write : started write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
@@ -200,7 +199,7 @@ bool Foam::UOPstream::write
             << Foam::abort(FatalError);
     }
 
-    return !failed;
+    return (returnCode == MPI_SUCCESS);
 }
 
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index cf04afdc17..ab99588756 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -167,7 +167,7 @@ bool Foam::UPstream::initNull()
     MPI_Initialized(&flag);
     if (flag)
     {
-        if (debug)
+        if (UPstream::debug)
         {
             Pout<< "UPstream::initNull : was already initialized\n";
         }
@@ -225,7 +225,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
 
             return true;
         }
-        else if (debug)
+        else if (UPstream::debug)
         {
             Pout<< "UPstream::init : was already initialized\n";
         }
@@ -279,7 +279,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
     MPI_Comm_size(MPI_COMM_WORLD, &numprocs);
     MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
 
-    if (debug)
+    if (UPstream::debug)
     {
         Pout<< "UPstream::init :"
             << " thread-support : wanted:" << needsThread
@@ -309,7 +309,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
         // During startup, so worldComm == globalComm
 
         wordList worlds(numprocs);
-        worlds[Pstream::myProcNo(UPstream::globalComm)] = world;
+        worlds[UPstream::myProcNo(UPstream::globalComm)] = world;
         Pstream::gatherList(worlds, UPstream::msgType(), UPstream::globalComm);
 
         // Compact
@@ -336,7 +336,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
         Pstream::broadcasts(UPstream::globalComm, allWorlds_, worldIDs_);
 
         const label myWorldId =
-            worldIDs_[Pstream::myProcNo(UPstream::globalComm)];
+            worldIDs_[UPstream::myProcNo(UPstream::globalComm)];
 
         DynamicList<label> subRanks;
         forAll(worldIDs_, proci)
@@ -363,7 +363,7 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
             procIDs_[UPstream::selfComm].front() = UPstream::myProcNo(subComm);
         }
 
-        if (debug)
+        if (UPstream::debug)
         {
             // Check
             int subNumProcs, subRank;
@@ -422,7 +422,7 @@ void Foam::UPstream::shutdown(int errNo)
             WarningInFunction
                 << "MPI was already finalized (by a connected program?)\n";
         }
-        else if (debug && errNo == 0)
+        else if (UPstream::debug && errNo == 0)
         {
             Pout<< "UPstream::shutdown : was already finalized\n";
         }
@@ -451,7 +451,7 @@ void Foam::UPstream::shutdown(int errNo)
     // Regular cleanup
     // ---------------
 
-    if (debug)
+    if (UPstream::debug)
     {
         Pout<< "UPstream::shutdown\n";
     }
diff --git a/src/Pstream/mpi/UPstreamBroadcast.C b/src/Pstream/mpi/UPstreamBroadcast.C
index 522ce5032e..cc75f95ed5 100644
--- a/src/Pstream/mpi/UPstreamBroadcast.C
+++ b/src/Pstream/mpi/UPstreamBroadcast.C
@@ -47,7 +47,7 @@ bool Foam::UPstream::broadcast
 
     //Needed?  PstreamGlobals::checkCommunicator(comm, rootProcNo);
 
-    if (debug)
+    if (UPstream::debug)
     {
         Pout<< "UPstream::broadcast : root:" << rootProcNo
             << " comm:" << comm
@@ -66,7 +66,7 @@ bool Foam::UPstream::broadcast
 
     profilingPstream::beginTiming();
 
-    bool failed = MPI_Bcast
+    const int returnCode = MPI_Bcast
     (
         buf,
         bufSize,
@@ -77,7 +77,7 @@ bool Foam::UPstream::broadcast
 
     profilingPstream::addBroadcastTime();
 
-    return !failed;
+    return (returnCode == MPI_SUCCESS);
 }
 
 
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index f6d6769309..dd22fa4c47 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -49,7 +49,7 @@ void Foam::PstreamDetail::broadcast0
 
     profilingPstream::beginTiming();
 
-    // const int retval =
+    // const int returnCode =
     MPI_Bcast
     (
         values,
@@ -80,7 +80,7 @@ void Foam::PstreamDetail::reduce0
 
     if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
     {
-        Pout<< "** reducing:";
+        Pout<< "** MPI_Reduce (blocking):";
         if (count == 1)
         {
             Pout<< (*values);
@@ -96,7 +96,7 @@ void Foam::PstreamDetail::reduce0
 
     profilingPstream::beginTiming();
 
-    // const int retval =
+    // const int returnCode =
     MPI_Reduce
     (
         MPI_IN_PLACE,  // recv is also send

From 5eebc758452b733699272f75b9a7e8b0dec2a12e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 14:26:05 +0200
Subject: [PATCH 251/348] ENH: improved UPstream gather/scatter functionality

- added UPstream::allGatherValues() with a direct call to MPI_Allgather.
  This enables possible benefit from a variety of internal algorithms
  and simplifies the caller

    Old:
        labelList nPerProc
        (
            UPstream::listGatherValues<label>(patch_.size(), myComm)
        );
        Pstream::broadcast(nPerProc, myComm);

    New:

        const labelList nPerProc
        (
            UPstream::allGatherValues<label>(patch_.size(), myComm)
        );

- Pstream::allGatherList uses MPI_Allgather for contiguous values
  instead of the hand-rolled tree walking involved with
  gatherList/scatterList.

-
- simplified the calling parameters for mpiGather/mpiScatter.

  Since send/recv data types are identical, the send/recv count
  is also always identical. Eliminates the possibility of any
  discrepancies.

  Since this is a low-level call, it does not affect much code.
  Currently just Foam::profilingPstream and a UPstream internal.

BUG: call to MPI_Allgather had hard-coded MPI_BYTE (not the data type)

- a latent bug since it is currently only passed char data anyhow
---
 .../test/parallel-comm2/Test-parallel-comm2.C |  3 +-
 .../surfaceRedistributePar.C                  |  8 +-
 .../db/IOstreams/Pstreams/PstreamGatherList.C | 27 +++---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  3 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 19 +++-
 .../db/IOstreams/Pstreams/UPstreamTemplates.C | 61 +++++++++----
 .../global/profiling/profilingPstream.C       |  6 +-
 .../parallel/globalIndex/globalIndex.C        | 10 +--
 .../parallel/globalIndex/globalIndex.H        |  1 -
 .../parallel/globalIndex/globalIndexI.H       |  5 +-
 src/Pstream/dummy/UPstreamGatherScatter.C     | 12 +--
 src/Pstream/mpi/UPstreamGatherScatter.C       | 12 +--
 src/Pstream/mpi/UPstreamWrapping.H            | 18 ++--
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 90 ++++++++-----------
 .../mappedPolyPatch/mappedPatchBase.C         | 10 +--
 15 files changed, 140 insertions(+), 145 deletions(-)

diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 7ccd11cf29..d38f35c1b3 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -266,9 +266,8 @@ int main(int argc, char *argv[])
             UPstream::mpiGather
             (
                 myDigest.cdata_bytes(),     // Send
-                SHA1Digest::max_size(),     // Num send per proc
                 digests.data_bytes(),       // Recv
-                SHA1Digest::max_size(),     // Num recv per proc
+                SHA1Digest::max_size(),     // Num send/recv per rank
                 UPstream::commGlobal()
             );
         }
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 80f3bf8b18..83f7fb6644 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -62,10 +62,10 @@ void writeProcStats
 )
 {
     // Determine surface bounding boxes, faces, points
-    List<treeBoundBox> surfBb(Pstream::nProcs());
-    surfBb[Pstream::myProcNo()] = treeBoundBox(s.points());
-    Pstream::gatherList(surfBb);
-
+    List<treeBoundBox> surfBb
+    (
+        UPstream::listGatherValues<treeBoundBox>(treeBoundBox(s.points()))
+    );
     labelList nPoints(UPstream::listGatherValues<label>(s.points().size()));
     labelList nFaces(UPstream::listGatherValues<label>(s.size()));
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
index 44d94933d6..e4dd9f8440 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamGatherList.C
@@ -350,20 +350,19 @@ void Foam::Pstream::allGatherList
 {
     if (UPstream::is_parallel(comm))
     {
-        // TBD
-        // if (std::is_arithmetic<T>::value)   // or is_contiguous ?
-        // {
-        //     if (values.size() != UPstream::nProcs(comm))
-        //     {
-        //         FatalErrorInFunction
-        //             << "Size of list:" << values.size()
-        //             << " != number of processors:"
-        //             << UPstream::nProcs(comm)
-        //             << Foam::abort(FatalError);
-        //     }
-        //     UPstream::mpiAllGather(values.data_bytes(), sizeof(T), comm);
-        //     return;
-        // }
+        if (is_contiguous<T>::value)
+        {
+            if (values.size() < UPstream::nProcs(comm))
+            {
+                FatalErrorInFunction
+                    << "List of values is too small:" << values.size()
+                    << " vs numProcs:" << UPstream::nProcs(comm) << nl
+                    << Foam::abort(FatalError);
+            }
+
+            UPstream::mpiAllGather(values.data_bytes(), sizeof(T), comm);
+            return;
+        }
 
         const auto& comms = UPstream::whichCommunication(comm);
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 331cf4da77..4700064f39 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -91,9 +91,8 @@ static List<int> getHostGroupIds(const label parentCommunicator)
     UPstream::mpiGather
     (
         myDigest.cdata_bytes(),     // Send
-        SHA1Digest::max_size(),     // Num send per proc
         digests.data_bytes(),       // Recv
-        SHA1Digest::max_size(),     // Num recv per proc
+        SHA1Digest::max_size(),     // Num send/recv data per rank
         parentCommunicator
     );
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 9e22089d9d..d164c7ad1a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -1011,10 +1011,10 @@ public:
         (                                                                     \
             /*! On rank: individual value to send */                          \
             const Native* sendData,                                           \
-            int sendCount,                                                    \
             /*! On master: receive buffer with all values */                  \
             Native* recvData,                                                 \
-            int recvCount,                                                    \
+            /*! Number of send/recv data per rank. Globally consistent! */    \
+            int count,                                                        \
             const label communicator = worldComm                              \
         );                                                                    \
                                                                               \
@@ -1023,10 +1023,10 @@ public:
         (                                                                     \
             /*! On master: send buffer with all values */                     \
             const Native* sendData,                                           \
-            int sendCount,                                                    \
             /*! On rank: individual value to receive */                       \
             Native* recvData,                                                 \
-            int recvCount,                                                    \
+            /*! Number of send/recv data per rank. Globally consistent! */    \
+            int count,                                                        \
             const label communicator = worldComm                              \
         );                                                                    \
                                                                               \
@@ -1034,7 +1034,9 @@ public:
         /*! Send data from proc slot, receive into all slots */               \
         static void mpiAllGather                                              \
         (                                                                     \
+            /*! On all ranks: the base of the data locations */               \
             Native* allData,                                                  \
+            /*! Number of send/recv data per rank. Globally consistent! */    \
             int count,                                                        \
             const label communicator = worldComm                              \
         );
@@ -1080,6 +1082,15 @@ public:
 
     // Gather single, contiguous value(s)
 
+        //- Allgather individual values into list locations.
+        //  The returned list has size nProcs, identical on all ranks.
+        template<class T>
+        static List<T> allGatherValues
+        (
+            const T& localValue,
+            const label communicator = worldComm
+        );
+
         //- Gather individual values into list locations.
         //  On master list length == nProcs, otherwise zero length.
         //  \n
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C
index a6b99f6ce9..10065bff3f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamTemplates.C
@@ -27,6 +27,42 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+Foam::List<T> Foam::UPstream::allGatherValues
+(
+    const T& localValue,
+    const label comm
+)
+{
+    if (!is_contiguous<T>::value)
+    {
+        FatalErrorInFunction
+            << "Cannot all-gather values for non-contiguous types" << endl
+            << Foam::abort(FatalError);
+    }
+
+
+    List<T> allValues;
+
+    if (UPstream::is_parallel(comm))
+    {
+        allValues.resize(UPstream::nProcs(comm));
+        allValues[UPstream::myProcNo(comm)] = localValue;
+
+        UPstream::mpiAllGather(allValues.data_bytes(), sizeof(T), comm);
+    }
+    else
+    {
+        // non-parallel: return own value
+        // TBD: only when UPstream::is_rank(comm) as well?
+        allValues.resize(1);
+        allValues[0] = localValue;
+    }
+
+    return allValues;
+}
+
+
 template<class T>
 Foam::List<T> Foam::UPstream::listGatherValues
 (
@@ -44,30 +80,25 @@ Foam::List<T> Foam::UPstream::listGatherValues
 
     List<T> allValues;
 
-    const label nproc =
-    (
-        UPstream::is_parallel(comm) ? UPstream::nProcs(comm) : 1
-    );
-
-    if (nproc > 1)
+    if (UPstream::is_parallel(comm))
     {
         if (UPstream::master(comm))
         {
-            allValues.resize(nproc);
+            allValues.resize(UPstream::nProcs(comm));
         }
 
         UPstream::mpiGather
         (
             reinterpret_cast<const char*>(&localValue),
-            sizeof(T),
             allValues.data_bytes(),
-            sizeof(T),
+            sizeof(T),  // The send/recv size per rank
             comm
         );
     }
     else
     {
         // non-parallel: return own value
+        // TBD: only when UPstream::is_rank(comm) as well?
         allValues.resize(1);
         allValues[0] = localValue;
     }
@@ -91,15 +122,12 @@ T Foam::UPstream::listScatterValues
     }
 
 
-    const label nproc =
-    (
-        UPstream::is_parallel(comm) ? UPstream::nProcs(comm) : 1
-    );
-
     T localValue;
 
-    if (nproc > 1)
+    if (UPstream::is_parallel(comm))
     {
+        const label nproc = UPstream::nProcs(comm);
+
         if (UPstream::master(comm) && allValues.size() < nproc)
         {
             FatalErrorInFunction
@@ -111,9 +139,8 @@ T Foam::UPstream::listScatterValues
         UPstream::mpiScatter
         (
             allValues.cdata_bytes(),
-            sizeof(T),
             reinterpret_cast<char*>(&localValue),
-            sizeof(T),
+            sizeof(T),  // The send/recv size per rank
             comm
         );
     }
diff --git a/src/OpenFOAM/global/profiling/profilingPstream.C b/src/OpenFOAM/global/profiling/profilingPstream.C
index cb6de74904..e7ad9050e0 100644
--- a/src/OpenFOAM/global/profiling/profilingPstream.C
+++ b/src/OpenFOAM/global/profiling/profilingPstream.C
@@ -229,9 +229,8 @@ void Foam::profilingPstream::report(const int reportLevel)
         UPstream::mpiGather
         (
             procValues.cdata_bytes(),   // Send
-            procValues.size_bytes(),    // Num send per proc
             allTimes.data_bytes(),      // Recv
-            procValues.size_bytes(),    // Num recv per proc
+            procValues.size_bytes(),    // Num send/recv data per rank
             UPstream::commWorld()
         );
     }
@@ -249,9 +248,8 @@ void Foam::profilingPstream::report(const int reportLevel)
         UPstream::mpiGather
         (
             procValues.cdata_bytes(),   // Send
-            procValues.size_bytes(),    // Num send per proc
             allCounts.data_bytes(),     // Recv
-            procValues.size_bytes(),    // Num recv per proc
+            procValues.size_bytes(),    // Num send/recv data per rank
             UPstream::commWorld()
         );
     }
diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndex.C b/src/OpenFOAM/parallel/globalIndex/globalIndex.C
index c74a5b356a..924ca62b74 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndex.C
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndex.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "globalIndex.H"
-#include "labelRange.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
@@ -200,14 +199,13 @@ void Foam::globalIndex::reset
 {
     labelList localLens;
 
-    const label len = Pstream::nProcs(comm);
+    const label len = UPstream::nProcs(comm);
 
     if (len)
     {
-        if (parallel && UPstream::parRun())
+        if (parallel && UPstream::parRun())  // or UPstream::is_parallel()
         {
-            localLens = UPstream::listGatherValues(localSize, comm);
-            Pstream::broadcast(localLens, comm);
+            localLens = UPstream::allGatherValues(localSize, comm);
         }
         else
         {
diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndex.H b/src/OpenFOAM/parallel/globalIndex/globalIndex.H
index 49934718d4..372b207ce4 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndex.H
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndex.H
@@ -55,7 +55,6 @@ namespace Foam
 
 // Forward Declarations
 class globalIndex;
-class labelRange;
 
 Istream& operator>>(Istream& is, globalIndex& gi);
 Ostream& operator<<(Ostream& os, const globalIndex& gi);
diff --git a/src/OpenFOAM/parallel/globalIndex/globalIndexI.H b/src/OpenFOAM/parallel/globalIndex/globalIndexI.H
index edf45f5cb8..72ed4a401c 100644
--- a/src/OpenFOAM/parallel/globalIndex/globalIndexI.H
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndexI.H
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ListOps.H"
-#include "labelRange.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -121,7 +120,7 @@ inline Foam::globalIndex::globalIndex
     const label comm
 )
 {
-    // one-sided: non-master only
+    // one-sided: non-master sizes only
     reset
     (
         UPstream::listGatherValues
@@ -401,7 +400,7 @@ inline void Foam::globalIndex::reset
     const label comm
 )
 {
-    // one-sided: non-master only
+    // one-sided: non-master sizes only
     reset
     (
         UPstream::listGatherValues
diff --git a/src/Pstream/dummy/UPstreamGatherScatter.C b/src/Pstream/dummy/UPstreamGatherScatter.C
index 7d2e2d63f9..2d1f125f30 100644
--- a/src/Pstream/dummy/UPstreamGatherScatter.C
+++ b/src/Pstream/dummy/UPstreamGatherScatter.C
@@ -36,28 +36,24 @@ License
 void Foam::UPstream::mpiGather                                                \
 (                                                                             \
     const Native* sendData,                                                   \
-    int sendCount,                                                            \
-                                                                              \
     Native* recvData,                                                         \
-    int recvCount,                                                            \
+    int count,                                                                \
     const label comm                                                          \
 )                                                                             \
 {                                                                             \
-    std::memmove(recvData, sendData, recvCount*sizeof(Native));               \
+    std::memmove(recvData, sendData, count*sizeof(Native));                   \
 }                                                                             \
                                                                               \
                                                                               \
 void Foam::UPstream::mpiScatter                                               \
 (                                                                             \
     const Native* sendData,                                                   \
-    int sendCount,                                                            \
-                                                                              \
     Native* recvData,                                                         \
-    int recvCount,                                                            \
+    int count,                                                                \
     const label comm                                                          \
 )                                                                             \
 {                                                                             \
-    std::memmove(recvData, sendData, recvCount*sizeof(Native));               \
+    std::memmove(recvData, sendData, count*sizeof(Native));                   \
 }                                                                             \
                                                                               \
                                                                               \
diff --git a/src/Pstream/mpi/UPstreamGatherScatter.C b/src/Pstream/mpi/UPstreamGatherScatter.C
index 180a98b9a3..4ed86d685a 100644
--- a/src/Pstream/mpi/UPstreamGatherScatter.C
+++ b/src/Pstream/mpi/UPstreamGatherScatter.C
@@ -38,16 +38,14 @@ License
 void Foam::UPstream::mpiGather                                                \
 (                                                                             \
     const Native* sendData,                                                   \
-    int sendCount,                                                            \
-                                                                              \
     Native* recvData,                                                         \
-    int recvCount,                                                            \
+    int count,                                                                \
     const label comm                                                          \
 )                                                                             \
 {                                                                             \
     PstreamDetail::gather                                                     \
     (                                                                         \
-        sendData, sendCount, recvData, recvCount,                             \
+        sendData, recvData, count,                                            \
         TaggedType, comm                                                      \
     );                                                                        \
 }                                                                             \
@@ -56,16 +54,14 @@ void Foam::UPstream::mpiGather                                                \
 void Foam::UPstream::mpiScatter                                               \
 (                                                                             \
     const Native* sendData,                                                   \
-    int sendCount,                                                            \
-                                                                              \
     Native* recvData,                                                         \
-    int recvCount,                                                            \
+    int count,                                                                \
     const label comm                                                          \
 )                                                                             \
 {                                                                             \
     PstreamDetail::scatter                                                    \
     (                                                                         \
-        sendData, sendCount, recvData, recvCount,                             \
+        sendData, recvData, count,                                            \
         TaggedType, comm                                                      \
     );                                                                        \
 }                                                                             \
diff --git a/src/Pstream/mpi/UPstreamWrapping.H b/src/Pstream/mpi/UPstreamWrapping.H
index 92791503e0..984a4f857e 100644
--- a/src/Pstream/mpi/UPstreamWrapping.H
+++ b/src/Pstream/mpi/UPstreamWrapping.H
@@ -164,12 +164,9 @@ void allToAllConsensus
 template<class Type>
 void gather
 (
-    const Type* sendData,
-    int sendCount,
-
-    Type* recvData,                     // Ignored on non-root rank
-    int recvCount,                      // Ignored on non-root rank
-
+    const Type* sendData,   // Local send value
+    Type* recvData,         // On master: recv buffer. Ignored elsewhere
+    int count,              // Per rank send/recv count. Globally consistent!
     MPI_Datatype datatype,              // The send/recv data type
     const label comm,                   // Communicator
     UPstream::Request* req = nullptr,   // Non-null for non-blocking
@@ -181,12 +178,9 @@ void gather
 template<class Type>
 void scatter
 (
-    const Type* sendData,               // Ignored on non-root rank
-    int sendCount,                      // Ignored on non-root rank
-
-    Type* recvData,
-    int recvCount,
-
+    const Type* sendData,   // On master: send buffer. Ignored elsewhere
+    Type* recvData,         // Local recv value
+    int count,              // Per rank send/recv count. Globally consistent!
     MPI_Datatype datatype,              // The send/recv data type
     const label comm,                   // Communicator
     UPstream::Request* req = nullptr,   // Non-null for non-blocking
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index dd22fa4c47..2e6eb8eb0a 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -924,14 +924,12 @@ template<class Type>
 void Foam::PstreamDetail::gather
 (
     const Type* sendData,
-    int sendCount,
-
     Type* recvData,
-    int recvCount,
 
+    int count,
     MPI_Datatype datatype,
-    const label comm,
 
+    const label comm,
     UPstream::Request* req,
     label* requestID
 )
@@ -940,13 +938,16 @@ void Foam::PstreamDetail::gather
 
     const bool immediate = (req || requestID);
 
-    if (!UPstream::is_rank(comm))
+    if (!UPstream::is_rank(comm) || !count)
     {
         return;
     }
     if (!UPstream::is_parallel(comm))
     {
-        std::memmove(recvData, sendData, recvCount*sizeof(Type));
+        if (recvData)
+        {
+            std::memmove(recvData, sendData, count*sizeof(Type));
+        }
         return;
     }
 
@@ -963,7 +964,7 @@ void Foam::PstreamDetail::gather
             Pout<< "** MPI_Gather (blocking):";
         }
         Pout<< " numProc:" << numProc
-            << " recvCount:" << recvCount
+            << " count:" << count
             << " with comm:" << comm
             << " warnComm:" << UPstream::warnComm
             << endl;
@@ -982,13 +983,9 @@ void Foam::PstreamDetail::gather
         (
             MPI_Igather
             (
-                const_cast<Type*>(sendData),
-                sendCount,
-                datatype,
-                recvData,
-                recvCount,
-                datatype,
-                0,  // (root rank) == UPstream::masterNo()
+                const_cast<Type*>(sendData), count, datatype,
+                recvData, count, datatype,
+                0,  // root: UPstream::masterNo()
                 PstreamGlobals::MPICommunicators_[comm],
                &request
             )
@@ -996,8 +993,7 @@ void Foam::PstreamDetail::gather
         {
             FatalErrorInFunction
                 << "MPI_Igather [comm: " << comm << "] failed."
-                << " sendCount " << sendCount
-                << " recvCount " << recvCount
+                << " count:" << count << nl
                 << Foam::abort(FatalError);
         }
 
@@ -1013,21 +1009,16 @@ void Foam::PstreamDetail::gather
         (
             MPI_Gather
             (
-                const_cast<Type*>(sendData),
-                sendCount,
-                datatype,
-                recvData,
-                recvCount,
-                datatype,
-                0,  // (root rank) == UPstream::masterNo()
+                const_cast<Type*>(sendData), count, datatype,
+                recvData, count, datatype,
+                0,  // root: UPstream::masterNo()
                 PstreamGlobals::MPICommunicators_[comm]
             )
         )
         {
             FatalErrorInFunction
                 << "MPI_Gather [comm: " << comm << "] failed."
-                << " sendCount " << sendCount
-                << " recvCount " << recvCount
+                << " count:" << count << nl
                 << Foam::abort(FatalError);
         }
 
@@ -1040,14 +1031,12 @@ template<class Type>
 void Foam::PstreamDetail::scatter
 (
     const Type* sendData,
-    int sendCount,
-
     Type* recvData,
-    int recvCount,
 
+    int count,
     MPI_Datatype datatype,
-    const label comm,
 
+    const label comm,
     UPstream::Request* req,
     label* requestID
 )
@@ -1056,13 +1045,16 @@ void Foam::PstreamDetail::scatter
 
     const bool immediate = (req || requestID);
 
-    if (!UPstream::is_rank(comm))
+    if (!UPstream::is_rank(comm) || !count)
     {
         return;
     }
     if (!UPstream::is_parallel(comm))
     {
-        std::memmove(recvData, sendData, recvCount*sizeof(Type));
+        if (recvData)
+        {
+            std::memmove(recvData, sendData, count*sizeof(Type));
+        }
         return;
     }
 
@@ -1079,7 +1071,7 @@ void Foam::PstreamDetail::scatter
             Pout<< "** MPI_Scatter (blocking):";
         }
         Pout<< " numProc:" << numProc
-            << " recvCount:" << recvCount
+            << " count:" << count
             << " with comm:" << comm
             << " warnComm:" << UPstream::warnComm
             << endl;
@@ -1098,13 +1090,9 @@ void Foam::PstreamDetail::scatter
         (
             MPI_Iscatter
             (
-                const_cast<Type*>(sendData),
-                sendCount,
-                datatype,
-                recvData,
-                recvCount,
-                datatype,
-                0,  // (root rank) == UPstream::masterNo()
+                const_cast<Type*>(sendData), count, datatype,
+                recvData, count, datatype,
+                0,  // root: UPstream::masterNo()
                 PstreamGlobals::MPICommunicators_[comm],
                &request
             )
@@ -1112,8 +1100,7 @@ void Foam::PstreamDetail::scatter
         {
             FatalErrorInFunction
                 << "MPI_Iscatter [comm: " << comm << "] failed."
-                << " sendCount " << sendCount
-                << " recvCount " << recvCount
+                << " count:" << count << nl
                 << Foam::abort(FatalError);
         }
 
@@ -1129,21 +1116,16 @@ void Foam::PstreamDetail::scatter
         (
             MPI_Scatter
             (
-                const_cast<Type*>(sendData),
-                sendCount,
-                datatype,
-                recvData,
-                recvCount,
-                datatype,
-                0,  // (root rank) == UPstream::masterNo()
+                const_cast<Type*>(sendData), count, datatype,
+                recvData, count, datatype,
+                0,  // root: UPstream::masterNo()
                 PstreamGlobals::MPICommunicators_[comm]
             )
         )
         {
             FatalErrorInFunction
                 << "MPI_Scatter [comm: " << comm << "] failed."
-                << " sendCount " << sendCount
-                << " recvCount " << recvCount
+                << " count:" << count << nl
                 << Foam::abort(FatalError);
         }
 
@@ -1483,8 +1465,8 @@ void Foam::PstreamDetail::allGather
         (
             MPI_Iallgather
             (
-                MPI_IN_PLACE, count, MPI_BYTE,
-                allData, count, MPI_BYTE,
+                MPI_IN_PLACE, count, datatype,
+                allData, count, datatype,
                 PstreamGlobals::MPICommunicators_[comm],
                &request
             )
@@ -1507,8 +1489,8 @@ void Foam::PstreamDetail::allGather
         (
             MPI_Allgather
             (
-                MPI_IN_PLACE, count, MPI_BYTE,
-                allData, count, MPI_BYTE,
+                MPI_IN_PLACE, count, datatype,
+                allData, count, datatype,
                 PstreamGlobals::MPICommunicators_[comm]
             )
         )
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 92421c80f5..00acc4587a 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -240,17 +240,15 @@ void Foam::mappedPatchBase::collectSamples
     {
         labelList procToWorldIndex
         (
-            UPstream::listGatherValues<label>(mySampleWorld, myComm)
+            UPstream::allGatherValues<label>(mySampleWorld, myComm)
         );
         labelList nPerProc
         (
-            UPstream::listGatherValues<label>(patch_.size(), myComm)
+            UPstream::allGatherValues<label>(patch_.size(), myComm)
         );
 
-        Pstream::broadcasts(myComm, procToWorldIndex, nPerProc);
-
-        patchFaceWorlds.setSize(patchFaces.size());
-        patchFaceProcs.setSize(patchFaces.size());
+        patchFaceWorlds.resize(patchFaces.size());
+        patchFaceProcs.resize(patchFaces.size());
 
         label sampleI = 0;
         forAll(nPerProc, proci)

From f15e58d3d5f01f1833df3f4e0c75519dc0fe3c0f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 14:26:05 +0200
Subject: [PATCH 252/348] ENH: add nbx.tuning to enable/disable initial barrier

- to prevent NBX from intercepting previous messages an initial
  barrier can help with synchronization. (Gregor Weiss)
---
 etc/controlDict                               | 30 ++++++++++++++++---
 .../Pstreams/PstreamExchangeConsensus.C       |  8 +++++
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 11 +++++++
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 11 +++++++
 src/OpenFOAM/global/argList/argList.C         | 15 ++++++----
 src/Pstream/mpi/UPstreamWrappingTemplates.C   | 24 ++++++++++-----
 6 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/etc/controlDict b/etc/controlDict
index d605346302..f74e10d1ea 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -82,6 +82,10 @@ InfoSwitches
 
 OptimisationSwitches
 {
+    // ===========
+    // File system
+    // ===========
+
     // Use physical (0) or logical (1) value for the cwd.
     cwd     1;
 
@@ -101,7 +105,7 @@ OptimisationSwitches
     fileModificationChecking timeStampMaster;
 
     //- Parallel IO file handler
-    //  uncollated (default), collated or masterUncollated
+    //  uncollated (default), collated, masterUncollated etc.
     fileHandler uncollated;
 
     //- collated: thread buffer size for queued file writes.
@@ -124,15 +128,24 @@ OptimisationSwitches
     ensight.maxChunk 5000000;
 
 
+    // =====================
+    // MPI/Parallel settings
+    // =====================
+
     // Default communication type (nonBlocking | scheduled | blocking);
     commsType       nonBlocking;
+
+    // Transfer double as float for processor boundaries. Mostly defunct.
     floatTransfer   0;
-    // Number processors to change to tree communication
+
+    // Min number of processors to change to tree communication
     nProcsSimpleSum 0;
-    // Min numProc to use non-blocking exchange algorithm (Hoeffler: NBX)
+
+    // Min number processor to use non-blocking exchange (NBX) algorithm
+    // However, a zero value == disabled.
     nonBlockingExchange 0;
 
-    // MPI buffer size (bytes)
+    // MPI buffer size (bytes).
     // Can override with the MPI_BUFFER_SIZE env variable.
     // The default and minimum is (20000000).
     mpiBufferSize   0;
@@ -151,6 +164,15 @@ OptimisationSwitches
     // instead of waiting for all to complete first.
     nPollProcInterfaces 0;
 
+    // Additional non-blocking exchange (NBX) tuning parameters (experimental)
+    // 0: none, 1: initial barrier
+    nbx.tuning      0;
+
+
+    // =====
+    // Other
+    // =====
+
     // Trap floating point exception.
     // Can override with FOAM_SIGFPE env variable (true|false)
     trapFpe         1;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
index cb529246a7..53894e2ddf 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchangeConsensus.C
@@ -76,6 +76,8 @@ void exchangeConsensus
 {
     static_assert(is_contiguous<Type>::value, "Contiguous data only!");
 
+    const bool initialBarrier = (UPstream::tuning_NBX_ > 0);
+
     const label startOfRequests = UPstream::nRequests();
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
@@ -118,6 +120,12 @@ void exchangeConsensus
         return;
     }
 
+    // An initial barrier may help to avoid synchronisation problems
+    // caused elsewhere
+    if (initialBarrier)
+    {
+        UPstream::barrier(comm);
+    }
 
     // Algorithm NBX: Nonblocking consensus with List containers
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 4700064f39..e78777626f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -808,6 +808,17 @@ registerOptSwitch
     Foam::UPstream::nProcsNonblockingExchange
 );
 
+int Foam::UPstream::tuning_NBX_
+(
+    Foam::debug::optimisationSwitch("nbx.tuning", 0)
+);
+registerOptSwitch
+(
+    "nbx.tuning",
+    int,
+    Foam::UPstream::tuning_NBX_
+);
+
 
 int Foam::UPstream::nPollProcInterfaces
 (
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index d164c7ad1a..dcf731b71b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -298,6 +298,9 @@ public:
         //- Optional maximum message size (bytes)
         static int maxCommsSize;
 
+        //- Tuning parameters for non-blocking exchange (NBX)
+        static int tuning_NBX_;
+
         //- MPI buffer-size (bytes)
         static const int mpiBufferSize;
 
@@ -930,6 +933,8 @@ public:
         //
         //  \note The message tag should be chosen to be a unique value
         //  since the implementation uses probing with ANY_SOURCE !!
+        //  An initial barrier may help to avoid synchronisation problems
+        //  caused elsewhere (See "nbx.tuning" opt switch)
         static void allToAllConsensus
         (
             const UList<int32_t>& sendData,
@@ -950,6 +955,8 @@ public:
         //
         //  \note The message tag should be chosen to be a unique value
         //  since the implementation uses probing with ANY_SOURCE !!
+        //  An initial barrier may help to avoid synchronisation problems
+        //  caused elsewhere (See "nbx.tuning" opt switch)
         static void allToAllConsensus
         (
             const UList<int64_t>& sendData,
@@ -971,6 +978,8 @@ public:
         //
         //  \note The message tag should be chosen to be a unique value
         //  since the implementation uses probing with ANY_SOURCE !!
+        //  An initial barrier may help to avoid synchronisation problems
+        //  caused elsewhere (See "nbx.tuning" opt switch)
         static void allToAllConsensus
         (
             const Map<int32_t>& sendData,
@@ -992,6 +1001,8 @@ public:
         //
         //  \note The message tag should be chosen to be a unique value
         //  since the implementation uses probing with ANY_SOURCE !!
+        //  An initial barrier may help to avoid synchronisation problems
+        //  caused elsewhere (See "nbx.tuning" opt switch)
         static void allToAllConsensus
         (
             const Map<int64_t>& sendData,
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 81e4d0403f..9478b95bf3 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1723,16 +1723,19 @@ void Foam::argList::parse
             }
             Info<< "Pstream initialized with:" << nl
                 << "    floatTransfer      : "
-                << Switch::name(Pstream::floatTransfer) << nl
-                << "    nProcsSimpleSum    : " << Pstream::nProcsSimpleSum << nl
+                << Switch::name(UPstream::floatTransfer) << nl
+                << "    nProcsSimpleSum    : "
+                << UPstream::nProcsSimpleSum << nl
                 << "    nonBlockingExchange: "
-                << Pstream::nProcsNonblockingExchange << nl
+                << UPstream::nProcsNonblockingExchange
+                << " (tuning: " << UPstream::tuning_NBX_ << ')' << nl
                 << "    exchange algorithm : "
                 << PstreamBuffers::algorithm << nl
                 << "    commsType          : "
-                << Pstream::commsTypeNames[Pstream::defaultCommsType] << nl
-                << "    polling iterations : " << Pstream::nPollProcInterfaces
-                << nl;
+                << UPstream::commsTypeNames[UPstream::defaultCommsType] << nl
+                << "    polling iterations : "
+                << UPstream::nPollProcInterfaces << nl;
+
             if (UPstream::allWorlds().size() > 1)
             {
                 Info<< "    worlds             : "
diff --git a/src/Pstream/mpi/UPstreamWrappingTemplates.C b/src/Pstream/mpi/UPstreamWrappingTemplates.C
index 2e6eb8eb0a..caba0bc64d 100644
--- a/src/Pstream/mpi/UPstreamWrappingTemplates.C
+++ b/src/Pstream/mpi/UPstreamWrappingTemplates.C
@@ -503,6 +503,8 @@ void Foam::PstreamDetail::allToAllConsensus
     const label comm
 )
 {
+    const bool initialBarrier = (UPstream::tuning_NBX_ > 0);
+
     if (!UPstream::is_rank(comm))
     {
         return;
@@ -564,11 +566,13 @@ void Foam::PstreamDetail::allToAllConsensus
 
     profilingPstream::beginTiming();
 
-    // If there are synchronisation problems,
-    // a beginning barrier can help, but should not be necessary
-    // when unique message tags are being used.
+    // An initial barrier may help to avoid synchronisation problems
+    // caused elsewhere
+    if (initialBarrier)
+    {
+        MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
+    }
 
-    //// MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
 
     // Start nonblocking synchronous send to process dest
     for (label proci = 0; proci < numProc; ++proci)
@@ -721,6 +725,8 @@ void Foam::PstreamDetail::allToAllConsensus
     const label comm
 )
 {
+    const bool initialBarrier = (UPstream::tuning_NBX_ > 0);
+
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
@@ -764,11 +770,13 @@ void Foam::PstreamDetail::allToAllConsensus
 
     profilingPstream::beginTiming();
 
-    // If there are synchronisation problems,
-    // a beginning barrier can help, but should not be necessary
-    // when unique message tags are being used.
+    // An initial barrier may help to avoid synchronisation problems
+    // caused elsewhere
+    if (initialBarrier)
+    {
+        MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
+    }
 
-    //// MPI_Barrier(PstreamGlobals::MPICommunicators_[comm]);
 
     // Start nonblocking synchronous send to process dest
 

From 9cd14bc8b0313226298edfb4c6553aeb65deca0b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 May 2023 19:09:19 +0200
Subject: [PATCH 253/348] STYLE: remove unused isWriteProc() methods from
 distribute fields

---
 .../redistributePar/parFvFieldDistributor.H   | 30 ++++++-------------
 .../parLagrangianDistributor.H                | 14 ++++-----
 .../parPointFieldDistributor.H                | 28 +++++------------
 .../distributed/faMeshDistributor.H           | 30 ++++++-------------
 4 files changed, 32 insertions(+), 70 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
index cb4a76a304..a864c30f7d 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
@@ -86,12 +86,6 @@ class parFvFieldDistributor
         //- Construct per-patch addressing
         void createPatchFaceMaps();
 
-        //- No copy construct
-        parFvFieldDistributor(const parFvFieldDistributor&) = delete;
-
-        //- No copy assignment
-        void operator=(const parFvFieldDistributor&) = delete;
-
 
 public:
 
@@ -99,6 +93,15 @@ public:
     static int verbose_;
 
 
+    // Generated Methods
+
+        //- No copy construct
+        parFvFieldDistributor(const parFvFieldDistributor&) = delete;
+
+        //- No copy assignment
+        void operator=(const parFvFieldDistributor&) = delete;
+
+
     // Constructors
 
         //- Construct from components
@@ -118,21 +121,6 @@ public:
 
     // Member Functions
 
-        //- Get status of write enabled (on this proc)
-        bool isWriteProc() const noexcept
-        {
-            return isWriteProc_;
-        }
-
-        //- Change status of write enabled (on this proc)
-        bool isWriteProc(const bool on) noexcept
-        {
-            bool old(isWriteProc_);
-            isWriteProc_ = on;
-            return old;
-        }
-
-
         //- Helper: reconstruct and write mesh points
         //  (note: should be moved to something like processorMeshes class)
         void reconstructPoints();
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H
index ad1bfbfe38..6ce206e795 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.H
@@ -80,7 +80,13 @@ class parLagrangianDistributor
         labelList destinationCell_;
 
 
-    // Private Member Functions
+public:
+
+    //- Output verbosity when writing
+    static int verbose_;
+
+
+    // Generated Methods
 
         //- No copy construct
         parLagrangianDistributor(const parLagrangianDistributor&) = delete;
@@ -89,12 +95,6 @@ class parLagrangianDistributor
         void operator=(const parLagrangianDistributor&) = delete;
 
 
-public:
-
-    //- Output verbosity when writing
-    static int verbose_;
-
-
     // Constructors
 
         //- Construct from components
diff --git a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
index 70307d7e28..855514bb96 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
@@ -98,7 +98,13 @@ class parPointFieldDistributor
         bool isWriteProc_;
 
 
-    // Private Member Functions
+public:
+
+    //- Output verbosity when writing
+    static int verbose_;
+
+
+    // Generated Methods
 
         //- No copy construct
         parPointFieldDistributor(const parPointFieldDistributor&) = delete;
@@ -107,12 +113,6 @@ class parPointFieldDistributor
         void operator=(const parPointFieldDistributor&) = delete;
 
 
-public:
-
-    //- Output verbosity when writing
-    static int verbose_;
-
-
     // Constructors
 
         //- Basic construction
@@ -178,20 +178,6 @@ public:
             const mapDistributePolyMesh& distMap
         );
 
-        //- Get status of write enabled (on this proc)
-        bool isWriteProc() const noexcept
-        {
-            return isWriteProc_;
-        }
-
-        //- Change status of write enabled (on this proc)
-        bool isWriteProc(const bool on) noexcept
-        {
-            bool old(isWriteProc_);
-            isWriteProc_ = on;
-            return old;
-        }
-
 
     // Field Mapping
 
diff --git a/src/finiteArea/distributed/faMeshDistributor.H b/src/finiteArea/distributed/faMeshDistributor.H
index 47afc8c7c2..69d9f80e68 100644
--- a/src/finiteArea/distributed/faMeshDistributor.H
+++ b/src/finiteArea/distributed/faMeshDistributor.H
@@ -99,12 +99,6 @@ class faMeshDistributor
             const labelUList& boundaryProcAddr
         );
 
-        //- No copy construct
-        faMeshDistributor(const faMeshDistributor&) = delete;
-
-        //- No copy assignment
-        void operator=(const faMeshDistributor&) = delete;
-
 
 public:
 
@@ -112,6 +106,15 @@ public:
     static int verbose_;
 
 
+    // Generated Methods
+
+        //- No copy construct
+        faMeshDistributor(const faMeshDistributor&) = delete;
+
+        //- No copy assignment
+        void operator=(const faMeshDistributor&) = delete;
+
+
     // Constructors
 
         //- Construct from components
@@ -148,21 +151,6 @@ public:
 
     // Member Functions
 
-        //- Get status of write enabled (on this proc)
-        bool isWriteProc() const noexcept
-        {
-            return isWriteProc_;
-        }
-
-        //- Change status of write enabled (on this proc)
-        bool isWriteProc(const bool on) noexcept
-        {
-            bool old(isWriteProc_);
-            isWriteProc_ = on;
-            return old;
-        }
-
-
     // Field Mapping
 
         //- Read, distribute and write all/selected point field types

From 505704d29061000e2115462fe0aa3d7b484168e0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 25 Jan 2023 13:21:44 +0000
Subject: [PATCH 254/348] ENH: allow numberOfSubdomains to be optional in
 parallel

- allows for a missing or empty file
---
 .../decompositionMethod/decompositionMethod.C | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index e1fcbdab12..5851e8e1f3 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -84,14 +84,25 @@ Foam::label Foam::decompositionMethod::nDomains
     const word& regionName
 )
 {
-    const label nDomainsGlobal = decompDict.get<label>("numberOfSubdomains");
+    label nDomainsRegion = 0;
+    label nDomainsGlobal = UPstream::nProcs();
+
+    // Allow numberOfSubdomains to be optional in parallel, which allows
+    // for missing files on directories that have not yet been created.
+
+    decompDict.readEntry<label>
+    (
+        "numberOfSubdomains",
+        nDomainsGlobal,
+        keyType::REGEX,  // keyType::LITERAL?
+        (UPstream::parRun() ? IOobject::LAZY_READ : IOobject::MUST_READ)
+    );
 
     if (!regionName.empty())
     {
         const dictionary& regionDict =
             optionalRegionDict(decompDict, regionName);
 
-        label nDomainsRegion;
         if (regionDict.readIfPresent("numberOfSubdomains", nDomainsRegion))
         {
             if (nDomainsRegion >= 1 && nDomainsRegion <= nDomainsGlobal)
@@ -100,9 +111,9 @@ Foam::label Foam::decompositionMethod::nDomains
             }
 
             WarningInFunction
-                << "ignoring out of range numberOfSubdomains "
-                << nDomainsRegion << " for region " << regionName
-                << nl << nl
+                << "Ignoring region [" << regionName
+                << "] numberOfSubdomains: " << nDomainsRegion
+                << ", using global: " << nDomainsGlobal << nl
                 << endl;
         }
     }

From 16064b60e2c98b68570ee926c382c3d64f5fe7b4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 25 Jan 2023 13:21:44 +0000
Subject: [PATCH 255/348] ENH: respect IOobject::readOpt in hexRef8 constructor

---
 .../polyTopoChange/hexRef8/hexRef8Data.C      | 44 +++++++++++++++----
 .../polyTopoChange/hexRef8/hexRef8Data.H      | 18 ++++----
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index 38bba1898b..78bb1bfe48 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -40,6 +40,16 @@ License
 
 Foam::hexRef8Data::hexRef8Data(const IOobject& io)
 {
+    if
+    (
+        // Or: !io.anyRead() ?
+        io.readOpt() != IOobject::MUST_READ
+     && io.readOpt() != IOobject::LAZY_READ
+    )
+    {
+        return;
+    }
+
     {
         typedef labelIOList Type;
         IOobject rio(io, "cellLevel");
@@ -237,8 +247,7 @@ void Foam::hexRef8Data::sync(const IOobject& io)
 {
     const polyMesh& mesh = dynamic_cast<const polyMesh&>(io.db());
 
-    bool hasCellLevel = returnReduceOr(bool(cellLevelPtr_));
-    if (hasCellLevel && !cellLevelPtr_)
+    if (returnReduceOr(cellLevelPtr_) && !cellLevelPtr_)
     {
         IOobject rio(io, "cellLevel");
         rio.readOpt(IOobject::NO_READ);
@@ -247,9 +256,13 @@ void Foam::hexRef8Data::sync(const IOobject& io)
             new labelIOList(rio, labelList(mesh.nCells(), Zero))
         );
     }
+    // Take over IOobject settings
+    if (cellLevelPtr_)
+    {
+        cellLevelPtr_->IOobjectOption::operator=(io);
+    }
 
-    bool hasPointLevel = returnReduceOr(bool(pointLevelPtr_));
-    if (hasPointLevel && !pointLevelPtr_)
+    if (returnReduceOr(pointLevelPtr_) && !pointLevelPtr_)
     {
         IOobject rio(io, "pointLevel");
         rio.readOpt(IOobject::NO_READ);
@@ -258,12 +271,16 @@ void Foam::hexRef8Data::sync(const IOobject& io)
             new labelIOList(rio, labelList(mesh.nPoints(), Zero))
         );
     }
+    // Take over IOobject settings
+    if (pointLevelPtr_)
+    {
+        pointLevelPtr_->IOobjectOption::operator=(io);
+    }
 
-    bool hasLevel0Edge = returnReduceOr(bool(level0EdgePtr_));
-    if (hasLevel0Edge)
+    if (returnReduceOr(level0EdgePtr_))
     {
         // Get master length
-        scalar masterLen = (Pstream::master() ? level0EdgePtr_().value() : 0);
+        scalar masterLen = (UPstream::master() ? level0EdgePtr_().value() : 0);
         Pstream::broadcast(masterLen);
         if (!level0EdgePtr_)
         {
@@ -275,14 +292,23 @@ void Foam::hexRef8Data::sync(const IOobject& io)
             );
         }
     }
+    // Take over IOobject settings
+    if (level0EdgePtr_)
+    {
+        level0EdgePtr_->IOobjectOption::operator=(io);
+    }
 
-    bool hasHistory = returnReduceOr(bool(refHistoryPtr_));
-    if (hasHistory && !refHistoryPtr_)
+    if (returnReduceOr(refHistoryPtr_) && !refHistoryPtr_)
     {
         IOobject rio(io, "refinementHistory");
         rio.readOpt(IOobject::NO_READ);
         refHistoryPtr_.reset(new refinementHistory(rio, mesh.nCells(), true));
     }
+    // Take over IOobject settings
+    if (refHistoryPtr_)
+    {
+        refHistoryPtr_->IOobjectOption::operator=(io);
+    }
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
index 39627b8496..8363c3839a 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef hexRef8Data_H
-#define hexRef8Data_H
+#ifndef Foam_hexRef8Data_H
+#define Foam_hexRef8Data_H
 
 #include "labelIOList.H"
 #include "uniformDimensionedFields.H"
@@ -71,7 +71,9 @@ class hexRef8Data
         autoPtr<refinementHistory> refHistoryPtr_;
 
 
-    // Private Member Functions
+public:
+
+    // Generated Methods
 
         //- No copy construct
         hexRef8Data(const hexRef8Data&) = delete;
@@ -80,12 +82,10 @@ class hexRef8Data
         void operator=(const hexRef8Data&) = delete;
 
 
-public:
-
     // Constructors
 
-        //- Construct read. Has special provision for only some processors
-        //- having the files so can be used in redistribution.
+        //- Construct from IOobject, reading if MUST_READ or LAZY_READ.
+        //- Use sync() if used in redistributing to different number of ranks
         explicit hexRef8Data(const IOobject& io);
 
         //- Construct as subset
@@ -114,7 +114,7 @@ public:
     // Member Functions
 
         //- Parallel synchronise. This enforces valid objects on all processors
-        //  (even if they don't have a mesh). Used by redistributePar.
+        //- (even if they don't have a mesh). Used by redistributePar.
         void sync(const IOobject& io);
 
         //- Update local numbering for changed mesh.

From 1abea53d1a2687221eafc5db04ebc1378bf7d4be Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 11 May 2023 08:53:50 +0200
Subject: [PATCH 256/348] ENH: lazy reading of old volume, old surface area

- avoid explicit isFile() check in favour of a lazy-read.
  With redistributePar + fileHandler, for example, it is possible that
  the master processor finds file but not the subprocs

ENH: lazy reading of tetBasePtIs

- delay reading until needed

Co-authored-by: Mark Olesen <>
---
 src/OpenFOAM/meshes/polyMesh/polyMesh.C | 19 +++--
 src/finiteArea/faMesh/faMesh.C          | 72 ++++++++++++-------
 src/finiteVolume/fvMesh/fvMesh.C        | 96 +++++++++++++------------
 3 files changed, 111 insertions(+), 76 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 5a8a820d65..b24c973db2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -153,8 +153,9 @@ Foam::autoPtr<Foam::labelIOList> Foam::polyMesh::readTetBasePtIs() const
         instance(),
         meshSubDir,
         *this,
-        IOobject::READ_IF_PRESENT,
-        IOobject::NO_WRITE
+        IOobject::LAZY_READ,
+        IOobject::NO_WRITE,
+        IOobject::NO_REGISTER
     );
 
     if (io.typeHeaderOk<labelIOList>(true))
@@ -244,7 +245,7 @@ Foam::polyMesh::polyMesh(const IOobject& io, const bool doInit)
     comm_(UPstream::worldComm),
     geometricD_(Zero),
     solutionD_(Zero),
-    tetBasePtIsPtr_(readTetBasePtIs()),
+    tetBasePtIsPtr_(nullptr),
     cellTreePtr_(nullptr),
     pointZones_
     (
@@ -908,6 +909,11 @@ const Foam::labelIOList& Foam::polyMesh::tetBasePtIs() const
                 << endl;
         }
 
+        labelList basePts
+        (
+            polyMeshTetDecomposition::findFaceBasePts(*this)
+        );
+
         tetBasePtIsPtr_.reset
         (
             new labelIOList
@@ -918,10 +924,11 @@ const Foam::labelIOList& Foam::polyMesh::tetBasePtIs() const
                     instance(),
                     meshSubDir,
                     *this,
-                    IOobject::READ_IF_PRESENT,
-                    IOobject::NO_WRITE
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
-                polyMeshTetDecomposition::findFaceBasePts(*this)
+                std::move(basePts)
             )
         );
     }
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index c164959cca..eadb9eb7a0 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -421,21 +421,33 @@ Foam::faMesh::faMesh
         faMesh::init(false);  // do not init lower levels
     }
 
-    if (doInit && fileHandler().isFile(pMesh.time().timePath()/"S0"))
+    if (doInit)
     {
-        S0Ptr_ = new DimensionedField<scalar, areaMesh>
+        // Read some optional fields
+        // - logic as per fvMesh
+
+        IOobject rio
         (
-            IOobject
-            (
-                "S0",
-                time().timeName(),
-                faMesh::meshSubDir,
-                faMesh::thisDb(),
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            *this
+            "name",
+            time().timeName(),
+            faMesh::meshSubDir,
+            faMesh::thisDb(),
+            IOobject::LAZY_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         );
+
+        // Read old surface areas (if present)
+        rio.resetHeader("S0");
+        if (returnReduceOr(rio.typeHeaderOk<regIOobject>(false)))
+        {
+            S0Ptr_ = new DimensionedField<scalar, areaMesh>
+            (
+                rio,
+                *this,
+                dimensionedScalar(dimArea, Zero)
+            );
+        }
     }
 }
 
@@ -680,21 +692,33 @@ Foam::faMesh::faMesh
         faMesh::init(false);  // do not init lower levels
     }
 
-    if (doInit && fileHandler().isFile(pMesh.time().timePath()/"S0"))
+    if (doInit)
     {
-        S0Ptr_ = new DimensionedField<scalar, areaMesh>
+        // Read old surface areas (if present)
+        // - logic as per fvMesh
+
+        IOobject rio
         (
-            IOobject
-            (
-                "S0",
-                time().timeName(),
-                faMesh::meshSubDir,
-                faMesh::thisDb(),
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            *this
+            "name",
+            time().timeName(),
+            faMesh::meshSubDir,
+            faMesh::thisDb(),
+            IOobject::LAZY_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
         );
+
+        // Read old surface areas (if present)
+        rio.resetHeader("S0");
+        if (returnReduceOr(rio.typeHeaderOk<regIOobject>(false)))
+        {
+            S0Ptr_ = new DimensionedField<scalar, areaMesh>
+            (
+                rio,
+                *this,
+                dimensionedScalar(dimArea, Zero)
+            );
+        }
     }
 }
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index f2759e7cdd..6425e3516c 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -176,20 +176,14 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
             *V00Ptr_ = *V0Ptr_;
         }
 
-        if (V0Ptr_)
+        if (!V0Ptr_)
         {
-            // Copy V into V0 storage
-            V0Ptr_->scalarField::operator=(V);
-        }
-        else
-        {
-            // Allocate V0 storage, fill with V
             V0Ptr_ = new DimensionedField<scalar, volMesh>
             (
                 IOobject
                 (
                     "V0",
-                    time().timeName(),
+                    this->time().timeName(),
                     *this,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
@@ -198,13 +192,14 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
                 *this,
                 dimVolume
             );
-            scalarField& V0 = *V0Ptr_;
             // Note: V0 now sized with current mesh, not with (potentially
             //       different size) V.
-            V0.resize_nocopy(V.size());
-            V0 = V;
+            V0Ptr_->scalarField::resize_nocopy(V.size());
         }
 
+        // Copy V into V0 storage
+        V0Ptr_->scalarField::operator=(V);
+
         curTimeIndex_ = time().timeIndex();
 
         if (debug)
@@ -285,53 +280,62 @@ bool Foam::fvMesh::init(const bool doInit)
         polyMesh::init(doInit);
     }
 
-    // Check the existence of the cell volumes and read if present
-    // and set the storage of V00
-    if (fileHandler().isFile(time().timePath()/dbDir()/"V0"))
+    // Read some optional fields
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // For redistributePar + fileHandler can have master processor
+    // find the file but not the subprocs.
+
+    IOobject rio
+    (
+        "none",
+        this->time().timeName(),
+        *this,
+        IOobject::LAZY_READ,
+        IOobject::NO_WRITE,
+        IOobject::NO_REGISTER
+    );
+
+
+    // Read old cell volumes (if present) and set the storage of V00
+    rio.resetHeader("V0");
+    if (returnReduceOr(rio.typeHeaderOk<regIOobject>(false)))
     {
-        // Set the moving flag early in case the demand-driven geometry
-        // construction checks for it
-        moving(true);
+        DebugInFunction
+            << "Detected V0: " << rio.objectRelPath() << nl;
 
         V0Ptr_ = new DimensionedField<scalar, volMesh>
         (
-            IOobject
-            (
-                "V0",
-                time().timeName(),
-                *this,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                IOobject::NO_REGISTER
-            ),
-            *this
+            rio,
+            *this,
+            dimensionedScalar(dimVol, Zero)
         );
 
-        V00();
-    }
-
-    // Check the existence of the mesh fluxes, read if present and set the
-    // mesh to be moving
-    if (fileHandler().isFile(time().timePath()/dbDir()/"meshPhi"))
-    {
-        // Set the moving flag early in case the demand-driven geometry
+        // Set the moving flag early in case demand-driven geometry
         // construction checks for it
         moving(true);
 
+        (void)V00();
+    }
+
+
+    // Read mesh fluxes (if present) and set the mesh to be moving
+    rio.resetHeader("meshPhi");
+    if (returnReduceOr(rio.typeHeaderOk<regIOobject>(false)))
+    {
+        DebugInFunction
+            << "Detected meshPhi: " << rio.objectRelPath() << nl;
+
         phiPtr_ = new surfaceScalarField
         (
-            IOobject
-            (
-                "meshPhi",
-                time().timeName(),
-                *this,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                IOobject::NO_REGISTER
-            ),
-            *this
+            rio,
+            *this,
+            dimensionedScalar(dimVol/dimTime, Zero)
         );
 
+        // Set the moving flag early in case demand-driven geometry
+        // construction checks for it
+        moving(true);
+
         // The mesh is now considered moving so the old-time cell volumes
         // will be required for the time derivatives so if they haven't been
         // read initialise to the current cell volumes
@@ -342,7 +346,7 @@ bool Foam::fvMesh::init(const bool doInit)
                 IOobject
                 (
                     "V0",
-                    time().timeName(),
+                    this->time().timeName(),
                     *this,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,

From 11742301f1c4a5d78f3285f0f8a58254bbaac2da Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 25 Apr 2023 09:57:57 +0200
Subject: [PATCH 257/348] ENH: add support for file/directory broadcasting

Co-authored-by: mattijs <mattijs>
---
 applications/test/broadcastCopy/Make/files    |   3 +
 applications/test/broadcastCopy/Make/options  |   2 +
 .../test/broadcastCopy/Test-broadcastCopy.C   |  97 ++++
 src/OpenFOAM/Make/files                       |   1 +
 .../fileOperation/fileOperation.H             |  17 +
 .../fileOperation/fileOperationBroadcast.C    | 415 ++++++++++++++++++
 6 files changed, 535 insertions(+)
 create mode 100644 applications/test/broadcastCopy/Make/files
 create mode 100644 applications/test/broadcastCopy/Make/options
 create mode 100644 applications/test/broadcastCopy/Test-broadcastCopy.C
 create mode 100644 src/OpenFOAM/global/fileOperations/fileOperation/fileOperationBroadcast.C

diff --git a/applications/test/broadcastCopy/Make/files b/applications/test/broadcastCopy/Make/files
new file mode 100644
index 0000000000..14f89956da
--- /dev/null
+++ b/applications/test/broadcastCopy/Make/files
@@ -0,0 +1,3 @@
+Test-broadcastCopy.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-broadcastCopy
diff --git a/applications/test/broadcastCopy/Make/options b/applications/test/broadcastCopy/Make/options
new file mode 100644
index 0000000000..18e6fe47af
--- /dev/null
+++ b/applications/test/broadcastCopy/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/broadcastCopy/Test-broadcastCopy.C b/applications/test/broadcastCopy/Test-broadcastCopy.C
new file mode 100644
index 0000000000..4c0ff2febf
--- /dev/null
+++ b/applications/test/broadcastCopy/Test-broadcastCopy.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Description
+    Test file/directory broadcasting
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "OSspecific.H"
+#include "fileOperation.H"
+#include "Pstream.H"
+#include "Switch.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noFunctionObjects();
+    argList::noCheckProcessorDirectories();
+
+    argList::addNote("Test broadcast file via MPI");
+
+    argList::addArgument("srcFile");
+    argList::addBoolOption("even", "Broadcast to even directories only");
+    argList::addBoolOption("relative", "Copy relative to output dir");
+
+    #include "setRootCase.H"
+
+    const auto srcFile = args.get<fileName>(1);
+
+    // const auto dstFile = args.get<fileName>(2);
+    fileName dstFile("proc" + Foam::name(UPstream::myProcNo()));
+
+
+    const bool writeOnProc =
+    (
+        !args.found("even") || 0 == (UPstream::myProcNo() % 2)
+    );
+
+    if (args.found("relative"))
+    {
+        // if (writeOnProc)
+        // {
+        //     Foam::mkDir(dstFile);
+        // }
+    }
+    else
+    {
+        dstFile /= srcFile + ".copy";
+    }
+
+    Pout<< "writing: " << writeOnProc << " : " << dstFile << endl;
+
+    const auto& fp = fileHandler();
+
+    fp.broadcastCopy
+    (
+        UPstream::worldComm,
+        writeOnProc,
+        srcFile,
+        dstFile
+    );
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index f9bb85e565..93f42ea300 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -18,6 +18,7 @@ global/etcFiles/etcFiles.C
 
 fileOps = global/fileOperations
 $(fileOps)/fileOperation/fileOperation.C
+$(fileOps)/fileOperation/fileOperationBroadcast.C
 $(fileOps)/fileOperationInitialise/fileOperationInitialise.C
 $(fileOps)/uncollatedFileOperation/uncollatedFileOperation.C
 $(fileOps)/masterUncollatedFileOperation/masterUncollatedFileOperation.C
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 8da0f46275..7f020e8878 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -379,6 +379,23 @@ public:
                 const bool emptyOnly = false
             ) const = 0;
 
+            //- Read dir/file (recursively if necessary) on master of the
+            //- communicator, send and write contents to all 'writeOnProc'
+            //- processors with local file name
+            //  \param comm the communicator for broadcasting
+            //  \param writeOnProc write on the processor
+            //  \param src the source file/directory
+            //  \param dst the target file/directory.
+            //      If empty, treat as being identical to the src.
+            virtual bool broadcastCopy
+            (
+                const label comm,
+                const bool writeOnProc,
+                const fileName& src,
+                const fileName& dst
+                // always recreates links
+            ) const;
+
 
         // (reg)IOobject functionality
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationBroadcast.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationBroadcast.C
new file mode 100644
index 0000000000..2d61a91f94
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationBroadcast.C
@@ -0,0 +1,415 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022-2023 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 "fileOperation.H"
+#include "Pstream.H"
+#include "OSspecific.H"
+#include <fstream>
+#include <cinttypes>
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Implementation for broadcasting an individual file
+static void broadcastFile_single
+(
+    const label comm,
+    const bool writeOnProc,
+    const fileName& srcName,
+    const fileName& dstName,
+    DynamicList<char>& buffer
+)
+{
+    if (fileOperation::debug)
+    {
+        InfoInFunction
+            << "Reading file " << srcName
+            << " on master processor and copying to " << dstName
+            << endl;
+    }
+
+    // Read file on master, broadcast to all but write on IOranks only.
+    // This is a lot easier / possibly quicker?
+    // than -allocating our own IO communicator
+    // -send to all IO subProcs -releasing communicator
+
+    // The file length uses uint64_t instead of off_t
+    // since MINGW has something odd for off_t:
+    //
+    // ... error: call of overloaded 'min(off_t&, off_t&)' is ambiguous
+
+    // Tuple2<off_t, mode_t> lengthAndMode(0, 0);
+    Tuple2<uint64_t, mode_t> lengthAndMode(0, 0);
+
+    std::unique_ptr<std::ifstream> srcStream;
+    std::unique_ptr<std::ofstream> dstStream;
+
+    if (UPstream::master(comm))
+    {
+        // Read (see newIFstream)
+        lengthAndMode.first() = Foam::fileSize(srcName);
+        lengthAndMode.second() = Foam::mode(srcName);
+
+        srcStream.reset
+        (
+            new std::ifstream
+            (
+                srcName,
+                std::ios_base::in | std::ios_base::binary
+            )
+        );
+        if (!srcStream->good())
+        {
+            FatalIOErrorInFunction(srcName)
+                << "Could not open file for reading!"
+                << exit(FatalIOError);
+        }
+    }
+
+    if
+    (
+        writeOnProc
+     &&
+        (
+            UPstream::master(comm)
+          ? (srcName != dstName)
+          : UPstream::is_subrank(comm)
+        )
+    )
+    {
+        // Make sure the destination directory exists.
+        // - will fail itself if not possible
+        // - no-op if directory already exists
+        Foam::mkDir(dstName.path());
+
+        dstStream.reset
+        (
+            new std::ofstream
+            (
+                dstName,
+                std::ios_base::out | std::ios_base::binary
+            )
+        );
+
+        if (!dstStream->good())
+        {
+            // Fail noisily or silently?
+            if (!dstStream->good())
+            {
+                dstStream.reset(nullptr);
+            }
+        }
+
+        // Adjust mode?
+        // Foam::chMode(dstName, fileMode);
+    }
+
+    // Broadcast size and mode (contiguous data)
+    UPstream::broadcast
+    (
+        reinterpret_cast<char*>(&lengthAndMode),
+        sizeof(lengthAndMode),
+        comm
+    );
+
+    uint64_t fileLength = lengthAndMode.first();
+
+    const uint64_t maxChunkSize =
+    (
+        UPstream::maxCommsSize > 0
+      ? uint64_t(UPstream::maxCommsSize)
+      : uint64_t(pTraits<int>::max)
+    );
+
+
+    while (fileLength > 0)
+    {
+        const uint64_t sendSize = min(fileLength, maxChunkSize);
+        fileLength -= sendSize;
+
+        // Read file contents into a character buffer
+        buffer.resize_nocopy(static_cast<label>(sendSize));
+
+        if (srcStream)
+        {
+            srcStream->read(buffer.data_bytes(), buffer.size_bytes());
+        }
+
+        UPstream::broadcast(buffer.data_bytes(), buffer.size_bytes(), comm);
+
+        if (dstStream)
+        {
+            dstStream->write(buffer.data_bytes(), buffer.size_bytes());
+        }
+    }
+}
+
+
+// Implementation for broadcasting directory contents or an individual file
+static bool broadcastFile_recursive
+(
+    const label comm,
+    const bool writeOnProc,
+    const fileName& src,
+    const fileName& dst,
+    // const bool followLink
+    DynamicList<char>& buffer
+)
+{
+    // Read file on master, broadcast to all but write on procs with doWrite
+    // only. This is a lot easier / possibly quicker?
+    // than -allocating our own IO communicator
+    // -send to all IO subProcs -releasing communicator
+
+    if (fileOperation::debug)
+    {
+        InfoInFunction
+            << "Reading " << src
+            << " on master processor and writing a copy to " << dst
+            << endl;
+    }
+
+    fileName::Type srcType;
+    if (UPstream::master(comm))
+    {
+        srcType = src.type(false);  // followLink = false, gzip = false
+    }
+
+    UPstream::broadcast
+    (
+        reinterpret_cast<char*>(&srcType),  // contiguous data
+        sizeof(srcType),
+        comm
+    );
+
+    // Check type of source file.
+    if (srcType == fileName::FILE)
+    {
+        broadcastFile_single(comm, writeOnProc, src, dst, buffer);
+    }
+    else if (srcType == fileName::SYMLINK)
+    {
+        WarningInFunction<< "Copying symbolic links not supported" << endl;
+
+        // Read the link target
+        fileName linkTarget;
+        if (UPstream::master(comm))
+        {
+            linkTarget = Foam::readLink(src);
+        }
+        Pstream::broadcast(linkTarget, comm);
+
+        if
+        (
+            writeOnProc
+         &&
+            (
+                UPstream::master(comm)
+              ? (src != dst)
+              : UPstream::is_subrank(comm)
+            )
+        )
+        {
+            // Recreate softlink on remote processor
+            return Foam::ln(linkTarget, dst);
+        }
+    }
+    else if (srcType == fileName::DIRECTORY)
+    {
+        // Copy files
+        {
+            fileNameList files;
+            if (UPstream::master(comm))
+            {
+                files = Foam::readDir
+                (
+                    src,
+                    fileName::FILE,
+                    false  // Never trim '.gz' ending
+                    //followLink
+                );
+            }
+            Pstream::broadcast(files, comm);
+
+            for (const fileName& item : files)
+            {
+                // File to file
+                broadcastFile_recursive
+                (
+                    comm,
+                    writeOnProc,
+                    src/item,
+                    dst/item,
+                    //followLink
+                    buffer
+                );
+            }
+        }
+
+        // Copy softlinks
+        {
+            fileNameList files;
+            if (UPstream::master(comm))
+            {
+                files = Foam::readDir
+                (
+                    src,
+                    fileName::SYMLINK,
+                    false  // Never trim '.gz' ending
+                    //followLink
+                );
+            }
+            Pstream::broadcast(files, comm);
+
+            for (const fileName& item : files)
+            {
+                // Softlink to softlink
+                broadcastFile_recursive
+                (
+                    comm,
+                    writeOnProc,
+                    src/item,
+                    dst/item,
+                    //followLink
+                    buffer
+                );
+            }
+        }
+
+
+        // Copy sub directories
+        {
+            fileNameList dirs;
+            if (UPstream::master(comm))
+            {
+                dirs = Foam::readDir
+                (
+                    src,
+                    fileName::DIRECTORY,
+                    false  // Never trim '.gz' ending
+                    //followLink
+                );
+            }
+            Pstream::broadcast(dirs, comm);
+
+            for (const fileName& item : dirs)
+            {
+                // Dir to Dir
+                broadcastFile_recursive
+                (
+                    comm,
+                    writeOnProc,
+                    src/item,
+                    dst/item,
+                    //followLink
+                    buffer
+                );
+            }
+        }
+    }
+    else if (srcType == fileName::UNDEFINED)
+    {
+        WarningInFunction<< "No known file type: " << src << endl;
+        return false;
+    }
+    else
+    {
+        return false;
+    }
+
+    return true;
+}
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+bool Foam::fileOperation::broadcastCopy
+(
+    const label comm,
+    const bool writeOnProc,
+    const fileName& srcPath,
+    const fileName& dstPath
+    //const bool followLink
+) const
+{
+    DynamicList<char> fileContents;
+
+
+    // FUTURE:
+    // Handling with broadcast of file -> directory etc
+    // as per Foam::cp()
+    //
+    // However, this adds extra communicattion and logic etc...
+
+#if 0
+    const fileName::Type srcType = src.type(followLink);
+
+    // Check type of source file.
+    if (srcType == fileName::FILE)
+    {
+        // If dest is a directory, create the destination file name.
+        if (destFile.type() == fileName::DIRECTORY)
+        {
+            destFile = destFile/src.name();
+        }
+    }
+    else if (srcType == fileName::DIRECTORY)
+    {
+        if (destFile.type() == fileName::DIRECTORY)
+        {
+            // Both are directories. Could mean copy contents or copy
+            // recursively.  Don't actually know what the user wants,
+            // but assume that if names are identical == copy contents.
+            //
+            // So: "path1/foo" "path2/foo"  copy contents
+            // So: "path1/foo" "path2/bar"  copy directory
+
+            const word srcDirName = src.name();
+            if (destFile.name() != srcDirName)
+            {
+                destFile /= srcDirName;
+            }
+        }
+    }
+#endif
+
+    return broadcastFile_recursive
+    (
+        comm,
+        writeOnProc,
+        srcPath,
+        (dstPath.empty() ? srcPath : dstPath),
+        fileContents
+    );
+}
+
+
+// ************************************************************************* //

From 8320a1e42157b5c2c98b220d4071c7ba21b833fd Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 11 May 2023 08:53:50 +0200
Subject: [PATCH 258/348] ENH: additional routines to extract number of
 collated data blocks

- uses file seek instead of read

ENH: broadcast instead of scatterv to sending sizes

Co-authored-by: Mark Olesen <>
---
 .../decomposedBlockData/decomposedBlockData.C | 262 +++++++++++++-----
 .../decomposedBlockData/decomposedBlockData.H |  34 ++-
 .../collatedFileOperation/OFstreamCollator.C  |   2 +-
 .../collatedFileOperation/OFstreamCollator.H  |   2 +-
 4 files changed, 221 insertions(+), 79 deletions(-)

diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
index aff5bd271e..fab7b0d4f5 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,6 +114,7 @@ bool Foam::decomposedBlockData::readBlockEntry
     // 0.  NCHARS (...)
     // 1.  List<char> NCHARS (...)
     // 2.  processorN  List<char> NCHARS (...) ;
+    // 3.  processorN  NCHARS (...) ;
 
     is.fatalCheck(FUNCTION_NAME);
     token tok(is);
@@ -145,6 +146,125 @@ bool Foam::decomposedBlockData::readBlockEntry
 }
 
 
+bool Foam::decomposedBlockData::skipBlockEntry(Istream& is)
+{
+    // As per readBlockEntry but seeks instead of reading.
+    // Internals like charList::readList
+
+    // Handle any of these:
+    // 0.  NCHARS (...)
+    // 1.  List<char> NCHARS (...)
+    // 2.  processorN  List<char> NCHARS (...) ;
+    // 3.  processorN  NCHARS (...) ;
+
+    if (!is.good()) return false;
+    token tok(is);
+    if (!is.good()) return false;
+
+    // Dictionary format has primitiveEntry keyword:
+    const bool isDictFormat = (tok.isWord() && !tok.isCompound());
+
+    if (isDictFormat)
+    {
+        is >> tok;
+        if (!is.good()) return false;
+    }
+
+
+    bool handled = false;
+
+    // Like charList::readList
+    if (tok.isCompound())
+    {
+        handled = true;
+    }
+    else if (tok.isLabel())
+    {
+        // Label: could be int(..) or just a plain '0'
+
+        const label len = tok.labelToken();
+
+        // Binary, always contiguous
+
+        if (len)
+        {
+            const auto oldFmt = is.format(IOstreamOption::BINARY);
+
+            // read(...) includes surrounding start/end delimiters.
+
+            // Note: nullptr to seek instead of reading
+            is.read(nullptr, std::streamsize(len));
+
+            is.format(oldFmt);
+        }
+
+        handled = true;
+    }
+    else
+    {
+        // Incorrect token
+        return false;
+    }
+
+    if (isDictFormat)
+    {
+        is.fatalCheck(FUNCTION_NAME);
+        is >> tok;
+        is.fatalCheck(FUNCTION_NAME);
+
+        // Swallow trailing ';'
+        if (tok.good() && !tok.isPunctuation(token::END_STATEMENT))
+        {
+            is.putBack(tok);
+        }
+    }
+
+    return handled;
+}
+
+
+Foam::label Foam::decomposedBlockData::getNumBlocks
+(
+    Istream& is,
+    const bool readHeader
+)
+{
+    label nBlocks = 0;
+
+    if (readHeader)
+    {
+        token tok(is);
+
+        if (is.good() && tok.isWord("FoamFile"))
+        {
+            dictionary headerDict(is);  // Read sub-dictionary content
+
+            if (headerDict.readIfPresent("version", tok))
+            {
+                is.version(tok);
+            }
+            is.format(headerDict.get<word>("format"));
+            //// Obtain number of blocks directly
+            // headerDict.readIfPresent("blocks", nBlocks);
+            //{
+            //    return nBlocks;
+            //}
+        }
+        else if (tok.good())
+        {
+            is.putBack(tok);
+        }
+    }
+
+    while (is.good() && skipBlockEntry(is))
+    {
+        ++nBlocks;
+    }
+
+    return nBlocks;
+}
+
+
 std::streamoff Foam::decomposedBlockData::writeBlockEntry
 (
     OSstream& os,
@@ -158,15 +278,39 @@ std::streamoff Foam::decomposedBlockData::writeBlockEntry
 
     const word procName("processor" + Foam::name(blocki));
 
+    // Write as commented content
     {
         os  << nl << "// " << procName << nl;
         charData.writeList(os) << nl;
     }
+    // Write as primitiveEntry
+    // {
+    //     os << nl << procName << nl;
+    //     charData.writeList(os);
+    //     os.endEntry();
+    // }
 
     return blockOffset;
 }
 
 
+std::streamoff Foam::decomposedBlockData::writeBlockEntry
+(
+    OSstream& os,
+    const label blocki,
+    const std::string& content
+)
+{
+    UList<char> charData
+    (
+        const_cast<char*>(content.data()),
+        label(content.size())
+    );
+
+    return decomposedBlockData::writeBlockEntry(os, blocki, charData);
+}
+
+
 std::streamoff Foam::decomposedBlockData::writeBlockEntry
 (
     OSstream& os,
@@ -176,10 +320,10 @@ std::streamoff Foam::decomposedBlockData::writeBlockEntry
     const bool withLocalHeader
 )
 {
-    // String(s) from all data to write
+    // String of all data to write
     string contentChars;
     {
-        OStringStream os(streamOptData);
+        OStringStream buf(streamOptData);
 
         bool ok = true;
 
@@ -188,30 +332,23 @@ std::streamoff Foam::decomposedBlockData::writeBlockEntry
         {
             const bool old = IOobject::bannerEnabled(false);
 
-            ok = io.writeHeader(os);
+            ok = io.writeHeader(buf);
 
             IOobject::bannerEnabled(old);
         }
 
         // Write the data to the Ostream
-        ok = ok && io.writeData(os);
+        ok = ok && io.writeData(buf);
 
         if (!ok)
         {
             return std::streamoff(-1);
         }
 
-        contentChars = os.str();
+        contentChars = buf.str();
     }
 
-    // The character data
-    UList<char> charData
-    (
-        const_cast<char*>(contentChars.data()),
-        label(contentChars.size())
-    );
-
-    return decomposedBlockData::writeBlockEntry(os, blocki, charData);
+    return decomposedBlockData::writeBlockEntry(os, blocki, contentChars);
 }
 
 
@@ -607,51 +744,49 @@ void Foam::decomposedBlockData::gatherSlaveData
     const UList<char>& data,
     const labelUList& recvSizes,
 
-    const label startProc,
-    const label nProcs,
+    const labelRange& fromProcs,
 
     List<int>& sliceOffsets,
-    List<char>& recvData
+    DynamicList<char>& recvData
 )
 {
+    const label myProci = UPstream::myProcNo(comm);
+    const label numProcs = UPstream::nProcs(comm);
+
+    int nSendBytes = 0;
+    recvData.clear();
+
     // Calculate master data
     List<int> sliceSizes;
     if (UPstream::master(comm))
     {
-        const label numProcs = UPstream::nProcs(comm);
-
         sliceSizes.resize(numProcs, 0);
         sliceOffsets.resize(numProcs+1, 0);
 
+        // Offset 1 beyond the end of the range
+        const label endProci = fromProcs.end_value();
+
         int totalSize = 0;
-        label proci = startProc;
-        for (label i = 0; i < nProcs; i++)
+        for (const label proci : fromProcs)
         {
             sliceSizes[proci] = int(recvSizes[proci]);
             sliceOffsets[proci] = totalSize;
             totalSize += sliceSizes[proci];
-            ++proci;
         }
-        sliceOffsets[proci] = totalSize;
-        recvData.setSize(totalSize);
-    }
 
-    int nSend = 0;
-    if
-    (
-       !UPstream::master(comm)
-     && (UPstream::myProcNo(comm) >= startProc)
-     && (UPstream::myProcNo(comm) < startProc+nProcs)
-    )
+        sliceOffsets[endProci] = totalSize;
+        recvData.resize(totalSize);
+    }
+    else if (fromProcs.contains(myProci))
     {
         // Note: UPstream::gather limited to int
-        nSend = int(data.size_bytes());
+        nSendBytes = int(data.size_bytes());
     }
 
     UPstream::gather
     (
         data.cdata(),
-        nSend,
+        nSendBytes,
 
         recvData.data(),
         sliceSizes,
@@ -671,7 +806,7 @@ Foam::label Foam::decomposedBlockData::calcNumProcs
 {
     const label nProcs = UPstream::nProcs(comm);
 
-    label nSendProcs = -1;
+    label nSendProcs = 0;
     if (UPstream::master(comm))
     {
         off_t totalSize = recvSizes[startProci];
@@ -685,19 +820,9 @@ Foam::label Foam::decomposedBlockData::calcNumProcs
         nSendProcs = proci-startProci;
     }
 
-    // Scatter nSendProcs
-    label n;
-    UPstream::scatter
-    (
-        reinterpret_cast<const char*>(&nSendProcs),
-        List<int>(nProcs, sizeof(nSendProcs)),
-        List<int>(nProcs, Zero),
-        reinterpret_cast<char*>(&n),
-        sizeof(n),
-        comm
-    );
+    Pstream::broadcast(nSendProcs, comm);
 
-    return n;
+    return nSendProcs;
 }
 
 
@@ -709,7 +834,7 @@ bool Foam::decomposedBlockData::writeBlocks
     const UList<char>& masterData,
 
     const labelUList& recvSizes,
-    const PtrList<SubList<char>>& slaveData,
+    const UPtrList<SubList<char>>& slaveData,
 
     const UPstream::commsTypes commsType,
     const bool syncReturnState
@@ -718,7 +843,7 @@ bool Foam::decomposedBlockData::writeBlocks
     if (debug)
     {
         Pout<< "decomposedBlockData::writeBlocks:"
-            << " stream:" << (osPtr ? osPtr->name() : "invalid")
+            << " stream:" << (osPtr ? osPtr->name() : "none")
             << " data:" << masterData.size()
             << " (master only) slaveData:" << slaveData.size()
             << " commsType:" << Pstream::commsTypeNames[commsType] << endl;
@@ -733,7 +858,7 @@ bool Foam::decomposedBlockData::writeBlocks
     {
         blockOffset.resize(nProcs);
 
-        OSstream& os = *osPtr;
+        OSstream& os = osPtr();
 
         blockOffset[UPstream::masterNo()] =
             decomposedBlockData::writeBlockEntry
@@ -753,7 +878,7 @@ bool Foam::decomposedBlockData::writeBlocks
         if (UPstream::master(comm))
         {
             // Master data already written ...
-            OSstream& os = *osPtr;
+            OSstream& os = osPtr();
 
             // Write slaves
             for (label proci = 1; proci < nProcs; ++proci)
@@ -775,20 +900,26 @@ bool Foam::decomposedBlockData::writeBlocks
         if (UPstream::master(comm))
         {
             // Master data already written ...
-            OSstream& os = *osPtr;
+            OSstream& os = osPtr();
 
             // Receive and write slaves
-            DynamicList<char> elems;
+            label maxNonLocalSize = 0;
             for (label proci = 1; proci < nProcs; ++proci)
             {
-                elems.resize(recvSizes[proci]);
+                maxNonLocalSize = max(maxNonLocalSize, recvSizes[proci]);
+            }
+
+            DynamicList<char> elems(maxNonLocalSize);
+            for (label proci = 1; proci < nProcs; ++proci)
+            {
+                elems.resize_nocopy(recvSizes[proci]);
                 UIPstream::read
                 (
                     UPstream::commsTypes::scheduled,
                     proci,
                     elems.data(),
                     elems.size_bytes(),
-                    Pstream::msgType(),
+                    UPstream::msgType(),
                     comm
                 );
 
@@ -811,7 +942,7 @@ bool Foam::decomposedBlockData::writeBlocks
                 UPstream::masterNo(),
                 masterData.cdata(),
                 masterData.size_bytes(),
-                Pstream::msgType(),
+                UPstream::msgType(),
                 comm
             );
         }
@@ -827,6 +958,8 @@ bool Foam::decomposedBlockData::writeBlocks
         label startProc = 1;
         label nSendProcs = nProcs-1;
 
+        DynamicList<char> recvData;
+
         while (nSendProcs > 0 && startProc < nProcs)
         {
             nSendProcs = calcNumProcs
@@ -848,16 +981,16 @@ bool Foam::decomposedBlockData::writeBlocks
 
 
             // Gather data from (a slice of) the slaves
+            labelRange fromProcs(startProc, nSendProcs);
+
             List<int> sliceOffsets;
-            List<char> recvData;
             gatherSlaveData
             (
                 comm,
                 masterData,
                 recvSizes,
 
-                startProc,      // startProc,
-                nSendProcs,     // nProcs,
+                fromProcs,
 
                 sliceOffsets,
                 recvData
@@ -865,15 +998,10 @@ bool Foam::decomposedBlockData::writeBlocks
 
             if (UPstream::master(comm))
             {
-                OSstream& os = *osPtr;
+                OSstream& os = osPtr();
 
-                // Write slaves
-                for
-                (
-                    label proci = startProc;
-                    proci < startProc+nSendProcs;
-                    ++proci
-                )
+                // Write received data
+                for (const label proci : fromProcs)
                 {
                     SubList<char> dataSlice
                     (
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
index bedc5e5e5e..7347712f94 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,11 +81,12 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef decomposedBlockData_H
-#define decomposedBlockData_H
+#ifndef Foam_decomposedBlockData_H
+#define Foam_decomposedBlockData_H
 
-#include "IOList.H"
 #include "regIOobject.H"
+#include "ISstream.H"
+#include "OSstream.H"
 #include "UPstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -153,6 +154,12 @@ protected:
             const UPstream::commsTypes commsType
         );
 
+        //- Helper: skip a block of (binary) character data
+        static bool skipBlockEntry(Istream& is);
+
+        //- Extract number of blocks from decomposedBlockData file stream
+        static label getNumBlocks(Istream& is, const bool readHeader);
+
 
 public:
 
@@ -247,6 +254,14 @@ public:
             const UList<char>& charData
         );
 
+        //- Helper: write block of (binary) character content
+        static std::streamoff writeBlockEntry
+        (
+            OSstream& os,
+            const label blocki,
+            const std::string& content
+        );
+
         //- Helper: write block of (binary) character data
         //  \return -1 on error
         static std::streamoff writeBlockEntry
@@ -298,11 +313,10 @@ public:
             const UList<char>& data,
             const labelUList& recvSizes,
 
-            const label startProc,
-            const label nProcs,
+            const labelRange& fromProcs,
 
             List<int>& recvOffsets,
-            List<char>& recvData
+            DynamicList<char>& recvData
         );
 
         //- Write *this. Ostream only valid on master.
@@ -317,10 +331,10 @@ public:
 
             const labelUList& recvSizes,
 
-            // optional slave data (on master)
-            const PtrList<SubList<char>>& slaveData,
+            // Optional slave data (on master)
+            const UPtrList<SubList<char>>& slaveData,
 
-            const UPstream::commsTypes,
+            const UPstream::commsTypes commsType,
             const bool syncReturnState = true
         );
 };
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
index 29e5675fd7..93eba9c1cf 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
@@ -49,7 +49,7 @@ bool Foam::OFstreamCollator::writeFile
     const fileName& fName,
     const string& masterData,
     const labelUList& recvSizes,
-    const PtrList<SubList<char>>& slaveData,    // optional slave data
+    const UPtrList<SubList<char>>& slaveData,    // optional slave data
     IOstreamOption streamOpt,
     IOstreamOption::atomicType atomic,
     IOstreamOption::appendType append,
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H
index 923fb4c7c1..006090c69a 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.H
@@ -158,7 +158,7 @@ class OFstreamCollator
             const fileName& fName,
             const string& masterData,
             const labelUList& recvSizes,
-            const PtrList<SubList<char>>& slaveData,
+            const UPtrList<SubList<char>>& slaveData,
             IOstreamOption streamOpt,
             IOstreamOption::atomicType atomic,
             IOstreamOption::appendType append,

From 19254d0cf28379f42d816ce6c858414ed5793517 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 May 2023 09:15:35 +0200
Subject: [PATCH 259/348] ENH: parallel-consistent check for dynamic library
 loading

- consolidate file synchronization checks in dynamicCode

STYLE: report missing library on master only (not every rank)

- avoid flooding the output with messages

Co-authored-by: mattijs <mattijs>
---
 .../functionEntries/codeStream/codeStream.C   | 251 ++++++------------
 .../db/dynamicLibrary/codedBase/codedBase.C   | 153 +++--------
 .../db/dynamicLibrary/codedBase/codedBase.H   |  20 +-
 .../dlLibraryTable/dlLibraryTable.C           |  22 +-
 .../dlLibraryTable/dlLibraryTable.H           |   6 +-
 .../dlLibraryTable/dlLibraryTableTemplates.C  |   2 +-
 .../dynamicLibrary/dynamicCode/dynamicCode.C  | 134 ++++++++--
 .../dynamicLibrary/dynamicCode/dynamicCode.H  |  75 +++---
 .../dynamicCode/dynamicCodeContext.H          |   4 +-
 9 files changed, 295 insertions(+), 372 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
index 22cf9c63ac..9384284164 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,22 +81,17 @@ bool Foam::functionEntries::codeStream::doingMasterOnlyReading
     // Fallback value
     bool masterOnly = regIOobject::masterOnlyReading;
 
-    const auto* iodictPtr = isA<baseIOdictionary>(dict.topDict());
+    const auto* rioPtr = isA<regIOobject>(dict.topDict());
 
-    if (iodictPtr)
+    if (rioPtr)
     {
-        masterOnly = iodictPtr->globalObject();
+        masterOnly = rioPtr->global();
+    }
 
-        DebugPout
-            << "codeStream : baseIOdictionary:" << dict.name()
-            << " master-only-reading:" << masterOnly << endl;
-    }
-    else
-    {
-        DebugPout
-            << "codeStream : not a baseIOdictionary:" << dict.name()
-            << " master-only-reading:" << masterOnly << endl;
-    }
+    DebugPout
+        << "codeStream : " << (rioPtr ? "IO" : "plain")
+        << " dictionary:" << dict.name()
+        << " master-only-reading:" << masterOnly << endl;
 
     return masterOnly;
 }
@@ -117,15 +112,17 @@ Foam::functionEntries::codeStream::getFunction
     std::string sha1Str(context.sha1().str(true));
     dynamicCode dynCode("codeStream" + sha1Str, sha1Str);
 
+
+    const dictionary& topDict = parentDict.topDict();
+    const bool masterOnly = doingMasterOnlyReading(topDict);
+
     // Load library if not already loaded
     // Version information is encoded in the libPath (encoded with the SHA1)
     const fileName libPath = dynCode.libPath();
 
-    // see if library is loaded
+    // See if library is loaded
     void* lib = nullptr;
 
-    const dictionary& topDict = parentDict.topDict();
-
     if (isA<baseIOdictionary>(topDict))
     {
         lib = libs(parentDict).findLibrary(libPath);
@@ -151,180 +148,79 @@ Foam::functionEntries::codeStream::getFunction
     }
 
 
-    // create library if required
+    // Indicates NFS filesystem
+    const bool isNFS = (IOobject::fileModificationSkew > 0);
+
+    // Create library if required
+    if
+    (
+        lib == nullptr
+     && (UPstream::master() || !isNFS)
+     && !dynCode.upToDate(context)
+    )
+    {
+        // Filter with this context
+        dynCode.reset(context);
+
+        // Compile filtered C template
+        dynCode.addCompileFile(codeTemplateC);
+
+        // define Make/options
+        dynCode.setMakeOptions
+        (
+            "EXE_INC = -g \\\n"
+          + context.options()
+          + "\n\nLIB_LIBS = \\\n"
+            "    -lOpenFOAM \\\n"
+          + context.libs()
+        );
+
+        if (!dynCode.copyOrCreateFiles(true))
+        {
+            FatalIOErrorInFunction(parentDict)
+                << "Failed writing files for" << nl
+                << dynCode.libRelPath() << nl
+                << exit(FatalIOError);
+        }
+
+        if (!dynCode.wmakeLibso())
+        {
+            FatalIOErrorInFunction(parentDict)
+                << "Failed wmake " << dynCode.libRelPath() << nl
+                << exit(FatalIOError);
+        }
+    }
+
+
+    //- Only block if we're not doing master-only reading.
+    //  (flag set by regIOobject::read, baseIOdictionary constructor)
+    if (!masterOnly && returnReduceOr(lib == nullptr))
+    {
+        // Broadcast distributed...
+
+        dynamicCode::waitForFile(libPath, context.dict());
+    }
+
     if (!lib)
     {
-        const bool create =
-            Pstream::master()
-         || (IOobject::fileModificationSkew <= 0);   // not NFS
-
-        if (create)
-        {
-            if (!dynCode.upToDate(context))
-            {
-                // filter with this context
-                dynCode.reset(context);
-
-                // compile filtered C template
-                dynCode.addCompileFile(codeTemplateC);
-
-                // define Make/options
-                dynCode.setMakeOptions
-                (
-                    "EXE_INC = -g \\\n"
-                  + context.options()
-                  + "\n\nLIB_LIBS = \\\n"
-                    "    -lOpenFOAM \\\n"
-                  + context.libs()
-                );
-
-                if (!dynCode.copyOrCreateFiles(true))
-                {
-                    FatalIOErrorInFunction(parentDict)
-                        << "Failed writing files for" << nl
-                        << dynCode.libRelPath() << nl
-                        << exit(FatalIOError);
-                }
-            }
-
-            if (!dynCode.wmakeLibso())
-            {
-                FatalIOErrorInFunction(parentDict)
-                    << "Failed wmake " << dynCode.libRelPath() << nl
-                    << exit(FatalIOError);
-            }
-        }
-
-        //- Only block if we're not doing master-only reading. (flag set by
-        //  regIOobject::read, baseIOdictionary constructor)
-        if
-        (
-           !doingMasterOnlyReading(topDict)
-         && IOobject::fileModificationSkew > 0
-        )
-        {
-            //- Since the library has only been compiled on the master the
-            //  other nodes need to pick this library up through NFS
-            //  We do this by just polling a few times using the
-            //  fileModificationSkew.
-
-            off_t mySize = Foam::fileSize(libPath);
-            off_t masterSize = mySize;
-            Pstream::broadcast(masterSize);
-
-            for
-            (
-                label iter = 0;
-                iter < IOobject::maxFileModificationPolls;
-                ++iter
-            )
-            {
-                DebugPout
-                    << "on processor " << Pstream::myProcNo()
-                    << "masterSize:" << masterSize
-                    << " and localSize:" << mySize
-                    << endl;
-
-                if (mySize == masterSize)
-                {
-                    break;
-                }
-                else if (mySize > masterSize)
-                {
-                    FatalIOErrorInFunction(context.dict())
-                        << "Excessive size when reading (NFS mounted) library "
-                        << nl << libPath << nl
-                        << "on processor " << Pstream::myProcNo()
-                        << " detected size " << mySize
-                        << " whereas master size is " << masterSize
-                        << " bytes." << nl
-                        << "If your case is NFS mounted increase"
-                        << " fileModificationSkew or maxFileModificationPolls;"
-                        << nl << "If your case is not NFS mounted"
-                        << " (so distributed) set fileModificationSkew"
-                        << " to 0"
-                        << exit(FatalIOError);
-                }
-                else
-                {
-                    DebugPout
-                        << "Local file " << libPath
-                        << " not of same size (" << mySize
-                        << ") as master ("
-                        << masterSize << "). Waiting for "
-                        << IOobject::fileModificationSkew
-                        << " seconds." << endl;
-
-                    Foam::sleep(IOobject::fileModificationSkew);
-
-                    // Recheck local size
-                    mySize = Foam::fileSize(libPath);
-                }
-            }
-
-
-            // Finished doing iterations. Do final check
-            if (mySize != masterSize)
-            {
-                FatalIOErrorInFunction(context.dict())
-                    << "Cannot read (NFS mounted) library " << nl
-                    << libPath << nl
-                    << "on processor " << Pstream::myProcNo()
-                    << " detected size " << mySize
-                    << " whereas master size is " << masterSize
-                    << " bytes." << nl
-                    << "If your case is NFS mounted increase"
-                    << " fileModificationSkew or maxFileModificationPolls;"
-                    << nl << "If your case is not NFS mounted"
-                    << " (so distributed) set fileModificationSkew"
-                    << " to 0"
-                    << exit(FatalIOError);
-            }
-
-            DebugPout
-                << "on processor " << Pstream::myProcNo()
-                << " after waiting: have masterSize:" << masterSize
-                << " and localSize:" << mySize << endl;
-        }
-
         if (isA<baseIOdictionary>(topDict))
         {
-            // Cached access to libs, with cleanup upon termination
-            DebugPout
-                << "Opening cached dictionary:" << libPath << endl;
-
             lib = libs(parentDict).open(libPath, false);
-
-            if (!lib)
-            {
-                FatalIOErrorInFunction(parentDict)
-                    << "Failed loading library " << libPath << nl
-                    << "Did you add all libraries to the 'libs' entry"
-                    << " in system/controlDict?"
-                    << exit(FatalIOError);
-            }
         }
         else
         {
-            // Uncached opening of libPath
-            DebugPout
-                << "Opening uncached dictionary:" << libPath << endl;
-
-            lib = Foam::dlOpen(libPath, true);
+            lib = Foam::dlOpen(libPath, false);
         }
     }
 
-    bool haveLib = lib;
-    if (!doingMasterOnlyReading(topDict))
-    {
-        Pstream::reduceAnd(haveLib);
-    }
 
-    if (!haveLib)
+    if (masterOnly ? !lib : returnReduceOr(!lib))
     {
         FatalIOErrorInFunction(parentDict)
-            << "Failed loading library " << libPath
+            << "Failed loading library " << dynCode.libRelPath()
             << " on some processors."
+            << "Did you add all libraries to the 'libs' entry"
+            << " in system/controlDict?"
             << exit(FatalIOError);
     }
 
@@ -341,7 +237,8 @@ Foam::functionEntries::codeStream::getFunction
     {
         FatalIOErrorInFunction(parentDict)
             << "Failed looking up symbol " << dynCode.codeName()
-            << " in library " << lib << exit(FatalIOError);
+            << " in library " << dynCode.libRelPath()
+            << exit(FatalIOError);
     }
 
     return function;
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index c2e25c8b19..69a71fcedb 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -213,27 +213,31 @@ void Foam::codedBase::createLibrary
     const dynamicCodeContext& context
 ) const
 {
-    bool create =
-        Pstream::master()
-     || (IOobject::fileModificationSkew <= 0);   // not NFS
+    // No library?
+    // The overall master should compile it (so only it needs a compiler) and
+    // - see if it appears at the other processors
+    // - or copy it across if it does not
 
-    if (create)
+    // Indicates NFS filesystem
+    const bool isNFS = (IOobject::fileModificationSkew > 0);
+
+    if
+    (
+        (UPstream::master() || !isNFS)
+     && !dynCode.upToDate(context)
+    )
     {
-        // Write files for new library
-        if (!dynCode.upToDate(context))
+        // Filter with this context
+        dynCode.reset(context);
+
+        this->prepare(dynCode, context);
+
+        if (!dynCode.copyOrCreateFiles(true))
         {
-            // filter with this context
-            dynCode.reset(context);
-
-            this->prepare(dynCode, context);
-
-            if (!dynCode.copyOrCreateFiles(true))
-            {
-                FatalIOErrorInFunction(context.dict())
-                    << "Failed writing files for" << nl
-                    << dynCode.libRelPath() << nl
-                    << exit(FatalIOError);
-            }
+            FatalIOErrorInFunction(context.dict())
+                << "Failed writing files for" << nl
+                << dynCode.libRelPath() << nl
+                << exit(FatalIOError);
         }
 
         if (!dynCode.wmakeLibso())
@@ -244,97 +248,15 @@ void Foam::codedBase::createLibrary
         }
     }
 
-
-    // all processes must wait for compile to finish
-    if (IOobject::fileModificationSkew > 0)
+    if (isNFS)
     {
-        //- Since the library has only been compiled on the master the
-        //  other nodes need to pick this library up through NFS
-        //  We do this by just polling a few times using the
-        //  fileModificationSkew.
-
-        const fileName libPath = dynCode.libPath();
-
-        off_t mySize = Foam::fileSize(libPath);
-        off_t masterSize = mySize;
-        Pstream::broadcast(masterSize);
-
-        for
-        (
-            label iter = 0;
-            iter < IOobject::maxFileModificationPolls;
-            ++iter
-        )
-        {
-            DebugPout
-                << "on processor " << Pstream::myProcNo()
-                << " have masterSize:" << masterSize
-                << " and localSize:" << mySize
-                << endl;
-
-            if (mySize == masterSize)
-            {
-                break;
-            }
-            else if (mySize > masterSize)
-            {
-                FatalIOErrorInFunction(context.dict())
-                    << "Excessive size when reading (NFS mounted) library "
-                    << nl << libPath << nl
-                    << "on processor " << Pstream::myProcNo()
-                    << " detected size " << mySize
-                    << " whereas master size is " << masterSize
-                    << " bytes." << nl
-                    << "If your case is NFS mounted increase"
-                    << " fileModificationSkew or maxFileModificationPolls;"
-                    << nl << "If your case is not NFS mounted"
-                    << " (so distributed) set fileModificationSkew"
-                    << " to 0"
-                    << exit(FatalIOError);
-            }
-            else
-            {
-                DebugPout
-                    << "Local file " << libPath
-                    << " not of same size (" << mySize
-                    << ") as master ("
-                    << masterSize << "). Waiting for "
-                    << IOobject::fileModificationSkew
-                    << " seconds." << endl;
-
-                Foam::sleep(IOobject::fileModificationSkew);
-
-                // Recheck local size
-                mySize = Foam::fileSize(libPath);
-            }
-        }
-
-
-        // Finished doing iterations. Do final check
-        if (mySize != masterSize)
-        {
-            FatalIOErrorInFunction(context.dict())
-                << "Cannot read (NFS mounted) library " << nl
-                << libPath << nl
-                << "on processor " << Pstream::myProcNo()
-                << " detected size " << mySize
-                << " whereas master size is " << masterSize
-                << " bytes." << nl
-                << "If your case is NFS mounted increase"
-                << " fileModificationSkew or maxFileModificationPolls;"
-                << nl << "If your case is not NFS mounted"
-                << " (so distributed) set fileModificationSkew"
-                << " to 0"
-                << exit(FatalIOError);
-        }
-
-        DebugPout
-            << "on processor " << Pstream::myProcNo()
-            << " after waiting: have masterSize:" << masterSize
-            << " and localSize:" << mySize << endl;
+        // Wait for compile to finish before attempting filesystem polling
+        UPstream::barrier(UPstream::worldComm);
     }
 
-    Pstream::reduceOr(create);  // MPI barrier
+    // Broadcast distributed...
+
+    dynamicCode::waitForFile(dynCode.libPath(), context.dict());
 }
 
 
@@ -391,16 +313,19 @@ void Foam::codedBase::updateLibrary
     this->clearRedirect();
 
     // May need to unload old library
-    unloadLibrary
-    (
-        oldLibPath_,
-        dlLibraryTable::basename(oldLibPath_),
-        context
-    );
+    unloadLibrary(oldLibPath_, dlLibraryTable::basename(oldLibPath_), context);
 
     // Try loading an existing library (avoid compilation when possible)
-    if (!loadLibrary(libPath, dynCode.codeName(), context))
+    void* lib = loadLibrary(libPath, dynCode.codeName(), context);
+
+    if (returnReduceOr(lib == nullptr))
     {
+        if (lib)
+        {
+            // Ensure consistency
+            unloadLibrary(libPath, dlLibraryTable::basename(libPath), context);
+        }
+
         createLibrary(dynCode, context);
 
         loadLibrary(libPath, dynCode.codeName(), context);
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
index aeac411730..fa224c4442 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,8 +44,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef codedBase_H
-#define codedBase_H
+#ifndef Foam_codedBase_H
+#define Foam_codedBase_H
 
 #include "dictionary.H"
 #include "dynamicCodeContext.H"
@@ -169,6 +169,14 @@ protected:
         ) const = 0;
 
 
+public:
+
+    //- Runtime type information
+    ClassName("codedBase");
+
+
+    // Generated Methods
+
         //- No copy construct
         codedBase(const codedBase&) = delete;
 
@@ -176,12 +184,6 @@ protected:
         void operator=(const codedBase&) = delete;
 
 
-public:
-
-    //- Runtime type information
-    ClassName("codedBase");
-
-
     // Constructors
 
         //- Default construct
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
index 8a52f4f806..d7fd8eef9c 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
@@ -185,7 +185,7 @@ void* Foam::dlLibraryTable::openLibrary
     if (!ptr)
     {
         // Even with details turned off, we want some feedback about failure
-        OSstream& os = (verbose ? WarningInFunction : Serr);
+        OSstream& os = (verbose > 0 ? WarningInFunction : InfoErr);
         os << "Could not load " << libName << nl << msg.c_str() << endl;
     }
 
@@ -222,8 +222,8 @@ Foam::dlLibraryTable::dlLibraryTable
     bool verbose
 )
 {
-    fileNameList libNames;
-    dict.readIfPresent(libsEntry, libNames);
+    List<fileName> libNames;
+    dict.readIfPresent(libsEntry, libNames, keyType::LITERAL);
     dlLibraryTable::open(libNames, verbose);
 }
 
@@ -253,7 +253,7 @@ Foam::dlLibraryTable::~dlLibraryTable()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::dlLibraryTable::empty() const
+bool Foam::dlLibraryTable::empty() const noexcept
 {
     for (const void* ptr : libPtrs_)
     {
@@ -267,7 +267,7 @@ bool Foam::dlLibraryTable::empty() const
 }
 
 
-Foam::label Foam::dlLibraryTable::size() const
+Foam::label Foam::dlLibraryTable::size() const noexcept
 {
     label nLoaded = 0;
 
@@ -383,8 +383,8 @@ bool Foam::dlLibraryTable::append(const fileName& libName)
         return false;
     }
 
-    libPtrs_.append(nullptr);
-    libNames_.append(libName);
+    libPtrs_.push_back(nullptr);
+    libNames_.push_back(libName);
 
     return true;
 }
@@ -449,8 +449,8 @@ void* Foam::dlLibraryTable::open
 
     if (ptr)
     {
-        libPtrs_.append(ptr);
-        libNames_.append(libName);
+        libPtrs_.push_back(ptr);
+        libNames_.push_back(libName);
     }
 
     return ptr;
@@ -587,10 +587,10 @@ bool Foam::dlLibraryTable::open
     bool verbose
 )
 {
-    fileNameList libNames;
+    List<fileName> libNames;
     return
     (
-        dict.readIfPresent(libsEntry, libNames)
+        dict.readIfPresent(libsEntry, libNames, keyType::LITERAL)
      && dlLibraryTable::open(libNames, verbose)
     );
 }
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
index 737d46c020..f3ca9d581c 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H
@@ -43,8 +43,8 @@ SourceFiles
 #ifndef Foam_dlLibraryTable_H
 #define Foam_dlLibraryTable_H
 
-#include "DynamicList.H"
 #include "fileName.H"
+#include "DynamicList.H"
 #include "InfoProxy.H"
 #include <memory>
 
@@ -218,10 +218,10 @@ public:
     // Member Functions
 
         //- True if there are no libraries loaded by the table
-        bool empty() const;
+        bool empty() const noexcept;
 
         //- The number of libraries loaded by the table
-        label size() const;
+        label size() const noexcept;
 
         //- Names of the libraries in use
         List<fileName> loaded() const;
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
index 8c558acf8b..a0d959fa52 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
@@ -41,7 +41,7 @@ bool Foam::dlLibraryTable::open
 )
 {
     List<fileName> libNames;
-    dict.readIfPresent(libsEntry, libNames);
+    dict.readIfPresent(libsEntry, libNames, keyType::LITERAL);
 
     label nOpen = 0;
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index f2d9cd47e6..f9472902cf 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,7 @@ License
 #include "argList.H"
 #include "stringOps.H"
 #include "Fstream.H"
+#include "IOobject.H"
 #include "IOstreams.H"
 #include "OSspecific.H"
 #include "etcFiles.H"
@@ -166,12 +167,12 @@ bool Foam::dynamicCode::resolveTemplates
 
         if (file.empty())
         {
-            badFiles.append(templateName);
+            badFiles.push_back(templateName);
             allOkay = false;
         }
         else
         {
-            resolvedFiles.append(file);
+            resolvedFiles.push_back(file);
         }
     }
 
@@ -181,16 +182,15 @@ bool Foam::dynamicCode::resolveTemplates
 
 bool Foam::dynamicCode::writeCommentSHA1(Ostream& os) const
 {
-    const auto fnd = filterVars_.cfind("SHA1sum");
+    const auto iter = filterVars_.cfind("SHA1sum");
 
-    if (!fnd.good())
+    if (iter.good())
     {
-        return false;
+        os  << "/* dynamicCode:\n * SHA1 = ";
+        os.writeQuoted(iter.val(), false) << "\n */\n";
     }
 
-    os  << "/* dynamicCode:\n * SHA1 = ";
-    os.writeQuoted(*fnd, false) << "\n */\n";
-    return true;
+    return iter.good();
 }
 
 
@@ -352,23 +352,23 @@ void Foam::dynamicCode::reset
 
 void Foam::dynamicCode::addCompileFile(const fileName& name)
 {
-    compileFiles_.append(name);
+    compileFiles_.push_back(name);
 }
 
 
 void Foam::dynamicCode::addCopyFile(const fileName& name)
 {
-    copyFiles_.append(name);
+    copyFiles_.push_back(name);
 }
 
 
 void Foam::dynamicCode::addCreateFile
 (
     const fileName& name,
-    const string& contents
+    const std::string& fileContents
 )
 {
-    createFiles_.append(fileAndContent(name, contents));
+    createFiles_.emplace_back(name, fileContents);
 }
 
 
@@ -465,7 +465,7 @@ bool Foam::dynamicCode::copyOrCreateFiles(const bool verbose) const
 
 
     // Create files:
-    for (const fileAndContent& content : createFiles_)
+    for (const auto& content : createFiles_)
     {
         const fileName dstFile(outputDir/stringOps::expand(content.first()));
 
@@ -502,7 +502,7 @@ bool Foam::dynamicCode::wmakeLibso() const
     // This can take a bit longer, so report that we are starting wmake
     // Even with details turned off, we want some feedback
 
-    OSstream& os = (Foam::infoDetailLevel > 0 ? Info : Serr);
+    OSstream& os = (Foam::infoDetailLevel > 0 ? Info : InfoErr);
     os  << "Invoking wmake libso " << this->codePath().c_str() << endl;
 
     if (Foam::system(cmd) == 0)
@@ -533,4 +533,108 @@ bool Foam::dynamicCode::upToDate(const dynamicCodeContext& context) const
 }
 
 
+// * * * * * * * * * * * * * * * Synchronisation * * * * * * * * * * * * * * //
+
+void Foam::dynamicCode::waitForFile
+(
+    const fileName& file,
+    const dictionary& contextDict
+)
+{
+    const int debug = 0;
+
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    // If library has just been compiled on the master, the other nodes
+    // need to pick this library up through NFS, which likely has delays
+    // in it.
+
+    // We do this by just polling a few times using the
+    // fileModificationSkew.
+
+    off_t localSize = Foam::fileSize(file);
+    off_t masterSize = localSize;
+    Pstream::broadcast(masterSize);
+
+    for
+    (
+        label iter = 0;
+        (
+            iter < IOobject::maxFileModificationPolls
+         && IOobject::fileModificationSkew > 0
+        );
+        ++iter
+    )
+    {
+        DebugPout
+            << "Processor " << UPstream::myProcNo()
+            << " masterSize:" << masterSize
+            << " localSize:" << localSize << endl;
+
+        if (localSize == masterSize)
+        {
+            return;
+        }
+        if (localSize > masterSize)
+        {
+            FatalIOErrorInFunction(contextDict)
+                << "Excessive size when reading (NFS mounted) library "
+                << nl << file << nl
+                << "on processor " << UPstream::myProcNo()
+                << " detected size " << localSize
+                << " whereas master size is " << masterSize
+                << " bytes." << nl
+                << "If your case is NFS mounted increase"
+                << " fileModificationSkew or maxFileModificationPolls;"
+                << nl << "If your case is not NFS mounted"
+                << " (so distributed) set fileModificationSkew"
+                << " to 0"
+                << exit(FatalIOError);
+        }
+        else
+        {
+            DebugPout
+                << "Local file " << file
+                << " not of same size (" << localSize
+                << ") as master ("
+                << masterSize << "). Waiting for "
+                << IOobject::fileModificationSkew
+                << " seconds." << endl;
+
+            Foam::sleep(IOobject::fileModificationSkew);
+
+            // Recheck local size
+            localSize = Foam::fileSize(file);
+        }
+    }
+
+    // Finished doing iterations. Do final check
+    if (localSize != masterSize)
+    {
+        FatalIOErrorInFunction(contextDict)
+            << "Cannot read (NFS mounted) library:" << nl
+            << file << nl
+            << "on processor " << UPstream::myProcNo()
+            << " detected size " << localSize
+            << " whereas master size is " << masterSize
+            << " bytes." << nl
+            << "If your case is NFS mounted increase"
+            << " fileModificationSkew or maxFileModificationPolls;" << nl
+            << "If your case is not NFS mounted"
+            << " (so distributed) set fileModificationSkew"
+            << " to 0"
+            << exit(FatalIOError);
+    }
+
+    DebugPout
+        << "Processor " << UPstream::myProcNo()
+        << " masterSize:" << masterSize
+        << " localSize:" << localSize
+        << " ... after waiting" << endl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
index 8331e1c232..3903c3b1d3 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,12 +35,13 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dynamicCode_H
-#define dynamicCode_H
+#ifndef Foam_dynamicCode_H
+#define Foam_dynamicCode_H
 
-#include "Tuple2.H"
-#include "HashTable.H"
+#include "fileName.H"
 #include "DynamicList.H"
+#include "HashTable.H"
+#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,12 +60,6 @@ class SHA1Digest;
 
 class dynamicCode
 {
-public:
-
-    typedef Tuple2<fileName, string> fileAndContent;
-
-private:
-
     // Private Data
 
         //- Root for dynamic code compilation
@@ -86,7 +81,7 @@ private:
         DynamicList<fileName> copyFiles_;
 
         //- Direct contents for files
-        DynamicList<fileAndContent> createFiles_;
+        DynamicList<Tuple2<fileName, std::string>> createFiles_;
 
         //- Variables to use during filtering
         HashTable<string> filterVars_;
@@ -95,15 +90,6 @@ private:
         std::string makeOptions_;
 
 
-    // Private Member Functions
-
-        //- No copy construct
-        dynamicCode(const dynamicCode&) = delete;
-
-        //- No copy assignment
-        void operator=(const dynamicCode&) = delete;
-
-
 protected:
 
     // Static Data Members
@@ -167,12 +153,21 @@ public:
         static int allowSystemOperations;
 
 
-    // Static Member functions
+    // Static Member Functions
 
         //- Check security for creating dynamic code
         static void checkSecurity(const char* title, const dictionary&);
 
 
+    // Generated Methods
+
+        //- No copy construct
+        dynamicCode(const dynamicCode&) = delete;
+
+        //- No copy assignment
+        void operator=(const dynamicCode&) = delete;
+
+
     // Constructors
 
         //- Construct for a specified code name and code directory name
@@ -184,33 +179,21 @@ public:
         );
 
 
-    // Member functions
+    // Member Functions
 
         //- Return the code-name
-        const word& codeName() const
-        {
-            return codeName_;
-        }
+        const word& codeName() const noexcept { return codeName_; }
 
         //- Return the code-dirname
-        const word& codeDirName() const
-        {
-            return codeDirName_;
-        }
+        const word& codeDirName() const noexcept { return codeDirName_; }
 
         //- Root for dynamic code compilation
         //  Expanded from \<case\>/dynamicCode
-        const fileName& codeRoot() const
-        {
-            return codeRoot_;
-        }
+        const fileName& codeRoot() const noexcept { return codeRoot_; }
 
         //- Subdirectory name for loading libraries
         //  Expanded from platforms/\$WM_OPTIONS/lib
-        fileName libSubDir() const
-        {
-            return libSubDir_;
-        }
+        const fileName& libSubDir() const noexcept { return libSubDir_; }
 
         //- Path for specified code name
         //  Corresponds to codeRoot()/codeDirName()
@@ -255,7 +238,7 @@ public:
         void addCopyFile(const fileName& name);
 
         //- Add a file to create with its contents. Will not be filtered
-        void addCreateFile(const fileName& name, const string& contents);
+        void addCreateFile(const fileName& name, const std::string& contents);
 
         //- Define filter variables for code, codeInclude, SHA1sum
         void setFilterContext(const dynamicCodeContext&);
@@ -280,6 +263,18 @@ public:
         bool wmakeLibso() const;
 
 
+    // Synchronisation
+
+        //- Wait for libPath() file to appear on sub-ranks.
+        //  Returns immediately if non-parallel or
+        //  IOobject::fileModificationSkew is not set
+        static void waitForFile
+        (
+            const fileName& file,
+            const dictionary& contextDict
+        );
+
+
     // Convenience
 
         //- Define a filter variables TemplateType and FieldType
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
index 95f527dd12..105686513b 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dynamicCodeContext_H
-#define dynamicCodeContext_H
+#ifndef Foam_dynamicCodeContext_H
+#define Foam_dynamicCodeContext_H
 
 #include "dictionary.H"
 #include "SHA1.H"

From abc60d4d20fcccb6c47238e862fd0c498e6a70df Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 6 Dec 2022 10:47:48 +0100
Subject: [PATCH 260/348] ENH: use refPtr to manage current fileHandler

- for special cases it can simplify sharing of processor communication
  patterns, but no visible change for most code.

- make fileHandler communicator modifiable (mutable), for special
  cases. The changes from 9711b7f1b941 now make this safer to do.

Continue to support legacy global function using an autoPtr:

   autoPtr<fileOperation> Foam::fileHandler(autoPtr<fileOperation>&&);

However, new code using refPtr uses the following static method since
swapping out file handlers is an infrequent operation that should
also stand out a bit more.

    fileOperation::fileHandler(...);
---
 src/OpenFOAM/Make/files                       |   1 +
 src/OpenFOAM/db/Time/TimeIO.C                 |  16 +-
 src/OpenFOAM/global/argList/argList.C         |   7 +-
 .../fileOperation/fileOperation.C             | 121 +----------
 .../fileOperation/fileOperation.H             | 127 +++++++++---
 .../fileOperation/fileOperationNew.C          | 195 ++++++++++++++++++
 6 files changed, 311 insertions(+), 156 deletions(-)
 create mode 100644 src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 93f42ea300..f2236c6352 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -19,6 +19,7 @@ global/etcFiles/etcFiles.C
 fileOps = global/fileOperations
 $(fileOps)/fileOperation/fileOperation.C
 $(fileOps)/fileOperation/fileOperationBroadcast.C
+$(fileOps)/fileOperation/fileOperationNew.C
 $(fileOps)/fileOperationInitialise/fileOperationInitialise.C
 $(fileOps)/uncollatedFileOperation/uncollatedFileOperation.C
 $(fileOps)/masterUncollatedFileOperation/masterUncollatedFileOperation.C
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 5f54fc28dc..3a7fa55ae4 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -166,18 +166,20 @@ void Foam::Time::readDict()
         }
         controlDict_.watchIndices().clear();
 
-        // The new handler, with verbosity
-        autoPtr<fileOperation> newHandler =
-            fileOperation::New(fileHandlerName, true);
+        // The new handler, create with some verbosity
+        refPtr<fileOperation> newHandler
+        (
+            fileOperation::New(fileHandlerName, true)
+        );
 
-        if (TimePaths::distributed() && newHandler)
+        // Install the new handler
+        (void) fileOperation::fileHandler(newHandler);
+
+        if (TimePaths::distributed())
         {
             newHandler->distributed(true);
         }
 
-        // Installing the new handler
-        Foam::fileHandler(std::move(newHandler));
-
         // Reinstall old watches
         fileHandler().addWatches(controlDict_, oldWatched);
     }
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 9478b95bf3..a19a57e842 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1231,7 +1231,10 @@ void Foam::argList::parse
             handlerType = fileOperation::defaultFileHandler;
         }
 
-        Foam::fileHandler(fileOperation::New(handlerType, bannerEnabled()));
+        (void) fileOperation::fileHandler
+        (
+            fileOperation::New(handlerType, bannerEnabled())
+        );
     }
 
 
@@ -1830,7 +1833,7 @@ Foam::argList::~argList()
     jobInfo.stop();     // Normal job termination
 
     // Delete file handler to flush any remaining IO
-    (void)Foam::fileHandler(nullptr);
+    (void) fileOperation::fileHandler(nullptr);
 }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 4fcef621cf..a69acf2514 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fileOperation.H"
-#include "uncollatedFileOperation.H"
 #include "regIOobject.H"
 #include "argList.H"
 #include "HashSet.H"
@@ -81,8 +80,6 @@ Foam::fileOperation::pathTypeNames_
 
 Foam::word Foam::fileOperation::processorsBaseDir = "processors";
 
-Foam::autoPtr<Foam::fileOperation> Foam::fileOperation::fileHandlerPtr_;
-
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
@@ -219,6 +216,7 @@ void sortProcessorDirs(Foam::UList<Foam::fileOperation::dirIndex>& dirs)
 } // End anonymous namespace
 #endif
 
+
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 Foam::labelList Foam::fileOperation::ioRanks()
@@ -739,54 +737,8 @@ Foam::fileOperation::fileOperation
 {}
 
 
-Foam::autoPtr<Foam::fileOperation>
-Foam::fileOperation::New
-(
-    const word& handlerType,
-    bool verbose
-)
-{
-    if (handlerType.empty())
-    {
-        if (fileOperation::defaultFileHandler.empty())
-        {
-            FatalErrorInFunction
-                << "defaultFileHandler name is undefined" << nl
-                << abort(FatalError);
-        }
-
-        return fileOperation::New(fileOperation::defaultFileHandler, verbose);
-    }
-
-    DebugInFunction
-        << "Constructing fileHandler" << endl;
-
-    auto* ctorPtr = wordConstructorTable(handlerType);
-
-    if (!ctorPtr)
-    {
-        FatalErrorInLookup
-        (
-            "fileHandler",
-            handlerType,
-            *wordConstructorTablePtr_
-        ) << abort(FatalError);
-    }
-
-    return autoPtr<fileOperation>(ctorPtr(verbose));
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::fileOperation::distributed(bool on) const noexcept
-{
-    bool old(distributed_);
-    distributed_ = on;
-    return old;
-}
-
-
 Foam::fileName Foam::fileOperation::objectPath
 (
     const IOobject& io,
@@ -1542,75 +1494,4 @@ Foam::label Foam::fileOperation::detectProcessorPath(const fileName& fName)
 }
 
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::fileOperation> Foam::fileOperation::NewUncollated()
-{
-    return autoPtr<fileOperation>
-    (
-        new fileOperations::uncollatedFileOperation(false)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
-
-const Foam::fileOperation& Foam::fileHandler()
-{
-    if (!fileOperation::fileHandlerPtr_)
-    {
-        word handlerType(Foam::getEnv("FOAM_FILEHANDLER"));
-
-        if (handlerType.empty())
-        {
-            handlerType = fileOperation::defaultFileHandler;
-        }
-
-        fileOperation::fileHandlerPtr_ = fileOperation::New(handlerType, true);
-    }
-
-    return *fileOperation::fileHandlerPtr_;
-}
-
-
-Foam::autoPtr<Foam::fileOperation>
-Foam::fileHandler(std::nullptr_t)
-{
-    return autoPtr<fileOperation>(fileOperation::fileHandlerPtr_.release());
-}
-
-
-Foam::autoPtr<Foam::fileOperation>
-Foam::fileHandler(autoPtr<fileOperation>&& newHandler)
-{
-    // - do nothing if newHandler is empty. Does not delete current
-    // - do nothing if newHandler is identical to current handler
-
-    // Change ownership as atomic operations
-
-    // If newHandler and current handler are actually identical, we
-    // have a bit problem somewhere else since this means that the pointer
-    // is managed is done in two places!
-    // Should flag as a FatalError (in the future), but there may still be
-    // some place where we would like to fake shared pointers?
-
-    // TBD: add a flush() operation on the old handler first,
-    // instead of waiting for it to be run on destruction?
-
-    autoPtr<fileOperation> old;
-
-    if
-    (
-        newHandler.get() != nullptr
-     && newHandler.get() != fileOperation::fileHandlerPtr_.get()
-    )
-    {
-        old.reset(newHandler.release());
-        old.swap(fileOperation::fileHandlerPtr_);
-    }
-
-    return old;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 7f020e8878..a62ad6644c 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -43,10 +43,9 @@ Description
 
 #include "ISstream.H"
 #include "Ostream.H"
-#include "autoPtr.H"
+#include "fileMonitor.H"
 #include "fileNameList.H"
 #include "instantList.H"
-#include "fileMonitor.H"
 #include "refPtr.H"
 #include "Enum.H"
 #include "Tuple2.H"
@@ -105,13 +104,12 @@ public:
         //- identical to UPstream::rangeType
         typedef IntRange<int> procRangeType;
 
-
 protected:
 
     // Protected Data
 
         //- Communicator to use
-        const label comm_;
+        mutable label comm_;
 
         //- Distributed roots (parallel run)
         mutable bool distributed_;
@@ -120,7 +118,7 @@ protected:
         mutable HashTable<dirIndexList> procsDirs_;
 
         //- File-change monitor for all registered files
-        mutable autoPtr<fileMonitor> monitorPtr_;
+        mutable std::unique_ptr<fileMonitor> monitorPtr_;
 
 
    // Protected Member Functions
@@ -180,11 +178,8 @@ public:
         TypeName("fileOperation");
 
 
-    //- Static fileOperation
-    static autoPtr<fileOperation> fileHandlerPtr_;
-
-    //- Static construct the commonly used uncollatedFileOperation
-    static autoPtr<fileOperation> NewUncollated();
+    //- The currently active file handler. Avoid accessing directly
+    static refPtr<fileOperation> fileHandlerPtr_;
 
 
     // Constructors
@@ -229,6 +224,60 @@ public:
     virtual ~fileOperation() = default;
 
 
+   // Factory Methods, Singleton-type Functions
+
+        //- The commonly used uncollatedFileOperation
+        static autoPtr<fileOperation> NewUncollated();
+
+        //- Return the current file handler.
+        //- Will create the default file handler if necessary.
+        static const fileOperation& fileHandler();
+
+        //- Delete current file handler.
+        //  \returns the old handler.
+        //  Should have [[nodiscard]], but gcc ignores void casting.
+        static refPtr<fileOperation> fileHandler(std::nullptr_t);
+
+        //- Replace the current file handler.
+        //  The following are considered no-ops:
+        //  - an empty/invalid newHandler does \b not delete, use a literal
+        //    \c nullptr (std::nullptr_t) for that
+        //  - if new handler and current handler are identical (same pointer).
+        //  .
+        //  \returns the old handler (on change), nullptr otherwise
+        //  Should have [[nodiscard]], but gcc ignores void casting.
+        static refPtr<fileOperation> fileHandler
+        (
+            refPtr<fileOperation>& newHandler
+        );
+
+        //- Replace the current file handler.
+        //  The following are considered no-ops:
+        //  - an empty/invalid newHandler does \b not delete, use a literal
+        //    \c nullptr (std::nullptr_t) for that
+        //  - if new handler and current handler are identical (same pointer).
+        //  .
+        //  \returns the old handler (on change), nullptr otherwise
+        //  Should have [[nodiscard]], but gcc ignores void casting.
+        static refPtr<fileOperation> fileHandler
+        (
+            refPtr<fileOperation>&& newHandler
+        );
+
+        //- Replace the current file handler.
+        //  The following are considered no-ops:
+        //  - an empty/invalid newHandler does \b not delete, use a literal
+        //    \c nullptr (std::nullptr_t) for that
+        //  - if new handler and current handler are identical (same pointer).
+        //  .
+        //  \returns the old handler (on change), nullptr otherwise
+        //  Should have [[nodiscard]], but gcc ignores void casting.
+        static refPtr<fileOperation> fileHandler
+        (
+            autoPtr<fileOperation>&& newHandler
+        );
+
+
    // Static Functions
 
         //- Sort directory entries according to time value,
@@ -248,17 +297,41 @@ public:
 
     // Member Functions
 
+    // Characteristics
+
+        //- Communicator to use
+        label comm() const noexcept
+        {
+            return comm_;
+        }
+
+        //- Set communicator to use [mutable]. Negative values are a no-op.
+        //  \return old value
+        label comm(label communicator) const noexcept
+        {
+            label old(comm_);
+            if (communicator >= 0) comm_ = communicator;
+            return old;
+        }
+
         //- Distributed roots (parallel run)
         bool distributed() const noexcept
         {
             return distributed_;
         }
 
-        //- Set distributed roots on/off (mutable)
+        //- Set distributed roots on/off [mutable]
         //  \return old value
-        bool distributed(bool on) const noexcept;
+        bool distributed(bool on) const noexcept
+        {
+            bool old(distributed_);
+            distributed_ = on;
+            return old;
+        }
 
 
+    // Member Functions
+
         // OSSpecific equivalents
 
             //- Make directory
@@ -653,23 +726,23 @@ inline Ostream& operator<<(Ostream& os, const fileOperation::pathType b)
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-// Note: defined in fileOperation.C
+//- Return the current file handler
+//- (will create default file handler if necessary).
+//- Forwards to fileOperation::handler()
+inline const fileOperation& fileHandler()
+{
+    return fileOperation::fileHandler();
+}
 
-//- Return the current file handler.
-//- Will create the default file handler if necessary.
-const fileOperation& fileHandler();
+//- Delete current file handler - forwards to fileOperation::handler()
+//  Should have [[nodiscard]], but gcc ignores void casting.
+inline refPtr<fileOperation> fileHandler(std::nullptr_t)
+{
+    return fileOperation::fileHandler(nullptr);
+}
 
-//- Delete current file handler.
-//  \returns the old handler
-autoPtr<fileOperation> fileHandler(std::nullptr_t);
-
-//- Replace the current file handler.
-//  The following are considered no-ops:
-//  - an empty/invalid newHandler does \b not delete,
-//    use fileHandler(std::nullptr_t) - ie, a literal \c nullptr for that
-//  - if new handler and current handler are identical (same pointer).
-//  .
-//  \returns the old handler (on change), nullptr otherwise
+//- Replace the current file handler - forwards to fileOperation::handler().
+//  \note legacy behaviour, so returns autoPtr instead of refPtr!
 autoPtr<fileOperation> fileHandler(autoPtr<fileOperation>&& newHandler);
 
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
new file mode 100644
index 0000000000..ef7da7d6dd
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022 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 "fileOperation.H"
+#include "uncollatedFileOperation.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::refPtr<Foam::fileOperation> Foam::fileOperation::fileHandlerPtr_;
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+const Foam::fileOperation& Foam::fileOperation::fileHandler()
+{
+    if (!fileOperation::fileHandlerPtr_)
+    {
+        word handlerType(Foam::getEnv("FOAM_FILEHANDLER"));
+
+        if (handlerType.empty())
+        {
+            handlerType = defaultFileHandler;
+        }
+
+        fileOperation::fileHandlerPtr_ = fileOperation::New(handlerType, true);
+    }
+
+    return *fileOperation::fileHandlerPtr_;
+}
+
+
+Foam::refPtr<Foam::fileOperation>
+Foam::fileOperation::fileHandler(std::nullptr_t)
+{
+    return refPtr<fileOperation>(std::move(fileHandlerPtr_));
+}
+
+
+Foam::refPtr<Foam::fileOperation>
+Foam::fileOperation::fileHandler(refPtr<fileOperation>& newHandler)
+{
+    // - do nothing if newHandler is empty. Does not delete current
+    // - do nothing if newHandler is identical to current handler
+
+    // Change ownership as atomic operations
+
+    // If newHandler and current handler are actually identical, we
+    // have a bit problem somewhere else since this means that the pointer
+    // is managed is done in two places!
+    // Should flag as a FatalError (in the future), but there may still be
+    // some place where we would like to fake shared pointers?
+
+    // TBD: add a flush() operation on the old handler first,
+    // instead of waiting for it to be run on destruction?
+
+    refPtr<fileOperation> old;
+
+    if
+    (
+        newHandler.get() != nullptr
+     && newHandler.get() != fileOperation::fileHandlerPtr_.get()
+    )
+    {
+        old.swap(newHandler);
+        old.swap(fileOperation::fileHandlerPtr_);
+    }
+
+    return old;
+}
+
+
+Foam::refPtr<Foam::fileOperation>
+Foam::fileOperation::fileHandler(autoPtr<fileOperation>&& newHandler)
+{
+    // Same logic as refPtr version
+
+    refPtr<fileOperation> old;
+
+    if
+    (
+        newHandler.get() != nullptr
+     && newHandler.get() != fileOperation::fileHandlerPtr_.get()
+    )
+    {
+        old.reset(newHandler.release());
+        old.swap(fileOperation::fileHandlerPtr_);
+    }
+
+    return old;
+}
+
+
+Foam::refPtr<Foam::fileOperation>
+Foam::fileOperation::fileHandler(refPtr<fileOperation>&& newHandler)
+{
+    return fileOperation::fileHandler(newHandler);
+}
+
+
+Foam::autoPtr<Foam::fileOperation> Foam::fileOperation::NewUncollated()
+{
+    return autoPtr<fileOperation>
+    (
+        new fileOperations::uncollatedFileOperation(false)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::fileOperation>
+Foam::fileOperation::New
+(
+    const word& handlerType,
+    bool verbose
+)
+{
+    if (handlerType.empty())
+    {
+        if (fileOperation::defaultFileHandler.empty())
+        {
+            FatalErrorInFunction
+                << "Default file-handler name is undefined" << nl
+                << abort(FatalError);
+        }
+
+        return fileOperation::New(fileOperation::defaultFileHandler, verbose);
+    }
+
+    DebugInFunction
+        << "Constructing fileHandler" << endl;
+
+    auto* ctorPtr = wordConstructorTable(handlerType);
+
+    if (!ctorPtr)
+    {
+        FatalErrorInLookup
+        (
+            "fileHandler",
+            handlerType,
+            *wordConstructorTablePtr_
+        ) << abort(FatalError);
+    }
+
+    return autoPtr<fileOperation>(ctorPtr(verbose));
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::fileOperation>
+Foam::fileHandler(autoPtr<fileOperation>&& newHandler)
+{
+    refPtr<fileOperation> oldHandler
+    (
+        fileOperation::fileHandler(std::move(newHandler))
+    );
+
+    autoPtr<fileOperation> old;
+
+    // Can return as autoPtr if handler was also a pointer (not a reference)
+    if (oldHandler.is_pointer())
+    {
+        old.reset(oldHandler.release());
+    }
+
+    return old;
+}
+
+
+// ************************************************************************* //

From 336422e00bf1842b2d2ef233d94011f2089a3d5a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 May 2023 10:14:49 +0200
Subject: [PATCH 261/348] ENH: check managed communicator upon construction of
 fileOperation

- previously checked on destruction, but it is robuster to check for a
  locally defined communicator during construction

- add InfoProxy output for fileOperation

ENH: add fileOperation::storeComm()

- transfers management of the communicator from external to internal.
  Use with caution
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  6 ----
 .../collatedFileOperation/OFstreamCollator.C  |  5 +--
 .../collatedFileOperation.C                   | 17 +++++----
 .../collatedFileOperation.H                   | 19 ++++++----
 .../hostCollatedFileOperation.C               | 23 ++++++------
 .../hostCollatedFileOperation.H               | 18 +++++++---
 .../fileOperation/fileOperation.C             | 22 ++++++++++--
 .../fileOperation/fileOperation.H             | 36 +++++++++++++++++--
 .../masterUncollatedFileOperation.C           | 16 +++++----
 .../masterUncollatedFileOperation.H           | 12 +++++--
 .../uncollatedFileOperation.C                 | 16 +++++----
 .../uncollatedFileOperation.H                 | 11 ++++--
 12 files changed, 139 insertions(+), 62 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index dcf731b71b..acbd44c17d 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -351,12 +351,6 @@ public:
         //- Number of currently defined communicators
         static label nComms() noexcept { return parentComm_.size(); }
 
-        //- True if communicator appears to be user-allocated
-        static bool isUserComm(const label communicator) noexcept
-        {
-            return (communicator > worldComm && communicator > selfComm);
-        }
-
         //- Debugging: print the communication tree
         static void printCommTree(const label communicator);
 
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
index 93eba9c1cf..3f4621f540 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
@@ -335,10 +335,7 @@ Foam::OFstreamCollator::~OFstreamCollator()
         thread_.reset(nullptr);
     }
 
-    if (threadComm_ != -1)
-    {
-        UPstream::freeCommunicator(threadComm_);
-    }
+    UPstream::freeCommunicator(threadComm_);
 }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
index e12779bf69..3ed78ec339 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -287,7 +287,7 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
         ),
         false
     ),
-    managedComm_(comm_),
+    managedComm_(getManagedComm(comm_)),  // Possibly locally allocated
     writer_(mag(maxThreadFileBufferSize), comm_),
     nProcs_(Pstream::nProcs()),
     ioRanks_(ioRanks())
@@ -300,7 +300,6 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
 (
     const label comm,
     const labelList& ioRanks,
-    const word& typeName,
     bool verbose
 )
 :
@@ -314,6 +313,13 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
 }
 
 
+void Foam::fileOperations::collatedFileOperation::storeComm() const
+{
+    // From externally -> locally managed
+    managedComm_ = getManagedComm(comm_);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::fileOperations::collatedFileOperation::~collatedFileOperation()
@@ -321,10 +327,7 @@ Foam::fileOperations::collatedFileOperation::~collatedFileOperation()
     // Wait for any outstanding file operations
     flush();
 
-    if (UPstream::isUserComm(managedComm_))
-    {
-        UPstream::freeCommunicator(managedComm_);
-    }
+    UPstream::freeCommunicator(managedComm_);
 }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
index fdfd59c2c4..836a105e21 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,8 +46,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fileOperations_collatedFileOperation_H
-#define fileOperations_collatedFileOperation_H
+#ifndef Foam_fileOperations_collatedFileOperation_H
+#define Foam_fileOperations_collatedFileOperation_H
 
 #include "masterUncollatedFileOperation.H"
 #include "OFstreamCollator.H"
@@ -70,7 +70,7 @@ class collatedFileOperation
     // Private Data
 
         //- Communicator allocated/managed by us
-        label managedComm_;
+        mutable label managedComm_;
 
 
     // Private Member Functions
@@ -78,6 +78,7 @@ class collatedFileOperation
         //- Any initialisation steps after constructing
         void init(bool verbose);
 
+
 protected:
 
     // Protected Data
@@ -129,15 +130,14 @@ public:
     // Constructors
 
         //- Default construct
-        explicit collatedFileOperation(bool verbose);
+        explicit collatedFileOperation(bool verbose = false);
 
         //- Construct from user communicator
         collatedFileOperation
         (
             const label comm,
             const labelList& ioRanks,
-            const word& typeName,
-            bool verbose
+            bool verbose = false
         );
 
 
@@ -147,6 +147,11 @@ public:
 
     // Member Functions
 
+        //- Transfer ownership of communicator to this fileOperation.
+        //- Use with caution
+        virtual void storeComm() const;
+
+
         // (reg)IOobject functionality
 
             //- Generate disk file name for object. Opposite of filePath.
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
index f86e2c6ca3..223e54e0df 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -144,26 +144,29 @@ Foam::fileOperations::hostCollatedFileOperation::hostCollatedFileOperation
         UPstream::allocateCommunicator
         (
             UPstream::worldComm,
-            subRanks(Pstream::nProcs())
+            subRanks(UPstream::nProcs())
         ),
-        (Pstream::parRun() ? labelList() : ioRanks()), // processor dirs
-        typeName,
-        false // verbose
+        (UPstream::parRun() ? labelList() : ioRanks()), // processor dirs
+        false  // verbose
     ),
-    managedComm_(comm_)
+    managedComm_(getManagedComm(comm_))  // Possibly locally allocated
 {
     init(verbose);
 }
 
 
+void Foam::fileOperations::hostCollatedFileOperation::storeComm() const
+{
+    // From externally -> locally managed
+    managedComm_ = getManagedComm(comm_);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::fileOperations::hostCollatedFileOperation::~hostCollatedFileOperation()
 {
-    if (UPstream::isUserComm(managedComm_))
-    {
-        UPstream::freeCommunicator(managedComm_);
-    }
+    UPstream::freeCommunicator(managedComm_);
 }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
index 859d2705a1..333b3e0773 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,8 +57,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fileOperations_hostCollatedFileOperation_H
-#define fileOperations_hostCollatedFileOperation_H
+#ifndef Foam_fileOperations_hostCollatedFileOperation_H
+#define Foam_fileOperations_hostCollatedFileOperation_H
 
 #include "collatedFileOperation.H"
 
@@ -80,7 +80,7 @@ class hostCollatedFileOperation
     // Private Data
 
         //- Communicator allocated/managed by us
-        label managedComm_;
+        mutable label managedComm_;
 
 
     // Private Member Functions
@@ -100,11 +100,18 @@ public:
     // Constructors
 
         //- Default construct
-        explicit hostCollatedFileOperation(const bool verbose);
+        explicit hostCollatedFileOperation(bool verbose = false);
 
 
     //- Destructor
     virtual ~hostCollatedFileOperation();
+
+
+    // Member Functions
+
+        //- Transfer ownership of communicator to this fileOperation.
+        //- Use with caution
+        virtual void storeComm() const;
 };
 
 
@@ -112,6 +119,7 @@ public:
             Class hostCollatedFileOperationInitialise Declaration
 \*---------------------------------------------------------------------------*/
 
+//! Internal class only
 class hostCollatedFileOperationInitialise
 :
     public collatedFileOperationInitialise
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index a69acf2514..25b35e3922 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -316,7 +316,7 @@ bool Foam::fileOperation::uniformFile(const fileNameList& names)
 
 bool Foam::fileOperation::uniformFile(const label comm, const fileName& name)
 {
-    if (!Pstream::parRun())
+    if (!UPstream::parRun())
     {
         return true;
     }
@@ -1494,4 +1494,22 @@ Foam::label Foam::fileOperation::detectProcessorPath(const fileName& fName)
 }
 
 
+// * * * * * * * * * * * * * *  Friend Operators * * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const InfoProxy<fileOperation>& iproxy
+)
+{
+    const auto& fp = *iproxy;
+
+    os  << "fileHandler:" << fp.type()
+        // << " nProcs:" << fp.nProcs()
+        << " comm:" << fp.comm()
+        << " distributed:" << fp.distributed() << nl;
+
+    return os;
+}
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index a62ad6644c..21b8d0e843 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,12 +43,14 @@ Description
 
 #include "ISstream.H"
 #include "Ostream.H"
+#include "UPstream.H"
 #include "fileMonitor.H"
 #include "fileNameList.H"
 #include "instantList.H"
 #include "refPtr.H"
 #include "Enum.H"
 #include "Tuple2.H"
+#include "InfoProxy.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,11 +58,14 @@ namespace Foam
 {
 
 // Forward Declarations
-class IOobject;
-class regIOobject;
+class fileOperation;
 class objectRegistry;
+class regIOobject;
+class IOobject;
 class Time;
 
+Ostream& operator<<(Ostream& os, const InfoProxy<fileOperation>& info);
+
 /*---------------------------------------------------------------------------*\
                          Class fileOperation Declaration
 \*---------------------------------------------------------------------------*/
@@ -160,6 +165,22 @@ protected:
         //- Is either a directory (empty name()) or a file
         bool exists(IOobject& io) const;
 
+        //- Construction helper: check for locally allocated communicator
+        static inline label getManagedComm(const label communicator)
+        {
+            return
+            (
+                (
+                    communicator < 0
+                 || communicator == UPstream::globalComm
+                 || communicator == UPstream::selfComm
+                 || communicator == UPstream::worldComm
+                )
+              ? -1
+              : communicator
+            );
+        }
+
 
 public:
 
@@ -329,9 +350,18 @@ public:
             return old;
         }
 
+        //- Return info proxy,
+        //- used to print information to a stream
+        InfoProxy<fileOperation> info() const noexcept { return *this; }
+
 
     // Member Functions
 
+        //- Transfer ownership of communicator to this fileOperation.
+        //- Use with caution
+        virtual void storeComm() const = 0;
+
+
         // OSSpecific equivalents
 
             //- Make directory
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index de391d0b0c..d73b453c96 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -740,10 +740,10 @@ masterUncollatedFileOperation
         UPstream::allocateCommunicator
         (
             UPstream::worldComm,
-            subRanks(Pstream::nProcs())
+            subRanks(UPstream::nProcs())
         )
     ),
-    managedComm_(comm_)
+    managedComm_(getManagedComm(comm_))  // Possibly locally allocated
 {
     init(verbose);
 }
@@ -763,15 +763,19 @@ masterUncollatedFileOperation
 }
 
 
+void Foam::fileOperations::masterUncollatedFileOperation::storeComm() const
+{
+    // From externally -> locally managed
+    managedComm_ = getManagedComm(comm_);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::fileOperations::masterUncollatedFileOperation::
 ~masterUncollatedFileOperation()
 {
-    if (UPstream::isUserComm(managedComm_))
-    {
-        UPstream::freeCommunicator(managedComm_);
-    }
+    UPstream::freeCommunicator(managedComm_);
 }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
index 225102ab4d..0b4848488e 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,7 +91,7 @@ class masterUncollatedFileOperation
     // Private Data
 
         //- Communicator allocated/managed by us
-        label managedComm_;
+        mutable label managedComm_;
 
 
     // Private Member Functions
@@ -99,6 +99,7 @@ class masterUncollatedFileOperation
         //- Any initialisation steps after constructing
         void init(bool verbose);
 
+
 protected:
 
     // Protected Data
@@ -491,7 +492,7 @@ public:
     // Constructors
 
         //- Default construct
-        explicit masterUncollatedFileOperation(bool verbose);
+        explicit masterUncollatedFileOperation(bool verbose = false);
 
         //- Construct from communicator
         masterUncollatedFileOperation(const label comm, bool verbose);
@@ -503,6 +504,11 @@ public:
 
     // Member Functions
 
+        //- Transfer ownership of communicator to this fileOperation.
+        //- Use with caution
+        virtual void storeComm() const;
+
+
         // OSSpecific equivalents
 
             //- Make directory
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 8acc5692ad..0988f3b251 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -194,20 +194,24 @@ Foam::fileOperations::uncollatedFileOperation::uncollatedFileOperation
 )
 :
     fileOperation(UPstream::worldComm),
-    managedComm_(-1)  // worldComm is externally managed
+    managedComm_(-1)  // Externally managed
 {
     init(verbose);
 }
 
 
+void Foam::fileOperations::uncollatedFileOperation::storeComm() const
+{
+    // From externally -> locally managed
+    managedComm_ = getManagedComm(comm_);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::fileOperations::uncollatedFileOperation::~uncollatedFileOperation()
 {
-    if (UPstream::isUserComm(managedComm_))
-    {
-        UPstream::freeCommunicator(managedComm_);
-    }
+    UPstream::freeCommunicator(managedComm_);
 }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
index d81c54d86d..a58d60a58d 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,7 @@ class uncollatedFileOperation
     // Private Data
 
         //- Communicator allocated/managed by us
-        label managedComm_;
+        mutable label managedComm_;
 
 
     // Private Member Functions
@@ -97,7 +97,7 @@ public:
     // Constructors
 
         //- Default construct
-        explicit uncollatedFileOperation(bool verbose);
+        explicit uncollatedFileOperation(bool verbose = false);
 
 
     //- Destructor
@@ -106,6 +106,11 @@ public:
 
     // Member Functions
 
+        //- Transfer ownership of communicator to this fileOperation.
+        //- Use with caution
+        virtual void storeComm() const;
+
+
         // OSSpecific equivalents
 
             //- Make directory

From 06147dabe7ec06c777f7ab59ef80ef94abde58d4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 11:24:44 +0200
Subject: [PATCH 262/348] ENH: more flexible handling of FOAM_IORANKS

- accept plain lists (space or comma separated) as well as the
  traditional OpenFOAM lists. This simplifies argument handling
  with job scripts.

  For example,
     simpleFoam -ioRanks 0,4,8 ...
  vs
     simpleFoam -ioRanks '(0 4 8)'  ...

  It is also possible to select the IO ranks on a per-host basis:

     simpleFoam -ioRanks host  ...

- expose rank/subrank handling as static fileOperation methods
---
 .../test/fileHandler-ranks1/Make/files        |   3 +
 .../test/fileHandler-ranks1/Make/options      |   2 +
 applications/test/fileHandler-ranks1/README   |  20 ++
 .../Test-fileHandler-ranks1.C                 | 249 ++++++++++++++
 src/OpenFOAM/Make/files                       |   1 +
 .../collatedFileOperation.C                   |  10 +-
 .../collatedFileOperation.H                   |   2 +-
 .../hostCollatedFileOperation.C               |  56 +--
 .../hostCollatedFileOperation.H               |  18 +-
 .../fileOperation/fileOperation.C             |  14 -
 .../fileOperation/fileOperation.H             |  61 +++-
 .../fileOperation/fileOperationRanks.C        | 319 ++++++++++++++++++
 .../masterUncollatedFileOperation.C           |  37 +-
 tutorials/IO/fileHandler/Allrun               |   8 +-
 14 files changed, 680 insertions(+), 120 deletions(-)
 create mode 100644 applications/test/fileHandler-ranks1/Make/files
 create mode 100644 applications/test/fileHandler-ranks1/Make/options
 create mode 100644 applications/test/fileHandler-ranks1/README
 create mode 100644 applications/test/fileHandler-ranks1/Test-fileHandler-ranks1.C
 create mode 100644 src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C

diff --git a/applications/test/fileHandler-ranks1/Make/files b/applications/test/fileHandler-ranks1/Make/files
new file mode 100644
index 0000000000..7ad7a3eb9a
--- /dev/null
+++ b/applications/test/fileHandler-ranks1/Make/files
@@ -0,0 +1,3 @@
+Test-fileHandler-ranks1.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-fileHandler-ranks1
diff --git a/applications/test/fileHandler-ranks1/Make/options b/applications/test/fileHandler-ranks1/Make/options
new file mode 100644
index 0000000000..18e6fe47af
--- /dev/null
+++ b/applications/test/fileHandler-ranks1/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/fileHandler-ranks1/README b/applications/test/fileHandler-ranks1/README
new file mode 100644
index 0000000000..657fad446a
--- /dev/null
+++ b/applications/test/fileHandler-ranks1/README
@@ -0,0 +1,20 @@
+Test that -ioRanks selections perform as expected and that sub-rank
+selection is also doing the correct thing.
+
+For example,
+
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks host
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '(0 3 14)'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks 14,15,2,0,10,15,0,0,0,
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3,10'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3,11'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3,14'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3,15'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3,12,115'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3,10,12,115'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks host -pick '1,2,3,4'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -pick '2,4,6,8'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,3' -pick '2,4,6,8'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,4' -pick '2,4,6,8'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,6' -pick '2,4,6,8'
+mpirun -np 10 --oversubscribe Test-fileHandler-ranks1 -parallel -ioRanks '0,6' -pick '2,4,6,8'
diff --git a/applications/test/fileHandler-ranks1/Test-fileHandler-ranks1.C b/applications/test/fileHandler-ranks1/Test-fileHandler-ranks1.C
new file mode 100644
index 0000000000..253553e7d6
--- /dev/null
+++ b/applications/test/fileHandler-ranks1/Test-fileHandler-ranks1.C
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-fileHandler-ranks1
+
+Description
+    Test IO ranks and ranks selection
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "fileName.H"
+#include "fileOperation.H"
+#include "IOstreams.H"
+#include "ITstream.H"
+#include "OSspecific.H"
+#include "Pstream.H"
+#include "SHA1.H"
+#include "stringOps.H"
+
+using namespace Foam;
+
+// Parse space, comma, semicolon separated list of integers, floats etc...
+template<class PrimitiveType>
+static List<PrimitiveType> splitStringToList(const std::string& str)
+{
+    const SubStrings<std::string> items = stringOps::splitAny(str, " ,;");
+
+    DynamicList<PrimitiveType> values(items.size());
+
+    for (const auto& item : items)
+    {
+        const std::string s(item.str());
+
+        PrimitiveType val;
+
+        if (Foam::read(s, val))
+        {
+            values.push_back(val);
+        }
+        else
+        {
+            // Report errors? Could get noisy...
+        }
+    }
+
+    return List<PrimitiveType>(std::move(values));
+}
+
+
+//- Construct by parsing string for scalar ranges
+//  The individual items are space, comma or semicolon delimited.
+static labelList parseIOranks
+(
+    const Foam::string& str,
+    label numProcs = -1
+)
+{
+    bool byHostName = false;
+
+    labelList ranks;
+
+    // Info<< "parsing: " << str << endl;
+
+    if (!str.empty())
+    {
+        if (str.contains('('))
+        {
+            // Looks like a list - tokenise it
+
+            ITstream is(str);
+            if (!is.empty())
+            {
+                is >> ranks;
+            }
+        }
+        else if (str == "host")
+        {
+            // Select by host
+            byHostName = true;
+        }
+        else
+        {
+            // Manual parse
+            ranks = splitStringToList<label>(str);
+        }
+    }
+
+    if (ranks.size())
+    {
+        // Never trust user input.
+        // Sort and eliminate any duplicates
+
+        std::sort(ranks.begin(), ranks.end());
+
+        auto last = std::unique(ranks.begin(), ranks.end());
+
+        label newLen = label(last - ranks.begin());
+
+        // Detect any values that are too large
+        if (numProcs > 0)
+        {
+            auto iter = std::find_if
+            (
+                ranks.begin(),
+                last,
+                [=](label proci) { return proci >= numProcs; }
+            );
+
+            if (last != iter)
+            {
+                newLen = label(iter - ranks.begin());
+            }
+        }
+
+        ranks.resize(newLen);
+    }
+    else if (byHostName)
+    {
+        // Use hostname
+        // Lowest rank per hostname is the IO rank
+
+        numProcs = UPstream::nProcs(UPstream::worldComm);
+
+        List<SHA1Digest> digests;
+        if (UPstream::master(UPstream::worldComm))
+        {
+            digests.resize(numProcs);
+        }
+
+        // Could also add lowercase etc, but since hostName()
+        // will be consistent within the same node, there is no need.
+        SHA1Digest myDigest(SHA1(hostName()).digest());
+
+        // The fixed-length digest allows use of MPI_Gather
+        UPstream::mpiGather
+        (
+            myDigest.cdata_bytes(),     // Send
+            digests.data_bytes(),       // Recv
+            SHA1Digest::max_size(),     // Num send/recv per rank
+            UPstream::worldComm
+        );
+
+        if (UPstream::master(UPstream::worldComm))
+        {
+            DynamicList<label> dynRanks(numProcs);
+
+            dynRanks.push_back(0);  // Always include master
+            label previ = 0;
+
+            for (label proci = 1; proci < digests.size(); ++proci)
+            {
+                if (digests[proci] != digests[previ])
+                {
+                    dynRanks.push_back(proci);
+                    previ = proci;
+                }
+            }
+
+            ranks.transfer(dynRanks);
+        }
+
+        Pstream::broadcast(ranks, UPstream::worldComm);
+    }
+
+    return ranks;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noCheckProcessorDirectories();
+
+    argList::addOption("io-ranks", "list", "shadow for -ioRanks (testing)");
+    argList::addOption("pick", "list", "limited subset of procs");
+
+    labelList ioRanks;
+
+    // Pre-check
+    for (int argi = 1; argi < argc; ++argi)
+    {
+        if (strcmp(argv[argi], "-io-ranks") == 0)
+        {
+            if (argi < argc-1)
+            {
+                ioRanks = parseIOranks(argv[argi+1]);
+                break;
+            }
+        }
+    }
+
+    #include "setRootCase.H"
+
+    bitSet useProc;
+
+    if (args.found("pick"))
+    {
+        useProc = bitSet
+        (
+            UPstream::nProcs(),
+            parseIOranks(args.get<string>("pick"))
+        );
+    }
+
+    Info<< "procs: " << UPstream::nProcs() << endl;
+    Info<< "io-ranks: " << flatOutput(ioRanks) << endl;
+    Info<< "-ioRanks: "
+        << flatOutput(fileOperation::getGlobalIORanks()) << endl;
+
+    Info<< "pick: " << flatOutput(useProc.toc()) << endl;
+
+    // labelList subRanks = fileOperation::getGlobalSubRanks(useProc);
+    //
+    // Pout<< "sub ranks: "
+    //     << flatOutput(fileOperation::getGlobalSubRanks(useProc)) << endl;
+
+    Info<< "\nEnd\n" << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index f2236c6352..b4918de003 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -20,6 +20,7 @@ fileOps = global/fileOperations
 $(fileOps)/fileOperation/fileOperation.C
 $(fileOps)/fileOperation/fileOperationBroadcast.C
 $(fileOps)/fileOperation/fileOperationNew.C
+$(fileOps)/fileOperation/fileOperationRanks.C
 $(fileOps)/fileOperationInitialise/fileOperationInitialise.C
 $(fileOps)/uncollatedFileOperation/uncollatedFileOperation.C
 $(fileOps)/masterUncollatedFileOperation/masterUncollatedFileOperation.C
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
index 3ed78ec339..191ae1f83a 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -78,7 +78,7 @@ namespace fileOperations
 
 void Foam::fileOperations::collatedFileOperation::printBanner
 (
-    const bool printRanks
+    const bool withRanks
 ) const
 {
     DetailInfo
@@ -105,7 +105,7 @@ void Foam::fileOperations::collatedFileOperation::printBanner
             << "         OpenFOAM etc/controlDict" << endl;
     }
 
-    if (printRanks)
+    if (withRanks)
     {
         // Information about the ranks
         stringList hosts(Pstream::nProcs());
@@ -277,11 +277,11 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
     masterUncollatedFileOperation
     (
         (
-            ioRanks().size()
+            fileOperation::getGlobalIORanks().size()
           ? UPstream::allocateCommunicator
             (
                 UPstream::worldComm,
-                subRanks(Pstream::nProcs())
+                subRanks(UPstream::nProcs())
             )
           : UPstream::worldComm
         ),
@@ -290,7 +290,7 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
     managedComm_(getManagedComm(comm_)),  // Possibly locally allocated
     writer_(mag(maxThreadFileBufferSize), comm_),
     nProcs_(Pstream::nProcs()),
-    ioRanks_(ioRanks())
+    ioRanks_(fileOperation::getGlobalIORanks())
 {
     init(verbose);
 }
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
index 836a105e21..bfec2a9e32 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -98,7 +98,7 @@ protected:
     // Protected Member Functions
 
         //- Print banner information, optionally with io ranks
-        void printBanner(const bool printRanks = false) const;
+        void printBanner(const bool withRanks = false) const;
 
         //- Is proci master of communicator (in parallel) or master of
         //- the io ranks (non-parallel)
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
index 223e54e0df..1bbf105fe8 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
@@ -64,60 +64,16 @@ Foam::labelList Foam::fileOperations::hostCollatedFileOperation::subRanks
     const label n
 )
 {
-    DynamicList<label> subRanks(64);
+    labelList mainIOranks(fileOperation::getGlobalIORanks());
 
-    labelList mainRanks(fileOperation::ioRanks());
-    if (!mainRanks.empty())
+    if (mainIOranks.empty())
     {
-        if (!mainRanks.found(0))
-        {
-            FatalErrorInFunction
-                << "Rank 0 (master) should be in the IO ranks. Currently "
-                << mainRanks << nl
-                << exit(FatalError);
-        }
-
-        // The lowest numbered rank is the IO rank
-        const bitSet isIOrank(n, mainRanks);
-
-        for (label proci = Pstream::myProcNo(); proci >= 0; --proci)
-        {
-            if (isIOrank[proci])
-            {
-                // Found my master. Collect all processors with same master
-                subRanks.append(proci);
-                for
-                (
-                    label rank = proci+1;
-                    rank < n && !isIOrank[rank];
-                    ++rank
-                )
-                {
-                    subRanks.append(rank);
-                }
-                break;
-            }
-        }
+        mainIOranks = fileOperation::getGlobalHostIORanks();
     }
-    else
-    {
-        // Normal operation: one lowest rank per hostname is the writer
-        const string myHostName(hostName());
 
-        stringList hosts(Pstream::nProcs());
-        hosts[Pstream::myProcNo()] = myHostName;
-        Pstream::allGatherList(hosts);
+    labelRange subRange = fileOperation::subRanks(mainIOranks);
 
-        // Collect procs with same hostname
-        forAll(hosts, proci)
-        {
-            if (hosts[proci] == myHostName)
-            {
-                subRanks.append(proci);
-            }
-        }
-    }
-    return subRanks;
+    return identity(subRange);
 }
 
 
@@ -146,7 +102,7 @@ Foam::fileOperations::hostCollatedFileOperation::hostCollatedFileOperation
             UPstream::worldComm,
             subRanks(UPstream::nProcs())
         ),
-        (UPstream::parRun() ? labelList() : ioRanks()), // processor dirs
+        (UPstream::parRun() ? labelList() : getGlobalIORanks()),
         false  // verbose
     ),
     managedComm_(getManagedComm(comm_))  // Possibly locally allocated
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
index 333b3e0773..f6ea90cf17 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
@@ -40,17 +40,25 @@ Description
     FOAM_IORANKS environment variable (also when running non-parallel), e.g.
     when decomposing into 4:
 
+    \verbatim
         FOAM_IORANKS='(0 2)' decomposePar -fileHandler hostCollated
+        FOAM_IORANKS='0,2'   decomposePar -fileHandler hostCollated
+        FOAM_IORANKS='0 2'   decomposePar -fileHandler hostCollated
+    \endverbatim
 
     will generate
 
-        processors4_0-1/
-            containing data for processors 0 to 1
-        processors4_2-3/
-            containing data for processors 2 to 3
+    \verbatim
+        processors4_0-1/  : containing data for processors 0 to 1
+        processors4_2-3/  : containing data for processors 2 to 3
+    \endverbatim
+
+Environment
+    - \c FOAM_ENV : list of io-ranks as plain space or comma separated
+      list or as an OpenFOAM formatted list. Eg, '(0 4 8)'
 
 See also
-    collatedFileOperation
+    Foam::collatedFileOperation
 
 SourceFiles
     hostCollatedFileOperation.C
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 25b35e3922..996c7d6e8f 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -219,20 +219,6 @@ void sortProcessorDirs(Foam::UList<Foam::fileOperation::dirIndex>& dirs)
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::labelList Foam::fileOperation::ioRanks()
-{
-    labelList ranks;
-
-    ITstream is(Foam::getEnv("FOAM_IORANKS"));
-    if (!is.empty())
-    {
-        is >> ranks;
-    }
-
-    return ranks;
-}
-
-
 Foam::instantList
 Foam::fileOperation::sortTimes
 (
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 21b8d0e843..721d2ea2c0 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -30,6 +30,38 @@ Class
 Description
     An encapsulation of filesystem-related operations.
 
+    Several of the file handlers can be configured to use specific ranks for
+    IO operations. These can either be defined from the command-line
+    \c -ioRanks option, or via the \c FOAM_ENV environment variable.
+    In either case, the list of IO ranks shall always include the value
+    \b 0 (master rank). The ranks may be specified as a plain list, or as an
+    OpenFOAM list. The special value \em host can be used to specify selection
+    based on hostname.
+
+    For example,
+    \verbatim
+        FOAM_IORANKS='0 4 8'   decomposePar -fileHandler hostCollated
+        FOAM_IORANKS='0,4,8'   decomposePar -fileHandler hostCollated
+        FOAM_IORANKS='(0 4 8)' decomposePar -fileHandler hostCollated
+    \endverbatim
+    will generate
+    \verbatim
+        processors12_0-3/   : containing data for processors 0 to 3
+        processors12_4-7/   : containing data for processors 4 to 7
+        processors12_8-11/  : containing data for processors 8 to 11
+    \endverbatim
+
+    The value \em host can be used to specify a single IO rank for each
+    host. For example,
+    \verbatim
+        decomposePar -fileHandler collated -ioRanks host
+        decomposePar -fileHandler hostCollated
+    \endverbatim
+
+Environment
+    - \c FOAM_ENV : list of io-ranks as plain space or comma separated
+      list or as an OpenFOAM formatted list. Eg, '(0 4 8)'
+
 Namespace
     Foam::fileOperations
 
@@ -109,6 +141,7 @@ public:
         //- identical to UPstream::rangeType
         typedef IntRange<int> procRangeType;
 
+
 protected:
 
     // Protected Data
@@ -131,9 +164,6 @@ protected:
         //- Get or create fileMonitor singleton
         fileMonitor& monitor() const;
 
-        //- Retrieve list of IO ranks from FOAM_IORANKS env variable
-        static labelList ioRanks();
-
         //- Merge two times
         static void mergeTimes
         (
@@ -161,7 +191,7 @@ protected:
             const fileName& objectPath
         ) const;
 
-        //- Does IOObject exist.
+        //- Does IOobject exist?
         //- Is either a directory (empty name()) or a file
         bool exists(IOobject& io) const;
 
@@ -647,15 +677,15 @@ public:
 
         // Other
 
-            //- Actual name of processors dir (for use in mode PROCOBJECT,
-            //  PROCINSTANCE)
+            //- Actual name of processors dir
+            //- (for use in mode PROCOBJECT, PROCINSTANCE)
             virtual word processorsDir(const IOobject& io) const
             {
                 return processorsBaseDir;
             }
 
-            //- Actual name of processors dir (for use in mode PROCOBJECT,
-            //  PROCINSTANCE)
+            //- Actual name of processors dir
+            //- (for use in mode PROCOBJECT, PROCINSTANCE)
             virtual word processorsDir(const fileName&) const
             {
                 return processorsBaseDir;
@@ -733,6 +763,21 @@ public:
 
             //- Detect processor number from '/aa/bb/processorDDD/cc'
             static label detectProcessorPath(const fileName& objPath);
+
+
+    // Rank selection/sub-selection
+
+        //- Get (contiguous) range/bounds of ranks addressed
+        //- within the given main io-ranks.
+        static labelRange subRanks(const labelUList& mainIOranks);
+
+        //- Get list of global IO master ranks based on the hostname.
+        //- It is assumed that each host range is contiguous.
+        static labelList getGlobalHostIORanks();
+
+        //- Get list of global IO ranks from FOAM_IORANKS env variable.
+        //- If set, these correspond to the IO master ranks.
+        static labelList getGlobalIORanks();
 };
 
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C
new file mode 100644
index 0000000000..e0a79e83c2
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C
@@ -0,0 +1,319 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022-2023 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 "fileOperation.H"
+#include "stringOps.H"
+#include "ITstream.H"
+#include "Pstream.H"
+#include "SHA1.H"
+#include "OSspecific.H"  // for hostName()
+#include <cinttypes>
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Parse space, comma, semicolon separated list of integers, floats etc...
+template<class PrimitiveType>
+static List<PrimitiveType> splitStringToList(const std::string& str)
+{
+    const SubStrings<std::string> items = stringOps::splitAny(str, " ,;");
+
+    DynamicList<PrimitiveType> values(items.size());
+
+    for (const auto& item : items)
+    {
+        const std::string s(item.str());
+
+        PrimitiveType val;
+
+        if (Foam::read(s, val))
+        {
+            values.push_back(val);
+        }
+        else
+        {
+            // Report errors? Could get noisy...
+        }
+    }
+
+    return List<PrimitiveType>(std::move(values));
+}
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::labelRange Foam::fileOperation::subRanks(const labelUList& mainIOranks)
+{
+    // Fast path - no IO ranks.
+    if (mainIOranks.empty())
+    {
+        return labelRange();
+    }
+
+    // The lowest numbered rank is the IO rank
+    // - linear search for the enclosing range
+    // - fallback is proc = 0, which silently adds master (0) into IO ranks
+
+    label begProc = 0;
+    label endProc = UPstream::nProcs(UPstream::worldComm);
+
+    const label myProci = UPstream::myProcNo(UPstream::worldComm);
+
+    forAllReverse(mainIOranks, i)
+    {
+        if (mainIOranks[i] <= myProci)
+        {
+            begProc = mainIOranks[i];
+            if (i+1 < mainIOranks.size())
+            {
+                endProc = mainIOranks[i+1];
+            }
+            break;
+        }
+    }
+
+    Pout<< "subRanks: " << labelRange(begProc, (endProc-begProc)) << endl;
+
+    return labelRange(begProc, (endProc-begProc));
+}
+
+
+Foam::labelList Foam::fileOperation::getGlobalHostIORanks()
+{
+    const label numProcs = UPstream::nProcs(UPstream::worldComm);
+
+    // Use hostname
+    // Lowest rank per hostname is the IO rank
+
+    List<SHA1Digest> digests;
+    if (UPstream::master(UPstream::worldComm))
+    {
+        digests.resize(numProcs);
+    }
+
+    // Could also add lowercase etc, but since hostName()
+    // will be consistent within the same node, there is no need.
+    SHA1Digest myDigest(SHA1(hostName()).digest());
+
+    // The fixed-length digest allows use of MPI_Gather
+    UPstream::mpiGather
+    (
+        myDigest.cdata_bytes(),     // Send
+        digests.data_bytes(),       // Recv
+        SHA1Digest::max_size(),     // Num send/recv per rank
+        UPstream::worldComm
+    );
+
+    labelList ranks;
+    DynamicList<label> dynRanks;
+
+    if (UPstream::master(UPstream::worldComm))
+    {
+        dynRanks.reserve(numProcs);
+
+        dynRanks.push_back(0);  // Always include master
+        label previ = 0;
+
+        for (label proci = 1; proci < digests.size(); ++proci)
+        {
+            if (digests[proci] != digests[previ])
+            {
+                dynRanks.push_back(proci);
+                previ = proci;
+            }
+        }
+
+        ranks.transfer(dynRanks);
+    }
+
+    Pstream::broadcast(ranks, UPstream::worldComm);
+    return ranks;
+}
+
+
+Foam::labelList Foam::fileOperation::getGlobalIORanks
+(
+    // const bool useHost
+)
+{
+    // bool byHostName = useHost;
+    bool byHostName = false;
+
+    DynamicList<label> dynRanks;
+
+    Foam::string str(Foam::getEnv("FOAM_IORANKS"));
+
+    if (!str.empty())
+    {
+        if (str.contains('('))
+        {
+            // Looks like a list - tokenise it
+            ITstream is(str);
+            if (!is.empty())
+            {
+                is >> dynRanks;
+            }
+        }
+        else if (str == "host")
+        {
+            // Select by hostname
+            byHostName = true;
+        }
+        else
+        {
+            // Manual parse
+            dynRanks = splitStringToList<label>(str);
+        }
+    }
+
+    if (dynRanks.size())
+    {
+        if (!dynRanks.contains(0))
+        {
+            // Could also add silently
+            // dynRanks.push_back(0);
+            FatalErrorInFunction
+                << "Rank 0 (master) should be in the IO ranks. Currently:" << nl
+                << "    " << flatOutput(dynRanks) << nl
+                << exit(FatalError);
+        }
+
+        // Never trust user input.
+        // Sort and eliminate any duplicates
+
+        std::sort(dynRanks.begin(), dynRanks.end());
+
+        if (dynRanks.front() < 0)
+        {
+            FatalErrorInFunction
+                << "Cannot have negative ranks! Currently:" << nl
+                << "    " << flatOutput(dynRanks) << nl
+                << exit(FatalError);
+        }
+
+        labelList ranks;
+
+        auto last = std::unique(dynRanks.begin(), dynRanks.end());
+
+        if (last < dynRanks.end())
+        {
+            ranks = dynRanks.slice(0, (last - dynRanks.begin()));
+        }
+        else
+        {
+            ranks = dynRanks;
+        }
+
+        return ranks;
+    }
+    else if (byHostName)
+    {
+        return fileOperation::getGlobalHostIORanks();
+    }
+
+    return labelList();
+}
+
+
+#if 0  // FUTURE
+bool Foam::fileOperation::isIOrank(const label proci) const
+{
+    return
+    (
+        UPstream::parRun()
+      ? UPstream::master(comm_)
+      : ioRanks_.empty()
+      ? (proci == 0)                // No io-ranks, assume single communicator
+      : ioRanks_.contains(proci)    // Found proci in IO rank
+    );
+}
+
+
+void Foam::fileOperation::printRanks() const
+{
+    // Collect the names of the IO masters
+    stringList hosts(UPstream::nProcs(UPstream::worldComm));
+    if (UPstream::master(comm_))
+    {
+        hosts[UPstream::myProcNo(UPstream::worldComm)] = hostName();
+    }
+    Pstream::gatherList(hosts, UPstream::msgType(), UPstream::worldComm);
+
+
+    DynamicList<label> offsetMaster;
+
+    // Calculate the offsets/counts
+
+    if (UPstream::master(UPstream::worldComm))
+    {
+        label nHostRanks = 0;
+        forAll(hosts, ranki)
+        {
+            if (!hosts[ranki].empty())
+            {
+                ++nHostRanks;
+            }
+        }
+        offsetMaster.reserve(nHostRanks+1);
+
+        forAll(hosts, ranki)
+        {
+            if (!hosts[ranki].empty())
+            {
+                offsetMaster.push_back(ranki);
+            }
+        }
+
+        // End of range is nProcs
+        offsetMaster.push_back(hosts.size());
+    }
+
+    if (offsetMaster.size() > 2)
+    {
+        DetailInfo
+            << "I/O on :" << nl << '(' << nl;
+        for (label group = 1; group < offsetMaster.size(); ++group)
+        {
+            const label beg = offsetMaster[group-1];
+            const label end = offsetMaster[group];
+
+            DetailInfo
+                << "    (" << hosts[beg].c_str() << ' '
+                << (end-beg) << ')' << nl;
+        }
+        DetailInfo
+            << ')' << nl;
+    }
+}
+#endif
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index d73b453c96..6aa0893614 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -85,46 +85,17 @@ Foam::labelList Foam::fileOperations::masterUncollatedFileOperation::subRanks
     const label n
 )
 {
-    labelList mainRanks(fileOperation::ioRanks());
+    labelList mainIOranks(fileOperation::getGlobalIORanks());
 
-    if (mainRanks.empty())
+    if (mainIOranks.empty())
     {
         return identity(n);
     }
     else
     {
-        DynamicList<label> subRanks(n);
+        labelRange subRange = fileOperation::subRanks(mainIOranks);
 
-        if (!mainRanks.found(0))
-        {
-            FatalErrorInFunction
-                << "Rank 0 (master) should be in the IO ranks. Currently "
-                << mainRanks << nl
-                << exit(FatalError);
-        }
-
-        // The lowest numbered rank is the IO rank
-        const bitSet isIOrank(n, mainRanks);
-
-        for (label proci = Pstream::myProcNo(); proci >= 0; --proci)
-        {
-            if (isIOrank[proci])
-            {
-                // Found my master. Collect all processors with same master
-                subRanks.append(proci);
-                for
-                (
-                    label rank = proci+1;
-                    rank < n && !isIOrank[rank];
-                    ++rank
-                )
-                {
-                    subRanks.append(rank);
-                }
-                break;
-            }
-        }
-        return subRanks;
+        return identity(subRange);
     }
 }
 
diff --git a/tutorials/IO/fileHandler/Allrun b/tutorials/IO/fileHandler/Allrun
index 6c62df4e1f..02a76ea205 100755
--- a/tutorials/IO/fileHandler/Allrun
+++ b/tutorials/IO/fileHandler/Allrun
@@ -47,7 +47,7 @@ mkdir -p machineB/fileHandler
 (   d=$PWD && \
     cd machineA/fileHandler && \
     runParallel -s multiRoot $application \
-    -fileHandler masterUncollated -ioRanks '(0 2)' \
+    -fileHandler masterUncollated -ioRanks '0,2' \
     -roots "(\"$d/machineA\" \"$d/machineB\" \"$d/machineB\")"
 )
 
@@ -60,13 +60,13 @@ runParallel foamFormatConvert -fileHandler uncollated
 
 #- Restart with multiple IO ranks
 runParallel -s multiCollated \
-    $application -fileHandler collated -ioRanks '(0 2)'
+    $application -fileHandler collated -ioRanks '0,2'
 
 #- Reconstruct the multi-rank format. Delete the collated directory
 #  since conflicts with the multi-collated directory
 rm -rf processors4
 runApplication -s multiCollated reconstructPar -latestTime \
-    -fileHandler collated -ioRanks '(0 2)'
+    -fileHandler collated -ioRanks '0,2'
 
 #- Convert the multi-rank format to uncollated
 runParallel -s uncollated foamFormatConvert -fileHandler uncollated
@@ -99,7 +99,7 @@ mkdir -p machineB/fileHandler
 (   d=$PWD && \
     cd machineA/fileHandler && \
     runParallel -s distributed_multiCollated $application \
-    -fileHandler collated -ioRanks '(0 2)' \
+    -fileHandler collated -ioRanks '0,2' \
     -roots "(\"$d/machineA\" \"$d/machineB\" \"$d/machineB\")"
 )
 

From 821d39525969dc73a08535598721d842f19a710f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2023 18:14:49 +0200
Subject: [PATCH 263/348] ENH: use refPtr fileHandler in decomposeFaFields,
 faMeshReconstructor

---
 .../finiteArea/makeFaMesh/decomposeFaFields.H | 13 ++++++------
 .../faReconstruct/faMeshReconstructor.C       | 20 +++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H b/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H
index f1a595e3b0..fd5840f30e 100644
--- a/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H
+++ b/applications/utilities/finiteArea/makeFaMesh/decomposeFaFields.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -57,8 +57,10 @@ do
         std::unique_ptr<faMeshSubset> subsetter;
         IOobjectList objects(0);
 
+        refPtr<fileOperation> newHandler(fileOperation::NewUncollated());
+
         const bool oldDistributed = fileHandler().distributed();
-        auto oldHandler = fileHandler(fileOperation::NewUncollated());
+        auto oldHandler = fileOperation::fileHandler(newHandler);
         fileHandler().distributed(true);
 
         if (UPstream::master())
@@ -73,11 +75,8 @@ do
             UPstream::parRun(oldParRun);
         }
 
-        // Restore old settings
-        if (oldHandler)
-        {
-            fileHandler(std::move(oldHandler));
-        }
+        // Restore settings
+        (void) fileOperation::fileHandler(oldHandler);
         fileHandler().distributed(oldDistributed);
 
         areaFieldsCache.readAllFields
diff --git a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
index 332480a5b3..ea49c9d551 100644
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@@ -721,13 +721,14 @@ void Foam::faMeshReconstructor::writeMesh(const word& timeName) const
 {
     const faMesh& fullMesh = this->mesh();
 
-    const bool oldDistributed = fileHandler().distributed();
-    auto oldHandler = fileHandler(fileOperation::NewUncollated());
-    fileHandler().distributed(true);
+    refPtr<fileOperation> writeHandler(fileOperation::NewUncollated());
 
-    if (Pstream::master())
+    auto oldHandler = fileOperation::fileHandler(writeHandler);
+    const bool oldDistributed = fileHandler().distributed(true);
+
+    if (UPstream::master())
     {
-        const bool oldParRun = Pstream::parRun(false);
+        const bool oldParRun = UPstream::parRun(false);
 
         IOobject io(fullMesh.boundary());
 
@@ -736,15 +737,12 @@ void Foam::faMeshReconstructor::writeMesh(const word& timeName) const
 
         fullMesh.boundary().write();
 
-        Pstream::parRun(oldParRun);
+        UPstream::parRun(oldParRun);
     }
 
-    // Restore old settings
-    if (oldHandler)
-    {
-        fileHandler(std::move(oldHandler));
-    }
+    // Restore settings
     fileHandler().distributed(oldDistributed);
+    (void) fileOperation::fileHandler(oldHandler);
 }
 
 

From 401c6646be1ee591a4a00f90cd9de7018cbfd095 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2023 17:21:01 +0200
Subject: [PATCH 264/348] ENH: support fileHandler in fieldsDistributor

---
 .../fieldsDistributor/fieldsDistributor.H     |  31 ++-
 .../fieldsDistributorTemplates.C              | 213 ++++++++++++------
 2 files changed, 166 insertions(+), 78 deletions(-)

diff --git a/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributor.H b/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributor.H
index aef9d63b55..d58e882758 100644
--- a/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributor.H
+++ b/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributor.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,10 +37,10 @@ SourceFiles
 #ifndef Foam_fieldsDistributor_H
 #define Foam_fieldsDistributor_H
 
-#include "IOobjectList.H"
 #include "bitSet.H"
-#include "boolList.H"
+#include "fileOperation.H"
 #include "PtrList.H"
+#include "IOobjectList.H"
 #include "GeometricField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,8 +61,9 @@ class fieldsDistributor
     template<class BoolListType, class GeoField, class MeshSubsetter>
     static void readFieldsImpl
     (
+        refPtr<fileOperation>* readHandlerPtr,  // Can be nullptr
         const BoolListType& haveMeshOnProc,
-        const MeshSubsetter* subsetter,
+        const MeshSubsetter* subsetter,         // Can be nullptr
         const typename GeoField::Mesh& mesh,
         IOobjectList& allObjects,
         PtrList<GeoField>& fields,
@@ -126,7 +127,7 @@ public:
     static void readFields
     (
         const bitSet& haveMeshOnProc,
-        const MeshSubsetter* subsetter,
+        const MeshSubsetter* subsetter,     // Can be nullptr
         const typename GeoField::Mesh& mesh,
         IOobjectList& allObjects,
         PtrList<GeoField>& fields,
@@ -138,8 +139,8 @@ public:
     template<class GeoField, class MeshSubsetter>
     static void readFields
     (
-        const boolList& haveMeshOnProc,
-        const MeshSubsetter* subsetter,
+        const boolUList& haveMeshOnProc,
+        const MeshSubsetter* subsetter,     // Can be nullptr
         const typename GeoField::Mesh& mesh,
         IOobjectList& allObjects,
         PtrList<GeoField>& fields,
@@ -151,7 +152,21 @@ public:
     template<class GeoField, class MeshSubsetter>
     static void readFields
     (
-        const boolList& haveMeshOnProc,
+        const boolUList& haveMeshOnProc,
+        const typename GeoField::Mesh& mesh,
+        const autoPtr<MeshSubsetter>& subsetter,
+        IOobjectList& allObjects,
+        PtrList<GeoField>& fields,
+        const bool deregister = false
+    );
+
+    //- Read volume/surface/point/area fields that may or may not exist
+    //- on all processors
+    template<class GeoField, class MeshSubsetter>
+    static void readFields
+    (
+        const boolUList& haveMeshOnProc,
+        refPtr<fileOperation>& readHandler,
         const typename GeoField::Mesh& mesh,
         const autoPtr<MeshSubsetter>& subsetter,
         IOobjectList& allObjects,
diff --git a/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C b/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C
index acd6ee1c3d..3163526388 100644
--- a/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C
+++ b/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,27 +32,24 @@ void Foam::fieldsDistributor::readField
 (
     const IOobject& io,
     const typename GeoField::Mesh& mesh,
-    const label i,
+    const label idx,
     PtrList<GeoField>& fields
 )
 {
-    fields.set(i, new GeoField(io, mesh));
+    fields.emplace_set(idx, io, mesh);
 }
 
+
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::fieldsDistributor::readField
 (
     const IOobject& io,
     const typename GeoMesh::Mesh& mesh,
-    const label i,
+    const label idx,
     PtrList<GeometricField<Type, PatchField, GeoMesh>>& fields
 )
 {
-    fields.set
-    (
-        i,
-        new GeometricField<Type, PatchField, GeoMesh>(io, mesh, false)
-    );
+    fields.emplace_set(idx, io, mesh, false);  // readOldTime = false
 }
 
 
@@ -75,7 +72,7 @@ void Foam::fieldsDistributor::readFields
 
     forAll(fieldObjects, i)
     {
-        fields.set(i, new GeoField(fieldObjects[i], mesh, readOldTime));
+        fields.emplace_set(i, fieldObjects[i], mesh, readOldTime);
     }
 }
 
@@ -96,7 +93,7 @@ void Foam::fieldsDistributor::readFields
 
     forAll(fieldObjects, i)
     {
-        fields.set(i, new GeoField(fieldObjects[i], mesh));
+        fields.emplace_set(i, fieldObjects[i], mesh);
     }
 }
 
@@ -104,6 +101,7 @@ void Foam::fieldsDistributor::readFields
 template<class BoolListType, class GeoField, class MeshSubsetter>
 void Foam::fieldsDistributor::readFieldsImpl
 (
+    refPtr<fileOperation>* readHandlerPtr,  // Can be nullptr
     const BoolListType& haveMeshOnProc,
     const MeshSubsetter* subsetter,
     const typename GeoField::Mesh& mesh,
@@ -122,17 +120,47 @@ void Foam::fieldsDistributor::readFieldsImpl
     wordList masterNames(objectNames);
     Pstream::broadcast(masterNames);
 
-    if (haveMeshOnProc.test(Pstream::myProcNo()) && objectNames != masterNames)
+    if
+    (
+        haveMeshOnProc.test(UPstream::myProcNo())
+     && objectNames != masterNames
+    )
     {
         FatalErrorInFunction
             << "Objects not synchronised across processors." << nl
             << "Master has " << flatOutput(masterNames) << nl
-            << "Processor " << Pstream::myProcNo()
+            << "Processor " << UPstream::myProcNo()
             << " has " << flatOutput(objectNames)
             << exit(FatalError);
     }
 
-    fields.clear();
+    #ifdef FULLDEBUG
+    {
+        // A bit more checking - this may not be strictly correct.
+        // The master must know about everyone, but the others really
+        // only need to know about themselves.
+        // Can broadcast decompose = yes/no from master
+
+        bitSet localValues(haveMeshOnProc)
+        bitSet masterValues(localValues);
+        Pstream::broadcast(masterValues);
+
+        localValues ^= masterValues;
+
+        if (localValues.any())
+        {
+            FatalErrorInFunction
+                << "haveMeshOnProc not synchronised across processors." << nl
+                << "Processor " << UPstream::myProcNo()
+                << " differs at these positions: "
+                << flatOutput(localValues.sortedToc()) << nl
+                << exit(FatalError);
+         }
+    }
+    #endif
+
+
+    fields.free();
     fields.resize(masterNames.size());
 
     if (fields.empty())
@@ -161,17 +189,11 @@ void Foam::fieldsDistributor::readFieldsImpl
     }
 
 
-    // Have master send all fields to processors that don't have a mesh. The
-    // issue is if a patchField does any parallel operations inside its
-    // construct-from-dictionary. This will not work when going to more
-    // processors (e.g. decompose = 1 -> many) ! We could make a special
-    // exception for decomposePar but nicer would be to have read-communicator
-    // ... For now detect if decomposing & disable parRun
-    if (Pstream::master())
+    // We are decomposing if none of the subprocs has a mesh
+    bool decompose = true;
+    if (UPstream::master())
     {
-        // Work out if we're decomposing - none of the subprocs has a mesh
-        bool decompose = true;
-        for (const int proci : Pstream::subProcs())
+        for (const int proci : UPstream::subProcs())
         {
             if (haveMeshOnProc.test(proci))
             {
@@ -179,39 +201,65 @@ void Foam::fieldsDistributor::readFieldsImpl
                 break;
             }
         }
-
-        const bool oldParRun = Pstream::parRun();
-        if (decompose)
-        {
-            Pstream::parRun(false);
-        }
-
-        forAll(masterNames, i)
-        {
-            const word& name = masterNames[i];
-            IOobject& io = *objects[name];
-            io.writeOpt(IOobject::AUTO_WRITE);
-
-            // Load field (but not oldTime)
-            readField(io, mesh, i, fields);
-        }
-
-        Pstream::parRun(oldParRun);  // Restore any changes
     }
-    else if (haveMeshOnProc.test(Pstream::myProcNo()))
+    Pstream::broadcast(decompose);
+
+
+    if (decompose && UPstream::master())
     {
-        // Have mesh so just try to load
+        const bool oldParRun = UPstream::parRun(false);
+
         forAll(masterNames, i)
         {
             const word& name = masterNames[i];
             IOobject& io = *objects[name];
             io.writeOpt(IOobject::AUTO_WRITE);
 
-            /// Pout<< "Attempt read: " << name << endl;
+            // Load field (but not oldTime)
+            readField(io, mesh, i, fields);
+        }
+
+        UPstream::parRun(oldParRun);
+    }
+    else if
+    (
+        !decompose
+     &&
+        // Has read-handler : use it to decide if reading is possible
+        // No  read-handler : decide based on the presence of a mesh
+        (
+            readHandlerPtr
+          ? readHandlerPtr->good()
+          : haveMeshOnProc.test(UPstream::myProcNo())
+        )
+    )
+    {
+        const label oldWorldComm = UPstream::worldComm;
+        refPtr<fileOperation> oldHandler;
+
+        if (readHandlerPtr)
+        {
+            // Swap read fileHandler for read fields
+            oldHandler = fileOperation::fileHandler(*readHandlerPtr);
+            UPstream::commWorld(fileHandler().comm());
+        }
+
+        forAll(masterNames, i)
+        {
+            const word& name = masterNames[i];
+            IOobject& io = *objects[name];
+            io.writeOpt(IOobject::AUTO_WRITE);
 
             // Load field (but not oldTime)
             readField(io, mesh, i, fields);
         }
+
+        if (readHandlerPtr)
+        {
+            // Restore fileHandler
+            *readHandlerPtr = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldWorldComm);
+        }
     }
 
 
@@ -220,7 +268,7 @@ void Foam::fieldsDistributor::readFieldsImpl
 
     PtrList<dictionary> fieldDicts;
 
-    if (Pstream::master())
+    if (UPstream::master())
     {
         // Broadcast zero sized fields everywhere (if needed)
         // Send like a list of dictionaries
@@ -234,7 +282,7 @@ void Foam::fieldsDistributor::readFieldsImpl
         if (nDicts && subsetter)
         {
             // Disable communication for interpolate() method
-            const bool oldParRun = Pstream::parRun(false);
+            const bool oldParRun = UPstream::parRun(false);
 
             for (const auto& fld : fields)
             {
@@ -246,7 +294,7 @@ void Foam::fieldsDistributor::readFieldsImpl
                 toProcs.endBlock();
             }
 
-            Pstream::parRun(oldParRun);  // Restore state
+            UPstream::parRun(oldParRun);  // Restore state
         }
 
         toProcs << token::END_LIST << token::NL;  // End list
@@ -257,7 +305,7 @@ void Foam::fieldsDistributor::readFieldsImpl
         IPBstream fromMaster(UPstream::masterNo());  // worldComm
 
         // But only consume where needed...
-        if (!haveMeshOnProc.test(Pstream::myProcNo()))
+        if (!haveMeshOnProc.test(UPstream::myProcNo()))
         {
             fromMaster >> fieldDicts;
         }
@@ -267,30 +315,26 @@ void Foam::fieldsDistributor::readFieldsImpl
     // Use the received dictionaries (if any) to create missing fields.
 
     // Disable communication when constructing from dictionary
-    const bool oldParRun = Pstream::parRun(false);
+    const bool oldParRun = UPstream::parRun(false);
+
+    IOobject noreadIO
+    (
+        "none",
+        mesh.time().timeName(),
+        mesh.thisDb(),
+        IOobject::NO_READ,
+        IOobject::AUTO_WRITE,
+        IOobject::REGISTER
+    );
 
     forAll(fieldDicts, i)
     {
-        fields.set
-        (
-            i,
-            new GeoField
-            (
-                IOobject
-                (
-                    masterNames[i],
-                    mesh.time().timeName(),
-                    mesh.thisDb(),
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                mesh,
-                fieldDicts[i]
-            )
-        );
+        noreadIO.resetHeader(masterNames[i]);
+
+        fields.emplace_set(i, noreadIO, mesh, fieldDicts[i]);
     }
 
-    Pstream::parRun(oldParRun);  // Restore any changes
+    UPstream::parRun(oldParRun);  // Restore any changes
 
 
     // Finally. Can checkOut of registry as required
@@ -338,6 +382,7 @@ void Foam::fieldsDistributor::readFields
 {
     readFieldsImpl
     (
+        nullptr,  // readHandler
         haveMeshOnProc,
         subsetter,
 
@@ -352,7 +397,7 @@ void Foam::fieldsDistributor::readFields
 template<class GeoField, class MeshSubsetter>
 void Foam::fieldsDistributor::readFields
 (
-    const boolList& haveMeshOnProc,
+    const boolUList& haveMeshOnProc,
     const MeshSubsetter* subsetter,
     const typename GeoField::Mesh& mesh,
     IOobjectList& allObjects,
@@ -362,6 +407,7 @@ void Foam::fieldsDistributor::readFields
 {
     readFieldsImpl
     (
+        nullptr,  // readHandler
         haveMeshOnProc,
         subsetter,
 
@@ -376,7 +422,7 @@ void Foam::fieldsDistributor::readFields
 template<class GeoField, class MeshSubsetter>
 void Foam::fieldsDistributor::readFields
 (
-    const boolList& haveMeshOnProc,
+    const boolUList& haveMeshOnProc,
     const typename GeoField::Mesh& mesh,
     const autoPtr<MeshSubsetter>& subsetter,
     IOobjectList& allObjects,
@@ -386,6 +432,33 @@ void Foam::fieldsDistributor::readFields
 {
     readFieldsImpl
     (
+        nullptr,  // readHandler
+        haveMeshOnProc,
+        subsetter.get(),
+
+        mesh,
+        allObjects,
+        fields,
+        deregister
+    );
+}
+
+
+template<class GeoField, class MeshSubsetter>
+void Foam::fieldsDistributor::readFields
+(
+    const boolUList& haveMeshOnProc,
+    refPtr<fileOperation>& readHandler,
+    const typename GeoField::Mesh& mesh,
+    const autoPtr<MeshSubsetter>& subsetter,
+    IOobjectList& allObjects,
+    PtrList<GeoField>& fields,
+    const bool deregister
+)
+{
+    readFieldsImpl
+    (
+       &readHandler,
         haveMeshOnProc,
         subsetter.get(),
 

From 73f6c7fe28c833445c2b907ae9b43ca867da2f5d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 16:30:44 +0200
Subject: [PATCH 265/348] ENH: centralise handling of fileOperations
 communicator subset

- use local function for the decision making, whether worldComm or a
  dedicated communicator is needed (and which sibling ranks are
  involved)

Co-authored-by: mattijs <mattijs>
---
 .../db/IOstreams/Fstreams/masterOFstream.C    |  46 +-
 .../db/IOstreams/Fstreams/masterOFstream.H    |  57 +-
 .../collatedFileOperation.C                   | 130 +++--
 .../collatedFileOperation.H                   |  31 +-
 .../hostCollatedFileOperation.C               |  72 ++-
 .../hostCollatedFileOperation.H               |  10 +-
 .../fileOperation/fileOperation.C             | 127 +++--
 .../fileOperation/fileOperation.H             | 113 +++-
 .../fileOperation/fileOperationNew.C          |  55 +-
 .../fileOperation/fileOperationRanks.C        |   2 -
 .../masterUncollatedFileOperation.C           | 485 ++++++++++++------
 .../masterUncollatedFileOperation.H           |  16 +-
 .../hostUncollatedFileOperation.C             | 175 +++++++
 .../hostUncollatedFileOperation.H             | 130 +++++
 .../uncollatedFileOperation.C                 |  68 ++-
 .../uncollatedFileOperation.H                 |  13 +-
 16 files changed, 1202 insertions(+), 328 deletions(-)
 create mode 100644 src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C
 create mode 100644 src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H

diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
index 79da7ae93b..cc80139f0e 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
@@ -47,7 +47,7 @@ void Foam::masterOFstream::checkWrite
         return;
     }
 
-    mkDir(fName.path());
+    Foam::mkDir(fName.path());
 
     OFstream os
     (
@@ -89,19 +89,23 @@ void Foam::masterOFstream::checkWrite
 
 void Foam::masterOFstream::commit()
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
-        List<fileName> filePaths(Pstream::nProcs());
-        filePaths[Pstream::myProcNo()] = pathName_;
-        Pstream::gatherList(filePaths);
+        List<fileName> filePaths(UPstream::nProcs(comm_));
+        filePaths[UPstream::myProcNo(comm_)] = pathName_;
+        Pstream::gatherList(filePaths, UPstream::msgType(), comm_);
 
-        bool uniform = fileOperation::uniformFile(filePaths);
+        bool uniform =
+        (
+            UPstream::master(comm_)
+         && fileOperation::uniformFile(filePaths)
+        );
 
-        Pstream::broadcast(uniform);
+        Pstream::broadcast(uniform, comm_);
 
         if (uniform)
         {
-            if (Pstream::master() && writeOnProc_)
+            if (UPstream::master(comm_) && writeOnProc_)
             {
                 checkWrite(pathName_, this->str());
             }
@@ -111,36 +115,38 @@ void Foam::masterOFstream::commit()
         }
 
         // Different files
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(comm_, UPstream::commsTypes::nonBlocking);
 
-        // Send my (valid) buffer to master
-        if (!Pstream::master())
+        if (!UPstream::master(comm_))
         {
             if (writeOnProc_)
             {
+                // Send buffer to master
                 string s(this->str());
 
-                UOPstream os(Pstream::masterNo(), pBufs);
+                UOPstream os(UPstream::masterNo(), pBufs);
                 os.write(s.data(), s.length());
             }
-            this->reset();
+            this->reset();  // Done with contents
         }
 
         pBufs.finishedGathers();
 
-        if (Pstream::master())
+
+        if (UPstream::master(comm_))
         {
-            // Write (valid) master data
             if (writeOnProc_)
             {
-                checkWrite(filePaths[Pstream::masterNo()], this->str());
+                // Write master data
+                checkWrite(filePaths[UPstream::masterNo()], this->str());
             }
-            this->reset();
+            this->reset();  // Done with contents
+
 
             // Allocate large enough to read without resizing
             List<char> buf(pBufs.maxRecvCount());
 
-            for (const int proci : Pstream::subProcs())
+            for (const int proci : UPstream::subProcs(comm_))
             {
                 const std::streamsize count(pBufs.recvDataCount(proci));
 
@@ -170,6 +176,7 @@ void Foam::masterOFstream::commit()
 Foam::masterOFstream::masterOFstream
 (
     IOstreamOption::atomicType atomic,
+    const label comm,
     const fileName& pathName,
     IOstreamOption streamOpt,
     IOstreamOption::appendType append,
@@ -181,7 +188,8 @@ Foam::masterOFstream::masterOFstream
     atomic_(atomic),
     compression_(streamOpt.compression()),
     append_(append),
-    writeOnProc_(writeOnProc)
+    writeOnProc_(writeOnProc),
+    comm_(comm)
 {}
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
index 4abeaf17e8..c139e00e0d 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +30,9 @@ Class
 Description
     Master-only drop-in replacement for OFstream.
 
+    Called on all processors (of the provided communicator).
+    Sends files to the master and writes them there.
+
 SourceFiles
     masterOFstream.C
 
@@ -39,6 +42,7 @@ SourceFiles
 #define Foam_masterOFstream_H
 
 #include "StringStream.H"
+#include "UPstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -70,6 +74,9 @@ class masterOFstream
         //- Should file be written (on this processor)
         const bool writeOnProc_;
 
+        //- Communicator
+        const label comm_;
+
 
     // Private Member Functions
 
@@ -92,6 +99,40 @@ public:
 
     // Constructors
 
+        //- Construct with specified atomic behaviour and communicator
+        //- from pathname, stream option, optional append
+        masterOFstream
+        (
+            IOstreamOption::atomicType atomic,
+            const label comm,
+            const fileName& pathname,
+            IOstreamOption streamOpt = IOstreamOption(),
+            IOstreamOption::appendType append = IOstreamOption::NON_APPEND,
+            const bool writeOnProc = true
+        );
+
+        //- Construct with specified communicator
+        //- from pathname, stream option, optional append
+        masterOFstream
+        (
+            const label comm,
+            const fileName& pathname,
+            IOstreamOption streamOpt = IOstreamOption(),
+            IOstreamOption::appendType append = IOstreamOption::NON_APPEND,
+            const bool writeOnProc = true
+        )
+        :
+            masterOFstream
+            (
+                IOstreamOption::NON_ATOMIC,
+                comm,
+                pathname,
+                streamOpt,
+                append,
+                writeOnProc
+            )
+        {}
+
         //- Construct with specified atomic behaviour (with worldComm)
         //- from pathname, stream option, optional append
         masterOFstream
@@ -101,7 +142,18 @@ public:
             IOstreamOption streamOpt = IOstreamOption(),
             IOstreamOption::appendType append = IOstreamOption::NON_APPEND,
             const bool writeOnProc = true
-        );
+        )
+        :
+            masterOFstream
+            (
+                atomic,
+                UPstream::worldComm,
+                pathname,
+                streamOpt,
+                append,
+                writeOnProc
+            )
+        {}
 
         //- Construct (with worldComm)
         //- from pathname, stream option, optional append
@@ -116,6 +168,7 @@ public:
             masterOFstream
             (
                 IOstreamOption::NON_ATOMIC,
+                UPstream::worldComm,
                 pathname,
                 streamOpt,
                 append,
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
index 191ae1f83a..1c846ae5d8 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -50,6 +50,12 @@ namespace fileOperations
         collatedFileOperation,
         word
     );
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        collatedFileOperation,
+        comm
+    );
 
     float collatedFileOperation::maxThreadFileBufferSize
     (
@@ -146,6 +152,7 @@ void Foam::fileOperations::collatedFileOperation::printBanner
         }
     }
 
+    //- fileModificationChecking already set by base class (masterUncollated)
     // if (IOobject::fileModificationChecking == IOobject::timeStampMaster)
     // {
     //     WarningInFunction
@@ -159,29 +166,6 @@ void Foam::fileOperations::collatedFileOperation::printBanner
 }
 
 
-bool Foam::fileOperations::collatedFileOperation::isMasterRank
-(
-    const label proci
-)
-const
-{
-    if (Pstream::parRun())
-    {
-        return Pstream::master(comm_);
-    }
-    else if (ioRanks_.size())
-    {
-        // Found myself in IO rank
-        return ioRanks_.found(proci);
-    }
-    else
-    {
-        // Assume all in single communicator
-        return proci == 0;
-    }
-}
-
-
 bool Foam::fileOperations::collatedFileOperation::appendObject
 (
     const regIOobject& io,
@@ -207,10 +191,10 @@ bool Foam::fileOperations::collatedFileOperation::appendObject
             << exit(FatalError);
     }
 
-    const bool isMaster = isMasterRank(proci);
+    const bool isIOmaster = fileOperation::isIOrank(proci);
 
     // Update meta-data for current state
-    if (isMaster)
+    if (isIOmaster)
     {
         const_cast<regIOobject&>(io).updateMetaData();
     }
@@ -227,7 +211,7 @@ bool Foam::fileOperations::collatedFileOperation::appendObject
         // UNCOMPRESSED (binary only)
         IOstreamOption(IOstreamOption::BINARY, streamOpt.version()),
         // Append on sub-ranks
-        (isMaster ? IOstreamOption::NON_APPEND : IOstreamOption::APPEND)
+        (isIOmaster ? IOstreamOption::NON_APPEND : IOstreamOption::APPEND)
     );
 
     if (!os.good())
@@ -237,7 +221,7 @@ bool Foam::fileOperations::collatedFileOperation::appendObject
             << exit(FatalIOError);
     }
 
-    if (isMaster)
+    if (isIOmaster)
     {
         decomposedBlockData::writeHeader(os, streamOpt, io);
     }
@@ -248,14 +232,44 @@ bool Foam::fileOperations::collatedFileOperation::appendObject
         streamOpt,
         io,
         proci,
-        // With FoamFile header on master?
-        isMaster
+        isIOmaster  // With FoamFile header on master
     );
 
     return (blockOffset >= 0) && os.good();
 }
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Construction helper: self/world/local communicator and IO ranks
+static Tuple2<label, labelList> getCommPattern()
+{
+    // Default is COMM_WORLD (single master)
+    Tuple2<label, labelList> commAndIORanks
+    (
+        UPstream::worldComm,
+        fileOperation::getGlobalIORanks()
+    );
+
+    if (UPstream::parRun() && commAndIORanks.second().size() > 1)
+    {
+        // Multiple masters: ranks for my IO range
+        commAndIORanks.first() = UPstream::allocateCommunicator
+        (
+            UPstream::worldComm,
+            fileOperation::subRanks(commAndIORanks.second())
+        );
+    }
+
+    return commAndIORanks;
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 void Foam::fileOperations::collatedFileOperation::init(bool verbose)
@@ -276,21 +290,12 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
 :
     masterUncollatedFileOperation
     (
-        (
-            fileOperation::getGlobalIORanks().size()
-          ? UPstream::allocateCommunicator
-            (
-                UPstream::worldComm,
-                subRanks(UPstream::nProcs())
-            )
-          : UPstream::worldComm
-        ),
-        false
+        getCommPattern(),
+        false,  // distributedRoots
+        false   // verbose
     ),
     managedComm_(getManagedComm(comm_)),  // Possibly locally allocated
-    writer_(mag(maxThreadFileBufferSize), comm_),
-    nProcs_(Pstream::nProcs()),
-    ioRanks_(fileOperation::getGlobalIORanks())
+    writer_(mag(maxThreadFileBufferSize), comm_)
 {
     init(verbose);
 }
@@ -298,16 +303,19 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
 
 Foam::fileOperations::collatedFileOperation::collatedFileOperation
 (
-    const label comm,
-    const labelList& ioRanks,
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots,
     bool verbose
 )
 :
-    masterUncollatedFileOperation(comm, false),
+    masterUncollatedFileOperation
+    (
+        commAndIORanks,
+        distributedRoots,
+        false   // verbose
+    ),
     managedComm_(-1),  // Externally managed
-    writer_(mag(maxThreadFileBufferSize), comm),
-    nProcs_(Pstream::nProcs()),
-    ioRanks_(ioRanks)
+    writer_(mag(maxThreadFileBufferSize), comm_)
 {
     init(verbose);
 }
@@ -392,6 +400,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
         // Note: currently still NON_ATOMIC (Dec-2022)
         masterOFstream os
         (
+            comm_,
             pathName,
             streamOpt,
             IOstreamOption::NON_APPEND,
@@ -423,7 +432,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
         mkDir(path);
         fileName pathName(path/io.name());
 
-        if (io.global())
+        if (io.global() || io.globalObject())
         {
             if (debug)
             {
@@ -436,6 +445,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
             // Note: currently still NON_ATOMIC (Dec-2022)
             masterOFstream os
             (
+                comm_,
                 pathName,
                 streamOpt,
                 IOstreamOption::NON_APPEND,
@@ -459,7 +469,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
 
             return ok;
         }
-        else if (!Pstream::parRun())
+        else if (!UPstream::parRun())
         {
             // Special path for e.g. decomposePar. Append to
             // processorsDDD/ file
@@ -502,7 +512,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject
 
             bool ok = os.good();
 
-            if (Pstream::master(comm_))
+            if (UPstream::master(comm_))
             {
                 // Suppress comment banner
                 const bool old = IOobject::bannerEnabled(false);
@@ -548,13 +558,13 @@ Foam::word Foam::fileOperations::collatedFileOperation::processorsDir
     const fileName& fName
 ) const
 {
-    if (Pstream::parRun())
+    if (UPstream::parRun())
     {
         const List<int>& procs(UPstream::procID(comm_));
 
-        word procDir(processorsBaseDir+Foam::name(Pstream::nProcs()));
+        word procDir(processorsBaseDir+Foam::name(nProcs_));
 
-        if (procs.size() != Pstream::nProcs())
+        if (procs.size() != nProcs_)
         {
             procDir +=
               + "_"
@@ -616,16 +626,4 @@ Foam::word Foam::fileOperations::collatedFileOperation::processorsDir
 }
 
 
-void Foam::fileOperations::collatedFileOperation::setNProcs(const label nProcs)
-{
-    nProcs_ = nProcs;
-
-    if (debug)
-    {
-        Pout<< "collatedFileOperation::setNProcs :"
-            << " Setting number of processors to " << nProcs_ << endl;
-    }
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
index bfec2a9e32..d2c9ad9888 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -86,24 +86,12 @@ protected:
         //- Threaded writer
         mutable OFstreamCollator writer_;
 
-        // For non-parallel operation
-
-            //- Number of processors (overall)
-            label nProcs_;
-
-            //- Ranks of IO handlers
-            const labelList ioRanks_;
-
 
     // Protected Member Functions
 
         //- Print banner information, optionally with io ranks
         void printBanner(const bool withRanks = false) const;
 
-        //- Is proci master of communicator (in parallel) or master of
-        //- the io ranks (non-parallel)
-        bool isMasterRank(const label proci) const;
-
         //- Append to processorsNN/ file
         bool appendObject
         (
@@ -115,8 +103,8 @@ protected:
 
 public:
 
-        //- Runtime type information
-        TypeName("collated");
+    //- Runtime type information
+    TypeName("collated");
 
 
     // Static Data
@@ -132,11 +120,11 @@ public:
         //- Default construct
         explicit collatedFileOperation(bool verbose = false);
 
-        //- Construct from user communicator
-        collatedFileOperation
+        //- Construct from communicator with specified io-ranks
+        explicit collatedFileOperation
         (
-            const label comm,
-            const labelList& ioRanks,
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots,
             bool verbose = false
         );
 
@@ -170,6 +158,7 @@ public:
                 const bool writeOnProc = true
             ) const;
 
+
         // Other
 
             //- Forcibly wait until all output done. Flush any cached data
@@ -180,10 +169,6 @@ public:
 
             //- Actual name of processors dir
             virtual word processorsDir(const fileName&) const;
-
-            //- Set number of processor directories/results.
-            //- Only used in decomposePar
-            virtual void setNProcs(const label nProcs);
 };
 
 
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
index 1bbf105fe8..f7ede70f30 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
@@ -28,7 +28,6 @@ License
 
 #include "hostCollatedFileOperation.H"
 #include "addToRunTimeSelectionTable.H"
-#include "bitSet.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -43,6 +42,12 @@ namespace fileOperations
         hostCollatedFileOperation,
         word
     );
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        hostCollatedFileOperation,
+        comm
+    );
 
     // Register initialisation routine. Signals need for threaded mpi and
     // handles command line arguments
@@ -57,25 +62,41 @@ namespace fileOperations
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
-Foam::labelList Foam::fileOperations::hostCollatedFileOperation::subRanks
-(
-    const label n
-)
+namespace Foam
 {
-    labelList mainIOranks(fileOperation::getGlobalIORanks());
+// Construction helper: self/world/local communicator and IO ranks
+static Tuple2<label, labelList> getCommPattern()
+{
+    // Default is COMM_WORLD (single master)
+    Tuple2<label, labelList> commAndIORanks
+    (
+        UPstream::worldComm,
+        fileOperation::getGlobalIORanks()
+    );
 
-    if (mainIOranks.empty())
+    if (commAndIORanks.second().empty())
     {
-        mainIOranks = fileOperation::getGlobalHostIORanks();
+        // Default: one master per host
+        commAndIORanks.second() = fileOperation::getGlobalHostIORanks();
     }
 
-    labelRange subRange = fileOperation::subRanks(mainIOranks);
+    if (UPstream::parRun() && commAndIORanks.second().size() > 1)
+    {
+        // Multiple masters: ranks for my IO range
+        commAndIORanks.first() = UPstream::allocateCommunicator
+        (
+            UPstream::worldComm,
+            fileOperation::subRanks(commAndIORanks.second())
+        );
+    }
 
-    return identity(subRange);
+    return commAndIORanks;
 }
 
+} // End namespace Foam
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -97,13 +118,9 @@ Foam::fileOperations::hostCollatedFileOperation::hostCollatedFileOperation
 :
     collatedFileOperation
     (
-        UPstream::allocateCommunicator
-        (
-            UPstream::worldComm,
-            subRanks(UPstream::nProcs())
-        ),
-        (UPstream::parRun() ? labelList() : getGlobalIORanks()),
-        false  // verbose
+        getCommPattern(),
+        false,  // distributedRoots
+        false   // verbose
     ),
     managedComm_(getManagedComm(comm_))  // Possibly locally allocated
 {
@@ -111,6 +128,25 @@ Foam::fileOperations::hostCollatedFileOperation::hostCollatedFileOperation
 }
 
 
+Foam::fileOperations::hostCollatedFileOperation::hostCollatedFileOperation
+(
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots,
+    bool verbose
+)
+:
+    collatedFileOperation
+    (
+        commAndIORanks,
+        distributedRoots,
+        false   // verbose
+    ),
+    managedComm_(-1)  // Externally managed
+{
+    init(verbose);
+}
+
+
 void Foam::fileOperations::hostCollatedFileOperation::storeComm() const
 {
     // From externally -> locally managed
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
index f6ea90cf17..23840308c8 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
@@ -96,8 +96,6 @@ class hostCollatedFileOperation
         //- Any initialisation steps after constructing
         void init(bool verbose);
 
-        //- Get the list of processors part of this set
-        static labelList subRanks(const label n);
 
 public:
 
@@ -110,6 +108,14 @@ public:
         //- Default construct
         explicit hostCollatedFileOperation(bool verbose = false);
 
+        //- Construct from communicator with specified io-ranks
+        explicit hostCollatedFileOperation
+        (
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots,
+            bool verbose = false
+        );
+
 
     //- Destructor
     virtual ~hostCollatedFileOperation();
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 996c7d6e8f..08710c72fa 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -27,16 +27,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fileOperation.H"
-#include "regIOobject.H"
-#include "argList.H"
-#include "HashSet.H"
 #include "objectRegistry.H"
-#include "decomposedBlockData.H"
-#include "polyMesh.H"
+#include "labelIOList.H"
 #include "registerSwitch.H"
+#include "stringOps.H"
 #include "Time.H"
-#include "ITstream.H"
-#include <cerrno>
+#include "OSspecific.H"  // for Foam::isDir etc
 #include <cinttypes>
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
@@ -45,6 +41,7 @@ namespace Foam
 {
     defineTypeNameAndDebug(fileOperation, 0);
     defineRunTimeSelectionTable(fileOperation, word);
+    defineRunTimeSelectionTable(fileOperation, comm);
 
     word fileOperation::defaultFileHandler
     (
@@ -80,6 +77,9 @@ Foam::fileOperation::pathTypeNames_
 
 Foam::word Foam::fileOperation::processorsBaseDir = "processors";
 
+//- Caching (e.g. of time directories) - enabled by default
+int Foam::fileOperation::cacheLevel_(1);
+
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
@@ -425,6 +425,13 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
     // find the corresponding actual processor directory (e.g. 'processors4')
     // and index (2)
 
+    // Behaviour affected by
+    // - UPstream::parRun()
+    // - syncPar : usually true, only uncollated does false. Determines
+    //             if directory status gets synchronised
+    // - distributed() : different processors have different roots
+    // - fileModificationChecking : (uncollated only) do IO on master only
+
     fileName path, pDir, local;
     procRangeType group;
     label numProcs;
@@ -435,11 +442,14 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
     {
         const fileName procPath(path/pDir);
 
-        const auto iter = procsDirs_.cfind(procPath);
-
-        if (iter.good())
+        if (cacheLevel() > 0)
         {
-            return iter.val();
+            const auto iter = procsDirs_.cfind(procPath);
+
+            if (iter.good())
+            {
+                return iter.val();
+            }
         }
 
         DynamicList<dirIndex> procDirs;
@@ -453,7 +463,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
 
         const bool readDirMasterOnly
         (
-            Pstream::parRun() && !distributed()
+            UPstream::parRun() && !distributed()
          &&
             (
                 IOobject::fileModificationChecking == IOobject::timeStampMaster
@@ -469,7 +479,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
             // Parallel and non-distributed
             // Read on master only and send to subProcs
 
-            if (Pstream::master(comm_))
+            if (UPstream::master(UPstream::worldComm))
             {
                 dirEntries = Foam::readDir(path, fileName::Type::DIRECTORY);
 
@@ -478,7 +488,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
                     << " names to sub-processes" << endl;
             }
 
-            Pstream::broadcast(dirEntries, comm_);
+            Pstream::broadcast(dirEntries, UPstream::worldComm);
         }
         else
         {
@@ -534,7 +544,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
                         pathTypeIdx.second() = proci;
                     }
                 }
-                else if (group.found(proci))
+                else if (group.contains(proci))
                 {
                     // "processorsNN_start-end"
                     // - save the local proc offset
@@ -564,7 +574,7 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
                 << " detected:" << procDirs << endl;
         }
 
-        if (Pstream::parRun() && (!distributed() || syncPar))
+        if (UPstream::parRun() && (!distributed() || syncPar))
         {
             reduce(procDirsStatus, bitOrOp<unsigned>());  // worldComm
 
@@ -595,7 +605,8 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
                     if
                     (
                         pathTypeIdx.first() == pathType::PROCBASEOBJECT
-                     && proci < nProcs
+                        // Do not restrict to currently used processors
+                        // && proci < nProcs
                     )
                     {
                         pathTypeIdx.second() = proci;
@@ -634,12 +645,12 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
                 }
             }
         }
-        else if (!Pstream::parRun())
+        else if (!UPstream::parRun())
         {
             // Serial: use the number of decompositions (if found)
             if (nProcs)
             {
-                const_cast<fileOperation&>(*this).setNProcs(nProcs);
+                const_cast<fileOperation&>(*this).nProcs(nProcs);
             }
         }
 
@@ -648,10 +659,17 @@ Foam::fileOperation::lookupAndCacheProcessorsPath
 
         if (procDirsStatus & 2u)
         {
-            procsDirs_.insert(procPath, procDirs);
+            if (cacheLevel() > 0)
+            {
+                procsDirs_.insert(procPath, procDirs);
 
-            // Make sure to return a reference
-            return procsDirs_[procPath];
+                // Make sure to return a reference
+                return procsDirs_[procPath];
+            }
+            else
+            {
+                return refPtr<dirIndexList>::New(procDirs);
+            }
         }
     }
 
@@ -681,8 +699,11 @@ bool Foam::fileOperation::exists(IOobject& io) const
     else
     {
         ok =
+        (
             isFile(objPath)
-         && io.typeHeaderOk<IOList<label>>(false);// object with local scope
+            // object with local scope
+         && io.typeHeaderOk<labelIOList>(false)
+        );
     }
 
     if (!ok)
@@ -700,8 +721,11 @@ bool Foam::fileOperation::exists(IOobject& io) const
             else
             {
                 ok =
+                (
                     isFile(originalPath)
-                 && io.typeHeaderOk<IOList<label>>(false);
+                    // object with local scope
+                 && io.typeHeaderOk<labelIOList>(false)
+                );
             }
         }
     }
@@ -712,14 +736,30 @@ bool Foam::fileOperation::exists(IOobject& io) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::fileOperation::fileOperation
+(
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots
+)
+:
+    comm_(commAndIORanks.first()),
+    nProcs_(UPstream::nProcs(UPstream::worldComm)),
+    distributed_(distributedRoots),
+    ioRanks_(commAndIORanks.second())
+{}
+
+
 Foam::fileOperation::fileOperation
 (
     const label comm,
+    const labelUList& ioRanks,
     const bool distributedRoots
 )
 :
     comm_(comm),
-    distributed_(distributedRoots)
+    nProcs_(UPstream::nProcs(UPstream::worldComm)),
+    distributed_(distributedRoots),
+    ioRanks_(ioRanks)
 {}
 
 
@@ -920,7 +960,7 @@ void Foam::fileOperation::updateStates
     const bool syncPar
 ) const
 {
-    monitor().updateStates(masterOnly, Pstream::parRun());
+    monitor().updateStates(masterOnly, UPstream::parRun());
 }
 
 
@@ -1195,10 +1235,6 @@ Foam::fileNameList Foam::fileOperation::readObjects
 }
 
 
-void Foam::fileOperation::setNProcs(const label nProcs)
-{}
-
-
 Foam::label Foam::fileOperation::nProcs
 (
     const fileName& dir,
@@ -1206,7 +1242,7 @@ Foam::label Foam::fileOperation::nProcs
 ) const
 {
     label nProcs = 0;
-    if (Pstream::master(comm_))
+    if (UPstream::master(comm_))
     {
         fileNameList dirNames(Foam::readDir(dir, fileName::Type::DIRECTORY));
 
@@ -1259,6 +1295,23 @@ void Foam::fileOperation::flush() const
 }
 
 
+void Foam::fileOperation::sync()
+{
+    if (debug)
+    {
+        Pout<< "fileOperation::sync : parallel synchronisation"
+            << endl;
+    }
+
+    Pstream::broadcasts
+    (
+        UPstream::worldComm,
+        nProcs_,
+        procsDirs_
+    );
+}
+
+
 Foam::fileName Foam::fileOperation::processorsCasePath
 (
     const IOobject& io,
@@ -1491,9 +1544,17 @@ Foam::Ostream& Foam::operator<<
     const auto& fp = *iproxy;
 
     os  << "fileHandler:" << fp.type()
-        // << " nProcs:" << fp.nProcs()
+        << " nProcs:" << fp.nProcs()
         << " comm:" << fp.comm()
-        << " distributed:" << fp.distributed() << nl;
+        << " distributed:" << fp.distributed()
+        << " ioranks: " << flatOutput(fp.ioRanks())
+        << " ranks: ";
+
+    if (fp.comm() >= 0)
+    {
+        os << flatOutput(UPstream::procID(fp.comm()));
+    }
+    os  << nl;
 
     return os;
 }
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 721d2ea2c0..6c78934f84 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -80,6 +80,7 @@ Description
 #include "fileNameList.H"
 #include "instantList.H"
 #include "refPtr.H"
+#include "bitSet.H"
 #include "Enum.H"
 #include "Tuple2.H"
 #include "InfoProxy.H"
@@ -144,14 +145,30 @@ public:
 
 protected:
 
+    // Protected Static Data
+
+        //- Cache level (eg, for caching time directories). Default: 1
+        static int cacheLevel_;
+
+
     // Protected Data
 
         //- Communicator to use
         mutable label comm_;
 
+        //- Overall number of processors.
+        //  Used to synthesise processor directory naming:
+        //  - parallel: UPstream::nProcs(UPstream::worldComm)
+        //  - non-parallel: detected from processor dir naming ('processorsNN')
+        label nProcs_;
+
         //- Distributed roots (parallel run)
         mutable bool distributed_;
 
+        //- The list of IO ranks (global ranks)
+        //  Primarily for additional bookkeeping in non-parallel
+        const labelList ioRanks_;
+
         //- Detected processors directories
         mutable HashTable<dirIndexList> procsDirs_;
 
@@ -195,6 +212,15 @@ protected:
         //- Is either a directory (empty name()) or a file
         bool exists(IOobject& io) const;
 
+
+        //- Is proci a master rank in the communicator (in parallel)
+        //- or a master rank in the IO ranks (non-parallel)
+        bool isIOrank(const label proci) const;
+
+        //- Helper: output which ranks are IO
+        void printRanks() const;
+
+
         //- Construction helper: check for locally allocated communicator
         static inline label getManagedComm(const label communicator)
         {
@@ -235,13 +261,23 @@ public:
 
     // Constructors
 
-        //- Construct from communicator, optionally with distributed roots
+        //- Construct from communicator,
+        //- optionally with specified io-ranks and/or distributed roots
         explicit fileOperation
         (
             const label comm,
+            const labelUList& ioRanks = labelUList::null(),
             const bool distributedRoots = false
         );
 
+        //- Construct from communicator with specified io-ranks
+        explicit fileOperation
+        (
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots = false
+        );
+
+
         //- Clone fileHandler
         /// virtual autoPtr<fileOperation> clone() const = 0;
 
@@ -259,6 +295,19 @@ public:
             (verbose)
         );
 
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            fileOperation,
+            comm,
+            (
+                const Tuple2<label, labelList>& commAndIORanks,
+                const bool distributedRoots,
+                bool verbose
+            ),
+            (commAndIORanks, distributedRoots, verbose)
+        );
+
 
     // Selectors
 
@@ -270,6 +319,16 @@ public:
             bool verbose = false
         );
 
+        //- Select fileHandler-type.
+        //- Uses defaultFileHandler if the handlerType is empty.
+        static autoPtr<fileOperation> New
+        (
+            const word& handlerType,
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots,
+            bool verbose = false
+        );
+
 
     //- Destructor
     virtual ~fileOperation() = default;
@@ -331,6 +390,20 @@ public:
 
    // Static Functions
 
+        //- Return cache level
+        static int cacheLevel() noexcept
+        {
+            return cacheLevel_;
+        }
+
+        //- Set cache level (0 = off). \return the previous value
+        static int cacheLevel(int level) noexcept
+        {
+            int old(cacheLevel_);
+            cacheLevel_ = level;
+            return old;
+        }
+
         //- Sort directory entries according to time value,
         //  with "constant" appearing first (if it exists)
         static instantList sortTimes
@@ -380,6 +453,10 @@ public:
             return old;
         }
 
+        //- The list of IO ranks (global ranks)
+        //  Primarily for additional bookkeeping in non-parallel
+        const labelList& ioRanks() const noexcept { return ioRanks_; }
+
         //- Return info proxy,
         //- used to print information to a stream
         InfoProxy<fileOperation> info() const noexcept { return *this; }
@@ -691,12 +768,23 @@ public:
                 return processorsBaseDir;
             }
 
-            //- Set number of processor directories/results. Only used in
-            //  decomposePar
-            virtual void setNProcs(const label nProcs);
+            //- Overall number of processors,
+            //- from UPstream::nProcs() or detected from directories/results.
+            label nProcs() const noexcept { return nProcs_; }
 
-            //- Get number of processor directories/results. Used for e.g.
-            //  reconstructPar, argList checking
+            //- Set number of processor directories/results.
+            //  Used to cache format of e.g. processorsDDD.
+            //  Returns old number of processors.
+            //  Only used in decomposePar
+            label nProcs(const label numProcs) noexcept
+            {
+                label old(nProcs_);
+                nProcs_ = numProcs;
+                return old;
+            }
+
+            //- Get number of processor directories/results.
+            //  Used for e.g. reconstructPar, argList checking
             virtual label nProcs
             (
                 const fileName& dir,
@@ -724,11 +812,14 @@ public:
             //- Forcibly wait until all output done. Flush any cached data
             virtual void flush() const;
 
+            //- Forcibly parallel sync
+            virtual void sync();
+
             //- Generate path (like io.path) from root+casename with any
             //  'processorXXX' replaced by procDir (usually 'processsors')
             fileName processorsCasePath
             (
-                const IOobject&,
+                const IOobject& io,
                 const word& procDir
             ) const;
 
@@ -736,7 +827,7 @@ public:
             //  'processorXXX' replaced by procDir (usually 'processsors')
             fileName processorsPath
             (
-                const IOobject&,
+                const IOobject& io,
                 const word& instance,
                 const word& procDir
             ) const;
@@ -778,6 +869,12 @@ public:
         //- Get list of global IO ranks from FOAM_IORANKS env variable.
         //- If set, these correspond to the IO master ranks.
         static labelList getGlobalIORanks();
+
+
+    // Housekeeping
+
+        //- Same as nProcs
+        label setNProcs(label numProcs) { return nProcs(numProcs); }
 };
 
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
index ef7da7d6dd..dee4b1c4aa 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -148,11 +148,12 @@ Foam::fileOperation::New
                 << abort(FatalError);
         }
 
+        // Forward to self
         return fileOperation::New(fileOperation::defaultFileHandler, verbose);
     }
 
     DebugInFunction
-        << "Constructing fileHandler" << endl;
+        << "Constructing fileHandler: " << handlerType << endl;
 
     auto* ctorPtr = wordConstructorTable(handlerType);
 
@@ -170,6 +171,56 @@ Foam::fileOperation::New
 }
 
 
+Foam::autoPtr<Foam::fileOperation>
+Foam::fileOperation::New
+(
+    const word& handlerType,
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots,
+    bool verbose
+)
+{
+    if (handlerType.empty())
+    {
+        if (fileOperation::defaultFileHandler.empty())
+        {
+            FatalErrorInFunction
+                << "defaultFileHandler name is undefined" << nl
+                << abort(FatalError);
+        }
+
+        // Forward to self
+        return fileOperation::New
+        (
+            fileOperation::defaultFileHandler,
+            commAndIORanks,
+            distributedRoots,
+            verbose
+        );
+    }
+
+    DebugInFunction
+        << "Constructing fileHandler: " << handlerType << endl;
+
+    auto* ctorPtr = commConstructorTable(handlerType);
+
+    if (!ctorPtr)
+    {
+        FatalErrorInLookup
+        (
+            "fileHandler",
+            handlerType,
+            *commConstructorTablePtr_
+        ) << abort(FatalError);
+    }
+
+    return autoPtr<fileOperation>
+    (
+        ctorPtr(commAndIORanks, distributedRoots, verbose)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::fileOperation>
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C
index e0a79e83c2..318afc65e5 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationRanks.C
@@ -243,7 +243,6 @@ Foam::labelList Foam::fileOperation::getGlobalIORanks
 }
 
 
-#if 0  // FUTURE
 bool Foam::fileOperation::isIOrank(const label proci) const
 {
     return
@@ -313,7 +312,6 @@ void Foam::fileOperation::printRanks() const
             << ')' << nl;
     }
 }
-#endif
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 6aa0893614..314cd76cf7 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -39,7 +39,6 @@ License
 #include "dummyISstream.H"
 #include "SubList.H"
 #include "unthreadedInitialise.H"
-#include "bitSet.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -54,6 +53,12 @@ namespace fileOperations
         masterUncollatedFileOperation,
         word
     );
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        masterUncollatedFileOperation,
+        comm
+    );
 
     float masterUncollatedFileOperation::maxMasterFileBufferSize
     (
@@ -80,26 +85,6 @@ namespace fileOperations
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::labelList Foam::fileOperations::masterUncollatedFileOperation::subRanks
-(
-    const label n
-)
-{
-    labelList mainIOranks(fileOperation::getGlobalIORanks());
-
-    if (mainIOranks.empty())
-    {
-        return identity(n);
-    }
-    else
-    {
-        labelRange subRange = fileOperation::subRanks(mainIOranks);
-
-        return identity(subRange);
-    }
-}
-
-
 Foam::word
 Foam::fileOperations::masterUncollatedFileOperation::findInstancePath
 (
@@ -121,7 +106,7 @@ Foam::fileOperations::masterUncollatedFileOperation::findInstancePath
         }
     }
 
-    return word::null;
+    return word();
 }
 
 
@@ -131,14 +116,15 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
     const bool checkGlobal,
     const bool isFile,
     const IOobject& io,
+    const dirIndexList& pDirs,
     const bool search,
     pathType& searchType,
     word& procsDir,
     word& newInstancePath
 ) const
 {
-    procsDir = word::null;
-    newInstancePath = word::null;
+    procsDir.clear();
+    newInstancePath.clear();
 
     if (io.instance().isAbsolute())
     {
@@ -152,7 +138,7 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
         else
         {
             searchType = fileOperation::NOTFOUND;
-            return fileName::null;
+            return fileName();
         }
     }
     else
@@ -169,9 +155,7 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
         // 2. Check processors/
         if (io.time().processorCase())
         {
-            refPtr<dirIndexList> pDirs(lookupProcessorsPath(io.objectPath()));
-
-            for (const dirIndex& dirIdx : pDirs())
+            for (const dirIndex& dirIdx : pDirs)
             {
                 const fileName& pDir = dirIdx.first();
                 fileName objPath =
@@ -239,12 +223,7 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
             if (newInstancePath.size() && newInstancePath != io.instance())
             {
                 // 1. Try processors equivalent
-                refPtr<dirIndexList> pDirs
-                (
-                    lookupProcessorsPath(io.objectPath())
-                );
-
-                for (const dirIndex& dirIdx : pDirs())
+                for (const dirIndex& dirIdx : pDirs)
                 {
                     const fileName& pDir = dirIdx.first();
 
@@ -295,10 +274,11 @@ Foam::fileOperations::masterUncollatedFileOperation::filePathInfo
                 }
             }
         }
-
-        searchType = fileOperation::NOTFOUND;
-        return fileName::null;
     }
+
+    // Nothing found
+    searchType = fileOperation::NOTFOUND;
+    return fileName();
 }
 
 
@@ -338,7 +318,7 @@ Foam::fileOperations::masterUncollatedFileOperation::localObjectPath
             // Uncollated type, e.g. processor1
             const word procName
             (
-                "processor" + Foam::name(Pstream::myProcNo(Pstream::worldComm))
+                "processor" + Foam::name(Pstream::myProcNo(UPstream::worldComm))
             );
             return
                 processorsPath
@@ -395,7 +375,7 @@ Foam::fileOperations::masterUncollatedFileOperation::localObjectPath
             const word procName
             (
                 "processor"
-               +Foam::name(Pstream::myProcNo(Pstream::worldComm))
+              + Foam::name(Pstream::myProcNo(UPstream::worldComm))
             );
             return
                 processorsPath
@@ -432,14 +412,14 @@ Foam::fileOperations::masterUncollatedFileOperation::localObjectPath
 
         case fileOperation::NOTFOUND:
         {
-            return fileName::null;
+            return fileName();
         }
         break;
 
         default:
         {
             NotImplemented;
-            return fileName::null;
+            return fileName();
         }
     }
 }
@@ -458,6 +438,8 @@ void Foam::fileOperations::masterUncollatedFileOperation::readAndSend
     {
         FatalIOErrorInFunction(filePath)
             << "Cannot open file " << filePath
+            //<< " using communicator " << pBufs.comm()
+            //<< " ioRanks:" << UPstream::procID(pBufs.comm())
             << exit(FatalIOError);
     }
 
@@ -529,11 +511,11 @@ Foam::fileOperations::masterUncollatedFileOperation::read
 {
     autoPtr<ISstream> isPtr;
 
-    // const bool uniform = uniformFile(filePaths);
+    // const bool uniform = fileOperation::uniformFile(filePaths);
 
     PstreamBuffers pBufs(comm, UPstream::commsTypes::nonBlocking);
 
-    if (Pstream::master(comm))
+    if (UPstream::master(comm))
     {
         if (uniform)
         {
@@ -543,6 +525,8 @@ Foam::fileOperations::masterUncollatedFileOperation::read
                 {
                     FatalIOErrorInFunction(filePaths[0])
                         << "cannot find file " << io.objectPath()
+                        << " fileHandler : comm:" << comm
+                        << " ioRanks:" << UPstream::procID(comm)
                         << exit(FatalIOError);
                 }
 
@@ -575,6 +559,8 @@ Foam::fileOperations::masterUncollatedFileOperation::read
                 {
                     FatalIOErrorInFunction(filePaths[0])
                         << "cannot find file " << io.objectPath()
+                        << " fileHandler : comm:" << comm
+                        << " ioRanks:" << UPstream::procID(comm)
                         << exit(FatalIOError);
                 }
 
@@ -586,7 +572,10 @@ Foam::fileOperations::masterUncollatedFileOperation::read
                 {
                     FatalIOErrorInFunction(*isPtr)
                         << "problem while reading header for object "
-                        << io.name() << exit(FatalIOError);
+                        << io.name()
+                        << " fileHandler : comm:" << comm
+                        << " ioRanks:" << UPstream::procID(comm)
+                        << exit(FatalIOError);
                 }
             }
 
@@ -612,7 +601,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
         }
     }
 
-    pBufs.finishedSends();
+    pBufs.finishedScatters();
 
     // isPtr will be valid on master and will be the unbuffered
     // IFstream. Else the information is in the PstreamBuffers (and
@@ -650,7 +639,10 @@ Foam::fileOperations::masterUncollatedFileOperation::read
             {
                 FatalIOErrorInFunction(*isPtr)
                     << "problem while reading header for object "
-                    << io.name() << exit(FatalIOError);
+                    << io.name()
+                    << " fileHandler : comm:" << comm
+                    << " ioRanks:" << UPstream::procID(comm)
+                    << exit(FatalIOError);
             }
         }
         else
@@ -659,11 +651,41 @@ Foam::fileOperations::masterUncollatedFileOperation::read
         }
     }
 
-
     return isPtr;
 }
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Construction helper: self/world/local communicator and IO ranks
+static Tuple2<label, labelList> getCommPattern()
+{
+    // Default is COMM_WORLD (single master)
+    Tuple2<label, labelList> commAndIORanks
+    (
+        UPstream::worldComm,
+        fileOperation::getGlobalIORanks()
+    );
+
+    if (UPstream::parRun() && commAndIORanks.second().size() > 1)
+    {
+        // Multiple masters: ranks for my IO range
+        commAndIORanks.first() = UPstream::allocateCommunicator
+        (
+            UPstream::worldComm,
+            fileOperation::subRanks(commAndIORanks.second())
+        );
+    }
+
+    return commAndIORanks;
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 void Foam::fileOperations::masterUncollatedFileOperation::init(bool verbose)
@@ -708,11 +730,7 @@ masterUncollatedFileOperation
 :
     fileOperation
     (
-        UPstream::allocateCommunicator
-        (
-            UPstream::worldComm,
-            subRanks(UPstream::nProcs())
-        )
+        getCommPattern()
     ),
     managedComm_(getManagedComm(comm_))  // Possibly locally allocated
 {
@@ -723,11 +741,12 @@ masterUncollatedFileOperation
 Foam::fileOperations::masterUncollatedFileOperation::
 masterUncollatedFileOperation
 (
-    const label comm,
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots,
     bool verbose
 )
 :
-    fileOperation(comm),
+    fileOperation(commAndIORanks, distributedRoots),
     managedComm_(-1)  // Externally managed
 {
     init(verbose);
@@ -896,7 +915,7 @@ time_t Foam::fileOperations::masterUncollatedFileOperation::lastModified
         fName,
         lastModifiedOp(followLink),
         Pstream::msgType(),
-        comm_
+        UPstream::worldComm
     );
 }
 
@@ -912,7 +931,7 @@ double Foam::fileOperations::masterUncollatedFileOperation::highResLastModified
         fName,
         highResLastModifiedOp(followLink),
         Pstream::msgType(),
-        comm_
+        UPstream::worldComm
     );
 }
 
@@ -1050,16 +1069,20 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
     {
         Pout<< "masterUncollatedFileOperation::filePath :"
             << " objectPath:" << io.objectPath()
-            << " checkGlobal:" << checkGlobal << endl;
+            << " checkGlobal:" << checkGlobal
+            << " parRun:" << Pstream::parRun()
+            << " localmaster:" << Pstream::master(comm_) << endl;
     }
 
     // Now that we have an IOobject path use it to detect & cache
     // processor directory naming
-    (void)lookupProcessorsPath(io.objectPath());
+    const refPtr<dirIndexList> pDirs(lookupProcessorsPath(io.objectPath()));
 
     // Trigger caching of times
-    (void)findTimes(io.time().path(), io.time().constant());
-
+    if (cacheLevel() > 0)
+    {
+        (void)findTimes(io.time().path(), io.time().constant());
+    }
 
     // Determine master filePath and scatter
 
@@ -1070,7 +1093,8 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
 
     if (Pstream::master(comm_))
     {
-        const bool oldParRun(Pstream::parRun(false));
+        const bool oldParRun = UPstream::parRun(false);
+        const int oldCache = fileOperation::cacheLevel(0);
 
         // All masters search locally. Note that global objects might
         // fail (except on master). This gets handled later on (in PARENTOBJECT)
@@ -1080,13 +1104,15 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
                 checkGlobal,
                 true,
                 io,
+                pDirs,
                 search,
                 searchType,
                 procsDir,
                 newInstancePath
             );
 
-        Pstream::parRun(oldParRun);
+        fileOperation::cacheLevel(oldCache);
+        UPstream::parRun(oldParRun);
 
         if (debug)
         {
@@ -1098,10 +1124,11 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
         }
     }
 
-    // Scatter the information about where the master found the object
+    // Broadcast information about where the master found the object
     // Note: use the worldComm to make sure all processors decide
     //       the same type. Only procsDir is allowed to differ; searchType
     //       and instance have to be same
+    if (UPstream::parRun())
     {
         int masterType(searchType);
         Pstream::broadcasts(UPstream::worldComm, masterType, newInstancePath);
@@ -1177,7 +1204,8 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
     if (debug)
     {
         Pout<< "masterUncollatedFileOperation::filePath :"
-            << " Returning from file searching:" << endl
+            << " Returning from file searching using type "
+            << fileOperation::pathTypeNames_[searchType] << endl
             << "    objectPath:" << io.objectPath() << endl
             << "    filePath  :" << objPath << endl << endl;
     }
@@ -1196,12 +1224,20 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
     {
         Pout<< "masterUncollatedFileOperation::dirPath :"
             << " objectPath:" << io.objectPath()
-            << " checkGlobal:" << checkGlobal << endl;
+            << " checkGlobal:" << checkGlobal
+            << " parRun:" << Pstream::parRun()
+            << " localmaster:" << Pstream::master(comm_) << endl;
     }
 
     // Now that we have an IOobject path use it to detect & cache
     // processor directory naming
-    (void)lookupProcessorsPath(io.objectPath());
+    const refPtr<dirIndexList> pDirs(lookupProcessorsPath(io.objectPath()));
+
+    // Trigger caching of times
+    if (cacheLevel() > 0)
+    {
+        (void)findTimes(io.time().path(), io.time().constant());
+    }
 
     // Determine master dirPath and broadcast
 
@@ -1210,31 +1246,50 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
     word procsDir;
     word newInstancePath;
 
+    // Local IO node searches for file
     if (Pstream::master(comm_))
     {
-        const bool oldParRun(Pstream::parRun(false));
+        const bool oldParRun = UPstream::parRun(false);
+        const int oldCache = fileOperation::cacheLevel(0);
 
         objPath = filePathInfo
         (
             checkGlobal,
             false,
             io,
+            pDirs,
             search,
             searchType,
             procsDir,
             newInstancePath
         );
 
-        Pstream::parRun(oldParRun);
+        fileOperation::cacheLevel(oldCache);
+        UPstream::parRun(oldParRun);
+
+        if (debug)
+        {
+            Pout<< "masterUncollatedFileOperation::dirPath :"
+                << " master objPath:" << objPath
+                << " searchType:" << fileOperation::pathTypeNames_[searchType]
+                << " procsDir:" << procsDir << " instance:" << newInstancePath
+                << endl;
+        }
     }
 
+
+    // Broadcast information about where the master found the object
+    // Note: use the worldComm to make sure all processors decide
+    //       the same type. Only procsDir is allowed to differ; searchType
+    //       and instance have to be same
+    if (UPstream::parRun())
     {
         int masterType(searchType);
-        // Future?: comm_,
         Pstream::broadcasts(UPstream::worldComm, masterType, newInstancePath);
         searchType = pathType(masterType);
     }
 
+
     if
     (
         checkGlobal
@@ -1250,6 +1305,7 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
     }
     else
     {
+        // Broadcast local processors dir amongst all local nodes
         Pstream::broadcast(procsDir, comm_);
 
         // Use the master type to determine if additional information is
@@ -1304,7 +1360,8 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
     if (debug)
     {
         Pout<< "masterUncollatedFileOperation::dirPath :"
-            << " Returning from file searching:" << endl
+            << " Returning from directory searching using type "
+            << fileOperation::pathTypeNames_[searchType] << endl
             << "    objectPath:" << io.objectPath() << endl
             << "    filePath  :" << objPath << endl << endl;
     }
@@ -1387,24 +1444,28 @@ Foam::fileOperations::masterUncollatedFileOperation::findInstance
     //         parent directory in case of parallel)
 
 
-    refPtr<dirIndexList> pDirs(lookupProcessorsPath(io.objectPath()));
+    const refPtr<dirIndexList> pDirs(lookupProcessorsPath(io.objectPath()));
 
     word foundInstance;
 
     // if (Pstream::master(comm_))
     if (Pstream::master(UPstream::worldComm))
     {
-        const bool oldParRun(Pstream::parRun(false));
+        const bool oldParRun = UPstream::parRun(false);
+        const int oldCache = fileOperation::cacheLevel(0);
+
         if (exists(pDirs, io))
         {
             foundInstance = io.instance();
         }
-        Pstream::parRun(oldParRun);
+        fileOperation::cacheLevel(oldCache);
+        UPstream::parRun(oldParRun);
     }
 
+
     // Do parallel early exit to avoid calling time.times()
-    // Pstream::broadcast(foundInstance, comm_);
     Pstream::broadcast(foundInstance, UPstream::worldComm);
+
     if (!foundInstance.empty())
     {
         io.instance() = foundInstance;
@@ -1429,7 +1490,8 @@ Foam::fileOperations::masterUncollatedFileOperation::findInstance
     // if (Pstream::master(comm_))
     if (Pstream::master(UPstream::worldComm))
     {
-        const bool oldParRun(Pstream::parRun(false));
+        const bool oldParRun = UPstream::parRun(false);
+        const int oldCache = fileOperation::cacheLevel(0);
 
         label instIndex = ts.size()-1;
 
@@ -1540,11 +1602,12 @@ Foam::fileOperations::masterUncollatedFileOperation::findInstance
             }
         }
 
+        fileOperation::cacheLevel(oldCache);
         UPstream::parRun(oldParRun);  // Restore parallel state
     }
 
-    // Pstream::broadcast(foundInstance, comm_);
     Pstream::broadcast(foundInstance, UPstream::worldComm);
+
     io.instance() = foundInstance;
 
 
@@ -1603,16 +1666,17 @@ Foam::fileOperations::masterUncollatedFileOperation::readObjects
     }
 
     fileNameList objectNames;
-    newInstance = word::null;
+    newInstance.clear();
 
     // Note: readObjects uses WORLD to make sure order of objects is the
     //       same everywhere
 
-    if (Pstream::master())  // comm_))
+    if (Pstream::master(UPstream::worldComm))
     {
         // Avoid fileOperation::readObjects from triggering parallel ops
         // (through call to filePath which triggers parallel )
         const bool oldParRun = UPstream::parRun(false);
+        const int oldCache = fileOperation::cacheLevel(0);
 
         //- Use non-time searching version
         objectNames = fileOperation::readObjects
@@ -1656,10 +1720,10 @@ Foam::fileOperations::masterUncollatedFileOperation::readObjects
             }
         }
 
+        fileOperation::cacheLevel(oldCache);
         UPstream::parRun(oldParRun);  // Restore parallel state
     }
 
-    // Future? comm_
     Pstream::broadcasts(UPstream::worldComm, newInstance, objectNames);
 
     if (debug)
@@ -1689,16 +1753,27 @@ bool Foam::fileOperations::masterUncollatedFileOperation::readHeader
             << "    filePath  :" << fName << endl;
     }
 
+    // We assume if filePath is the same
+    //  - headerClassName
+    //  - note
+    // are also the same, independent of where the file came from.
+
     // Get filePaths on world master
-    fileNameList filePaths(Pstream::nProcs(Pstream::worldComm));
-    filePaths[Pstream::myProcNo(Pstream::worldComm)] = fName;
-    Pstream::gatherList(filePaths, Pstream::msgType(), Pstream::worldComm);
-    bool uniform = uniformFile(filePaths);
+    fileNameList filePaths(Pstream::nProcs(UPstream::worldComm));
+    filePaths[UPstream::myProcNo(UPstream::worldComm)] = fName;
+    Pstream::gatherList(filePaths, UPstream::msgType(), UPstream::worldComm);
+
+    bool uniform
+    (
+        UPstream::master(UPstream::worldComm)
+     && fileOperation::uniformFile(filePaths)
+    );
+
     Pstream::broadcast(uniform, UPstream::worldComm);
 
     if (uniform)
     {
-        if (Pstream::master(Pstream::worldComm))
+        if (Pstream::master(UPstream::worldComm))
         {
             if (!fName.empty())
             {
@@ -1722,12 +1797,13 @@ bool Foam::fileOperations::masterUncollatedFileOperation::readHeader
     }
     else
     {
-        if (Pstream::nProcs(comm_) != Pstream::nProcs(Pstream::worldComm))
+        if (Pstream::nProcs(comm_) != Pstream::nProcs(UPstream::worldComm))
         {
-            // Re-gather file paths on local master
-            filePaths.resize(Pstream::nProcs(comm_));
-            filePaths[Pstream::myProcNo(comm_)] = fName;
-            Pstream::gatherList(filePaths, Pstream::msgType(), comm_);
+            // Assume if different nprocs the communicators are also
+            // different. Re-gather file paths on local master
+            filePaths.resize(UPstream::nProcs(comm_));
+            filePaths[UPstream::myProcNo(comm_)] = fName;
+            Pstream::gatherList(filePaths, UPstream::msgType(), comm_);
         }
 
         // Intermediate storage arrays (master only)
@@ -1798,7 +1874,8 @@ bool Foam::fileOperations::masterUncollatedFileOperation::readHeader
     if (debug)
     {
         Pout<< "masterUncollatedFileOperation::readHeader :" << " ok:" << ok
-            << " class:" << io.headerClassName() << endl;
+            << " class:" << io.headerClassName()
+            << " for file:" << fName << endl;;
     }
     return ok;
 }
@@ -1818,6 +1895,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
         Pout<< "masterUncollatedFileOperation::readStream :"
             << " object : " << io.name()
             << " global : " << io.global()
+            << " globalObject : " << io.globalObject()
             << " fName : " << fName << " readOnProc:" << readOnProc << endl;
     }
 
@@ -1828,7 +1906,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
 
     // Detect collated format. This could be done on the local communicator
     // but we do it on the master node only for now.
-    if (UPstream::master()) // comm_))
+    if (UPstream::master(UPstream::worldComm))
     {
         if (!fName.empty())
         {
@@ -1871,7 +1949,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
         }
     }
 
-    Pstream::broadcast(isCollated);  //, comm_);
+    Pstream::broadcast(isCollated, UPstream::worldComm);
 
     if (isCollated)
     {
@@ -1904,6 +1982,8 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
                 FatalIOErrorInFunction(*isPtr)
                     << "Could not detect processor number"
                     << " from objectPath:" << io.objectPath()
+                    << " fileHandler : comm:" << comm_
+                    << " ioRanks:" << flatOutput(ioRanks_)
                     << exit(FatalIOError);
             }
 
@@ -1954,7 +2034,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
             // Get size of file to determine communications type
             bool bigSize = false;
 
-            if (Pstream::master())   //, comm_))
+            if (Pstream::master(UPstream::worldComm))
             {
                 // TBD: handle multiple masters?
                 bigSize =
@@ -1965,7 +2045,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
             }
             // Reduce (not broadcast)
             // - if we have multiple master files (FUTURE)
-            Pstream::reduceOr(bigSize);  //, comm_);
+            Pstream::reduceOr(bigSize, UPstream::worldComm);
 
             const UPstream::commsTypes myCommsType
             (
@@ -1994,23 +2074,32 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
                 << " starting separated input from " << fName << endl;
         }
 
-        if (io.global())
+        if (io.global() || io.globalObject())
         {
             // Use worldComm. Note: should not really need to gather filePaths
             // since we enforce sending from master anyway ...
-            fileNameList filePaths(Pstream::nProcs());
-            filePaths[Pstream::myProcNo()] = fName;
-            Pstream::gatherList(filePaths);
+            fileNameList filePaths(Pstream::nProcs(UPstream::worldComm));
+            filePaths[Pstream::myProcNo(UPstream::worldComm)] = fName;
+            Pstream::gatherList
+            (
+                filePaths,
+                Pstream::msgType(),
+                UPstream::worldComm
+            );
 
             boolList procValid
             (
-                UPstream::listGatherValues<bool>(readOnProc)
+                UPstream::listGatherValues<bool>
+                (
+                    readOnProc,
+                    UPstream::worldComm
+                )
             );
             // NB: local proc validity information required on sub-ranks too!
-            procValid.resize(Pstream::nProcs());
-            procValid[Pstream::myProcNo()] = readOnProc;
+            procValid.resize(Pstream::nProcs(UPstream::worldComm));
+            procValid[Pstream::myProcNo(UPstream::worldComm)] = readOnProc;
 
-            return read(io, Pstream::worldComm, true, filePaths, procValid);
+            return read(io, UPstream::worldComm, true, filePaths, procValid);
         }
         else
         {
@@ -2028,7 +2117,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
             procValid[Pstream::myProcNo(comm_)] = readOnProc;
 
             // Uniform in local comm
-            const bool uniform = uniformFile(filePaths);
+            const bool uniform = fileOperation::uniformFile(filePaths);
 
             return read(io, comm_, uniform, filePaths, procValid);
         }
@@ -2046,12 +2135,17 @@ bool Foam::fileOperations::masterUncollatedFileOperation::read
 {
     bool ok = true;
 
-    if (io.globalObject())
+    if (io.global() || io.globalObject())
     {
         if (debug)
         {
             Pout<< "masterUncollatedFileOperation::read :"
-                << " Reading global object " << io.name() << endl;
+                << " Reading global object " << io.name()
+                << " worldComm:" << UPstream::worldComm
+                << " Pstream::myProcNo:"
+                << Pstream::myProcNo(UPstream::worldComm)
+                << " amMaster:" << Pstream::master(UPstream::worldComm)
+                << endl;
         }
 
         bool ok = false;
@@ -2059,10 +2153,13 @@ bool Foam::fileOperations::masterUncollatedFileOperation::read
         {
             // Do master-only reading always.
             const bool oldParRun = UPstream::parRun(false);
+            const int oldCache = fileOperation::cacheLevel(0);
 
-            ok = io.readData(io.readStream(typeName));
+            auto& is = io.readStream(typeName);
+            ok = io.readData(is);
             io.close();
 
+            fileOperation::cacheLevel(oldCache);
             UPstream::parRun(oldParRun);  // Restore parallel state
         }
 
@@ -2112,6 +2209,14 @@ bool Foam::fileOperations::masterUncollatedFileOperation::read
         io.close();
     }
 
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::read :"
+            << " Read object:" << io.name()
+            << " isGlobal:" << (io.global() || io.globalObject())
+            << " status:" << ok << endl;
+    }
+
     return ok;
 }
 
@@ -2170,39 +2275,48 @@ Foam::instantList Foam::fileOperations::masterUncollatedFileOperation::findTimes
         if (debug)
         {
             Pout<< "masterUncollatedFileOperation::findTimes :"
-                << " Found " << iter.val()->size() << " cached times" << endl;
+                << " Found " << iter.val()->size() << " cached times" << nl
+                << "    for directory:" << directory << endl;
         }
         return *(iter.val());
     }
     else
     {
         instantList times;
-        if (Pstream::master())  // comm_))
+        if (Pstream::master(UPstream::worldComm))
         {
             // Do master-only reading always.
             const bool oldParRun = UPstream::parRun(false);
+            const int oldCache = fileOperation::cacheLevel(0);
 
             times = fileOperation::findTimes(directory, constantName);
 
+            fileOperation::cacheLevel(oldCache);
             UPstream::parRun(oldParRun);  // Restore parallel state
         }
-        Pstream::broadcast(times);    //, comm_);
+
+        Pstream::broadcast(times, UPstream::worldComm);
 
         if (debug)
         {
             Pout<< "masterUncollatedFileOperation::findTimes :"
-                << " Caching times:" << times << nl
+                << " Found times:" << flatOutput(times) << nl
                 << "    for directory:" << directory << endl;
         }
 
-        // Note: do we also cache if no times have been found since it might
-        //       indicate a directory that is being filled later on ...
+        // Caching
+        // - cache values even if no times were found since it might
+        //   indicate a directory that is being filled later on ...
+        if (cacheLevel() > 0)
+        {
+            auto* tPtr = new DynamicList<instant>(std::move(times));
+            times_.set(directory, tPtr);
 
-        auto* tPtr = new DynamicList<instant>(std::move(times));
+            return *tPtr;
+        }
 
-        times_.set(directory, tPtr);
-
-        return *tPtr;
+        // Times found (not cached)
+        return times;
     }
 }
 
@@ -2220,7 +2334,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::setTime
     // Mutable access to instant list for modification and sorting
     // - cannot use auto type deduction here
 
-    HashPtrTable<DynamicList<instant>>::iterator iter = times_.find(tm.path());
+    auto iter = times_.find(tm.path());
 
     if (iter.good())
     {
@@ -2287,20 +2401,16 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
         // Insert logic of filePath. We assume that if a file is absolute
         // on the master it is absolute also on the sub-ranks etc.
 
-        fileNameList filePaths(Pstream::nProcs(Pstream::worldComm));
-        filePaths[Pstream::myProcNo(Pstream::worldComm)] = filePath;
-        Pstream::gatherList(filePaths, Pstream::msgType(), Pstream::worldComm);
+        fileNameList filePaths(Pstream::nProcs(comm_));
+        filePaths[Pstream::myProcNo(comm_)] = filePath;
+        Pstream::gatherList(filePaths, Pstream::msgType(), comm_);
 
-        PstreamBuffers pBufs
-        (
-            Pstream::commsTypes::nonBlocking,
-            Pstream::msgType(),
-            Pstream::worldComm
-        );
+        PstreamBuffers pBufs(comm_, Pstream::commsTypes::nonBlocking);
 
-        if (Pstream::master(Pstream::worldComm))
+        if (Pstream::master(comm_))
         {
-            const bool uniform = uniformFile(filePaths);
+            // Same filename on the IO node -> same file
+            const bool uniform = fileOperation::uniformFile(filePaths);
 
             if (uniform)
             {
@@ -2313,14 +2423,21 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
                 readAndSend
                 (
                     filePath,
-                    identity(Pstream::nProcs(Pstream::worldComm)-1, 1),
+                    identity(Pstream::nProcs(comm_)-1, 1),
                     pBufs
                 );
             }
             else
             {
-                for (const int proci : Pstream::subProcs(Pstream::worldComm))
+                for (const int proci : Pstream::subProcs(comm_))
                 {
+                    if (debug)
+                    {
+                        Pout<< "masterUncollatedFileOperation::NewIFstream :"
+                            << " Opening local file " << filePath
+                            << " for rank " << proci << endl;
+                    }
+
                     readAndSend
                     (
                         filePaths[proci],
@@ -2334,7 +2451,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
 
         pBufs.finishedSends();
 
-        if (Pstream::master(Pstream::worldComm))
+        if (Pstream::master(comm_))
         {
             // Read myself
             isPtr.reset(new IFstream(filePaths[Pstream::masterNo()]));
@@ -2394,6 +2511,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
     (
         new masterOFstream
         (
+            comm_,
             pathName,
             streamOpt,
             IOstreamOption::NON_APPEND,
@@ -2417,6 +2535,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream
         new masterOFstream
         (
             atomic,
+            comm_,
             pathName,
             streamOpt,
             IOstreamOption::NON_APPEND,
@@ -2433,17 +2552,93 @@ void Foam::fileOperations::masterUncollatedFileOperation::flush() const
 }
 
 
+void Foam::fileOperations::masterUncollatedFileOperation::sync()
+{
+    if (debug)
+    {
+        Pout<< "masterUncollatedFileOperation::sync :"
+            << " syncing information across processors" << endl;
+    }
+
+    fileOperation::sync();
+
+
+    wordList timeNames;
+    List<DynamicList<instant>> instants;
+
+    if (Pstream::master(UPstream::worldComm))
+    {
+        timeNames.resize(times_.size());
+        instants.resize(times_.size());
+
+        // Flatten into two lists to preserve key/val pairing
+        label i = 0;
+        forAllConstIters(times_, iter)
+        {
+            timeNames[i] = iter.key();
+            instants[i] = std::move(*(iter.val()));
+            ++i;
+        }
+    }
+
+    Pstream::broadcasts(UPstream::worldComm, timeNames, instants);
+
+    times_.clear();
+    forAll(timeNames, i)
+    {
+        fileName dir(timeNames[i]);
+        auto ptr = autoPtr<DynamicList<instant>>::New(std::move(instants[i]));
+
+        if (Pstream::parRun() && !Pstream::master(UPstream::worldComm))
+        {
+            // Replace processor0 ending with processorDDD
+            fileName path;
+            fileName pDir;
+            fileName local;
+            procRangeType group;
+            label numProcs;
+            const label proci = splitProcessorPath
+            (
+                dir,
+                path,
+                pDir,
+                local,
+                group,
+                numProcs
+            );
+
+            //Pout<< "**sync : From dir : " << dir << nl
+            //    << "    path : " << path << nl
+            //    << "    pDir : " << pDir << nl
+            //    << "    local: " << local << nl
+            //    << "    proci: " << proci << nl
+            //    << endl;
+
+            const label myProci = Pstream::myProcNo(UPstream::worldComm);
+
+            if (proci != -1 && proci != myProci)
+            {
+                dir = path/"processor" + Foam::name(myProci);
+            }
+        }
+
+        times_.insert(dir, ptr);
+    }
+}
+
+
 Foam::label Foam::fileOperations::masterUncollatedFileOperation::addWatch
 (
     const fileName& fName
 ) const
 {
     label watchFd = -1;
-    if (Pstream::master())      // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         watchFd = monitor().addWatch(fName);
     }
-    Pstream::broadcast(watchFd);  //, comm_);
+
+    Pstream::broadcast(watchFd, UPstream::worldComm);
     return watchFd;
 }
 
@@ -2454,11 +2649,12 @@ bool Foam::fileOperations::masterUncollatedFileOperation::removeWatch
 ) const
 {
     bool ok = false;
-    if (Pstream::master())  // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         ok = monitor().removeWatch(watchIndex);
     }
-    Pstream::broadcast(ok);   //, comm_);
+
+    Pstream::broadcast(ok, UPstream::worldComm);
     return ok;
 }
 
@@ -2471,7 +2667,7 @@ Foam::label Foam::fileOperations::masterUncollatedFileOperation::findWatch
 {
     label index = -1;
 
-    if (Pstream::master())  // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         forAll(watchIndices, i)
         {
@@ -2482,7 +2678,8 @@ Foam::label Foam::fileOperations::masterUncollatedFileOperation::findWatch
             }
         }
     }
-    Pstream::broadcast(index);  //, comm_);
+
+    Pstream::broadcast(index, UPstream::worldComm);
     return index;
 }
 
@@ -2530,11 +2727,12 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::getFile
 ) const
 {
     fileName fName;
-    if (Pstream::master())  // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         fName = monitor().getFile(watchIndex);
     }
-    Pstream::broadcast(fName);  //, comm_);
+
+    Pstream::broadcast(fName, UPstream::worldComm);
     return fName;
 }
 
@@ -2545,7 +2743,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::updateStates
     const bool syncPar
 ) const
 {
-    if (Pstream::master())  // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         monitor().updateStates(true, false);
     }
@@ -2559,11 +2757,12 @@ Foam::fileOperations::masterUncollatedFileOperation::getState
 ) const
 {
     unsigned int state = fileMonitor::UNMODIFIED;
-    if (Pstream::master())  // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         state = monitor().getState(watchFd);
     }
-    Pstream::broadcast(state);  //, comm_);
+
+    Pstream::broadcast(state, UPstream::worldComm);
     return fileMonitor::fileState(state);
 }
 
@@ -2573,7 +2772,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::setUnmodified
     const label watchFd
 ) const
 {
-    if (Pstream::master())  // comm_))
+    if (!UPstream::parRun() || Pstream::master(UPstream::worldComm))
     {
         monitor().setUnmodified(watchFd);
     }
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
index 0b4848488e..6ddda2dcdd 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -392,9 +392,6 @@ protected:
 
     // Private Member Functions
 
-        //- Get the list of processors that are part of this communicator
-        static labelList subRanks(const label n);
-
         template<class Type>
         Type scatterList(const UList<Type>&, const int, const label comm) const;
 
@@ -436,6 +433,7 @@ protected:
             const bool checkGlobal,
             const bool isFile,
             const IOobject& io,
+            const dirIndexList& pDirs,
             const bool search,
             pathType& searchType,
             word& processorsDir,
@@ -494,8 +492,13 @@ public:
         //- Default construct
         explicit masterUncollatedFileOperation(bool verbose = false);
 
-        //- Construct from communicator
-        masterUncollatedFileOperation(const label comm, bool verbose);
+        //- Construct from communicator with specified io-ranks
+        explicit masterUncollatedFileOperation
+        (
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots,
+            bool verbose = false
+        );
 
 
     //- Destructor
@@ -773,6 +776,9 @@ public:
             //- Forcibly wait until all output done. Flush any cached data
             virtual void flush() const;
 
+            //- Forcibly parallel sync
+            virtual void sync();
+
             //- Return cached times
             const HashPtrTable<DynamicList<instant>>& times() const noexcept
             {
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C
new file mode 100644
index 0000000000..ab7b28b175
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022-2023 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 "hostUncollatedFileOperation.H"
+#include "addToRunTimeSelectionTable.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+namespace fileOperations
+{
+    defineTypeNameAndDebug(hostUncollatedFileOperation, 0);
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        hostUncollatedFileOperation,
+        word
+    );
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        hostUncollatedFileOperation,
+        comm
+    );
+
+    // Register initialisation routine. Signals need for threaded mpi and
+    // handles command line arguments
+    addNamedToRunTimeSelectionTable
+    (
+        fileOperationInitialise,
+        hostUncollatedFileOperationInitialise,
+        word,
+        hostUncollated
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Construction helper: self/world/local communicator and IO ranks
+static Tuple2<label, labelList> getCommPattern()
+{
+    // Default is COMM_WORLD (single master)
+    Tuple2<label, labelList> commAndIORanks
+    (
+        UPstream::worldComm,
+        fileOperation::getGlobalIORanks()
+    );
+
+    if (commAndIORanks.second().empty())
+    {
+        // Default: one master per host
+        commAndIORanks.second() = fileOperation::getGlobalHostIORanks();
+    }
+
+    if (UPstream::parRun() && commAndIORanks.second().size() > 1)
+    {
+        // Multiple masters: ranks for my IO range
+        commAndIORanks.first() = UPstream::allocateCommunicator
+        (
+            UPstream::worldComm,
+            fileOperation::subRanks(commAndIORanks.second())
+        );
+    }
+
+    return commAndIORanks;
+}
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+void Foam::fileOperations::hostUncollatedFileOperation::init(bool verbose)
+{
+    verbose = (verbose && Foam::infoDetailLevel > 0);
+
+    if (verbose)
+    {
+        DetailInfo
+            << "I/O    : " << this->type() << nl;
+
+        if (ioRanks_.size())
+        {
+            fileOperation::printRanks();
+        }
+    }
+}
+
+
+Foam::fileOperations::hostUncollatedFileOperation::hostUncollatedFileOperation
+(
+    bool verbose
+)
+:
+    masterUncollatedFileOperation
+    (
+        getCommPattern(),
+        false,  // distributedRoots
+        false   // verbose
+    ),
+    managedComm_(getManagedComm(comm_))  // Possibly locally allocated
+{
+    init(verbose);
+}
+
+
+Foam::fileOperations::hostUncollatedFileOperation::hostUncollatedFileOperation
+(
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots,
+    bool verbose
+)
+:
+    masterUncollatedFileOperation
+    (
+        commAndIORanks,
+        distributedRoots,
+        false   // verbose
+    ),
+    managedComm_(-1)  // Externally managed
+{
+    init(verbose);
+}
+
+
+void Foam::fileOperations::hostUncollatedFileOperation::storeComm() const
+{
+    // From externally -> locally managed
+    managedComm_ = getManagedComm(comm_);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fileOperations::hostUncollatedFileOperation::
+~hostUncollatedFileOperation()
+{
+    // Wait for any outstanding file operations
+    flush();
+
+    UPstream::freeCommunicator(managedComm_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
new file mode 100644
index 0000000000..c76baf5716
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022-2023 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::fileOperations::hostUncollatedFileOperation
+
+Description
+    Version of masterUncollated with host-based IO ranks
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_fileOperations_hostUncollatedFileOperation_H
+#define Foam_fileOperations_hostUncollatedFileOperation_H
+
+#include "masterUncollatedFileOperation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileOperations
+{
+
+/*---------------------------------------------------------------------------*\
+                 Class hostUncollatedFileOperation Declaration
+\*---------------------------------------------------------------------------*/
+
+class hostUncollatedFileOperation
+:
+    public masterUncollatedFileOperation
+{
+    // Private Data
+
+        //- Communicator allocated/managed by us
+        mutable label managedComm_;
+
+
+    // Private Member Functions
+
+        //- Any initialisation steps after constructing
+        void init(bool verbose);
+
+public:
+
+        //- Runtime type information
+        TypeName("hostUncollated");
+
+
+    // Constructors
+
+        //- Default construct
+        explicit hostUncollatedFileOperation(bool verbose = false);
+
+        //- Construct from communicator with specified io-ranks
+        explicit hostUncollatedFileOperation
+        (
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots,
+            bool verbose = false
+        );
+
+
+    //- Destructor
+    virtual ~hostUncollatedFileOperation();
+
+
+    // Member Functions
+
+        //- Transfer ownership of communicator to this fileOperation.
+        //- Use with caution
+        virtual void storeComm() const;
+};
+
+
+/*---------------------------------------------------------------------------*\
+            Class hostUncollatedFileOperationInitialise Declaration
+\*---------------------------------------------------------------------------*/
+
+class hostUncollatedFileOperationInitialise
+:
+    public masterUncollatedFileOperationInitialise
+{
+public:
+
+    // Constructors
+
+        //- Construct from components
+        hostUncollatedFileOperationInitialise(int& argc, char**& argv)
+        :
+            masterUncollatedFileOperationInitialise(argc, argv)
+        {}
+
+
+    //- Destructor
+    virtual ~hostUncollatedFileOperationInitialise() = default;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileOperations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 0988f3b251..2b380cc1f6 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -41,7 +41,18 @@ namespace Foam
 namespace fileOperations
 {
     defineTypeNameAndDebug(uncollatedFileOperation, 0);
-    addToRunTimeSelectionTable(fileOperation, uncollatedFileOperation, word);
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        uncollatedFileOperation,
+        word
+    );
+    addToRunTimeSelectionTable
+    (
+        fileOperation,
+        uncollatedFileOperation,
+        comm
+    );
 
     // Mark as not needing threaded mpi
     addNamedToRunTimeSelectionTable
@@ -159,7 +170,7 @@ Foam::fileName Foam::fileOperations::uncollatedFileOperation::filePathInfo
         }
     }
 
-    return fileName::null;
+    return fileName();
 }
 
 
@@ -174,6 +185,37 @@ Foam::fileOperations::uncollatedFileOperation::lookupProcessorsPath
 }
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Construction helper: self/world/local communicator and IO ranks
+static Tuple2<label, labelList> getCommPattern()
+{
+    // Default is COMM_SELF (only involves itself)
+    Tuple2<label, labelList> commAndIORanks
+    (
+        UPstream::selfComm,
+        fileOperation::getGlobalIORanks()
+    );
+
+    if (UPstream::parRun() && commAndIORanks.second().size() > 1)
+    {
+        // Multiple masters: ranks for my IO range
+        commAndIORanks.first() = UPstream::allocateCommunicator
+        (
+            UPstream::worldComm,
+            fileOperation::subRanks(commAndIORanks.second())
+        );
+    }
+
+    return commAndIORanks;
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 void Foam::fileOperations::uncollatedFileOperation::init(bool verbose)
@@ -193,7 +235,24 @@ Foam::fileOperations::uncollatedFileOperation::uncollatedFileOperation
     bool verbose
 )
 :
-    fileOperation(UPstream::worldComm),
+    fileOperation
+    (
+        getCommPattern()
+    ),
+    managedComm_(getManagedComm(comm_))  // Possibly locally allocated
+{
+    init(verbose);
+}
+
+
+Foam::fileOperations::uncollatedFileOperation::uncollatedFileOperation
+(
+    const Tuple2<label, labelList>& commAndIORanks,
+    const bool distributedRoots,
+    bool verbose
+)
+:
+    fileOperation(commAndIORanks, distributedRoots),
     managedComm_(-1)  // Externally managed
 {
     init(verbose);
@@ -211,6 +270,9 @@ void Foam::fileOperations::uncollatedFileOperation::storeComm() const
 
 Foam::fileOperations::uncollatedFileOperation::~uncollatedFileOperation()
 {
+    // Wait for any outstanding file operations
+    flush();
+
     UPstream::freeCommunicator(managedComm_);
 }
 
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
index a58d60a58d..41ddb96b5f 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
@@ -64,6 +64,7 @@ class uncollatedFileOperation
         //- Any initialisation steps after constructing
         void init(bool verbose);
 
+
 protected:
 
     // Protected Member Functions
@@ -90,8 +91,8 @@ protected:
 
 public:
 
-        //- Runtime type information
-        TypeName("uncollated");
+    //- Runtime type information
+    TypeName("uncollated");
 
 
     // Constructors
@@ -99,6 +100,14 @@ public:
         //- Default construct
         explicit uncollatedFileOperation(bool verbose = false);
 
+        //- Construct from communicator with specified io-ranks
+        explicit uncollatedFileOperation
+        (
+            const Tuple2<label, labelList>& commAndIORanks,
+            const bool distributedRoots,
+            bool verbose = false
+        );
+
 
     //- Destructor
     virtual ~uncollatedFileOperation();

From 5284bc301972688928c0a3b610941955442ee724 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 May 2023 23:28:19 +0200
Subject: [PATCH 266/348] ENH: add fileOperation::New with a subset of ranks

- replicate the given fileHandler properties with
  a subset of (global) ranks
---
 .../fileOperation/fileOperation.H             |  45 ++++-
 .../fileOperation/fileOperationNew.C          | 186 +++++++++++++++++-
 2 files changed, 226 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 6c78934f84..245eef2586 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -238,6 +238,20 @@ protected:
         }
 
 
+private:
+
+    // Private Member Functions
+
+        //- Low-level implementation for subsetting 'clone' operation
+        static autoPtr<fileOperation> New_impl
+        (
+            const fileOperation& origHandler,
+            //! The selected sub-ranks (in worldComm)
+            const labelUList& subProcs,
+            bool verbose
+        );
+
+
 public:
 
     // Static Data
@@ -278,10 +292,6 @@ public:
         );
 
 
-        //- Clone fileHandler
-        /// virtual autoPtr<fileOperation> clone() const = 0;
-
-
     // Declare run-time constructor selection table
 
         declareRunTimeSelectionTable
@@ -330,6 +340,33 @@ public:
         );
 
 
+        //- Replicate the given fileHandler properties with
+        //- a subset of (global) ranks.
+        //  Always includes rank 0 and constrained by the global numProcs
+        //  Returns nullptr if myProcNo is not involved.
+        static autoPtr<fileOperation> New
+        (
+            //! The original file handler
+            const fileOperation& origHandler,
+            //! The selected sub-ranks (in worldComm)
+            const boolUList& useProc,
+            bool verbose = false
+        );
+
+        //- Replicate the given fileHandler properties with
+        //- a subset of (global) ranks.
+        //  Always includes rank 0 and constrained by the global numProcs
+        //  Returns nullptr if myProcNo is not involved.
+        static autoPtr<fileOperation> New
+        (
+            //! The original file handler
+            const fileOperation& origHandler,
+            //! The selected sub-ranks (in worldComm). Monotonic order!
+            const bitSet& useProc,
+            bool verbose = false
+        );
+
+
     //- Destructor
     virtual ~fileOperation() = default;
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
index dee4b1c4aa..f836be8534 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
@@ -125,7 +125,7 @@ Foam::autoPtr<Foam::fileOperation> Foam::fileOperation::NewUncollated()
 {
     return autoPtr<fileOperation>
     (
-        new fileOperations::uncollatedFileOperation(false)
+        new fileOperations::uncollatedFileOperation(false)  // verbose = false
     );
 }
 
@@ -221,6 +221,190 @@ Foam::fileOperation::New
 }
 
 
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// From boolUList/bitSet to list of labels,
+// always include rank 0 and constrain by numProcs
+template<class BoolListType>
+static labelList getSelectedProcs(const BoolListType& useProc)
+{
+    labelList ranks;
+
+    if
+    (
+        UPstream::master(UPstream::worldComm)
+     || useProc.test(UPstream::myProcNo(UPstream::worldComm))
+    )
+    {
+        DynamicList<label> subProcs(UPstream::nProcs(UPstream::worldComm));
+
+        for (const int proci : UPstream::allProcs(UPstream::worldComm))
+        {
+            // Always include the master rank
+            if (!proci || useProc.test(proci))
+            {
+                subProcs.push_back(proci);
+            }
+        }
+
+        ranks.transfer(subProcs);
+    }
+
+    return ranks;
+}
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::fileOperation>
+Foam::fileOperation::New_impl
+(
+    const fileOperation& origHandler,
+    const labelUList& subProcs,  // in worldComm
+    bool verbose
+)
+{
+    autoPtr<fileOperation> newHandler;
+
+    // NB: input must include master!
+
+    const label myProci = UPstream::myProcNo(UPstream::worldComm);
+    const label numProcs = UPstream::nProcs(UPstream::worldComm);
+
+    if (subProcs.contains(myProci))
+    {
+        // Retaining the original IO ranks if possible
+
+        // Retain the original IO ranks that coincide with the new subset.
+        // This may still need more attention...
+
+        const labelUList& origIOranks = origHandler.ioRanks();
+        DynamicList<label> subIORanks(origIOranks.size());
+
+        for (const label proci : subProcs)
+        {
+            if (origIOranks.contains(proci))
+            {
+                subIORanks.push_back(proci);
+            }
+        }
+
+        // Default starting point
+        Tuple2<label, labelList> commAndIORanks
+        (
+            UPstream::worldComm,
+            subIORanks
+        );
+
+        // TBD: special handling for uncollated
+        // if (origHandler.comm() == UPstream::selfComm)
+        // {
+        //     commAndIORanks.first() = UPstream::selfComm;
+        // }
+
+        const bool hasIOranks = (commAndIORanks.second().size() > 1);
+
+        if
+        (
+            UPstream::parRun()
+         && (hasIOranks || (subProcs.size() != numProcs))
+        )
+        {
+            // Without any IO range, restrict to overall proc range
+            // since we don't necessarily trust the input...
+            labelRange siblingRange(numProcs);
+
+            if (hasIOranks)
+            {
+                // Multiple masters: ranks included in my IO range
+                siblingRange = fileOperation::subRanks(commAndIORanks.second());
+            }
+
+            // Restrict to siblings within the IO range or proc range
+            labelList siblings;
+            if (siblingRange.size())
+            {
+                auto& dynSiblings = subIORanks;
+                dynSiblings.clear();
+
+                for (const label proci : subProcs)
+                {
+                    if (siblingRange.contains(proci))
+                    {
+                        dynSiblings.push_back(proci);
+                    }
+                }
+
+                siblings.transfer(dynSiblings);
+            }
+
+            // Warning: MS-MPI currently uses MPI_Comm_create() instead of
+            // MPI_Comm_create_group() so it will block there!
+
+            commAndIORanks.first() = UPstream::allocateCommunicator
+            (
+                UPstream::worldComm,
+                siblings
+            );
+        }
+
+
+        // Allocate new handler with same type and similar IO ranks
+        // but with different sub-ranks (and communicator)
+
+        newHandler = fileOperation::New
+        (
+            origHandler.type(),
+            commAndIORanks,
+            origHandler.distributed(),
+            verbose
+        );
+
+        if (newHandler)
+        {
+            newHandler->nProcs(origHandler.nProcs());
+            newHandler->storeComm();
+        }
+    }
+
+    return newHandler;
+}
+
+
+Foam::autoPtr<Foam::fileOperation>
+Foam::fileOperation::New
+(
+    const fileOperation& origHandler,
+    const boolUList& useProc,  // in worldComm
+    bool verbose
+)
+{
+    labelList subProcs = getSelectedProcs(useProc);
+
+    return fileOperation::New_impl(origHandler, subProcs, verbose);
+}
+
+
+Foam::autoPtr<Foam::fileOperation>
+Foam::fileOperation::New
+(
+    const fileOperation& origHandler,
+    const bitSet& useProc,  // in worldComm
+    bool verbose
+)
+{
+    labelList subProcs = getSelectedProcs(useProc);
+
+    return fileOperation::New_impl(origHandler, subProcs, verbose);
+}
+
+
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::fileOperation>

From a34262966b4084e228a02435b71e4083ed63913b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 19 May 2023 16:29:54 +0200
Subject: [PATCH 267/348] STYLE: use fileOperation nProcs() instead of
 setNProcs()

---
 .../utilities/parallelProcessing/decomposePar/decomposePar.C    | 2 +-
 .../parallelProcessing/reconstructPar/reconstructPar.C          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index bd77c4096c..3ab664458e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
         );
 
         // Give file handler a chance to determine the output directory
-        const_cast<fileOperation&>(fileHandler()).setNProcs(nDomains);
+        const_cast<fileOperation&>(fileHandler()).nProcs(nDomains);
 
         if (decomposeFieldsOnly)
         {
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index bae8f635a5..7398cb581d 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
     }
 
     // Warn fileHandler of number of processors
-    const_cast<fileOperation&>(fileHandler()).setNProcs(nProcs);
+    const_cast<fileOperation&>(fileHandler()).nProcs(nProcs);
 
     // Create the processor databases
     PtrList<Time> databases(nProcs);

From d34dfbe0b77691a697134bf992ffb67e20302b1b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 23 May 2023 09:43:39 +0200
Subject: [PATCH 268/348] ENH: dummy fileOperation: placeholder for interfaces
 taking a reference

STYLE: align readOnProc/writeOnProc naming within masterUncollated
---
 .../test/fileHandler-dummy/Make/files         |   3 +
 .../test/fileHandler-dummy/Make/options       |   2 +
 .../Test-fileHandler-dummy.C                  |  79 ++++
 src/OpenFOAM/Make/files                       |   1 +
 .../collatedFileOperation.H                   |   1 +
 .../dummyFileOperation/dummyFileOperation.C   | 385 ++++++++++++++++++
 .../dummyFileOperation/dummyFileOperation.H   | 290 +++++++++++++
 .../fileOperation/fileOperation.H             |  15 +
 .../fileOperation/fileOperationNew.C          |  15 +
 .../masterUncollatedFileOperation.C           |  90 ++--
 .../masterUncollatedFileOperation.H           |   7 +-
 .../hostUncollatedFileOperation.H             |   1 +
 .../uncollatedFileOperation.C                 |   4 +-
 .../uncollatedFileOperation.H                 |   2 +-
 14 files changed, 849 insertions(+), 46 deletions(-)
 create mode 100644 applications/test/fileHandler-dummy/Make/files
 create mode 100644 applications/test/fileHandler-dummy/Make/options
 create mode 100644 applications/test/fileHandler-dummy/Test-fileHandler-dummy.C
 create mode 100644 src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C
 create mode 100644 src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.H

diff --git a/applications/test/fileHandler-dummy/Make/files b/applications/test/fileHandler-dummy/Make/files
new file mode 100644
index 0000000000..5f84ed028f
--- /dev/null
+++ b/applications/test/fileHandler-dummy/Make/files
@@ -0,0 +1,3 @@
+Test-fileHandler-dummy.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-fileHandler-dummy
diff --git a/applications/test/fileHandler-dummy/Make/options b/applications/test/fileHandler-dummy/Make/options
new file mode 100644
index 0000000000..18e6fe47af
--- /dev/null
+++ b/applications/test/fileHandler-dummy/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */
diff --git a/applications/test/fileHandler-dummy/Test-fileHandler-dummy.C b/applications/test/fileHandler-dummy/Test-fileHandler-dummy.C
new file mode 100644
index 0000000000..fd55fb991a
--- /dev/null
+++ b/applications/test/fileHandler-dummy/Test-fileHandler-dummy.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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/>.
+
+Application
+    Test-fileHandler-dummy
+
+Description
+    Simple test of dummy fileOperation
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "fileName.H"
+#include "fileOperation.H"
+#include "Switch.H"
+
+using namespace Foam;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noCheckProcessorDirectories();
+
+    argList::addBoolOption
+    (
+        "force",
+        "Force use of dummy handler (and provoke NotImplemented)"
+    );
+
+    #include "setRootCase.H"
+
+    const bool optForce = args.found("force");
+
+    const auto& dummy = fileOperation::null();
+
+    Info<< "default handler: " << fileHandler() << endl;
+    Info<< "dummy handler: " << dummy() << endl;
+
+    Switch hasFile(Switch::INVALID);
+
+    if (optForce || (dummy && dummy().good()))
+    {
+        hasFile = dummy().isFile("foo");
+    }
+
+    Info<< "check file: " << hasFile << endl;
+
+    Info<< "\nEnd\n" << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index b4918de003..cb0be37821 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -22,6 +22,7 @@ $(fileOps)/fileOperation/fileOperationBroadcast.C
 $(fileOps)/fileOperation/fileOperationNew.C
 $(fileOps)/fileOperation/fileOperationRanks.C
 $(fileOps)/fileOperationInitialise/fileOperationInitialise.C
+$(fileOps)/dummyFileOperation/dummyFileOperation.C
 $(fileOps)/uncollatedFileOperation/uncollatedFileOperation.C
 $(fileOps)/masterUncollatedFileOperation/masterUncollatedFileOperation.C
 $(fileOps)/collatedFileOperation/collatedFileOperation.C
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
index d2c9ad9888..92ce70c71a 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -176,6 +176,7 @@ public:
                Class collatedFileOperationInitialise Declaration
 \*---------------------------------------------------------------------------*/
 
+//! Internal class only
 class collatedFileOperationInitialise
 :
     public masterUncollatedFileOperationInitialise
diff --git a/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C b/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C
new file mode 100644
index 0000000000..d7da952169
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C
@@ -0,0 +1,385 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "dummyFileOperation.H"
+#include "dummyISstream.H"
+#include "Fstream.H"
+#include "objectRegistry.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+namespace fileOperations
+{
+    defineTypeName(dummyFileOperation);
+
+// No runtime selection
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fileOperations::dummyFileOperation::dummyFileOperation
+(
+    bool verbose
+)
+:
+    fileOperation
+    (
+        // Use COMM_SELF for now, but COMM_NULL is probably more appropriate
+        Tuple2<label, labelList>
+        (
+            UPstream::selfComm,
+            fileOperation::getGlobalIORanks()
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fileOperations::dummyFileOperation::~dummyFileOperation()
+{}
+
+
+// * * * * * * * * * * * * * Filesystem Operations * * * * * * * * * * * * * //
+
+bool Foam::fileOperations::dummyFileOperation::mkDir
+(
+    const fileName& dir,
+    mode_t mode
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::chMod
+(
+    const fileName& fName,
+    mode_t mode
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+mode_t Foam::fileOperations::dummyFileOperation::mode
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return mode_t(0);
+}
+
+
+Foam::fileName::Type Foam::fileOperations::dummyFileOperation::type
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return fileName::Type::UNDEFINED;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::exists
+(
+    const fileName& fName,
+    const bool checkGzip,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::isDir
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::isFile
+(
+    const fileName& fName,
+    const bool checkGzip,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+off_t Foam::fileOperations::dummyFileOperation::fileSize
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return off_t(0);
+}
+
+
+time_t Foam::fileOperations::dummyFileOperation::lastModified
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return time_t(0);
+}
+
+
+double Foam::fileOperations::dummyFileOperation::highResLastModified
+(
+    const fileName& fName,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return 0;
+}
+
+
+
+Foam::fileNameList Foam::fileOperations::dummyFileOperation::readDir
+(
+    const fileName& dir,
+    const fileName::Type type,
+    const bool filtergz,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return fileNameList();
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::cp
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::ln
+(
+    const fileName& src,
+    const fileName& dst
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::mv
+(
+    const fileName& src,
+    const fileName& dst,
+    const bool followLink
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::mvBak
+(
+    const fileName& fName,
+    const std::string& ext
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::rm
+(
+    const fileName& fName
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::rmDir
+(
+    const fileName& dir,
+    const bool silent,
+    const bool emptyOnly
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::fileName Foam::fileOperations::dummyFileOperation::filePath
+(
+    const bool checkGlobal,
+    const IOobject& io,
+    const word& typeName,
+    const bool search
+) const
+{
+    NotImplemented;
+    return fileName();
+}
+
+
+Foam::fileName Foam::fileOperations::dummyFileOperation::dirPath
+(
+    const bool checkGlobal,
+    const IOobject& io,
+    const bool search
+) const
+{
+    NotImplemented;
+    return fileName();
+}
+
+
+Foam::fileNameList Foam::fileOperations::dummyFileOperation::readObjects
+(
+    const objectRegistry& db,
+    const fileName& instance,
+    const fileName& local,
+    word& newInstance
+) const
+{
+    NotImplemented;
+    return fileNameList();
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::readHeader
+(
+    IOobject& io,
+    const fileName& fName,
+    const word& typeName
+) const
+{
+    NotImplemented;
+    io.resetHeader();
+    return false;
+}
+
+
+Foam::autoPtr<Foam::ISstream>
+Foam::fileOperations::dummyFileOperation::readStream
+(
+    regIOobject& io,
+    const fileName& fName,
+    const word& typeName,
+    const bool readOnProc
+) const
+{
+    NotImplemented;
+    return autoPtr<ISstream>(new dummyISstream());
+}
+
+
+bool Foam::fileOperations::dummyFileOperation::read
+(
+    regIOobject& io,
+    const bool masterOnly,
+    const IOstreamOption::streamFormat format,
+    const word& typeName
+) const
+{
+    NotImplemented;
+    return false;
+}
+
+
+Foam::autoPtr<Foam::ISstream>
+Foam::fileOperations::dummyFileOperation::NewIFstream
+(
+    const fileName& filePath
+) const
+{
+    NotImplemented;
+    return autoPtr<ISstream>(new dummyISstream());
+}
+
+
+Foam::autoPtr<Foam::OSstream>
+Foam::fileOperations::dummyFileOperation::NewOFstream
+(
+    const fileName& pathName,
+    IOstreamOption streamOpt,
+    const bool writeOnProc
+) const
+{
+    NotImplemented;
+    return autoPtr<OSstream>(new OFstream(nullptr));  // ie, /dev/null
+}
+
+
+Foam::autoPtr<Foam::OSstream>
+Foam::fileOperations::dummyFileOperation::NewOFstream
+(
+    IOstreamOption::atomicType atomic,
+    const fileName& pathName,
+    IOstreamOption streamOpt,
+    const bool writeOnProc
+) const
+{
+    NotImplemented;
+    return autoPtr<OSstream>(new OFstream(nullptr));  // ie, /dev/null
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.H b/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.H
new file mode 100644
index 0000000000..5195fe2eea
--- /dev/null
+++ b/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.H
@@ -0,0 +1,290 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::fileOperations::dummyFileOperation
+
+Description
+    Dummy fileOperation, to be used as a placeholder for interfaces
+    taking a reference to a fileOperation.
+    Will mostly behave like a no-op, but at the moment no guarantees
+    of any particular behaviour other than good() returning false.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_fileOperations_dummyFileOperation_H
+#define Foam_fileOperations_dummyFileOperation_H
+
+#include "fileOperation.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fileOperations
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class dummyFileOperation Declaration
+\*---------------------------------------------------------------------------*/
+
+class dummyFileOperation
+:
+    public fileOperation
+{
+public:
+
+    //- Runtime type information
+    TypeNameNoDebug("dummy");
+
+
+    // Constructors
+
+        //- Default construct
+        explicit dummyFileOperation(bool verbose = false);
+
+
+    //- Destructor
+    virtual ~dummyFileOperation();
+
+
+    // Member Functions
+
+        //- This fileOperation is not really valid for anything.
+        virtual bool good() const { return false; }
+
+        //- No managed communicator
+        virtual void storeComm() const {}
+
+
+        // OSSpecific equivalents
+
+            //- Make directory
+            virtual bool mkDir(const fileName&, mode_t=0777) const;
+
+            //- Set the file mode
+            virtual bool chMod(const fileName&, const mode_t) const;
+
+            //- Return the file mode
+            virtual mode_t mode
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return the file type: DIRECTORY, FILE or SYMLINK
+            virtual fileName::Type type
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist (as DIRECTORY or FILE) in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool exists
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist as a DIRECTORY in the file system?
+            virtual bool isDir
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Does the name exist as a FILE in the file system?
+            //  Optionally enable/disable check for gzip file.
+            virtual bool isFile
+            (
+                const fileName&,
+                const bool checkGzip=true,
+                const bool followLink = true
+            ) const;
+
+            //- Return size of file
+            virtual off_t fileSize
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return time of last file modification
+            virtual time_t lastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Return time of last file modification
+            virtual double highResLastModified
+            (
+                const fileName&,
+                const bool followLink = true
+            ) const;
+
+            //- Read a directory and return the entries as a string list
+            virtual fileNameList readDir
+            (
+                const fileName&,
+                const fileName::Type=fileName::FILE,
+                const bool filtergz=true,
+                const bool followLink = true
+            ) const;
+
+            //- Copy, recursively if necessary, the source to the destination
+            virtual bool cp
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = true
+            ) const;
+
+             //- Create a softlink. dst should not exist. Returns true if
+            //  successful.
+            virtual bool ln(const fileName& src, const fileName& dst) const;
+
+            //- Rename src to dst
+            virtual bool mv
+            (
+                const fileName& src,
+                const fileName& dst,
+                const bool followLink = false
+            ) const;
+
+            //- Rename to a corresponding backup file
+            //  If the backup file already exists, attempt with
+            //  "01" .. "99" suffix
+            virtual bool mvBak
+            (
+                const fileName&,
+                const std::string& ext = "bak"
+            ) const;
+
+            //- Remove a file, returning true if successful otherwise false
+            virtual bool rm(const fileName&) const;
+
+            //- Remove a directory and its contents
+            //  \param dir the directory to remove
+            //  \param silent do not report missing directory
+            //  \param emptyOnly only remove empty directories (recursive)
+            virtual bool rmDir
+            (
+                const fileName& dir,
+                const bool silent = false,
+                const bool emptyOnly = false
+            ) const;
+
+
+        // (reg)IOobject functionality
+
+            //- Search for an object. checkGlobal
+            virtual fileName filePath
+            (
+                const bool checkGlobal,
+                const IOobject& io,
+                const word& typeName,
+                const bool search
+            ) const;
+
+            //- Search for a directory. checkGlobal
+            virtual fileName dirPath
+            (
+                const bool checkGlobal,
+                const IOobject& io,
+                const bool search
+            ) const;
+
+            //- Search directory for objects. Used in IOobjectList.
+            virtual fileNameList readObjects
+            (
+                const objectRegistry& db,
+                const fileName& instance,
+                const fileName& local,
+                word& newInstance
+            ) const;
+
+            //- Read object header from supplied file
+            virtual bool readHeader
+            (
+                IOobject&,
+                const fileName&,
+                const word& typeName
+            ) const;
+
+            //- Reads header for regIOobject and returns an ISstream
+            //- to read the contents.
+            virtual autoPtr<ISstream> readStream
+            (
+                regIOobject&,
+                const fileName&,
+                const word& typeName,
+                const bool readOnProc = true
+            ) const;
+
+            //- Top-level read
+            virtual bool read
+            (
+                regIOobject&,
+                const bool masterOnly,
+                const IOstreamOption::streamFormat format,
+                const word& typeName
+            ) const;
+
+            //- Generate an ISstream that reads a file
+            virtual autoPtr<ISstream> NewIFstream(const fileName&) const;
+
+            //- Generate an OSstream that writes a file
+            virtual autoPtr<OSstream> NewOFstream
+            (
+                const fileName& pathname,
+                IOstreamOption streamOpt = IOstreamOption(),
+                const bool writeOnProc = true
+            ) const;
+
+            //- Generate an OSstream that writes a file
+            virtual autoPtr<OSstream> NewOFstream
+            (
+                IOstreamOption::atomicType,
+                const fileName& pathname,
+                IOstreamOption streamOpt = IOstreamOption(),
+                const bool writeOnProc = true
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileOperations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index 245eef2586..c7350b7a99 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -143,6 +143,14 @@ public:
         typedef IntRange<int> procRangeType;
 
 
+private:
+
+    // Private Static Data
+
+        //- Storage of the dummy file handler (demand-driven)
+        static refPtr<fileOperation> dummyHandlerPtr_;
+
+
 protected:
 
     // Protected Static Data
@@ -272,6 +280,9 @@ public:
     //- The currently active file handler. Avoid accessing directly
     static refPtr<fileOperation> fileHandlerPtr_;
 
+    //- Reference to a dummy file handler.
+    static refPtr<fileOperation> null();
+
 
     // Constructors
 
@@ -501,6 +512,10 @@ public:
 
     // Member Functions
 
+        //- True if the fileOperation can be considered valid.
+        //- At the moment, primarily used to detect the dummy fileOperation.
+        virtual bool good() const { return true; }
+
         //- Transfer ownership of communicator to this fileOperation.
         //- Use with caution
         virtual void storeComm() const = 0;
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
index f836be8534..b24f38870f 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
@@ -26,15 +26,30 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fileOperation.H"
+#include "dummyFileOperation.H"
 #include "uncollatedFileOperation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+Foam::refPtr<Foam::fileOperation> Foam::fileOperation::dummyHandlerPtr_;
+
 Foam::refPtr<Foam::fileOperation> Foam::fileOperation::fileHandlerPtr_;
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
+Foam::refPtr<Foam::fileOperation> Foam::fileOperation::null()
+{
+    if (!dummyHandlerPtr_)
+    {
+        // verbose = false
+        dummyHandlerPtr_.reset(new fileOperations::dummyFileOperation(false));
+    }
+
+    return dummyHandlerPtr_;
+}
+
+
 const Foam::fileOperation& Foam::fileOperation::fileHandler()
 {
     if (!fileOperation::fileHandlerPtr_)
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 314cd76cf7..700b44aa8c 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -428,10 +428,12 @@ Foam::fileOperations::masterUncollatedFileOperation::localObjectPath
 void Foam::fileOperations::masterUncollatedFileOperation::readAndSend
 (
     const fileName& filePath,
-    const labelUList& procs,
+    const labelUList& recvProcs,
     PstreamBuffers& pBufs
 )
 {
+    if (recvProcs.empty()) return;
+
     IFstream ifs(filePath, IOstreamOption::BINARY);
 
     if (!ifs.good())
@@ -462,7 +464,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::readAndSend
             std::istreambuf_iterator<char>()
         );
 
-        for (const label proci : procs)
+        for (const label proci : recvProcs)
         {
             UOPstream os(proci, pBufs);
             os.write(buf.data(), buf.length());
@@ -483,7 +485,7 @@ void Foam::fileOperations::masterUncollatedFileOperation::readAndSend
         List<char> buf(static_cast<label>(count));
         ifs.stdStream().read(buf.data(), count);
 
-        for (const label proci : procs)
+        for (const label proci : recvProcs)
         {
             UOPstream os(proci, pBufs);
             os.write(buf.cdata(), count);
@@ -505,37 +507,35 @@ Foam::fileOperations::masterUncollatedFileOperation::read
     IOobject& io,
     const label comm,
     const bool uniform,             // on comms master only
-    const fileNameList& filePaths,  // on comms master only
-    const boolList& procValid       // on comms master and sub-ranks
+    const fileNameList& filePaths,  // on comms master and sub-ranks
+    const boolUList& readOnProcs    // on comms master and sub-ranks
 )
 {
     autoPtr<ISstream> isPtr;
 
-    // const bool uniform = fileOperation::uniformFile(filePaths);
-
     PstreamBuffers pBufs(comm, UPstream::commsTypes::nonBlocking);
 
     if (UPstream::master(comm))
     {
         if (uniform)
         {
-            if (procValid[0])
+            if (readOnProcs[0])
             {
                 if (filePaths[0].empty())
                 {
                     FatalIOErrorInFunction(filePaths[0])
-                        << "cannot find file " << io.objectPath()
+                        << "Cannot find file " << io.objectPath()
                         << " fileHandler : comm:" << comm
                         << " ioRanks:" << UPstream::procID(comm)
                         << exit(FatalIOError);
                 }
 
-                DynamicList<label> validProcs(Pstream::nProcs(comm));
-                for (const int proci : Pstream::allProcs(comm))
+                DynamicList<label> recvProcs(UPstream::nProcs(comm));
+                for (const int proci : UPstream::allProcs(comm))
                 {
-                    if (procValid[proci])
+                    if (readOnProcs[proci])
                     {
-                        validProcs.append(proci);
+                        recvProcs.push_back(proci);
                     }
                 }
 
@@ -545,20 +545,20 @@ Foam::fileOperations::masterUncollatedFileOperation::read
                 {
                     Pout<< "masterUncollatedFileOperation::readStream :"
                         << " For uniform file " << filePaths[0]
-                        << " sending to " << validProcs
+                        << " sending to " << recvProcs
                         << " in comm:" << comm << endl;
                 }
-                readAndSend(filePaths[0], validProcs, pBufs);
+                readAndSend(filePaths[0], recvProcs, pBufs);
             }
         }
         else
         {
-            if (procValid[0])
+            if (readOnProcs[0])
             {
                 if (filePaths[0].empty())
                 {
                     FatalIOErrorInFunction(filePaths[0])
-                        << "cannot find file " << io.objectPath()
+                        << "Cannot find file " << io.objectPath()
                         << " fileHandler : comm:" << comm
                         << " ioRanks:" << UPstream::procID(comm)
                         << exit(FatalIOError);
@@ -580,7 +580,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
             }
 
             // Read sub-rank files
-            for (const int proci : Pstream::subProcs(comm))
+            for (const int proci : UPstream::subProcs(comm))
             {
                 if (debug)
                 {
@@ -591,7 +591,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
 
                 const fileName& fPath = filePaths[proci];
 
-                if (procValid[proci] && !fPath.empty())
+                if (readOnProcs[proci] && !fPath.empty())
                 {
                     // Note: handle compression ourselves since size cannot
                     // be determined without actually uncompressing
@@ -609,14 +609,14 @@ Foam::fileOperations::masterUncollatedFileOperation::read
 
     if (!isPtr)
     {
-        if (procValid[Pstream::myProcNo(comm)])
+        if (readOnProcs[UPstream::myProcNo(comm)])
         {
             // This processor needs to return something
-            List<char> buf(pBufs.recvDataCount(Pstream::masterNo()));
+            List<char> buf(pBufs.recvDataCount(UPstream::masterNo()));
 
             if (!buf.empty())
             {
-                UIPstream is(Pstream::masterNo(), pBufs);
+                UIPstream is(UPstream::masterNo(), pBufs);
                 is.read(buf.data(), buf.size());
             }
 
@@ -633,7 +633,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
             isPtr.reset(new IListStream(std::move(buf)));
 
             // With the proper file name
-            isPtr->name() = filePaths[Pstream::myProcNo(comm)];
+            isPtr->name() = filePaths[UPstream::myProcNo(comm)];
 
             if (!io.readHeader(*isPtr))
             {
@@ -1971,7 +1971,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
         splitProcessorPath(fName, path, procDir, local, group, nProcs);
 
 
-        if (!Pstream::parRun())
+        if (!UPstream::parRun())
         {
             // Analyse the objectpath to find out the processor we're trying
             // to access
@@ -2078,16 +2078,16 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
         {
             // Use worldComm. Note: should not really need to gather filePaths
             // since we enforce sending from master anyway ...
-            fileNameList filePaths(Pstream::nProcs(UPstream::worldComm));
-            filePaths[Pstream::myProcNo(UPstream::worldComm)] = fName;
+            fileNameList filePaths(UPstream::nProcs(UPstream::worldComm));
+            filePaths[UPstream::myProcNo(UPstream::worldComm)] = fName;
             Pstream::gatherList
             (
                 filePaths,
-                Pstream::msgType(),
+                UPstream::msgType(),
                 UPstream::worldComm
             );
 
-            boolList procValid
+            boolList readOnProcs
             (
                 UPstream::listGatherValues<bool>
                 (
@@ -2096,30 +2096,40 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream
                 )
             );
             // NB: local proc validity information required on sub-ranks too!
-            procValid.resize(Pstream::nProcs(UPstream::worldComm));
-            procValid[Pstream::myProcNo(UPstream::worldComm)] = readOnProc;
+            readOnProcs.resize(UPstream::nProcs(UPstream::worldComm));
+            readOnProcs[UPstream::myProcNo(UPstream::worldComm)] = readOnProc;
 
-            return read(io, UPstream::worldComm, true, filePaths, procValid);
+            // Uniform in local comm
+            return read(io, UPstream::worldComm, true, filePaths, readOnProcs);
         }
         else
         {
             // Use local communicator
-            fileNameList filePaths(Pstream::nProcs(comm_));
-            filePaths[Pstream::myProcNo(comm_)] = fName;
-            Pstream::gatherList(filePaths, Pstream::msgType(), comm_);
-
-            boolList procValid
+            fileNameList filePaths(UPstream::nProcs(comm_));
+            filePaths[UPstream::myProcNo(comm_)] = fName;
+            Pstream::gatherList
             (
-                UPstream::listGatherValues<bool>(readOnProc, comm_)
+                filePaths,
+                UPstream::msgType(),
+                comm_
+            );
+
+            boolList readOnProcs
+            (
+                UPstream::listGatherValues<bool>
+                (
+                    readOnProc,
+                    comm_
+                )
             );
             // NB: local proc validity information required on sub-ranks too!
-            procValid.resize(Pstream::nProcs(comm_));
-            procValid[Pstream::myProcNo(comm_)] = readOnProc;
+            readOnProcs.resize(UPstream::nProcs(comm_));
+            readOnProcs[UPstream::myProcNo(comm_)] = readOnProc;
 
             // Uniform in local comm
             const bool uniform = fileOperation::uniformFile(filePaths);
 
-            return read(io, comm_, uniform, filePaths, procValid);
+            return read(io, comm_, uniform, filePaths, readOnProcs);
         }
     }
 }
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
index 6ddda2dcdd..bd908cb8de 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -454,7 +454,7 @@ protected:
         static void readAndSend
         (
             const fileName& filePath,
-            const labelUList& procs,
+            const labelUList& recvProcs,
             PstreamBuffers& pBufs
         );
 
@@ -464,8 +464,8 @@ protected:
             IOobject& io,
             const label comm,
             const bool uniform,             // on comms master only
-            const fileNameList& filePaths,  // on comms master only
-            const boolList& procValid       // on comms master only
+            const fileNameList& filePaths,  // on comms master and sub-ranks
+            const boolUList& readOnProcs    // on comms master and sub-ranks
         );
 
         //- Helper: check IO for local existence. Like filePathInfo but
@@ -791,6 +791,7 @@ public:
            Class masterUncollatedFileOperationInitialise Declaration
 \*---------------------------------------------------------------------------*/
 
+//! Internal class only
 class masterUncollatedFileOperationInitialise
 :
     public unthreadedInitialise
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
index c76baf5716..6364eb853f 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
@@ -98,6 +98,7 @@ public:
             Class hostUncollatedFileOperationInitialise Declaration
 \*---------------------------------------------------------------------------*/
 
+//! Internal class only
 class hostUncollatedFileOperationInitialise
 :
     public masterUncollatedFileOperationInitialise
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 2b380cc1f6..ea17ca8333 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -614,10 +614,10 @@ Foam::fileOperations::uncollatedFileOperation::readStream
     regIOobject& io,
     const fileName& fName,
     const word& typeName,
-    const bool writeOnProc
+    const bool readOnProc
 ) const
 {
-    if (!writeOnProc)
+    if (!readOnProc)
     {
         return autoPtr<ISstream>(new dummyISstream());
     }
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
index 41ddb96b5f..9b8bd51083 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
@@ -285,7 +285,7 @@ public:
                 regIOobject&,
                 const fileName&,
                 const word& typeName,
-                const bool procValid = true
+                const bool readOnProc = true
             ) const;
 
             //- Top-level read

From 8a060e87cbb0f52e2d2b78316a76565635b06ba6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 23 May 2023 11:13:26 +0200
Subject: [PATCH 269/348] ENH: fileHandler support for faMeshDistributor and
 field distributors

- fatten the interface to continue allowing write control with a bool
  or with a dedicated file handler. This may slim down in the future.

Co-authored-by: mattijs <mattijs>
---
 .../redistributePar/parFvFieldDistributor.C   | 38 +++++++++-
 .../redistributePar/parFvFieldDistributor.H   | 27 +++++++-
 .../parFvFieldDistributorTemplates.C          | 50 ++++++++++++--
 .../parPointFieldDistributor.C                | 56 ++++++++++++++-
 .../parPointFieldDistributor.H                | 49 +++++++++++--
 .../parPointFieldDistributorTemplates.C       | 19 ++++-
 .../redistributePar/redistributePar.C         |  3 +-
 .../distributed/faMeshDistributor.C           | 69 +++++++++++++------
 .../distributed/faMeshDistributor.H           | 27 ++++++--
 .../distributed/faMeshDistributorTemplates.C  | 63 +++++++++++++++--
 10 files changed, 352 insertions(+), 49 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.C b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.C
index 16187c06fc..4604a9e2d2 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,12 +85,33 @@ Foam::parFvFieldDistributor::parFvFieldDistributor
     srcMesh_(srcMesh),
     tgtMesh_(tgtMesh),
     distMap_(distMap),
+    dummyHandler_(fileOperation::null()),
+    writeHandler_(dummyHandler_),
     isWriteProc_(isWriteProc)
 {
     createPatchFaceMaps();
 }
 
 
+Foam::parFvFieldDistributor::parFvFieldDistributor
+(
+    const fvMesh& srcMesh,
+    fvMesh& tgtMesh,
+    const mapDistributePolyMesh& distMap,
+    refPtr<fileOperation>& writeHandler
+)
+:
+    srcMesh_(srcMesh),
+    tgtMesh_(tgtMesh),
+    distMap_(distMap),
+    dummyHandler_(nullptr),
+    writeHandler_(writeHandler),
+    isWriteProc_(Switch::INVALID)
+{
+    createPatchFaceMaps();
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::parFvFieldDistributor::reconstructPoints()
@@ -105,9 +126,22 @@ void Foam::parFvFieldDistributor::reconstructPoints()
     pointField newPoints(srcMesh_.points(), mapper);
     tgtMesh_.movePoints(newPoints);
 
-    if (Pstream::master())
+    if (isWriteProc_.good())
     {
+        if (UPstream::master())
+        {
+            tgtMesh_.write();
+        }
+    }
+    else if (writeHandler_ && writeHandler_->good())
+    {
+        auto oldHandler = fileOperation::fileHandler(writeHandler_);
+        const label oldComm = UPstream::commWorld(fileHandler().comm());
+
         tgtMesh_.write();
+
+        writeHandler_  = fileOperation::fileHandler(oldHandler);
+        UPstream::commWorld(oldComm);
     }
 }
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
index a864c30f7d..1c070863c2 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,6 +46,7 @@ SourceFiles
 
 #include "PtrList.H"
 #include "fvMesh.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,8 +78,14 @@ class parFvFieldDistributor
         //- Patch mappers
         PtrList<mapDistributeBase> patchFaceMaps_;
 
-        //- Do I need to write (eg, master only for reconstruct)
-        bool isWriteProc_;
+        //- Storage for dummy handler (when using bool control)
+        refPtr<fileOperation> dummyHandler_;
+
+        //- Write control via a file handler
+        refPtr<fileOperation>& writeHandler_;
+
+        //- Write control as a bool
+        Switch isWriteProc_;
 
 
     // Private Member Functions
@@ -118,6 +125,20 @@ public:
             const bool isWriteProc
         );
 
+        //- Construct from components
+        //
+        //  \param srcMesh  The source mesh (eg, processor)
+        //  \param tgtMesh  The target mesh (eg, reconstructed)
+        //  \param distMap  The distribution map
+        //  \param writeHandler  Handler for output writing (on this proc)
+        parFvFieldDistributor
+        (
+            const fvMesh& srcMesh,
+            fvMesh& tgtMesh,
+            const mapDistributePolyMesh& distMap,
+            refPtr<fileOperation>& writeHandler
+        );
+
 
     // Member Functions
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C
index 418a670561..9b347a17db 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -436,9 +436,23 @@ Foam::label Foam::parFvFieldDistributor::distributeInternalFields
         (
             distributeInternalField<Type>(*(objects[fieldName]))
         );
-        if (isWriteProc_)
+
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 
@@ -486,9 +500,23 @@ Foam::label Foam::parFvFieldDistributor::distributeVolumeFields
         (
             distributeVolumeField<Type>(*(objects[fieldName]))
         );
-        if (isWriteProc_)
+
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 
@@ -532,9 +560,23 @@ Foam::label Foam::parFvFieldDistributor::distributeSurfaceFields
         (
             distributeSurfaceField<Type>(*(objects[fieldName]))
         );
-        if (isWriteProc_)
+
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
index 08e6c6be17..9cd704087f 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +48,8 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
     tgtMeshRef_(nullptr),
     distMapRef_(nullptr),
     patchPointMaps_(),
+    dummyHandler_(fileOperation::null()),
+    writeHandler_(dummyHandler_),
     isWriteProc_(isWriteProc)
 {
     if (savePoints)
@@ -57,6 +59,30 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
 }
 
 
+Foam::parPointFieldDistributor::parPointFieldDistributor
+(
+    const pointMesh& srcMesh,
+    const bool savePoints,
+    refPtr<fileOperation>& writeHandler
+)
+:
+    srcMesh_(srcMesh),
+    nOldPoints_(srcMesh.size()),
+    patchMeshPoints_(),
+    tgtMeshRef_(nullptr),
+    distMapRef_(nullptr),
+    patchPointMaps_(),
+    dummyHandler_(nullptr),
+    writeHandler_(writeHandler),
+    isWriteProc_(Switch::INVALID)
+{
+    if (savePoints)
+    {
+        saveMeshPoints();
+    }
+}
+
+
 Foam::parPointFieldDistributor::parPointFieldDistributor
 (
     const pointMesh& srcMesh,
@@ -72,6 +98,8 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
     tgtMeshRef_(tgtMesh),
     distMapRef_(distMap),
     patchPointMaps_(),
+    dummyHandler_(fileOperation::null()),
+    writeHandler_(dummyHandler_),
     isWriteProc_(isWriteProc)
 {
     if (savePoints)
@@ -81,6 +109,32 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
 }
 
 
+Foam::parPointFieldDistributor::parPointFieldDistributor
+(
+    const pointMesh& srcMesh,
+    const pointMesh& tgtMesh,
+    const mapDistributePolyMesh& distMap,
+    const bool savePoints,
+    refPtr<fileOperation>& writeHandler
+)
+:
+    srcMesh_(srcMesh),
+    nOldPoints_(srcMesh.size()),
+    patchMeshPoints_(),
+    tgtMeshRef_(tgtMesh),
+    distMapRef_(distMap),
+    patchPointMaps_(),
+    dummyHandler_(nullptr),
+    writeHandler_(writeHandler),
+    isWriteProc_(Switch::INVALID)
+{
+    if (savePoints)
+    {
+        saveMeshPoints();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::parPointFieldDistributor::hasMeshPoints() const
diff --git a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
index 855514bb96..357a0ef5a4 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
+++ b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,6 +57,7 @@ SourceFiles
 #include "PtrList.H"
 #include "pointMesh.H"
 #include "pointFieldsFwd.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -94,8 +95,14 @@ class parPointFieldDistributor
         //- Point patch mappers
         PtrList<mapDistributeBase> patchPointMaps_;
 
-        //- Do I need to write (eg, master only for reconstruct)
-        bool isWriteProc_;
+        //- Storage for dummy handler (when using bool control)
+        refPtr<fileOperation> dummyHandler_;
+
+        //- Write control via a file handler
+        refPtr<fileOperation>& writeHandler_;
+
+        //- Write control as a bool
+        Switch isWriteProc_;
 
 
 public:
@@ -123,8 +130,20 @@ public:
         explicit parPointFieldDistributor
         (
             const pointMesh& srcMesh,
-            const bool savePoints = false,
-            const bool isWriteProc = false
+            const bool savePoints,  // normally false
+            const bool isWriteProc
+        );
+
+        //- Basic construction
+        //
+        //  \param srcMesh  The source pointMesh
+        //  \param savePoints  Call saveMeshPoints() immediately
+        //  \param writeHandler  Valid for output writing (on this proc)
+        explicit parPointFieldDistributor
+        (
+            const pointMesh& srcMesh,
+            const bool savePoints,  // normally false
+            refPtr<fileOperation>& writeHandler
         );
 
         //- Full construction of source/target
@@ -139,8 +158,24 @@ public:
             const pointMesh& srcMesh,
             const pointMesh& tgtMesh,
             const mapDistributePolyMesh& distMap,
-            const bool savePoints = false,
-            const bool isWriteProc = false
+            const bool savePoints,  // normally false
+            const bool isWriteProc
+        );
+
+        //- Full construction of source/target
+        //
+        //  \param srcMesh  The source pointMesh
+        //  \param tgtMesh  The target pointMesh
+        //  \param distMap  The distribution map
+        //  \param savePoints  Call saveMeshPoints() immediately
+        //  \param writeHandler  Valid for output writing (on this proc)
+        explicit parPointFieldDistributor
+        (
+            const pointMesh& srcMesh,
+            const pointMesh& tgtMesh,
+            const mapDistributePolyMesh& distMap,
+            const bool savePoints,  // normally false
+            refPtr<fileOperation>& writeHandler
         );
 
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributorTemplates.C b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributorTemplates.C
index d7c73ea218..e048bed283 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributorTemplates.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributorTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -207,9 +207,24 @@ Foam::label Foam::parPointFieldDistributor::distributePointFields
         ++nFields;
 
         tmp<fieldType> tfld(distributePointField<Type>(io));
-        if (isWriteProc_)
+
+
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index b1ee6a5d71..d5bab2a321 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -2622,7 +2622,8 @@ int main(int argc, char *argv[])
                 (
                     areaMeshPtr(),      // source
                     areaProcMeshPtr(),  // target
-                    faDistMap
+                    faDistMap,
+                    true                // isWriteProc (unused)
                 );
 
                 areaFields.redistributeAndWrite(distributor, true);
diff --git a/src/finiteArea/distributed/faMeshDistributor.C b/src/finiteArea/distributed/faMeshDistributor.C
index aac018d208..9ee084fd94 100644
--- a/src/finiteArea/distributed/faMeshDistributor.C
+++ b/src/finiteArea/distributed/faMeshDistributor.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -96,27 +96,12 @@ void Foam::faMeshDistributor::createInternalEdgeMap() const
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::faMeshDistributor::faMeshDistributor
-(
-    const faMesh& srcMesh,
-    const faMesh& tgtMesh,
-    const mapDistributePolyMesh& distMap,
-    const bool isWriteProc
-)
-:
-    srcMesh_(srcMesh),
-    tgtMesh_(tgtMesh),
-    distMap_(distMap),
-    internalEdgeMap_(),
-    patchEdgeMaps_(),
-    isWriteProc_(isWriteProc)
+void Foam::faMeshDistributor::checkAddressing() const
 {
     #ifdef FULLDEBUG
     {
-        Pout<< "Create from nFaces:" << srcMesh.faceLabels().size()
-            << " to:" << tgtMesh.faceLabels().size() << endl;
+        Pout<< "Create from nFaces:" << srcMesh_.faceLabels().size()
+            << " to:" << tgtMesh_.faceLabels().size() << endl;
 
         // Check face centres
         {
@@ -155,7 +140,7 @@ Foam::faMeshDistributor::faMeshDistributor
             );
 
             Pout<< "distributed edges: " << oldEdgeCentres.size() << " from "
-                << srcMesh.nEdges() << " to " << tgtMesh.nEdges() << endl;
+                << srcMesh_.nEdges() << " to " << tgtMesh_.nEdges() << endl;
 
             // volume: faces, area: edges
             distMap_.distributeFaceData(oldEdgeCentres);
@@ -202,6 +187,50 @@ Foam::faMeshDistributor::faMeshDistributor
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::faMeshDistributor::faMeshDistributor
+(
+    const faMesh& srcMesh,
+    const faMesh& tgtMesh,
+    const mapDistributePolyMesh& distMap,
+    const bool isWriteProc
+)
+:
+    srcMesh_(srcMesh),
+    tgtMesh_(tgtMesh),
+    distMap_(distMap),
+    internalEdgeMap_(),
+    patchEdgeMaps_(),
+    dummyHandler_(fileOperation::null()),
+    writeHandler_(dummyHandler_),
+    isWriteProc_(isWriteProc)
+{
+    checkAddressing();
+}
+
+
+Foam::faMeshDistributor::faMeshDistributor
+(
+    const faMesh& srcMesh,
+    const faMesh& tgtMesh,
+    const mapDistributePolyMesh& distMap,
+    refPtr<fileOperation>& writeHandler
+)
+:
+    srcMesh_(srcMesh),
+    tgtMesh_(tgtMesh),
+    distMap_(distMap),
+    internalEdgeMap_(),
+    patchEdgeMaps_(),
+    dummyHandler_(nullptr),
+    writeHandler_(writeHandler),
+    isWriteProc_(Switch::INVALID)
+{
+    checkAddressing();
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::label Foam::faMeshDistributor::distributeAllFields
diff --git a/src/finiteArea/distributed/faMeshDistributor.H b/src/finiteArea/distributed/faMeshDistributor.H
index 69d9f80e68..52f2c4d825 100644
--- a/src/finiteArea/distributed/faMeshDistributor.H
+++ b/src/finiteArea/distributed/faMeshDistributor.H
@@ -45,6 +45,7 @@ SourceFiles
 #include "mapDistributePolyMesh.H"
 #include "areaFieldsFwd.H"
 #include "edgeFieldsFwd.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,8 +78,14 @@ class faMeshDistributor
         //- Patch edge mappers
         mutable PtrList<mapDistributeBase> patchEdgeMaps_;
 
-        //- Do I need to write (eg, master only for reconstruct)
-        bool isWriteProc_;
+        //- Storage for dummy handler (when using bool control)
+        refPtr<fileOperation> dummyHandler_;
+
+        //- Write control via a file handler
+        refPtr<fileOperation>& writeHandler_;
+
+        //- Write control as a bool
+        Switch isWriteProc_;
 
 
     // Private Member Functions
@@ -89,6 +96,9 @@ class faMeshDistributor
         //- Construct per-patch edge mapping
         void createPatchMaps() const;
 
+        //- Debug: check addressing
+        void checkAddressing() const;
+
         static mapDistributePolyMesh createReconstructMap
         (
             const faMesh& mesh,
@@ -117,13 +127,22 @@ public:
 
     // Constructors
 
-        //- Construct from components
+        //- Construct from components, using bool to control writing
         faMeshDistributor
         (
             const faMesh& srcMesh,
             const faMesh& tgtMesh,
             const mapDistributePolyMesh& faDistMap,
-            const bool isWriteProc = false
+            const bool isWriteProc
+        );
+
+        //- Construct from components, using file handler to control writing
+        faMeshDistributor
+        (
+            const faMesh& srcMesh,
+            const faMesh& tgtMesh,
+            const mapDistributePolyMesh& faDistMap,
+            refPtr<fileOperation>& writeHandler
         );
 
 
diff --git a/src/finiteArea/distributed/faMeshDistributorTemplates.C b/src/finiteArea/distributed/faMeshDistributorTemplates.C
index 9fb026451c..26d2da28f5 100644
--- a/src/finiteArea/distributed/faMeshDistributorTemplates.C
+++ b/src/finiteArea/distributed/faMeshDistributorTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -327,9 +327,23 @@ Foam::label Foam::faMeshDistributor::distributeAreaFields
         ++nFields;
 
         tmp<fieldType> tfld(distributeAreaField<Type>(io));
-        if (isWriteProc_)
+
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 
@@ -371,9 +385,22 @@ Foam::label Foam::faMeshDistributor::distributeEdgeFields
         ++nFields;
 
         tmp<fieldType> tfld(distributeEdgeField<Type>(io));
-        if (isWriteProc_)
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 
@@ -397,9 +424,22 @@ void Foam::faMeshDistributor::redistributeAndWrite
         tmp<GeometricField<Type, faPatchField, areaMesh>> tfld =
             this->distributeField(fld);
 
-        if (isWriteProc_)
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 }
@@ -416,9 +456,22 @@ void Foam::faMeshDistributor::redistributeAndWrite
         tmp<GeometricField<Type, faePatchField, edgeMesh>> tfld =
             this->distributeField(fld);
 
-        if (isWriteProc_)
+        if (isWriteProc_.good())
         {
+            if (isWriteProc_)
+            {
+                tfld().write();
+            }
+        }
+        else if (writeHandler_ && writeHandler_->good())
+        {
+            auto oldHandler = fileOperation::fileHandler(writeHandler_);
+            const label oldComm = UPstream::commWorld(fileHandler().comm());
+
             tfld().write();
+
+            writeHandler_ = fileOperation::fileHandler(oldHandler);
+            UPstream::commWorld(oldComm);
         }
     }
 }

From 8d2bf3fc2e4a4d40aec7bba6d92d28e85afbc66a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 May 2023 18:43:32 +0200
Subject: [PATCH 270/348] ENH: soft update of autoPtr<fileOperation> to
 refPtr<fileOperation>

Co-authored-by: mattijs <mattijs>
---
 .../redistributePar/redistributePar.C         | 40 +++++++------------
 .../faMesh/faMeshTools/faMeshTools.H          |  5 ++-
 .../faMesh/faMeshTools/faMeshToolsProcAddr.C  | 19 +++------
 .../fvMesh/fvMeshTools/fvMeshTools.H          |  5 ++-
 .../fvMesh/fvMeshTools/fvMeshToolsProcAddr.C  | 15 ++-----
 5 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index d5bab2a321..24c95b6377 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -551,7 +551,7 @@ void correctCoupledBoundaryConditions(fvMesh& mesh)
 // Inplace redistribute mesh and any fields
 autoPtr<mapDistributePolyMesh> redistributeAndWrite
 (
-    autoPtr<fileOperation>&& writeHandler,
+    refPtr<fileOperation>& writeHandler,
     const Time& baseRunTime,
     const fileName& proc0CaseName,
 
@@ -834,18 +834,12 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     }
     else
     {
-        autoPtr<fileOperation> defaultHandler;
-        if (writeHandler)
-        {
-            defaultHandler = fileHandler(std::move(writeHandler));
-        }
+        auto oldHandler = fileOperation::fileHandler(writeHandler);
 
         mesh.write();
 
-        if (defaultHandler)
-        {
-            writeHandler = fileHandler(std::move(defaultHandler));
-        }
+        writeHandler = fileOperation::fileHandler(oldHandler);
+
         topoSet::removeFiles(mesh);
     }
     Info<< "Written redistributed mesh to "
@@ -861,7 +855,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
             mesh,
             distMap(),
             decompose,
-            std::move(writeHandler)
+            writeHandler
         );
     }
     else
@@ -1064,7 +1058,7 @@ int main(int argc, char *argv[])
     //                than it writes to
     // - reconstruct - reads parallel, write on master only and to parent
     //                 directory
-    autoPtr<fileOperation> writeHandler;
+    refPtr<fileOperation> writeHandler;
     if
     (
         fileHandler().type()
@@ -1072,7 +1066,8 @@ int main(int argc, char *argv[])
     )
     {
         // Install 'uncollated' as fileHandler. Save old one in writeHandler.
-        writeHandler = fileHandler(fileOperation::NewUncollated());
+        writeHandler =
+            fileOperation::fileHandler(fileOperation::NewUncollated());
     }
 
     // Switch off parallel synchronisation of cached time directories
@@ -1582,7 +1577,7 @@ int main(int argc, char *argv[])
 
                     redistributeAndWrite
                     (
-                        std::move(writeHandler),
+                        writeHandler,
                         baseRunTime,
                         proc0CaseName,
 
@@ -1713,7 +1708,7 @@ int main(int argc, char *argv[])
                         areaBaseMeshPtr(),  // Reconstruct location
                         faDistMap,
                         false,              // decompose=false
-                        std::move(writeHandler),
+                        writeHandler,
                         areaMeshPtr.get()   // procMesh
                     );
                 }
@@ -2502,7 +2497,7 @@ int main(int argc, char *argv[])
             // - but not lagrangian fields; these are done later
             autoPtr<mapDistributePolyMesh> distMap = redistributeAndWrite
             (
-                std::move(writeHandler),
+                writeHandler,
                 baseRunTime,
                 proc0CaseName,
 
@@ -2575,11 +2570,7 @@ int main(int argc, char *argv[])
                 }
                 else
                 {
-                    autoPtr<fileOperation> defaultHandler;
-                    if (writeHandler)
-                    {
-                        defaultHandler = fileHandler(std::move(writeHandler));
-                    }
+                    auto oldHandler = fileOperation::fileHandler(writeHandler);
 
                     IOmapDistributePolyMeshRef
                     (
@@ -2598,10 +2589,7 @@ int main(int argc, char *argv[])
 
                     areaProcMeshPtr->write();
 
-                    if (defaultHandler)
-                    {
-                        writeHandler = fileHandler(std::move(defaultHandler));
-                    }
+                    writeHandler = fileOperation::fileHandler(oldHandler);
 
                     if (decompose)
                     {
@@ -2610,7 +2598,7 @@ int main(int argc, char *argv[])
                             areaProcMeshPtr(),
                             faDistMap,
                             decompose,
-                            std::move(writeHandler)
+                            writeHandler
                         );
                     }
                 }
diff --git a/src/finiteArea/faMesh/faMeshTools/faMeshTools.H b/src/finiteArea/faMesh/faMeshTools/faMeshTools.H
index 9b3677b4df..0906f5d550 100644
--- a/src/finiteArea/faMesh/faMeshTools/faMeshTools.H
+++ b/src/finiteArea/faMesh/faMeshTools/faMeshTools.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,6 +50,7 @@ namespace Foam
 {
 
 // Forward Declarations
+class fileOperation;
 class mapDistributePolyMesh;
 class polyMesh;
 class IOobject;
@@ -121,7 +122,7 @@ public:
         const faMesh& mesh,
         const mapDistributePolyMesh& faDistMap,
         const bool decompose,
-        autoPtr<fileOperation>&& writeHandler,
+        refPtr<fileOperation>& writeHandler,
         const faMesh* procMesh = nullptr
     );
 
diff --git a/src/finiteArea/faMesh/faMeshTools/faMeshToolsProcAddr.C b/src/finiteArea/faMesh/faMeshTools/faMeshToolsProcAddr.C
index 07fdec186f..a9e074decf 100644
--- a/src/finiteArea/faMesh/faMeshTools/faMeshToolsProcAddr.C
+++ b/src/finiteArea/faMesh/faMeshTools/faMeshToolsProcAddr.C
@@ -309,7 +309,7 @@ void Foam::faMeshTools::writeProcAddressing
     const faMesh& mesh,
     const mapDistributePolyMesh& map,
     const bool decompose,
-    autoPtr<fileOperation>&& writeHandler,
+    refPtr<fileOperation>& writeHandler,
     const faMesh* procMesh
 )
 {
@@ -398,11 +398,7 @@ void Foam::faMeshTools::writeProcAddressing
         );
     }
 
-    autoPtr<fileOperation> defaultHandler;
-    if (writeHandler)
-    {
-        defaultHandler = fileHandler(std::move(writeHandler));
-    }
+    auto oldHandler = fileOperation::fileHandler(writeHandler);
 
 
     // If we want procAddressing, need to manually write it ourselves
@@ -434,11 +430,11 @@ void Foam::faMeshTools::writeProcAddressing
         // Reconstruct: "procAddressing" only meaningful for rank 0
         // and written into base (serial) location (if at all).
 
-        if (Pstream::master())
+        if (UPstream::master())
         {
-            const bool oldParRun = Pstream::parRun(false);
+            const bool oldParRun = UPstream::parRun(false);
             procAddrMap.write();
-            Pstream::parRun(oldParRun);
+            UPstream::parRun(oldParRun);
         }
     }
 
@@ -448,10 +444,7 @@ void Foam::faMeshTools::writeProcAddressing
     const bool pointOk = pointMap.write();
     const bool patchOk = patchMap.write();
 
-    if (defaultHandler)
-    {
-        writeHandler = fileHandler(std::move(defaultHandler));
-    }
+    writeHandler = fileOperation::fileHandler(oldHandler);
 
     if (!edgeOk || !faceOk || !pointOk || !patchOk)
     {
diff --git a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H
index bee45fc4ec..bdf80b80cf 100644
--- a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H
+++ b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +48,7 @@ namespace Foam
 {
 
 // Forward Declarations
+class fileOperation;
 class mapDistributePolyMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -192,7 +193,7 @@ public:
         const fvMesh& procMesh,
         const mapDistributePolyMesh& map,
         const bool decompose,
-        autoPtr<fileOperation>&& writeHandler
+        refPtr<fileOperation>& writeHandler
     );
 };
 
diff --git a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C
index 637ab073a2..1cd8e06dda 100644
--- a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C
+++ b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshToolsProcAddr.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -303,7 +303,7 @@ void Foam::fvMeshTools::writeProcAddressing
     const fvMesh& mesh,
     const mapDistributePolyMesh& map,
     const bool decompose,
-    autoPtr<fileOperation>&& writeHandler
+    refPtr<fileOperation>& writeHandler
 )
 {
     Info<< "Writing ("
@@ -421,21 +421,14 @@ void Foam::fvMeshTools::writeProcAddressing
         );
     }
 
-    autoPtr<fileOperation> defaultHandler;
-    if (writeHandler)
-    {
-        defaultHandler = fileHandler(std::move(writeHandler));
-    }
+    auto oldHandler = fileOperation::fileHandler(writeHandler);
 
     const bool cellOk = cellMap.write();
     const bool faceOk = faceMap.write();
     const bool pointOk = pointMap.write();
     const bool patchOk = patchMap.write();
 
-    if (defaultHandler)
-    {
-        writeHandler = fileHandler(std::move(defaultHandler));
-    }
+    writeHandler = fileOperation::fileHandler(oldHandler);
 
     if (!cellOk || !faceOk || !pointOk || !patchOk)
     {

From 4984153d2df135da31033644f5c32a2f30dab041 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 12 May 2023 18:43:32 +0200
Subject: [PATCH 271/348] ENH: Update faMeshTools and fvMeshTools for read
 handler

- extend the loadOrCreateMesh functionality to work in conjunction
  with file handlers. This allows selective loading of the mesh parts
  without the ugly workaround of writing zero-sized meshes to disk and
  then reading them back.

Co-authored-by: Mark Olesen <>
---
 .../faMesh/faMeshTools/faMeshTools.C          | 259 ++++++++--
 .../faMesh/faMeshTools/faMeshTools.H          |  33 ++
 .../fvMesh/fvMeshTools/fvMeshTools.C          | 467 ++++++++++++------
 .../fvMesh/fvMeshTools/fvMeshTools.H          |  27 +
 4 files changed, 581 insertions(+), 205 deletions(-)

diff --git a/src/finiteArea/faMesh/faMeshTools/faMeshTools.C b/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
index cce1e3c6d7..102dd4046b 100644
--- a/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
+++ b/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
@@ -30,6 +30,8 @@ License
 #include "faBoundaryMeshEntries.H"
 #include "areaFields.H"
 #include "edgeFields.H"
+#include "fileOperation.H"
+#include "BitOps.H"
 #include "polyMesh.H"
 #include "processorFaPatch.H"
 
@@ -66,7 +68,8 @@ void Foam::faMeshTools::forceDemandDriven(faMesh& mesh)
 }
 
 
-Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::newMesh
+Foam::autoPtr<Foam::faMesh>
+Foam::faMeshTools::newMesh
 (
     const IOobject& io,
     const polyMesh& pMesh,
@@ -248,9 +251,11 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::newMesh
 }
 
 
-Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
+Foam::autoPtr<Foam::faMesh>
+Foam::faMeshTools::loadOrCreateMeshImpl
 (
     const IOobject& io,
+    refPtr<fileOperation>* readHandlerPtr,  // Can be nullptr
     const polyMesh& pMesh,
     const bool decompose,
     const bool verbose
@@ -270,9 +275,11 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
     // Read and scatter master patches (without reading master mesh!)
 
     PtrList<entry> patchEntries;
-    if (Pstream::master())
+    if (UPstream::master())
     {
-        const bool oldParRun = Pstream::parRun(false);
+        const bool oldParRun = UPstream::parRun(false);
+        const label oldNumProcs = fileHandler().nProcs();
+        const int oldCache = fileOperation::cacheLevel(0);
 
         patchEntries = faBoundaryMeshEntries
         (
@@ -288,46 +295,75 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
             )
         );
 
-        Pstream::parRun(oldParRun);
+        fileOperation::cacheLevel(oldCache);
+        if (oldParRun)
+        {
+            const_cast<fileOperation&>(fileHandler()).nProcs(oldNumProcs);
+        }
+        UPstream::parRun(oldParRun);
     }
 
     // Broadcast: send patches to all
-    Pstream::broadcast(patchEntries);  // == worldComm;
+    Pstream::broadcast(patchEntries, UPstream::worldComm);
 
-    /// Info<< patchEntries << nl;
-
-    // Dummy meshes
-    // ~~~~~~~~~~~~
 
     // Check who has or needs a mesh.
-    // For 'decompose', only need mesh on master.
-    // Otherwise check for presence of the "faceLabels" file
+    bool haveLocalMesh = false;
 
-    bool haveMesh =
-    (
-        decompose
-      ? Pstream::master()
-      : fileHandler().isFile
+    if (readHandlerPtr)
+    {
+        // Non-null reference when a mesh exists on given processor
+        haveLocalMesh = (*readHandlerPtr).good();
+    }
+    else
+    {
+        // No file handler.
+        // For 'decompose', only need mesh on master.
+        // Otherwise check for presence of the "faceLabels" file
+
+        haveLocalMesh =
         (
-            fileHandler().filePath
+            decompose
+          ? UPstream::master()
+          : fileHandler().isFile
             (
-                io.time().path()/io.instance()/meshSubDir/"faceLabels"
+                fileHandler().filePath
+                (
+                    io.time().path()/io.instance()/meshSubDir/"faceLabels"
+                )
             )
-        )
+        );
+    }
+
+
+    // Globally consistent information about who has a mesh
+    boolList haveMesh
+    (
+        UPstream::allGatherValues<bool>(haveLocalMesh)
     );
 
 
-    if (!haveMesh)
+    autoPtr<faMesh> meshPtr;
+
+    if (!haveLocalMesh)
     {
-        const bool oldParRun = Pstream::parRun(false);
+        // No local mesh - need to synthesize one
+
+        const bool oldParRun = UPstream::parRun(false);
+        const label oldNumProcs = fileHandler().nProcs();
+        const int oldCache = fileOperation::cacheLevel(0);
 
         // Create dummy mesh - on procs that don't already have a mesh
-        faMesh dummyMesh
+        meshPtr.reset
         (
-            pMesh,
-            labelList(),
-            IOobject(io, IOobject::NO_READ, IOobject::AUTO_WRITE)
+            new faMesh
+            (
+                pMesh,
+                labelList(),
+                IOobject(io, IOobject::NO_READ, IOobject::AUTO_WRITE)
+            )
         );
+        faMesh& mesh = *meshPtr;
 
         // Add patches
         faPatchList patches(patchEntries.size());
@@ -361,39 +397,119 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
                         name,
                         patchDict,
                         nPatches++,
-                        dummyMesh.boundary()
+                        mesh.boundary()
                     )
                 );
             }
         }
-
         patches.resize(nPatches);
-        dummyMesh.addFaPatches(patches, false);  // No parallel comms
+        mesh.addFaPatches(patches, false);  // No parallel comms
 
-        // Bad hack, but the underlying polyMesh is NO_WRITE
-        // so it does not create the faMesh subDir for us...
-        Foam::mkDir(dummyMesh.boundary().path());
+        if (!readHandlerPtr)
+        {
+            // The 'old' way of doing things.
+            // Write the dummy mesh to disk for subsequent re-reading.
+            //
+            // This is not particularly elegant.
 
-        //Pout<< "Writing dummy mesh to " << dummyMesh.boundary().path()
-        //    << endl;
-        dummyMesh.write();
+            // Bad hack, but the underlying polyMesh is NO_WRITE
+            // so it does not create the faMesh subDir for us...
+            Foam::mkDir(mesh.boundary().path());
 
-        Pstream::parRun(oldParRun);  // Restore parallel state
+            //Pout<< "Writing dummy mesh to " << mesh.boundary().path() << nl;
+            mesh.write();
+
+            // Discard - it will be re-read later
+            meshPtr.reset(nullptr);
+        }
+
+        fileOperation::cacheLevel(oldCache);
+        if (oldParRun)
+        {
+            const_cast<fileOperation&>(fileHandler()).nProcs(oldNumProcs);
+        }
+        UPstream::parRun(oldParRun);  // Restore parallel state
+    }
+    else if (readHandlerPtr && haveLocalMesh)
+    {
+        const labelList meshProcIds(BitOps::sortedToc(haveMesh));
+
+        UPstream::communicator newCommunicator;
+        const label oldWorldComm = UPstream::commWorld();
+
+        auto& readHandler = *readHandlerPtr;
+        auto oldHandler = fileOperation::fileHandler(readHandler);
+
+        // With IO ranks the communicator of the fileOperation will
+        // only include the ranks for the current IO rank.
+        // Instead allocate a new communicator for everyone with a mesh
+
+        const auto& handlerProcIds = UPstream::procID(fileHandler().comm());
+
+        // Comparing global ranks in the communicator.
+        // Use std::equal for the List<label> vs List<int> comparison
+
+        if
+        (
+            meshProcIds.size() == handlerProcIds.size()
+         && std::equal
+            (
+                meshProcIds.cbegin(),
+                meshProcIds.cend(),
+                handlerProcIds.cbegin()
+            )
+        )
+        {
+            // Can use the handler communicator as is.
+            UPstream::commWorld(fileHandler().comm());
+        }
+        else if
+        (
+            UPstream::nProcs(fileHandler().comm())
+         != UPstream::nProcs(UPstream::worldComm)
+        )
+        {
+            // Need a new communicator for the fileHandler.
+
+            // Warning: MS-MPI currently uses MPI_Comm_create() instead of
+            // MPI_Comm_create_group() so it will block here!
+
+            newCommunicator.reset(UPstream::worldComm, meshProcIds);
+            UPstream::commWorld(newCommunicator.comm());
+        }
+
+        // Load but do not initialise
+        meshPtr = autoPtr<faMesh>::New(pMesh, labelList(), io);
+
+        readHandler = fileOperation::fileHandler(oldHandler);
+        UPstream::commWorld(oldWorldComm);
+
+        // Reset mesh communicator to the real world comm
+        meshPtr().comm() = UPstream::commWorld();
     }
 
-    // Read mesh
-    // ~~~~~~~~~
-    // Now all processors have a (possibly zero size) mesh so read in
-    // parallel
 
-    /// Pout<< "Reading area mesh from " << io.objectRelPath() << endl;
-    auto meshPtr = autoPtr<faMesh>::New(pMesh, false);
-    faMesh& mesh = *meshPtr;
+    if (!meshPtr)
+    {
+        // Using the 'old' way of doing things (writing to disk and re-reading).
 
-    // Sync patches
-    // ~~~~~~~~~~~~
+        // Read mesh from disk
+        //
+        // Now all processors have a (possibly zero size) mesh so can
+        // read in parallel
 
-    if (!Pstream::master() && haveMesh)
+        /// Pout<< "Reading area mesh from " << io.objectRelPath() << endl;
+        // Load but do not initialise
+        meshPtr = autoPtr<faMesh>::New(pMesh, false);
+    }
+
+    faMesh& mesh = meshPtr();
+
+    // Check patches
+    // ~~~~~~~~~~~~~
+
+    #if 0
+    if (!UPstream::master() && haveLocalMesh)
     {
         // Check master names against mine
 
@@ -416,9 +532,8 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
             if (patchi >= patches.size())
             {
                 FatalErrorInFunction
-                    << "Non-processor patches not synchronised."
-                    << endl
-                    << "Processor " << Pstream::myProcNo()
+                    << "Non-processor patches not synchronised." << endl
+                    << "Processor " << UPstream::myProcNo()
                     << " has only " << patches.size()
                     << " patches, master has "
                     << patchi
@@ -432,12 +547,11 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
             )
             {
                 FatalErrorInFunction
-                    << "Non-processor patches not synchronised."
-                    << endl
+                    << "Non-processor patches not synchronised." << endl
                     << "Master patch " << patchi
                     << " name:" << type
                     << " type:" << type << endl
-                    << "Processor " << Pstream::myProcNo()
+                    << "Processor " << UPstream::myProcNo()
                     << " patch " << patchi
                     << " has name:" << patches[patchi].name()
                     << " type:" << patches[patchi].type()
@@ -445,6 +559,7 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
             }
         }
     }
+    #endif
 
 
     // Recreate basic geometry, globalMeshData etc.
@@ -467,4 +582,44 @@ Foam::autoPtr<Foam::faMesh> Foam::faMeshTools::loadOrCreateMesh
 }
 
 
+Foam::autoPtr<Foam::faMesh>
+Foam::faMeshTools::loadOrCreateMesh
+(
+    const IOobject& io,
+    const polyMesh& pMesh,
+    const bool decompose,
+    const bool verbose
+)
+{
+    return faMeshTools::loadOrCreateMeshImpl
+    (
+        io,
+        nullptr,  // fileOperation (ignore)
+        pMesh,
+        decompose,
+        verbose
+    );
+}
+
+
+Foam::autoPtr<Foam::faMesh>
+Foam::faMeshTools::loadOrCreateMesh
+(
+    const IOobject& io,
+    const polyMesh& pMesh,
+    refPtr<fileOperation>& readHandler,
+    const bool verbose
+)
+{
+    return faMeshTools::loadOrCreateMeshImpl
+    (
+        io,
+       &readHandler,
+        pMesh,
+        false,  // decompose (ignored)
+        verbose
+    );
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteArea/faMesh/faMeshTools/faMeshTools.H b/src/finiteArea/faMesh/faMeshTools/faMeshTools.H
index 0906f5d550..ee63b1b305 100644
--- a/src/finiteArea/faMesh/faMeshTools/faMeshTools.H
+++ b/src/finiteArea/faMesh/faMeshTools/faMeshTools.H
@@ -61,6 +61,26 @@ class IOobject;
 
 class faMeshTools
 {
+    // Private Member Functions
+
+    // Read mesh if available. Otherwise create empty mesh with same non-proc
+    // patches as proc0 mesh.
+    //  Has two modes of operation.
+    //  If the readHandler is non-nullptr, use it to decide on availability.
+    //  Requires:
+    //  - all processors to have all patches (and in same order).
+    //  - io.instance() set to facesInstance
+    static autoPtr<faMesh> loadOrCreateMeshImpl
+    (
+        const IOobject& io,
+        refPtr<fileOperation>* readHandlerPtr,  // Can be nullptr
+        const polyMesh& pMesh,
+        const bool decompose,  // Only used if readHandlerPtr == nullptr
+        const bool verbose = false
+    );
+
+
+
 public:
 
     //- Unregister the faMesh from its associated polyMesh
@@ -97,6 +117,19 @@ public:
         const bool verbose = false
     );
 
+    // Read mesh if available. Otherwise create empty mesh with same non-proc
+    // patches as proc0 mesh. Requires:
+    //  - all processors to have all patches (and in same order).
+    //  - io.instance() set to facesInstance
+    static autoPtr<faMesh> loadOrCreateMesh
+    (
+        const IOobject& io,
+        const polyMesh& pMesh,
+        //! Non-null reference if a mesh exists on given processor
+        refPtr<fileOperation>& readHandler,
+        const bool verbose = false
+    );
+
 
     //- Read decompose/reconstruct addressing
     static mapDistributePolyMesh readProcAddressing
diff --git a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C
index a537c114bb..14f154017d 100644
--- a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C
+++ b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +30,8 @@ License
 #include "pointSet.H"
 #include "faceSet.H"
 #include "cellSet.H"
+#include "fileOperation.H"
+#include "BitOps.H"
 #include "IOobjectList.H"
 #include "basicFvGeometryScheme.H"
 #include "processorPolyPatch.H"
@@ -471,7 +473,7 @@ Foam::fvMeshTools::newMesh
     // Read and scatter master patches (without reading master mesh!)
 
     PtrList<entry> patchEntries;
-    if (Pstream::master())
+    if (UPstream::master())
     {
         const bool oldParRun = Pstream::parRun(false);
 
@@ -502,7 +504,7 @@ Foam::fvMeshTools::newMesh
             )
         );
 
-        Pstream::parRun(oldParRun);
+        UPstream::parRun(oldParRun);
     }
 
     // Broadcast information to all
@@ -730,14 +732,14 @@ Foam::fvMeshTools::newMesh
 
 
 Foam::autoPtr<Foam::fvMesh>
-Foam::fvMeshTools::loadOrCreateMesh
+Foam::fvMeshTools::loadOrCreateMeshImpl
 (
     const IOobject& io,
+    refPtr<fileOperation>* readHandlerPtr,  // Can be nullptr
     const bool decompose,
     const bool verbose
 )
 {
-
     // Region name
     // ~~~~~~~~~~~
 
@@ -752,9 +754,11 @@ Foam::fvMeshTools::loadOrCreateMesh
     // Read and scatter master patches (without reading master mesh!)
 
     PtrList<entry> patchEntries;
-    if (Pstream::master())
+    if (UPstream::master())
     {
-        const bool oldParRun = Pstream::parRun(false);
+        const bool oldParRun = UPstream::parRun(false);
+        const label oldNumProcs = fileHandler().nProcs();
+        const int oldCache = fileOperation::cacheLevel(0);
 
         patchEntries = polyBoundaryMeshEntries
         (
@@ -770,45 +774,74 @@ Foam::fvMeshTools::loadOrCreateMesh
             )
         );
 
-        Pstream::parRun(oldParRun);
+        fileOperation::cacheLevel(oldCache);
+        if (oldParRun)
+        {
+            const_cast<fileOperation&>(fileHandler()).nProcs(oldNumProcs);
+        }
+        UPstream::parRun(oldParRun);
     }
 
     // Broadcast: send patches to all
-    Pstream::broadcast(patchEntries);  // == worldComm;
+    Pstream::broadcast(patchEntries, UPstream::worldComm);
 
 
-    // Dummy meshes
-    // ~~~~~~~~~~~~
-
     // Check who has or needs a mesh.
-    // For 'decompose', only need mesh on master.
-    // Otherwise check for presence of the "faces" file
+    bool haveLocalMesh = false;
 
-    bool haveMesh =
-    (
-        decompose
-      ? Pstream::master()
-      : fileHandler().isFile
+    if (readHandlerPtr)
+    {
+        // Non-null reference when a mesh exists on given processor
+        haveLocalMesh = (*readHandlerPtr).good();
+    }
+    else
+    {
+        // No file handler.
+        // Check for presence of the "faces" file,
+        // but for 'decompose', only need mesh on master.
+
+        haveLocalMesh =
         (
-            fileHandler().filePath
+            decompose
+          ? UPstream::master()
+          : fileHandler().isFile
             (
-                io.time().path()/io.instance()/meshSubDir/"faces"
+                fileHandler().filePath
+                (
+                    io.time().path()/io.instance()/meshSubDir/"faces"
+                )
             )
-        )
+        );
+    }
+
+    // Globally consistent information about who has a mesh
+    boolList haveMesh
+    (
+        UPstream::allGatherValues<bool>(haveLocalMesh)
     );
 
 
-    if (!haveMesh)
+    autoPtr<fvMesh> meshPtr;
+
+    if (!haveLocalMesh)
     {
-        const bool oldParRun = Pstream::parRun(false);
+        // No local mesh - need to synthesize one
+
+        const bool oldParRun = UPstream::parRun(false);
+        const label oldNumProcs = fileHandler().nProcs();
+        const int oldCache = fileOperation::cacheLevel(0);
 
         // Create dummy mesh - on procs that don't already have a mesh
-        fvMesh dummyMesh
+        meshPtr.reset
         (
-            IOobject(io, IOobject::NO_READ, IOobject::AUTO_WRITE),
-            Foam::zero{},
-            false
+            new fvMesh
+            (
+                IOobject(io, IOobject::NO_READ, IOobject::AUTO_WRITE),
+                Foam::zero{},
+                false
+            )
         );
+        fvMesh& mesh = *meshPtr;
 
         // Add patches
         polyPatchList patches(patchEntries.size());
@@ -844,65 +877,142 @@ Foam::fvMeshTools::loadOrCreateMesh
                         name,
                         patchDict,
                         nPatches++,
-                        dummyMesh.boundaryMesh()
+                        mesh.boundaryMesh()
                     )
                 );
             }
         }
         patches.resize(nPatches);
-        dummyMesh.addFvPatches(patches, false);  // No parallel comms
+        mesh.addFvPatches(patches, false);  // No parallel comms
 
+        if (!readHandlerPtr)
+        {
+            // The 'old' way of doing things.
+            // Write the dummy mesh to disk for subsequent re-reading.
+            //
+            // This is not particularly elegant.
+            //
+            // Note: add some dummy zones so upon reading it does not read them
+            // from the undecomposed case. Should be done as extra argument to
+            // regIOobject::readStream?
 
-        // Add some dummy zones so upon reading it does not read them
-        // from the undecomposed case. Should be done as extra argument to
-        // regIOobject::readStream?
+            List<pointZone*> pz
+            (
+                1,
+                new pointZone("dummyZone", 0, mesh.pointZones())
+            );
+            List<faceZone*> fz
+            (
+                1,
+                new faceZone("dummyZone", 0, mesh.faceZones())
+            );
+            List<cellZone*> cz
+            (
+                1,
+                new cellZone("dummyZone", 0, mesh.cellZones())
+            );
+            mesh.addZones(pz, fz, cz);
+            mesh.pointZones().clear();
+            mesh.faceZones().clear();
+            mesh.cellZones().clear();
+            //Pout<< "Writing dummy mesh: " << mesh.polyMesh::objectPath()
+            //    << endl;
+            mesh.write();
 
-        List<pointZone*> pz
+            // Discard - it will be re-read later
+            meshPtr.reset(nullptr);
+        }
+
+        fileOperation::cacheLevel(oldCache);
+        if (oldParRun)
+        {
+            const_cast<fileOperation&>(fileHandler()).nProcs(oldNumProcs);
+        }
+        UPstream::parRun(oldParRun);  // Restore parallel state
+    }
+    else if (readHandlerPtr && haveLocalMesh)
+    {
+        const labelList meshProcIds(BitOps::sortedToc(haveMesh));
+
+        UPstream::communicator newCommunicator;
+        const label oldWorldComm = UPstream::commWorld();
+
+        auto& readHandler = *readHandlerPtr;
+        auto oldHandler = fileOperation::fileHandler(readHandler);
+
+        // With IO ranks the communicator of the fileOperation will
+        // only include the ranks for the current IO rank.
+        // Instead allocate a new communicator for everyone with a mesh
+
+        const auto& handlerProcIds = UPstream::procID(fileHandler().comm());
+
+        // Comparing global ranks in the communicator.
+        // Use std::equal for the List<label> vs List<int> comparison
+
+        if
         (
-            1,
-            new pointZone("dummyPointZone", 0, dummyMesh.pointZones())
-        );
-        List<faceZone*> fz
+            meshProcIds.size() == handlerProcIds.size()
+         && std::equal
+            (
+                meshProcIds.cbegin(),
+                meshProcIds.cend(),
+                handlerProcIds.cbegin()
+            )
+        )
+        {
+            // Can use the handler communicator as is.
+            UPstream::commWorld(fileHandler().comm());
+        }
+        else if
         (
-            1,
-            new faceZone("dummyFaceZone", 0, dummyMesh.faceZones())
-        );
-        List<cellZone*> cz
-        (
-            1,
-            new cellZone("dummyCellZone", 0, dummyMesh.cellZones())
-        );
-        dummyMesh.addZones(pz, fz, cz);
-        dummyMesh.pointZones().clear();
-        dummyMesh.faceZones().clear();
-        dummyMesh.cellZones().clear();
-        //Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath()
-        //    << endl;
-        dummyMesh.write();
+            UPstream::nProcs(fileHandler().comm())
+         != UPstream::nProcs(UPstream::worldComm)
+        )
+        {
+            // Need a new communicator for the fileHandler.
 
-        Pstream::parRun(oldParRun);  // Restore parallel state
+            // Warning: MS-MPI currently uses MPI_Comm_create() instead of
+            // MPI_Comm_create_group() so it will block here!
+
+            newCommunicator.reset(UPstream::worldComm, meshProcIds);
+            UPstream::commWorld(newCommunicator.comm());
+        }
+
+        // Load but do not initialise
+        meshPtr = autoPtr<fvMesh>::New(io, false);
+
+        readHandler = fileOperation::fileHandler(oldHandler);
+        UPstream::commWorld(oldWorldComm);
+
+        // Reset mesh communicator to the real world comm
+        meshPtr().polyMesh::comm() = UPstream::commWorld();
     }
 
 
-    // Read mesh
-    // ~~~~~~~~~
-    // Now all processors have a (possibly zero size) mesh so read in
-    // parallel
-
-    //Pout<< "Reading mesh from " << io.objectRelPath() << endl;
-    auto meshPtr = autoPtr<fvMesh>::New(io);
-    fvMesh& mesh = *meshPtr;
-
-    // Make sure to use a non-parallel geometry calculation method
-    fvMeshTools::setBasicGeometry(mesh);
-
-
-    // Sync patches
-    // ~~~~~~~~~~~~
-
-    if (!Pstream::master() && haveMesh)
+    if (!meshPtr)
     {
-        // Check master names against mine
+        // Using the 'old' way of doing things (writing to disk and re-reading).
+
+        // Read mesh from disk
+        //
+        // Now all processors have a (possibly zero size) mesh so can
+        // read in parallel
+
+        //Pout<< "Reading mesh from " << io.objectRelPath() << endl;
+        // Load but do not initialise
+        meshPtr = autoPtr<fvMesh>::New(io, false);
+    }
+
+    fvMesh& mesh = meshPtr();
+
+
+    // Check patches
+    // ~~~~~~~~~~~~~
+
+    #if 0
+    if (!UPstream::master() && haveLocalMesh)
+    {
+        // Check master patch entries names against local ones
 
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
@@ -924,12 +1034,11 @@ Foam::fvMeshTools::loadOrCreateMesh
             if (patchi >= patches.size())
             {
                 FatalErrorInFunction
-                    << "Non-processor patches not synchronised."
-                    << endl
-                    << "Processor " << Pstream::myProcNo()
+                    << "Non-processor patches not synchronised." << endl
+                    << "Processor " << UPstream::myProcNo()
                     << " has only " << patches.size()
                     << " patches, master has "
-                    << patchi
+                    << patchi << endl
                     << exit(FatalError);
             }
 
@@ -940,12 +1049,11 @@ Foam::fvMeshTools::loadOrCreateMesh
             )
             {
                 FatalErrorInFunction
-                    << "Non-processor patches not synchronised."
-                    << endl
+                    << "Non-processor patches not synchronised." << endl
                     << "Master patch " << patchi
                     << " name:" << type
                     << " type:" << type << endl
-                    << "Processor " << Pstream::myProcNo()
+                    << "Processor " << UPstream::myProcNo()
                     << " patch " << patchi
                     << " has name:" << patches[patchi].name()
                     << " type:" << patches[patchi].type()
@@ -953,92 +1061,109 @@ Foam::fvMeshTools::loadOrCreateMesh
             }
         }
     }
+    #endif
 
 
-    // Determine zones
-    // ~~~~~~~~~~~~~~~
+    // Synchronize zones
+    // ~~~~~~~~~~~~~~~~~
 
-    wordList pointZoneNames(mesh.pointZones().names());
-    wordList faceZoneNames(mesh.faceZones().names());
-    wordList cellZoneNames(mesh.cellZones().names());
-    Pstream::broadcasts
-    (
-        UPstream::worldComm,
-        pointZoneNames,
-        faceZoneNames,
-        cellZoneNames
-    );
-
-    if (!haveMesh)
     {
-        // Add the zones. Make sure to remove the old dummy ones first
-        mesh.pointZones().clear();
-        mesh.faceZones().clear();
-        mesh.cellZones().clear();
-
-        List<pointZone*> pz(pointZoneNames.size());
-        forAll(pointZoneNames, i)
-        {
-            pz[i] = new pointZone(pointZoneNames[i], i, mesh.pointZones());
-        }
-        List<faceZone*> fz(faceZoneNames.size());
-        forAll(faceZoneNames, i)
-        {
-            fz[i] = new faceZone(faceZoneNames[i], i, mesh.faceZones());
-        }
-        List<cellZone*> cz(cellZoneNames.size());
-        forAll(cellZoneNames, i)
-        {
-            cz[i] = new cellZone(cellZoneNames[i], i, mesh.cellZones());
-        }
-        mesh.addZones(pz, fz, cz);
-    }
+        wordList pointZoneNames(mesh.pointZones().names());
+        wordList faceZoneNames(mesh.faceZones().names());
+        wordList cellZoneNames(mesh.cellZones().names());
+        Pstream::broadcasts
+        (
+            UPstream::worldComm,
+            pointZoneNames,
+            faceZoneNames,
+            cellZoneNames
+        );
 
 
-    // Determine sets
-    // ~~~~~~~~~~~~~~
-
-    wordList pointSetNames;
-    wordList faceSetNames;
-    wordList cellSetNames;
-    if (Pstream::master())
-    {
-        // Read sets
-        const bool oldParRun = Pstream::parRun(false);
-        IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
-        Pstream::parRun(oldParRun);
-
-        pointSetNames = objects.sortedNames<pointSet>();
-        faceSetNames = objects.sortedNames<faceSet>();
-        cellSetNames = objects.sortedNames<cellSet>();
-    }
-    Pstream::broadcasts
-    (
-        UPstream::worldComm,
-        pointSetNames,
-        faceSetNames,
-        cellSetNames
-    );
-
-    if (!haveMesh)
-    {
-        for (const word& setName : pointSetNames)
+        if (!haveLocalMesh)
         {
-            pointSet(mesh, setName, 0).write();
-        }
-        for (const word& setName : faceSetNames)
-        {
-            faceSet(mesh, setName, 0).write();
-        }
-        for (const word& setName : cellSetNames)
-        {
-            cellSet(mesh, setName, 0).write();
+            // Add the zones. Make sure to remove the old dummy ones first
+            mesh.pointZones().clear();
+            mesh.faceZones().clear();
+            mesh.cellZones().clear();
+
+            PtrList<pointZone> pz(pointZoneNames.size());
+            forAll(pointZoneNames, i)
+            {
+                pz.emplace_set(i, pointZoneNames[i], i, mesh.pointZones());
+            }
+
+            PtrList<faceZone> fz(faceZoneNames.size());
+            forAll(faceZoneNames, i)
+            {
+                fz.emplace_set(i, faceZoneNames[i], i, mesh.faceZones());
+            }
+
+            PtrList<cellZone> cz(cellZoneNames.size());
+            forAll(cellZoneNames, i)
+            {
+                cz.emplace_set(i, cellZoneNames[i], i, mesh.cellZones());
+            }
+            mesh.addZones(std::move(pz), std::move(fz), std::move(cz));
         }
     }
 
 
-    // Force recreation of globalMeshData.
+    // Synchronize sets (on disk)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (!readHandlerPtr)
+    {
+        wordList pointSetNames;
+        wordList faceSetNames;
+        wordList cellSetNames;
+        if (UPstream::master())
+        {
+            // Read sets
+            const bool oldParRun = UPstream::parRun(false);
+
+            IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
+            UPstream::parRun(oldParRun);
+
+            pointSetNames = objects.sortedNames<pointSet>();
+            faceSetNames = objects.sortedNames<faceSet>();
+            cellSetNames = objects.sortedNames<cellSet>();
+        }
+        Pstream::broadcasts
+        (
+            UPstream::worldComm,
+            pointSetNames,
+            faceSetNames,
+            cellSetNames
+        );
+
+        if (!haveLocalMesh)
+        {
+            for (const word& setName : pointSetNames)
+            {
+                pointSet(mesh, setName, 0).write();
+            }
+            for (const word& setName : faceSetNames)
+            {
+                faceSet(mesh, setName, 0).write();
+            }
+            for (const word& setName : cellSetNames)
+            {
+                cellSet(mesh, setName, 0).write();
+            }
+        }
+    }
+
+
+    // Meshes have been done without init so now can do full initialisation
+
+    fvMeshTools::setBasicGeometry(mesh);
+    mesh.init(true);
+
+    // Force early recreation of globalMeshData etc
     mesh.globalData();
+    mesh.tetBasePtIs();
+    mesh.geometricD();
 
 
     // Do some checks.
@@ -1060,6 +1185,42 @@ Foam::fvMeshTools::loadOrCreateMesh
 }
 
 
+Foam::autoPtr<Foam::fvMesh>
+Foam::fvMeshTools::loadOrCreateMesh
+(
+    const IOobject& io,
+    const bool decompose,
+    const bool verbose
+)
+{
+    return fvMeshTools::loadOrCreateMeshImpl
+    (
+        io,
+        nullptr,  // fileOperation (ignore)
+        decompose,
+        verbose
+    );
+}
+
+
+Foam::autoPtr<Foam::fvMesh>
+Foam::fvMeshTools::loadOrCreateMesh
+(
+    const IOobject& io,
+    refPtr<fileOperation>& readHandler,
+    const bool verbose
+)
+{
+    return fvMeshTools::loadOrCreateMeshImpl
+    (
+        io,
+       &readHandler,
+        false,  // decompose (ignored)
+        verbose
+    );
+}
+
+
 void Foam::fvMeshTools::createDummyFvMeshFiles
 (
     const objectRegistry& mesh,
diff --git a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H
index bdf80b80cf..2c899adb9b 100644
--- a/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H
+++ b/src/finiteVolume/fvMesh/fvMeshTools/fvMeshTools.H
@@ -96,6 +96,21 @@ class fvMeshTools
     // Remove trailing patches
     static void trimPatches(fvMesh&, const label nPatches);
 
+    //- Read mesh if available, or create empty mesh with non-proc as per
+    //- proc0 mesh.
+    //  Has two modes of operation.
+    //  If the readHandler is non-nullptr, use it to decide on availability.
+    //  Requires:
+    //  - all processors to have all patches (and in same order).
+    //  - io.instance() set to facesInstance
+    static autoPtr<fvMesh> loadOrCreateMeshImpl
+    (
+        const IOobject& io,
+        refPtr<fileOperation>* readHandlerPtr,  // Can be nullptr
+        const bool decompose,  // Only used if readHandlerPtr == nullptr
+        const bool verbose = false
+    );
+
 
 public:
 
@@ -170,6 +185,18 @@ public:
         const bool verbose = false
     );
 
+    //- Read mesh if available, or create empty mesh with non-proc as per
+    //- proc0 mesh.
+    //  The fileHandler is specified on processors that have a processor mesh.
+    //  Generates empty mesh on other processors.
+    static autoPtr<fvMesh> loadOrCreateMesh
+    (
+        const IOobject& io,
+        //! Non-null reference if a mesh exists on given processor
+        refPtr<fileOperation>& readHandler,
+        const bool verbose = true
+    );
+
     //- Create additional fvSchemes/fvSolution files
     static void createDummyFvMeshFiles
     (

From 30dc4656150b407eed167f5900780913c29bca70 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 24 Nov 2022 09:00:00 +0000
Subject: [PATCH 272/348] ENH: update timeActivatedFileUpdate with distributed
 fileHandler

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

diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 2067c283d6..f512435430 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -75,7 +75,14 @@ void Foam::functionObjects::timeActivatedFileUpdate::updateFile()
             << "to  : " << time_.relativePath(fileToUpdate_, true) << nl
             << endl;
 
-        if (Pstream::master() || time_.distributed())
+        if
+        (
+            UPstream::master()
+         || (
+                fileHandler().distributed()
+             && UPstream::master(fileHandler().comm())
+            )
+        )
         {
             // Copy on master only for non-distributed
             fileName tmpFile(fileToUpdate_ + Foam::name(pid()));
@@ -141,7 +148,9 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read
         Info<< "    " << tuple.first() << tab
             << time_.relativePath(srcFile, true) << nl;
 
-        if (Pstream::master() || time_.distributed())
+        // No need for distributed test since dictionaries are read on the
+        // master only or otherwise they need to be copied everywhere
+        if (UPstream::master())  // || time_.distributed())
         {
             if (!Foam::isFile(srcFile))
             {

From fcbfa40b0b711c8c5744ec146e3f99a9695926f0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 30 May 2023 10:41:15 +0100
Subject: [PATCH 273/348] ENH: checkMesh: small message change

---
 .../utilities/mesh/manipulation/checkMesh/checkTopology.C       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 4bd5054911..a4dcfe90b6 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -896,7 +896,7 @@ Foam::label Foam::checkTopology
             bool hadBadEdges = checkPatch
             (
                 allGeometry,
-                "## ALL BOUNDARIES ##",
+                "\".*\"",
                  mesh,
                 pp,
                 // faceLabels,

From adc38d55ac5e3eba776853d19e1f471277ac831e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 24 May 2023 13:30:08 +0100
Subject: [PATCH 274/348] ENH: coupled: enforce consistency. See #2783

---
 .../turbulence/PDRkEpsilon/PDRkEpsilon.C      |  7 ++-
 .../liquidFilmFoam/liquidFilmFoam.C           |  8 ++-
 .../sphereSurfactantFoam/createFaFields.H     |  1 +
 .../preProcessing/setFields/setFields.C       | 13 ++++-
 .../fieldsDistributorTemplates.C              |  2 +-
 .../RAS/LamBremhorstKE/LamBremhorstKE.C       |  4 +-
 .../RAS/LienCubicKE/LienCubicKE.C             |  2 +
 .../RAS/LienLeschziner/LienLeschziner.C       |  4 +-
 .../RAS/ShihQuadraticKE/ShihQuadraticKE.C     |  2 +
 .../RAS/kkLOmega/kkLOmega.C                   |  2 +
 .../RAS/mixtureKEpsilon/mixtureKEpsilon.C     |  8 +++
 .../Base/kOmegaSST/kOmegaSSTBase.C            | 25 ++++++++++
 .../turbulenceModels/RAS/EBRSM/EBRSM.C        |  2 +
 .../turbulenceModels/RAS/LRR/LRR.C            |  2 +
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |  2 +
 .../turbulenceModels/RAS/SSG/SSG.C            |  2 +
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.C  |  2 +
 .../RAS/kEpsilonPhitF/kEpsilonPhitF.C         |  4 +-
 .../turbulenceModels/RAS/kOmega/kOmega.C      |  2 +
 .../RAS/realizableKE/realizableKE.C           |  2 +
 .../ObukhovLength/ObukhovLength.C             | 50 ++++++++++++++++---
 .../kEpsilonLopesdaCosta.C                    |  2 +
 src/combustionModels/EDC/EDC.C                |  8 ++-
 src/combustionModels/PaSR/PaSR.C              |  5 +-
 .../cfdTools/general/bound/bound.C            |  4 ++
 .../CoEulerDdtScheme/CoEulerDdtScheme.C       | 42 ++++++++++++++--
 .../CrankNicolsonDdtScheme.C                  | 43 ++++++++++++++--
 .../EulerDdtScheme/EulerDdtScheme.C           | 37 ++++++++++++--
 .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C  | 42 ++++++++++++++--
 .../backwardDdtScheme/backwardDdtScheme.C     | 38 ++++++++++++--
 .../steadyStateDdtScheme.C                    | 28 +++++++----
 .../directionalMeshWavePatchDistMethod.C      |  6 ++-
 .../meshWave/meshWavePatchDistMethod.C        |  9 +++-
 .../meshWaveAddressingPatchDistMethod.C       | 22 ++++++++
 .../wallDistAddressing/wallDistAddressing.C   |  3 ++
 .../StandardChemistryModel.C                  |  3 +-
 36 files changed, 387 insertions(+), 51 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index e8c36a390c..c7152d8030 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -132,6 +132,11 @@ void PDRkEpsilon::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push new cell values to
+    // coupled neighbours. Note that we want to avoid the re-updateCoeffs
+    // of the wallFunctions so make sure to bypass the evaluate on
+    // those patches and only do the coupled ones.
+    epsilon_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     // Add the blockage generation term so that it is included consistently
     // in both the k and epsilon equations
diff --git a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
index 4cf01b79a0..02878bf9e4 100644
--- a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
+++ b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
@@ -87,7 +87,13 @@ int main(int argc, char *argv[])
             (
                 fam::ddt(h, Us)
               + fam::div(phi2s, Us)
-              + fam::Sp(0.0125*frictionFactor*mag(Us), Us)
+              + fam::Sp
+                (
+                    0.0125
+                   *frictionFactor.internalField()
+                   *mag(Us.internalField()),
+                    Us
+                )
              ==
                 Gs*h
               - fam::Sp(Sd, Us)
diff --git a/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H b/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
index 8ba4602445..514c6157d4 100644
--- a/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
+++ b/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
@@ -47,6 +47,7 @@ forAll(Us, faceI)
     Us[faceI].z() =
         Uinf.value()*0.25*R[faceI].x()*R[faceI].z()/sqr(mag(R[faceI]));
 }
+Us.boundaryFieldRef().evaluateCoupled<coupledFaPatch>();
 
 Us -= aMesh.faceAreaNormals()*(aMesh.faceAreaNormals() & Us);
 
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 2865c0e1df..d4312085a7 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,6 +44,8 @@ Description
 #include "faceSet.H"
 #include "volFields.H"
 #include "areaFields.H"
+#include "coupledFvPatch.H"
+#include "coupledFaPatch.H"
 
 using namespace Foam;
 
@@ -186,6 +188,9 @@ bool setCellFieldType
             pfld = pfld.patchInternalField();
         }
 
+        // Handle any e.g. halo-swaps
+        field.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
+
         if (!field.write())
         {
             FatalErrorInFunction
@@ -271,6 +276,9 @@ bool setAreaFieldType
             }
         }
 
+        // Handle any e.g. halo-swaps
+        field.boundaryFieldRef().template evaluateCoupled<coupledFaPatch>();
+
         if (!field.write())
         {
             FatalErrorInFunction
@@ -421,6 +429,9 @@ bool setFaceFieldType
             }
         }
 
+        // Handle any e.g. halo-swaps
+        field.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
+
         if (!field.write())
         {
             FatalErrorInFunction
diff --git a/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C b/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C
index 3163526388..e260e16b53 100644
--- a/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C
+++ b/src/OpenFOAM/parallel/fieldsDistributor/fieldsDistributorTemplates.C
@@ -141,7 +141,7 @@ void Foam::fieldsDistributor::readFieldsImpl
         // only need to know about themselves.
         // Can broadcast decompose = yes/no from master
 
-        bitSet localValues(haveMeshOnProc)
+        bitSet localValues(haveMeshOnProc);
         bitSet masterValues(localValues);
         Pstream::broadcast(masterValues);
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
index 6844e216a4..30717fd6a3 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -221,6 +221,8 @@ void LamBremhorstKE::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     const volScalarField Rt(this->Rt());
     const volScalarField fMu(this->fMu(Rt));
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
index cc03139c53..9e25620447 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
@@ -390,6 +390,8 @@ void LienCubicKE::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     const volScalarField f2(this->f2());
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
index 21d0870960..30a5c54dde 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -274,6 +274,8 @@ void LienLeschziner::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     const volScalarField f2(this->f2());
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
index 727ee0ddef..1444ef3bb5 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
@@ -274,6 +274,8 @@ void ShihQuadraticKE::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
index 149940e33c..e95b9b3ca4 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
@@ -679,6 +679,8 @@ void kkLOmega::correct()
 
 
     omega_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    omega_.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
     // Turbulence specific dissipation rate equation
     tmp<fvScalarMatrix> omegaEqn
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
index b2c743253c..35aa10c5b0 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@@ -619,7 +619,11 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
 
         // Update k, epsilon and G at the wall
         kl.boundaryFieldRef().updateCoeffs();
+        // Push any changed cell values to coupled neighbours
+        kl.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
+
         epsilonl.boundaryFieldRef().updateCoeffs();
+        epsilonl.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
         Gc.ref().checkOut();
     }
@@ -639,7 +643,11 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
 
         // Update k, epsilon and G at the wall
         kg.boundaryFieldRef().updateCoeffs();
+        // Push any changed cell values to coupled neighbours
+        kg.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
         epsilong.boundaryFieldRef().updateCoeffs();
+        // Push any changed cell values to coupled neighbours
+        epsilong.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
 
         Gd.ref().checkOut();
     }
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
index 80f5bfa87a..ba6661b871 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
@@ -524,8 +524,33 @@ void kOmegaSSTBase<BasicEddyViscosityModel>::correct()
     volScalarField::Internal GbyNu0(this->GbyNu0(tgradU(), S2));
     volScalarField::Internal G(this->GName(), nut*GbyNu0);
 
+
+    // - boundary condition changes a cell value
+    // - normally this would be triggered through correctBoundaryConditions
+    // - which would do
+    //      - fvPatchField::evaluate() which calls
+    //      - fvPatchField::updateCoeffs()
+    // - however any processor boundary conditions already start sending
+    //   at initEvaluate so would send over the old value.
+    // - avoid this by explicitly calling updateCoeffs early and then
+    //   only doing the boundary conditions that rely on initEvaluate
+    //   (currently only coupled ones)
+
+    //- 1. Explicitly swap values on coupled boundary conditions
     // Update omega and G at the wall
     omega_.boundaryFieldRef().updateCoeffs();
+    // omegaWallFunctions change the cell value! Make sure to push these to
+    // coupled neighbours. Note that we want to avoid the re-updateCoeffs
+    // of the wallFunctions so make sure to bypass the evaluate on
+    // those patches and only do the coupled ones.
+    omega_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
+
+    ////- 2. Make sure the boundary condition calls updateCoeffs from
+    ////     initEvaluate
+    ////     (so before any swap is done - requires all coupled bcs to be
+    ////      after wall bcs. Unfortunately this conflicts with cyclicACMI)
+    //omega_.correctBoundaryConditions();
+
 
     const volScalarField CDkOmega
     (
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C b/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C
index db19a5deff..cafc50905a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/EBRSM/EBRSM.C
@@ -474,6 +474,8 @@ void EBRSM<BasicTurbulenceModel>::correct()
 
         // Update epsilon and G at the wall
         epsilon_.boundaryFieldRef().updateCoeffs();
+        // Push any changed cell values to coupled neighbours
+        epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
         // (M:Eq. C.14)
         tmp<fvScalarMatrix> epsEqn
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
index cb20f989b8..9bd6a8d666 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
@@ -295,6 +295,8 @@ void LRR<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index c70797140b..3f7df45d61 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -281,6 +281,8 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
index 721d7b86b5..6b1fa3291f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
@@ -305,6 +305,8 @@ void SSG<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index 62e3aa813b..ead17ff204 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -253,6 +253,8 @@ void kEpsilon<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C
index c3169d640a..5e27438de2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -412,6 +412,8 @@ void kEpsilonPhitF<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // Turbulent kinetic energy dissipation rate equation (LUU:Eq. 4)
     // k/T ~ epsilon
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
index 0035d5c666..77721813cf 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
@@ -211,6 +211,8 @@ void kOmega<BasicTurbulenceModel>::correct()
 
     // Update omega and G at the wall
     omega_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    omega_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // Turbulence specific dissipation rate equation
     tmp<fvScalarMatrix> omegaEqn
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index 633ec4e00b..6e08625a61 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -276,6 +276,8 @@ void realizableKE<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     // SAF: limiting thermo->nu(). If psiThermo is used rho might be < 0
     // temporarily when p < 0 then nu < 0 which needs limiting
diff --git a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
index 68e8d0eef7..9c81e13814 100644
--- a/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
+++ b/src/atmosphericModels/functionObjects/ObukhovLength/ObukhovLength.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd
+    Copyright (C) 2020,2023 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,6 +33,8 @@ License
 #include "mapPolyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 #include "zeroGradientFvPatchField.H"
+#include "coupledFvPatchField.H"
+#include "processorFvPatchField.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -125,16 +127,52 @@ bool Foam::functionObjects::ObukhovLength::calcOL()
             )
         );
 
+
+    // Special bit of coding here to handle cyclics
+    // - sign(B) can easily be positive in one cell but negative in its
+    //   coupled cell
+    // - so cyclic value might evaluate to 0
+    // - which upsets the division
+    // - note that instead of sign() any other field might have the same
+    //   positive and negative coupled values - it is just a lot less likely
+    // - problem is that overridden patch types do not propagate - use in-place
+    //   operations only
+
+    volScalarField denom
+    (
+        IOobject
+        (
+            "denom",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
+        ),
+        sign(B)
+    );
+
+    // Override interpolated value on interpolated coupled patches
+    for (auto& pfld : denom.boundaryFieldRef())
+    {
+        if
+        (
+            isA<coupledFvPatchField<scalar>>(pfld)
+        && !isA<processorFvPatchField<scalar>>(pfld)
+        )
+        {
+            pfld = pfld.patchInternalField();
+        }
+    }
+
+    denom *= kappa_*max(mag(B), dimensionedScalar(B.dimensions(), VSMALL));
+
     // (O:Eq. 26)
     *result1 = // ObukhovLength
         -min
         (
             dimensionedScalar(dimLength, ROOTVGREAT), // neutral stratification
-            pow3(*result2)/
-            (
-                sign(B)*kappa_
-                *max(mag(B), dimensionedScalar(B.dimensions(), VSMALL))
-            )
+            pow3(*result2)/denom
         );
 
     return isNew;
diff --git a/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
index ffda9c451e..7f6a4f8d67 100644
--- a/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
+++ b/src/atmosphericModels/turbulenceModels/RAS/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
@@ -421,6 +421,8 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::correct()
 
     // Update epsilon and G at the wall
     epsilon_.boundaryFieldRef().updateCoeffs();
+    // Push any changed cell values to coupled neighbours
+    epsilon_.boundaryFieldRef().template evaluateCoupled<coupledFvPatch>();
 
     volScalarField::Internal magU(mag(U));
     volScalarField::Internal magU3(pow3(magU));
diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C
index 5d22a9f137..3e55ba9ce1 100644
--- a/src/combustionModels/EDC/EDC.C
+++ b/src/combustionModels/EDC/EDC.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -143,6 +143,9 @@ void Foam::combustionModels::EDC<ReactionThermo>::correct()
                         );
                 }
             }
+
+            // Evaluate bcs
+            kappa_.correctBoundaryConditions();
         }
         else
         {
@@ -171,6 +174,9 @@ void Foam::combustionModels::EDC<ReactionThermo>::correct()
                         );
                 }
             }
+
+            // Evaluate bcs
+            kappa_.correctBoundaryConditions();
         }
 
         Info<< "Chemistry time solved max/min : "
diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C
index 63a223c88d..63559a0aaf 100644
--- a/src/combustionModels/PaSR/PaSR.C
+++ b/src/combustionModels/PaSR/PaSR.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -99,6 +99,9 @@ void Foam::combustionModels::PaSR<ReactionThermo>::correct()
                 kappa_[i] = 1.0;
             }
         }
+
+        // Evaluate bcs
+        kappa_.correctBoundaryConditions();
     }
 }
 
diff --git a/src/finiteVolume/cfdTools/general/bound/bound.C b/src/finiteVolume/cfdTools/general/bound/bound.C
index 4e96f8c5a7..9c6c269ed5 100644
--- a/src/finiteVolume/cfdTools/general/bound/bound.C
+++ b/src/finiteVolume/cfdTools/general/bound/bound.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,6 +57,9 @@ Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
         );
 
         vsf.boundaryFieldRef() = max(vsf.boundaryField(), lowerBound.value());
+
+        // Give coupled bcs chance to update since cell values changed
+        vsf.boundaryFieldRef().evaluateCoupled<coupledFvPatch>();
     }
 
     return vsf;
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 2b16e0a36c..14bd9c6217 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -178,6 +179,11 @@ CoEulerDdtScheme<Type>::fvcDdt
             rDeltaT.primitiveField()*dt.value()
            *(1.0 - mesh().Vsc0()/mesh().Vsc());
 
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
         return tdtdt;
     }
     else
@@ -214,7 +220,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -232,6 +238,13 @@ CoEulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -266,7 +279,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -284,6 +297,13 @@ CoEulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -318,7 +338,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -339,6 +359,13 @@ CoEulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -374,7 +401,7 @@ CoEulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -404,6 +431,13 @@ CoEulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index a7ec7a31af..3c395b5ae0 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-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2021,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -393,6 +393,11 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             (rDtCoef*dt)*(mesh().V() - mesh().V0())
           - mesh().V0()*offCentre_(ddt0.internalField())
         )/mesh().V();
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
     }
 
     return tdtdt;
@@ -447,7 +452,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -465,6 +470,13 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                 ) - offCentre_(ff(ddt0.boundaryField()))
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -535,7 +547,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -555,6 +567,13 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                 ) - offCentre_(ff(ddt0.boundaryField()))
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -629,7 +648,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -651,6 +670,13 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                 ) - offCentre_(ff(ddt0.boundaryField()))
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -738,7 +764,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
             );
         }
 
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -772,6 +798,13 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
                 ) - offCentre_(ff(ddt0.boundaryField()))
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index b94f628cad..375c6daed8 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -104,7 +105,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -120,6 +121,13 @@ EulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -154,7 +162,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -170,6 +178,13 @@ EulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -204,7 +219,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -223,6 +238,13 @@ EulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -258,7 +280,7 @@ EulerDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -285,6 +307,13 @@ EulerDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 61e3186cdf..9e2fcab684 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -183,6 +184,11 @@ SLTSDdtScheme<Type>::fvcDdt
         tdtdt.ref().primitiveFieldRef() =
             rDeltaT.primitiveField()*dt.value()*(1.0 - mesh().V0()/mesh().V());
 
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
         return tdtdt;
     }
     else
@@ -219,7 +225,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -237,6 +243,13 @@ SLTSDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -271,7 +284,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -289,6 +302,13 @@ SLTSDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -323,7 +343,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -344,6 +364,13 @@ SLTSDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -379,7 +406,7 @@ SLTSDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -409,6 +436,13 @@ SLTSDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index ef0f0aedf3..8d77b3c009 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -152,7 +152,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -178,6 +178,13 @@ backwardDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -224,7 +231,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -250,6 +257,13 @@ backwardDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -296,7 +310,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -325,6 +339,13 @@ backwardDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
@@ -372,7 +393,7 @@ backwardDdtScheme<Type>::fvcDdt
 
     if (mesh().moving())
     {
-        return tmp<GeometricField<Type, fvPatchField, volMesh>>
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
         (
             new GeometricField<Type, fvPatchField, volMesh>
             (
@@ -418,6 +439,13 @@ backwardDdtScheme<Type>::fvcDdt
                 )
             )
         );
+
+        // Different operation on boundary v.s. internal so re-evaluate
+        // coupled boundaries
+        tdtdt.ref().boundaryFieldRef().
+            template evaluateCoupled<coupledFvPatch>();
+
+        return tdtdt;
     }
     else
     {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index a970206248..849852f754 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -374,20 +375,25 @@ tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    return tmp<surfaceScalarField>::New
+    auto tphi
     (
-        IOobject
+        tmp<surfaceScalarField>::New
         (
-            "meshPhi",
-            mesh().time().timeName(),
-            mesh().thisDb(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            IOobject::NO_REGISTER
-        ),
-        mesh(),
-        dimensionedScalar(dimVolume/dimTime, Zero)
+            IOobject
+            (
+                "meshPhi",
+                mesh().time().timeName(),
+                mesh().thisDb(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
+            ),
+            mesh(),
+            dimensionedScalar(dimVolume/dimTime, Zero)
+        )
     );
+    tphi.ref().setOriented();
+    return tphi;
 }
 
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
index 45d36c44ee..7610085b70 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/directionalMeshWave/directionalMeshWavePatchDistMethod.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -150,6 +150,10 @@ bool Foam::patchDistMethods::directionalMeshWave::correct
         }
     }
 
+    // Make sure boundary values are up-to-date
+    y.correctBoundaryConditions();
+    n.correctBoundaryConditions();
+
     // Transfer number of unset values
     this->nUnset_ = wave.nUnset();
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
index c3a13cf633..0a4504b313 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/meshWavePatchDistMethod.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -99,6 +99,9 @@ bool Foam::patchDistMethods::meshWave::correct(volScalarField& y)
         }
     }
 
+    // Make sure boundary values are up-to-date
+    y.correctBoundaryConditions();
+
     // Transfer number of unset values
     nUnset_ = wave.nUnset();
 
@@ -155,6 +158,10 @@ bool Foam::patchDistMethods::meshWave::correct
         }
     }
 
+    // Make sure boundary values are up-to-date
+    y.correctBoundaryConditions();
+    n.correctBoundaryConditions();
+
     // Transfer number of unset values
     nUnset_ = wave.nUnset();
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
index bf9fb619b6..035173a417 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWaveAddressing/meshWaveAddressingPatchDistMethod.C
@@ -99,6 +99,26 @@ bool Foam::patchDistMethods::meshWaveAddressing::correct
 
     y = wDist.y();
 
+    // Note: copying value only so might not be consistent with supplied
+    // patch types (e.g. zeroGradient when called from wallDist). Assume
+    // only affected ones are the supplied patches ...
+    {
+        auto& bfld = y.boundaryFieldRef();
+        const label startOfRequests = UPstream::nRequests();
+        for (const label patchi : patchIDs_)
+        {
+            bfld[patchi].initEvaluate(UPstream::commsTypes::nonBlocking);
+        }
+
+        // Wait for outstanding requests
+        UPstream::waitRequests(startOfRequests);
+
+        for (const label patchi : patchIDs_)
+        {
+            bfld[patchi].evaluate(UPstream::commsTypes::nonBlocking);
+        }
+    }
+
 
     // Only calculate n if the field is defined
     if (notNull(n))
@@ -109,6 +129,8 @@ bool Foam::patchDistMethods::meshWaveAddressing::correct
             pnf == pnf.patch().nf();
         }
 
+        // No problem with inconsistency as for y (see above) since doing
+        // correctBoundaryConditions on actual n field.
         wDist.map(n, mapDistribute::transform());
     }
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C
index 80c97e1541..c6639c2857 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistAddressing/wallDistAddressing.C
@@ -238,6 +238,9 @@ void Foam::wallDistAddressing::correct(volScalarField& y)
         );
     }
 
+    // Make sure boundary values are up to date
+    y.correctBoundaryConditions();
+
 
     // Extract all addressing
     // ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
index 3b55b76d94..a306b2dadd 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2021,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -574,6 +574,7 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::Qdot() const
                 Qdot[celli] -= hi*RR_[i][celli];
             }
         }
+        tQdot.ref().correctBoundaryConditions();
     }
 
     return tQdot;

From 6a66a15b8ff4b8621190dadea6ac99fb9532fc4d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 21 Feb 2023 17:30:23 +0000
Subject: [PATCH 275/348] ENH: generalise masterCoarsest restart (GAMG)

---
 .../GAMGAgglomeration/GAMGAgglomeration.C     | 287 ++++++++++--------
 .../GAMGAgglomeration/GAMGAgglomeration.H     |  53 +++-
 .../algebraicPairGAMGAgglomeration.C          |  14 +-
 .../dummyAgglomeration/dummyAgglomeration.C   |   2 +-
 .../dummyAgglomeration/dummyAgglomeration.H   |  20 +-
 .../pairGAMGAgglomerate.C                     |  96 +++---
 .../pairGAMGAgglomeration.H                   |  19 +-
 .../GAMGProcAgglomeration.C                   |   3 +-
 .../masterCoarsestGAMGProcAgglomeration.C     |  31 ++
 .../masterCoarsestGAMGProcAgglomeration.H     |  24 ++
 .../GAMG/GAMGSolverAgglomerateMatrix.C        |   3 +-
 .../faceAreaPairGAMGAgglomeration.C           |  13 +-
 .../assemblyFaceAreaPairGAMGAgglomeration.C   |  20 +-
 .../MGridGenGAMGAgglomeration.C               |  15 +-
 .../rhoSimpleFoam/squareBendLiq/Allrun        |   6 +-
 15 files changed, 391 insertions(+), 215 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 4a5ffe33fe..1bcb5d600a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,11 +48,15 @@ namespace Foam
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
+void Foam::GAMGAgglomeration::compactLevels
+(
+    const label nCreatedLevels,
+    const bool doProcessorAgglomerate
+)
 {
-    nCells_.setSize(nCreatedLevels);
+    nCells_.setSize(nCreatedLevels, 0);
     restrictAddressing_.setSize(nCreatedLevels);
-    nFaces_.setSize(nCreatedLevels);
+    nFaces_.setSize(nCreatedLevels, 0);
     faceRestrictAddressing_.setSize(nCreatedLevels);
     faceFlipMap_.setSize(nCreatedLevels);
     nPatchFaces_.setSize(nCreatedLevels);
@@ -60,8 +64,8 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
     meshLevels_.setSize(nCreatedLevels);
 
     // Have procCommunicator_ always, even if not procAgglomerating
-    procCommunicator_.setSize(nCreatedLevels + 1);
-    if (processorAgglomerate())
+    procCommunicator_.setSize(nCreatedLevels + 1, -1);
+    if (doProcessorAgglomerate && processorAgglomerate())
     {
         procAgglomMap_.setSize(nCreatedLevels);
         agglomProcIDs_.setSize(nCreatedLevels);
@@ -71,156 +75,160 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
         procBoundaryFaceMap_.setSize(nCreatedLevels);
 
         procAgglomeratorPtr_().agglomerate();
+    }
+}
 
 
+void Foam::GAMGAgglomeration::printLevels() const
+{
+    Info<< "GAMGAgglomeration:" << nl
+        << "    local agglomerator     : " << type() << nl;
+    if (processorAgglomerate())
+    {
+        Info<< "    processor agglomerator : "
+            << procAgglomeratorPtr_().type() << nl
+            << nl;
     }
 
-    // Print a bit
-    if (debug)
+    Info<< setw(36) << "nCells"
+        << setw(20) << "nFaces/nCells"
+        << setw(20) << "nInterfaces"
+        << setw(20) << "nIntFaces/nCells"
+        << setw(12) << "profile"
+        << nl
+        << setw(8) << "Level"
+        << setw(8) << "nProcs"
+        << "    "
+        << setw(8) << "avg"
+        << setw(8) << "max"
+        << "    "
+        << setw(8) << "avg"
+        << setw(8) << "max"
+        << "    "
+        << setw(8) << "avg"
+        << setw(8) << "max"
+        << "    "
+        << setw(8) << "avg"
+        << setw(8) << "max"
+        //<< "    "
+        << setw(12) << "avg"
+        << nl
+        << setw(8) << "-----"
+        << setw(8) << "------"
+        << "    "
+        << setw(8) << "---"
+        << setw(8) << "---"
+        << "    "
+        << setw(8) << "---"
+        << setw(8) << "---"
+        << "    "
+        << setw(8) << "---"
+        << setw(8) << "---"
+        << "    "
+        << setw(8) << "---"
+        << setw(8) << "---"
+        //<< "    "
+        << setw(12) << "---"
+        //<< "    "
+        << nl;
+
+    const label maxSize = returnReduce(size(), maxOp<label>());
+
+    for (label levelI = 0; levelI <= maxSize; levelI++)
     {
-        Info<< "GAMGAgglomeration:" << nl
-            << "    local agglomerator     : " << type() << nl;
-        if (processorAgglomerate())
+        label nProcs = 0;
+        label nCells = 0;
+        scalar faceCellRatio = 0;
+        label nInterfaces = 0;
+        label nIntFaces = 0;
+        scalar ratio = 0.0;
+        scalar profile = 0.0;
+
+        if (hasMeshLevel(levelI))
         {
-            Info<< "    processor agglomerator : "
-                << procAgglomeratorPtr_().type() << nl
-                << nl;
+            nProcs = 1;
+
+            const lduMesh& fineMesh = meshLevel(levelI);
+            nCells = fineMesh.lduAddr().size();
+            faceCellRatio =
+                scalar(fineMesh.lduAddr().lowerAddr().size())/nCells;
+
+            const lduInterfacePtrsList interfaces =
+                fineMesh.interfaces();
+            forAll(interfaces, i)
+            {
+                if (interfaces.set(i))
+                {
+                    nInterfaces++;
+                    nIntFaces += interfaces[i].faceCells().size();
+                }
+            }
+            ratio = scalar(nIntFaces)/nCells;
+
+            profile = fineMesh.lduAddr().band().second();
         }
 
-        Info<< setw(36) << "nCells"
-            << setw(20) << "nFaces/nCells"
-            << setw(20) << "nInterfaces"
-            << setw(20) << "nIntFaces/nCells"
-            << setw(12) << "profile"
-            << nl
-            << setw(8) << "Level"
-            << setw(8) << "nProcs"
+        label totNprocs = returnReduce(nProcs, sumOp<label>());
+
+        label maxNCells = returnReduce(nCells, maxOp<label>());
+        label totNCells = returnReduce(nCells, sumOp<label>());
+
+        scalar maxFaceCellRatio =
+            returnReduce(faceCellRatio, maxOp<scalar>());
+        scalar totFaceCellRatio =
+            returnReduce(faceCellRatio, sumOp<scalar>());
+
+        label maxNInt = returnReduce(nInterfaces, maxOp<label>());
+        label totNInt = returnReduce(nInterfaces, sumOp<label>());
+
+        scalar maxRatio = returnReduce(ratio, maxOp<scalar>());
+        scalar totRatio = returnReduce(ratio, sumOp<scalar>());
+
+        scalar totProfile = returnReduce(profile, sumOp<scalar>());
+
+        const int oldPrecision = Info.stream().precision(4);
+
+        Info<< setw(8) << levelI
+            << setw(8) << totNprocs
             << "    "
-            << setw(8) << "avg"
-            << setw(8) << "max"
+            << setw(8) << totNCells/totNprocs
+            << setw(8) << maxNCells
             << "    "
-            << setw(8) << "avg"
-            << setw(8) << "max"
+            << setw(8) << totFaceCellRatio/totNprocs
+            << setw(8) << maxFaceCellRatio
             << "    "
-            << setw(8) << "avg"
-            << setw(8) << "max"
+            << setw(8) << scalar(totNInt)/totNprocs
+            << setw(8) << maxNInt
             << "    "
-            << setw(8) << "avg"
-            << setw(8) << "max"
-            //<< "    "
-            << setw(12) << "avg"
-            << nl
-            << setw(8) << "-----"
-            << setw(8) << "------"
-            << "    "
-            << setw(8) << "---"
-            << setw(8) << "---"
-            << "    "
-            << setw(8) << "---"
-            << setw(8) << "---"
-            << "    "
-            << setw(8) << "---"
-            << setw(8) << "---"
-            << "    "
-            << setw(8) << "---"
-            << setw(8) << "---"
-            //<< "    "
-            << setw(12) << "---"
-            //<< "    "
+            << setw(8) << totRatio/totNprocs
+            << setw(8) << maxRatio
+            << setw(12) << totProfile/totNprocs
             << nl;
 
-        for (label levelI = 0; levelI <= size(); levelI++)
-        {
-            label nProcs = 0;
-            label nCells = 0;
-            scalar faceCellRatio = 0;
-            label nInterfaces = 0;
-            label nIntFaces = 0;
-            scalar ratio = 0.0;
-            scalar profile = 0.0;
-
-            if (hasMeshLevel(levelI))
-            {
-                nProcs = 1;
-
-                const lduMesh& fineMesh = meshLevel(levelI);
-                nCells = fineMesh.lduAddr().size();
-                faceCellRatio =
-                    scalar(fineMesh.lduAddr().lowerAddr().size())/nCells;
-
-                const lduInterfacePtrsList interfaces =
-                    fineMesh.interfaces();
-                forAll(interfaces, i)
-                {
-                    if (interfaces.set(i))
-                    {
-                        nInterfaces++;
-                        nIntFaces += interfaces[i].faceCells().size();
-                    }
-                }
-                ratio = scalar(nIntFaces)/nCells;
-
-                profile = fineMesh.lduAddr().band().second();
-            }
-
-            label totNprocs = returnReduce(nProcs, sumOp<label>());
-
-            label maxNCells = returnReduce(nCells, maxOp<label>());
-            label totNCells = returnReduce(nCells, sumOp<label>());
-
-            scalar maxFaceCellRatio =
-                returnReduce(faceCellRatio, maxOp<scalar>());
-            scalar totFaceCellRatio =
-                returnReduce(faceCellRatio, sumOp<scalar>());
-
-            label maxNInt = returnReduce(nInterfaces, maxOp<label>());
-            label totNInt = returnReduce(nInterfaces, sumOp<label>());
-
-            scalar maxRatio = returnReduce(ratio, maxOp<scalar>());
-            scalar totRatio = returnReduce(ratio, sumOp<scalar>());
-
-            scalar totProfile = returnReduce(profile, sumOp<scalar>());
-
-            const int oldPrecision = Info.stream().precision(4);
-
-            Info<< setw(8) << levelI
-                << setw(8) << totNprocs
-                << "    "
-                << setw(8) << totNCells/totNprocs
-                << setw(8) << maxNCells
-                << "    "
-                << setw(8) << totFaceCellRatio/totNprocs
-                << setw(8) << maxFaceCellRatio
-                << "    "
-                << setw(8) << scalar(totNInt)/totNprocs
-                << setw(8) << maxNInt
-                << "    "
-                << setw(8) << totRatio/totNprocs
-                << setw(8) << maxRatio
-                << setw(12) << totProfile/totNprocs
-                << nl;
-
-            Info.stream().precision(oldPrecision);
-        }
-        Info<< endl;
+        Info.stream().precision(oldPrecision);
     }
+    Info<< endl;
 }
 
 
 bool Foam::GAMGAgglomeration::continueAgglomerating
 (
+    const label nCellsInCoarsestLevel,
     const label nFineCells,
-    const label nCoarseCells
+    const label nCoarseCells,
+    const label comm
 ) const
 {
-    const label nTotalCoarseCells = returnReduce(nCoarseCells, sumOp<label>());
-    if (nTotalCoarseCells < Pstream::nProcs()*nCellsInCoarsestLevel_)
+    const label nTotalCoarseCells =
+        returnReduce(nCoarseCells, sumOp<label>(), UPstream::msgType(), comm);
+    if (nTotalCoarseCells < Pstream::nProcs(comm)*nCellsInCoarsestLevel)
     {
         return false;
     }
     else
     {
-        const label nTotalFineCells = returnReduce(nFineCells, sumOp<label>());
+        const label nTotalFineCells =
+            returnReduce(nFineCells, sumOp<label>(), UPstream::msgType(), comm);
         return nTotalCoarseCells < nTotalFineCells;
     }
 }
@@ -333,7 +341,12 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
                 << exit(FatalError);
         }
 
-        return store(ctorPtr(mesh, controlDict).ptr());
+        auto agglomPtr(ctorPtr(mesh, controlDict));
+        if (debug)
+        {
+            agglomPtr().printLevels();
+        }
+        return store(agglomPtr.ptr());
     }
 }
 
@@ -378,7 +391,12 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
         }
         else
         {
-            return store(ctorPtr(matrix, controlDict).ptr());
+            auto agglomPtr(ctorPtr(matrix, controlDict));
+            if (debug)
+            {
+                agglomPtr().printLevels();
+            }
+            return store(agglomPtr.ptr());
         }
     }
 }
@@ -429,7 +447,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
                 << exit(FatalError);
         }
 
-        return store
+        auto agglomPtr
         (
             ctorPtr
             (
@@ -437,8 +455,13 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
                 cellVolumes,
                 faceAreas,
                 controlDict
-            ).ptr()
+            )
         );
+        if (debug)
+        {
+            agglomPtr().printLevels();
+        }
+        return store(agglomPtr.ptr());
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index 7e3ec1d195..688fbe7414 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,6 +53,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class lduMesh;
 class lduMatrix;
 class mapDistribute;
@@ -151,18 +152,28 @@ protected:
         //- Combine a level with the previous one
         void combineLevels(const label curLevel);
 
-        //- Shrink the number of levels to that specified
-        void compactLevels(const label nCreatedLevels);
+        //- Shrink the number of levels to that specified. Optionally do
+        //  processor agglomeration
+        void compactLevels
+        (
+            const label nCreatedLevels,
+            const bool doProcessorAgglomerate
+        );
 
         //- Check the need for further agglomeration
         bool continueAgglomerating
         (
+            const label nCellsInCoarsestLevel,
             const label nCells,
-            const label nCoarseCells
+            const label nCoarseCells,
+            const label comm
         ) const;
 
         void clearLevel(const label leveli);
 
+        //- Print level overview
+        void printLevels() const;
+
 
         // Processor agglomeration
 
@@ -468,16 +479,30 @@ public:
             const labelListListList& boundaryFaceMap(const label fineLeveli)
             const;
 
-        //- Given restriction determines if coarse cells are connected.
-        //  Return ok is so, otherwise creates new restriction that is
-        static bool checkRestriction
-        (
-            labelList& newRestrict,
-            label& nNewCoarse,
-            const lduAddressing& fineAddressing,
-            const labelUList& restriction,
-            const label nCoarse
-        );
+
+        // Helpers
+
+            //- Agglomerate from a starting level. Starting level is usually 0
+            //- (initial mesh) but sometimes >0 (restarting after processor
+            //- agglomeration)
+            virtual void agglomerate
+            (
+                const label nCellsInCoarsestLevel,
+                const label startLevel,
+                const scalarField& startFaceWeights,
+                const bool doProcessorAgglomerate = true
+            ) = 0;
+
+            //- Given restriction determines if coarse cells are connected.
+            //  Return ok is so, otherwise creates new restriction that is
+            static bool checkRestriction
+            (
+                labelList& newRestrict,
+                label& nNewCoarse,
+                const lduAddressing& fineAddressing,
+                const labelUList& restriction,
+                const label nCoarse
+            );
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C
index 02cf3d1f86..7a38913e93 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,15 +55,19 @@ Foam::algebraicPairGAMGAgglomeration::algebraicPairGAMGAgglomeration
 :
     pairGAMGAgglomeration(matrix.mesh(), controlDict)
 {
-    const lduMesh& mesh = matrix.mesh();
-
     if (matrix.hasLower())
     {
-        agglomerate(mesh, max(mag(matrix.upper()), mag(matrix.lower())));
+        agglomerate
+        (
+            nCellsInCoarsestLevel_,
+            0,
+            max(mag(matrix.upper()), mag(matrix.lower())),
+            true
+        );
     }
     else
     {
-        agglomerate(mesh, mag(matrix.upper()));
+        agglomerate(nCellsInCoarsestLevel_, 0, mag(matrix.upper()), true);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
index 9da13c4e9a..0892f4442c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
@@ -74,7 +74,7 @@ Foam::dummyAgglomeration::dummyAgglomeration
     }
 
     // Shrink the storage of the levels to those created
-    compactLevels(nLevels_);
+    compactLevels(nLevels_, true);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
index ab7a1694b9..da19c940bc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dummyAgglomeration_H
-#define dummyAgglomeration_H
+#ifndef Foam_dummyAgglomeration_H
+#define Foam_dummyAgglomeration_H
 
 #include "GAMGAgglomeration.H"
 
@@ -52,7 +52,7 @@ class dummyAgglomeration
 :
     public GAMGAgglomeration
 {
-    // Private data
+    // Private Data
 
         //- Preset number of levels
         label nLevels_;
@@ -81,6 +81,20 @@ public:
             const lduMesh& mesh,
             const dictionary& controlDict
         );
+
+        //- Agglomerate from a starting level. Starting level is usually 0
+        //- (initial mesh) but sometimes >0 (restarting after processor
+        //- agglomeration)
+        virtual void agglomerate
+        (
+            const label nCellsInCoarsestLevel,
+            const label startLevel,
+            const scalarField& startFaceWeights,
+            const bool doProcessorAgglomerate = true
+        )
+        {
+            NotImplemented;
+        }
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 19981c5764..7da7012658 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,43 +33,79 @@ License
 
 void Foam::pairGAMGAgglomeration::agglomerate
 (
-    const lduMesh& mesh,
-    const scalarField& faceWeights
+    const label nCellsInCoarsestLevel,
+    const label startLevel,
+    const scalarField& startFaceWeights,
+    const bool doProcessorAgglomerate
 )
 {
-    const label nFaces = mesh.lduAddr().lowerAddr().size();
-    if (faceWeights.size() != nFaces)
+    if (nCells_.size() < maxLevels_)
     {
-        FatalErrorInFunction
-            << "Supplied number of face weights " << faceWeights.size()
-            << " does not correspond to the number of faces " << nFaces << endl
-            << "This may be because of using a geometry-based"
-            << " agglomeration method instead of a matrix-based one"
-            << exit(FatalError);
+        // See compactLevels. Make space if not enough
+        nCells_.resize(maxLevels_);
+        restrictAddressing_.resize(maxLevels_);
+        nFaces_.resize(maxLevels_);
+        faceRestrictAddressing_.resize(maxLevels_);
+        faceFlipMap_.resize(maxLevels_);
+        nPatchFaces_.resize(maxLevels_);
+        patchFaceRestrictAddressing_.resize(maxLevels_);
+        meshLevels_.resize(maxLevels_);
+        // Have procCommunicator_ always, even if not procAgglomerating.
+        // Use value -1 to indicate nothing is proc-agglomerated
+        procCommunicator_.resize(maxLevels_ + 1, -1);
+        if (processorAgglomerate())
+        {
+            procAgglomMap_.resize(maxLevels_);
+            agglomProcIDs_.resize(maxLevels_);
+            procCommunicator_.resize(maxLevels_);
+            procCellOffsets_.resize(maxLevels_);
+            procFaceMap_.resize(maxLevels_);
+            procBoundaryMap_.resize(maxLevels_);
+            procBoundaryFaceMap_.resize(maxLevels_);
+        }
     }
 
 
     // Start geometric agglomeration from the given faceWeights
-    scalarField* faceWeightsPtr = const_cast<scalarField*>(&faceWeights);
+    scalarField faceWeights = startFaceWeights;
 
     // Agglomerate until the required number of cells in the coarsest level
     // is reached
 
     label nPairLevels = 0;
-    label nCreatedLevels = 0;
+    label nCreatedLevels = startLevel;
 
     while (nCreatedLevels < maxLevels_ - 1)
     {
+        if (!hasMeshLevel(nCreatedLevels))
+        {
+            FatalErrorInFunction<< "No mesh at nCreatedLevels:"
+                << nCreatedLevels
+                << exit(FatalError);
+        }
+
+        const auto& fineMesh = meshLevel(nCreatedLevels);
+
+
         label nCoarseCells = -1;
 
         tmp<labelField> finalAgglomPtr = agglomerate
         (
             nCoarseCells,
-            meshLevel(nCreatedLevels).lduAddr(),
-            *faceWeightsPtr
+            fineMesh.lduAddr(),
+            faceWeights
         );
 
-        if (continueAgglomerating(finalAgglomPtr().size(), nCoarseCells))
+        if
+        (
+            continueAgglomerating
+            (
+                nCellsInCoarsestLevel,
+                finalAgglomPtr().size(),
+                nCoarseCells,
+                fineMesh.comm()
+            )
+        )
         {
             nCells_[nCreatedLevels] = nCoarseCells;
             restrictAddressing_.set(nCreatedLevels, finalAgglomPtr);
@@ -78,32 +115,25 @@ void Foam::pairGAMGAgglomeration::agglomerate
             break;
         }
 
+        // Create coarse mesh
         agglomerateLduAddressing(nCreatedLevels);
 
         // Agglomerate the faceWeights field for the next level
         {
-            scalarField* aggFaceWeightsPtr
+            scalarField aggFaceWeights
             (
-                new scalarField
-                (
-                    meshLevels_[nCreatedLevels].upperAddr().size(),
-                    0.0
-                )
+                meshLevels_[nCreatedLevels].upperAddr().size(),
+                0.0
             );
 
             restrictFaceField
             (
-                *aggFaceWeightsPtr,
-                *faceWeightsPtr,
+                aggFaceWeights,
+                faceWeights,
                 nCreatedLevels
             );
 
-            if (nCreatedLevels)
-            {
-                delete faceWeightsPtr;
-            }
-
-            faceWeightsPtr = aggFaceWeightsPtr;
+            faceWeights = std::move(aggFaceWeights);
         }
 
         if (nPairLevels % mergeLevels_)
@@ -119,13 +149,7 @@ void Foam::pairGAMGAgglomeration::agglomerate
     }
 
     // Shrink the storage of the levels to those created
-    compactLevels(nCreatedLevels);
-
-    // Delete temporary geometry storage
-    if (nCreatedLevels)
-    {
-        delete faceWeightsPtr;
-    }
+    compactLevels(nCreatedLevels, doProcessorAgglomerate);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
index fc6480d4c8..93005f38d1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomeration.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,13 +67,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Agglomerate all levels starting from the given face weights
-        void agglomerate
-        (
-            const lduMesh& mesh,
-            const scalarField& faceWeights
-        );
-
         //- No copy construct
         pairGAMGAgglomeration(const pairGAMGAgglomeration&) = delete;
 
@@ -102,6 +96,17 @@ public:
             const lduAddressing& fineMatrixAddressing,
             const scalarField& faceWeights
         );
+
+        //- Agglomerate from a starting level. Starting level is usually 0
+        //- (initial mesh) but sometimes >0 (restarting after processor
+        //- agglomeration)
+        virtual void agglomerate
+        (
+            const label nCellsInCoarsestLevel,
+            const label startLevel,
+            const scalarField& startFaceWeights,
+            const bool doProcessorAgglomerate = true
+        );
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index 247f72fb50..519e5f9ef5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
@@ -51,7 +51,8 @@ void Foam::GAMGProcAgglomeration::printStats
     {
         if (agglom.hasMeshLevel(levelI))
         {
-            os  << agglom.meshLevel(levelI).info() << endl;
+            os  << "Level " << levelI << " mesh:"
+                << agglom.meshLevel(levelI).info() << endl;
         }
         else
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
index 721913d170..8ffdfd36ad 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
@@ -62,6 +62,10 @@ Foam::masterCoarsestGAMGProcAgglomeration::masterCoarsestGAMGProcAgglomeration
             0,
             keyType::LITERAL
         )
+    ),
+    nMasterCoarsestCells_
+    (
+        controlDict.getOrDefault<label>("nCellsInMasterLevel", -1)
     )
 {
     const auto* ePtr = controlDict.findEntry("nMasters", keyType::LITERAL);
@@ -208,9 +212,36 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                         agglomProcIDs,
                         comms_.back()
                     );
+
+                    if (nMasterCoarsestCells_ > 0)
+                    {
+                        const label levelI = agglom_.size();
+                        if (agglom_.hasMeshLevel(levelI))
+                        {
+                            const lduMesh& fineMesh = agglom_.meshLevel(levelI);
+                            const auto& addr = fineMesh.lduAddr();
+                            const scalarField weights
+                            (
+                                addr.lowerAddr().size(),
+                                1.0
+                            );
+                            agglom_.agglomerate
+                            (
+                                nMasterCoarsestCells_,
+                                levelI,
+                                weights,
+                                false
+                            );
+                        }
+                    }
                 }
             }
         }
+
+
+        // Note that at this point for nMasterCoarsestCells_ the non-master
+        // processors will have less levels. This does/should not matter since
+        // they are not involved in those levels
     }
 
     // Print a bit
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
index 8d0a0de15a..d54e24ac91 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
@@ -50,6 +50,11 @@ Description
 
             // Alternative : specify number of (equi-distributed) masters
             nMasters                2;
+
+            // Restart local agglomeration after processor agglomeration. Used
+            // as nCellsInCoarsestLevel. Only applicable for pair-wise local
+            // agglomeration methods.
+            nMasterCoarsestCells    1;
         }
 
 SourceFiles
@@ -67,6 +72,9 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
+class GAMGAgglomeration;
+
 /*---------------------------------------------------------------------------*\
               Class masterCoarsestGAMGProcAgglomeration Declaration
 \*---------------------------------------------------------------------------*/
@@ -79,6 +87,22 @@ class masterCoarsestGAMGProcAgglomeration
 
         label nProcessorsPerMaster_;
 
+        const label nMasterCoarsestCells_;
+
+        DynamicList<label> comms_;
+
+
+    // Private Member Functions
+
+        //- No copy construct
+        masterCoarsestGAMGProcAgglomeration
+        (
+            const masterCoarsestGAMGProcAgglomeration&
+        ) = delete;
+
+        //- No copy assignment
+        void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
+
 
 public:
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index a6dc781272..d1d5b6018c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -298,7 +299,7 @@ void Foam::GAMGSolver::gatherMatrices
     List<List<label>>& otherRanks
 ) const
 {
-    if (debug)
+    if (debug & 2)
     {
         Pout<< "GAMGSolver::gatherMatrices :"
             << " collecting matrices from procs:" << procIDs
diff --git a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
index 1fef3555f8..1254794ee7 100644
--- a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
+++ b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,7 +68,8 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration
     //agglomerate(mesh, sqrt(fvmesh.magSf().primitiveField()));
     agglomerate
     (
-        mesh,
+        nCellsInCoarsestLevel_,
+        0,          //mesh,
         mag
         (
             cmptMultiply
@@ -77,7 +79,8 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration
                 vector(1, 1.01, 1.02)
                 //vector::one
             )
-        )
+        ),
+        true
     );
 }
 
@@ -95,7 +98,8 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration
     //agglomerate(mesh, sqrt(mag(faceAreas)));
     agglomerate
     (
-        mesh,
+        nCellsInCoarsestLevel_,
+        0,          //mesh,
         mag
         (
             cmptMultiply
@@ -105,7 +109,8 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration
                 vector(1, 1.01, 1.02)
                 //vector::one
             )
-        )
+        ),
+        true
     );
 }
 
diff --git a/src/finiteVolume/lduPrimitiveMeshAssembly/assemblyFaceAreaPairGAMGAgglomeration/assemblyFaceAreaPairGAMGAgglomeration.C b/src/finiteVolume/lduPrimitiveMeshAssembly/assemblyFaceAreaPairGAMGAgglomeration/assemblyFaceAreaPairGAMGAgglomeration.C
index 1cbca2c9a4..a26baaf9d2 100644
--- a/src/finiteVolume/lduPrimitiveMeshAssembly/assemblyFaceAreaPairGAMGAgglomeration/assemblyFaceAreaPairGAMGAgglomeration.C
+++ b/src/finiteVolume/lduPrimitiveMeshAssembly/assemblyFaceAreaPairGAMGAgglomeration/assemblyFaceAreaPairGAMGAgglomeration.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -181,7 +181,8 @@ assemblyFaceAreaPairGAMGAgglomeration
 
         agglomerate
         (
-            mesh,
+            nCellsInCoarsestLevel_,
+            0,      //mesh,
             mag
             (
                 cmptMultiply
@@ -189,7 +190,8 @@ assemblyFaceAreaPairGAMGAgglomeration
                     faceAreas/sqrt(mag(faceAreas)),
                     vector(1, 1.01, 1.02)
                 )
-            )
+            ),
+            true
         );
     }
     else
@@ -199,7 +201,8 @@ assemblyFaceAreaPairGAMGAgglomeration
 
         agglomerate
         (
-            matrix.mesh(),
+            nCellsInCoarsestLevel_,
+            0,      //matrix.mesh(),
             mag
             (
                 cmptMultiply
@@ -209,7 +212,8 @@ assemblyFaceAreaPairGAMGAgglomeration
                     vector(1, 1.01, 1.02)
                     //vector::one
                 )
-            )
+            ),
+            true
         );
     }
 }
@@ -228,7 +232,8 @@ assemblyFaceAreaPairGAMGAgglomeration
 {
     agglomerate
     (
-        matrix.mesh(),
+        nCellsInCoarsestLevel_,
+        0,      //matrix.mesh(),
         mag
         (
             cmptMultiply
@@ -236,7 +241,8 @@ assemblyFaceAreaPairGAMGAgglomeration
                 faceAreas/sqrt(mag(faceAreas)),
                 vector(1, 1.01, 1.02)
             )
-        )
+        ),
+        true
     );
 }
 
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
index 823ac8d9cb..4881058132 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -290,7 +290,16 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
             );
         }
 
-        if (continueAgglomerating(finalAgglomPtr().size(), nCoarseCells))
+        if
+        (
+            continueAgglomerating
+            (
+                nCellsInCoarsestLevel_,
+                finalAgglomPtr().size(),
+                nCoarseCells,
+                meshLevel(nCreatedLevels).comm()
+            )
+        )
         {
             nCells_[nCreatedLevels] = nCoarseCells;
             restrictAddressing_.set(nCreatedLevels, finalAgglomPtr);
@@ -359,7 +368,7 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
     }
 
     // Shrink the storage of the levels to those created
-    compactLevels(nCreatedLevels);
+    compactLevels(nCreatedLevels, true);
 
     // Delete temporary geometry storage
     if (nCreatedLevels)
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
index 83cb4993d5..e799410294 100755
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun
@@ -20,7 +20,11 @@ runParallel $(getApplication)
 foamDictionary -entry solvers.p.processorAgglomerator -set 'masterCoarsest' system/fvSolution
 runParallel -s masterCoarsest $(getApplication)
 
-#- Run with processorAgglomerator - multiple masters
+#- Run with processorAgglomerator+nCellsInMasterLevel
+foamDictionary -entry solvers.p.nCellsInMasterLevel -set '1' system/fvSolution
+runParallel -s nCellsInMasterLevel $(getApplication)
+
+#- Run with processorAgglomerator - multiple masters 
 foamDictionary -entry solvers.p.nMasters -set '2' system/fvSolution
 runParallel -s masterCoarsest2 $(getApplication)
 

From e566142f8ab23f22ec6b0cc2b1c67e13ecfccac4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 24 May 2023 15:53:07 +0100
Subject: [PATCH 276/348] ENH: materCoarsest: input renaming

---
 .../masterCoarsestGAMGProcAgglomeration.C           |  8 ++++----
 .../masterCoarsestGAMGProcAgglomeration.H           | 13 ++-----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
index 8ffdfd36ad..4eab566515 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
@@ -63,7 +63,7 @@ Foam::masterCoarsestGAMGProcAgglomeration::masterCoarsestGAMGProcAgglomeration
             keyType::LITERAL
         )
     ),
-    nMasterCoarsestCells_
+    nCellsInMasterLevel_
     (
         controlDict.getOrDefault<label>("nCellsInMasterLevel", -1)
     )
@@ -213,7 +213,7 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                         comms_.back()
                     );
 
-                    if (nMasterCoarsestCells_ > 0)
+                    if (nCellsInMasterLevel_ > 0)
                     {
                         const label levelI = agglom_.size();
                         if (agglom_.hasMeshLevel(levelI))
@@ -227,7 +227,7 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                             );
                             agglom_.agglomerate
                             (
-                                nMasterCoarsestCells_,
+                                nCellsInMasterLevel_,
                                 levelI,
                                 weights,
                                 false
@@ -239,7 +239,7 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
         }
 
 
-        // Note that at this point for nMasterCoarsestCells_ the non-master
+        // Note that at this point for nCellsInMasterLevel_ the non-master
         // processors will have less levels. This does/should not matter since
         // they are not involved in those levels
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
index d54e24ac91..cf629785e1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.H
@@ -54,7 +54,7 @@ Description
             // Restart local agglomeration after processor agglomeration. Used
             // as nCellsInCoarsestLevel. Only applicable for pair-wise local
             // agglomeration methods.
-            nMasterCoarsestCells    1;
+            nCellsInMasterLevel     1;
         }
 
 SourceFiles
@@ -87,7 +87,7 @@ class masterCoarsestGAMGProcAgglomeration
 
         label nProcessorsPerMaster_;
 
-        const label nMasterCoarsestCells_;
+        const label nCellsInMasterLevel_;
 
         DynamicList<label> comms_;
 
@@ -109,15 +109,6 @@ public:
     //- Runtime type information
     TypeName("masterCoarsest");
 
-    //- No copy construct
-    masterCoarsestGAMGProcAgglomeration
-    (
-        const masterCoarsestGAMGProcAgglomeration&
-    ) = delete;
-
-    //- No copy assignment
-    void operator=(const masterCoarsestGAMGProcAgglomeration&) = delete;
-
 
     // Constructors
 

From c177637db2d28e757a3e40254150610a6665e0f2 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Tue, 17 Jan 2023 16:43:02 +0000
Subject: [PATCH 277/348] ENH: ParticleHistogram: refactor
 PatchParticleHistogram function object

- enable 'faceZone' support.
- introduce 'cloudFunctionObjectTools' to simplify collection of particle info
  on patches or face zones.
- enable 'writeFile' support to better control file output.
- rename 'PatchParticleHistogram' as 'ParticleHistogram' for better clarity.
---
 src/lagrangian/intermediate/Make/files        |   2 +-
 .../include/makeParcelCloudFunctionObjects.H  |   6 +-
 .../makeReactingParcelCloudFunctionObjects.H  |   6 +-
 .../makeThermoParcelCloudFunctionObjects.H    |   6 +-
 .../cloudFunctionObjectTools.C                | 113 +++++++
 .../cloudFunctionObjectTools.H                | 129 ++++++++
 .../ParticleHistogram/ParticleHistogram.C     | 278 ++++++++++++++++++
 .../ParticleHistogram.H}                      | 166 ++++++-----
 .../PatchParticleHistogram.C                  | 253 ----------------
 .../constant/reactingCloud1Properties         |   6 +-
 .../filter/constant/reactingCloud1Properties  |   4 +-
 11 files changed, 625 insertions(+), 344 deletions(-)
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.C
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.H
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.C
 rename src/lagrangian/intermediate/submodels/CloudFunctionObjects/{PatchParticleHistogram/PatchParticleHistogram.H => ParticleHistogram/ParticleHistogram.H} (55%)
 delete mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.C

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 4d6e12f6dc..445cbc2a20 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -120,7 +120,7 @@ phaseProperties/phasePropertiesList/phasePropertiesList.C
 
 /* additional helper classes */
 clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
-
+submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.C
 
 /* averaging methods */
 submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index 6b0d78ac38..f2fc385cb6 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,10 +38,10 @@ License
 #include "ParticleTracks.H"
 #include "ParticleTrap.H"
 #include "ParticleZoneInfo.H"
+#include "ParticleHistogram.H"
 #include "PatchCollisionDensity.H"
 #include "PatchInteractionFields.H"
 #include "PatchPostProcessing.H"
-#include "PatchParticleHistogram.H"
 #include "RemoveParcels.H"
 #include "VoidFraction.H"
 #include "KinematicReynoldsNumber.H"
@@ -60,10 +60,10 @@ License
     makeCloudFunctionObjectType(ParticleTracks, CloudType);                    \
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
     makeCloudFunctionObjectType(ParticleZoneInfo, CloudType);                  \
+    makeCloudFunctionObjectType(ParticleHistogram, CloudType);                 \
     makeCloudFunctionObjectType(PatchCollisionDensity, CloudType);             \
     makeCloudFunctionObjectType(PatchInteractionFields, CloudType);            \
     makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
-    makeCloudFunctionObjectType(PatchParticleHistogram, CloudType);            \
     makeCloudFunctionObjectType(RemoveParcels, CloudType);                     \
     makeCloudFunctionObjectType(VoidFraction, CloudType);                      \
     makeCloudFunctionObjectType(KinematicReynoldsNumber, CloudType);           \
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H
index e8bed51a3e..e620ceb4c1 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,10 +38,10 @@ License
 #include "ParticleTracks.H"
 #include "ParticleTrap.H"
 #include "ParticleZoneInfo.H"
+#include "ParticleHistogram.H"
 #include "PatchCollisionDensity.H"
 #include "PatchInteractionFields.H"
 #include "PatchPostProcessing.H"
-#include "PatchParticleHistogram.H"
 #include "RemoveParcels.H"
 #include "VoidFraction.H"
 #include "NusseltNumber.H"
@@ -63,10 +63,10 @@ License
     makeCloudFunctionObjectType(ParticleTracks, CloudType);                    \
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
     makeCloudFunctionObjectType(ParticleZoneInfo, CloudType);                  \
+    makeCloudFunctionObjectType(ParticleHistogram, CloudType);                 \
     makeCloudFunctionObjectType(PatchCollisionDensity, CloudType);             \
     makeCloudFunctionObjectType(PatchInteractionFields, CloudType);            \
     makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
-    makeCloudFunctionObjectType(PatchParticleHistogram, CloudType);            \
     makeCloudFunctionObjectType(RemoveParcels, CloudType);                     \
     makeCloudFunctionObjectType(VoidFraction, CloudType);                      \
     makeCloudFunctionObjectType(NusseltNumber, CloudType);                     \
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H
index 0e0a312b8f..4a8a37f4fc 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,10 +37,10 @@ License
 #include "ParticleTracks.H"
 #include "ParticleTrap.H"
 #include "ParticleZoneInfo.H"
+#include "ParticleHistogram.H"
 #include "PatchCollisionDensity.H"
 #include "PatchInteractionFields.H"
 #include "PatchPostProcessing.H"
-#include "PatchParticleHistogram.H"
 #include "RemoveParcels.H"
 #include "VoidFraction.H"
 #include "NusseltNumber.H"
@@ -61,10 +61,10 @@ License
     makeCloudFunctionObjectType(ParticleTracks, CloudType);                    \
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
     makeCloudFunctionObjectType(ParticleZoneInfo, CloudType);                  \
+    makeCloudFunctionObjectType(ParticleHistogram, CloudType);                 \
     makeCloudFunctionObjectType(PatchCollisionDensity, CloudType);             \
     makeCloudFunctionObjectType(PatchInteractionFields, CloudType);            \
     makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
-    makeCloudFunctionObjectType(PatchParticleHistogram, CloudType);            \
     makeCloudFunctionObjectType(RemoveParcels, CloudType);                     \
     makeCloudFunctionObjectType(VoidFraction, CloudType);                      \
     makeCloudFunctionObjectType(NusseltNumber, CloudType);                     \
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.C
new file mode 100644
index 0000000000..1f58610711
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.C
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "cloudFunctionObjectTools.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::cloudFunctionObjectTools::collector::collector
+(
+    const dictionary& dict,
+    const polyMesh& mesh
+)
+:
+    isPatch_(false),
+    IDs_(),
+    names_(),
+    BBs_()
+{
+    wordRes matcher;
+
+    if (dict.readIfPresent("patches", matcher) && !matcher.empty())
+    {
+        isPatch_ = true;
+
+        IDs_ = mesh.boundaryMesh().indices(matcher);
+
+        names_.resize(IDs_.size());
+
+        label count = 0;
+        for (const label patchi : IDs_)
+        {
+            names_[count] = mesh.boundaryMesh()[patchi].name();
+            ++count;
+        }
+    }
+    else if (dict.readIfPresent("faceZones", matcher))
+    {
+        const faceZoneMesh& fzm = mesh.faceZones();
+
+        IDs_ = fzm.indices(matcher);
+
+        BBs_.resize(IDs_.size());
+        names_.resize(IDs_.size());
+
+        label count = 0;
+        for (const label zonei : IDs_)
+        {
+            const faceZone& fz = fzm[zonei];
+            names_[count] = fz.name();
+
+            auto& bb = BBs_[count];
+            ++count;
+
+            bb.reset();
+
+            const auto& faces = mesh.faces();
+            const auto& points = mesh.points();
+            for (const label facei : fz)
+            {
+                bb.add(points, faces[facei]);
+            }
+            bb.reduce();
+            bb.inflate(0.05);
+        }
+    }
+
+    if (matcher.empty() || IDs_.size() < 1)
+    {
+        FatalIOErrorInFunction(dict)
+            << "No matching patches or face zones found: "
+            << flatOutput(matcher) << nl
+            << exit(FatalIOError);
+    }
+}
+
+
+Foam::cloudFunctionObjectTools::collector::collector
+(
+    const collector& phc
+)
+:
+    isPatch_(phc.isPatch_),
+    IDs_(phc.IDs_),
+    names_(phc.names_),
+    BBs_(phc.BBs_)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.H
new file mode 100644
index 0000000000..e5fe1fee3e
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/cloudFunctionObjectTools.H
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::cloudFunctionObjectTools::collector
+
+Description
+    Implementation of template-invariant tools for
+    various function objects such as Foam::ParticleHistogram.
+
+SourceFiles
+    cloudFunctionObjectTools.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cloudFunctionObjectTools_collector_H
+#define cloudFunctionObjectTools_collector_H
+
+#include "polyMesh.H"
+#include "boundBox.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Namespace cloudFunctionObjectTools Declaration
+\*---------------------------------------------------------------------------*/
+
+namespace cloudFunctionObjectTools
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class collector Declaration
+\*---------------------------------------------------------------------------*/
+
+class collector
+{
+    // Private Data
+
+        //- Flag to decide if the collector is patch based
+        bool isPatch_;
+
+        //- List of indices of collectors (zones or patches)
+        labelList IDs_;
+
+        //- List of names of collectors
+        wordList names_;
+
+        //- List of bounding-boxes of collectors
+        List<boundBox> BBs_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary
+        collector
+        (
+            const dictionary& dict,
+            const polyMesh& mesh
+        );
+
+        //- Copy construct
+        collector(const collector& phc);
+
+        //- No copy assignment
+        void operator=(const collector&) = delete;
+
+
+    //- Destructor
+    virtual ~collector() = default;
+
+
+    // Member Functions
+
+    // Access
+
+        //- Return the flag if the collector is patch based
+        bool isPatch() const noexcept { return isPatch_; }
+
+        //- Return number of collectors (zones or patches)
+        label size() const noexcept { return IDs_.size(); }
+
+        //- Return const reference to the indices of collectors
+        const labelList& IDs() const noexcept { return IDs_; }
+
+        //- Return const reference to the names of collectors
+        const wordList& names() const noexcept { return names_; }
+
+        //- Return const reference to the bounding-boxes of collectors
+        const List<boundBox>& BBs() const noexcept { return BBs_; }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace cloudFunctionObjectTools
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.C
new file mode 100644
index 0000000000..e0010d085b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.C
@@ -0,0 +1,278 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2020-2023 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 "ParticleHistogram.H"
+#include "Pstream.H"
+#include "stringListOps.H"
+#include "ListOps.H"
+#include "ListListOps.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticleHistogram<CloudType>::writeFileHeader(Ostream& os) const
+{
+    this->writeHeaderValue(os, "nBin", nBins_);
+    this->writeHeaderValue(os, "min", range_.min());
+    this->writeHeaderValue(os, "max", range_.max());
+    this->writeHeader(os, "");
+    this->writeCommented(os, "dEdge1");
+    os  << tab << "dEdge2"
+        << tab << "nParticles"
+        << tab << "nParticlesCumulative"
+        << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ParticleHistogram<CloudType>::ParticleHistogram
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& modelName
+)
+:
+    CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
+    functionObjects::writeFile
+    (
+        owner,
+        this->localPath(),
+        typeName
+    ),
+    collector_(this->coeffDict(), owner.mesh()),
+    nBins_
+    (
+        this->coeffDict().template getCheck<label>("nBins", labelMinMax::ge(1))
+    ),
+    maxStoredParcels_(this->coeffDict().getScalar("maxStoredParcels")),
+    range_
+    (
+        this->coeffDict().getScalar("min"),
+        this->coeffDict().getScalar("max")
+    ),
+    binEdges_(nBins_ + 1),
+    nParticlesCumulative_(),
+    dParticles_(),
+    nParticles_()
+{
+    writeFile::read(this->coeffDict());
+
+    if (!range_.good())
+    {
+        FatalIOErrorInFunction(this->coeffDict())
+            << "Invalid histogram range: " << range_
+            << exit(FatalIOError);
+    }
+
+    if (maxStoredParcels_ <= 0)
+    {
+        FatalIOErrorInFunction(this->coeffDict())
+            << "maxStoredParcels = " << maxStoredParcels_
+            << ", cannot be equal to or less than zero"
+            << exit(FatalIOError);
+    }
+
+    // Compute histogram-bin properties
+    binEdges_[0] = range_.min();
+    const scalar delta = range_.span()/scalar(nBins_);
+    for (label i = 0; i < nBins_; ++i)
+    {
+        const scalar next = range_.min() + (i+1)*delta;
+        binEdges_[i+1] = next;
+    }
+
+    const label sz = collector_.size();
+    nParticlesCumulative_ = List<scalarList>(sz, scalarList(nBins_, Zero));
+    dParticles_.resize(sz);
+    nParticles_.resize(sz);
+}
+
+
+template<class CloudType>
+Foam::ParticleHistogram<CloudType>::ParticleHistogram
+(
+    const ParticleHistogram<CloudType>& ph
+)
+:
+    CloudFunctionObject<CloudType>(ph),
+    writeFile(ph),
+    collector_(ph.collector_),
+    nBins_(ph.nBins_),
+    maxStoredParcels_(ph.maxStoredParcels_),
+    range_(ph.range_),
+    binEdges_(ph.binEdges_),
+    nParticlesCumulative_(ph.nParticlesCumulative_),
+    dParticles_(ph.dParticles_),
+    nParticles_(ph.nParticles_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticleHistogram<CloudType>::postPatch
+(
+    const parcelType& p,
+    const polyPatch& pp,
+    bool&
+)
+{
+    if (!collector_.isPatch())
+    {
+        return;
+    }
+
+    const label patchi = pp.index();
+    const label localPatchi = collector_.IDs().find(patchi);
+
+    if
+    (
+        localPatchi != -1
+     && dParticles_[localPatchi].size() < maxStoredParcels_
+    )
+    {
+        dParticles_[localPatchi].append(p.d());
+        nParticles_[localPatchi].append(p.nParticle());
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticleHistogram<CloudType>::postFace
+(
+    const parcelType& p,
+    bool&
+)
+{
+    if (collector_.isPatch())
+    {
+        return;
+    }
+
+    const labelList& IDs = collector_.IDs();
+    const List<boundBox>& BBs = collector_.BBs();
+    const faceZoneMesh& fzm = this->owner().mesh().faceZones();
+
+    forAll(IDs, i)
+    {
+        if (!BBs[i].contains(p.position()))
+        {
+            // Quick reject if the particle is not in the face zone bound box
+            continue;
+        }
+
+        const label zonei = IDs[i];
+        const label localFacei = fzm[zonei].find(p.face());
+
+        if
+        (
+            localFacei != -1
+         && dParticles_[i].size() < maxStoredParcels_
+        )
+        {
+            dParticles_[i].append(p.d());
+            nParticles_[i].append(p.nParticle());
+        }
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticleHistogram<CloudType>::write()
+{
+    const wordList& names = collector_.names();
+
+    forAll(names, i)
+    {
+        List<scalarList> procDiameters(Pstream::nProcs());
+        procDiameters[Pstream::myProcNo()] = dParticles_[i];
+        Pstream::gatherList(procDiameters);
+
+        List<scalarList> procParticles(Pstream::nProcs());
+        procParticles[Pstream::myProcNo()] = nParticles_[i];
+        Pstream::gatherList(procParticles);
+
+        if (Pstream::master())
+        {
+            scalarList globalDiameters;
+            globalDiameters = ListListOps::combine<scalarList>
+            (
+                procDiameters,
+                accessOp<scalarList>()
+            );
+
+            scalarList globalParticles;
+            globalParticles = ListListOps::combine<scalarList>
+            (
+                procParticles,
+                accessOp<scalarList>()
+            );
+
+            // Compute histogram
+            scalarList nParticles(nBins_, Zero);
+            const scalar delta = range_.span()/scalar(nBins_);
+            forAll(globalDiameters, j)
+            {
+                const label bini = (globalDiameters[j] - range_.min())/delta;
+                if (bini >= 0 && bini < nBins_)
+                {
+                    nParticles[bini] += globalParticles[j];
+                    nParticlesCumulative_[i][bini] += globalParticles[j];
+                }
+            }
+
+            if (this->writeToFile())
+            {
+                autoPtr<OFstream> osPtr = this->newFileAtTime
+                (
+                    names[i],
+                    this->owner().time().value()
+                );
+                OFstream& os = osPtr.ref();
+
+                writeFileHeader(os);
+
+                forAll(nParticles, j)
+                {
+                    os  << binEdges_[j] << tab
+                        << binEdges_[j + 1] << tab
+                        << nParticles[j] << tab
+                        << nParticlesCumulative_[i][j]
+                        << nl;
+                }
+            }
+        }
+
+        dParticles_[i].clearStorage();
+        nParticles_[i].clearStorage();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.H
similarity index 55%
rename from src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.H
index c8b3b99239..6b2866fd40 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleHistogram/ParticleHistogram.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,64 +24,86 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::PatchParticleHistogram
+    Foam::ParticleHistogram
 
 Description
     Computes a histogram for the distribution of particle diameters
-    and corresponding number of particles hitting on a given list of patches.
+    and corresponding number of particles hitting on a given list of
+    patches or face zones.
 
     Operands:
     \table
       Operand        | Type | Location
       input          | -    | -
-      output file    | dat  | $FOAM_CASE/postProcessing/\<FO\>/\<time\>/\<file\>
+      output file    | dat  | \<case\>/postProcessing/\<FO\>/\<time\>/\<file\>
       output field   | -    | -
     \endtable
 
-    The output file contains two columns, the first is the bin edges of
-    the particle diameter (i.e. \c d), and the second is the number of
-    particles whose diameter falling into the corresponding bin
-    (i.e. \c nParticles).
+    The output file contains four columns, from the first to the last:
+    \vartable
+        dEdge1      | Left bin-edge of particle diameter
+        dEdge2      | Right bin-edge of particle diameter
+        nParticles  | Number of particles falling into the corresponding bin
+        nParticlesCumulative | Cumulative number of binned particles
+    \endvartable
 
 Usage
     Minimal example by using
     \c constant/reactingCloud1Properties.cloudFunctions:
     \verbatim
-    patchParticleHistogram1
+    particleHistogram1
     {
-        // Mandatory entries (unmodifiable)
-        type             patchParticleHistogram;
-        patches          (<patch1> <patch2> ... <patchN>);
-        nBins            10;
-        min              0.1;
-        max              10.0;
-        maxStoredParcels 20;
+        // Mandatory entries
+        type                 particleHistogram;
+        nBins                <label>;
+        min                  <scalar>;
+        max                  <scalar>;
+        maxStoredParcels     <scalar>;
+
+        // Conditional entries
+
+            // Option-1
+            patches          (<wordRes>);
+
+            // Option-2
+            faceZones        (<wordRes>);
+
+        // Inherited entries
+        ...
     }
     \endverbatim
 
     where the entries mean:
     \table
-      Property     | Description                        | Type   | Reqd  | Dflt
-      type         | Type name: patchParticleHistogram  | word   |  yes  | -
-      patches      | Names of operand patches         | wordList |  yes  | -
+      Property     | Description                        | Type   | Reqd  | Deflt
+      type         | Type name: particleHistogram       | word   |  yes  | -
       nBins        | Number of histogram bins           | label  |  yes  | -
       max          | Maximum value of histogram data    | scalar |  yes  | -
       min          | Minimum value of histogram data    | scalar |  yes  | -
       maxStoredParcels | Maximum number of parcels to process | label | yes | -
+      patches      | Names of operand patches          | wordRes |  choice  | -
+      faceZones    | Names of operand face zones       | wordRes |  choice  | -
     \endtable
 
+    The inherited entries are elaborated in:
+      - \link CloudFunctionObject.H \endlink
+      - \link writeFile.H \endlink
+
 Note
   - The underlying type of \c maxStoredParcels is set as a scalar for I/O.
 
 SourceFiles
-    PatchParticleHistogram.C
+    ParticleHistogram.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PatchParticleHistogram_H
-#define PatchParticleHistogram_H
+#ifndef Foam_ParticleHistogram_H
+#define Foam_ParticleHistogram_H
 
 #include "CloudFunctionObject.H"
+#include "writeFile.H"
+#include "MinMax.H"
+#include "cloudFunctionObjectTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,81 +111,64 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class PatchParticleHistogram Declaration
+                    Class ParticleHistogram Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class PatchParticleHistogram
+class ParticleHistogram
 :
-    public CloudFunctionObject<CloudType>
+    public CloudFunctionObject<CloudType>,
+    public functionObjects::writeFile
 {
     // Private Data
 
-        //- Convenience typedef for parcel type
-        typedef typename CloudType::particleType parcelType;
+        // Typedefs
+
+            //- Convenience typedef for parcel type
+            typedef typename CloudType::particleType parcelType;
+
+        //- Collector surfaces
+        cloudFunctionObjectTools::collector collector_;
 
         //- Number of data bins
         const label nBins_;
 
-        //- Minimum value of histogram data
-        const scalar min_;
-
-        //- Maximum value of histogram data
-        const scalar max_;
-
-        //- Bin width of histogram
-        const scalar delta_;
-
         //- Maximum number of parcels to store - set as a scalar for I/O
         const scalar maxStoredParcels_;
 
+        //- Min/Max value of histogram data
+        const scalarMinMax range_;
+
         //- Bin edges of histogram
         scalarField binEdges_;
 
-        //- List of patch indices to post-process
-        labelList patchIDs_;
-
-        //- Accumulated number of particles per patch
+        //- Accumulated number of particles per surface
         //- binned according to the histogram settings
-        List<List<scalar>> nParticlesCumulative_;
+        List<scalarList> nParticlesCumulative_;
 
-        //- List of time for each data record
-        List<DynamicList<scalar>> times_;
+        // List of surface-hit particle diameters
+        List<DynamicList<scalar>> dParticles_;
 
-        // List of patch-hit particle diameters
-        List<DynamicList<scalar>> patchDiameters_;
-
-        // List of number of patch-hit particles
-        List<DynamicList<scalar>> patchParticles_;
+        // List of number of surface-hit particles
+        List<DynamicList<scalar>> nParticles_;
 
 
     // Private Member Functions
 
-        //- Return local patchi if patch is in patchIds_ list
-        label applyToPatch(const label globalPatchi) const;
-
-
-protected:
-
-    // Protected Member Functions
-
-        //- Write post-processing info
-        void write();
+        //- Write output file header
+        void writeFileHeader(Ostream& os) const;
 
 
 public:
 
     //- Runtime type information
-    TypeName("patchParticleHistogram");
+    TypeName("particleHistogram");
 
 
     // Constructors
 
-        //- No default construct
-        PatchParticleHistogram() = delete;
-
         //- Construct from dictionary
-        PatchParticleHistogram
+        ParticleHistogram
         (
             const dictionary& dict,
             CloudType& owner,
@@ -171,36 +176,45 @@ public:
         );
 
         //- Copy construct
-        PatchParticleHistogram(const PatchParticleHistogram<CloudType>& ppm);
+        ParticleHistogram(const ParticleHistogram<CloudType>& ph);
 
         //- No copy assignment
-        void operator=(const PatchParticleHistogram<CloudType>&) = delete;
+        void operator=(const ParticleHistogram<CloudType>&) = delete;
 
         //- Construct and return a clone
         virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
         {
             return autoPtr<CloudFunctionObject<CloudType>>
             (
-                new PatchParticleHistogram<CloudType>(*this)
+                new ParticleHistogram<CloudType>(*this)
             );
         }
 
 
     //- Destructor
-    virtual ~PatchParticleHistogram() = default;
+    virtual ~ParticleHistogram() = default;
 
 
     // Member Functions
 
-        // Evaluation
+    // Evaluation
 
-            //- Post-patch hook
-            virtual void postPatch
-            (
-                const parcelType& p,
-                const polyPatch& pp,
-                bool& keepParticle
-            );
+        //- Post-patch hook
+        virtual void postPatch
+        (
+            const parcelType& p,
+            const polyPatch& pp,
+            bool& keepParticle
+        );
+
+        //- Post-face hook
+        virtual void postFace(const parcelType& p, bool& keepParticle);
+
+
+    // I-O
+
+        //- Write post-processing info
+        virtual void write();
 };
 
 
@@ -212,7 +226,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "PatchParticleHistogram.C"
+    #include "ParticleHistogram.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.C
deleted file mode 100644
index 43b04a80c0..0000000000
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchParticleHistogram/PatchParticleHistogram.C
+++ /dev/null
@@ -1,253 +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 "PatchParticleHistogram.H"
-#include "Pstream.H"
-#include "stringListOps.H"
-#include "ListOps.H"
-#include "ListListOps.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::label Foam::PatchParticleHistogram<CloudType>::applyToPatch
-(
-    const label globalPatchi
-) const
-{
-    return patchIDs_.find(globalPatchi);
-}
-
-
-// * * * * * * * * * * * * * protected Member Functions  * * * * * * * * * * //
-
-template<class CloudType>
-void Foam::PatchParticleHistogram<CloudType>::write()
-{
-    forAll(times_, i)
-    {
-        List<List<scalar>> procTimes(Pstream::nProcs());
-        procTimes[Pstream::myProcNo()] = times_[i];
-        Pstream::gatherList(procTimes);
-
-        List<List<scalar>> procDiameters(Pstream::nProcs());
-        procDiameters[Pstream::myProcNo()] = patchDiameters_[i];
-        Pstream::gatherList(procDiameters);
-
-        List<List<scalar>> procParticles(Pstream::nProcs());
-        procParticles[Pstream::myProcNo()] = patchParticles_[i];
-        Pstream::gatherList(procParticles);
-
-        if (Pstream::master())
-        {
-            const fvMesh& mesh = this->owner().mesh();
-
-            mkDir(this->writeTimeDir());
-
-            const word& patchName = mesh.boundaryMesh()[patchIDs_[i]].name();
-
-            OFstream patchOutFile
-            (
-                this->writeTimeDir()/patchName + ".post",
-                IOstreamOption::ASCII,
-                mesh.time().writeCompression()
-            );
-
-            List<scalar> globalTimes;
-            globalTimes = ListListOps::combine<List<scalar>>
-            (
-                procTimes,
-                accessOp<List<scalar>>()
-            );
-
-            List<scalar> globalDiameters;
-            globalDiameters = ListListOps::combine<List<scalar>>
-            (
-                procDiameters,
-                accessOp<List<scalar>>()
-            );
-
-            List<scalar> globalParticles;
-            globalParticles = ListListOps::combine<List<scalar>>
-            (
-                procParticles,
-                accessOp<List<scalar>>()
-            );
-
-            // Compute histogram
-            List<scalar> nParticles(nBins_, Zero);
-            forAll(globalDiameters, j)
-            {
-                const label bini = (globalDiameters[j] - min_)/delta_;
-                if (bini >= 0 && bini < nBins_)
-                {
-                    nParticles[bini] += globalParticles[j];
-                    nParticlesCumulative_[i][bini] += globalParticles[j];
-                }
-            }
-
-            patchOutFile
-                << "# nBin=" << nBins_
-                << "; min="  << min_
-                << "; max="  << max_ << nl
-                << "# dEdge1    dEdge2    nParticles    nParticlesCumulative"
-                << endl;
-
-            forAll(nParticles, j)
-            {
-                patchOutFile
-                    << binEdges_[j]
-                    << ' '
-                    << binEdges_[j + 1]
-                    << ' '
-                    << nParticles[j]
-                    << ' '
-                    << nParticlesCumulative_[i][j]
-                    << nl;
-            }
-        }
-
-        times_[i].clearStorage();
-        patchDiameters_[i].clearStorage();
-        patchParticles_[i].clearStorage();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::PatchParticleHistogram<CloudType>::PatchParticleHistogram
-(
-    const dictionary& dict,
-    CloudType& owner,
-    const word& modelName
-)
-:
-    CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
-    nBins_(dict.getCheck<label>("nBins", labelMinMax::ge(1))),
-    min_(dict.getScalar("min")),
-    max_(dict.getScalar("max")),
-    delta_((max_ - min_)/scalar(nBins_)),
-    maxStoredParcels_(dict.getScalar("maxStoredParcels")),
-    binEdges_(nBins_ + 1),
-    patchIDs_(),
-    nParticlesCumulative_(),
-    times_(),
-    patchDiameters_(),
-    patchParticles_()
-{
-    if (min_ >= max_)
-    {
-        FatalIOErrorInFunction(dict)
-            << "Histogram minimum = " << min_
-            << ", cannot be larger than histogram maximum = " << max_
-            << exit(FatalIOError);
-    }
-
-    if (maxStoredParcels_ <= 0)
-    {
-        FatalIOErrorInFunction(dict)
-            << "maxStoredParcels = " << maxStoredParcels_
-            << ", cannot be equal to or less than zero"
-            << exit(FatalIOError);
-    }
-
-    // Compute histogram-bin properties
-    binEdges_[0] = min_;
-    for (label i = 0; i < nBins_; ++i)
-    {
-        const scalar next = min_ + (i+1)*delta_;
-        binEdges_[i+1] = next;
-    }
-
-    // Compute histogram-patch properties
-    const wordRes patchMatcher(dict.get<wordRes>("patches"));
-
-    patchIDs_ = patchMatcher.matching(owner.mesh().boundaryMesh().names());
-
-    if (patchIDs_.empty())
-    {
-        FatalIOErrorInFunction(dict)
-            << "No matching patches found: "
-            << flatOutput(patchMatcher) << nl
-            << exit(FatalIOError);
-    }
-
-    nParticlesCumulative_ =
-        List<List<scalar>>(patchIDs_.size(), List<scalar>(nBins_, Zero));
-
-    times_.setSize(patchIDs_.size());
-    patchDiameters_.setSize(patchIDs_.size());
-    patchParticles_.setSize(patchIDs_.size());
-}
-
-
-template<class CloudType>
-Foam::PatchParticleHistogram<CloudType>::PatchParticleHistogram
-(
-    const PatchParticleHistogram<CloudType>& ppm
-)
-:
-    CloudFunctionObject<CloudType>(ppm),
-    nBins_(ppm.nBins_),
-    min_(ppm.min_),
-    max_(ppm.max_),
-    delta_(ppm.delta_),
-    maxStoredParcels_(ppm.maxStoredParcels_),
-    binEdges_(ppm.binEdges_),
-    patchIDs_(ppm.patchIDs_),
-    nParticlesCumulative_(ppm.nParticlesCumulative_),
-    times_(ppm.times_),
-    patchDiameters_(ppm.patchDiameters_),
-    patchParticles_(ppm.patchParticles_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class CloudType>
-void Foam::PatchParticleHistogram<CloudType>::postPatch
-(
-    const parcelType& p,
-    const polyPatch& pp,
-    bool&
-)
-{
-    const label patchi = pp.index();
-    const label localPatchi = applyToPatch(patchi);
-
-    if (localPatchi != -1 && times_[localPatchi].size() < maxStoredParcels_)
-    {
-        times_[localPatchi].append(this->owner().time().value());
-        patchDiameters_[localPatchi].append(p.d());
-        patchParticles_[localPatchi].append(p.nParticle());
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
index 2222916d68..9dfedc27c4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
@@ -531,7 +531,7 @@ in the injection models set above we have
 36  μm ->  2 parcels per second
 45  μm ->  2 parcels per second
 
-therefore in the following "patchParticleHistogram1" we can set
+therefore in the following "particleHistogram1" we can set
     nBins = 9
     min = 0μm
     max = 45μm
@@ -547,9 +547,9 @@ in this ways the particles hitting the patches will be classified in the followi
     9) 40.01μm to 45.01μm <- the 45μm particles will be counted in this range
 */
 
-    patchParticleHistogram1
+    particleHistogram1
     {
-        type            patchParticleHistogram;
+        type            particleHistogram;
         patches
         (
             roof
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
index 661e3e1d16..569edc4ee5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -167,9 +167,9 @@ cloudFunctions
         writer          vtk;
     }
 
-    patchParticleHistogram1
+    particleHistogram1
     {
-        type            patchParticleHistogram;
+        type            particleHistogram;
         patches
         (
             cycLeft_half0

From 2eb2de5f8ee95cdab35078624d741310313f2eba Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Thu, 19 Jan 2023 11:21:29 +0000
Subject: [PATCH 278/348] ENH: ParticlePostProcessing: refactor
 PatchPostProcessing function object

- enable 'faceZones' support.
- enable 'writeFile' support to better control file output.
- rename 'PatchPostProcessing' as 'ParticlePostProcessing' for better clarity.
- fix #1808
---
 .../include/makeParcelCloudFunctionObjects.H  |   4 +-
 .../makeReactingParcelCloudFunctionObjects.H  |   4 +-
 .../makeThermoParcelCloudFunctionObjects.H    |   4 +-
 .../ParticlePostProcessing.C                  | 269 ++++++++++++++++++
 .../ParticlePostProcessing.H                  | 226 +++++++++++++++
 .../PatchPostProcessing/PatchPostProcessing.C | 216 --------------
 .../PatchPostProcessing/PatchPostProcessing.H | 171 -----------
 .../PatchPostProcessingI.H                    |  42 ---
 .../constant/reactingCloud1Properties         |   4 +-
 .../filter/constant/reactingCloud1Properties  |   4 +-
 .../constant/reactingCloud1Properties         |   4 +-
 .../constant/reactingCloud1Properties         |   4 +-
 .../constant/reactingCloud1Properties         |   4 +-
 .../filter/constant/reactingCloud1Properties  |   4 +-
 14 files changed, 513 insertions(+), 447 deletions(-)
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.C
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.H
 delete mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
 delete mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
 delete mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H

diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index f2fc385cb6..137e3ecb34 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -39,9 +39,9 @@ License
 #include "ParticleTrap.H"
 #include "ParticleZoneInfo.H"
 #include "ParticleHistogram.H"
+#include "ParticlePostProcessing.H"
 #include "PatchCollisionDensity.H"
 #include "PatchInteractionFields.H"
-#include "PatchPostProcessing.H"
 #include "RemoveParcels.H"
 #include "VoidFraction.H"
 #include "KinematicReynoldsNumber.H"
@@ -61,9 +61,9 @@ License
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
     makeCloudFunctionObjectType(ParticleZoneInfo, CloudType);                  \
     makeCloudFunctionObjectType(ParticleHistogram, CloudType);                 \
+    makeCloudFunctionObjectType(ParticlePostProcessing, CloudType);            \
     makeCloudFunctionObjectType(PatchCollisionDensity, CloudType);             \
     makeCloudFunctionObjectType(PatchInteractionFields, CloudType);            \
-    makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
     makeCloudFunctionObjectType(RemoveParcels, CloudType);                     \
     makeCloudFunctionObjectType(VoidFraction, CloudType);                      \
     makeCloudFunctionObjectType(KinematicReynoldsNumber, CloudType);           \
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H
index e620ceb4c1..30bfada4de 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H
@@ -39,9 +39,9 @@ License
 #include "ParticleTrap.H"
 #include "ParticleZoneInfo.H"
 #include "ParticleHistogram.H"
+#include "ParticlePostProcessing.H"
 #include "PatchCollisionDensity.H"
 #include "PatchInteractionFields.H"
-#include "PatchPostProcessing.H"
 #include "RemoveParcels.H"
 #include "VoidFraction.H"
 #include "NusseltNumber.H"
@@ -64,9 +64,9 @@ License
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
     makeCloudFunctionObjectType(ParticleZoneInfo, CloudType);                  \
     makeCloudFunctionObjectType(ParticleHistogram, CloudType);                 \
+    makeCloudFunctionObjectType(ParticlePostProcessing, CloudType);            \
     makeCloudFunctionObjectType(PatchCollisionDensity, CloudType);             \
     makeCloudFunctionObjectType(PatchInteractionFields, CloudType);            \
-    makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
     makeCloudFunctionObjectType(RemoveParcels, CloudType);                     \
     makeCloudFunctionObjectType(VoidFraction, CloudType);                      \
     makeCloudFunctionObjectType(NusseltNumber, CloudType);                     \
diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H
index 4a8a37f4fc..f43ae83b60 100644
--- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H
@@ -38,9 +38,9 @@ License
 #include "ParticleTrap.H"
 #include "ParticleZoneInfo.H"
 #include "ParticleHistogram.H"
+#include "ParticlePostProcessing.H"
 #include "PatchCollisionDensity.H"
 #include "PatchInteractionFields.H"
-#include "PatchPostProcessing.H"
 #include "RemoveParcels.H"
 #include "VoidFraction.H"
 #include "NusseltNumber.H"
@@ -62,9 +62,9 @@ License
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                      \
     makeCloudFunctionObjectType(ParticleZoneInfo, CloudType);                  \
     makeCloudFunctionObjectType(ParticleHistogram, CloudType);                 \
+    makeCloudFunctionObjectType(ParticlePostProcessing, CloudType);            \
     makeCloudFunctionObjectType(PatchCollisionDensity, CloudType);             \
     makeCloudFunctionObjectType(PatchInteractionFields, CloudType);            \
-    makeCloudFunctionObjectType(PatchPostProcessing, CloudType);               \
     makeCloudFunctionObjectType(RemoveParcels, CloudType);                     \
     makeCloudFunctionObjectType(VoidFraction, CloudType);                      \
     makeCloudFunctionObjectType(NusseltNumber, CloudType);                     \
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.C
new file mode 100644
index 0000000000..32175a1fee
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.C
@@ -0,0 +1,269 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2019-2023 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 "ParticlePostProcessing.H"
+#include "Pstream.H"
+#include "stringListOps.H"
+#include "ListOps.H"
+#include "ListListOps.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticlePostProcessing<CloudType>::writeFileHeader(Ostream& os) const
+{
+    this->writeCommented(os, "Time");
+    os  << ' ' << "currentProc";
+
+    if (!header_.empty())
+    {
+        os  << ' ' << header_;
+    }
+
+    os  << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ParticlePostProcessing<CloudType>::ParticlePostProcessing
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& modelName
+)
+:
+    CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
+    functionObjects::writeFile
+    (
+        owner,
+        this->localPath(),
+        typeName
+    ),
+    collector_(this->coeffDict(), owner.mesh()),
+    maxStoredParcels_(this->coeffDict().getScalar("maxStoredParcels")),
+    header_(),
+    fields_(),
+    times_(),
+    data_()
+{
+    writeFile::read(this->coeffDict());
+
+    this->coeffDict().readIfPresent("fields", fields_);
+
+    if (maxStoredParcels_ <= 0)
+    {
+        FatalIOErrorInFunction(this->coeffDict())
+            << "maxStoredParcels = " << maxStoredParcels_
+            << ", cannot be equal to or less than zero"
+            << exit(FatalIOError);
+    }
+
+    const label sz = collector_.size();
+    times_.resize(sz);
+    data_.resize(sz);
+}
+
+
+template<class CloudType>
+Foam::ParticlePostProcessing<CloudType>::ParticlePostProcessing
+(
+    const ParticlePostProcessing<CloudType>& ppp
+)
+:
+    CloudFunctionObject<CloudType>(ppp),
+    writeFile(ppp),
+    collector_(ppp.collector_),
+    maxStoredParcels_(ppp.maxStoredParcels_),
+    header_(ppp.header_),
+    fields_(ppp.fields_),
+    times_(ppp.times_),
+    data_(ppp.data_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticlePostProcessing<CloudType>::postPatch
+(
+    const parcelType& p,
+    const polyPatch& pp,
+    bool&
+)
+{
+    if (!collector_.isPatch())
+    {
+        return;
+    }
+
+    const label patchi = pp.index();
+    const label localPatchi = collector_.IDs().find(patchi);
+
+    if (header_.empty())
+    {
+        OStringStream data;
+        p.writeProperties(data, fields_, " ", true);
+        header_ = data.str();
+    }
+
+    if (localPatchi != -1 && data_[localPatchi].size() < maxStoredParcels_)
+    {
+        times_[localPatchi].append(this->owner().time().value());
+
+        OStringStream data;
+        data<< Pstream::myProcNo();
+        p.writeProperties(data, fields_, " ", false);
+
+        data_[localPatchi].append(data.str());
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticlePostProcessing<CloudType>::postFace
+(
+    const parcelType& p,
+    bool&
+)
+{
+    if (collector_.isPatch())
+    {
+        return;
+    }
+
+    const labelList& IDs = collector_.IDs();
+    const List<boundBox>& BBs = collector_.BBs();
+    const faceZoneMesh& fzm = this->owner().mesh().faceZones();
+
+    if (header_.empty())
+    {
+        OStringStream data;
+        p.writeProperties(data, fields_, " ", true);
+        header_ = data.str();
+    }
+
+    forAll(IDs, i)
+    {
+        if (!BBs[i].contains(p.position()))
+        {
+            // Quick reject if the particle is not in the face zone bound box
+            continue;
+        }
+
+        const label zonei = IDs[i];
+        const label localFacei = fzm[zonei].find(p.face());
+
+        if (localFacei != -1 && data_[localFacei].size() < maxStoredParcels_)
+        {
+            times_[i].append(this->owner().time().value());
+
+            OStringStream data;
+            data<< Pstream::myProcNo();
+            p.writeProperties(data, fields_, " ", false);
+
+            data_[i].append(data.str());
+        }
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticlePostProcessing<CloudType>::write()
+{
+    const wordList& names = collector_.names();
+
+    forAll(names, i)
+    {
+        List<scalarList> procTimes(Pstream::nProcs());
+        procTimes[Pstream::myProcNo()] = times_[i];
+        Pstream::gatherList(procTimes);
+
+        List<List<string>> procData(Pstream::nProcs());
+        procData[Pstream::myProcNo()] = data_[i];
+        Pstream::gatherList(procData);
+
+        Pstream::combineReduce
+        (
+            header_,
+            [](string& x, const string& y)
+            {
+                if (y.size() > x.size())
+                {
+                    x = y;
+                }
+            }
+        );
+
+        if (Pstream::master())
+        {
+            List<string> globalData;
+            globalData = ListListOps::combine<List<string>>
+            (
+                procData,
+                accessOp<List<string>>()
+            );
+
+            scalarList globalTimes;
+            globalTimes = ListListOps::combine<scalarList>
+            (
+                procTimes,
+                accessOp<scalarList>()
+            );
+
+            if (this->writeToFile())
+            {
+                autoPtr<OFstream> osPtr = this->newFileAtTime
+                (
+                    names[i],
+                    this->owner().time().value()
+                );
+                OFstream& os = osPtr.ref();
+
+                writeFileHeader(os);
+
+                const labelList indices(sortedOrder(globalTimes));
+                forAll(globalTimes, j)
+                {
+                    const label datai = indices[j];
+
+                    os  << globalTimes[datai] << tab
+                        << globalData[datai].c_str()
+                        << nl;
+                }
+            }
+        }
+
+        times_[i].clearStorage();
+        data_[i].clearStorage();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.H
new file mode 100644
index 0000000000..20150c5210
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticlePostProcessing/ParticlePostProcessing.H
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2019-2023 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::ParticlePostProcessing
+
+Description
+    Writes out various standard Lagrangian data elements of
+    particles hitting on a given list of patches or face zones.
+
+    Operands:
+    \table
+      Operand        | Type | Location
+      input          | -    | -
+      output file    | dat  | \<case\>/postProcessing/\<FO\>/\<time\>/\<file\>
+      output field   | -    | -
+    \endtable
+
+    The output file contains columns depending on the \c fields entry.
+
+Usage
+    Minimal example by using
+    \c constant/reactingCloud1Properties.cloudFunctions:
+    \verbatim
+    ParticlePostProcessing1
+    {
+        // Mandatory entries
+        type                 particlePostProcessing;
+        maxStoredParcels     <scalar>;
+
+        // Optional entries
+        fields               (<wordRes>);
+
+        // Conditional entries
+
+            // Option-1
+            patches          (<wordRes>);
+
+            // Option-2
+            faceZones        (<wordRes>);
+
+        // Inherited entries
+        ...
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property     | Description                        | Type   | Reqd  | Deflt
+      type         | Type name: particlePostProcessing  | word   |  yes  | -
+      maxStoredParcels | Maximum number of parcels to process | label | yes | -
+      fields       | Names of standard Lagrangian fields | wordRes | no  | all
+      patches      | Names of operand patches          | wordRes |  choice  | -
+      faceZones    | Names of operand face zones       | wordRes |  choice  | -
+    \endtable
+
+    The inherited entries are elaborated in:
+      - \link CloudFunctionObject.H \endlink
+      - \link writeFile.H \endlink
+
+Note
+  - The underlying type of \c maxStoredParcels is set as a scalar for I/O.
+  - Empty files indicate that no particles hit selected surfaces.
+
+SourceFiles
+    ParticlePostProcessing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_ParticlePostProcessing_H
+#define Foam_ParticlePostProcessing_H
+
+#include "CloudFunctionObject.H"
+#include "writeFile.H"
+#include "cloudFunctionObjectTools.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class ParticlePostProcessing Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ParticlePostProcessing
+:
+    public CloudFunctionObject<CloudType>,
+    public functionObjects::writeFile
+{
+    // Private Data
+
+        // Typedefs
+
+            //- Convenience typedef for parcel type
+            typedef typename CloudType::particleType parcelType;
+
+        //- Collector surfaces
+        cloudFunctionObjectTools::collector collector_;
+
+        //- Maximum number of parcels to store - set as a scalar for I/O
+        scalar maxStoredParcels_;
+
+        //- Field header
+        string header_;
+
+        //- Field name filters
+        wordRes fields_;
+
+        //- List of times for each data record
+        List<DynamicList<scalar>> times_;
+
+        //- List of output data per surface
+        List<DynamicList<string>> data_;
+
+
+    // Private Member Functions
+
+        //- Write output file header
+        void writeFileHeader(Ostream& os) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("particlePostProcessing");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ParticlePostProcessing
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& modelName
+        );
+
+        //- Copy construct
+        ParticlePostProcessing(const ParticlePostProcessing<CloudType>& ppp);
+
+        //- No copy assignment
+        void operator=(const ParticlePostProcessing<CloudType>&) = delete;
+
+        //- Construct and return a clone
+        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
+        {
+            return autoPtr<CloudFunctionObject<CloudType>>
+            (
+                new ParticlePostProcessing<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~ParticlePostProcessing() = default;
+
+
+    // Member Functions
+
+    // Access
+
+        //- Return maximum number of parcels to store per surface
+        label maxStoredParcels() const noexcept { return maxStoredParcels_; }
+
+
+    // Evaluation
+
+        //- Post-patch hook
+        virtual void postPatch
+        (
+            const parcelType& p,
+            const polyPatch& pp,
+            bool& keepParticle
+        );
+
+        //- Post-face hook
+        virtual void postFace(const parcelType& p, bool& keepParticle);
+
+
+    // I-O
+
+        //- Write post-processing info
+        virtual void write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "ParticlePostProcessing.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
deleted file mode 100644
index c5310ac0e5..0000000000
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ /dev/null
@@ -1,216 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 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 "PatchPostProcessing.H"
-#include "Pstream.H"
-#include "stringListOps.H"
-#include "ListOps.H"
-#include "ListListOps.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::label Foam::PatchPostProcessing<CloudType>::applyToPatch
-(
-    const label globalPatchi
-) const
-{
-    return patchIDs_.find(globalPatchi);
-}
-
-
-// * * * * * * * * * * * * * protected Member Functions  * * * * * * * * * * //
-
-template<class CloudType>
-void Foam::PatchPostProcessing<CloudType>::write()
-{
-    forAll(patchData_, i)
-    {
-        List<List<scalar>> procTimes(Pstream::nProcs());
-        procTimes[Pstream::myProcNo()] = times_[i];
-        Pstream::gatherList(procTimes);
-
-        List<List<string>> procData(Pstream::nProcs());
-        procData[Pstream::myProcNo()] = patchData_[i];
-        Pstream::gatherList(procData);
-
-        if (Pstream::master())
-        {
-            const fvMesh& mesh = this->owner().mesh();
-
-            // Create directory if it doesn't exist
-            mkDir(this->writeTimeDir());
-
-            const word& patchName = mesh.boundaryMesh()[patchIDs_[i]].name();
-
-            OFstream patchOutFile
-            (
-                this->writeTimeDir()/patchName + ".post",
-                IOstreamOption::ASCII,
-                mesh.time().writeCompression()
-            );
-
-            List<string> globalData;
-            globalData = ListListOps::combine<List<string>>
-            (
-                procData,
-                accessOp<List<string>>()
-            );
-
-            List<scalar> globalTimes;
-            globalTimes = ListListOps::combine<List<scalar>>
-            (
-                procTimes,
-                accessOp<List<scalar>>()
-            );
-
-            labelList indices(sortedOrder(globalTimes));
-
-            string header("# Time currentProc " + header_);
-            patchOutFile<< header.c_str() << nl;
-
-            forAll(globalTimes, i)
-            {
-                label dataI = indices[i];
-
-                patchOutFile
-                    << globalTimes[dataI] << ' '
-                    << globalData[dataI].c_str()
-                    << nl;
-            }
-        }
-
-        patchData_[i].clearStorage();
-        times_[i].clearStorage();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
-(
-    const dictionary& dict,
-    CloudType& owner,
-    const word& modelName
-)
-:
-    CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
-    maxStoredParcels_(this->coeffDict().getScalar("maxStoredParcels")),
-    fields_(),
-    patchIDs_(),
-    times_(),
-    patchData_(),
-    header_()
-{
-    // The "fields" filter is optional
-    this->coeffDict().readIfPresent("fields", fields_);
-
-    // The "patches" are required
-    const wordRes patchMatcher(this->coeffDict().lookup("patches"));
-
-    patchIDs_ = patchMatcher.matching(owner.mesh().boundaryMesh().names());
-
-    if (patchIDs_.empty())
-    {
-        WarningInFunction
-            << "No matching patches found: "
-            << flatOutput(patchMatcher) << nl;
-    }
-
-    if (debug)
-    {
-        Info<< "Post-process fields "
-            << flatOutput(fields_) << nl;
-
-        Info<< "On patches (";
-
-        for (const label patchi : patchIDs_)
-        {
-            Info<< ' ' << owner.mesh().boundaryMesh()[patchi].name();
-        }
-
-        Info<< " )" << nl;
-    }
-
-    patchData_.setSize(patchIDs_.size());
-    times_.setSize(patchIDs_.size());
-}
-
-
-template<class CloudType>
-Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
-(
-    const PatchPostProcessing<CloudType>& ppm
-)
-:
-    CloudFunctionObject<CloudType>(ppm),
-    maxStoredParcels_(ppm.maxStoredParcels_),
-    fields_(ppm.fields_),
-    patchIDs_(ppm.patchIDs_),
-    times_(ppm.times_),
-    patchData_(ppm.patchData_),
-    header_(ppm.header_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class CloudType>
-void Foam::PatchPostProcessing<CloudType>::postPatch
-(
-    const parcelType& p,
-    const polyPatch& pp,
-    bool&
-)
-{
-    const label patchi = pp.index();
-    const label localPatchi = applyToPatch(patchi);
-
-    if (header_.empty())
-    {
-        OStringStream data;
-        p.writeProperties(data, fields_, " ", true);
-        header_ = data.str();
-    }
-
-    if (localPatchi != -1 && patchData_[localPatchi].size() < maxStoredParcels_)
-    {
-        times_[localPatchi].append(this->owner().time().value());
-
-        OStringStream data;
-        data<< Pstream::myProcNo();
-        p.writeProperties(data, fields_, " ", false);
-
-        patchData_[localPatchi].append(data.str());
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
deleted file mode 100644
index 4e1f6c4eb7..0000000000
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
+++ /dev/null
@@ -1,171 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 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::PatchPostProcessing
-
-Group
-    grpLagrangianIntermediateFunctionObjects
-
-Description
-    Standard post-processing
-
-SourceFiles
-    PatchPostProcessing.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef PatchPostProcessing_H
-#define PatchPostProcessing_H
-
-#include "CloudFunctionObject.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class PatchPostProcessing Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class CloudType>
-class PatchPostProcessing
-:
-    public CloudFunctionObject<CloudType>
-{
-    // Private data
-
-        typedef typename CloudType::particleType parcelType;
-
-        //- Maximum number of parcels to store - set as a scalar for I/O
-        scalar maxStoredParcels_;
-
-        //- Field name filters
-        wordRes fields_;
-
-        //- List of patch indices to post-process
-        labelList patchIDs_;
-
-        //- List of time for each data record
-        List<DynamicList<scalar>> times_;
-
-        //- List of output data per patch
-        List<DynamicList<string>> patchData_;
-
-        //- Field header
-        string header_;
-
-
-    // Private Member Functions
-
-        //- Returns local patchi if patch is in patchIds_ list
-        label applyToPatch(const label globalPatchi) const;
-
-
-protected:
-
-    // Protected Member Functions
-
-        //- Write post-processing info
-        void write();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("patchPostProcessing");
-
-
-    // Constructors
-
-        //- Construct from dictionary
-        PatchPostProcessing
-        (
-            const dictionary& dict,
-            CloudType& owner,
-            const word& modelName
-        );
-
-        //- Construct copy
-        PatchPostProcessing(const PatchPostProcessing<CloudType>& ppm);
-
-        //- Construct and return a clone
-        virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
-        {
-            return autoPtr<CloudFunctionObject<CloudType>>
-            (
-                new PatchPostProcessing<CloudType>(*this)
-            );
-        }
-
-
-    //- Destructor
-    virtual ~PatchPostProcessing() = default;
-
-
-    // Member Functions
-
-        // Access
-
-            //- Return maximum number of parcels to store per patch
-            inline label maxStoredParcels() const;
-
-            //- Return const mapping from local to global patch ids
-            inline const labelList& patchIDs() const;
-
-
-        // Evaluation
-
-            //- Post-patch hook
-            virtual void postPatch
-            (
-                const parcelType& p,
-                const polyPatch& pp,
-                bool& keepParticle
-            );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "PatchPostProcessingI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "PatchPostProcessing.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H
deleted file mode 100644
index 936ac0f6b4..0000000000
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-template<class CloudType>
-Foam::label Foam::PatchPostProcessing<CloudType>::maxStoredParcels() const
-{
-    return maxStoredParcels_;
-}
-
-
-template<class CloudType>
-const Foam::labelList& Foam::PatchPostProcessing<CloudType>::patchIDs() const
-{
-    return patchIDs_;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
index 9dfedc27c4..7046b1e6bf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
@@ -564,9 +564,9 @@ in this ways the particles hitting the patches will be classified in the followi
         maxStoredParcels 100000000;
     }
 
-    patchPostProcessing1
+    particlePostProcessing1
     {
-        type            patchPostProcessing;
+        type            particlePostProcessing;
         fields          (position origId d);
         maxStoredParcels 100000000;
         patches
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
index 569edc4ee5..109fe2bcb9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -181,9 +181,9 @@ cloudFunctions
         maxStoredParcels 20;
     }
 
-    patchPostProcessing1
+    particlePostProcessing1
     {
-        type            patchPostProcessing;
+        type            particlePostProcessing;
         fields          (position "U.*" d T nParticle);
         maxStoredParcels 20;
         patches
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 9b942452b6..78a56cb859 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -175,9 +175,9 @@ subModels
 
 cloudFunctions
 {
-    patchPostProcessing1
+    particlePostProcessing1
     {
-        type            patchPostProcessing;
+        type            particlePostProcessing;
         maxStoredParcels 100;
         patches         ( outlet );
     }
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 45cf1123fc..187b44cdf3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -177,9 +177,9 @@ subModels
 
 cloudFunctions
 {
-    patchPostProcessing1
+    particlePostProcessing1
     {
-        type            patchPostProcessing;
+        type            particlePostProcessing;
         maxStoredParcels 100;
         patches         ( outlet );
     }
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index cb7f07b827..eaf32c6253 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -177,9 +177,9 @@ subModels
 
 cloudFunctions
 {
-    patchPostProcessing1
+    particlePostProcessing1
     {
-        type            patchPostProcessing;
+        type            particlePostProcessing;
         maxStoredParcels 100;
         patches         ( outlet );
     }
diff --git a/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties b/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
index 0d4984003a..3de4532bc9 100644
--- a/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
+++ b/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
@@ -158,9 +158,9 @@ subModels
 
 cloudFunctions
 {
-    patchPostProcessing1
+    particlePostProcessing1
     {
-        type            patchPostProcessing;
+        type            particlePostProcessing;
         maxStoredParcels 20;
         patches
         (

From c8e224b598bb8162b55fca4f9294b7ad20a1ff38 Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Thu, 1 Jun 2023 16:21:00 +0000
Subject: [PATCH 279/348] ENH: lduMatrix: parallel version of DIC,DILU

---
 src/meshTools/Make/files                      |   5 +
 .../distributedDICPreconditioner.C            | 135 +++
 .../distributedDICPreconditioner.H            | 131 +++
 .../distributedDILUPreconditioner.C           | 897 ++++++++++++++++++
 .../distributedDILUPreconditioner.H           | 274 ++++++
 .../processorColour.C                         | 363 +++++++
 .../processorColour.H                         | 156 +++
 7 files changed, 1961 insertions(+)
 create mode 100644 src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.C
 create mode 100644 src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.H
 create mode 100644 src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
 create mode 100644 src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
 create mode 100644 src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C
 create mode 100644 src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.H

diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 4f974d5d2f..bd0112da39 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -309,6 +309,11 @@ $(ACMICycPatches)/cyclicACMIPointPatchField/cyclicACMIPointPatchFields.C
 PeriodicAMICycPatches=$(AMI)/patches/cyclicPeriodicAMI
 $(PeriodicAMICycPatches)/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
 
+extraPreconditioners=matrices/lduMatrix/preconditioners/distributedDILUPreconditioner
+$(extraPreconditioners)/distributedDILUPreconditioner.C
+$(extraPreconditioners)/distributedDICPreconditioner.C
+$(extraPreconditioners)/processorColour.C
+
 multiWorld/multiWorldConnectionsObject.C
 
 mappedPatches/mappedPolyPatch/mappedPatchBase.C
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.C b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.C
new file mode 100644
index 0000000000..64a0bd6210
--- /dev/null
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.C
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "distributedDICPreconditioner.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(distributedDICPreconditioner, 0);
+
+    lduMatrix::preconditioner::
+        addsymMatrixConstructorToTable<distributedDICPreconditioner>
+        adddistributedDICPreconditionerSymMatrixConstructorToTable_;
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::distributedDICPreconditioner::forwardInternalDiag
+(
+    solveScalarField& rD,
+    const label colouri
+) const
+{
+    // Add forward constributions to diagonal
+
+    const auto& matrix = solver_.matrix();
+    const auto& lduAddr = matrix.lduAddr();
+
+    const label* const __restrict__ uPtr = lduAddr.upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr.lowerAddr().begin();
+    const scalar* const __restrict__ upperPtr = matrix.upper().begin();
+
+    const label nFaces = matrix.upper().size();
+    if (cellColourPtr_.valid())
+    {
+        const auto& cellColour = cellColourPtr_();
+        for (label face=0; face<nFaces; face++)
+        {
+            const label cell = lPtr[face];
+            if (cellColour[cell] == colouri)
+            {
+                rD[uPtr[face]] -= upperPtr[face]*upperPtr[face]/rD[cell];
+            }
+        }
+    }
+    else
+    {
+        for (label face=0; face<nFaces; face++)
+        {
+            rD[uPtr[face]] -= upperPtr[face]*upperPtr[face]/rD[lPtr[face]];
+        }
+    }
+}
+
+
+void Foam::distributedDICPreconditioner::forwardInternal
+(
+    solveScalarField& wA,
+    const label colouri
+) const
+{
+    const auto& matrix = solver_.matrix();
+    const auto& lduAddr = matrix.lduAddr();
+
+    solveScalar* __restrict__ wAPtr = wA.begin();
+    const solveScalar* __restrict__ rDPtr = rD_.begin();
+
+    const label* const __restrict__ uPtr = lduAddr.upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr.lowerAddr().begin();
+    const scalar* const __restrict__ upperPtr = matrix.upper().begin();
+
+    const label nFaces = matrix.upper().size();
+    if (cellColourPtr_.valid())
+    {
+        const auto& cellColour = cellColourPtr_();
+        for (label face=0; face<nFaces; face++)
+        {
+            const label cell = lPtr[face];
+            if (cellColour[cell] == colouri)
+            {
+                wAPtr[uPtr[face]] -=
+                    rDPtr[uPtr[face]]*upperPtr[face]*wAPtr[cell];
+            }
+        }
+    }
+    else
+    {
+        for (label face=0; face<nFaces; face++)
+        {
+            wAPtr[uPtr[face]] -=
+                rDPtr[uPtr[face]]*upperPtr[face]*wAPtr[lPtr[face]];
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::distributedDICPreconditioner::distributedDICPreconditioner
+(
+    const lduMatrix::solver& sol,
+    const dictionary& dict
+)
+:
+    distributedDILUPreconditioner(sol, dict)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.H b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.H
new file mode 100644
index 0000000000..6f8e1cba2f
--- /dev/null
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDICPreconditioner.H
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::distributedDICPreconditioner
+
+Group
+    grpLduMatrixPreconditioners
+
+Description
+    Version of DICpreconditioner that uses preconditioning across processor
+    (and coupled) boundaries. Based on 'Parallel Preconditioners' chapter from
+    'Iterative Methods for Sparse Linear Systems' by Yousef Saad.
+
+    Leaves out the handling of boundary nodes after internal nodes since
+    probably not beneficial (so no overlap of comms and internal calculation)
+
+    By default preconditions across coupled boundaries (currently only
+    tested for cyclicAMI). This can be disabled with the 'coupled' setting
+
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  distributedDIC;
+            coupled         false;
+        }
+
+    The cyclicAMI boundary behaviour will only work if
+    - running non-parallel or
+    - different sides of cyclicAMI run on different processors i.e.
+      there is no processor which has cells on both owner and neighbour
+      of the patch pair.
+
+See Also
+    Foam::DICPreconditioner
+    Foam::distributedDILUPreconditioner
+
+SourceFiles
+    distributedDICPreconditioner.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef distributedDICPreconditioner_H
+#define distributedDICPreconditioner_H
+
+#include "distributedDILUPreconditioner.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class distributedDICPreconditioner Declaration
+\*---------------------------------------------------------------------------*/
+
+class distributedDICPreconditioner
+:
+    public distributedDILUPreconditioner
+{
+protected:
+
+    // Protected member functions
+
+        //- Update diagonal for colour
+        virtual void forwardInternalDiag
+        (
+            solveScalarField& rD,
+            const label colouri
+        ) const;
+
+        //- Update preconditioned variable walking forward on internal faces
+        virtual void forwardInternal
+        (
+            solveScalarField& wA,
+            const label colouri
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("distributedDIC");
+
+
+    // Constructors
+
+        //- Construct from matrix components and preconditioner solver controls
+        distributedDICPreconditioner
+        (
+            const lduMatrix::solver&,
+            const dictionary& solverControlsUnused
+        );
+
+
+    //- Destructor
+    virtual ~distributedDICPreconditioner() = default;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
new file mode 100644
index 0000000000..1f92ab7dc4
--- /dev/null
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
@@ -0,0 +1,897 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "distributedDILUPreconditioner.H"
+#include "processorLduInterface.H"
+#include "cyclicLduInterface.H"
+#include "cyclicAMILduInterface.H"
+#include "processorColour.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(distributedDILUPreconditioner, 0);
+
+    lduMatrix::preconditioner::
+        addasymMatrixConstructorToTable<distributedDILUPreconditioner>
+        adddistributedDILUPreconditionerAsymMatrixConstructorToTable_;
+
+    const lduMesh* distributedDILUPreconditioner::meshPtr_ = nullptr;
+
+    autoPtr<labelList> distributedDILUPreconditioner::procColoursPtr_(nullptr);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::distributedDILUPreconditioner::updateMatrixInterfaces
+(
+    const bool add,
+    const FieldField<Field, solveScalar>& coupleCoeffs,
+    const labelList& selectedInterfaces,
+    const solveScalarField& psiif,
+    solveScalarField& result,
+    const direction cmpt
+) const
+{
+    const auto& matrix = solver_.matrix();
+    const auto& lduAddr = matrix.lduAddr();
+    const auto& interfaces = solver_.interfaces();
+
+    const label startOfRequests = Pstream::nRequests();
+
+    // From lduMatrix::initMatrixInterfaces
+
+    // Avoid any conflicts with inter-processor comms
+    UPstream::msgType() += 321;
+
+    for (const label interfacei : selectedInterfaces)
+    {
+        interfaces[interfacei].initInterfaceMatrixUpdate
+        (
+            result,
+            add,
+            lduAddr,
+            interfacei,
+            psiif,
+            coupleCoeffs[interfacei],
+            cmpt,
+            UPstream::commsTypes::nonBlocking
+        );
+    }
+
+    UPstream::waitRequests(startOfRequests);
+
+    // Consume
+    for (const label interfacei : selectedInterfaces)
+    {
+        interfaces[interfacei].updateInterfaceMatrix
+        (
+            result,
+            add,
+            lduAddr,
+            interfacei,
+            psiif,
+            coupleCoeffs[interfacei],
+            cmpt,
+            UPstream::commsTypes::nonBlocking
+        );
+    }
+
+    UPstream::msgType() -= 321;
+}
+
+
+void Foam::distributedDILUPreconditioner::sendGlobal
+(
+    const labelList& selectedInterfaces,
+    solveScalarField& psi,
+    const label colouri
+) const
+{
+    const auto& interfaces = solver_.interfaces();
+
+    if (selectedInterfaces.size())
+    {
+        // Save old data
+        FieldField<Field, solveScalar> one(interfaces.size());
+        FieldField<Field, solveScalar> old(interfaces.size());
+        for (const label inti : selectedInterfaces)
+        {
+            const auto& intf = interfaces[inti].interface();
+            const auto& fc = intf.faceCells();
+            one.set(inti, new solveScalarField(fc.size(), 1.0));
+            old.set(inti, new solveScalarField(psi, intf.faceCells()));
+        }
+        updateMatrixInterfaces
+        (
+            false,              // add to psi
+            one,
+            selectedInterfaces,
+            psi,                // send data
+            psi,                // result
+            0                   // cmpt
+        );
+
+        if (!colourBufs_.set(colouri))
+        {
+            colourBufs_.set
+            (
+                colouri,
+                new FieldField<Field, solveScalar>
+                (
+                    interfaces.size()
+                )
+            );
+        }
+        auto& colourBuf = colourBufs_[colouri];
+        colourBuf.setSize(interfaces.size());
+        for (const label inti : selectedInterfaces)
+        {
+            const auto& intf = interfaces[inti].interface();
+            const auto& fc = intf.faceCells();
+            if (!colourBuf.set(inti))
+            {
+                colourBuf.set(inti, new Field<solveScalar>(fc.size()));
+            }
+            auto& cb = colourBuf[inti];
+            //cb.resize_nocopy(fc.size());
+            auto& oldValues = old[inti];
+
+            forAll(cb, face)
+            {
+                const label cell = fc[face];
+                // Store change in boundary value
+                cb[face] = psi[cell]-oldValues[face];
+                // Restore old value
+                std::swap(psi[cell], oldValues[face]);
+            }
+        }
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::receive
+(
+    const labelList& selectedInterfaces,
+    DynamicList<UPstream::Request>& requests
+) const
+{
+    const auto& interfaces = solver_.interfaces();
+    const auto& interfaceBouCoeffs = solver_.interfaceBouCoeffs();
+
+    // Start reads
+    for (const label inti : selectedInterfaces)
+    {
+        const auto& intf = interfaces[inti].interface();
+        const auto* ppp = isA<const processorLduInterface>(intf);
+
+        auto& recvBuf = recvBufs_[inti];
+        recvBuf.resize_nocopy(interfaceBouCoeffs[inti].size());
+
+        requests.push_back(UPstream::Request());
+        UIPstream::read
+        (
+            requests.back(),
+            ppp->neighbProcNo(),
+            recvBuf.data_bytes(),
+            recvBuf.size_bytes(),
+            ppp->tag()+70,          // random offset
+            ppp->comm()
+        );
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::send
+(
+    const labelList& selectedInterfaces,
+    const solveScalarField& psiInternal,
+    DynamicList<UPstream::Request>& requests
+) const
+{
+    const auto& interfaces = solver_.interfaces();
+
+    // Start writes
+    for (const label inti : selectedInterfaces)
+    {
+        const auto& intf = interfaces[inti].interface();
+        const auto* ppp = isA<const processorLduInterface>(intf);
+        const auto& faceCells = intf.faceCells();
+
+        auto& sendBuf = sendBufs_[inti];
+
+        sendBuf.resize_nocopy(faceCells.size());
+        forAll(faceCells, face)
+        {
+            sendBuf[face] = psiInternal[faceCells[face]];
+        }
+
+        requests.push_back(UPstream::Request());
+        UOPstream::write
+        (
+            requests.back(),
+            ppp->neighbProcNo(),
+            sendBuf.cdata_bytes(),
+            sendBuf.size_bytes(),
+            ppp->tag()+70,          // random offset
+            ppp->comm()
+        );
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::wait
+(
+    DynamicList<UPstream::Request>& requests
+) const
+{
+    UPstream::waitRequests(requests);
+    requests.clear();
+}
+
+
+// Diagonal calculation
+// ~~~~~~~~~~~~~~~~~~~~
+
+void Foam::distributedDILUPreconditioner::addInterfaceDiag
+(
+    solveScalarField& rD,
+    const label inti,
+    const Field<solveScalar>& recvBuf
+) const
+{
+    const auto& interfaces = solver_.interfaces();
+    const auto& interfaceBouCoeffs = solver_.interfaceBouCoeffs();
+    const auto& interfaceIntCoeffs = solver_.interfaceIntCoeffs();
+
+    const auto& intf = interfaces[inti].interface();
+    // TBD: do not use patch faceCells but passed-in addressing?
+    const auto& faceCells = intf.faceCells();
+    const auto& bc = interfaceBouCoeffs[inti];
+    const auto& ic = interfaceIntCoeffs[inti];
+
+    forAll(recvBuf, face)
+    {
+        // Note:interfaceBouCoeffs, interfaceIntCoeffs on the receiving
+        //      side are negated
+        rD[faceCells[face]] -= bc[face]*ic[face]/recvBuf[face];
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::forwardInternalDiag
+(
+    solveScalarField& rD,
+    const label colouri
+) const
+{
+    // Add forward constributions to diagonal
+
+    const auto& matrix = solver_.matrix();
+    const auto& lduAddr = matrix.lduAddr();
+
+    const label* const __restrict__ uPtr = lduAddr.upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr.lowerAddr().begin();
+    const scalar* const __restrict__ upperPtr = matrix.upper().begin();
+    const scalar* const __restrict__ lowerPtr = matrix.lower().begin();
+
+    const label nFaces = matrix.upper().size();
+    if (cellColourPtr_.valid())
+    {
+        const auto& cellColour = cellColourPtr_();
+        for (label face=0; face<nFaces; face++)
+        {
+            const label cell = lPtr[face];
+            if (cellColour[cell] == colouri)
+            {
+                rD[uPtr[face]] -= upperPtr[face]*lowerPtr[face]/rD[cell];
+            }
+        }
+    }
+    else
+    {
+        for (label face=0; face<nFaces; face++)
+        {
+            rD[uPtr[face]] -= upperPtr[face]*lowerPtr[face]/rD[lPtr[face]];
+        }
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::addInterface
+(
+    solveScalarField& wA,
+    const label inti,
+    const Field<solveScalar>& recvBuf
+) const
+{
+    const auto& interfaces = solver_.interfaces();
+    const auto& interfaceBouCoeffs = solver_.interfaceBouCoeffs();
+
+    const auto& intf = interfaces[inti].interface();
+    const auto& faceCells = intf.faceCells();
+    const auto& bc = interfaceBouCoeffs[inti];
+    const solveScalar* __restrict__ rDPtr = rD_.begin();
+    solveScalar* __restrict__ wAPtr = wA.begin();
+
+    forAll(recvBuf, face)
+    {
+        // Note: interfaceBouCoeffs is -upperPtr
+        const label cell = faceCells[face];
+        wAPtr[cell] += rDPtr[cell]*bc[face]*recvBuf[face];
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::forwardInternal
+(
+    solveScalarField& wA,
+    const label colouri
+) const
+{
+    const auto& matrix = solver_.matrix();
+    const auto& lduAddr = matrix.lduAddr();
+
+    solveScalar* __restrict__ wAPtr = wA.begin();
+    const solveScalar* __restrict__ rDPtr = rD_.begin();
+
+    const label* const __restrict__ uPtr = lduAddr.upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr.lowerAddr().begin();
+    const label* const __restrict__ losortPtr = lduAddr.losortAddr().begin();
+    const scalar* const __restrict__ lowerPtr = matrix.lower().begin();
+
+    const label nFaces = matrix.upper().size();
+    if (cellColourPtr_.valid())
+    {
+        const auto& cellColour = cellColourPtr_();
+        for (label face=0; face<nFaces; face++)
+        {
+            const label sface = losortPtr[face];
+            const label cell = lPtr[sface];
+            if (cellColour[cell] == colouri)
+            {
+                wAPtr[uPtr[sface]] -=
+                    rDPtr[uPtr[sface]]*lowerPtr[sface]*wAPtr[cell];
+            }
+        }
+    }
+    else
+    {
+        for (label face=0; face<nFaces; face++)
+        {
+            const label sface = losortPtr[face];
+            wAPtr[uPtr[sface]] -=
+                rDPtr[uPtr[sface]]*lowerPtr[sface]*wAPtr[lPtr[sface]];
+        }
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::backwardInternal
+(
+    solveScalarField& wA,
+    const label colouri
+) const
+{
+    const auto& matrix = solver_.matrix();
+    const auto& lduAddr = matrix.lduAddr();
+
+    solveScalar* __restrict__ wAPtr = wA.begin();
+    const solveScalar* __restrict__ rDPtr = rD_.begin();
+
+    const label* const __restrict__ uPtr = lduAddr.upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr.lowerAddr().begin();
+    const scalar* const __restrict__ upperPtr = matrix.upper().begin();
+
+    const label nFacesM1 = matrix.upper().size() - 1;
+
+    if (cellColourPtr_.valid())
+    {
+        const auto& cellColour = cellColourPtr_();
+        for (label face=nFacesM1; face>=0; face--)
+        {
+            const label cell = uPtr[face];
+            if (cellColour[cell] == colouri)
+            {
+                // Note: lower cell guaranteed in same colour
+                wAPtr[lPtr[face]] -=
+                    rDPtr[lPtr[face]]*upperPtr[face]*wAPtr[cell];
+            }
+        }
+    }
+    else
+    {
+        for (label face=nFacesM1; face>=0; face--)
+        {
+            wAPtr[lPtr[face]] -=
+                rDPtr[lPtr[face]]*upperPtr[face]*wAPtr[uPtr[face]];
+        }
+    }
+}
+
+
+void Foam::distributedDILUPreconditioner::calcReciprocalD
+(
+    solveScalarField& rD
+) const
+{
+    const auto& matrix = solver_.matrix();
+
+    // Make sure no outstanding receives
+    wait(lowerRecvRequests_);
+
+    // Start reads (into recvBufs_)
+    receive(lowerNbrs_, lowerRecvRequests_);
+
+    // Start with diagonal
+    const scalarField& diag = matrix.diag();
+    rD.resize_nocopy(diag.size());
+    std::copy(diag.begin(), diag.end(), rD.begin());
+
+
+    // Subtract coupled contributions
+    {
+        // Wait for finish. Received result in recvBufs
+        wait(lowerRecvRequests_);
+
+        for (const label inti : lowerNbrs_)
+        {
+            addInterfaceDiag(rD, inti, recvBufs_[inti]);
+        }
+    }
+
+
+    // - divide the internal mesh into domains/colour, similar to domain
+    //   decomposition
+    // - we could use subsetted bits of the mesh or just loop over only
+    //   the cells of the current domain
+    // - a domain only uses boundary values of lower numbered domains
+    // - this also limits the interfaces that need to be evaluated since
+    //   we assume an interface only changes local faceCells and these
+    //   are all of the same colour
+
+    for (label colouri = 0; colouri < nColours_; colouri++)
+    {
+        if (cellColourPtr_.valid())// && colourBufs_.set(colouri))
+        {
+            for (const label inti : lowerGlobalRecv_[colouri])
+            {
+                addInterfaceDiag(rD, inti, colourBufs_[colouri][inti]);
+            }
+        }
+
+        forwardInternalDiag(rD, colouri);
+
+        // Store effect of exchanging rD to higher interfaces in colourBufs_
+        if (cellColourPtr_.valid())
+        {
+            sendGlobal(higherGlobalSend_[colouri], rD, higherColour_[colouri]);
+        }
+    }
+
+    // Make sure no outstanding sends
+    wait(higherSendRequests_);
+
+    // Start writes of rD (using sendBufs)
+    send(higherNbrs_, rD, higherSendRequests_);
+
+    // Calculate the reciprocal of the preconditioned diagonal
+    const label nCells = rD.size();
+
+    for (label cell=0; cell<nCells; cell++)
+    {
+        rD[cell] = 1.0/rD[cell];
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::distributedDILUPreconditioner::distributedDILUPreconditioner
+(
+    const lduMatrix::solver& sol,
+    const dictionary& dict
+)
+:
+    lduMatrix::preconditioner(sol),
+    coupled_(dict.getOrDefault<bool>("coupled", true, keyType::LITERAL)),
+    rD_(sol.matrix().diag().size())
+{
+    const lduMesh& mesh = sol.matrix().mesh();
+    const auto& interfaces = sol.interfaces();
+    const auto& interfaceBouCoeffs = sol.interfaceBouCoeffs();
+
+    // Allocate buffers
+    // ~~~~~~~~~~~~~~~~
+
+    sendBufs_.setSize(interfaces.size());
+    recvBufs_.setSize(interfaces.size());
+    forAll(interfaceBouCoeffs, inti)
+    {
+        if (interfaces.set(inti))
+        {
+            const auto& bc = interfaceBouCoeffs[inti];
+            sendBufs_.set(inti, new scalarField(bc.size(), Zero));
+            recvBufs_.set(inti, new scalarField(bc.size(), Zero));
+        }
+    }
+
+
+    // Determine processor colouring
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    //const processorColour& colours = processorColour::New(mesh);
+    //const label myColour = colours[Pstream::myProcNo()];
+    if (&mesh != meshPtr_)
+    {
+        procColoursPtr_.reset(new labelList(Pstream::nProcs(mesh.comm())));
+        const label nProcColours =
+            processorColour::colour(mesh, procColoursPtr_());
+
+        if (debug)
+        {
+            Info<< typeName << " : calculated processor colours:"
+                << nProcColours << endl;
+        }
+
+        meshPtr_ = &mesh;
+    }
+    const labelList& procColours = procColoursPtr_();
+
+    const label myColour = procColours[Pstream::myProcNo(mesh.comm())];
+
+    bool haveGlobalCoupled = false;
+    bool haveDistributedAMI = false;
+    forAll(interfaces, inti)
+    {
+        if (interfaces.set(inti))
+        {
+            const auto& intf = interfaces[inti].interface();
+            const auto* ppp = isA<const processorLduInterface>(intf);
+            if (ppp)
+            {
+                const label nbrColour = procColours[ppp->neighbProcNo()];
+                //const label nbrColour = ppp->neighbProcNo();
+                if (nbrColour < myColour)
+                {
+                    lowerNbrs_.append(inti);
+                }
+                else if (nbrColour > myColour)
+                {
+                    higherNbrs_.append(inti);
+                }
+                else
+                {
+                    WarningInFunction
+                        << "weird processorLduInterface"
+                        << " from " << ppp->myProcNo()
+                        << " to " << ppp->neighbProcNo()
+                        << endl;
+                }
+            }
+            else //if (isA<const cyclicAMILduInterface>(intf))
+            {
+                haveGlobalCoupled = true;
+
+                const auto* AMIpp = isA<const cyclicAMILduInterface>(intf);
+                if (AMIpp)
+                {
+                    //const auto& AMI =
+                    //(
+                    //    AMIpp->owner()
+                    //  ? AMIpp->AMI()
+                    //  : AMIpp->neighbPatch().AMI()
+                    //);
+                    //haveDistributedAMI = AMI.distributed();
+
+                    if (debug)
+                    {
+                        Info<< typeName << " : interface " << inti
+                            << " of type " << intf.type()
+                            << " is distributed:" << haveDistributedAMI << endl;
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    if (debug)
+    {
+        Info<< typeName
+            << " : lower proc interfaces:" << flatOutput(lowerNbrs_)
+            << " higher proc interfaces:" << flatOutput(higherNbrs_)
+            << endl;
+    }
+
+
+    // Determine local colouring/zoneing
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Start off with all cells colour 0
+    nColours_ = 1;
+    cellColourPtr_.clear();
+    if (coupled_ && haveGlobalCoupled)
+    {
+        labelList patchToColour;
+        cellColourPtr_.reset(new labelList(mesh.lduAddr().size()));
+        //if (haveDistributedAMI)
+        //{
+        //    nColours_ = 1;
+        //    cellColourPtr_() = 0;
+        //    patchToColour = labelList(interfaces.size(), 0);
+        //}
+        //else
+        {
+            nColours_ = processorColour::cellColour
+            (
+                mesh,
+                cellColourPtr_(),
+                patchToColour
+            );
+        }
+
+        lowerGlobalRecv_.resize_nocopy(nColours_);
+        lowerGlobalSend_.resize_nocopy(nColours_);
+        lowerColour_.setSize(nColours_, -1);
+        higherGlobalRecv_.resize_nocopy(nColours_);
+        higherGlobalSend_.resize_nocopy(nColours_);
+        higherColour_.setSize(nColours_, -1);
+        colourBufs_.setSize(nColours_);
+
+        forAll(interfaces, inti)
+        {
+            if (interfaces.set(inti))
+            {
+                const auto& intf = interfaces[inti].interface();
+
+                label nbrInti = -1;
+                const auto* AMIpp = isA<const cyclicAMILduInterface>(intf);
+                if (AMIpp)
+                {
+                    nbrInti = AMIpp->neighbPatchID();
+                }
+                const auto* cycpp = isA<const cyclicLduInterface>(intf);
+                if (cycpp)
+                {
+                    nbrInti = cycpp->neighbPatchID();
+                }
+
+                if (nbrInti != -1)
+                {
+                    const label colouri = patchToColour[inti];
+                    const label nbrColouri = patchToColour[nbrInti];
+
+                    if
+                    (
+                        (haveDistributedAMI && (inti < nbrInti))
+                     || (!haveDistributedAMI && (colouri < nbrColouri))
+                    )
+                    {
+                        // Send to higher
+                        higherGlobalSend_[colouri].append(nbrInti);
+                        higherColour_[colouri] = nbrColouri;
+                        // Receive from higher
+                        higherGlobalRecv_[colouri].append(inti);
+                    }
+                    else
+                    {
+                        // Send to lower
+                        lowerGlobalSend_[colouri].append(nbrInti);
+                        lowerColour_[colouri] = nbrColouri;
+                        // Receive from lower
+                        lowerGlobalRecv_[colouri].append(inti);
+                    }
+                }
+            }
+        }
+    }
+
+
+    if (debug)
+    {
+        Info<< typeName << " : local colours:" << nColours_ << endl;
+        Info<< incrIndent;
+        forAll(lowerGlobalRecv_, colouri)
+        {
+            const auto& lowerRecv = lowerGlobalRecv_[colouri];
+            if (lowerRecv.size())
+            {
+                const auto& lowerSend = lowerGlobalSend_[colouri];
+                const auto& lowerCol = lowerColour_[colouri];
+                Info<< indent
+                    << "Lower global interfaces for colour:" << colouri
+                    << " receiving from:" << flatOutput(lowerRecv)
+                    << " sending to:" << flatOutput(lowerSend)
+                    << " with colour:" << lowerCol << endl;
+            }
+        }
+        forAll(higherGlobalRecv_, colouri)
+        {
+            const auto& higherRecv = higherGlobalRecv_[colouri];
+            if (higherRecv.size())
+            {
+                const auto& higherSend = higherGlobalSend_[colouri];
+                const auto& higherCol = higherColour_[colouri];
+                Info<< indent
+                    << "Higher global interfaces for colour:" << colouri
+                    << " receiving from:" << flatOutput(higherRecv)
+                    << " sending to:" << flatOutput(higherSend)
+                    << " with colour:" << higherCol << endl;
+            }
+        }
+    }
+
+    calcReciprocalD(rD_);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::distributedDILUPreconditioner::~distributedDILUPreconditioner()
+{
+    // Wait on all requests before storage is being taken down
+    // (could rely on construction order?)
+    wait(lowerSendRequests_);
+    wait(lowerRecvRequests_);
+    wait(higherSendRequests_);
+    wait(higherRecvRequests_);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::distributedDILUPreconditioner::precondition
+(
+    solveScalarField& wA,
+    const solveScalarField& rA,
+    const direction
+) const
+{
+    solveScalar* __restrict__ wAPtr = wA.begin();
+    const solveScalar* __restrict__ rAPtr = rA.begin();
+    const solveScalar* __restrict__ rDPtr = rD_.begin();
+
+    const label nCells = wA.size();
+
+
+    // Forward sweep
+    // ~~~~~~~~~~~~~
+
+    // Make sure no receives are still in flight (should not happen)
+    wait(lowerRecvRequests_);
+
+    // Start reads (into recvBufs)
+    receive(lowerNbrs_, lowerRecvRequests_);
+
+    // Initialise 'internal' cells
+    for (label cell=0; cell<nCells; cell++)
+    {
+        wAPtr[cell] = rDPtr[cell]*rAPtr[cell];
+    }
+
+    // Do 'halo' contributions from lower numbered procs
+    {
+        // Wait for finish. Received result in recvBufs
+        wait(lowerRecvRequests_);
+
+        for (const label inti : lowerNbrs_)
+        {
+            addInterface(wA, inti, recvBufs_[inti]);
+        }
+
+        for (label colouri = 0; colouri < nColours_; colouri++)
+        {
+            // Do non-processor boundaries for this colour
+            if (cellColourPtr_.valid())// && colourBufs_.set(colouri))
+            {
+                for (const label inti : lowerGlobalRecv_[colouri])
+                {
+                    addInterface(wA, inti, colourBufs_[colouri][inti]);
+                }
+            }
+
+            forwardInternal(wA, colouri);
+
+            // Store effect of exchanging rD to higher interfaces
+            // in colourBufs_
+            if (cellColourPtr_.valid())
+            {
+                sendGlobal
+                (
+                    higherGlobalSend_[colouri],
+                    wA,
+                    higherColour_[colouri]
+                );
+            }
+        }
+    }
+
+    // Make sure no outstanding sends from previous iteration
+    wait(higherSendRequests_);
+
+    // Start writes of wA (using sendBufs)
+    send(higherNbrs_, wA, higherSendRequests_);
+
+
+    // Backward sweep
+    // ~~~~~~~~~~~~~~
+
+    // Make sure no outstanding receives
+    wait(higherRecvRequests_);
+
+    // Start receives
+    receive(higherNbrs_, higherRecvRequests_);
+
+    {
+        // Wait until receives finished
+        wait(higherRecvRequests_);
+
+        for (const label inti : higherNbrs_)
+        {
+            addInterface(wA, inti, recvBufs_[inti]);
+        }
+
+        for (label colouri = nColours_-1; colouri >= 0; colouri--)
+        {
+            // Do non-processor boundaries for this colour
+            if (cellColourPtr_.valid())// && colourBufs_.set(colouri))
+            {
+                for (const label inti : higherGlobalRecv_[colouri])
+                {
+                    addInterface(wA, inti, colourBufs_[colouri][inti]);
+                }
+            }
+
+            backwardInternal(wA, colouri);
+
+            // Store effect of exchanging rD to higher interfaces
+            // in colourBufs_
+            if (cellColourPtr_.valid())
+            {
+                sendGlobal
+                (
+                    lowerGlobalSend_[colouri],
+                    wA,
+                    lowerColour_[colouri]
+                );
+            }
+        }
+    }
+
+    // Make sure no outstanding sends
+    wait(lowerSendRequests_);
+
+    // Start writes of wA (using sendBufs)
+    send(lowerNbrs_, wA, lowerSendRequests_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
new file mode 100644
index 0000000000..bda91b01ea
--- /dev/null
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::distributedDILUPreconditioner
+
+Group
+    grpLduMatrixPreconditioners
+
+Description
+    Version of DILUpreconditioner that uses preconditioning across processor
+    (and coupled) boundaries. Based on 'Parallel Preconditioners' chapter from
+    'Iterative Methods for Sparse Linear Systems' by Yousef Saad.
+
+    Leaves out the handling of boundary nodes after internal nodes since
+    probably not beneficial (so no overlap of comms and internal calculation)
+
+    By default preconditions across coupled boundaries (currently only
+    tested for cyclicAMI). This can be disabled with the 'coupled' setting
+
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  distributedDILU;
+            coupled         false;
+        }
+
+    The cyclicAMI boundary behaviour will only work if
+    - running non-parallel or
+    - different sides of cyclicAMI run on different processors i.e.
+      there is no processor which has cells on both owner and neighbour
+      of the patch pair.
+
+See Also
+    Foam::DILUPreconditioner
+    Foam::distributedDICPreconditioner
+
+SourceFiles
+    distributedDILUPreconditioner.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef distributedDILUPreconditioner_H
+#define distributedDILUPreconditioner_H
+
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class distributedDILUPreconditioner Declaration
+\*---------------------------------------------------------------------------*/
+
+class distributedDILUPreconditioner
+:
+    public lduMatrix::preconditioner
+{
+protected:
+
+    // Protected data
+
+        //- Precondition across global coupled bc
+        const bool coupled_;
+
+
+        //- Processor interface buffers and colouring
+
+            //- Previous mesh
+            static const lduMesh* meshPtr_;
+
+            //- Previous processor colours
+            static autoPtr<labelList> procColoursPtr_;
+
+            //- Buffers for sending and receiving data
+            mutable FieldField<Field, solveScalar> sendBufs_;
+            mutable FieldField<Field, solveScalar> recvBufs_;
+            mutable DynamicList<UPstream::Request> recvRequests_;
+
+            //- Interfaces to lower coloured processors
+            DynamicList<label> lowerNbrs_;
+            mutable DynamicList<UPstream::Request> lowerSendRequests_;
+            mutable DynamicList<UPstream::Request> lowerRecvRequests_;
+
+            //- Interfaces to higher coloured processors
+            DynamicList<label> higherNbrs_;
+            mutable DynamicList<UPstream::Request> higherSendRequests_;
+            mutable DynamicList<UPstream::Request> higherRecvRequests_;
+
+
+        //- Local (cell) colouring from global interfaces
+
+            //- Colour/zone per cell
+            autoPtr<labelList> cellColourPtr_;
+
+            //- Number of colours (in case of multiple disconnected regions
+            //  in single mesh)
+            label nColours_;
+
+
+        //- Global interfaces. Per colour the interfaces that (might)
+        //- influence it
+
+            mutable PtrList<FieldField<Field, solveScalar>> colourBufs_;
+
+            //- Interfaces to non-processor lower coupled interfaces
+            List<DynamicList<label>> lowerGlobalRecv_;
+
+            //- Interfaces to non-processor lower coupled interfaces
+            List<DynamicList<label>> lowerGlobalSend_;
+
+            //- Corresponding destination colour (for lowerGlobal)
+            List<label> lowerColour_;
+
+            //- Interfaces to non-processor higher coupled interfaces
+            List<DynamicList<label>> higherGlobalRecv_;
+
+            //- Interfaces to non-processor higher coupled interfaces
+            List<DynamicList<label>> higherGlobalSend_;
+
+            //- Corresponding destination colour (for higherGlobal)
+            List<label> higherColour_;
+
+
+        //- The reciprocal preconditioned diagonal
+        solveScalarField rD_;
+
+
+    // Private Member Functions
+
+        //- Variant of lduMatrix::updateMatrixInterfaces on selected interfaces
+        void updateMatrixInterfaces
+        (
+            const bool add,
+            const FieldField<Field, solveScalar>& coupleCoeffs,
+            const labelList& selectedInterfaces,
+            const solveScalarField& psiif,
+            solveScalarField& result,
+            const direction cmpt
+        ) const;
+
+        //- Send (and store in colourBufs_[colouri]) the effect of
+        //  doing selectedInterfaces
+        void sendGlobal
+        (
+            const labelList& selectedInterfaces,
+            solveScalarField& psi,
+            const label colouri
+        ) const;
+
+        //- Start receiving in recvBufs_
+        void receive
+        (
+            const labelList& selectedInterfaces,
+            DynamicList<UPstream::Request>& requests
+        ) const;
+
+        //- Start sending sendBufs_
+        void send
+        (
+            const labelList& selectedInterfaces,
+            const solveScalarField& psiInternal,
+            DynamicList<UPstream::Request>& requests
+        ) const;
+
+        //- Wait for explicit requests
+        void wait(DynamicList<UPstream::Request>& requests) const;
+
+        //- Update diagonal for interface
+        virtual void addInterfaceDiag
+        (
+            solveScalarField& rD,
+            const label inti,
+            const Field<solveScalar>& recvBuf
+        ) const;
+
+        //- Update diagonal for all faces of a certain colour
+        virtual void forwardInternalDiag
+        (
+            solveScalarField& rD,
+            const label colouri
+        ) const;
+
+        //- Update preconditioned variable from interface
+        virtual void addInterface
+        (
+            solveScalarField& wA,
+            const label inti,
+            const Field<solveScalar>& recvBuf
+        ) const;
+
+        //- Update preconditioned variable walking forward on internal faces
+        virtual void forwardInternal
+        (
+            solveScalarField& wA,
+            const label colouri
+        ) const;
+
+        //- Update preconditioned variable walking backward on internal faces
+        virtual void backwardInternal
+        (
+            solveScalarField& wA,
+            const label colouri
+        ) const;
+
+        //- Calculate reciprocal of diagonal
+        virtual void calcReciprocalD(solveScalarField& rD) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("distributedDILU");
+
+
+    // Constructors
+
+        //- Construct from matrix components and preconditioner solver controls
+        distributedDILUPreconditioner
+        (
+            const lduMatrix::solver&,
+            const dictionary& solverControlsUnused
+        );
+
+
+    //- Destructor
+    virtual ~distributedDILUPreconditioner();
+
+
+    // Member Functions
+
+        //- Return wA the preconditioned form of residual rA
+        virtual void precondition
+        (
+            solveScalarField& wA,
+            const solveScalarField& rA,
+            const direction cmpt=0
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C
new file mode 100644
index 0000000000..b852dd5c10
--- /dev/null
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C
@@ -0,0 +1,363 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022 M. Janssens
+-------------------------------------------------------------------------------
+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 "processorColour.H"
+#include "processorLduInterface.H"
+#include "processorTopologyNew.H"
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(processorColour, 0);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::processorColour::colour
+(
+    const lduMesh& mesh,
+    labelList& procColour
+)
+{
+    procColour.resize_nocopy(Pstream::nProcs(mesh.comm()));
+    procColour = -1;
+
+    // Re-use processor-topology analysis
+
+    labelListList procNeighbours(Pstream::nProcs(mesh.comm()));
+
+    // Fill my entry
+    {
+        const lduInterfacePtrsList patches = mesh.interfaces();
+
+        auto& procToProcs = procNeighbours[Pstream::myProcNo(mesh.comm())];
+        label n = 0;
+        forAll(patches, patchi)
+        {
+            if (patches.set(patchi))
+            {
+                if (isA<processorLduInterface>(patches[patchi]))
+                {
+                    n++;
+                }
+            }
+        }
+
+        procToProcs.resize_nocopy(n);
+        n = 0;
+        forAll(patches, patchi)
+        {
+            if (patches.set(patchi))
+            {
+                const auto* ppPtr = isA<processorLduInterface>(patches[patchi]);
+                if (ppPtr)
+                {
+                    procToProcs[n++] = ppPtr->neighbProcNo();
+                }
+            }
+        }
+    }
+    // Send to master
+    Pstream::gatherList(procNeighbours, UPstream::msgType(), mesh.comm());
+
+
+    // Use greedy algorithm for now
+    // (see e.g. https://iq.opengenus.org/graph-colouring-greedy-algorithm/)
+
+    if (Pstream::master(mesh.comm()))
+    {
+        DynamicList<label> front;
+        front.append(0);    // start from processor 0
+
+        DynamicList<label> newFront;
+        while (front.size())
+        {
+            //Pout<< "Front:" << front << endl;
+
+            newFront.clear();
+            for (const label proci : front)
+            {
+                if (procColour[proci] == -1)
+                {
+                    const labelList& nbrs = procNeighbours[proci];
+                    const UIndirectList<label> nbrColour(procColour, nbrs);
+
+                    for
+                    (
+                        label colouri = 0;
+                        colouri < Pstream::nProcs();
+                        colouri++
+                    )
+                    {
+                        if (!nbrColour.found(colouri))
+                        {
+                            procColour[proci] = colouri;
+                            for (label nbrProci : nbrs)
+                            {
+                                if (procColour[nbrProci] == -1)
+                                {
+                                    newFront.append(nbrProci);
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+
+            front = std::move(newFront);
+        }
+    }
+
+    Pstream::broadcast(procColour, mesh.comm());
+
+
+    //if (false)
+    //{
+    //    volScalarField volColour
+    //    (
+    //        IOobject
+    //        (
+    //            "colour",
+    //            mesh.time().timeName(),
+    //            mesh,
+    //            IOobject::NO_READ,
+    //            IOobject::AUTO_WRITE,
+    //            false
+    //        ),
+    //        mesh,
+    //        dimensionedScalar(dimless, procColour[Pstream::myProcNo()]),
+    //        zeroGradientFvPatchScalarField::typeName
+    //    );
+    //    volColour.write();
+    //}
+
+    const label nColours = max(procColour)+1;
+
+    if (debug)
+    {
+        Info<< typeName << " : coloured " << Pstream::nProcs(mesh.comm())
+            << " processors with in total " << nColours << " colours" << endl;
+    }
+
+    return nColours;
+}
+
+
+void Foam::processorColour::walkFront
+(
+    const lduMesh& mesh,
+    DynamicList<label>& front,
+    labelList& cellColour
+)
+{
+    // Colour with the (min) coupled (global) patch
+
+    const lduAddressing& addr = mesh.lduAddr();
+    const label* const __restrict__ uPtr = addr.upperAddr().begin();
+    const label* const __restrict__ lPtr = addr.lowerAddr().begin();
+    const label* const __restrict__ ownStartPtr = addr.ownerStartAddr().begin();
+    const label* const __restrict__ losortStartAddrPtr =
+        addr.losortStartAddr().begin();
+    const label* const __restrict__ losortAddrPtr = addr.losortAddr().begin();
+
+    DynamicList<label> newFront;
+    while (true)
+    {
+        newFront.clear();
+        for (const label celli : front)
+        {
+            const label colouri = cellColour[celli];
+
+            {
+                const label fStart = ownStartPtr[celli];
+                const label fEnd = ownStartPtr[celli + 1];
+
+                for (label facei=fStart; facei<fEnd; facei++)
+                {
+                    const label nbr =
+                    (
+                        lPtr[facei] == celli
+                      ? uPtr[facei]
+                      : lPtr[facei]
+                    );
+                    if (cellColour[nbr] == -1)
+                    {
+                        cellColour[nbr] = colouri;
+                        newFront.append(nbr);
+                    }
+                }
+            }
+            {
+                const label fStart = losortStartAddrPtr[celli];
+                const label fEnd = losortStartAddrPtr[celli + 1];
+
+                for (label i=fStart; i<fEnd; i++)
+                {
+                    label facei = losortAddrPtr[i];
+                    const label nbr =
+                    (
+                        lPtr[facei] == celli
+                      ? uPtr[facei]
+                      : lPtr[facei]
+                    );
+                    if (cellColour[nbr] == -1)
+                    {
+                        cellColour[nbr] = colouri;
+                        newFront.append(nbr);
+                    }
+                }
+            }
+
+        }
+
+        if (newFront.empty())
+        {
+            break;
+        }
+
+        front.transfer(newFront);
+    }
+}
+
+
+Foam::label Foam::processorColour::cellColour
+(
+    const lduMesh& mesh,
+    labelList& cellColour,
+    labelList& patchToColour
+)
+{
+    // Colour with the (min) coupled (global) patch. Compact to have colour 0
+    // if a single region. Problematic if same patch on multiple disconnected
+    // regions.
+
+    const lduAddressing& addr = mesh.lduAddr();
+    const lduInterfacePtrsList patches = mesh.interfaces();
+
+    const label nCells = addr.size();
+
+    patchToColour.resize_nocopy(patches.size());
+    patchToColour = -1;
+    cellColour.resize_nocopy(nCells);
+    cellColour = -1;
+
+
+    label colouri = 0;
+
+    // Starting front from patch faceCells
+    DynamicList<label> front;
+    forAll(patches, inti)
+    {
+        if
+        (
+            patches.set(inti)
+        && !isA<const processorLduInterface>(patches[inti])
+        )
+        {
+            // 'global' interface. Seed faceCells with patch index
+
+            if (patchToColour[inti] == -1)
+            {
+                patchToColour[inti] = colouri++;
+            }
+
+            const auto& fc = patches[inti].faceCells();
+            forAll(fc, face)
+            {
+                const label cell = fc[face];
+                if (cellColour[cell] != patchToColour[inti])
+                {
+                    cellColour[cell] = patchToColour[inti];
+                    front.append(cell);
+                }
+            }
+        }
+    }
+
+
+    // Walk current mesh
+    walkFront(mesh, front, cellColour);
+
+
+    // Any unvisited cell is still labelMax. Put into colour 0.
+    for (auto& colour : cellColour)
+    {
+        if (colour == -1)
+        {
+            colour = 0;
+        }
+    }
+
+    if (debug)
+    {
+        Info<< typeName << " : coloured " << nCells
+            << " cells with in total " << colouri << " colours" << endl;
+    }
+
+    return colouri;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::processorColour::processorColour(const lduMesh& mesh)
+:
+    MeshObject<lduMesh, Foam::MoveableMeshObject, processorColour>(mesh)
+{
+    nColours_ = colour(mesh, *this);
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+const Foam::processorColour& Foam::processorColour::New(const lduMesh& mesh)
+{
+    const processorColour* ptr =
+        mesh.thisDb().objectRegistry::template cfindObject<processorColour>
+        (
+            processorColour::typeName
+        );
+
+    if (ptr)
+    {
+        return *ptr;
+    }
+
+    processorColour* objectPtr = new processorColour(mesh);
+
+    //regIOobject::store(static_cast<MoveableMeshObject<lduMesh>*>(objectPtr));
+    regIOobject::store(objectPtr);
+
+    return *objectPtr;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.H b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.H
new file mode 100644
index 0000000000..e4fe4857ca
--- /dev/null
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.H
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022 M. Janssens
+-------------------------------------------------------------------------------
+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::processorColour
+
+Description
+    Colouring processors such that no neighbours have the same colour
+
+SourceFiles
+    processorColour.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_processorColour_H
+#define Foam_processorColour_H
+
+#include "MeshObject.H"
+#include "lduMesh.H"
+#include "lduInterfacePtrsList.H"
+#include "primitiveFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class lduMatrix;
+
+/*---------------------------------------------------------------------------*\
+                      Class processorColour Declaration
+\*---------------------------------------------------------------------------*/
+
+class processorColour
+:
+    public MeshObject<lduMesh, MoveableMeshObject, processorColour>,
+    public labelList
+{
+protected:
+
+    // Protected data
+
+        //- Max number of colours
+        label nColours_;
+
+
+    // Protected Member Fucntions
+
+        static void walkFront
+        (
+            const lduMesh& mesh,
+            DynamicList<label>& front,
+            labelList& cellColour
+        );
+
+
+private:
+
+        //- No copy construct
+        processorColour(const processorColour&) = delete;
+
+        //- No copy assignment
+        void operator=(const processorColour&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("processorColour");
+
+
+    // Constructors
+
+        //- Construct given mesh
+        processorColour(const lduMesh& mesh);
+
+
+    // Selectors
+
+        //- Should use the MeshObject provided one but that needs a
+        //  mesh.name() ...
+        static const processorColour& New(const lduMesh& mesh);
+
+
+    //- Destructor
+    virtual ~processorColour() = default;
+
+
+    // Member Functions
+
+        // Access
+
+            label nColours() const
+            {
+                return nColours_;
+            }
+
+            label myColour() const
+            {
+                return operator[](Pstream::myProcNo());
+            }
+
+
+        //- Calculate processor colouring from processor connectivity. Sets
+        //- colour per processor such that no neighbouring processors have the
+        //- same colour. Returns number of colours used.
+        static label colour(const lduMesh& mesh, labelList& procColour);
+
+        //- Calculate (locally) per cell colour according to walking from
+        //- global patches. Returns number of colours used.
+        //- Note: asssumes all non-processor interfaces are global.
+        static label cellColour
+        (
+            const lduMesh& mesh,
+            labelList& cellColour,
+            labelList& patchToColour
+        );
+
+        virtual bool movePoints()
+        {
+            return true;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 9b5b5ecc75792912529d0f592c5fe3ddb91a26be Mon Sep 17 00:00:00 2001
From: "Bernhard F.W. Gschaider" <bgschaid@hfd-research.at>
Date: Fri, 2 Jun 2023 20:22:09 +0100
Subject: [PATCH 280/348] BUG: DarcyForchheimer: fix debug condition for start
 times (fixes #2787)

---
 .../porosityModel/DarcyForchheimer/DarcyForchheimer.C | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index a4e887e7a0..2ac51692d2 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -115,7 +115,14 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
     }
 
 
-    if (debug && mesh_.time().writeTime())
+    if
+    (
+        debug
+     && (
+            mesh_.time().writeTime()
+         || mesh_.time().timeIndex() == mesh_.time().startTimeIndex()
+        )
+    )
     {
         volTensorField Dout
         (

From 68c44f32197fdec2bd2c076037a6533a8723a37b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 5 Jun 2023 09:51:34 +0100
Subject: [PATCH 281/348] COMP: distributedDILU: solveScalar support

---
 .../distributedDILUPreconditioner.C                    | 10 +++++-----
 .../distributedDILUPreconditioner.H                    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
index 1f92ab7dc4..d963c24dcc 100644
--- a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
@@ -52,7 +52,7 @@ namespace Foam
 void Foam::distributedDILUPreconditioner::updateMatrixInterfaces
 (
     const bool add,
-    const FieldField<Field, solveScalar>& coupleCoeffs,
+    const FieldField<Field, scalar>& coupleCoeffs,
     const labelList& selectedInterfaces,
     const solveScalarField& psiif,
     solveScalarField& result,
@@ -119,13 +119,13 @@ void Foam::distributedDILUPreconditioner::sendGlobal
     if (selectedInterfaces.size())
     {
         // Save old data
-        FieldField<Field, solveScalar> one(interfaces.size());
+        FieldField<Field, scalar> one(interfaces.size());
         FieldField<Field, solveScalar> old(interfaces.size());
         for (const label inti : selectedInterfaces)
         {
             const auto& intf = interfaces[inti].interface();
             const auto& fc = intf.faceCells();
-            one.set(inti, new solveScalarField(fc.size(), 1.0));
+            one.set(inti, new scalarField(fc.size(), 1.0));
             old.set(inti, new solveScalarField(psi, intf.faceCells()));
         }
         updateMatrixInterfaces
@@ -537,8 +537,8 @@ Foam::distributedDILUPreconditioner::distributedDILUPreconditioner
         if (interfaces.set(inti))
         {
             const auto& bc = interfaceBouCoeffs[inti];
-            sendBufs_.set(inti, new scalarField(bc.size(), Zero));
-            recvBufs_.set(inti, new scalarField(bc.size(), Zero));
+            sendBufs_.set(inti, new solveScalarField(bc.size(), Zero));
+            recvBufs_.set(inti, new solveScalarField(bc.size(), Zero));
         }
     }
 
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
index bda91b01ea..817f584c16 100644
--- a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
@@ -156,7 +156,7 @@ protected:
         void updateMatrixInterfaces
         (
             const bool add,
-            const FieldField<Field, solveScalar>& coupleCoeffs,
+            const FieldField<Field, scalar>& coupleCoeffs,
             const labelList& selectedInterfaces,
             const solveScalarField& psiif,
             solveScalarField& result,

From 7bc3bc9194d9504b07c1f0e7402fe826a3a6da0a Mon Sep 17 00:00:00 2001
From: Shannon Leakey <>
Date: Wed, 7 Jun 2023 15:09:26 +0100
Subject: [PATCH 282/348] DOC: Scalar: fix the comment (fixes #2794)

---
 src/OpenFOAM/primitives/Scalar/Scalar.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index ffc7d71c64..fbd89c4308 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -239,7 +239,7 @@ inline Scalar sign(const Scalar s) noexcept
 }
 
 
-//- Return 1 if s is greater than zero, otherwise 1
+//- Return 1 if s is greater than zero, otherwise 0
 inline Scalar pos(const Scalar s) noexcept
 {
     return (s > 0)? 1: 0;

From 3455d67d7face4e993aa2b48c5edb31c339704ba Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 7 Jun 2023 20:22:13 +0100
Subject: [PATCH 283/348] COMP: word: using uintptr_t needs <cstdint>

---
 src/OpenFOAM/primitives/strings/word/word.C | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/OpenFOAM/primitives/strings/word/word.C b/src/OpenFOAM/primitives/strings/word/word.C
index 6465c41962..a1a66656d8 100644
--- a/src/OpenFOAM/primitives/strings/word/word.C
+++ b/src/OpenFOAM/primitives/strings/word/word.C
@@ -30,6 +30,7 @@ License
 #include "debug.H"
 #include <cctype>
 #include <sstream>
+#include <cstdint>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

From 2ac4e5f4d625ca284d4bf224a7bd307d61b7006e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 9 Jun 2023 18:15:59 +0100
Subject: [PATCH 284/348] ENH: MGridGen: adapt to new GAMGAgglomeration API.
 Fixes #2795

---
 .../MGridGenGAMGAgglomeration.C               | 45 ++++++++++++-------
 .../MGridGenGAMGAgglomeration.H               | 19 ++++++++
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
index 4881058132..83f7c096e8 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
@@ -172,19 +172,34 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
 )
 :
     GAMGAgglomeration(mesh, controlDict),
-    fvMesh_(refCast<const fvMesh>(mesh))
-{
-    // Min, max size of agglomerated cells
-    label minSize(controlDict.get<label>("minSize"));
-    label maxSize(controlDict.get<label>("maxSize"));
-
-    // Number of iterations applied to improve agglomeration consistency across
-    // processor boundaries
-    label nProcConsistencyIter
+    fvMesh_(refCast<const fvMesh>(mesh)),
+    minSize_(controlDict.get<label>("minSize")),
+    maxSize_(controlDict.get<label>("maxSize")),
+    nProcConsistencyIter_
     (
         controlDict.get<label>("nProcConsistencyIter")
+    )
+{
+    agglomerate
+    (
+        1,  //nCellsInCoarsestLevel
+        0,
+        scalarField::null(),
+        true
     );
+}
 
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::MGridGenGAMGAgglomeration::agglomerate
+(
+    const label nCellsInCoarsestLevel,
+    const label startLevel,
+    const scalarField& startFaceWeights,
+    const bool doProcessorAgglomerate
+)
+{
     // Start geometric agglomeration from the cell volumes and areas of the mesh
     scalarField* VPtr = const_cast<scalarField*>(&fvMesh_.cellVolumes());
 
@@ -226,8 +241,8 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
         tmp<labelField> finalAgglomPtr = agglomerate
         (
             nCoarseCells,
-            minSize,
-            maxSize,
+            minSize_,
+            maxSize_,
             meshLevel(nCreatedLevels).lduAddr(),
             *VPtr,
             *magSfPtr,
@@ -235,7 +250,7 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
         );
 
         // Adjust weights only
-        for (int i=0; i<nProcConsistencyIter; i++)
+        for (int i=0; i<nProcConsistencyIter_; i++)
         {
             const lduMesh& mesh = meshLevel(nCreatedLevels);
             const lduAddressing& addr = mesh.lduAddr();
@@ -281,8 +296,8 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
             finalAgglomPtr = agglomerate
             (
                 nCoarseCells,
-                minSize,
-                maxSize,
+                minSize_,
+                maxSize_,
                 meshLevel(nCreatedLevels).lduAddr(),
                 *VPtr,
                 weights,
@@ -368,7 +383,7 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
     }
 
     // Shrink the storage of the levels to those created
-    compactLevels(nCreatedLevels, true);
+    compactLevels(nCreatedLevels, doProcessorAgglomerate);
 
     // Delete temporary geometry storage
     if (nCreatedLevels)
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
index 81b61079f7..4056a882eb 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
@@ -66,6 +66,14 @@ class MGridGenGAMGAgglomeration
 
         const fvMesh& fvMesh_;
 
+        // Min, max size of agglomerated cells
+        const label minSize_;
+        const label maxSize_;
+
+        // Number of iterations applied to improve agglomeration consistency
+        // across processor boundaries
+        label nProcConsistencyIter_;
+
 
     // Private Member Functions
 
@@ -136,6 +144,17 @@ public:
             const lduMesh& mesh,
             const dictionary& controlDict
         );
+
+        //- Agglomerate from a starting level. Starting level is usually 0
+        //- (initial mesh) but sometimes >0 (restarting after processor
+        //- agglomeration)
+        virtual void agglomerate
+        (
+            const label nCellsInCoarsestLevel,
+            const label startLevel,
+            const scalarField& startFaceWeights,
+            const bool doProcessorAgglomerate = true
+        );
 };
 
 

From 1c9ea038d09400936836957bc6197e91a1bfd66c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Jun 2023 13:05:23 +0200
Subject: [PATCH 285/348] MISC: additional -repeat option for testing MPI_Comm
 leakage (#1598)

---
 .../test/parallel-comm1/Test-parallel-comm1.C | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/applications/test/parallel-comm1/Test-parallel-comm1.C b/applications/test/parallel-comm1/Test-parallel-comm1.C
index bc856e781c..ed8ce38516 100644
--- a/applications/test/parallel-comm1/Test-parallel-comm1.C
+++ b/applications/test/parallel-comm1/Test-parallel-comm1.C
@@ -121,17 +121,22 @@ scalar sumReduce
 
 int main(int argc, char *argv[])
 {
+    argList::noCheckProcessorDirectories();
+    argList::addVerboseOption();
+    argList::addOption("repeat", "count");
 
     #include "setRootCase.H"
-    #include "createTime.H"
+
+    const label repeat = args.getOrDefault<label>("repeat", 1);
+    const int optVerbose = args.verbose();
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     // Allocate a communicator
     label n = Pstream::nProcs(UPstream::worldComm);
 
-    DynamicList<label> bottom;
-    DynamicList<label> top;
+    DynamicList<label> bottom(n/2);
+    DynamicList<label> top(n/2);
 
     for (label i = 0; i < n/2; i++)
     {
@@ -142,37 +147,49 @@ int main(int argc, char *argv[])
         top.append(i);
     }
 
-    //Pout<< "bottom:" << bottom << endl;
-    Pout<< "top             :" << top << endl;
 
+    Info<< "repeating: " << repeat << " times" << endl;
 
-    scalar localValue = 111*UPstream::myProcNo(UPstream::worldComm);
-    Pout<< "localValue      :" << localValue << endl;
-
-
-    label comm = UPstream::allocateCommunicator(UPstream::worldComm, top);
-
-    Pout<< "allocated comm  :" << comm << endl;
-    Pout<< "comm myproc     :" << Pstream::myProcNo(comm)
-        << endl;
-
-
-    if (Pstream::myProcNo(comm) != -1)
+    if (optVerbose || repeat == 1)
     {
-        scalar sum = returnReduce
-        (
-            localValue,
-            sumOp<scalar>(),
-            UPstream::msgType(),
-            comm
-        );
-        Pout<< "sum             :" << sum << endl;
+        //Pout<< "bottom:" << bottom << endl;
+        Pout<< "top             :" << top << endl;
     }
 
-    UPstream::freeCommunicator(comm);
+    for (label count = 0; count < repeat; ++count)
+    {
+        label comm = UPstream::allocateCommunicator(UPstream::worldComm, top);
+
+        scalar localValue = 111*UPstream::myProcNo(UPstream::worldComm);
+
+        if (optVerbose || (repeat == 1 && count == 0))
+        {
+            Pout<< "localValue      :" << localValue << endl;
+            Pout<< "allocated comm  :" << comm
+                << " proci :" << UPstream::myProcNo(comm) << endl;
+        }
+
+        if (Pstream::myProcNo(comm) != -1)
+        {
+            scalar sum = returnReduce
+            (
+                localValue,
+                sumOp<scalar>(),
+                UPstream::msgType(),
+                comm
+            );
+
+            if (optVerbose || (repeat == 1 && count == 0))
+            {
+                Pout<< "sum             :" << sum << endl;
+            }
+        }
+
+        UPstream::freeCommunicator(comm);
+    }
 
 
-    Pout<< "End\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }

From b13c2c042f23852789bc15336a8e7145c88370d5 Mon Sep 17 00:00:00 2001
From: Gabriel Gerlero <>
Date: Mon, 12 Jun 2023 13:52:55 +0200
Subject: [PATCH 286/348] COMP: resolve clang/MacOS size ambiguities (fixes
 #2778)

---
 src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C | 5 +++--
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C        | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
index ff6eeab4d4..034f6d3c33 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C
@@ -176,9 +176,10 @@ void exchangeChunkedBuf
                 const auto proci = slot.first;
                 const auto count = slot.second.size();
 
-                if (proci != myProci)
+                if (proci != myProci && count > maxCount)
                 {
-                    maxCount = max(maxCount, count);
+                    // Note: using max() can be ambiguous
+                    maxCount = count;
                 }
             }
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 646a1cedac..831f6485b6 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -1039,7 +1039,8 @@ Foam::Istream& Foam::ISstream::readRaw(char* data, std::streamsize count)
         else
         {
             // Forward seek
-            is_.seekg(is_.tellg() + count);
+            // - use absolute positioning (see C++ notes about std::ifstream)
+            is_.seekg(is_.tellg() + std::istream::pos_type(count));
 
             // Not sure if this is needed (as per rewind)
             // some documentation indicates that ifstream needs

From 57c50bda79e8a3c41ac8d6209516072d47d17227 Mon Sep 17 00:00:00 2001
From: Alexey Matveichev <>
Date: Mon, 12 Jun 2023 14:06:13 +0200
Subject: [PATCH 287/348] CONFIG: re-export FOAM_DYLD_LIBRARY_PATH in foamJob
 (#2793)

---
 bin/foamJob | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/foamJob b/bin/foamJob
index 5583c91888..75a963e93c 100755
--- a/bin/foamJob
+++ b/bin/foamJob
@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2015 OpenFOAM Foundation
-#     Copyright (C) 2019-2022 OpenCFD Ltd.
+#     Copyright (C) 2019-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -23,6 +23,15 @@
 # If dispatching via foamExec
 foamExec="$WM_PROJECT_DIR/bin/tools/foamExec"
 
+# Darwin workaround - SIP clearing DYLD_LIBRARY_PATH variable
+if [ -n "$FOAM_LD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
+then
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
+fi
+
+
+#------------------------------------------------------------------------------
+
 usage() {
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done

From f096c34a802897fa4c9c8c941b17a9607323b283 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Jun 2023 14:51:38 +0200
Subject: [PATCH 288/348] REVERT: unstable MPI_Mprobe/MPI_Mrecv on intelmpi +
 PMI-2 (#2796)

- reverts commit c6f528588b83
---
 src/Pstream/mpi/UIPstreamRead.C | 61 +++------------------------------
 1 file changed, 5 insertions(+), 56 deletions(-)

diff --git a/src/Pstream/mpi/UIPstreamRead.C b/src/Pstream/mpi/UIPstreamRead.C
index c60f95bb87..afee9a1905 100644
--- a/src/Pstream/mpi/UIPstreamRead.C
+++ b/src/Pstream/mpi/UIPstreamRead.C
@@ -31,6 +31,10 @@ License
 #include "profilingPstream.H"
 #include "IOstreams.H"
 
+// FUTURE? probe and receive message
+// - as of 2023-06 appears to be broken with INTELMPI + PMI-2 (slurm)
+//   and perhaps other places so currently avoid
+
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
 // General blocking/non-blocking MPI receive, optionally with probed
@@ -44,10 +48,6 @@ static Foam::label UPstream_mpi_receive
     const int tag,
     const Foam::label communicator,
     Foam::UPstream::Request* req
-#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
-    , MPI_Message* message = nullptr
-#endif
 )
 {
     using namespace Foam;
@@ -84,21 +84,6 @@ static Foam::label UPstream_mpi_receive
         int returnCode = 0;
         MPI_Status status;
 
-#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-        // MPI-3 : eg, openmpi-1.7 (2013) and later
-        if (message)
-        {
-            returnCode = MPI_Mrecv
-            (
-                buf,
-                bufSize,
-                MPI_BYTE,
-                message,
-                &status
-            );
-        }
-        else
-#endif
         {
             returnCode = MPI_Recv
             (
@@ -151,21 +136,6 @@ static Foam::label UPstream_mpi_receive
         int returnCode = 0;
         MPI_Request request;
 
-#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-        // MPI-3 : eg, openmpi-1.7 (2013) and later
-        if (message)
-        {
-            returnCode = MPI_Imrecv
-            (
-                buf,
-                bufSize,
-                MPI_BYTE,
-                message,
-                &request
-            );
-        }
-        else
-#endif
         {
             returnCode = MPI_Irecv
             (
@@ -227,12 +197,6 @@ void Foam::UIPstream::bufferIPCrecv()
             << Foam::endl;
     }
 
-#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-    // MPI-3 : eg, openmpi-1.7 (2013) and later
-    MPI_Message message;
-    MPI_Message* messagePtr = nullptr;
-#endif
-
     // No buffer size allocated/specified - probe size of incoming message
     if (!recvBuf_.capacity())
     {
@@ -240,18 +204,6 @@ void Foam::UIPstream::bufferIPCrecv()
 
         MPI_Status status;
 
-#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-        // MPI-3 : eg, openmpi-1.7 (2013) and later
-        messagePtr = &message;
-        MPI_Mprobe
-        (
-            fromProcNo_,
-            tag_,
-            PstreamGlobals::MPICommunicators_[comm_],
-           &message,
-           &status
-        );
-#else
         MPI_Probe
         (
             fromProcNo_,
@@ -259,7 +211,7 @@ void Foam::UIPstream::bufferIPCrecv()
             PstreamGlobals::MPICommunicators_[comm_],
            &status
         );
-#endif
+
         MPI_Get_count(&status, MPI_BYTE, &messageSize_);
 
         profilingPstream::addProbeTime();
@@ -282,9 +234,6 @@ void Foam::UIPstream::bufferIPCrecv()
         tag_,
         comm_,
         nullptr   // UPstream::Request
-#if defined(MPI_VERSION) && (MPI_VERSION >= 3)
-        , messagePtr
-#endif
     );
 
     // Set addressed size. Leave actual allocated memory intact.

From e92975075af2f7eb5e9d1aae8d4b7f5f5eee8ae9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Jun 2023 15:21:20 +0200
Subject: [PATCH 289/348] ENH: sum reduction of nPoints/nFaces/nCells in a
 single call (globalMeshData)

STYLE: use labelRange instead of identity(...) for communicator
---
 .../procFacesGAMGProcAgglomeration.C          |  3 +-
 .../polyMesh/globalMeshData/globalMeshData.C  | 50 +++++--------------
 .../polyMesh/globalMeshData/globalMeshData.H  | 14 +++---
 3 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index d537dae584..52baecc75b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -152,7 +152,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     UPstream::communicator singleCellMeshComm
     (
         mesh.comm(),
-        labelList(Foam::one{}, 0)   // only processor 0
+        labelRange(1)  // Processor 0 only
     );
 
     scalarField faceWeights;
@@ -197,7 +197,6 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     }
 
     Pstream::broadcast(fineToCoarse, mesh.comm());
-    singleCellMeshComm.reset();
 
     return tfineToCoarse;
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index feba605416..7fd3cb883b 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2504,8 +2504,8 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     const globalIndex globalPPoints(meshPoints.size());
 
     labelList patchToCoupled(meshPoints.size(), -1);
-    label nCoupled = 0;
     labelList coupledToGlobalPatch(pointSlavesMap.constructSize(), -1);
+    //label nCoupled = 0;
 
     // Note: loop over patch since usually smaller
     forAll(meshPoints, patchPointi)
@@ -2518,7 +2518,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
         {
             patchToCoupled[patchPointi] = iter();
             coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointi);
-            nCoupled++;
+            //++nCoupled;
         }
     }
 
@@ -2718,55 +2718,31 @@ void Foam::globalMeshData::updateMesh()
     UPstream::communicator dupComm
     (
         UPstream::worldComm,
-        identity(UPstream::nProcs(UPstream::worldComm))
+        labelRange(UPstream::nProcs(UPstream::worldComm))
     );
 
     const label comm = dupComm.comm();
     const label oldWarnComm = UPstream::commWarn(comm);
 
+    FixedList<label, 3> totals;
 
-    // Total number of faces.
-    nTotalFaces_ = returnReduce
-    (
-        mesh_.nFaces(),
-        sumOp<label>(),
-        UPstream::msgType(),
-        comm
-    );
+    totals[0] = mesh_.nPoints();
+    totals[1] = mesh_.nFaces();
+    totals[2] = mesh_.nCells();
 
-    if (debug)
-    {
-        Pout<< "globalMeshData : nTotalFaces:" << nTotalFaces_ << endl;
-    }
+    reduce(totals, sumOp<label>(), UPstream::msgType(), comm);
 
-    nTotalCells_ = returnReduce
-    (
-        mesh_.nCells(),
-        sumOp<label>(),
-        UPstream::msgType(),
-        comm
-    );
-
-    if (debug)
-    {
-        Pout<< "globalMeshData : nTotalCells:" << nTotalCells_ << endl;
-    }
-
-    nTotalPoints_ = returnReduce
-    (
-        mesh_.nPoints(),
-        sumOp<label>(),
-        UPstream::msgType(),
-        comm
-    );
+    nTotalPoints_ = totals[0];
+    nTotalFaces_ = totals[1];
+    nTotalCells_ = totals[2];
 
     // Restore communicator settings
     UPstream::commWarn(oldWarnComm);
-    dupComm.reset();
 
     if (debug)
     {
-        Pout<< "globalMeshData : nTotalPoints:" << nTotalPoints_ << endl;
+        Info<< "globalMeshData : Total points/faces/cells : "
+            << totals << endl;
     }
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index fb75f9677e..b9a70712c5 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -348,22 +348,22 @@ public:
                 return mesh_;
             }
 
-            //- Does the mesh contain processor patches? (also valid when
-            //  not running parallel)
-            bool parallel() const
+            //- Does the mesh contain processor patches?
+            //- (also valid when not running parallel)
+            bool parallel() const noexcept
             {
                 return !processorPatches_.empty();
             }
 
-            //- Return total number of points in decomposed mesh. Not
-            //  compensated for duplicate points!
+            //- Return total number of points in decomposed mesh.
+            //- Not compensated for duplicate points!
             label nTotalPoints() const noexcept
             {
                 return nTotalPoints_;
             }
 
-            //- Return total number of faces in decomposed mesh. Not
-            //  compensated for duplicate faces!
+            //- Return total number of faces in decomposed mesh.
+            //- Not compensated for duplicate faces!
             label nTotalFaces() const noexcept
             {
                 return nTotalFaces_;

From dbba89fc92704215a51fafb89dd34842c857b648 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Tue, 13 Jun 2023 09:02:13 +0100
Subject: [PATCH 290/348] ENH: InterfaceCompositionModel: add new combination

---
 .../InterfaceCompositionModels.C                  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C
index 980f5e0873..82418e64a9 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -481,6 +481,19 @@ namespace Foam
             hTabulatedPolyIcoSolidThermoPhysics
         );
 
+        makeInterfacePureType
+        (
+            Lee,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            tabulatedThermoPhysics,
+            heRhoThermo,
+            rhoThermo,
+            pureMixture,
+            tabulatedThermoPhysics
+        );
+
         // From pure phase (tabulated) to solid phase (icoTabulated)
         makeInterfacePureType
         (

From b87db82c05bcde713e7722b4d3615a7f81e47701 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 13 Jun 2023 14:13:54 +0100
Subject: [PATCH 291/348] ENH: particleTracks - reinstated label field output

---
 .../postProcessing/lagrangian/particleTracks/particleTracks.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 6270c10a84..754109e162 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -286,7 +286,7 @@ int main(int argc, char *argv[])
         trackSampler.createTrackField(localTimes, allTrackTimes);
 
         // Create the track fields
-        ///trackSampler.setTrackFields(obr, labelFields);
+        trackSampler.setTrackFields(obr, labelFields);
         trackSampler.setTrackFields(obr, scalarFields);
         trackSampler.setTrackFields(obr, vectorFields);
         trackSampler.setTrackFields(obr, sphericalTensorFields);
@@ -382,7 +382,7 @@ int main(int argc, char *argv[])
             writer.setTrackTimes(times);
             writer.nFields(nFields);
 
-            ///writeTrackFields(writer, labelFields);
+            writeTrackFields(writer, labelFields);
             writeTrackFields(writer, scalarFields);
             writeTrackFields(writer, vectorFields);
             writeTrackFields(writer, sphericalTensorFields);

From 1cdba9b2690365a55b66fee525eebeda5d3b410f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2023 11:27:06 +0200
Subject: [PATCH 292/348] ENH: make checkMesh writing of bad edges optional
 (#2771)

- primarily relevant for finite-area meshes, in which case they can be
  considered to be an additional, detailed diagnositic that is
  normally not needed (clutters the file system).

  Writing can be enabled with the `-write-edges` option.
---
 .../mesh/manipulation/checkMesh/checkMesh.C   | 63 +++++++++++++------
 .../manipulation/checkMesh/checkTopology.C    | 11 +++-
 .../manipulation/checkMesh/checkTopology.H    |  3 +-
 3 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 76db56ca70..90bdf3a79f 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,6 +67,9 @@ Usage
     \param -writeFields '(\<fieldName\>)' \n
     Writes selected mesh quality measures as fields.
 
+    \param -write-edges \n
+    Write bad edges (possibly relevant for finite-area) in VTK format.
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
@@ -142,6 +145,11 @@ int main(int argc, char *argv[])
         "surfaceFormat",
         "Reconstruct and write all faceSets and cellSets in selected format"
     );
+    argList::addBoolOption
+    (
+        "write-edges",
+        "Write bad edges (possibly relevant for finite-area) in vtk format"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
@@ -153,6 +161,7 @@ int main(int argc, char *argv[])
     const bool allGeometry = args.found("allGeometry");
     const bool allTopology = args.found("allTopology");
     const bool meshQuality = args.found("meshQuality");
+    const bool optWriteEdges = args.found("write-edges");
 
     const word surfaceFormat = args.getOrDefault<word>("writeSets", "");
     const bool writeSets = surfaceFormat.size();
@@ -188,10 +197,11 @@ int main(int argc, char *argv[])
         if (!badFields.empty())
         {
             FatalErrorInFunction
-                << "Illegal field(s) " << flatOutput(badFields.sortedToc())
-                << nl
-                << "Valid fields are " << flatOutput(allFields.sortedToc())
-                << nl << exit(FatalError);
+                << "Illegal field(s): "
+                << flatOutput(badFields.sortedToc()) << nl
+                << "Valid fields: "
+                << flatOutput(allFields.sortedToc()) << nl
+                << exit(FatalError);
         }
     }
     else if (args.found("writeAllFields"))
@@ -207,34 +217,48 @@ int main(int argc, char *argv[])
     }
 
 
+    Info<< "Check mesh..." << nl;
+    Info().incrIndent();
+
     if (noTopology)
     {
-        Info<< "Disabling all topology checks." << nl << endl;
+        Info<< indent
+            << "Disabling all topology checks." << nl;
     }
     if (allTopology)
     {
-        Info<< "Enabling all (cell, face, edge, point) topology checks."
-            << nl << endl;
+        Info<< indent
+            << "Enabling all (cell, face, edge, point) topology checks." << nl;
     }
     if (allGeometry)
     {
-        Info<< "Enabling all geometry checks." << nl << endl;
+        Info<< indent
+            << "Enabling all geometry checks." << nl;
     }
     if (meshQuality)
     {
-        Info<< "Enabling user-defined geometry checks." << nl << endl;
+        Info<< indent
+            << "Enabling user-defined geometry checks." << nl;
     }
     if (writeSets)
     {
-        Info<< "Reconstructing and writing " << surfaceFormat
-            << " representation"
-            << " of all faceSets and cellSets." << nl << endl;
+        Info<< indent
+            << "Reconstructing and writing " << surfaceFormat
+            << " representation of all faceSets and cellSets." << nl;
     }
     if (selectedFields.size())
     {
-        Info<< "Writing mesh quality as fields " << selectedFields << nl
-            << endl;
+        Info<< indent
+            << "Writing mesh quality as fields "
+            << flatOutput(selectedFields.sortedToc()) << nl;
     }
+    if (optWriteEdges)
+    {
+        Info<< indent
+            << "Writing any bad edges in vtk format" << nl;
+    }
+    Info().decrIndent();
+    Info<< endl;
 
 
     PtrList<IOdictionary> qualDict(meshes.size());
@@ -270,9 +294,9 @@ int main(int argc, char *argv[])
     }
 
 
-    forAll(timeDirs, timeI)
+    forAll(timeDirs, timei)
     {
-        runTime.setTime(timeDirs[timeI], timeI);
+        runTime.setTime(timeDirs[timei], timei);
 
         // Get most changed of all meshes
         polyMesh::readUpdateState state = polyMesh::UNCHANGED;
@@ -284,7 +308,7 @@ int main(int argc, char *argv[])
 
         if
         (
-            !timeI
+            !timei
          || state == polyMesh::TOPO_CHANGE
          || state == polyMesh::TOPO_PATCH_CHANGE
         )
@@ -310,7 +334,8 @@ int main(int argc, char *argv[])
                         allTopology,
                         allGeometry,
                         surfWriter,
-                        setWriter
+                        setWriter,
+                        optWriteEdges
                     );
                 }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index a4dcfe90b6..b93ed914ca 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -406,7 +406,8 @@ Foam::label Foam::checkTopology
     const bool allTopology,
     const bool allGeometry,
     autoPtr<surfaceWriter>& surfWriter,
-    autoPtr<coordSetWriter>& setWriter
+    autoPtr<coordSetWriter>& setWriter,
+    const bool writeBadEdges
 )
 {
     label noFailedChecks = 0;
@@ -906,7 +907,7 @@ Foam::label Foam::checkTopology
             );
             Info<< nl << endl;
 
-            if (hadBadEdges)
+            if (writeBadEdges && hadBadEdges)
             {
                 edgeList dumpEdges(pp.edges(), badEdges.sortedToc());
 
@@ -932,6 +933,12 @@ Foam::label Foam::checkTopology
                     << " bad edges: " << writer.output().name() << nl;
                 writer.close();
             }
+            else if (hadBadEdges)
+            {
+                Info<< "Detected "
+                    << returnReduce(badEdges.size(), sumOp<label>())
+                    << " bad edges (possibly relevant for finite-area)" << nl;
+            }
         }
 
         //Info.setf(ios_base::right);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
index d80a7d9315..52ce933310 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
@@ -75,7 +75,8 @@ label checkTopology
     const bool allTopology,
     const bool allGeometry,
     autoPtr<surfaceWriter>& surfWriter,
-    autoPtr<coordSetWriter>& setWriter
+    autoPtr<coordSetWriter>& setWriter,
+    const bool writeBadEdges = false
 );
 
 } // End namespace Foam

From f4df00a4e90a73c60d1d20cc0647cc5260a80674 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2023 15:18:18 +0200
Subject: [PATCH 293/348] ENH: support alternative registration name for
 solution "data" (#2797)

---
 .../GeometricField/GeometricField.H           |  6 +-
 src/OpenFOAM/meshes/data/data.C               | 49 ++++-----
 src/OpenFOAM/meshes/data/data.H               | 99 ++++++++++++++++---
 src/OpenFOAM/meshes/data/dataTemplates.C      |  3 +-
 src/finiteArea/faMesh/faMesh.C                |  6 +-
 5 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index eaa54bab72..2d5157abf1 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -660,9 +660,9 @@ public:
         //  alpha is read from controlDict
         void relax();
 
-        //- Select the final iteration parameters if `final' is true
-        //  by returning the field name + "Final"
-        //  otherwise the standard parameters by returning the field name
+        //- Select the final iteration parameters if \c final is true
+        //- by returning the field name + "Final"
+        //- otherwise the standard parameters by returning the field name
         word select(bool final) const;
 
         //- Helper function to write the min and max to an Ostream
diff --git a/src/OpenFOAM/meshes/data/data.C b/src/OpenFOAM/meshes/data/data.C
index 15e419193f..083304d26f 100644
--- a/src/OpenFOAM/meshes/data/data.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,48 +29,35 @@ License
 #include "data.H"
 #include "Time.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-int Foam::data::debug(Foam::debug::debugSwitch("data", 0));
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::data::data(const objectRegistry& obr)
+Foam::data::data
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary* content
+)
 :
     IOdictionary
     (
         IOobject
         (
-            "data",
+            name,
             obr.time().system(),
             obr,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
-        )
-    ),
-    prevTimeIndex_(0)
-{
-    set("solverPerformance", dictionary());
-}
-
-
-Foam::data::data(const objectRegistry& obr, const dictionary& dict)
-:
-    IOdictionary
-    (
-        IOobject
-        (
-            "data",
-            obr.time().system(),
-            obr,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::NO_WRITE,
+            IOobject::REGISTER
         ),
-        dict
+        content
     ),
-    prevTimeIndex_(0)
-{}
+    prevTimeIndex_(-1)
+{
+    if (content == nullptr || !findDict("solverPerformance", keyType::LITERAL))
+    {
+        set("solverPerformance", dictionary());
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index 91da9a93d4..202419a4c6 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,16 +30,17 @@ Class
 Description
     Database for solution data, solver performance and other reduced data.
 
-    fvMesh is derived from data so that all fields have access to the data from
-    the mesh reference they hold.
+    Both faMesh and fvMesh are derived from this class so that every
+    GeometricField has access to this data via their mesh reference.
 
 SourceFiles
     data.C
+    dataTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef data_H
-#define data_H
+#ifndef Foam_data_H
+#define Foam_data_H
 
 #include "IOdictionary.H"
 #include "solverPerformance.H"
@@ -57,7 +58,7 @@ class data
 :
     public IOdictionary
 {
-    // Private data
+    // Private Data
 
         //- Previously used time-index, used for reset between iterations
         mutable label prevTimeIndex_;
@@ -65,26 +66,69 @@ class data
 
     // Private Member Functions
 
+        //- True if boolean entry exists and is set
+        bool getBoolEntry(const word& keyword) const
+        {
+            bool value = false;
+            return readIfPresent(keyword, value) && value;
+        }
+
+        //- Add/remove boolean entry
+        void setBoolEntry(const word& keyword, bool on)
+        {
+            if (on)
+            {
+                add(keyword, true);
+            }
+            else
+            {
+                remove(keyword);
+            }
+        }
+
         //- No copy construct
         data(const data&) = delete;
 
         //- No copy assignment
         void operator=(const data&) = delete;
 
-
 public:
 
-    //- Debug switch
-    static int debug;
-
-
     // Constructors
 
-        //- Construct for objectRegistry
-        data(const objectRegistry& obr);
+        //- Construct for objectRegistry (registered with specified name)
+        //- optionally with initial content
+        data
+        (
+            const word& name,
+            const objectRegistry& obr,
+            const dictionary* content = nullptr
+        );
 
-        //- Construct for objectRegistry and initial contents
-        data(const objectRegistry& obr, const dictionary& dict);
+        //- Construct for objectRegistry (registered as "data")
+        explicit data(const objectRegistry& obr)
+        :
+            data("data", obr)
+        {}
+
+        //- Construct for objectRegistry (registered with specified name)
+        //- copying initial content
+        data
+        (
+            const word& name,
+            const objectRegistry& obr,
+            const dictionary& dict
+        )
+        :
+            data(name, obr, &dict)
+        {}
+
+        //- Construct for objectRegistry (registered as "data")
+        //- copying initial content
+        data(const objectRegistry& obr, const dictionary& dict)
+        :
+            data("data", obr, &dict)
+        {}
 
 
     // Member Functions
@@ -93,6 +137,31 @@ public:
         //- includes initial and final residuals for convergence checking
         const dictionary& solverPerformanceDict() const;
 
+        //- True if "firstIteration" entry exists and is set
+        bool isFirstIteration() const
+        {
+            return getBoolEntry("firstIteration");
+        }
+
+        //- True if "finalIteration" entry exists and is set
+        bool isFinalIteration() const
+        {
+            return getBoolEntry("finalIteration");
+        }
+
+        //- Add/remove "firstIteration" entry
+        void isFirstIteration(bool on)
+        {
+            return setBoolEntry("firstIteration", on);
+        }
+
+        //- Add/remove "finalIteration" entry
+        void isFinalIteration(bool on)
+        {
+            return setBoolEntry("finalIteration", on);
+        }
+
+
         //- Add/set the solverPerformance entry for the named field
         template<class Type>
         void setSolverPerformance
diff --git a/src/OpenFOAM/meshes/data/dataTemplates.C b/src/OpenFOAM/meshes/data/dataTemplates.C
index baa9c6f403..8bef786dd3 100644
--- a/src/OpenFOAM/meshes/data/dataTemplates.C
+++ b/src/OpenFOAM/meshes/data/dataTemplates.C
@@ -53,8 +53,7 @@ void Foam::data::setSolverPerformance
         dict.readIfPresent(name, perfs);
     }
 
-    // Append to list
-    perfs.setSize(perfs.size()+1, sp);
+    perfs.push_back(sp);
 
     dict.set(name, perfs);
 }
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index eadb9eb7a0..95c5081bbe 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -350,7 +350,7 @@ Foam::faMesh::faMesh
     faSchemes(mesh()),
     edgeInterpolation(*this),
     faSolution(mesh()),
-    data(mesh()),   // Always NO_READ, NO_WRITE
+    data(faMesh::thisDb()),   // Always NO_READ, NO_WRITE
     faceLabels_
     (
         IOobject
@@ -473,7 +473,7 @@ Foam::faMesh::faMesh
     faSchemes(mesh(), io.readOpt()),
     edgeInterpolation(*this),
     faSolution(mesh(), io.readOpt()),
-    data(mesh()),   // Always NO_READ, NO_WRITE
+    data(faMesh::thisDb()),   // Always NO_READ, NO_WRITE
     faceLabels_
     (
         IOobject
@@ -558,7 +558,7 @@ Foam::faMesh::faMesh
     ),
     data
     (
-        mesh(),
+        faMesh::thisDb(),
         static_cast<const data&>(baseMesh)
     ),
     faceLabels_

From a8cec219c34cac342995174d1afd8cd4ad28bff6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2023 10:40:57 +0200
Subject: [PATCH 294/348] ENH: add UPstream request cancellation (#2800)

- useful when speculative receives have been initiated but are no
  longer required.

  Combines MPI_Cancel() + MPI_Request_free() for consistent resource
  management. Currently no feedback provided if the request was
  satisfied by a completed send/recv or by cancellation (can be added
  later if required).
---
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |  41 ++-
 .../processorGAMGInterfaceField.C             |   5 +-
 src/Pstream/dummy/UPstreamRequest.C           |  17 +-
 src/Pstream/mpi/UPstreamRequest.C             | 280 ++++++++++++------
 .../calculatedProcessorGAMGInterfaceField.C   |   5 +-
 5 files changed, 250 insertions(+), 98 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index acbd44c17d..13d477dcfa 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -593,6 +593,33 @@ public:
         //  A no-op for non-parallel. No special treatment for null requests.
         static void addRequest(UPstream::Request& req);
 
+        //- Non-blocking comms: cancel and free outstanding request.
+        //- Corresponds to MPI_Cancel() + MPI_Request_free()
+        //  A no-op if parRun() == false
+        //  if there are no pending requests,
+        //  or if the index is out-of-range (0 to nRequests)
+        static void cancelRequest(const label i);
+
+        //- Non-blocking comms: cancel and free outstanding request.
+        //- Corresponds to MPI_Cancel() + MPI_Request_free()
+        //  A no-op if parRun() == false
+        static void cancelRequest(UPstream::Request& req);
+
+        //- Non-blocking comms: cancel and free outstanding requests.
+        //- Corresponds to MPI_Cancel() + MPI_Request_free()
+        //  A no-op if parRun() == false or list is empty
+        static void cancelRequests(UList<UPstream::Request>& requests);
+
+        //- Non-blocking comms: free outstanding request.
+        //- Corresponds to MPI_Request_free()
+        //  A no-op if parRun() == false
+        static void freeRequest(UPstream::Request& req);
+
+        //- Non-blocking comms: free outstanding requests.
+        //- Corresponds to MPI_Request_free()
+        //  A no-op if parRun() == false or list is empty
+        static void freeRequests(UList<UPstream::Request>& requests);
+
         //- Wait until all requests (from position onwards) have finished.
         //- Corresponds to MPI_Waitall()
         //  A no-op if parRun() == false,
@@ -699,7 +726,7 @@ public:
         //  if there are no pending requests,
         //  or if the indices are out-of-range (0 to nRequests)
         //  Each finished request parameter is set to -1 (ie, done).
-        static bool finishedRequestPair(label& req1, label& req2);
+        static bool finishedRequestPair(label& req0, label& req1);
 
         //- Non-blocking comms: wait for both requests to finish.
         //- Corresponds to pair of MPI_Wait()
@@ -707,7 +734,7 @@ public:
         //  if there are no pending requests,
         //  or if the indices are out-of-range (0 to nRequests)
         //  Each finished request parameter is set to -1 (ie, done).
-        static void waitRequestPair(label& req1, label& req2);
+        static void waitRequestPair(label& req0, label& req1);
 
 
     // General
@@ -1271,11 +1298,17 @@ public:
         //- Reset to default constructed value (MPI_REQUEST_NULL)
         void reset() noexcept;
 
-        //- Same as calling UPstream::waitRequest()
-        void wait() { UPstream::waitRequest(*this); }
+        //- Same as calling UPstream::cancelRequest()
+        void cancel() { UPstream::cancelRequest(*this); }
+
+        //- Same as calling UPstream::freeRequest()
+        void free() { UPstream::freeRequest(*this); }
 
         //- Same as calling UPstream::finishedRequest()
         bool finished() { return UPstream::finishedRequest(*this); }
+
+        //- Same as calling UPstream::waitRequest()
+        void wait() { UPstream::waitRequest(*this); }
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 0e4b221535..d5a1ac5e93 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -171,9 +171,8 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }
diff --git a/src/Pstream/dummy/UPstreamRequest.C b/src/Pstream/dummy/UPstreamRequest.C
index 551e766f37..f4962ffd45 100644
--- a/src/Pstream/dummy/UPstreamRequest.C
+++ b/src/Pstream/dummy/UPstreamRequest.C
@@ -53,7 +53,14 @@ Foam::label Foam::UPstream::nRequests() noexcept { return 0; }
 
 void Foam::UPstream::resetRequests(const label n) {}
 
-void Foam::UPstream::addRequest(UPstream::Request& req) {}
+void Foam::UPstream::addRequest(UPstream::Request&) {}
+
+void Foam::UPstream::cancelRequest(const label i) {}
+void Foam::UPstream::cancelRequest(UPstream::Request&) {}
+void Foam::UPstream::cancelRequests(UList<UPstream::Request>&) {}
+
+void Foam::UPstream::freeRequest(UPstream::Request&) {}
+void Foam::UPstream::freeRequests(UList<UPstream::Request>&) {}
 
 void Foam::UPstream::waitRequests(const label pos, label len) {}
 void Foam::UPstream::waitRequests(UList<UPstream::Request>&) {}
@@ -96,18 +103,18 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>&)
 }
 
 
-bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
+bool Foam::UPstream::finishedRequestPair(label& req0, label& req1)
 {
+    req0 = -1;
     req1 = -1;
-    req2 = -1;
     return true;
 }
 
 
-void Foam::UPstream::waitRequestPair(label& req1, label& req2)
+void Foam::UPstream::waitRequestPair(label& req0, label& req1)
 {
+    req0 = -1;
     req1 = -1;
-    req2 = -1;
 }
 
 
diff --git a/src/Pstream/mpi/UPstreamRequest.C b/src/Pstream/mpi/UPstreamRequest.C
index eb8cfc9251..4f9467fd22 100644
--- a/src/Pstream/mpi/UPstreamRequest.C
+++ b/src/Pstream/mpi/UPstreamRequest.C
@@ -88,6 +88,118 @@ void Foam::UPstream::addRequest(UPstream::Request& req)
 }
 
 
+void Foam::UPstream::cancelRequest(const label i)
+{
+    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
+    if
+    (
+        !UPstream::parRun()
+     || i < 0
+     || i >= PstreamGlobals::outstandingRequests_.size()
+    )
+    {
+        return;
+    }
+
+    {
+        auto& request = PstreamGlobals::outstandingRequests_[i];
+        if (MPI_REQUEST_NULL != request)  // Active handle is mandatory
+        {
+            MPI_Cancel(&request);
+            MPI_Request_free(&request);  //<- Sets to MPI_REQUEST_NULL
+        }
+    }
+}
+
+
+void Foam::UPstream::cancelRequest(UPstream::Request& req)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    {
+        MPI_Request request = PstreamDetail::Request::get(req);
+        if (MPI_REQUEST_NULL != request)  // Active handle is mandatory
+        {
+            MPI_Cancel(&request);
+            MPI_Request_free(&request);
+        }
+        req = UPstream::Request(MPI_REQUEST_NULL);  // Now inactive
+    }
+}
+
+
+void Foam::UPstream::cancelRequests(UList<UPstream::Request>& requests)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    for (auto& req : requests)
+    {
+        MPI_Request request = PstreamDetail::Request::get(req);
+        if (MPI_REQUEST_NULL != request)  // Active handle is mandatory
+        {
+            MPI_Cancel(&request);
+            MPI_Request_free(&request);
+        }
+        req = UPstream::Request(MPI_REQUEST_NULL);  // Now inactive
+    }
+}
+
+
+void Foam::UPstream::freeRequest(UPstream::Request& req)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    {
+        MPI_Request request = PstreamDetail::Request::get(req);
+        if (MPI_REQUEST_NULL != request)  // Active handle is mandatory
+        {
+            // if (cancel)
+            // {
+            //     MPI_Cancel(&request);
+            // }
+            MPI_Request_free(&request);
+        }
+        req = UPstream::Request(MPI_REQUEST_NULL);  // Now inactive
+    }
+}
+
+
+void Foam::UPstream::freeRequests(UList<UPstream::Request>& requests)
+{
+    // No-op for non-parallel
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    for (auto& req : requests)
+    {
+        MPI_Request request = PstreamDetail::Request::get(req);
+        if (MPI_REQUEST_NULL != request)  // Active handle is mandatory
+        {
+            // if (cancel)
+            // {
+            //     MPI_Cancel(&request);
+            // }
+            MPI_Request_free(&request);
+        }
+        req = UPstream::Request(MPI_REQUEST_NULL);  // Now inactive
+    }
+}
+
+
 void Foam::UPstream::waitRequests(const label pos, label len)
 {
     // No-op for non-parallel, no pending requests or out-of-range
@@ -178,7 +290,7 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
     {
         MPI_Request request = PstreamDetail::Request::get(req);
 
-        if (MPI_REQUEST_NULL != request)
+        if (MPI_REQUEST_NULL != request)  // Apply some prefiltering
         {
             waitRequests[count] = request;
             ++count;
@@ -187,7 +299,7 @@ void Foam::UPstream::waitRequests(UList<UPstream::Request>& requests)
 
     if (!count)
     {
-        // Early exit: has NULL requests only
+        // No active request handles
         return;
     }
 
@@ -422,8 +534,8 @@ Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>& requests)
 //
 /// void Foam::UPstream::waitRequests
 /// (
-///     UPstream::Request& req1,
-///     UPstream::Request& req2
+///     UPstream::Request& req0,
+///     UPstream::Request& req1
 /// )
 /// {
 ///     // No-op for non-parallel
@@ -435,22 +547,22 @@ Foam::label Foam::UPstream::waitAnyRequest(UList<UPstream::Request>& requests)
 ///     int count = 0;
 ///     MPI_Request waitRequests[2];
 ///
-///     waitRequests[count] = PstreamDetail::Request::get(req1);
+///     waitRequests[count] = PstreamDetail::Request::get(req0);
 ///     if (MPI_REQUEST_NULL != waitRequests[count])
 ///     {
-///         // Flag in advance as being handled
-///         req1 = UPstream::Request(MPI_REQUEST_NULL);
 ///         ++count;
 ///     }
 ///
-///     waitRequests[count] = PstreamDetail::Request::get(req2);
+///     waitRequests[count] = PstreamDetail::Request::get(req1);
 ///     if (MPI_REQUEST_NULL != waitRequests[count])
 ///     {
-///         // Flag in advance as being handled
-///         req2 = UPstream::Request(MPI_REQUEST_NULL);
 ///         ++count;
 ///     }
 ///
+///     // Flag in advance as being handled
+///     req0 = UPstream::Request(MPI_REQUEST_NULL);
+///     req1 = UPstream::Request(MPI_REQUEST_NULL);
+///
 ///     if (!count)
 ///     {
 ///         return;
@@ -544,8 +656,7 @@ void Foam::UPstream::waitRequest(UPstream::Request& req)
 
     profilingPstream::addWaitTime();
 
-    // Handled, reset to MPI_REQUEST_NULL
-    req = UPstream::Request(MPI_REQUEST_NULL);
+    req = UPstream::Request(MPI_REQUEST_NULL);  // Now inactive
 }
 
 
@@ -605,7 +716,7 @@ bool Foam::UPstream::finishedRequest(UPstream::Request& req)
 
     if (flag)
     {
-        // Success: reset request to MPI_REQUEST_NULL
+        // Success: now inactive
         req = UPstream::Request(MPI_REQUEST_NULL);
     }
 
@@ -687,7 +798,7 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
     {
         MPI_Request request = PstreamDetail::Request::get(req);
 
-        if (MPI_REQUEST_NULL != request)
+        if (MPI_REQUEST_NULL != request)  // Apply some prefiltering
         {
             waitRequests[count] = request;
             ++count;
@@ -696,7 +807,7 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
 
     if (!count)
     {
-        // Early exit: has NULL requests only
+        // No active handles
         return true;
     }
 
@@ -736,45 +847,60 @@ bool Foam::UPstream::finishedRequests(UList<UPstream::Request>& requests)
 }
 
 
-bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
+bool Foam::UPstream::finishedRequestPair(label& req0, label& req1)
 {
     // No-op for non-parallel
     if (!UPstream::parRun())
     {
+        req0 = -1;
         req1 = -1;
-        req2 = -1;
         return true;
     }
 
-    int count = 0;
+    bool anyActive = false;
     MPI_Request waitRequests[2];
 
-    // In range?
-    if (req1 >= 0 && req1 < PstreamGlobals::outstandingRequests_.size())
+    // No-op for out-of-range (eg, placeholder indices)
+
+    if (req0 >= 0 && req0 < PstreamGlobals::outstandingRequests_.size())
     {
-        waitRequests[0] = PstreamGlobals::outstandingRequests_[req1];
-        ++count;
+        waitRequests[0] = PstreamGlobals::outstandingRequests_[req0];
     }
     else
     {
         waitRequests[0] = MPI_REQUEST_NULL;
-        req1 = -1;
     }
 
-    // No-op for non-parallel, or out-of-range (eg, placeholder indices)
-    if (req2 >= 0 && req2 < PstreamGlobals::outstandingRequests_.size())
+    if (req1 >= 0 && req1 < PstreamGlobals::outstandingRequests_.size())
     {
-        waitRequests[1] = PstreamGlobals::outstandingRequests_[req2];
-        ++count;
+        waitRequests[1] = PstreamGlobals::outstandingRequests_[req1];
     }
     else
     {
         waitRequests[1] = MPI_REQUEST_NULL;
-        req2 = -1;
     }
 
-    if (!count)
+    if (MPI_REQUEST_NULL != waitRequests[0])  // An active handle
     {
+        anyActive = true;
+    }
+    else
+    {
+        req0 = -1;
+    }
+
+    if (MPI_REQUEST_NULL != waitRequests[1])  // An active handle
+    {
+        anyActive = true;
+    }
+    else
+    {
+        req1 = -1;
+    }
+
+    if (!anyActive)
+    {
+        // No active handles
         return true;
     }
 
@@ -807,56 +933,56 @@ bool Foam::UPstream::finishedRequestPair(label& req1, label& req2)
         // No active request handles.
         // Slight pedantic, but copy back requests in case they were altered
 
-        if (req1 >= 0)
+        if (req0 >= 0)
         {
-            PstreamGlobals::outstandingRequests_[req1] = waitRequests[0];
+            PstreamGlobals::outstandingRequests_[req0] = waitRequests[0];
         }
 
-        if (req2 >= 0)
+        if (req1 >= 0)
         {
-            PstreamGlobals::outstandingRequests_[req2] = waitRequests[1];
+            PstreamGlobals::outstandingRequests_[req1] = waitRequests[1];
         }
 
         // Flag indices as 'done'
+        req0 = -1;
         req1 = -1;
-        req2 = -1;
         return true;
     }
 
     // Copy back requests to their 'stack' locations
     for (int i = 0; i < outcount; ++i)
     {
-        int reqid = indices[i];
+        const int idx = indices[i];
 
-        if (reqid == 0)
+        if (idx == 0)
+        {
+            if (req0 >= 0)
+            {
+                PstreamGlobals::outstandingRequests_[req0] = waitRequests[0];
+                req0 = -1;
+            }
+        }
+        if (idx == 1)
         {
             if (req1 >= 0)
             {
-                PstreamGlobals::outstandingRequests_[req1] = waitRequests[0];
+                PstreamGlobals::outstandingRequests_[req1] = waitRequests[1];
                 req1 = -1;
             }
         }
-        if (reqid == 1)
-        {
-            if (req2 >= 0)
-            {
-                PstreamGlobals::outstandingRequests_[req2] = waitRequests[1];
-                req2 = -1;
-            }
-        }
     }
 
     return (outcount > 0);
 }
 
 
-void Foam::UPstream::waitRequestPair(label& req1, label& req2)
+void Foam::UPstream::waitRequestPair(label& req0, label& req1)
 {
     // No-op for non-parallel. Flag indices as 'done'
     if (!UPstream::parRun())
     {
+        req0 = -1;
         req1 = -1;
-        req2 = -1;
         return;
     }
 
@@ -864,32 +990,37 @@ void Foam::UPstream::waitRequestPair(label& req1, label& req2)
     MPI_Request waitRequests[2];
 
     // No-op for out-of-range (eg, placeholder indices)
+    // Prefilter inactive handles
+
+    if (req0 >= 0 && req0 < PstreamGlobals::outstandingRequests_.size())
+    {
+        waitRequests[count] = PstreamGlobals::outstandingRequests_[req0];
+        PstreamGlobals::outstandingRequests_[req0] = MPI_REQUEST_NULL;
+
+        if (MPI_REQUEST_NULL != waitRequests[count])  // An active handle
+        {
+            ++count;
+        }
+    }
+
     if (req1 >= 0 && req1 < PstreamGlobals::outstandingRequests_.size())
     {
-        waitRequests[0] = PstreamGlobals::outstandingRequests_[req1];
-        ++count;
-    }
-    else
-    {
-        waitRequests[0] = MPI_REQUEST_NULL;
-        req1 = -1;  // Flag as 'done'
+        waitRequests[count] = PstreamGlobals::outstandingRequests_[req1];
+        PstreamGlobals::outstandingRequests_[req1] = MPI_REQUEST_NULL;
+
+        if (MPI_REQUEST_NULL != waitRequests[count])  // An active handle
+        {
+            ++count;
+        }
     }
 
-    // No-op for out-of-range (eg, placeholder indices)
-    if (req2 >= 0 && req2 < PstreamGlobals::outstandingRequests_.size())
-    {
-        waitRequests[1] = PstreamGlobals::outstandingRequests_[req2];
-        ++count;
-    }
-    else
-    {
-        waitRequests[1] = MPI_REQUEST_NULL;
-        req2 = -1;  // Flag as 'done'
-    }
+    // Flag in advance as being handled
+    req0 = -1;
+    req1 = -1;
 
-    // Early exit
     if (!count)
     {
+        // No active handles
         return;
     }
 
@@ -904,23 +1035,6 @@ void Foam::UPstream::waitRequestPair(label& req1, label& req2)
     }
 
     profilingPstream::addWaitTime();
-
-    // Copy back requests to their 'stack' locations
-    // and flag index as done
-
-    if (req1 >= 0)
-    {
-        PstreamGlobals::outstandingRequests_[req1] = waitRequests[0];
-    }
-
-    if (req2 >= 0)
-    {
-        PstreamGlobals::outstandingRequests_[req2] = waitRequests[1];
-    }
-
-    // Flag indices as 'done'
-    req1 = -1;
-    req2 = -1;
 }
 
 
diff --git a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
index adf9b74a17..81526549ae 100644
--- a/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
+++ b/src/overset/lduPrimitiveProcessorInterface/GAMG/calculatedProcessorGAMGInterfaceField.C
@@ -172,9 +172,8 @@ void Foam::calculatedProcessorGAMGInterfaceField::updateInterfaceMatrix
     {
         // Fast path: consume straight from receive buffer
 
-        // Require receive data. Update the send request state.
-        // OR: UPstream::waitRequestPair(recvRequest_, sendRequest_);
-
+        // Require receive data.
+        // Only update the send request state.
         UPstream::waitRequest(recvRequest_); recvRequest_ = -1;
         if (UPstream::finishedRequest(sendRequest_)) sendRequest_ = -1;
     }

From 9489a5a1019f048e7f1a6cbdd715f6139f7590d5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 13 Jun 2023 18:29:04 +0200
Subject: [PATCH 295/348] COMP: replace selfComm/globalComm variables with
 functions instead (#2799)

- with C++11, static constexpr variables apparently also require
  definition in a translation unit and not just as inlined quantities.
  Mostly not an issue, however gcc with -O0 does not do the inlining
  and thus actually requires them to be defined in a translation unit
  as well.

  These variables were provided for symmetry with worldComm, but only
  used in low-level internal code. Changing to inlined functions
  solves the linkage issue and also aligns with the commWorld()
  function naming.

Mnemonics:
   MPI_COMM_SELF           => UPstream::commSelf()
   overall MPI_COMM_WORLD  => UPstream::commGlobal(), sometimes commWorld()
   local COMM_WORLD        => UPstream::commWorld()
---
 .../db/IOstreams/Pstreams/UIPstreamBase.C     |  2 +-
 .../db/IOstreams/Pstreams/UOPstreamBase.C     |  2 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 42 +++++++--------
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 54 +++++++++----------
 .../dummyFileOperation/dummyFileOperation.C   |  2 +-
 .../fileOperation/fileOperation.H             | 14 ++---
 .../fileOperation/fileOperationNew.C          |  4 +-
 .../uncollatedFileOperation.C                 |  2 +-
 src/Pstream/mpi/UPstream.C                    | 38 +++++++------
 9 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
index db04620b71..0151f0ab04 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstreamBase.C
@@ -220,7 +220,7 @@ Foam::UIPstreamBase::UIPstreamBase
     Istream(fmt),
     fromProcNo_(UPstream::masterNo()),      // placeholder
     tag_(UPstream::msgType()),              // placeholder
-    comm_(UPstream::selfComm),              // placeholder
+    comm_(UPstream::commSelf()),            // placeholder
     messageSize_(receiveBuf.size()),        // Message == buffer
     storedRecvBufPos_(0),
     clearAtEnd_(false),   // Do not clear recvBuf if at end!!
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
index b865858bad..13bf32ade0 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstreamBase.C
@@ -180,7 +180,7 @@ Foam::UOPstreamBase::UOPstreamBase
     Ostream(fmt),
     toProcNo_(UPstream::masterNo()),        // placeholder
     tag_(UPstream::msgType()),              // placeholder
-    comm_(UPstream::selfComm),              // placeholder
+    comm_(UPstream::commSelf()),            // placeholder
     sendAtDestruct_(false),   // Never sendAtDestruct!!
     sendBuf_(sendBuf)
 {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index e78777626f..2aa12b7311 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -152,28 +152,28 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         // but just in case of future changes
 
         // Using (world, self) ordering
-        freeCommunicator(UPstream::selfComm);
-        freeCommunicator(UPstream::globalComm);
+        freeCommunicator(UPstream::commSelf());
+        freeCommunicator(UPstream::commGlobal());
 
-        // 0: worldComm/globalComm
+        // 0: COMM_WORLD : commWorld() / commGlobal()
         comm = allocateCommunicator(-1, singleProc, false);
-        if (comm != UPstream::globalComm)
+        if (comm != UPstream::commGlobal())
         {
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  expected globalComm:" << UPstream::globalComm
+                << "  expected comm-global:" << UPstream::commGlobal()
                 << Foam::exit(FatalError);
         }
 
-        // 1: selfComm
+        // 1: COMM_SELF
         comm = allocateCommunicator(-2, singleProc, false);
-        if (comm != UPstream::selfComm)
+        if (comm != UPstream::commSelf())
         {
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  expected selfComm:" << UPstream::selfComm
+                << "  expected comm-self:" << UPstream::commSelf()
                 << Foam::exit(FatalError);
         }
 
@@ -186,34 +186,34 @@ void Foam::UPstream::setParRun(const label nProcs, const bool haveThreads)
         // but this time with MPI components
 
         // Using (world, self) ordering
-        freeCommunicator(UPstream::selfComm);
-        freeCommunicator(UPstream::globalComm);
+        freeCommunicator(UPstream::commSelf());
+        freeCommunicator(UPstream::commGlobal());
 
-        // 0: worldComm/globalComm
+        // 0: COMM_WORLD : commWorld() / commGlobal()
         comm = allocateCommunicator(-1, labelRange(nProcs), true);
-        if (comm != UPstream::globalComm)
+        if (comm != UPstream::commGlobal())
         {
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  expected globalComm:" << UPstream::globalComm
+                << "  expected comm-global:" << UPstream::commGlobal()
                 << Foam::exit(FatalError);
         }
 
-        // 1: selfComm
+        // 1: COMM_SELF
         // - Processor number wrt world communicator
-        singleProc.start() = UPstream::myProcNo(UPstream::globalComm);
+        singleProc.start() = UPstream::myProcNo(UPstream::commGlobal());
         comm = allocateCommunicator(-2, singleProc, true);
-        if (comm != UPstream::selfComm)
+        if (comm != UPstream::commSelf())
         {
             // Failed sanity check
             FatalErrorInFunction
                 << "problem : comm:" << comm
-                << "  expected selfComm:" << UPstream::selfComm
+                << "  expected comm-self:" << UPstream::commSelf()
                 << Foam::exit(FatalError);
         }
 
-        Pout.prefix() = '[' +  Foam::name(myProcNo(globalComm)) + "] ";
+        Pout.prefix() = '[' + Foam::name(myProcNo(commGlobal())) + "] ";
         Perr.prefix() = Pout.prefix();
     }
 
@@ -761,14 +761,14 @@ Foam::label Foam::UPstream::worldComm(0);
 Foam::label Foam::UPstream::warnComm(-1);
 
 
-// Predefine worldComm, selfComm slots.
+// Predefine world and self communicator slots.
 // These are overwritten in parallel mode (by UPstream::setParRun())
 const Foam::label nPredefinedComm = []()
 {
-    // 0: worldComm/globalComm
+    // 0: COMM_WORLD : commWorld() / commGlobal()
     (void) Foam::UPstream::allocateCommunicator(-1, Foam::labelRange(1), false);
 
-    // 1: selfComm
+    // 1: COMM_SELF
     (void) Foam::UPstream::allocateCommunicator(-2, Foam::labelRange(1), false);
 
     return Foam::UPstream::nComms();
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 13d477dcfa..df37286cf7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -265,7 +265,7 @@ private:
         static void freeCommunicatorComponents(const label index);
 
         //- Allocate inter-host, intra-host communicators
-        //- with worldComm as parent
+        //- with comm-world as parent
         static bool allocateHostCommunicatorPairs();
 
 
@@ -308,18 +308,12 @@ public:
     // Standard Communicators
 
         //- Communicator for all ranks.
-        //- May differ from globalComm if local worlds are in use
+        //- May differ from commGlobal() if local worlds are in use
         static label worldComm;
 
         //- Debugging: warn for use of any communicator differing from warnComm
         static label warnComm;
 
-        //- Communicator for all ranks, irrespective of any local worlds
-        static constexpr label globalComm = 0;
-
-        //- A communicator within the current rank only
-        static constexpr label selfComm = 1;
-
         //- Communicator for all ranks, irrespective of any local worlds
         static constexpr label commGlobal() noexcept { return 0; }
 
@@ -816,33 +810,35 @@ public:
         }
 
 
-        // Worlds
+    // Worlds
 
-            //- All worlds
-            static const wordList& allWorlds() noexcept
-            {
-                return allWorlds_;
-            }
+        //- All worlds
+        static const wordList& allWorlds() noexcept
+        {
+            return allWorlds_;
+        }
 
-            //- The indices into allWorlds for all processes
-            static const labelList& worldIDs() noexcept
-            {
-                return worldIDs_;
-            }
+        //- The indices into allWorlds for all processes
+        static const labelList& worldIDs() noexcept
+        {
+            return worldIDs_;
+        }
 
-            //- My worldID
-            static label myWorldID()
-            {
-                return worldIDs_[myProcNo(globalComm)];
-            }
+        //- My worldID
+        static label myWorldID()
+        {
+            return worldIDs_[myProcNo(UPstream::commGlobal())];
+        }
 
-            //- My world
-            static const word& myWorld()
-            {
-                return allWorlds_[worldIDs_[myProcNo(globalComm)]];
-            }
+        //- My world
+        static const word& myWorld()
+        {
+            return allWorlds_[worldIDs_[myProcNo(UPstream::commGlobal())]];
+        }
 
 
+    // Rank addressing
+
         //- Range of process indices for all processes
         static rangeType allProcs(const label communicator = worldComm)
         {
diff --git a/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C b/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C
index d7da952169..16abedaf68 100644
--- a/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/dummyFileOperation/dummyFileOperation.C
@@ -55,7 +55,7 @@ Foam::fileOperations::dummyFileOperation::dummyFileOperation
         // Use COMM_SELF for now, but COMM_NULL is probably more appropriate
         Tuple2<label, labelList>
         (
-            UPstream::selfComm,
+            UPstream::commSelf(),
             fileOperation::getGlobalIORanks()
         )
     )
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
index c7350b7a99..0bf282312d 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H
@@ -166,7 +166,7 @@ protected:
 
         //- Overall number of processors.
         //  Used to synthesise processor directory naming:
-        //  - parallel: UPstream::nProcs(UPstream::worldComm)
+        //  - parallel: UPstream::nProcs(UPstream::commWorld())
         //  - non-parallel: detected from processor dir naming ('processorsNN')
         label nProcs_;
 
@@ -236,9 +236,9 @@ protected:
             (
                 (
                     communicator < 0
-                 || communicator == UPstream::globalComm
-                 || communicator == UPstream::selfComm
-                 || communicator == UPstream::worldComm
+                 || communicator == UPstream::commGlobal()
+                 || communicator == UPstream::commSelf()
+                 || communicator == UPstream::commWorld()
                 )
               ? -1
               : communicator
@@ -254,7 +254,7 @@ private:
         static autoPtr<fileOperation> New_impl
         (
             const fileOperation& origHandler,
-            //! The selected sub-ranks (in worldComm)
+            //! The selected sub-ranks (in comm-world)
             const labelUList& subProcs,
             bool verbose
         );
@@ -359,7 +359,7 @@ public:
         (
             //! The original file handler
             const fileOperation& origHandler,
-            //! The selected sub-ranks (in worldComm)
+            //! The selected sub-ranks (in comm-world)
             const boolUList& useProc,
             bool verbose = false
         );
@@ -372,7 +372,7 @@ public:
         (
             //! The original file handler
             const fileOperation& origHandler,
-            //! The selected sub-ranks (in worldComm). Monotonic order!
+            //! The selected sub-ranks (in comm-world). Monotonic order!
             const bitSet& useProc,
             bool verbose = false
         );
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
index b24f38870f..b12739ed76 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationNew.C
@@ -318,9 +318,9 @@ Foam::fileOperation::New_impl
         );
 
         // TBD: special handling for uncollated
-        // if (origHandler.comm() == UPstream::selfComm)
+        // if (origHandler.comm() == UPstream::commSelf())
         // {
-        //     commAndIORanks.first() = UPstream::selfComm;
+        //     commAndIORanks.first() = UPstream::commSelf();
         // }
 
         const bool hasIOranks = (commAndIORanks.second().size() > 1);
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index ea17ca8333..9f2420e453 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -196,7 +196,7 @@ static Tuple2<label, labelList> getCommPattern()
     // Default is COMM_SELF (only involves itself)
     Tuple2<label, labelList> commAndIORanks
     (
-        UPstream::selfComm,
+        UPstream::commSelf(),
         fileOperation::getGlobalIORanks()
     );
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index ab99588756..1b982ca32a 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -306,14 +306,19 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
 
     if (worldIndex != -1)
     {
-        // During startup, so worldComm == globalComm
+        // During startup, so commWorld() == commGlobal()
 
         wordList worlds(numprocs);
-        worlds[UPstream::myProcNo(UPstream::globalComm)] = world;
-        Pstream::gatherList(worlds, UPstream::msgType(), UPstream::globalComm);
+        worlds[UPstream::myProcNo(UPstream::commGlobal())] = world;
+        Pstream::gatherList
+        (
+            worlds,
+            UPstream::msgType(),
+            UPstream::commGlobal()
+        );
 
         // Compact
-        if (UPstream::master(UPstream::globalComm))
+        if (UPstream::master(UPstream::commGlobal()))
         {
             DynamicList<word> worldNames(numprocs);
             worldIDs_.resize_nocopy(numprocs);
@@ -333,10 +338,10 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
 
             allWorlds_.transfer(worldNames);
         }
-        Pstream::broadcasts(UPstream::globalComm, allWorlds_, worldIDs_);
+        Pstream::broadcasts(UPstream::commGlobal(), allWorlds_, worldIDs_);
 
         const label myWorldId =
-            worldIDs_[UPstream::myProcNo(UPstream::globalComm)];
+            worldIDs_[UPstream::myProcNo(UPstream::commGlobal())];
 
         DynamicList<label> subRanks;
         forAll(worldIDs_, proci)
@@ -347,9 +352,9 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
             }
         }
 
-        // Allocate new communicator with globalComm as its parent
+        // Allocate new communicator with comm-global as its parent
         const label subComm =
-            UPstream::allocateCommunicator(UPstream::globalComm, subRanks);
+            UPstream::allocateCommunicator(UPstream::commGlobal(), subRanks);
 
 
         // Override worldComm
@@ -357,10 +362,11 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
         // For testing: warn use of non-worldComm
         UPstream::warnComm = UPstream::worldComm;
 
-        // For selfComm : the processor number wrt the new world communicator
-        if (procIDs_[UPstream::selfComm].size())
+        // MPI_COMM_SELF : the processor number wrt the new world communicator
+        if (procIDs_[UPstream::commSelf()].size())
         {
-            procIDs_[UPstream::selfComm].front() = UPstream::myProcNo(subComm);
+            procIDs_[UPstream::commSelf()].front() =
+                UPstream::myProcNo(subComm);
         }
 
         if (UPstream::debug)
@@ -535,11 +541,11 @@ void Foam::UPstream::allocateCommunicatorComponents
     {
         // Global communicator. Same as world communicator for single-world
 
-        if (index != UPstream::globalComm)
+        if (index != UPstream::commGlobal())
         {
             FatalErrorInFunction
                 << "world communicator should always be index "
-                << UPstream::globalComm
+                << UPstream::commGlobal()
                 << Foam::exit(FatalError);
         }
 
@@ -570,7 +576,7 @@ void Foam::UPstream::allocateCommunicatorComponents
     }
     else if (parentIndex == -2)
     {
-        // Self communicator (selfComm)
+        // MPI_COMM_SELF
 
         PstreamGlobals::pendingMPIFree_[index] = false;
         PstreamGlobals::MPICommunicators_[index] = MPI_COMM_SELF;
@@ -592,8 +598,8 @@ void Foam::UPstream::allocateCommunicatorComponents
         }
         #endif
 
-        // For selfComm : the process IDs within the world communicator.
-        // Uses MPI_COMM_WORLD in case called before UPstream::globalComm
+        // For MPI_COMM_SELF : the process IDs within the world communicator.
+        // Uses MPI_COMM_WORLD in case called before UPstream::commGlobal()
         // was initialized
 
         procIDs_[index].resize_nocopy(1);

From ffbd05f72a1d19c305ac5bd75e27134d1ab54e4d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2023 09:47:01 +0200
Subject: [PATCH 296/348] DOC: add deprecation notes for exprFixed/exprMixed
 BCs (#2703)

- this functionality can now be handled directly within
  uniformMixedFvPatchField etc, which are also more flexible.
---
 .../exprFixedValueFvPatchField.H              |  9 ++--
 .../exprFixedValueFvPatchFields.C             |  4 +-
 .../exprFixedValueFvPatchFields.H             | 51 -------------------
 .../fvPatchFields/exprMixedFvPatchField.C     |  4 ++
 .../fvPatchFields/exprMixedFvPatchField.H     | 16 +++---
 .../fvPatchFields/exprMixedFvPatchFields.C    |  4 +-
 .../fvPatchFields/exprMixedFvPatchFields.H    | 51 -------------------
 7 files changed, 22 insertions(+), 117 deletions(-)
 delete mode 100644 src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H
 delete mode 100644 src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H

diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
index fba2f2ed98..b4d375eefc 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
@@ -37,16 +37,17 @@ Usage
     \endtable
 
 Note
-    Can also just use uniformFixedValueFvPatchField with an expression
-    for the PatchFunction1.
+    This boundary condition is deprecated in favour of
+    Foam::uniformFixedValueFvPatchField
+    with expression entries.
 
 SourceFiles
     exprFixedValueFvPatchField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef exprFixedValueFvPatchField_H
-#define exprFixedValueFvPatchField_H
+#ifndef FoamDeprecated_exprFixedValueFvPatchField_H
+#define FoamDeprecated_exprFixedValueFvPatchField_H
 
 #include "fixedValueFvPatchField.H"
 #include "patchExprFieldBase.H"
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C
index 5695a23af9..6ea6507b99 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C
@@ -25,7 +25,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "exprFixedValueFvPatchFields.H"
+#include "exprFixedValueFvPatchField.H"
+#include "fieldTypes.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -36,6 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+makePatchTypeFieldTypedefs(exprFixedValue);
 makePatchFields(exprFixedValue);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H
deleted file mode 100644
index cab541738e..0000000000
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprFixedValueFvPatchFields_H
-#define exprFixedValueFvPatchFields_H
-
-#include "exprFixedValueFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(exprFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
index acfa22fd2c..80e4db62ba 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
@@ -109,6 +109,10 @@ Foam::exprMixedFvPatchField<Type>::exprMixedFvPatchField
     ),
     driver_(this->patch(), dict_)
 {
+    DeprecatedInFunction(2212)
+        << "Use uniformMixed with Function1 expressions instead." << nl
+        << "    This boundary condition will be removed in the future" << endl;
+
     setDebug();
     DebugInFunction << nl;
 
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
index 6d395e078f..437d0dc4c5 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
@@ -38,21 +38,19 @@ Usage
     \endtable
 
 Note
-    For fixed-value boundary conditions, can also just use
-    uniformFixedValueFvPatchField with an expression for the
-    PatchFunction1, or a exprMixedFvPatchField.
-
-    For gradient boundary conditions, can also just use
-    uniformFixedGradientFvPatchField with an expression for the
-    PatchFunction1.
+    This boundary condition is deprecated in favour of
+    Foam::uniformMixedFvPatchField,
+    Foam::uniformFixedValueFvPatchField,
+    Foam::uniformFixedGradientFvPatchField
+    with expression entries.
 
 SourceFiles
     exprMixedFvPatchField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef exprMixedFvPatchField_H
-#define exprMixedFvPatchField_H
+#ifndef FoamDeprecated_exprMixedFvPatchField_H
+#define FoamDeprecated_exprMixedFvPatchField_H
 
 #include "mixedFvPatchField.H"
 #include "patchExprFieldBase.H"
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C
index 730fee6baa..de7626578a 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C
@@ -25,7 +25,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "exprMixedFvPatchFields.H"
+#include "exprMixedFvPatchField.H"
+#include "fieldTypes.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -36,6 +37,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+makePatchTypeFieldTypedefs(exprMixed);
 makePatchFields(exprMixed);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H
deleted file mode 100644
index 40531f0295..0000000000
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprMixedFvPatchFields_H
-#define exprMixedFvPatchFields_H
-
-#include "exprMixedFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(exprMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From 83b1ebee6fc33e66bd8c5962af543c8ac4255772 Mon Sep 17 00:00:00 2001
From: Alexey Matveichev <>
Date: Wed, 14 Jun 2023 10:07:35 +0200
Subject: [PATCH 297/348] COMP: replace sprintf with snprintf (MacOS), add note
 about vfork

---
 src/OSspecific/MSwindows/MSwindows.C | 6 +++---
 src/OSspecific/POSIX/POSIX.C         | 8 +++++---
 src/fileFormats/stl/STLCore.C        | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/OSspecific/MSwindows/MSwindows.C b/src/OSspecific/MSwindows/MSwindows.C
index 8769e3d326..10bc5a59cf 100644
--- a/src/OSspecific/MSwindows/MSwindows.C
+++ b/src/OSspecific/MSwindows/MSwindows.C
@@ -7,7 +7,7 @@
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
     Copyright (C) 2011 Symscape
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -998,14 +998,14 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
     if (exists(src, false))
     {
         constexpr const int maxIndex = 99;
-        char index[3];
+        char index[4];
 
         for (int n = 0; n <= maxIndex; ++n)
         {
             fileName dstName(src + "." + ext);
             if (n)
             {
-                sprintf(index, "%02d", n);
+                ::snprintf(index, 4, "%02d", n);
                 dstName += index;
             }
 
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index adc6e544de..826ac47021 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1305,14 +1305,14 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
     if (exists(src, false))
     {
         constexpr const int maxIndex = 99;
-        char index[3];
+        char index[4];
 
         for (int n = 0; n <= maxIndex; ++n)
         {
             fileName dstName(src + "." + ext);
             if (n)
             {
-                ::sprintf(index, "%02d", n);
+                ::snprintf(index, 4, "%02d", n);
                 dstName += index;
             }
 
@@ -1639,6 +1639,7 @@ int Foam::system(const std::string& command, const bool bg)
         return 0;
     }
 
+    // TBD: vfork is deprecated as of macOS 12.0
     const pid_t child_pid = ::vfork();   // NB: vfork, not fork!
 
     if (child_pid == -1)
@@ -1698,6 +1699,7 @@ int Foam::system(const CStringList& command, const bool bg)
     // The normal system() command has a fork buried in it that causes
     // issues with infiniband and openmpi etc.
 
+    // TBD: vfork is deprecated as of macOS 12.0
     const pid_t child_pid = ::vfork();
 
     if (child_pid == -1)
diff --git a/src/fileFormats/stl/STLCore.C b/src/fileFormats/stl/STLCore.C
index c51b4edbee..69749a70ff 100644
--- a/src/fileFormats/stl/STLCore.C
+++ b/src/fileFormats/stl/STLCore.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -234,7 +234,7 @@ void Foam::fileFormats::STLCore::writeBinaryHeader
 {
     // STL header with extra information about nTris
     char header[STLHeaderSize];
-    sprintf(header, "STL binary file %u facets", nTris);
+    ::snprintf(header, STLHeaderSize, "STL binary file %u facets", nTris);
 
     // Fill trailing with zeroes (to avoid writing junk)
     for (size_t i = strlen(header); i < STLHeaderSize; ++i)

From f584ec97d09789853f8c7df3dccfa7768223ae24 Mon Sep 17 00:00:00 2001
From: Alexey Matveichev <>
Date: Wed, 14 Jun 2023 10:45:45 +0200
Subject: [PATCH 298/348] ENH: reimplement Foam::dlOpen() for macOS (#2801)

- The Apple SIP (System Integrity Protection) clears environment
  variables, which affects the behaviour of dynamic library loading
  (the DYLD_LIBRARY_PATH env variable).

  OpenFOAM shadows this variable as FOAM_LD_LIBRARY_PATH, which has
  been used to restore DYLD_LIBRARY_PATH (eg, in RunFunctions script).

  However, this solution is not quite complete, as it
    (a) requires sourcing of RunFunctions file,
    (b) additional errors appear depending on a user workflow.

  This changeset alleviates the problem by also iterating through
  paths stored in the shadow variable when loading dynamic libraries
  (if the DYLD_LIBRARY_PATH is empty).
---
 bin/foamJob                  |  7 ----
 bin/tools/RunFunctions       |  7 ----
 src/OSspecific/POSIX/POSIX.C | 67 +++++++++++++++++++++++++++++-------
 3 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/bin/foamJob b/bin/foamJob
index 75a963e93c..6221eb67df 100755
--- a/bin/foamJob
+++ b/bin/foamJob
@@ -23,13 +23,6 @@
 # If dispatching via foamExec
 foamExec="$WM_PROJECT_DIR/bin/tools/foamExec"
 
-# Darwin workaround - SIP clearing DYLD_LIBRARY_PATH variable
-if [ -n "$FOAM_LD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
-then
-    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
-fi
-
-
 #------------------------------------------------------------------------------
 
 usage() {
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index f8482f63f2..68364b7738 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -25,13 +25,6 @@
 # Basic sanity checks
 [ -d "$FOAM_TUTORIALS" ] || echo "No OpenFOAM tutorials? : $FOAM_TUTORIALS" 1>&2
 
-# Darwin workaround - SIP clearing DYLD_LIBRARY_PATH variable
-if [ -n "$FOAM_LD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
-then
-    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
-fi
-
-
 #------------------------------------------------------------------------------
 
 #
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 826ac47021..dffd5e0a54 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -41,6 +41,7 @@ Description
 #include "timer.H"
 #include "DynamicList.H"
 #include "CStringList.H"
+#include "stringOps.H"
 #include "IOstreams.H"
 #include "Pstream.H"
 
@@ -108,6 +109,52 @@ static inline void redirects(const bool bg)
 }
 
 
+// Library loading is normally simply via dlopen(),
+// but SIP (System Integrity Protection) on Apple will generally
+// clear out the DYLD_LIBRARY_PATH set from shell scripts.
+// We thus have FOAM_LD_LIBRARY_PATH as a shadow parameter and use
+// that to attempt loading ourselves
+static inline void* loadLibrary(const Foam::fileName& libName)
+{
+    constexpr int ldflags = (RTLD_LAZY|RTLD_GLOBAL);
+
+#ifdef __APPLE__
+    const char* normal = nullptr;
+    const char* shadow = nullptr;
+
+    if
+    (
+        !libName.isAbsolute()
+     && ((normal = ::getenv("DYLD_LIBRARY_PATH"))    == nullptr || !*normal)
+     && ((shadow = ::getenv("FOAM_LD_LIBRARY_PATH")) != nullptr && *shadow)
+    )
+    {
+        // SIP appears to have cleared DYLD_LIBRARY_PATH but the
+        // shadow parameter is available
+
+        const Foam::string ldPaths(shadow);
+        const auto paths = Foam::stringOps::split<Foam::string>(ldPaths, ':');
+
+        for (const auto& p : paths)
+        {
+            if (p.length())  // Split removes empty, but be paranoid
+            {
+                const Foam::fileName fullPath(p.str()/libName);
+                void* handle = ::dlopen(fullPath.c_str(), ldflags);
+                if (handle)
+                {
+                    return handle;
+                }
+            }
+        }
+    }
+#endif
+
+    // Regular loading
+    return ::dlopen(libName.c_str(), ldflags);
+}
+
+
 // * * * * * * * * * * * * * * * * Local Classes * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -1752,16 +1799,13 @@ int Foam::system(const Foam::UList<Foam::string>& command, const bool bg)
 
 void* Foam::dlOpen(const fileName& libName, const bool check)
 {
-    constexpr int ldflags = (RTLD_LAZY|RTLD_GLOBAL);
-
     if (POSIX::debug)
     {
         std::cout
-            << "dlOpen(const fileName&)"
-            << " : dlopen of " << libName << std::endl;
+            << "dlopen() of " << libName << std::endl;
     }
 
-    void* handle = ::dlopen(libName.c_str(), ldflags);
+    void* handle = loadLibrary(libName);
 
     if (!handle)
     {
@@ -1771,13 +1815,12 @@ void* Foam::dlOpen(const fileName& libName, const bool check)
         {
             // Try with 'lib' prefix
             libso = "lib" + libName;
-            handle = ::dlopen(libso.c_str(), ldflags);
+            handle = loadLibrary(libso);
 
             if (POSIX::debug)
             {
                 std::cout
-                    << "dlOpen(const fileName&)"
-                    << " : dlopen of " << libso << std::endl;
+                    << "   dlopen() as " << libso << std::endl;
             }
         }
         else
@@ -1790,13 +1833,12 @@ void* Foam::dlOpen(const fileName& libName, const bool check)
         if (!handle && !libso.has_ext(EXT_SO))
         {
             libso.replace_ext(EXT_SO);
-            handle = ::dlopen(libso.c_str(), ldflags);
+            handle = loadLibrary(libso);
 
             if (POSIX::debug)
             {
                 std::cout
-                    << "dlOpen(const fileName&)"
-                    << " : dlopen of " << libso << std::endl;
+                    << "   dlopen() as " << libso << std::endl;
             }
         }
     }
@@ -1810,8 +1852,7 @@ void* Foam::dlOpen(const fileName& libName, const bool check)
     if (POSIX::debug)
     {
         std::cout
-            << "dlOpen(const fileName&)"
-            << " : dlopen of " << libName
+            << "dlopen() of " << libName
             << " handle " << handle << std::endl;
     }
 

From 528c5ed8ebeb07b396d2a9a6f3419a3c1fb14354 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2023 12:14:15 +0200
Subject: [PATCH 299/348] CONFIG: set API level to 2306 (pre-release state)

- README updated to v2306
---
 .gitlab/issue_templates/bug.md |  2 +-
 META-INFO/api-info             |  4 ++--
 README.md                      | 14 +++++++-------
 doc/BuildIssues.md             |  4 ++--
 wmake/rules/General/general    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index e8a7b2014e..a45306d006 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -49,7 +49,7 @@
 
 <!--
   Providing details of your set-up can help us identify any issues, e.g.
-  OpenFOAM version : v2212|v2206|v2112|v2106|v2012 etc
+  OpenFOAM version : v2306|v2212|v2206|v2112|v2106 etc
   Operating system : ubuntu|openSUSE|centos etc
   Hardware info    : any info that may help?
   Compiler         : gcc|intel|clang etc
diff --git a/META-INFO/api-info b/META-INFO/api-info
index c176b198ba..3dc622b390 100644
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@@ -1,2 +1,2 @@
-api=2302
-patch=230110
+api=2306
+patch=0
diff --git a/README.md b/README.md
index 0fbab6f54f..e7897b61f1 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ Violations of the Trademark are monitored, and will be duly prosecuted.
 
 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v2212 version:
+For example, for the OpenFOAM-v2306 version:
 ```
-source /installation/path/OpenFOAM-v2212/etc/bashrc
+source /installation/path/OpenFOAM-v2306/etc/bashrc
 ```
 
 ## Compiling OpenFOAM
@@ -127,8 +127,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v2212
-\-- ThirdParty-v2212
+|-- OpenFOAM-v2306
+\-- ThirdParty-v2306
 ```
 There are, however, many cases where this simple convention is inadequate:
 
@@ -136,7 +136,7 @@ There are, however, many cases where this simple convention is inadequate:
   operating system or cluster installation provides it)
 
 * When we have changed the OpenFOAM directory name to some arbitrary
-  directory name, e.g. openfoam-sandbox2212, etc..
+  directory name, e.g. openfoam-sandbox2306, etc..
 
 * When we would like any additional 3rd party software to be located
   inside of the OpenFOAM directory to ensure that the installation is
@@ -156,9 +156,9 @@ when locating the ThirdParty directory with the following precedence:
 2. PREFIX/ThirdParty-VERSION
    * this corresponds to the traditional approach
 3. PREFIX/ThirdParty-vAPI
-   * allows for an updated value of VERSION, *eg*, `v2212-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v2306-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `2212` and the original `ThirdParty-v2212/` would be found.
+     be `2306` and the original `ThirdParty-v2306/` would be found.
 4. PREFIX/ThirdParty-API
    * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common
diff --git a/doc/BuildIssues.md b/doc/BuildIssues.md
index 991fccabf9..9518b7acaa 100644
--- a/doc/BuildIssues.md
+++ b/doc/BuildIssues.md
@@ -1,4 +1,4 @@
-## Known Build Issues (v2212, v2206, v2112, v2106, v2012)
+## Known Build Issues (v2306, v2212, v2206, v2112, v2106, v2012)
 
 ### Windows cross-compilation
 
@@ -188,4 +188,4 @@ and attempt to install a `paraview~qt` version instead.
 [wiki-config]: https://develop.openfoam.com/Development/openfoam/-/wikis/configuring
 
 ---
-Copyright 2019-2022 OpenCFD Ltd
+Copyright 2019-2023 OpenCFD Ltd
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index f8a7831575..049b28b780 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,5 +1,5 @@
 #-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM=2302
+WM_VERSION = OPENFOAM=2306
 
 AR         = ar
 ARFLAGS    = cr

From 188c303a2790080b74cd40f5d3af5a2f9d1e8f45 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 5 May 2023 15:07:33 +0100
Subject: [PATCH 300/348] ENH: finiteArea: enable cache-gradient mechanism

---
 src/finiteArea/finiteArea/fac/facGrad.C       |  37 ++----
 .../gradSchemes/faGradScheme/faGradScheme.C   | 111 +++++++++++++++++-
 .../gradSchemes/faGradScheme/faGradScheme.H   |  51 ++++++--
 .../gradSchemes/gaussFaGrad/gaussFaGrad.C     |  49 ++++++--
 .../gradSchemes/gaussFaGrad/gaussFaGrad.H     |  27 ++++-
 .../leastSquaresFaGrad/leastSquaresFaGrad.C   |  13 +-
 .../leastSquaresFaGrad/leastSquaresFaGrad.H   |   8 +-
 .../edgeLimitedFaGrad/edgeLimitedFaGrad.H     |  10 +-
 .../edgeLimitedFaGrad/edgeLimitedFaGrads.C    |  15 ++-
 .../faceLimitedFaGrad/faceLimitedFaGrad.H     |  11 +-
 .../faceLimitedFaGrad/faceLimitedFaGrads.C    |  15 ++-
 .../liquidFilmFoam/cylinder/system/faSolution |   6 +
 12 files changed, 276 insertions(+), 77 deletions(-)

diff --git a/src/finiteArea/finiteArea/fac/facGrad.C b/src/finiteArea/finiteArea/fac/facGrad.C
index 54c829e883..4d833fd190 100644
--- a/src/finiteArea/finiteArea/fac/facGrad.C
+++ b/src/finiteArea/finiteArea/fac/facGrad.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +32,7 @@ License
 #include "facEdgeIntegrate.H"
 #include "faMesh.H"
 #include "faGradScheme.H"
+#include "gaussFaGrad.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,20 +59,10 @@ grad
     const GeometricField<Type, faePatchField, edgeMesh>& ssf
 )
 {
-    const areaVectorField &n = ssf.mesh().faceAreaNormals();
-    typedef typename outerProduct<vector,Type>::type GradType;
-
-    tmp<GeometricField<GradType, faPatchField, areaMesh>> tgGrad =
-        fac::edgeIntegrate(ssf.mesh().Sf()*ssf);
-
-    GeometricField<GradType, faPatchField, areaMesh>& gGrad = tgGrad.ref();
-
-    gGrad -= n*(n & gGrad);
-    gGrad.correctBoundaryConditions();
-
-    return tgGrad;
+    return fa::gaussGrad<Type>::gradf(ssf, "grad(" + ssf.name() + ')');
 }
 
+
 template<class Type>
 tmp
 <
@@ -108,22 +100,11 @@ grad
     const word& name
 )
 {
-    const areaVectorField &n = vf.mesh().faceAreaNormals();
-    typedef typename outerProduct<vector,Type>::type GradType;
-
-    tmp<GeometricField<GradType, faPatchField, areaMesh>> tgGrad =
-        fa::gradScheme<Type>::New
-        (
-            vf.mesh(),
-            vf.mesh().gradScheme(name)
-        ).ref().grad(vf);
-
-    GeometricField<GradType, faPatchField, areaMesh>& gGrad = tgGrad.ref();
-
-    gGrad -= n*(n & gGrad);
-    gGrad.correctBoundaryConditions();
-
-    return tgGrad;
+    return fa::gradScheme<Type>::New
+    (
+        vf.mesh(),
+        vf.mesh().gradScheme(name)
+    )().grad(vf, name);
 }
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C
index a5aef3b13f..597355f714 100644
--- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C
+++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,8 @@ License
 
 #include "fa.H"
 #include "HashTable.H"
+#include "objectRegistry.H"
+#include "solution.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -83,11 +85,112 @@ tmp<gradScheme<Type>> gradScheme<Type>::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-gradScheme<Type>::~gradScheme()
-{}
+tmp
+<
+    GeometricField
+    <
+        typename outerProduct<vector, Type>::type,
+        faPatchField,
+        areaMesh
+    >
+>
+gradScheme<Type>::grad
+(
+    const GeometricField<Type, faPatchField, areaMesh>& vsf,
+    const word& name
+) const
+{
+    typedef typename outerProduct<vector, Type>::type GradType;
+    typedef GeometricField<GradType, faPatchField, areaMesh> GradFieldType;
+
+    GradFieldType* pgGrad =
+        mesh().thisDb().template getObjectPtr<GradFieldType>(name);
+
+    if (!this->mesh().cache(name)) // || this->mesh().changing()
+    {
+        // Delete any old occurrences to avoid double registration
+        if (pgGrad && pgGrad->ownedByRegistry())
+        {
+            solution::cachePrintMessage("Deleting", name, vsf);
+            delete pgGrad;
+        }
+
+        solution::cachePrintMessage("Calculating", name, vsf);
+        return calcGrad(vsf, name);
+    }
+
+
+    if (!pgGrad)
+    {
+        solution::cachePrintMessage("Calculating and caching", name, vsf);
+
+        pgGrad = calcGrad(vsf, name).ptr();
+        regIOobject::store(pgGrad);
+    }
+    else
+    {
+        if (pgGrad->upToDate(vsf))
+        {
+            solution::cachePrintMessage("Reusing", name, vsf);
+        }
+        else
+        {
+            solution::cachePrintMessage("Updating", name, vsf);
+            delete pgGrad;
+
+            pgGrad = calcGrad(vsf, name).ptr();
+            regIOobject::store(pgGrad);
+        }
+    }
+
+    return *pgGrad;
+}
+
+
+template<class Type>
+tmp
+<
+    GeometricField
+    <
+        typename outerProduct<vector, Type>::type,
+        faPatchField,
+        areaMesh
+    >
+>
+gradScheme<Type>::grad
+(
+    const GeometricField<Type, faPatchField, areaMesh>& vsf
+) const
+{
+    return grad(vsf, "grad(" + vsf.name() + ')');
+}
+
+
+template<class Type>
+tmp
+<
+    GeometricField
+    <
+        typename outerProduct<vector, Type>::type,
+        faPatchField,
+        areaMesh
+    >
+>
+gradScheme<Type>::grad
+(
+    const tmp<GeometricField<Type, faPatchField, areaMesh>>& tvsf
+) const
+{
+    typedef typename outerProduct<vector, Type>::type GradType;
+    typedef GeometricField<GradType, faPatchField, areaMesh> GradFieldType;
+
+    tmp<GradFieldType> tgrad = grad(tvsf());
+    tvsf.clear();
+    return tgrad;
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
index 11696af03b..e6f2bac9c1 100644
--- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
+++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -113,26 +114,62 @@ public:
 
 
     //- Destructor
-    virtual ~gradScheme();
+    virtual ~gradScheme() = default;
 
 
     // Member Functions
 
         //- Return mesh reference
-        const faMesh& mesh() const
-        {
-            return mesh_;
-        }
+        const faMesh& mesh() const { return mesh_; }
+
+        //- Calculate and return the grad of the given field.
+        //  Used by grad either to recalculate the cached gradient when it is
+        //  out of date with respect to the field or when it is not cached.
+        virtual tmp
+        <
+            GeometricField
+            <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
+        > calcGrad
+        (
+            const GeometricField<Type, faPatchField, areaMesh>&,
+            const word& name
+        ) const = 0;
 
         //- Calculate and return the grad of the given field
-        virtual tmp
+        //- which may have been cached
+        tmp
+        <
+            GeometricField
+            <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
+        > grad
+        (
+            const GeometricField<Type, faPatchField, areaMesh>&,
+            const word& name
+        ) const;
+
+        //- Calculate and return the grad of the given field
+        //- with the default name
+        //- which may have been cached
+        tmp
         <
             GeometricField
             <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
         > grad
         (
             const GeometricField<Type, faPatchField, areaMesh>&
-        ) const = 0;
+        ) const;
+
+        //- Calculate and return the grad of the given field
+        //- with the default name
+        //- which may have been cached
+        tmp
+        <
+            GeometricField
+            <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
+        > grad
+        (
+            const tmp<GeometricField<Type, faPatchField, areaMesh>>&
+        ) const;
 };
 
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C
index 294f521ac4..af88fa2cf9 100644
--- a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C
+++ b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,17 +48,52 @@ tmp
 <
     GeometricField
     <
-        typename outerProduct<vector, Type>::type, faPatchField, areaMesh
+        typename outerProduct<vector, Type>::type,
+        faPatchField,
+        areaMesh
     >
 >
-gaussGrad<Type>::grad
+gaussGrad<Type>::gradf
 (
-    const GeometricField<Type, faPatchField, areaMesh>& vsf
+    const GeometricField<Type, faePatchField, edgeMesh>& ssf,
+    const word& name
+)
+{
+    const areaVectorField &n = ssf.mesh().faceAreaNormals();
+    typedef typename outerProduct<vector,Type>::type GradType;
+
+    tmp<GeometricField<GradType, faPatchField, areaMesh>> tgGrad =
+        fac::edgeIntegrate(ssf.mesh().Sf()*ssf);
+
+    GeometricField<GradType, faPatchField, areaMesh>& gGrad = tgGrad.ref();
+
+    gGrad -= n*(n & gGrad);
+    gGrad.correctBoundaryConditions();
+
+    return tgGrad;
+}
+
+
+template<class Type>
+tmp
+<
+    GeometricField
+    <
+        typename outerProduct<vector, Type>::type,
+        faPatchField,
+        areaMesh
+    >
+>
+gaussGrad<Type>::calcGrad
+(
+    const GeometricField<Type, faPatchField, areaMesh>& vsf,
+    const word& name
 ) const
 {
     typedef typename outerProduct<vector, Type>::type GradType;
+    typedef GeometricField<GradType, faPatchField, areaMesh> GradFieldType;
 
-    tmp<GeometricField<GradType, faPatchField, areaMesh>> tgGrad
+    tmp<GradFieldType> tgGrad
     (
         fac::edgeIntegrate
         (
@@ -65,12 +101,11 @@ gaussGrad<Type>::grad
            *tinterpScheme_().interpolate(vsf)
         )
     );
-
-    GeometricField<GradType, faPatchField, areaMesh>& gGrad = tgGrad.ref();
+    GradFieldType& gGrad = tgGrad.ref();
 
     gGrad.correctBoundaryConditions();
+    gGrad.rename(name);
 
-    gGrad.rename("grad(" + vsf.name() + ')');
     correctBoundaryConditions(vsf, gGrad);
 
     return tgGrad;
diff --git a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
index 84303d3fa5..f0348ffdda 100644
--- a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,8 +63,9 @@ class gaussGrad
 :
     public fa::gradScheme<Type>
 {
-    // Private data
+    // Private Data
 
+        //- Interpolation scheme
         tmp<edgeInterpolationScheme<Type>> tinterpScheme_;
 
 
@@ -118,17 +120,32 @@ public:
 
     // Member Functions
 
-        //- Return the gradient of the given field calculated
-        //  using Gauss' theorem on the interpolated field
+        //- Return the gradient of the given field
+        //- calculated using Gauss' theorem on the given surface field
+        static
         tmp
         <
             GeometricField
             <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
-        > grad
+        > gradf
         (
-            const GeometricField<Type, faPatchField, areaMesh>&
+            const GeometricField<Type, faePatchField, edgeMesh>&,
+            const word& name
+        );
+
+        //- Return the gradient of the given field to the
+        //- gradScheme::grad for optional caching
+        virtual tmp
+        <
+            GeometricField
+            <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
+        > calcGrad
+        (
+            const GeometricField<Type, faPatchField, areaMesh>& vsf,
+            const word& name
         ) const;
 
+
         //- Correct the boundary values of the gradient using the patchField
         // snGrad functions
         static void correctBoundaryConditions
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C
index ef6c9d6ce9..ea983b8975 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,18 +46,20 @@ namespace fa
 {
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 template<class Type>
 tmp
 <
     GeometricField
     <
-        typename outerProduct<vector, Type>::type, faPatchField, areaMesh
+        typename outerProduct<vector, Type>::type,
+        faPatchField,
+        areaMesh
     >
 >
-leastSquaresFaGrad<Type>::grad
+leastSquaresFaGrad<Type>::calcGrad
 (
-    const GeometricField<Type, faPatchField, areaMesh>& vsf
+    const GeometricField<Type, faPatchField, areaMesh>& vsf,
+    const word& name
 ) const
 {
     typedef typename outerProduct<vector, Type>::type GradType;
@@ -69,7 +72,7 @@ leastSquaresFaGrad<Type>::grad
         (
             IOobject
             (
-                "grad(" + vsf.name() + ')',
+                name,
                 vsf.instance(),
                 vsf.db(),
                 IOobject::NO_READ,
diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
index 6651c73004..1e3e518f76 100644
--- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -93,13 +94,16 @@ public:
 
     // Member Functions
 
+        //- Return the gradient of the given field to the
+        //- gradScheme::grad for optional caching
         virtual tmp
         <
             GeometricField
             <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
-        > grad
+        > calcGrad
         (
-            const GeometricField<Type, faPatchField, areaMesh>&
+            const GeometricField<Type, faPatchField, areaMesh>& vsf,
+            const word& name
         ) const;
 };
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
index 8705ecafa5..1d4ca927fd 100644
--- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,13 +117,16 @@ public:
 
     // Member Functions
 
-        tmp
+        //- Return the gradient of the given field to the
+        //- gradScheme::grad for optional caching
+        virtual tmp
         <
             GeometricField
             <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
-        > grad
+        > calcGrad
         (
-            const GeometricField<Type, faPatchField, areaMesh>&
+            const GeometricField<Type, faPatchField, areaMesh>& vsf,
+            const word& name
         ) const;
 };
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C
index aa6cf862f9..d86270a326 100644
--- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C
+++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,14 +73,15 @@ inline void edgeLimitedGrad<Type>::limitEdge
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-tmp<areaVectorField> edgeLimitedGrad<scalar>::grad
+tmp<areaVectorField> edgeLimitedGrad<scalar>::calcGrad
 (
-    const areaScalarField& vsf
+    const areaScalarField& vsf,
+    const word& name
 ) const
 {
     const faMesh& mesh = vsf.mesh();
 
-    tmp<areaVectorField> tGrad = basicGradScheme_().grad(vsf);
+    tmp<areaVectorField> tGrad = basicGradScheme_().calcGrad(vsf, name);
 
     if (k_ < SMALL)
     {
@@ -206,14 +208,15 @@ tmp<areaVectorField> edgeLimitedGrad<scalar>::grad
 
 
 template<>
-tmp<areaTensorField> edgeLimitedGrad<vector>::grad
+tmp<areaTensorField> edgeLimitedGrad<vector>::calcGrad
 (
-    const areaVectorField& vvf
+    const areaVectorField& vvf,
+    const word& name
 ) const
 {
     const faMesh& mesh = vvf.mesh();
 
-    tmp<areaTensorField> tGrad = basicGradScheme_().grad(vvf);
+    tmp<areaTensorField> tGrad = basicGradScheme_().grad(vvf, name);
 
     if (k_ < SMALL)
     {
diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
index a8a0bcbe96..16f5033264 100644
--- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
+++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -118,14 +119,16 @@ public:
             const Type& extrapolate
         );
 
-
-        tmp
+        //- Return the gradient of the given field to the
+        //- gradScheme::grad for optional caching
+        virtual tmp
         <
             GeometricField
             <typename outerProduct<vector, Type>::type, faPatchField, areaMesh>
-        > grad
+        > calcGrad
         (
-            const GeometricField<Type, faPatchField, areaMesh>&
+            const GeometricField<Type, faPatchField, areaMesh>& vsf,
+            const word& name
         ) const;
 };
 
diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C
index 38bd277111..c32dda42fe 100644
--- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C
+++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -94,14 +95,15 @@ inline void faceLimitedGrad<Type>::limitEdge
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-tmp<areaVectorField> faceLimitedGrad<scalar>::grad
+tmp<areaVectorField> faceLimitedGrad<scalar>::calcGrad
 (
-    const areaScalarField& vsf
+    const areaScalarField& vsf,
+    const word& name
 ) const
 {
     const faMesh& mesh = vsf.mesh();
 
-    tmp<areaVectorField> tGrad = basicGradScheme_().grad(vsf);
+    tmp<areaVectorField> tGrad = basicGradScheme_().calcGrad(vsf, name);
 
     if (k_ < SMALL)
     {
@@ -243,14 +245,15 @@ tmp<areaVectorField> faceLimitedGrad<scalar>::grad
 
 
 template<>
-tmp<areaTensorField> faceLimitedGrad<vector>::grad
+tmp<areaTensorField> faceLimitedGrad<vector>::calcGrad
 (
-    const areaVectorField& vsf
+    const areaVectorField& vsf,
+    const word& name
 ) const
 {
     const faMesh& mesh = vsf.mesh();
 
-    tmp<areaTensorField> tGrad = basicGradScheme_().grad(vsf);
+    tmp<areaTensorField> tGrad = basicGradScheme_().grad(vsf, name);
 
     if (k_ < SMALL)
     {
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution
index d097b9ba26..94ba9eddd5 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution
@@ -44,5 +44,11 @@ relaxationFactors
     Us  0.5;
 }
 
+cache
+{
+    grad(h);
+    grad(Us);
+}
+
 
 // ************************************************************************* //

From bfcf3b2ac4f0a0f0469247774a87fad57b88ecc1 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Wed, 17 May 2023 12:08:40 +0100
Subject: [PATCH 301/348] ENH: sixDoF: add underlying-motion access to
 constraints

---
 .../sixDoFRigidBodyMotionConstraint.H                      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
index e54af99bcb..2aeea59cb0 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -162,6 +163,12 @@ public:
                 return sDoFRBMCCoeffs_;
             }
 
+        //- Return const access to motion
+        const sixDoFRigidBodyMotion& motion() const noexcept { return motion_; }
+
+
+    // I-O
+
         //- Write
         virtual void write(Ostream&) const;
 };

From 789db1d554623f6af5881497e90f51369a3ac7d3 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Mon, 22 May 2023 08:22:27 +0100
Subject: [PATCH 302/348] ENH: sixDoF: enable time-variant constraints in body
 motions

---
 .../sixDoFRigidBodyMotion.C                   | 30 ++++++++++++++++++-
 .../sixDoFRigidBodyMotion.H                   | 11 ++++++-
 .../sixDoFRigidBodyMotionI.H                  |  7 ++++-
 .../sixDoFRigidBodyMotionIO.C                 |  4 ++-
 .../CrankNicolson/CrankNicolson.C             |  5 +++-
 .../sixDoFSolvers/Newmark/Newmark.C           |  5 +++-
 .../sixDoFSolvers/sixDoFSolver/sixDoFSolver.H |  4 +++
 .../sixDoFSolver/sixDoFSolverI.H              |  6 ++++
 .../sixDoFSolvers/symplectic/symplectic.C     |  4 +++
 9 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 8240a1305c..349493e096 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,6 +90,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion(const Time& time)
     aRelax_(1.0),
     aDamp_(1.0),
     report_(false),
+    updateConstraints_(false),
     solver_(nullptr)
 {}
 
@@ -130,6 +131,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
     aRelax_(dict.getOrDefault<scalar>("accelerationRelaxation", 1)),
     aDamp_(dict.getOrDefault<scalar>("accelerationDamping", 1)),
     report_(dict.getOrDefault("report", false)),
+    updateConstraints_(dict.getOrDefault("updateConstraints", false)),
     solver_(sixDoFSolver::New(dict.subDict("solver"), *this))
 {
     addRestraints(dict);
@@ -178,6 +180,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
     aRelax_(sDoFRBM.aRelax_),
     aDamp_(sDoFRBM.aDamp_),
     report_(sDoFRBM.report_),
+    updateConstraints_(sDoFRBM.updateConstraints_),
     solver_(sDoFRBM.solver_.clone())
 {}
 
@@ -304,6 +307,31 @@ void Foam::sixDoFRigidBodyMotion::updateAcceleration
 }
 
 
+void Foam::sixDoFRigidBodyMotion::updateConstraints()
+{
+    if (!updateConstraints_)
+    {
+        return;
+    }
+
+    pointConstraint pct;
+    pointConstraint pcr;
+
+    forAll(constraints_, i)
+    {
+        constraints_[i].setCentreOfRotation(initialCentreOfRotation_);
+        constraints_[i].constrainTranslation(pct);
+        constraints_[i].constrainRotation(pcr);
+    }
+
+    tConstraints_ = pct.constraintTransformation();
+    rConstraints_ = pcr.constraintTransformation();
+
+    Info<< "Translational constraint tensor " << tConstraints_ << nl
+        << "Rotational constraint tensor " << rConstraints_ << endl;
+}
+
+
 void Foam::sixDoFRigidBodyMotion::update
 (
     bool firstIter,
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
index c9dd5e7ab7..8365882d84 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,6 +119,9 @@ class sixDoFRigidBodyMotion
         //- Reporting of motion data (on or off)
         bool report_;
 
+        //- Flag to enable time-variant constraints
+        bool updateConstraints_;
+
         //- Motion solver
         autoPtr<sixDoFSolver> solver_;
 
@@ -152,6 +155,9 @@ class sixDoFRigidBodyMotion
         //- Update and relax accelerations from the force and torque
         void updateAcceleration(const vector& fGlobal, const vector& tauGlobal);
 
+        //- Update the constraints to the object
+        void updateConstraints();
+
 
         // Access functions retained as private because of the risk of
         // confusion over what is a body local frame vector and what is global
@@ -271,6 +277,9 @@ public:
             //- Return the report Switch
             inline bool report() const;
 
+            //- Return the update-constraints flag
+            inline bool updateConstraints() const;
+
             //- Return time
             inline const Time& time() const;
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H
index 91eabdc341..f42f3045b5 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -275,6 +275,11 @@ inline bool Foam::sixDoFRigidBodyMotion::report() const
     return report_;
 }
 
+inline bool Foam::sixDoFRigidBodyMotion::updateConstraints() const
+{
+    return updateConstraints_;
+}
+
 
 inline void Foam::sixDoFRigidBodyMotion::newTime()
 {
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
index e6cbb4d598..df005017e1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,7 @@ bool Foam::sixDoFRigidBodyMotion::read(const dictionary& dict)
     aRelax_ = dict.getOrDefault<scalar>("accelerationRelaxation", 1);
     aDamp_ = dict.getOrDefault<scalar>("accelerationDamping", 1);
     report_ = dict.getOrDefault<Switch>("report", false);
+    updateConstraints_ = dict.getOrDefault("updateConstraints", false);
 
     restraints_.clear();
     addRestraints(dict);
@@ -61,6 +62,7 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
     os.writeEntry("accelerationRelaxation", aRelax_);
     os.writeEntry("accelerationDamping", aDamp_);
     os.writeEntry("report", report_);
+    os.writeEntry("updateConstraints", updateConstraints_);
 
     if (!restraints_.empty())
     {
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C
index 7d446dd6ee..f9fa6739f1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/CrankNicolson/CrankNicolson.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,6 +75,9 @@ void Foam::sixDoFSolvers::CrankNicolson::solve
     // Update the linear acceleration and torque
     updateAcceleration(fGlobal, tauGlobal);
 
+    // Update the constraints to the object
+    updateConstraints();
+
     // Correct linear velocity
     v() = tConstraints()
       & (v0() + aDamp()*deltaT*(aoc_*a() + (1 - aoc_)*a0()));
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
index 35e506a871..0ed1ef9beb 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/Newmark/Newmark.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,6 +82,9 @@ void Foam::sixDoFSolvers::Newmark::solve
     // Update the linear acceleration and torque
     updateAcceleration(fGlobal, tauGlobal);
 
+    // Update the constraints to the object
+    updateConstraints();
+
     // Correct linear velocity
     v() =
         tConstraints()
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
index 800d819d1b..97cc1a1256 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolver.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -128,6 +129,9 @@ protected:
             const vector& tauGlobal
         );
 
+        //- Update the constraints to the object
+        inline void updateConstraints();
+
 
 public:
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolverI.H b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolverI.H
index f059b83c07..e7fca2c5d1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolverI.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolverI.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -129,5 +130,10 @@ inline void Foam::sixDoFSolver::updateAcceleration
     body_.updateAcceleration(fGlobal, tauGlobal);
 }
 
+inline void Foam::sixDoFSolver::updateConstraints()
+{
+    body_.updateConstraints();
+}
+
 
 // ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
index 0fdd3f8632..d5875361e7 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,6 +86,9 @@ void Foam::sixDoFSolvers::symplectic::solve
     // Update the linear acceleration and torque
     updateAcceleration(fGlobal, tauGlobal);
 
+    // Update the constraints to the object
+    updateConstraints();
+
     // Second simplectic step:
     //     Complete update of linear and angular velocities
 

From 67c5e63819a409fc75c9284df5757d373edc7437 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Mon, 22 May 2023 08:11:41 +0100
Subject: [PATCH 303/348] ENH: sixDoF: add max/min angle constraints to the
 axis constraint

---
 .../sixDoFRigidBodyMotionAxisConstraint.C     | 257 ++++++++++++++++--
 .../sixDoFRigidBodyMotionAxisConstraint.H     |  90 +++++-
 2 files changed, 324 insertions(+), 23 deletions(-)

diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
index 58c39df663..978f2df367 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +29,7 @@ License
 #include "sixDoFRigidBodyMotionAxisConstraint.H"
 #include "addToRunTimeSelectionTable.H"
 #include "sixDoFRigidBodyMotion.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -47,6 +49,42 @@ namespace sixDoFRigidBodyMotionConstraints
 }
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::sixDoFRigidBodyMotionConstraints::axis::rotationSector
+(
+    const vector& oldDir,
+    const vector& newDir
+) const
+{
+    const scalar thetaDir = (oldDir ^ newDir) & axis_;
+
+    if (equal(thetaDir, 0))
+    {
+        return 0;
+    }
+
+    return label(sign(thetaDir));
+}
+
+
+bool Foam::sixDoFRigidBodyMotionConstraints::axis::calcDir
+(
+    const vector& fm,
+    const bool rotationSector
+) const
+{
+    const scalar fmDir = axis_ & fm;
+
+    if (equal(fmDir, 0))
+    {
+        return rotationSector;
+    }
+
+    return (label(sign(fmDir)) == 1) ? true : false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::sixDoFRigidBodyMotionConstraints::axis::axis
@@ -57,18 +95,16 @@ Foam::sixDoFRigidBodyMotionConstraints::axis::axis
 )
 :
     sixDoFRigidBodyMotionConstraint(name, sDoFRBMCDict, motion),
-    axis_()
+    refQ_(),
+    axis_(),
+    maxCWThetaPtr_(),
+    maxCCWThetaPtr_(),
+    degrees_(false)
 {
     read(sDoFRBMCDict);
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::sixDoFRigidBodyMotionConstraints::axis::~axis()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::sixDoFRigidBodyMotionConstraints::axis::constrainTranslation
@@ -83,7 +119,115 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::constrainRotation
     pointConstraint& pc
 ) const
 {
-    pc.combine(pointConstraint(Tuple2<label, vector>(2, axis_)));
+    if (!(maxCWThetaPtr_ && maxCCWThetaPtr_))
+    {
+        pc.combine(pointConstraint(Tuple2<label, vector>(2, axis_)));
+        return;
+    }
+
+
+    // Calculate principal directions of the body
+    const vector refDir
+    (
+        rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 1, 0)
+    );
+    const vector oldDir
+    (
+        (refQ_ & refDir).removeCollinear(axis_).normalise()
+    );
+    const vector newDir
+    (
+        (motion().orientation() & refDir).removeCollinear(axis_).normalise()
+    );
+
+
+    // Find the index of the rotation sector that the body resides
+    const label rotationSectorIndex = rotationSector(oldDir, newDir);
+
+    if (!rotationSectorIndex)
+    {
+        // The body resides at the reference orientation
+        pc.combine(pointConstraint(Tuple2<label, vector>(2, axis_)));
+        return;
+    }
+
+    const bool rotationSector = (rotationSectorIndex == 1) ? true : false;
+
+
+    // Calculate the directions of total momentum and force acting on the body
+    const bool angularMomentumDir =
+        calcDir
+        (
+            motion().state().pi(),
+            rotationSector
+        );
+    const bool torqueDir = calcDir(motion().state().tau(), rotationSector);
+
+
+    // Calculate the rotation angle of the body wrt the reference orientation
+    const scalar theta = mag(acos(min(oldDir & newDir, scalar(1))));
+
+
+    // Calculate maximum clockwise and counterclockwise rotation angles
+    const scalar t = motion().time().timeOutputValue();
+    const scalar maxCWTheta =
+        degrees_
+      ? mag(degToRad(maxCWThetaPtr_->value(t)))
+      : mag(maxCWThetaPtr_->value(t));
+
+    const scalar maxCCWTheta =
+        degrees_
+      ? mag(degToRad(maxCCWThetaPtr_->value(t)))
+      : mag(maxCCWThetaPtr_->value(t));
+
+
+    // Apply the constraints according to various conditions
+    if
+    (
+        (rotationSector && (theta < maxCCWTheta))
+     || (!rotationSector && (theta < maxCWTheta))
+    )
+    {
+        pc.combine(pointConstraint(Tuple2<label, vector>(2, axis_)));
+    }
+    else
+    {
+        if (rotationSector == angularMomentumDir)
+        {
+            const scalar magPi = mag(motion().state().pi());
+
+            if (equal(magPi, scalar(0)) && rotationSector != torqueDir)
+            {
+                pc.combine(pointConstraint(Tuple2<label, vector>(2, axis_)));
+            }
+            else
+            {
+                // Constrain all rotational motions
+                pc.combine(pointConstraint(Tuple2<label, vector>(3, Zero)));
+            }
+        }
+        else
+        {
+            // If there is a difference between the directions of
+            // body rotation and of torque, release the body
+            pc.combine(pointConstraint(Tuple2<label, vector>(2, axis_)));
+        }
+    }
+
+
+    if (motion().report())
+    {
+        Info
+            << " old direction = " << oldDir << nl
+            << " new direction = " << newDir << nl
+            << " rotationSector = " << rotationSector << nl
+            << " theta = " << sign((oldDir ^ newDir) & axis_)*theta << nl
+            << " torque = " << motion().state().tau() << nl
+            << " torque dir = " << torqueDir << nl
+            << " angular momentum = " << motion().state().pi() << nl
+            << " angular momentum dir = " << angularMomentumDir << nl
+            << endl;
+    }
 }
 
 
@@ -92,21 +236,76 @@ bool Foam::sixDoFRigidBodyMotionConstraints::axis::read
     const dictionary& sDoFRBMCDict
 )
 {
-    sixDoFRigidBodyMotionConstraint::read(sDoFRBMCDict);
+    if (!sixDoFRigidBodyMotionConstraint::read(sDoFRBMCDict))
+    {
+        return false;
+    }
 
     sDoFRBMCCoeffs_.readEntry("axis", axis_);
 
-    scalar magFixedAxis(mag(axis_));
+    axis_.normalise();
 
-    if (magFixedAxis > VSMALL)
+    if (mag(axis_) < VSMALL)
     {
-        axis_ /= magFixedAxis;
+        FatalIOErrorInFunction(sDoFRBMCDict)
+            << "The entry 'axis' cannot have zero length: " << axis_
+            << exit(FatalIOError);
     }
-    else
+
+
+    if (sDoFRBMCCoeffs_.found("thetaUnits"))
     {
-        FatalErrorInFunction
-            << "axis has zero length"
-            << abort(FatalError);
+        const word thetaUnits(sDoFRBMCCoeffs_.getWord("thetaUnits"));
+
+        if (thetaUnits == "degrees")
+        {
+            degrees_ = true;
+        }
+        else if (thetaUnits == "radians")
+        {
+            degrees_ = false;
+        }
+        else
+        {
+            FatalIOErrorInFunction(sDoFRBMCCoeffs_)
+                << "The units of thetaUnits can be either degrees or radians"
+                << exit(FatalIOError);
+        }
+
+
+        maxCWThetaPtr_.reset
+        (
+            Function1<scalar>::New
+            (
+                "maxClockwiseTheta",
+                sDoFRBMCCoeffs_,
+                &motion().time()
+            )
+        );
+
+        maxCCWThetaPtr_.reset
+        (
+            Function1<scalar>::New
+            (
+                "maxCounterclockwiseTheta",
+                sDoFRBMCCoeffs_,
+                &motion().time()
+            )
+        );
+
+
+        refQ_ =
+            sDoFRBMCCoeffs_.getOrDefault<tensor>("referenceOrientation", I);
+
+        if (mag(mag(refQ_) - sqrt(3.0)) > ROOTSMALL)
+        {
+            FatalIOErrorInFunction(sDoFRBMCCoeffs_)
+                << "The entry 'referenceOrientation' " << refQ_
+                << " is not a rotation tensor. "
+                << "mag(referenceOrientation) - sqrt(3) = "
+                << mag(refQ_) - sqrt(3.0) << nl
+                << exit(FatalIOError);
+        }
     }
 
     return true;
@@ -119,6 +318,32 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::write
 ) const
 {
     os.writeEntry("axis", axis_);
+
+
+    if (maxCWThetaPtr_ && maxCCWThetaPtr_)
+    {
+        if (degrees_)
+        {
+            os.writeEntry("thetaUnits", "degrees");
+        }
+        else
+        {
+            os.writeEntry("thetaUnits", "radians");
+        }
+
+        if (maxCWThetaPtr_)
+        {
+            maxCWThetaPtr_->writeData(os);
+        }
+
+        if (maxCCWThetaPtr_)
+        {
+            maxCCWThetaPtr_->writeData(os);
+        }
+
+        os.writeEntry("referenceOrientation", refQ_);
+    }
 }
 
+
 // ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
index 9bec2ece47..ce72cc6d0a 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,18 +28,67 @@ Class
     Foam::sixDoFRigidBodyMotionConstraints::axis
 
 Description
-    Orientation constraint:
-        may only rotate around a fixed axis.
+    This constraint imposes an orientation limitation where bodies
+    are restricted to rotate only around a fixed axis, optionally with
+    the inclusion of maximum and minimum rotation angle constraints.
+
+Usage
+    Minimal example by \c constant/dynamicMeshDict.sixDoFRigidBodyMotionCoeffs:
+    \verbatim
+    constraints
+    {
+        constrainRotation1
+        {
+            // Mandatory entries
+            sixDoFRigidBodyMotionConstraint     axis;
+            axis                                <vector>;
+
+            // Optional entries
+            maxClockwiseTheta                   <Function1<scalar>>;
+            maxCounterclockwiseTheta            <Function1<scalar>>;
+            thetaUnits                          <word>;
+            referenceOrientation                <tensor>;
+        }
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property     | Description                        | Type | Reqd | Deflt
+      sixDoFRigidBodyMotionConstraint | Type name: axis | word | yes  | -
+      axis         | Reference rotation axis fixed in global space   <!--
+                   -->                                | vector | yes  | -
+      maxClockwiseTheta | Maximum clockwise rotation angle about the <!--
+                   --> rotation axis            | Function1\<scalar\> | no | -
+      maxCounterlockwiseTheta | Maximum counterclockwise rotation    <!--
+             --> angle about the rotation axis  | Function1\<scalar\> | no | -
+      thetaUnits   | Units of theta angles             | word   | no  | radians
+      referenceOrientation | Reference orientation where there is no moment <!--
+                   -->                                 | tensor | no  | I
+    \endtable
+
+    The inherited entries are elaborated in:
+      - \link Function1.H \endlink
+
+Notes
+  - The units for \c thetaUnits can be specified
+    as either \c degrees or \c radians.
+  - The \c maxClockwiseTheta and \c maxCounterlockwiseTheta
+    are always non-negative.
+  - Negative and positive \c theta correspond to clockwise
+    and counterclockwise rotation sectors with respect to
+    the reference orientation, respectively.
 
 SourceFiles
     sixDoFRigidBodyMotionAxisConstraint.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef sixDoFRigidBodyMotionAxisConstraint_H
-#define sixDoFRigidBodyMotionAxisConstraint_H
+#ifndef Foam_sixDoFRigidBodyMotionAxisConstraint_H
+#define Foam_sixDoFRigidBodyMotionAxisConstraint_H
 
 #include "sixDoFRigidBodyMotionConstraint.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,12 +106,35 @@ class axis
 :
     public sixDoFRigidBodyMotionConstraint
 {
+    // Private Data
 
-    // Private data
+        //- Reference orientation where there is no moment
+        tensor refQ_;
 
-        //- Reference axis in global space
+        //- Reference rotation axis fixed in global space
         vector axis_;
 
+        //- Maximum clockwise rotation angle around the rotation axis
+        autoPtr<Function1<scalar>> maxCWThetaPtr_;
+
+        //- Maximum counterclockwise rotation angle around the rotation axis
+        autoPtr<Function1<scalar>> maxCCWThetaPtr_;
+
+        //- Flag to enable to use maxTheta in degrees rather than in radians
+        bool degrees_;
+
+
+    // Private Member Functions
+
+        //- Return the index of the rotation sector that the
+        //- body resides with respect to the reference orientation
+        //  -1: clockwise, 0: reference orientation, 1: counterclockwise
+        label rotationSector(const vector& oldDir, const vector& newDir) const;
+
+        //- Return the direction of the given force or momentum
+        //  false: clockwise, true: counterclockwise
+        bool calcDir(const vector& fm, const bool rotationSector) const;
+
 
 public:
 
@@ -88,9 +161,12 @@ public:
             );
         }
 
+        //- No copy assignment
+        void operator=(const sixDoFRigidBodyMotionConstraint&) = delete;
+
 
     //- Destructor
-    virtual ~axis();
+    virtual ~axis() = default;
 
 
     // Member Functions

From f4cc4d7652fd3f5dcb5fd2a345fbf2cb7dc02597 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 28 Apr 2023 11:01:23 +0100
Subject: [PATCH 304/348] ENH: turbulentTemperatureRadCoupledMixed: add
 postprocessing elements

- add writeFile functionality
- enable the optional calculation of heat-transfer coefficient fields

Co-authored-by: mattijs <mattijs>
---
 ...eratureRadCoupledMixedFvPatchScalarField.C | 299 ++++++++++++++++--
 ...eratureRadCoupledMixedFvPatchScalarField.H | 208 ++++++++----
 2 files changed, 424 insertions(+), 83 deletions(-)

diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 7e5da847ca..108f68fe8f 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,7 @@ License
 #include "volFields.H"
 #include "mappedPatchBase.H"
 #include "basicThermo.H"
+#include "IOField.H"
 #include "mappedPatchFieldBase.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,6 +42,82 @@ namespace Foam
 namespace compressible
 {
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+volScalarField&
+turbulentTemperatureRadCoupledMixedFvPatchScalarField::getOrCreateField
+(
+    const word& fieldName
+) const
+{
+    const fvMesh& mesh = patch().boundaryMesh().mesh();
+
+    auto* ptr = mesh.getObjectPtr<volScalarField>(fieldName);
+
+    if (!ptr)
+    {
+        ptr = new volScalarField
+        (
+            IOobject
+            (
+                fieldName,
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar(dimless, Zero)
+        );
+        mesh.objectRegistry::store(ptr);
+    }
+
+    return *ptr;
+}
+
+
+void turbulentTemperatureRadCoupledMixedFvPatchScalarField::storeHTCFields
+(
+    const word& prefix,
+    const scalarField& shtc,
+    const scalarField& shtcPatch
+)
+const
+{
+    volScalarField& htc =
+        getOrCreateField(IOobject::scopedName(prefix, "htc"));
+    htc.boundaryFieldRef()[patch().index()] = shtc;
+
+    volScalarField& htcPatch =
+        getOrCreateField(IOobject::scopedName(prefix, "htcPatch"));
+    htcPatch.boundaryFieldRef()[patch().index()] = shtcPatch;
+}
+
+
+void turbulentTemperatureRadCoupledMixedFvPatchScalarField::writeFileHeader
+(
+    Ostream& os
+)
+{
+    writeCommented(os, "Time");
+    writeTabbed(os, "Q_[W]");
+    writeTabbed(os, "q_[W/m^2]");
+    writeTabbed(os, "HTCavg_[W/m^2/K]");
+    writeTabbed(os, "patchHTCavg_[W/m^2/K]");
+    writeTabbed(os, "TpMin_[K]");
+    writeTabbed(os, "TpMax_[K]");
+    writeTabbed(os, "TpAvg_[K]");
+    writeTabbed(os, "TpNbrMin_[K]");
+    writeTabbed(os, "TpNbrMax_[K]");
+    writeTabbed(os, "TpNbrAvg_[K]");
+
+    os  << endl;
+
+    writtenHeader_ = true;
+    updateHeader_ = false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 turbulentTemperatureRadCoupledMixedFvPatchScalarField::
@@ -57,10 +134,21 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         mappedPatchFieldBase<scalar>::mapper(p, iF),
         *this
     ),
+    functionObjects::writeFile
+    (
+        db(),
+        "turbulentTemperatureRadCoupledMixed",
+        "undefined",
+        false
+    ),
     TnbrName_("undefined-Tnbr"),
     qrNbrName_("undefined-qrNbr"),
     qrName_("undefined-qr"),
-    thermalInertia_(false)
+    logInterval_(-1),
+    executionIndex_(0),
+    thermalInertia_(false),
+    verbose_(false),
+    prefix_(word::null)
 {
     this->refValue() = Zero;
     this->refGrad() = Zero;
@@ -86,6 +174,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         *this,
         psf
     ),
+    functionObjects::writeFile(psf),
     TnbrName_(psf.TnbrName_),
     qrNbrName_(psf.qrNbrName_),
     qrName_(psf.qrName_),
@@ -93,7 +182,11 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
     thicknessLayer_(psf.thicknessLayer_.clone(p.patch())),
     kappaLayers_(psf.kappaLayers_),
     kappaLayer_(psf.kappaLayer_.clone(p.patch())),
-    thermalInertia_(psf.thermalInertia_)
+    logInterval_(psf.logInterval_),
+    executionIndex_(psf.executionIndex_),
+    thermalInertia_(psf.thermalInertia_),
+    verbose_(psf.verbose_),
+    prefix_(psf.prefix_)
 {}
 
 
@@ -113,10 +206,21 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         *this,
         dict
     ),
+    functionObjects::writeFile
+    (
+        db(),
+        "turbulentTemperatureRadCoupledMixed",
+        patch().name(),
+        false
+    ),
     TnbrName_(dict.getOrDefault<word>("Tnbr", "T")),
     qrNbrName_(dict.getOrDefault<word>("qrNbr", "none")),
     qrName_(dict.getOrDefault<word>("qr", "none")),
-    thermalInertia_(dict.getOrDefault<Switch>("thermalInertia", false))
+    logInterval_(dict.getOrDefault<scalar>("logInterval", -1)),
+    executionIndex_(0),
+    thermalInertia_(dict.getOrDefault<Switch>("thermalInertia", false)),
+    verbose_(dict.getOrDefault<bool>("verbose", false)),
+    prefix_(dict.getOrDefault<word>("prefix", "multiWorld"))
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
@@ -218,6 +322,8 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
     {
         source() = 0.0;
     }
+
+    writeFile::read(dict);
 }
 
 
@@ -236,6 +342,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         *this,
         psf
     ),
+    functionObjects::writeFile(psf),
     TnbrName_(psf.TnbrName_),
     qrNbrName_(psf.qrNbrName_),
     qrName_(psf.qrName_),
@@ -243,7 +350,11 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
     thicknessLayer_(psf.thicknessLayer_.clone(patch().patch())),
     kappaLayers_(psf.kappaLayers_),
     kappaLayer_(psf.kappaLayer_.clone(patch().patch())),
-    thermalInertia_(psf.thermalInertia_)
+    logInterval_(psf.logInterval_),
+    executionIndex_(psf.executionIndex_),
+    thermalInertia_(psf.thermalInertia_),
+    verbose_(psf.verbose_),
+    prefix_(psf.prefix_)
 {}
 
 
@@ -261,6 +372,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
         *this,
         psf
     ),
+    functionObjects::writeFile(psf),
     TnbrName_(psf.TnbrName_),
     qrNbrName_(psf.qrNbrName_),
     qrName_(psf.qrName_),
@@ -268,7 +380,11 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
     thicknessLayer_(psf.thicknessLayer_.clone(patch().patch())),
     kappaLayers_(psf.kappaLayers_),
     kappaLayer_(psf.kappaLayer_.clone(patch().patch())),
-    thermalInertia_(psf.thermalInertia_)
+    logInterval_(psf.logInterval_),
+    executionIndex_(psf.executionIndex_),
+    thermalInertia_(psf.thermalInertia_),
+    verbose_(psf.verbose_),
+    prefix_(psf.prefix_)
 {}
 
 
@@ -358,6 +474,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
 
     scalarField TcNbr;
+    scalarField TpNbr;  // only if verbose_
     scalarField KDeltaNbr;
 
     if (mpp.sameWorld())
@@ -375,6 +492,10 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
         // Swap to obtain full local values of neighbour K*delta
         TcNbr = nbrField.patchInternalField();
+        if (verbose_)
+        {
+            TpNbr = nbrField;
+        }
         KDeltaNbr = nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs();
     }
     else
@@ -382,9 +503,17 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
         // Different world so use my region,patch. Distribution below will
         // do the reordering.
         TcNbr = patchInternalField();
+        if (verbose_)
+        {
+            TpNbr = Tp;
+        }
         KDeltaNbr = KDelta;
     }
     distribute(this->internalField().name() + "_value", TcNbr);
+    if (verbose_)
+    {
+        distribute(this->internalField().name() + "_patchValue", TpNbr);
+    }
     distribute(this->internalField().name() + "_weights", KDeltaNbr);
 
     scalarField KDeltaC(this->size(), GREAT);
@@ -545,22 +674,111 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
     mixedFvPatchScalarField::updateCoeffs();
 
-    if (debug)
-    {
-        scalar Q = gSum(kappaTp*patch().magSf()*snGrad());
 
-        Info<< patch().boundaryMesh().mesh().name() << ':'
+    if (verbose_)
+    {
+        // Calculate heat-transfer rate and heat flux
+        const scalar Q = gSum(kappaTp*patch().magSf()*snGrad());
+        const scalar magSf = gSum(patch().magSf());
+        const scalar q = Q/max(magSf, SMALL);
+
+
+        // Calculate heat-transfer coeff based on the first definition
+        // [W/m^2] = [W/m/K K * 1/m]
+        const scalarField qField
+        (
+            kappaTp*snGrad()
+        );
+        const scalarField deltaT(TcNbr - Tc);
+        scalarField htc(deltaT.size(), Zero);
+
+        forAll(deltaT, i)
+        {
+            if (mag(deltaT[i]) > SMALL)
+            {
+                htc[i] = qField[i]/deltaT[i];
+            }
+        }
+        const scalar aveHtc = gSum(htc*patch().magSf())/max(magSf, SMALL);
+
+
+        // Calculate heat-transfer coeff based on the second definition
+        const scalarField deltaTPatch(TpNbr - Tp);
+        scalarField htcPatch(deltaTPatch.size(), Zero);
+
+        forAll(deltaTPatch, i)
+        {
+            if (mag(deltaTPatch[i]) > SMALL)
+            {
+                htcPatch[i] = qField[i]/deltaTPatch[i];
+            }
+        }
+        const scalar aveHtcPatch =
+            gSum(htcPatch*patch().magSf())/max(magSf, SMALL);
+
+        // Calculate various averages of temperature
+        const scalarMinMax TpMinMax = gMinMax(Tp);
+        const scalar TpAvg = gAverage(Tp);
+        const scalarMinMax TpNbrMinMax = gMinMax(TpNbr);
+        const scalar TpNbrAvg = gAverage(TpNbr);
+
+
+        Info<< nl
+            << patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
             << this->internalField().name() << " <- "
             << mpp.sampleRegion() << ':'
             << mpp.samplePatch() << ':'
-            << this->internalField().name() << " :"
-            << " heat transfer rate:" << Q
-            << " walltemperature "
-            << " min:" << gMin(Tp)
-            << " max:" << gMax(Tp)
-            << " avg:" << gAverage(Tp)
-            << endl;
+            << this->internalField().name() << " :" << nl
+            << " Heat transfer rate [W]:" << Q << nl
+            << " Area [m^2]:" << magSf << nl
+            << " Heat flux [W/m^2]:" << q << nl
+            << " Area-averaged heat-transfer coefficient [W/m^2/K]:"
+            << aveHtc << nl
+            << " Area-averaged patch heat-transfer coefficient [W/m^2/K]:"
+            << aveHtcPatch << nl
+            << " Wall temperature [K]"
+            << " min:" << TpMinMax.min()
+            << " max:" << TpMinMax.max()
+            << " avg:" << TpAvg << nl
+            << " Neighbour wall temperature [K]"
+            << " min:" << TpNbrMinMax.min()
+            << " max:" << TpNbrMinMax.max()
+            << " avg:" << TpNbrAvg
+            << nl << endl;
+
+
+        // Handle data for file output
+        if (canResetFile())
+        {
+            resetFile(patch().name());
+        }
+
+        if (canWriteHeader())
+        {
+            writeFileHeader(file());
+        }
+
+        if (canWriteToFile() && writeFile())
+        {
+            file()
+                << db().time().timeOutputValue() << token::TAB
+                << Q << token::TAB
+                << q << token::TAB
+                << aveHtc << token::TAB
+                << aveHtcPatch << token::TAB
+                << TpMinMax.min() << token::TAB
+                << TpMinMax.max() << token::TAB
+                << TpAvg << token::TAB
+                << TpNbrMinMax.min() << token::TAB
+                << TpNbrMinMax.max() << token::TAB
+                << TpNbrAvg << token::TAB
+                << endl;
+        }
+
+
+        // Store htc fields as patch fields of a volScalarField
+        storeHTCFields(prefix_, htc, htcPatch);
     }
 
     // Restore tag
@@ -713,6 +931,39 @@ deltaH() const
 }
 
 
+bool turbulentTemperatureRadCoupledMixedFvPatchScalarField::writeFile()
+{
+    if (!verbose_ || (logInterval_ <= 0))
+    {
+        return false;
+    }
+
+    const auto& time = patch().boundaryMesh().mesh().time();
+
+    const scalar t = time.timeOutputValue();
+    const scalar ts = time.startTime().value();
+    const scalar deltaT = time.deltaTValue();
+
+    const label executionIndex = label
+    (
+        (
+            (t - ts)
+          + 0.5*deltaT
+        )
+        /logInterval_
+    );
+
+    bool write = false;
+    if (executionIndex > executionIndex_)
+    {
+        executionIndex_ = executionIndex;
+        write = true;
+    }
+
+    return write;
+}
+
+
 void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write
 (
     Ostream& os
@@ -720,17 +971,17 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write
 {
     mixedFvPatchField<scalar>::write(os);
 
-    //os.writeEntry("Tnbr", TnbrName_);
     os.writeEntryIfDifferent<word>("Tnbr", "T", TnbrName_);
-
-    //os.writeEntry("qrNbr", qrNbrName_);
     os.writeEntryIfDifferent<word>("qrNbr", "none", qrNbrName_);
-    //os.writeEntry("qr", qrName_);
     os.writeEntryIfDifferent<word>("qr", "none", qrName_);
+    os.writeEntry<scalar>("logInterval", logInterval_);
+
     if (thermalInertia_)
     {
         os.writeEntry("thermalInertia", thermalInertia_);
     }
+    os.writeEntryIfDifferent<bool>("verbose", false, verbose_);
+    os.writeEntryIfDifferent<word>("prefix", "multiWorld", prefix_);
 
     if (thicknessLayer_)
     {
@@ -743,6 +994,12 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write
         kappaLayers_.writeEntry("kappaLayers", os);
     }
 
+    // Write writeFile entries
+    os.writeEntry<label>("writePrecision", writePrecision_);
+    os.writeEntry<bool>("updateHeader", updateHeader_);
+    os.writeEntry<bool>("writeToFile", writeToFile_);
+    os.writeEntry<bool>("useUserTime", useUserTime_);
+
     temperatureCoupledBase::write(os);
     mappedPatchFieldBase<scalar>::write(os);
 }
diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
index 0dbabd4d7b..44a721daa2 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,41 +25,59 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::
-        turbulentTemperatureRadCoupledMixedFvPatchScalarField
+    Foam::compressible::turbulentTemperatureRadCoupledMixedFvPatchScalarField
 
 Description
-    Mixed boundary condition for temperature and radiation heat transfer
-    to be used for in multiregion cases. Optional thin thermal layer
-    resistances can be specified through thicknessLayers and kappaLayers
-    entries.
+    Mixed boundary condition for temperature and radiation heat transfer,
+    suitable for multiregion cases. The optional specification of
+    thin thermal layer resistances can be made using the entries
+    \c thicknessLayers and \c kappaLayers.
 
-    The thermal conductivity \c kappa can either be retrieved from various
-    possible sources, as detailed in the class temperatureCoupledBase.
+    The thermal conductivity \c kappa can be obtained from a variety
+    of sources, as explained in the \c temperatureCoupledBase class.
 
 Usage
-    \table
-        Property     | Description             | Required    | Default value
-        Tnbr         | name of the field    | no | T
-        qrNbr      | name of the radiative flux in the nbr region | no | none
-        qr         | name of the radiative flux in this region | no | none
-        thicknessLayers | list of thicknesses per layer [m] | no |
-        kappaLayers  | list of thermal conductivites per layer [W/m/K] | no |
-        thicknessLayer | single thickness of layer [m] | no |
-        kappaLayer  | corresponding thermal conductivity [W/m/K] | no |
-        kappaMethod  | inherited from temperatureCoupledBase | inherited |
-        kappa        | inherited from temperatureCoupledBase | inherited |
-        thermalInertia | Add thermal inertia to wall node | no | false
-    \endtable
-
     Example of the boundary condition specification:
     \verbatim
     <patchName>
+    {
+        // Mandatory entries
+        type                compressible::turbulentTemperatureRadCoupledMixed;
+
+        // Optional entries
+        Tnbr                <word>;
+        qrNbr               <word>;
+        qr                  <word>;
+        logInterval         <scalar>;
+        thermalInertia      <bool>;
+        verbose             <bool>;
+        prefix              <word>;
+
+        // Conditional entries
+
+            // Option-1
+            thicknessLayers <scalarList>;
+            kappaLayers     <scalarList>;
+
+            // Option-2
+            thicknessLayer  <PatchFunction1<scalar>>;
+            kappaLayer      <PatchFunction1<scalar>>;
+
+        // Inherited entries
+        kappaMethod         <word>;
+        kappa               <word>;
+        ...
+    }
+    \endverbatim
+
+    For example:
+    \verbatim
+    <patchName>
     {
         type            compressible::turbulentTemperatureRadCoupledMixed;
         Tnbr            T;
         qrNbr           qr; // or none. Name of qr field on neighbour region
-        qr              qr; // or none. Name of qr field on local region
+        qr              qr; // or none. Name of qr field on this region
         thicknessLayers (0.1 0.2 0.3 0.4);
         kappaLayers     (1 2 3 4);
         thermalInertia  false/true;
@@ -69,23 +87,53 @@ Usage
     }
     \endverbatim
 
-    Needs to be on underlying mapped(Wall)FvPatch.
+    where the entries mean:
+    \table
+      Property | Description                            | Type  | Reqd | Deflt
+      type   | Type name: compressible::turbulentTemperatureRadCoupledMixed <!--
+               -->                                      | word  | yes  | -
+      Tnbr     | Name of the nbr temperature field      | word  | no   | T
+      qrNbr    | Name of the radiative flux in the nbr region | word | no | none
+      qr       | Name of the radiative flux in this region | word | no | none
+      logInterval | Log-file output frequency [s]          | scalar | no  | -1
+      thermalInertia | Flag to add thermal inertia to wall node | bool | no <!--
+               -->                                                     | false
+      verbose | Flag to enable verbose output with extra fields | bool | no <!--
+              -->                                                      | false
+      prefix  | Name of output-field prefix (in verbose mode)         <!--
+              -->                                       | word | no | multiWorld
+      thicknessLayers | List of thicknesses per layer [m] | scalarList <!--
+              -->                                             | choice | -
+      kappaLayers  | List of thermal conductivites per layer [W/m/K]   <!--
+              -->                                | scalarList | choice | -
+      thicknessLayer | Single thickness of layer [m]                   <!--
+              -->                   | PatchFunction1\<scalar\>| choice | -
+      kappaLayer     | Corresponding thermal conductivity [W/m/K]      <!--
+              -->                   | PatchFunction1\<scalar\>| choice | -
+    \endtable
 
-See also
-    Foam::temperatureCoupledBase
+    The inherited entries are elaborated in:
+      - \link mixedFvPatchFields.H \endlink
+      - \link temperatureCoupledBase.H \endlink
+      - \link mappedPatchFieldBase.H \endlink
+      - \link writeFile.H \endlink
+
+Note
+  - Needs to be on underlying \c mapped(Wall)FvPatch.
 
 SourceFiles
     turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentTemperatureRadCoupledMixedFvPatchScalarField_H
-#define turbulentTemperatureRadCoupledMixedFvPatchScalarField_H
+#ifndef Foam_turbulentTemperatureRadCoupledMixedFvPatchScalarField_H
+#define Foam_turbulentTemperatureRadCoupledMixedFvPatchScalarField_H
 
 #include "mixedFvPatchFields.H"
 #include "temperatureCoupledBase.H"
 #include "scalarList.H"
 #include "mappedPatchFieldBase.H"
+#include "writeFile.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -102,18 +150,18 @@ class turbulentTemperatureRadCoupledMixedFvPatchScalarField
 :
     public mixedFvPatchScalarField,
     public temperatureCoupledBase,
-    public mappedPatchFieldBase<scalar>
+    public mappedPatchFieldBase<scalar>,
+    public functionObjects::writeFile
 {
-
     // Private Data
 
-        //- Name of field on the neighbour region
+        //- Name of temperature field on the neighbour region
         const word TnbrName_;
 
         //- Name of the radiative heat flux in the neighbour region
         const word qrNbrName_;
 
-        //- Name of the radiative heat flux in local region
+        //- Name of the radiative heat flux in this region
         const word qrName_;
 
         //- Thickness of layers (either scalarList or a single PatchFunction1)
@@ -124,29 +172,61 @@ class turbulentTemperatureRadCoupledMixedFvPatchScalarField
         scalarList kappaLayers_;
         autoPtr<PatchFunction1<scalar>> kappaLayer_;
 
-        //- Thermal inertia term
-        Switch thermalInertia_;
+        //- Log-file output frequency
+        scalar logInterval_;
+
+        //- Index of previous execution
+        label executionIndex_;
+
+        //- Flag to enable thermal inertia term
+        const Switch thermalInertia_;
+
+        //- Flag to enable verbose output with extra fields
+        const bool verbose_;
+
+        //- Name of output-field prefix (in verbose mode)
+        const word prefix_;
 
 
      // Private Functions
 
-            //- Return local alphaSfDelta
-            tmp<scalarField> alphaSfDelta() const;
+        //- Return local alphaSfDelta
+        tmp<scalarField> alphaSfDelta() const;
 
-            //- Return delta enthalpy between regions
-            tmp<scalarField> deltaH() const;
+        //- Return delta enthalpy between regions
+        tmp<scalarField> deltaH() const;
 
-            //- Return the sum of deltaCoeff*alpha from nbr and local
-            tmp<scalarField> beta() const;
+        //- Return the sum of deltaCoeff*alpha from nbr and local
+        tmp<scalarField> beta() const;
+
+        //- Calculate coefficients for assembly matrix
+        tmp<Field<scalar>> coeffs
+        (
+            fvMatrix<scalar>& matrix,
+            const Field<scalar>&,
+            const label
+        ) const;
+
+        //- Return requested field from the object registry
+        //- or create+register the field to the object registry
+        volScalarField& getOrCreateField(const word& fieldName) const;
+
+        //- Store heat-transfer coeff fields to facilitate postprocessing
+        void storeHTCFields
+        (
+            const word& prefix,
+            const scalarField& htc,
+            const scalarField& htcPatch
+        ) const;
+
+        //- Flag to allow writing to file
+        bool writeFile();
 
 
-            //- Calculate coefficients for assembly matrix
-            tmp<Field<scalar>> coeffs
-            (
-                fvMatrix<scalar>& matrix,
-                const Field<scalar>&,
-                const label
-            ) const;
+        // functionObjects::writeFile
+
+            //- Write file header information
+            void writeFileHeader(Ostream& os);
 
 
 public:
@@ -173,8 +253,8 @@ public:
         );
 
         //- Construct by mapping given
-        //  turbulentTemperatureCoupledBaffleMixedFvPatchScalarField onto a
-        //  new patch
+        //- turbulentTemperatureCoupledBaffleMixedFvPatchScalarField onto a
+        //- new patch
         turbulentTemperatureRadCoupledMixedFvPatchScalarField
         (
             const
@@ -228,22 +308,24 @@ public:
 
     // Member Functions
 
-        // Mapping functions
+    // Mapping
 
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper&
-            );
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap
+        (
+            const fvPatchFieldMapper&
+        );
 
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchField<scalar>&,
-                const labelList&
-            );
+        //- Reverse map the given fvPatchField onto this fvPatchField
+        virtual void rmap
+        (
+            const fvPatchField<scalar>&,
+            const labelList&
+        );
 
 
+    // Evaluation
+
         //- Given patch temperature calculate corresponding K field. Override
         //- temperatureCoupledBase::kappa to includes effect of any
         //- explicit kappaThickness
@@ -261,6 +343,8 @@ public:
         );
 
 
+    // I-O
+
         //- Write
         virtual void write(Ostream& os) const;
 };

From 40d6ba19b1f4e2d5932b2e08258abe03c83c0ccb Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Thu, 15 Jun 2023 12:33:25 +0000
Subject: [PATCH 305/348] ENH: PCG: cache preconditioner

---
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |  4 ++
 .../matrices/lduMatrix/solvers/FPCG/FPCG.C    | 13 ++++--
 .../matrices/lduMatrix/solvers/FPCG/FPCG.H    |  6 +++
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.C  | 23 ++++++----
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.H  |  6 +++
 .../lduMatrix/solvers/PBiCGStab/PBiCGStab.C   | 23 ++++++----
 .../lduMatrix/solvers/PBiCGStab/PBiCGStab.H   |  6 +++
 .../matrices/lduMatrix/solvers/PCG/PCG.C      | 15 +++++--
 .../matrices/lduMatrix/solvers/PCG/PCG.H      |  6 +++
 .../matrices/lduMatrix/solvers/PPCG/PPCG.C    | 30 +++++++++----
 .../matrices/lduMatrix/solvers/PPCG/PPCG.H    |  6 +++
 .../distributedDILUPreconditioner.C           | 44 +++++++++++++++++--
 .../distributedDILUPreconditioner.H           | 17 ++++---
 13 files changed, 160 insertions(+), 39 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 287f68fc6f..e13bb4cd05 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -575,6 +575,10 @@ public:
             {
                 NotImplemented;
             }
+
+            //- Signal end of solver
+            virtual void setFinished(const solverPerformance& perf) const
+            {}
     };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C
index 36bcdc99d0..da6f96db0b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.C
@@ -159,12 +159,14 @@ Foam::solverPerformance Foam::FPCG::scalarSolve
     )
     {
         // --- Select and construct the preconditioner
-        autoPtr<lduMatrix::preconditioner> preconPtr =
-            lduMatrix::preconditioner::New
+        if (!preconPtr_)
+        {
+            preconPtr_ = lduMatrix::preconditioner::New
             (
                 *this,
                 controlDict_
             );
+        }
 
         FixedList<solveScalar, 2> globalSum;
 
@@ -175,7 +177,7 @@ Foam::solverPerformance Foam::FPCG::scalarSolve
             wArAold = wArA;
 
             // --- Precondition residual
-            preconPtr->precondition(wA, rA, cmpt);
+            preconPtr_->precondition(wA, rA, cmpt);
 
             // --- Update search directions and calculate residual:
             gSumMagProd(globalSum, wA, rA, matrix().mesh().comm());
@@ -237,6 +239,11 @@ Foam::solverPerformance Foam::FPCG::scalarSolve
         );
     }
 
+    if (preconPtr_)
+    {
+        preconPtr_->setFinished(solverPerf);
+    }
+
     matrix().setResidualField
     (
         ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H
index 16daa7b795..2640912d6f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/FPCG/FPCG.H
@@ -61,6 +61,12 @@ class FPCG
 :
     public lduMatrix::solver
 {
+    // Private Member Data
+
+        //- Cached preconditioner
+        mutable autoPtr<lduMatrix::preconditioner> preconPtr_;
+
+
     // Private Member Functions
 
         //- Blocking version of sum(a*b), sum(mag(b))
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
index e4c9b7a75f..a0a3115d23 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
@@ -146,12 +146,14 @@ Foam::solverPerformance Foam::PBiCG::solve
         solveScalar wArT = 0;
 
         // --- Select and construct the preconditioner
-        autoPtr<lduMatrix::preconditioner> preconPtr =
-        lduMatrix::preconditioner::New
-        (
-            *this,
-            controlDict_
-        );
+        if (!preconPtr_)
+        {
+            preconPtr_ = lduMatrix::preconditioner::New
+            (
+                *this,
+                controlDict_
+            );
+        }
 
         // --- Solver iteration
         do
@@ -160,8 +162,8 @@ Foam::solverPerformance Foam::PBiCG::solve
             const solveScalar wArTold = wArT;
 
             // --- Precondition residuals
-            preconPtr->precondition(wA, rA, cmpt);
-            preconPtr->preconditionT(wT, rT, cmpt);
+            preconPtr_->precondition(wA, rA, cmpt);
+            preconPtr_->preconditionT(wT, rT, cmpt);
 
             // --- Update search directions:
             wArT = gSumProd(wA, rT, matrix().mesh().comm());
@@ -235,6 +237,11 @@ Foam::solverPerformance Foam::PBiCG::solve
             << exit(FatalError);
     }
 
+    if (preconPtr_)
+    {
+        preconPtr_->setFinished(solverPerf);
+    }
+
     matrix().setResidualField
     (
         ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index e2a668848f..9494acdd20 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -54,6 +54,12 @@ class PBiCG
 :
     public lduMatrix::solver
 {
+    // Private Member Data
+
+        //- Cached preconditioner
+        mutable autoPtr<lduMatrix::preconditioner> preconPtr_;
+
+
     // Private Member Functions
 
         //- No copy construct
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
index ccf535206f..4c9be16e29 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
@@ -149,12 +149,14 @@ Foam::solverPerformance Foam::PBiCGStab::scalarSolve
         solveScalar omega = 0;
 
         // --- Select and construct the preconditioner
-        autoPtr<lduMatrix::preconditioner> preconPtr =
-        lduMatrix::preconditioner::New
-        (
-            *this,
-            controlDict_
-        );
+        if (!preconPtr_)
+        {
+            preconPtr_ = lduMatrix::preconditioner::New
+            (
+                *this,
+                controlDict_
+            );
+        }
 
         // --- Solver iteration
         do
@@ -196,7 +198,7 @@ Foam::solverPerformance Foam::PBiCGStab::scalarSolve
             }
 
             // --- Precondition pA
-            preconPtr->precondition(yA, pA, cmpt);
+            preconPtr_->precondition(yA, pA, cmpt);
 
             // --- Calculate AyA
             matrix_.Amul(AyA, yA, interfaceBouCoeffs_, interfaces_, cmpt);
@@ -233,7 +235,7 @@ Foam::solverPerformance Foam::PBiCGStab::scalarSolve
             }
 
             // --- Precondition sA
-            preconPtr->precondition(zA, sA, cmpt);
+            preconPtr_->precondition(zA, sA, cmpt);
 
             // --- Calculate tA
             matrix_.Amul(tA, zA, interfaceBouCoeffs_, interfaces_, cmpt);
@@ -264,6 +266,11 @@ Foam::solverPerformance Foam::PBiCGStab::scalarSolve
         );
     }
 
+    if (preconPtr_)
+    {
+        preconPtr_->setFinished(solverPerf);
+    }
+
     matrix().setResidualField
     (
         ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
index 4a5ff10d41..7377434435 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.H
@@ -69,6 +69,12 @@ class PBiCGStab
 :
     public lduMatrix::solver
 {
+    // Private Member Data
+
+        //- Cached preconditioner
+        mutable autoPtr<lduMatrix::preconditioner> preconPtr_;
+
+
     // Private Member Functions
 
         //- No copy construct
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
index c3ce1b28ea..a43161347f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -129,12 +129,14 @@ Foam::solverPerformance Foam::PCG::scalarSolve
     )
     {
         // --- Select and construct the preconditioner
-        autoPtr<lduMatrix::preconditioner> preconPtr =
-            lduMatrix::preconditioner::New
+        if (!preconPtr_)
+        {
+            preconPtr_ = lduMatrix::preconditioner::New
             (
                 *this,
                 controlDict_
             );
+        }
 
         // --- Solver iteration
         do
@@ -143,7 +145,7 @@ Foam::solverPerformance Foam::PCG::scalarSolve
             wArAold = wArA;
 
             // --- Precondition residual
-            preconPtr->precondition(wA, rA, cmpt);
+            preconPtr_->precondition(wA, rA, cmpt);
 
             // --- Update search directions:
             wArA = gSumProd(wA, rA, matrix().mesh().comm());
@@ -199,6 +201,11 @@ Foam::solverPerformance Foam::PCG::scalarSolve
         );
     }
 
+    if (preconPtr_)
+    {
+        preconPtr_->setFinished(solverPerf);
+    }
+
     matrix().setResidualField
     (
         ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index 416dc43f01..2f76977614 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -57,6 +57,12 @@ class PCG
 :
     public lduMatrix::solver
 {
+    // Private Member Data
+
+        //- Cached preconditioner
+        mutable autoPtr<lduMatrix::preconditioner> preconPtr_;
+
+
     // Private Member Functions
 
         //- No copy construct
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
index ea88f04462..3b9fcd79ad 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.C
@@ -113,16 +113,18 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
     }
 
     // --- Select and construct the preconditioner
-    autoPtr<lduMatrix::preconditioner> preconPtr =
-        lduMatrix::preconditioner::New
+    if (!preconPtr_)
+    {
+        preconPtr_ = lduMatrix::preconditioner::New
         (
             *this,
             controlDict_
         );
+    }
 
     // --- Precondition residual (= u0)
     solveScalarField u(nCells);
-    preconPtr->precondition(u, r, cmpt);
+    preconPtr_->precondition(u, r, cmpt);
 
     // --- Calculate A*u - reuse w
     matrix_.Amul(w, u, interfaceBouCoeffs_, interfaces_, cmpt);
@@ -143,12 +145,12 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
         gSumMagProd(globalSum, u, r, w, r, outstandingRequest, comm);
 
         // --- Precondition residual
-        preconPtr->precondition(m, w, cmpt);
+        preconPtr_->precondition(m, w, cmpt);
     }
     else
     {
         // --- Precondition residual
-        preconPtr->precondition(m, w, cmpt);
+        preconPtr_->precondition(m, w, cmpt);
 
         // --- Start global reductions for inner products
         gSumMagProd(globalSum, w, u, m, r, outstandingRequest, comm);
@@ -229,12 +231,12 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
             gSumMagProd(globalSum, u, r, w, r, outstandingRequest, comm);
 
             // --- Precondition residual
-            preconPtr->precondition(m, w, cmpt);
+            preconPtr_->precondition(m, w, cmpt);
         }
         else
         {
             // --- Precondition residual
-            preconPtr->precondition(m, w, cmpt);
+            preconPtr_->precondition(m, w, cmpt);
 
             // --- Start global reductions for inner products
             gSumMagProd(globalSum, w, u, m, r, outstandingRequest, comm);
@@ -247,11 +249,23 @@ Foam::solverPerformance Foam::PPCG::scalarSolveCG
     // Cleanup any outstanding requests
     outstandingRequest.wait();
 
+    if (preconPtr_)
+    {
+        preconPtr_->setFinished(solverPerf);
+    }
+
+    //TBD
+    //matrix().setResidualField
+    //(
+    //    ConstPrecisionAdaptor<scalar, solveScalar>(rA)(),
+    //    fieldName_,
+    //    false
+    //);
+
     return solverPerf;
 }
 
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::PPCG::PPCG
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
index 964089a6d7..9c39affd42 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PPCG/PPCG.H
@@ -66,6 +66,12 @@ class PPCG
 :
     public lduMatrix::solver
 {
+    // Private Member Data
+
+        //- Cached preconditioner
+        mutable autoPtr<lduMatrix::preconditioner> preconPtr_;
+
+
     // Private Member Functions
 
         //- Non-blocking version of sum(a*b), sum(a*c), sum(mag(sumMag))
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
index d963c24dcc..48b3470efa 100644
--- a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.C
@@ -248,10 +248,18 @@ void Foam::distributedDILUPreconditioner::send
 
 void Foam::distributedDILUPreconditioner::wait
 (
-    DynamicList<UPstream::Request>& requests
+    DynamicList<UPstream::Request>& requests,
+    const bool cancel
 ) const
 {
-    UPstream::waitRequests(requests);
+    if (cancel)
+    {
+        UPstream::cancelRequests(requests);
+    }
+    else
+    {
+        UPstream::waitRequests(requests);
+    }
     requests.clear();
 }
 
@@ -757,12 +765,20 @@ Foam::distributedDILUPreconditioner::distributedDILUPreconditioner
 
 Foam::distributedDILUPreconditioner::~distributedDILUPreconditioner()
 {
+    DebugPout<< "~distributedDILUPreconditioner()" << endl;
+
     // Wait on all requests before storage is being taken down
-    // (could rely on construction order?)
+
     wait(lowerSendRequests_);
     wait(lowerRecvRequests_);
     wait(higherSendRequests_);
     wait(higherRecvRequests_);
+
+    // TBD: cancel/ignore outstanding messages
+    //wait(lowerSendRequests_, true);
+    //wait(lowerRecvRequests_, true);
+    //wait(higherSendRequests_, true);
+    //wait(higherRecvRequests_, true);
 }
 
 
@@ -894,4 +910,26 @@ void Foam::distributedDILUPreconditioner::precondition
 }
 
 
+void Foam::distributedDILUPreconditioner::setFinished
+(
+    const solverPerformance& s
+) const
+{
+    DebugPout<< "setFinished fieldName:" << s.fieldName() << endl;
+
+    // Wait on all requests before storage is being taken down
+    // (could rely on construction order?)
+    wait(lowerSendRequests_);
+    wait(lowerRecvRequests_);
+    wait(higherSendRequests_);
+    wait(higherRecvRequests_);
+
+    // TBD: cancel/ignore outstanding messages
+    //wait(lowerSendRequests_, true);
+    //wait(lowerRecvRequests_, true);
+    //wait(higherSendRequests_, true);
+    //wait(higherRecvRequests_, true);
+}
+
+
 // ************************************************************************* //
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
index 817f584c16..10b090711f 100644
--- a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/distributedDILUPreconditioner.H
@@ -62,8 +62,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef distributedDILUPreconditioner_H
-#define distributedDILUPreconditioner_H
+#ifndef Foam_distributedDILUPreconditioner_H
+#define Foam_distributedDILUPreconditioner_H
 
 #include "lduMatrix.H"
 
@@ -82,7 +82,7 @@ class distributedDILUPreconditioner
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Precondition across global coupled bc
         const bool coupled_;
@@ -187,8 +187,12 @@ protected:
             DynamicList<UPstream::Request>& requests
         ) const;
 
-        //- Wait for explicit requests
-        void wait(DynamicList<UPstream::Request>& requests) const;
+        //- Wait for requests or cancel/free requests
+        void wait
+        (
+            DynamicList<UPstream::Request>& requests,
+            const bool cancel = false
+        ) const;
 
         //- Update diagonal for interface
         virtual void addInterfaceDiag
@@ -260,6 +264,9 @@ public:
             const solveScalarField& rA,
             const direction cmpt=0
         ) const;
+
+        //- Signal end of solver
+        virtual void setFinished(const solverPerformance& perf) const;
 };
 
 

From ee26a36add2f61a96b461827c9bc19011dc60f21 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Fri, 2 Jun 2023 13:54:02 +0100
Subject: [PATCH 306/348] ENH: specularRadiation: add axisymmetric fvDOM
 boundary condition

---
 src/thermophysicalModels/radiation/Make/files |   1 +
 ...specularRadiationMixedFvPatchScalarField.C | 468 ++++++++++++++++++
 ...specularRadiationMixedFvPatchScalarField.H | 221 +++++++++
 3 files changed, 690 insertions(+)
 create mode 100644 src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.C
 create mode 100644 src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.H

diff --git a/src/thermophysicalModels/radiation/Make/files b/src/thermophysicalModels/radiation/Make/files
index 08c27f94bd..c1cd7aaf42 100644
--- a/src/thermophysicalModels/radiation/Make/files
+++ b/src/thermophysicalModels/radiation/Make/files
@@ -69,6 +69,7 @@ derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTempe
 derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
 derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
 derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.C
 
 /* fvOptions */
 fvOptions/radiation/radiation.C
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.C
new file mode 100644
index 0000000000..d748553358
--- /dev/null
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.C
@@ -0,0 +1,468 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "radiationModel.H"
+#include "fvDOM.H"
+#include "specularRadiationMixedFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wedgePolyPatch.H"
+#include "symmetryPlanePolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace radiation
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+scalar specularRadiationMixedFvPatchScalarField::azimuthAngle
+(
+    const vector& d
+) const
+{
+    return sign(d.y())*Foam::acos(d.x()/Foam::sqrt(sqr(d.x()) + sqr(d.y())));
+}
+
+
+scalar specularRadiationMixedFvPatchScalarField::polarAngle
+(
+    const vector& d
+) const
+{
+    return Foam::acos(d.z()/mag(d));
+}
+
+
+tmp<scalarField> specularRadiationMixedFvPatchScalarField::interpolateI
+(
+    const fvDOM& dom,
+    const label closestRayi
+) const
+{
+    // Calculate the reflected ray for this ray (KE:p. 2)
+    const vector dAve(normalised(dom.IRay(rayID_).dAve()));
+    const vector dSpe(normalised(dAve - 2*(dAve & n_)*n_));
+
+
+    // Fetch the number of polar and azimuthal segments
+    const label nPolar = dom.nTheta();
+    const label nAzimuth = 4*dom.nPhi();
+
+
+    // Find the neighbouring ray indices of the reflected ray in the east
+    // and west
+    // Go to the east
+    const label polari = std::floor(closestRayi/nAzimuth) + 1;
+    label eastRayi = closestRayi + 1;
+    if (eastRayi == nAzimuth*polari)
+    {
+        eastRayi -= nAzimuth;
+    }
+    // Go to the west
+    label westRayi = closestRayi - 1;
+    if (westRayi < nAzimuth*(polari - 1))
+    {
+        westRayi += nAzimuth;
+    }
+
+    // Find the ray index closest to the reflected ray in the azimuthal
+    // direction
+    label azimuthRayi = -1;
+    bool east = false;
+    const vector dEast(normalised(dom.IRay(eastRayi).dAve()));
+    const vector dWest(normalised(dom.IRay(westRayi).dAve()));
+    if (mag(dSpe - dEast) < mag(dSpe - dWest))
+    {
+        azimuthRayi = eastRayi;
+        east = true;
+    }
+    else
+    {
+        azimuthRayi = westRayi;
+    }
+
+
+    // Find the neighbouring ray indices of the reflected ray in the north
+    // and south
+    // Go to the north
+    label northRayi = closestRayi - nAzimuth;
+    if (northRayi < 0)
+    {
+        // The pole is inside the polar segment - skip
+        northRayi = -1;
+    }
+    // Go to the south
+    label southRayi = closestRayi + nAzimuth;
+    if (southRayi > nPolar*nAzimuth-1)
+    {
+        // The pole is inside the polar segment - skip
+        southRayi = -1;
+    }
+
+
+    // Find the ray index closest to the reflected ray in the polar direction
+    label polarRayi = -1;
+    if (northRayi != -1 && southRayi != -1)
+    {
+        const vector dNorth(normalised(dom.IRay(northRayi).dAve()));
+        const vector dSouth(normalised(dom.IRay(southRayi).dAve()));
+
+        if (mag(dSpe - dNorth) < mag(dSpe - dSouth))
+        {
+            polarRayi = northRayi;
+        }
+        else
+        {
+            polarRayi = southRayi;
+        }
+    }
+    else if (northRayi != -1)
+    {
+        polarRayi = northRayi;
+    }
+    else if (southRayi != -1)
+    {
+        polarRayi = southRayi;
+    }
+
+
+    // Find the ray index neighbouring the azimuthal and polar neighbour rays
+    label cornerRayi = -1;
+    if (polarRayi != -1)
+    {
+        if (east)
+        {
+            cornerRayi = polarRayi + 1;
+
+            if (!(cornerRayi % nAzimuth))
+            {
+                cornerRayi -= nAzimuth;
+            }
+        }
+        else
+        {
+            cornerRayi = polarRayi - 1;
+            if (!(polarRayi % nAzimuth))
+            {
+                cornerRayi += nAzimuth;
+            }
+        }
+    }
+
+
+    // Interpolate the ray intensity of the reflected complementary ray from
+    // the neighbouring rays
+    const label patchi = this->patch().index();
+    auto tIc = tmp<scalarField>::New(this->patch().size(), Zero);
+    auto& Ic = tIc.ref();
+
+
+    if (polarRayi == -1)
+    {
+        // Linear interpolation only in the azimuth direction
+        const vector d1(normalised(dom.IRay(closestRayi).dAve()));
+        const vector d2(normalised(dom.IRay(azimuthRayi).dAve()));
+
+        const scalar phic = azimuthAngle(dSpe);
+        const scalar phi1 = azimuthAngle(d1);
+        const scalar phi2 = azimuthAngle(d2);
+
+        const auto& I1 =
+            dom.IRayLambda(closestRayi, lambdaID_).boundaryField()[patchi];
+        const auto& I2 =
+            dom.IRayLambda(azimuthRayi, lambdaID_).boundaryField()[patchi];
+
+        Ic = lerp(I1, I2, (phic - phi1)/(phi2 - phi1));
+    }
+    else
+    {
+        // Bilinear interpolation in the azimuth and polar directions
+        const vector d1(normalised(dom.IRay(closestRayi).dAve()));
+        const vector d2(normalised(dom.IRay(azimuthRayi).dAve()));
+        const vector d3(normalised(dom.IRay(polarRayi).dAve()));
+        const vector d4(normalised(dom.IRay(cornerRayi).dAve()));
+
+        const scalar phic = azimuthAngle(dSpe);
+        const scalar phi1 = azimuthAngle(d1);
+        const scalar phi2 = azimuthAngle(d2);
+        const scalar phi3 = azimuthAngle(d3);
+        const scalar phi4 = azimuthAngle(d4);
+
+        const scalar thetac = polarAngle(dSpe);
+        const scalar theta1 = polarAngle(d1);
+        const scalar theta3 = polarAngle(d3);
+
+        const auto& I1 =
+            dom.IRayLambda(closestRayi, lambdaID_).boundaryField()[patchi];
+        const auto& I2 =
+            dom.IRayLambda(azimuthRayi, lambdaID_).boundaryField()[patchi];
+        const auto& I3 =
+            dom.IRayLambda(polarRayi, lambdaID_).boundaryField()[patchi];
+        const auto& I4 =
+            dom.IRayLambda(cornerRayi, lambdaID_).boundaryField()[patchi];
+
+        const scalarField Ia(lerp(I1, I2, (phic - phi1)/(phi2 - phi1)));
+        const scalarField Ib(lerp(I3, I4, (phic - phi3)/(phi4 - phi3)));
+
+        Ic = lerp(Ia, Ib, (thetac - theta1)/(theta3 - theta1));
+    }
+
+    return tIc;
+}
+
+
+label specularRadiationMixedFvPatchScalarField::calcComplementaryRayID
+(
+    const fvDOM& dom
+) const
+{
+    vectorList dAve(dom.nRay());
+    forAll(dAve, rayi)
+    {
+        dAve[rayi] = normalised(dom.IRay(rayi).dAve());
+    }
+
+
+    // Check if the ray goes out of the domain, ie. no reflection
+    if ((dAve[rayID_] & n_) > 0)
+    {
+        return -1;
+    }
+
+
+    // Calculate the reflected ray direction for rayID (KE:p. 2)
+    const vector dSpe
+    (
+        normalised(dAve[rayID_] - 2*(dAve[rayID_] & n_)*n_)
+    );
+
+
+    // Find the closest ray to the reflected ray
+    label complementaryRayID = -1;
+    scalar dotProductThisRay = -GREAT;
+    forAll(dAve, i)
+    {
+        const scalar dotProductOtherRay = dAve[i] & dSpe;
+
+        if (dotProductThisRay < dotProductOtherRay)
+        {
+            complementaryRayID = i;
+            dotProductThisRay = dotProductOtherRay;
+        }
+    }
+
+    return complementaryRayID;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+specularRadiationMixedFvPatchScalarField::
+specularRadiationMixedFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    n_(),
+    rayID_(-1),
+    lambdaID_(-1),
+    interpolate_(false)
+{
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
+    this->valueFraction() = Zero;
+}
+
+
+specularRadiationMixedFvPatchScalarField::
+specularRadiationMixedFvPatchScalarField
+(
+    const specularRadiationMixedFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper),
+    n_(ptf.n_),
+    rayID_(ptf.rayID_),
+    lambdaID_(ptf.lambdaID_),
+    interpolate_(ptf.interpolate_)
+{}
+
+
+specularRadiationMixedFvPatchScalarField::
+specularRadiationMixedFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    n_(),
+    rayID_(-1),
+    lambdaID_(-1),
+    interpolate_(dict.getOrDefault("interpolate", false))
+{
+    this->refValue() = Zero;
+    this->refGrad() = Zero;
+    this->valueFraction() = Zero;
+
+    if (!this->readValueEntry(dict))
+    {
+        fvPatchScalarField::operator=(this->refValue());
+    }
+
+
+    if (isA<wedgePolyPatch>(p.patch()))
+    {
+        const auto& wp = refCast<const wedgePolyPatch>(p.patch());
+        n_ = wp.n();
+    }
+    else if (isA<symmetryPlanePolyPatch>(p.patch()))
+    {
+        const auto& sp = refCast<const symmetryPlanePolyPatch>(p.patch());
+        n_ = sp.n();
+    }
+    else
+    {
+        FatalErrorInFunction
+            << " specularRadiation boundary condition is limited to "
+            << "wedge or symmetry-plane geometries." << nl
+            << exit(FatalError);
+    }
+}
+
+
+specularRadiationMixedFvPatchScalarField::
+specularRadiationMixedFvPatchScalarField
+(
+    const specularRadiationMixedFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(ptf, iF),
+    n_(ptf.n_),
+    rayID_(ptf.rayID_),
+    lambdaID_(ptf.lambdaID_),
+    interpolate_(ptf.interpolate_)
+{}
+
+
+specularRadiationMixedFvPatchScalarField::
+specularRadiationMixedFvPatchScalarField
+(
+    const specularRadiationMixedFvPatchScalarField& ptf
+)
+:
+    mixedFvPatchScalarField(ptf),
+    n_(ptf.n_),
+    rayID_(ptf.rayID_),
+    lambdaID_(ptf.lambdaID_),
+    interpolate_(ptf.interpolate_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void specularRadiationMixedFvPatchScalarField::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const fvDOM& dom = db().lookupObject<fvDOM>("radiationProperties");
+
+    // Get rayID and lambdaID for this ray
+    if (rayID_ == -1 && lambdaID_ == -1)
+    {
+        dom.setRayIdLambdaId(internalField().name(), rayID_, lambdaID_);
+    }
+
+
+    // Find the ray index closest to the reflected ray
+    const label compID = calcComplementaryRayID(dom);
+
+
+    if (compID == -1)
+    {
+        // Apply zero-gradient condition for rays outgoing from the domain
+        this->valueFraction() = 0;
+    }
+    else
+    {
+        // Apply fixed condition for rays incoming to the domain
+        this->valueFraction() = 1;
+
+        if (!interpolate_)
+        {
+            // Fetch the existing ray closest to the reflected ray (KE:Eq. 4)
+            this->refValue() =
+                dom.IRayLambda
+                (
+                    compID,
+                    lambdaID_
+                ).internalField();
+        }
+        else
+        {
+            // Interpolate the ray intensity from neighbouring rays (KE:p. 2)
+            this->refValue() = interpolateI(dom, compID);
+        }
+    }
+
+    mixedFvPatchScalarField::updateCoeffs();
+}
+
+
+void specularRadiationMixedFvPatchScalarField::write(Ostream& os) const
+{
+    mixedFvPatchScalarField::write(os);
+    os.writeEntryIfDifferent<bool>("interpolate", false, interpolate_);
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+   fvPatchScalarField,
+   specularRadiationMixedFvPatchScalarField
+);
+
+
+} // End namespace radiation
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.H
new file mode 100644
index 0000000000..bc456ae4fe
--- /dev/null
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/specularRadiation/specularRadiationMixedFvPatchScalarField.H
@@ -0,0 +1,221 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::radiation::specularRadiationMixedFvPatchScalarField
+
+Description
+    This boundary condition provides a specular radiation condition for
+    axisymmetric and symmetry-plane \c fvDOM computations.
+
+    References:
+    \verbatim
+        Standard model (tag:KE):
+            Kumar, P., & Eswaran, V. (2013).
+            A methodology to solve 2D and axisymmetric radiative
+            transfer problems using a general 3D solver.
+            Journal of heat transfer, 135(12).
+            DOI:10.1115/1.4024674
+    \endverbatim
+
+Usage
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        // Mandatory entries
+        type                specularRadiation;
+
+        // Optional entries
+        interpolate         <bool>;
+
+        // Inherited entries
+        patchType           <word>;
+        ...
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property | Description                            | Type  | Reqd | Deflt
+      type     | Type name: turbulentDigitalFilterInlet | word  | yes  | -
+      interpolate | Flag to enable ray-intensity interp | bool  | no   | false
+    \endtable
+
+    The inherited entries are elaborated in:
+      - \link mixedFvPatchFields.H \endlink
+
+Note
+  - The condition is limited to the underlying \c wedge and \c symmetryPlane
+    conditions.
+
+SourceFiles
+    specularRadiationMixedFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_specularRadiationMixedFvPatchScalarField_H
+#define Foam_specularRadiationMixedFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace radiation
+{
+
+/*---------------------------------------------------------------------------*\
+          Class specularRadiationMixedFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class specularRadiationMixedFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+    // Private Data
+
+        //- Patch normal vector
+        vector n_;
+
+        //- Ray index of this ray
+        label rayID_;
+
+        //- Band index of this ray
+        label lambdaID_;
+
+        //- Flag to enable ray-intensity interpolation
+        const bool interpolate_;
+
+
+    // Private Member Functions
+
+        //- Return the corresponding azimuth angle of a given Cartesian vector
+        scalar azimuthAngle(const vector& d) const;
+
+        //- Return the corresponding polar angle of a given Cartesian vector
+        scalar polarAngle(const vector& d) const;
+
+        //- Return interpolated ray intensity
+        tmp<scalarField> interpolateI
+        (
+            const fvDOM& dom,
+            const label closestRayID
+        ) const;
+
+        //- Return the index of complementary ray
+        label calcComplementaryRayID(const fvDOM& dom) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("specularRadiation");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        specularRadiationMixedFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        specularRadiationMixedFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //- specularRadiationMixedFvPatchScalarField onto a new patch
+        specularRadiationMixedFvPatchScalarField
+        (
+            const specularRadiationMixedFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        specularRadiationMixedFvPatchScalarField
+        (
+            const specularRadiationMixedFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<scalar> > clone() const
+        {
+            return tmp<fvPatchField<scalar> >
+            (
+                new specularRadiationMixedFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        specularRadiationMixedFvPatchScalarField
+        (
+            const specularRadiationMixedFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<scalar> > clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<scalar> >
+            (
+                new specularRadiationMixedFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member Functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace radiation
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+#endif
+
+// ************************************************************************* //

From 0f2bbbcbbe447c954bea4536b3d97e8f7dcb5457 Mon Sep 17 00:00:00 2001
From: Vuko Vukcevic <vvukcevic@simscale.com>
Date: Thu, 15 Jun 2023 13:21:29 +0000
Subject: [PATCH 307/348] Feature: Fan momentum source fvOption based on fan
 curve

---
 src/fvOptions/Make/files                      |   1 +
 .../fanMomentumSource/fanMomentumSource.C     | 460 ++++++++++++++++++
 .../fanMomentumSource/fanMomentumSource.H     | 230 +++++++++
 3 files changed, 691 insertions(+)
 create mode 100644 src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.C
 create mode 100644 src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.H

diff --git a/src/fvOptions/Make/files b/src/fvOptions/Make/files
index d481c16016..10013764ff 100644
--- a/src/fvOptions/Make/files
+++ b/src/fvOptions/Make/files
@@ -36,6 +36,7 @@ $(derivedSources)/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulate
 $(derivedSources)/viscousDissipation/viscousDissipation.C
 $(derivedSources)/buoyancyTurbSource/buoyancyTurbSource.C
 $(derivedSources)/patchCellsSource/patchCellsSource.C
+$(derivedSources)/fanMomentumSource/fanMomentumSource.C
 
 $(derivedSources)/heatExchangerSource/heatExchangerSource.C
 $(derivedSources)/heatExchangerSource/heatExchangerModels/heatExchangerModel/heatExchangerModel.C
diff --git a/src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.C b/src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.C
new file mode 100644
index 0000000000..bc9be6f01e
--- /dev/null
+++ b/src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.C
@@ -0,0 +1,460 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022 Louis Vittoz, SimScale GmbH
+    Copyright (C) 2023 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 "fanMomentumSource.H"
+#include "IFstream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(fanMomentumSource, 0);
+    addToRunTimeSelectionTable(option, fanMomentumSource, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions   * * * * * * * * * * * //
+
+void Foam::fv::fanMomentumSource::writeProps
+(
+    const scalar gradP,
+    const scalar flowRate
+) const
+{
+    // Only write on output time
+    if (mesh_.time().writeTime())
+    {
+        IOdictionary propsDict
+        (
+            IOobject
+            (
+                name_ + "Properties",
+                mesh_.time().timeName(),
+                "uniform",
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
+            )
+        );
+        propsDict.add("gradient", gradP);
+        propsDict.add("flow_rate", flowRate);
+        propsDict.regIOobject::write();
+    }
+}
+
+
+void Foam::fv::fanMomentumSource::initUpstreamFaces()
+{
+    // First calculate the centre of gravity of the cell zone
+    const vectorField& cellCentres = mesh_.cellCentres();
+    const scalarField& cellVolumes = mesh_.cellVolumes();
+
+    vector centreGravityCellZone(Zero);
+    scalar cellZoneVolume = 0;
+    for (const label celli : cells_)
+    {
+        const scalar cellVolume = cellVolumes[celli];
+        centreGravityCellZone += cellCentres[celli]*cellVolume;
+        cellZoneVolume += cellVolume;
+    }
+
+    reduce(centreGravityCellZone, sumOp<vector>());
+    reduce(cellZoneVolume, sumOp<scalar>());
+
+    if (cellZoneVolume < SMALL)
+    {
+        FatalErrorInFunction
+            << "Cannot initialize upstream faces because the total cell zone"
+            << " volume is zero or negative: " << cellZoneVolume << "." << nl
+            << "Check whether there are cells in fan momentum source cell zone."
+            << abort(FatalError);
+    }
+
+    centreGravityCellZone /= cellZoneVolume;
+
+    // Collect faces upstream of the centre of gavity
+    const faceZone& fZone = mesh_.faceZones()[surroundingFaceZoneID_];
+    const vectorField& faceCentreGravity = mesh_.faceCentres();
+
+    upstreamPatchFaceInfo_.resize_nocopy(fZone.size());
+
+    label count = 0;
+    for (const label facei : fZone)
+    {
+        if
+        (
+            (flowDir_ & (faceCentreGravity[facei] - centreGravityCellZone)) < 0
+        )
+        {
+            labelPair patchFaceInfo(-1, -1);
+
+            if (mesh_.isInternalFace(facei))
+            {
+                // Patch ID already set to -1, set only the face ID
+                patchFaceInfo.second() = facei;
+            }
+            else
+            {
+                patchFaceInfo.first() = mesh_.boundaryMesh().whichPatch(facei);
+                const polyPatch& pp = mesh_.boundaryMesh()[patchFaceInfo.first()];
+                const auto* cpp = isA<coupledPolyPatch>(pp);
+
+                if (cpp)
+                {
+                    patchFaceInfo.second() =
+                        cpp->owner()
+                      ? pp.whichFace(facei)
+                      : -1;
+                }
+                else if (!isA<emptyPolyPatch>(pp))
+                {
+                    patchFaceInfo.second() = pp.whichFace(facei);
+                }
+                // else both face ID and patch ID remain at -1
+            }
+
+            // If this is an upstream face, set it in the list
+            if (patchFaceInfo.second() >= 0)
+            {
+                upstreamPatchFaceInfo_[count] = patchFaceInfo;
+                count++;
+            }
+        }
+    }
+
+    upstreamPatchFaceInfo_.setSize(count);
+
+    // Fill cellsInZones_ with all cell IDs
+    for (const label celli : cells_)
+    {
+        cellsInZones_.insert(celli);
+    }
+
+    // Sanity check
+    const labelUList& owners = mesh_.owner();
+    const labelUList& neighbours = mesh_.neighbour();
+    for (const labelPair& patchFaceInfo : upstreamPatchFaceInfo_)
+    {
+        if (patchFaceInfo.first() == -1)
+        {
+            const label facei = patchFaceInfo.second();
+            const label own = owners[facei];
+            const label nei = neighbours[facei];
+
+            // To be valid: one cell has to be inside the cellZone and the other
+            // one, outside
+            if (cellsInZones_.found(own) == cellsInZones_.found(nei))
+            {
+                FatalErrorInFunction
+                    << "It seems that the faceZone is not part of the cellZone "
+                    << "boundaries."
+                    << abort(FatalError);
+            }
+        }
+    }
+}
+
+
+Foam::scalar
+Foam::fv::fanMomentumSource::calcFlowRate
+(
+    const surfaceScalarField& phi,
+    const surfaceScalarField& rhof
+) const
+{
+    // Sanity check to make sure we're not left in an inconsistent state because
+    // here we're operating on primitive (non-dimensional) fields
+    if (isNull(rhof) != (phi.dimensions() == dimVolume/dimTime))
+    {
+        FatalErrorInFunction
+            << "Incorrect usage of the function. " << nl
+            << "For incompressible flow, pass surfaceScalarField::null for rhof"
+            << " and volumetric flux for phi." << nl
+            << "For compressible flow, pass face-interpolated density as rhof"
+            << " and mass flux for phi."
+            << exit(FatalError);
+    }
+
+    // Calculate the flow rate through the upstream faces
+    scalarList phif(upstreamPatchFaceInfo_.size());
+
+    const labelUList& owners = mesh_.owner();
+
+    forAll(upstreamPatchFaceInfo_, i)
+    {
+        const labelPair& patchFaceInfo = upstreamPatchFaceInfo_[i];
+
+        if (isNull(rhof))
+        {
+            // Incompressible variant (phi = volumetric flux)
+            phif[i] =
+                patchFaceInfo.first() < 0
+              ? phi[patchFaceInfo.second()]
+              : phi.boundaryField()[patchFaceInfo];
+        }
+        else
+        {
+            // Compressible variant (phi = mass flux)
+            phif[i] =
+               patchFaceInfo.first() < 0
+             ? phi[patchFaceInfo.second()]/
+               rhof.internalField()[patchFaceInfo.second()]
+             : phi.boundaryField()[patchFaceInfo]/
+               rhof.boundaryField()[patchFaceInfo];
+        }
+
+        // Sign of the flux needs to be flipped if this is an internal face
+        // whose owner is found in the cell zone
+        if
+        (
+            patchFaceInfo.first() < 0
+         && cellsInZones_.found(owners[patchFaceInfo.second()])
+        )
+        {
+            phif[i] *= -1;
+        }
+    }
+
+    return gSum(phif);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::fanMomentumSource::fanMomentumSource
+(
+    const word& sourceName,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    fv::cellSetOption(sourceName, modelType, dict, mesh),
+    upstreamPatchFaceInfo_(),
+    cellsInZones_(),
+    fanCurvePtr_(Function1<scalar>::New("fanCurve", coeffs_, &mesh)),
+    UName_(coeffs_.getOrDefault<word>("U", "U")),
+    flowDir_(coeffs_.get<vector>("flowDir")),
+    thickness_(coeffs_.get<scalar>("thickness")),
+    gradPFan_(0.0),
+    surroundingFaceZoneID_(-1),
+    rho_(coeffs_.getOrDefault<scalar>("rho", SMALL)),
+    useRefRho_(coeffs_.found("rho"))
+{
+    // Skip all the checks if the source term has been deactivated
+    // because there are no selected cells.
+    // Such a situation typically occurs for multiple fluid regions
+    if (fv::option::isActive())
+    {
+        const word faceZoneName = coeffs_.getWord("faceZone");
+
+        surroundingFaceZoneID_ = mesh_.faceZones().findZoneID(faceZoneName);
+
+        if (surroundingFaceZoneID_ < 0)
+        {
+            FatalErrorInFunction
+                << type() << " " << this->name() << ": "
+                << "    Unknown face zone name: " << faceZoneName
+                << ". Valid face zones are: " << mesh_.faceZones().names()
+                << exit(FatalError);
+        }
+
+        flowDir_.normalise();
+        if (mag(flowDir_) < SMALL)
+        {
+            FatalIOErrorInFunction(coeffs_)
+                << "'flowDir' cannot be a zero-valued vector."
+                << exit(FatalIOError);
+        }
+
+        if (thickness_ < VSMALL)
+        {
+            FatalIOErrorInFunction(coeffs_)
+                << "'thickness' cannot be non-positive."
+                << exit(FatalIOError);
+        }
+
+        if (coeffs_.found("fields"))
+        {
+            IOWarningInFunction(coeffs_)
+                << "Found 'fields' entry, which will be ignored. This fvOption"
+                << " will operate only on field 'U' = " << UName_
+                << endl;
+        }
+        fieldNames_.resize(1, UName_);
+
+        fv::option::resetApplied();
+
+        // Read the initial pressure gradient from file if it exists
+        IFstream propsFile
+        (
+            mesh_.time().timePath()/"uniform"/(name_ + "Properties")
+        );
+
+        if (propsFile.good())
+        {
+            Info<< "    Reading pressure gradient from file" << endl;
+            dictionary propsDict(propsFile);
+            propsDict.readEntry("gradient", gradPFan_);
+        }
+
+        Info<< "    Initial pressure gradient = " << gradPFan_ << nl << endl;
+
+        if (rho_ < SMALL)
+        {
+            FatalIOErrorInFunction(coeffs_)
+                << "'rho' cannot be zero or negative."
+                << exit(FatalIOError);
+        }
+
+        initUpstreamFaces();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::fanMomentumSource::addSup
+(
+    fvMatrix<vector>& eqn,
+    const label fieldi
+)
+{
+    volVectorField::Internal Su
+    (
+        IOobject
+        (
+            name_ + fieldNames_[fieldi] + "Sup",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
+        ),
+        mesh_,
+        dimensionedVector(eqn.dimensions()/dimVolume, Zero)
+    );
+
+    const auto& phi = mesh().lookupObject<surfaceScalarField>("phi");
+
+    if (phi.dimensions() != dimVelocity*dimArea)
+    {
+        FatalErrorInFunction
+            << "You called incompressible variant of addSup for case with "
+            << "a mass flux and not volumetric flux. This is not allowed."
+            << abort(FatalError);
+    }
+
+    if (!useRefRho_)
+    {
+        FatalErrorInFunction
+            << "You called incompressible addSup without providing a "
+            << "reference density. Add 'rho' entry to the dictionary."
+            << abort(FatalError);
+    }
+
+    const scalar flowRate = calcFlowRate(phi, surfaceScalarField::null());
+
+    // Pressure drop for this flow rate
+    // if flow rate is negative, pressure is clipped at the static pressure
+    gradPFan_ =
+        fanCurvePtr_->value(max(flowRate, scalar(0)))/thickness_/rho_;
+
+    // Create the source term
+    UIndirectList<vector>(Su, cells_) = flowDir_*gradPFan_;
+
+    eqn += Su;
+
+    writeProps(gradPFan_, flowRate);
+}
+
+
+void Foam::fv::fanMomentumSource::addSup
+(
+    const volScalarField& rho,
+    fvMatrix<vector>& eqn,
+    const label fieldi
+)
+{
+    volVectorField::Internal Su
+    (
+        IOobject
+        (
+            name_ + fieldNames_[fieldi] + "Sup",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            IOobject::NO_REGISTER
+        ),
+        mesh_,
+        dimensionedVector(eqn.dimensions()/dimVolume, Zero)
+    );
+
+    const auto& phi = mesh().lookupObject<surfaceScalarField>("phi");
+
+    if (phi.dimensions() != dimMass/dimTime)
+    {
+        FatalErrorInFunction
+            << "You called compressible variant of addSup for case with "
+            << "a volumetric flux and not mass flux. This is not allowed."
+            << abort(FatalError);
+    }
+
+    const surfaceScalarField rhof(fvc::interpolate(rho));
+    const scalar flowRate = calcFlowRate(phi, rhof);
+
+    // Pressure drop for this flow rate
+    // if flow rate is negative, pressure is clipped at the static pressure
+    gradPFan_ = fanCurvePtr_->value(max(flowRate, scalar(0)))/thickness_;
+
+    // Create the source term
+    UIndirectList<vector>(Su, cells_) = flowDir_*gradPFan_;
+
+    eqn += Su;
+
+    writeProps(gradPFan_, flowRate);
+}
+
+
+bool Foam::fv::fanMomentumSource::read(const dictionary& dict)
+{
+    NotImplemented;
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.H b/src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.H
new file mode 100644
index 0000000000..ca5c3efdcf
--- /dev/null
+++ b/src/fvOptions/sources/derived/fanMomentumSource/fanMomentumSource.H
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2022 Louis Vittoz, SimScale GmbH
+    Copyright (C) 2023 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::fv::fanMomentumSource
+
+Group
+    grpFvOptionsSources
+
+Description
+    This source term models the action of a fan on the flow. It calculates
+    flow rate through a set of upstream faces of encompassing the cell zone. The
+    set of upstream faces is automatically calculated based on the flow
+    direction and the surrounding face zone. Based on the flow rate, the
+    pressure gradient is calculated based on the fan pressure curve and the
+    thickness of the fan (measurement section). The pressure gradient is then
+    added to the momentum equation.
+
+Usage
+    Minimal example by using \c constant/fvOptions:
+    \verbatim
+    <name>
+    {
+        // Mandatory entries
+        type                fanMomentumSource;
+        fanCurve            <Function1<scalar>>;
+        flowDir             <vector>;
+        thickness           <scalar>;
+        cellZone            <word>;
+        faceZone            <word>;
+
+        // Optional entries
+        gradient            <scalar>;
+        rho                 <scalar>;
+        U                   <word>;
+
+        // Inherited entries
+        ...
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property  | Description                       | Type  | Reqd | Deflt
+      type      | Type name: fanMomentumSource      | word  | yes  | -
+      fanCurve  | Pressure drop vs flow-rate  | Function1\<scalar\>| yes | -
+      flowDir   | Direction of the flow through the fan | vector | yes | -
+      cellZone  | Cell zone representing the fan    | word   | yes | -
+      faceZone  | Face zone around the cell zone    | word   | yes | -
+      thickness | Thickness of the fan [m]          | scalar | yes | -
+      gradient  | Initial pressure gradient         | scalar | no  | -
+      rho       | Reference density for incompressible flow | scalar | no  | -
+      U         | Name of velocity field            | word   | no  | U
+    \endtable
+
+    The inherited entries are elaborated in:
+      - \link fvOption.H \endlink
+      - \link cellSetOption.H \endlink
+      - \link Function1.H \endlink
+
+Note
+  - The fan curve needs to be provded for a pressure drop in [Pa] and
+    is specified as a function of the volumetric flow rate in [m^3/s].
+
+SourceFiles
+    fanMomentumSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_fv_fanMomentumSource_H
+#define Foam_fv_fanMomentumSource_H
+
+#include "cellSetOption.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class fanMomentumSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class fanMomentumSource
+:
+    public fv::cellSetOption
+{
+    // Private Data
+
+        //- Local list of pairs of upstream patch IDs and upstream face IDs
+        //  For internal faces, the upstream patch ID is -1
+        List<labelPair> upstreamPatchFaceInfo_;
+
+        //- Cells in zone
+        labelHashSet cellsInZones_;
+
+        //- Volumetric flow rate [m3] vs. pressure drop [Pa] table
+        autoPtr<Function1<scalar>> fanCurvePtr_;
+
+        //- Name of the velocity field this function object operates on
+        word UName_;
+
+        //- Direction of flow through the fan
+        vector flowDir_;
+
+        //- Thickness of the fan, in [m]
+        scalar thickness_;
+
+        //- Pressure drop
+        scalar gradPFan_;
+
+        //- Id for the surrounding face zone
+        label surroundingFaceZoneID_;
+
+        //- Reference density for incompressible cases
+        scalar rho_;
+
+        //- Whether to use reference density
+        bool useRefRho_;
+
+
+    // Private Member Functions
+
+        //- Write the pressure gradient to file (for restarts etc)
+        void writeProps(const scalar gradP, const scalar flowRate) const;
+
+        //- Collect all faces upstream of
+        //- the centre of gravity of the cell zone
+        void initUpstreamFaces();
+
+        //- Return the volumetric flow rate given flux and face-interpolated
+        //  density. For incompressible cases, use surfaceScalarField::null()
+        //  for rhof
+        scalar calcFlowRate
+        (
+            const surfaceScalarField& phi,
+            const surfaceScalarField& rhof
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fanMomentumSource");
+
+
+    // Constructors
+
+        //- Construct from explicit source name and mesh
+        fanMomentumSource
+        (
+            const word& sourceName,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+        //- No copy construct
+        fanMomentumSource(const fanMomentumSource&) = delete;
+
+        //- No copy assignment
+        void operator=(const fanMomentumSource&) = delete;
+
+
+    //- Destructor
+    virtual ~fanMomentumSource() = default;
+
+
+    // Member Functions
+
+    // Evaluation
+
+        //- Add explicit contribution to momentum equation
+        virtual void addSup
+        (
+            fvMatrix<vector>& eqn,
+            const label fieldi
+        );
+
+        //- Add explicit contribution to compressible momentum equation
+        virtual void addSup
+        (
+            const volScalarField& rho,
+            fvMatrix<vector>& eqn,
+            const label fieldi
+        );
+
+
+    // IO
+
+        //- Read source dictionary
+        virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 41cb1686499e09c0c6e6acac134ef8862e822cc3 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Mon, 19 Jun 2023 08:55:44 +0100
Subject: [PATCH 308/348] TUT: scalarTransport: avoid excessive number of
 output directories (fixes #2806)

---
 .../postProcessing/solvers/scalarTransport/scalarTransport      | 2 ++
 .../rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport | 2 +-
 .../windshieldCondensation/system/controlDict                   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
index 1c22802153..65957dcc0b 100644
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
@@ -18,6 +18,8 @@ Description
 type            scalarTransport;
 libs            ("libsolverFunctionObjects.so");
 
+writeControl    writeTime;
+
 field           s;
 schemesField    s;
 D               1e-09;
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport
index d4d4874252..e77607e0e6 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport
@@ -7,7 +7,7 @@ tracer0
     log   off;
 
     resetOnStartUp  false;
-    // writeControl    writeTime;
+    writeControl    writeTime;
     // writeInterval   1;
     field           tracer0;
     D               0.001;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
index 22ca6f7934..997bcb1fe9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
@@ -61,6 +61,8 @@ functions
         fvOptions
         {
         }
+
+        writeControl    writeTime;
     }
 
     fileUpdate

From 979b5a20cdf7ecbe1feee7da916bb57357b0fea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20Wei=C3=9Fmann?= <>
Date: Mon, 19 Jun 2023 09:57:47 +0100
Subject: [PATCH 309/348] ENH: update Visual Studio Code settings for new
 vscode versions (fixes #2805)

---
 bin/tools/vscode-settings | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/bin/tools/vscode-settings b/bin/tools/vscode-settings
index 6cf4804cd6..80a9f30898 100755
--- a/bin/tools/vscode-settings
+++ b/bin/tools/vscode-settings
@@ -18,8 +18,7 @@
 #     Emit some settings for Visual Studio Code + OpenFOAM
 #
 # Example
-#     bin/tools/vscode-settings > .vscode/settings.json
-#     openfoam -spdp -int64 bin/tools/vscode-settings
+#    bin/tools/vscode-settings > openfoam.code-workspace
 #
 # Environment
 #     WM_PROJECT_DIR, WM_PROJECT_USER_DIR, WM_OPTIONS
@@ -42,8 +41,7 @@ options:
 Emit some settings for Visual Studio Code + OpenFOAM
 
 For example,
-    bin/tools/vscode-settings > .vscode/settings.json
-    openfoam -spdp -int64 bin/tools/vscode-settings
+    bin/tools/vscode-settings > openfoam.code-workspace
 
 USAGE
     exit 0  # clean exit
@@ -117,15 +115,18 @@ cat << INFO 1>&2
 # -------------------------
 INFO
 
-echo '{'  # BEGIN_LIST
-
 # ccls integration
 cat << JSON_CONTENT
-    "ccls.cache.directory":
-"$outputDir/ccls-cache",
+{
+    "folders": [
+        {
+            "path": "$projectDir"
+        }
+    ],
+    "settings": {
+        "ccls.cache.directory": "$outputDir/ccls-cache",
 
-    "ccls.misc.compilationDatabaseDirectory":
-"$outputDir",
+        "ccls.misc.compilationDatabaseDirectory": "$outputDir",
 
 JSON_CONTENT
 
@@ -134,19 +135,18 @@ JSON_CONTENT
 if [ -x "$session" ]
 then
 cat << JSON_CONTENT
-    "C_Cpp.default.compileCommands":
-"$session wmake -with-bear -s -j",
+        "C_Cpp.default.compileCommands": "$session wmake -with-bear -s -j",
 JSON_CONTENT
 fi
 
 cat << JSON_CONTENT
 
-    "C_Cpp.autocomplete": "Disabled",
-    "C_Cpp.errorSquiggles": "Disabled",
-    "C_Cpp.formatting": "Disabled",
-    "C_Cpp.intelliSenseEngine": "Disabled"
+        "C_Cpp.autocomplete": "Disabled",
+        "C_Cpp.errorSquiggles": "Disabled",
+        "C_Cpp.formatting": "Disabled",
+        "C_Cpp.intelliSenseEngine": "Disabled"
+    }
+}
 JSON_CONTENT
 
-echo '}'  # END_LIST
-
 #------------------------------------------------------------------------------

From 66a2894da8d24ce7d5f131f1083d5d05e228038d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 19 Jun 2023 15:53:27 +0100
Subject: [PATCH 310/348] ENH: parProfiling: add few more functionality to test

---
 tutorials/IO/cavity_parProfiling/README.txt   |  5 +++--
 .../system/decomposeParDict                   | 22 ++++++++++++++-----
 .../system/fvSolution.template                | 10 +++++----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/tutorials/IO/cavity_parProfiling/README.txt b/tutorials/IO/cavity_parProfiling/README.txt
index 5c2fb30ae3..6346eb4521 100644
--- a/tutorials/IO/cavity_parProfiling/README.txt
+++ b/tutorials/IO/cavity_parProfiling/README.txt
@@ -1,3 +1,4 @@
 Testcase for parProfiling wrapper linear solver.
-
-It only activates parProfiling within the linear solver.
+- activates parProfiling within the linear solver.
+- tests multiLevel scotch
+- test distributedDI* preconditioners
diff --git a/tutorials/IO/cavity_parProfiling/system/decomposeParDict b/tutorials/IO/cavity_parProfiling/system/decomposeParDict
index 5eed9b045e..174ec90586 100644
--- a/tutorials/IO/cavity_parProfiling/system/decomposeParDict
+++ b/tutorials/IO/cavity_parProfiling/system/decomposeParDict
@@ -14,14 +14,26 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains  2;
-
-method  hierarchical;
-
+numberOfSubdomains  20;
+method              scotch;
 coeffs
 {
-    n   (2 1 1);
+    // Divide into 20/10=2 nodes
+    domains (10);
+    // Inside a node the communication weight is 1% of that inbetween nodes
+    domainWeights (0.01);
 }
 
 
+
+//numberOfSubdomains  2;
+//
+//method  hierarchical;
+//
+//coeffs
+//{
+//    n   (2 1 1);
+//}
+
+
 // ************************************************************************* //
diff --git a/tutorials/IO/cavity_parProfiling/system/fvSolution.template b/tutorials/IO/cavity_parProfiling/system/fvSolution.template
index 67ad6d913e..4301384924 100644
--- a/tutorials/IO/cavity_parProfiling/system/fvSolution.template
+++ b/tutorials/IO/cavity_parProfiling/system/fvSolution.template
@@ -20,7 +20,7 @@ solvers
     {
         solver          parProfiling;
         baseSolver      PCG;
-        preconditioner  DIC;
+        preconditioner  distributedDIC;
         tolerance       1e-06;
         relTol          0.05;
     }
@@ -28,14 +28,16 @@ solvers
     {
         solver          parProfiling;
         baseSolver      PCG;
-        preconditioner  DIC;
+        preconditioner  distributedDIC;
         tolerance       1e-06;
         relTol          0;
     }
     U
     {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
+        //solver          smoothSolver;
+        //smoother        symGaussSeidel;
+        solver          PBiCGStab;
+        preconditioner  distributedDILU;
         tolerance       1e-05;
         relTol          0;
     }

From b2217d5e6b925aff04f3646f5bf0f8b4f174db59 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 15 Jun 2023 09:37:17 +0200
Subject: [PATCH 311/348] ENH: simplify inheritances for
 fileOperationInitialise

- can be broadly categorised as 'unthreaded'
  or 'collated' (threading requirement depends on buffering)
  without other opaque inheritances.

CONFIG: add hostUncollated to bash completion prompt
---
 etc/config.sh/bash_completion                 |  4 +-
 src/OpenFOAM/Make/files                       |  2 +-
 .../collatedFileOperation.C                   |  4 +-
 .../collatedFileOperation.H                   | 18 ++--
 .../hostCollatedFileOperation.C               |  5 +-
 .../hostCollatedFileOperation.H               | 25 ------
 .../fileOperationInitialise.C                 | 37 ++++----
 .../fileOperationInitialise.H                 | 40 ++++++++-
 .../unthreadedInitialise.H                    | 88 -------------------
 .../masterUncollatedFileOperation.C           |  6 +-
 .../masterUncollatedFileOperation.H           | 27 ------
 .../hostUncollatedFileOperation.C             |  6 +-
 .../hostUncollatedFileOperation.H             | 25 ------
 .../uncollatedFileOperation.C                 |  6 +-
 14 files changed, 84 insertions(+), 209 deletions(-)
 rename src/OpenFOAM/global/fileOperations/{fileOperationInitialise => fileOperation}/fileOperationInitialise.C (78%)
 rename src/OpenFOAM/global/fileOperations/{fileOperationInitialise => fileOperation}/fileOperationInitialise.H (74%)
 delete mode 100644 src/OpenFOAM/global/fileOperations/fileOperationInitialise/unthreadedInitialise.H

diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index 9a748badde..8134ad7204 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2017-2022 OpenCFD Ltd.
+#     Copyright (C) 2017-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -146,7 +146,7 @@ _of_complete_()
         COMPREPLY=($(compgen -W "$choices" -- ${cur}))
         ;;
     -fileHandler)
-        choices="collated uncollated hostCollated masterUncollated"
+        choices="collated uncollated hostCollated hostUncollated masterUncollated"
         COMPREPLY=($(compgen -W "$choices" -- ${cur}))
         ;;
     *)
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index cb0be37821..0edb074fde 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -21,7 +21,7 @@ $(fileOps)/fileOperation/fileOperation.C
 $(fileOps)/fileOperation/fileOperationBroadcast.C
 $(fileOps)/fileOperation/fileOperationNew.C
 $(fileOps)/fileOperation/fileOperationRanks.C
-$(fileOps)/fileOperationInitialise/fileOperationInitialise.C
+$(fileOps)/fileOperation/fileOperationInitialise.C
 $(fileOps)/dummyFileOperation/dummyFileOperation.C
 $(fileOps)/uncollatedFileOperation/uncollatedFileOperation.C
 $(fileOps)/masterUncollatedFileOperation/masterUncollatedFileOperation.C
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
index 1c846ae5d8..2318c474d7 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -68,11 +68,11 @@ namespace fileOperations
         collatedFileOperation::maxThreadFileBufferSize
     );
 
-    // Mark as needing threaded mpi
+    // Threaded MPI: depending on buffering
     addNamedToRunTimeSelectionTable
     (
         fileOperationInitialise,
-        collatedFileOperationInitialise,
+        fileOperationInitialise_collated,
         word,
         collated
     );
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
index 92ce70c71a..04acd2ae0f 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H
@@ -50,6 +50,7 @@ SourceFiles
 #define Foam_fileOperations_collatedFileOperation_H
 
 #include "masterUncollatedFileOperation.H"
+#include "fileOperationInitialise.H"
 #include "OFstreamCollator.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -173,32 +174,33 @@ public:
 
 
 /*---------------------------------------------------------------------------*\
-               Class collatedFileOperationInitialise Declaration
+               Class fileOperationInitialise_collated Declaration
 \*---------------------------------------------------------------------------*/
 
-//! Internal class only
-class collatedFileOperationInitialise
+//- A fileOperation initialiser for collated file handlers.
+//- Requires threading for non-zero maxThreadFileBufferSize.
+class fileOperationInitialise_collated
 :
-    public masterUncollatedFileOperationInitialise
+    public fileOperationInitialise
 {
 public:
 
     // Constructors
 
         //- Construct from components
-        collatedFileOperationInitialise(int& argc, char**& argv)
+        fileOperationInitialise_collated(int& argc, char**& argv)
         :
-            masterUncollatedFileOperationInitialise(argc, argv)
+            fileOperationInitialise(argc, argv)
         {}
 
 
     //- Destructor
-    virtual ~collatedFileOperationInitialise() = default;
+    virtual ~fileOperationInitialise_collated() = default;
 
 
     // Member Functions
 
-        //- Requires threading for non-zero maxThreadFileBufferSize
+        //- The (MPI) threading requirement depends on buffering
         virtual bool needsThreading() const
         {
             return (collatedFileOperation::maxThreadFileBufferSize > 0);
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
index f7ede70f30..8ee087e691 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.C
@@ -49,12 +49,11 @@ namespace fileOperations
         comm
     );
 
-    // Register initialisation routine. Signals need for threaded mpi and
-    // handles command line arguments
+    // Threaded MPI: depending on buffering
     addNamedToRunTimeSelectionTable
     (
         fileOperationInitialise,
-        hostCollatedFileOperationInitialise,
+        fileOperationInitialise_collated,
         word,
         hostCollated
     );
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
index 23840308c8..25ab873fc0 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
@@ -129,31 +129,6 @@ public:
 };
 
 
-/*---------------------------------------------------------------------------*\
-            Class hostCollatedFileOperationInitialise Declaration
-\*---------------------------------------------------------------------------*/
-
-//! Internal class only
-class hostCollatedFileOperationInitialise
-:
-    public collatedFileOperationInitialise
-{
-public:
-
-    // Constructors
-
-        //- Construct from components
-        hostCollatedFileOperationInitialise(int& argc, char**& argv)
-        :
-            collatedFileOperationInitialise(argc, argv)
-        {}
-
-
-    //- Destructor
-    virtual ~hostCollatedFileOperationInitialise() = default;
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fileOperations
diff --git a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationInitialise.C
similarity index 78%
rename from src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C
rename to src/OpenFOAM/global/fileOperations/fileOperation/fileOperationInitialise.C
index f934b4bd22..978e4a9d09 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationInitialise.C
@@ -50,37 +50,44 @@ Foam::fileOperations::fileOperationInitialise::fileOperationInitialise
     char**& argv
 )
 {
-    // Check for -ioRanks, which requires an argument
+    // Check for -ioRanks: requires an argument
     int index = -1;
     for (int argi = 1; argi < argc; ++argi)
     {
-        if (argv[argi][0] == '-')
+        const char *optName = argv[argi];
+
+        if (optName[0] == '-')
         {
-            const char *optName = &argv[argi][1];
+            ++optName;  // Looks like an option, skip leading '-'
+            bool emitErrorMessage = false;
 
             if (strcmp(optName, "ioRanks") == 0)
             {
+                // Requires a parameter
                 if (argi < argc-1)
                 {
                     index = argi;
-                    Foam::setEnv("FOAM_IORANKS", argv[argi+1], true);
+                    ++argi;
+                    Foam::setEnv("FOAM_IORANKS", argv[argi], true);
                     break;
                 }
                 else
                 {
-                    // No argument to -ioRanks.
-                    // Give error message as in argList.
-                    // Slight problem: Pstream not yet initialised so
-                    // - no master-only output
-                    // - no early exit
-
-                    Info<< nl
-                        << "Error: option '-ioRanks' requires a list of"
-                           " IO ranks as argument" << nl << nl;
-
-                    //UPstream::exit(1);  // works for serial and parallel
+                    emitErrorMessage = true;
                 }
             }
+
+            if (emitErrorMessage)
+            {
+                // Missing argument: emit message but not exit or
+                // FatalError since Pstream etc are not yet initialised
+
+                Info<< nl
+                    << "Error: option '-" << optName
+                    << "' requires an argument" << nl << nl;
+
+                //NO: UPstream::exit(1);  // works for serial and parallel
+            }
         }
     }
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationInitialise.H
similarity index 74%
rename from src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.H
rename to src/OpenFOAM/global/fileOperations/fileOperation/fileOperationInitialise.H
index a5f6d91fe6..ebd129b3d1 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/fileOperationInitialise.H
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperationInitialise.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,8 +34,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fileOperationInitialise_H
-#define fileOperationInitialise_H
+#ifndef Foam_fileOperations_fileOperationInitialise_H
+#define Foam_fileOperations_fileOperationInitialise_H
 
 #include "runTimeSelectionTables.H"
 
@@ -79,7 +80,7 @@ public:
 
     // Selectors
 
-        //- Select type
+        //- Select initialisation type
         static autoPtr<fileOperationInitialise> New
         (
             const word& type, int& argc, char**& argv
@@ -92,11 +93,42 @@ public:
 
     // Member Functions
 
-        //- Threading required?
+        //- Requires (MPI) threading?
         virtual bool needsThreading() const = 0;
 };
 
 
+/*---------------------------------------------------------------------------*\
+              Class fileOperationInitialise_unthreaded Declaration
+\*---------------------------------------------------------------------------*/
+
+//- A fileOperation initialiser for unthreaded file handlers.
+class fileOperationInitialise_unthreaded
+:
+    public fileOperationInitialise
+{
+public:
+
+    // Constructors
+
+        //- Construct from components
+        fileOperationInitialise_unthreaded(int& argc, char**& argv)
+        :
+            fileOperationInitialise(argc, argv)
+        {}
+
+
+    //- Destructor
+    virtual ~fileOperationInitialise_unthreaded() = default;
+
+
+    // Member Functions
+
+        //- No (MPI) threading required
+        virtual bool needsThreading() const { return false; }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fileOperations
diff --git a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/unthreadedInitialise.H b/src/OpenFOAM/global/fileOperations/fileOperationInitialise/unthreadedInitialise.H
deleted file mode 100644
index 36baf2b8cf..0000000000
--- a/src/OpenFOAM/global/fileOperations/fileOperationInitialise/unthreadedInitialise.H
+++ /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) 2017-2018 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/>.
-
-Class
-    Foam::unthreadedInitialise
-
-Description
-    A fileOperation initialiser for unthreaded file handlers
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef unthreadedInitialise_H
-#define unthreadedInitialise_H
-
-#include "fileOperationInitialise.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace fileOperations
-{
-
-/*---------------------------------------------------------------------------*\
-                     Class unthreadedInitialise Declaration
-\*---------------------------------------------------------------------------*/
-
-class unthreadedInitialise
-:
-    public fileOperationInitialise
-{
-public:
-
-    // Constructors
-
-        //- Construct from components
-        unthreadedInitialise(int& argc, char**& argv)
-        :
-            fileOperationInitialise(argc, argv)
-        {}
-
-
-    //- Destructor
-    virtual ~unthreadedInitialise() = default;
-
-
-    // Member Functions
-
-        //- No threading required
-        virtual bool needsThreading() const
-        {
-            return false;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace fileOperations
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 700b44aa8c..7db6427ffa 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -27,6 +27,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "masterUncollatedFileOperation.H"
+#include "fileOperationInitialise.H"
 #include "addToRunTimeSelectionTable.H"
 #include "Pstream.H"
 #include "Time.H"
@@ -38,7 +39,6 @@ License
 #include "registerSwitch.H"
 #include "dummyISstream.H"
 #include "SubList.H"
-#include "unthreadedInitialise.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -71,11 +71,11 @@ namespace fileOperations
         masterUncollatedFileOperation::maxMasterFileBufferSize
     );
 
-    // Mark as not needing threaded mpi
+    // Threaded MPI: not required
     addNamedToRunTimeSelectionTable
     (
         fileOperationInitialise,
-        masterUncollatedFileOperationInitialise,
+        fileOperationInitialise_unthreaded,
         word,
         masterUncollated
     );
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
index bd908cb8de..b705312b4f 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -66,8 +66,6 @@ Description
 #include "OSspecific.H"
 #include "HashPtrTable.H"
 #include "DynamicList.H"
-#include "List.H"
-#include "unthreadedInitialise.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -787,31 +785,6 @@ public:
 };
 
 
-/*---------------------------------------------------------------------------*\
-           Class masterUncollatedFileOperationInitialise Declaration
-\*---------------------------------------------------------------------------*/
-
-//! Internal class only
-class masterUncollatedFileOperationInitialise
-:
-    public unthreadedInitialise
-{
-public:
-
-    // Constructors
-
-        //- Construct from components
-        masterUncollatedFileOperationInitialise(int& argc, char**& argv)
-        :
-            unthreadedInitialise(argc, argv)
-        {}
-
-
-    //- Destructor
-    virtual ~masterUncollatedFileOperationInitialise() = default;
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fileOperations
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C
index ab7b28b175..e1541444bd 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.C
@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "hostUncollatedFileOperation.H"
+#include "fileOperationInitialise.H"
 #include "addToRunTimeSelectionTable.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
@@ -48,12 +49,11 @@ namespace fileOperations
         comm
     );
 
-    // Register initialisation routine. Signals need for threaded mpi and
-    // handles command line arguments
+    // Threaded MPI: not required
     addNamedToRunTimeSelectionTable
     (
         fileOperationInitialise,
-        hostUncollatedFileOperationInitialise,
+        fileOperationInitialise_unthreaded,
         word,
         hostUncollated
     );
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
index 6364eb853f..70b4f8949e 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/hostUncollatedFileOperation.H
@@ -94,31 +94,6 @@ public:
 };
 
 
-/*---------------------------------------------------------------------------*\
-            Class hostUncollatedFileOperationInitialise Declaration
-\*---------------------------------------------------------------------------*/
-
-//! Internal class only
-class hostUncollatedFileOperationInitialise
-:
-    public masterUncollatedFileOperationInitialise
-{
-public:
-
-    // Constructors
-
-        //- Construct from components
-        hostUncollatedFileOperationInitialise(int& argc, char**& argv)
-        :
-            masterUncollatedFileOperationInitialise(argc, argv)
-        {}
-
-
-    //- Destructor
-    virtual ~hostUncollatedFileOperationInitialise() = default;
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fileOperations
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 9f2420e453..01103eecee 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -27,12 +27,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "uncollatedFileOperation.H"
+#include "fileOperationInitialise.H"
 #include "Time.H"
 #include "Fstream.H"
 #include "addToRunTimeSelectionTable.H"
 #include "decomposedBlockData.H"
 #include "dummyISstream.H"
-#include "unthreadedInitialise.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
@@ -54,11 +54,11 @@ namespace fileOperations
         comm
     );
 
-    // Mark as not needing threaded mpi
+    // Threaded MPI: not required
     addNamedToRunTimeSelectionTable
     (
         fileOperationInitialise,
-        unthreadedInitialise,
+        fileOperationInitialise_unthreaded,
         word,
         uncollated
     );

From 4412566c586a5f077a3fa933f40808d8bea5ad06 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 15 Jun 2023 11:23:31 +0200
Subject: [PATCH 312/348] ENH: support command-line specification of MPI
 threads (#2791)

- MPI_THREAD_MULTIPLE is usually undesirable for performance reasons,
  but in some cases may be necessary if a linked library expects it.
  Provide a '-mpi-threads' option to explicitly request it.

ENH: consolidate some looping logic within argList
---
 applications/test/argList/Test-argList.C      |   5 +-
 .../test/parallel-comm0/Test-parallel-comm0.C |  17 +-
 .../test/parallel-comm2/Test-parallel-comm2.C |  17 +-
 .../Test-parallel-external-init.C             |  16 +-
 .../Test-processorTopology.C                  |  15 +-
 .../foamFormatConvert/foamFormatConvert.C     |   2 +-
 .../foamUpgradeCyclics/foamUpgradeCyclics.C   |   3 +-
 src/OpenFOAM/db/Time/TimeIO.C                 |  12 +-
 src/OpenFOAM/global/argList/argList.C         | 316 ++++++++++++------
 src/OpenFOAM/global/argList/argList.H         |  22 +-
 src/OpenFOAM/global/argList/argListHelp.C     |  10 +-
 src/OpenFOAM/global/argList/argListI.H        |  14 +-
 src/OpenFOAM/global/argList/parRun.H          | 134 +++++---
 src/Pstream/mpi/UPstream.C                    |  16 +-
 14 files changed, 366 insertions(+), 233 deletions(-)

diff --git a/applications/test/argList/Test-argList.C b/applications/test/argList/Test-argList.C
index 44edb17aad..fafa778517 100644
--- a/applications/test/argList/Test-argList.C
+++ b/applications/test/argList/Test-argList.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -124,6 +124,9 @@ int main(int argc, char *argv[])
     argList::addDryRunOption("Just for testing");
     argList::addVerboseOption("Increase verbosity");
 
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
+
     #include "setRootCase.H"
 
     Pout<< "command-line ("
diff --git a/applications/test/parallel-comm0/Test-parallel-comm0.C b/applications/test/parallel-comm0/Test-parallel-comm0.C
index 3abb70d6ba..5212eda189 100644
--- a/applications/test/parallel-comm0/Test-parallel-comm0.C
+++ b/applications/test/parallel-comm0/Test-parallel-comm0.C
@@ -42,6 +42,7 @@ Description
 
 using namespace Foam;
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void printInfo(const label comm)
 {
@@ -65,20 +66,10 @@ int main(int argc, char *argv[])
 {
     argList::noBanner();
     argList::noCheckProcessorDirectories();
-    argList::addBoolOption("verbose", "Set debug level");
-
-    // Capture manually. We need values before proper startup
-    int nVerbose = 0;
-    for (int argi = 1; argi < argc; ++argi)
-    {
-        if (strcmp(argv[argi], "-verbose") == 0)
-        {
-            ++nVerbose;
-        }
-    }
-
-    UPstream::debug = nVerbose;
+    argList::addVerboseOption("Set UPstream::debug level");
 
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
 
     #include "setRootCase.H"
 
diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index d38f35c1b3..5f9f575bf6 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -44,6 +44,8 @@ Description
 
 using namespace Foam;
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 void rankInfo(const label comm)
 {
     const int ranki = UPstream::myProcNo(comm);
@@ -63,7 +65,7 @@ int main(int argc, char *argv[])
 {
     argList::noBanner();
     argList::noCheckProcessorDirectories();
-    argList::addBoolOption("verbose", "Set debug level");
+    argList::addVerboseOption("Set UPstream::debug level");
     argList::addBoolOption("info", "information");
     argList::addBoolOption("print-tree", "Report tree(s) as graph");
     argList::addBoolOption("comm-split", "Test simple comm split");
@@ -71,17 +73,8 @@ int main(int argc, char *argv[])
     argList::addBoolOption("host-comm", "Test Pstream host-comm");
     argList::addBoolOption("host-broadcast", "Test host-base broadcasts");
 
-    // Capture manually. We need values before proper startup
-    int nVerbose = 0;
-    for (int argi = 1; argi < argc; ++argi)
-    {
-        if (strcmp(argv[argi], "-verbose") == 0)
-        {
-            ++nVerbose;
-        }
-    }
-
-    UPstream::debug = nVerbose;
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
 
     #include "setRootCase.H"
 
diff --git a/applications/test/parallel-external-init/Test-parallel-external-init.C b/applications/test/parallel-external-init/Test-parallel-external-init.C
index 362dc0b382..a838739ee1 100644
--- a/applications/test/parallel-external-init/Test-parallel-external-init.C
+++ b/applications/test/parallel-external-init/Test-parallel-external-init.C
@@ -44,6 +44,7 @@ Description
 
 using namespace Foam;
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 bool startMPI()
 {
@@ -121,19 +122,10 @@ int main(int argc, char *argv[])
 {
     argList::noBanner();
     argList::noCheckProcessorDirectories();
-    argList::addBoolOption("verbose", "Set debug level");
+    argList::addVerboseOption("Set UPstream::debug level");
 
-    // Need to capture manually, since we need values before proper startup
-    int nVerbose = 0;
-    for (int argi = 1; argi < argc; ++argi)
-    {
-        if (strcmp(argv[argi], "-verbose") == 0)
-        {
-            ++nVerbose;
-        }
-    }
-
-    UPstream::debug = nVerbose;
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
 
     startMPI();
 
diff --git a/applications/test/processorTopology/Test-processorTopology.C b/applications/test/processorTopology/Test-processorTopology.C
index 0150221d86..ffad839c58 100644
--- a/applications/test/processorTopology/Test-processorTopology.C
+++ b/applications/test/processorTopology/Test-processorTopology.C
@@ -43,24 +43,15 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noFunctionObjects();
-    argList::addBoolOption("verbose", "Set debug level");
+    argList::addVerboseOption("Set UPstream::debug level");
     argList::addBoolOption("comm-graph", "Test simple graph communicator");
     argList::addNote
     (
         "Create graph of OpenFOAM mesh connections"
     );
 
-    // Capture manually. We need values before proper startup
-    int nVerbose = 0;
-    for (int argi = 1; argi < argc; ++argi)
-    {
-        if (strcmp(argv[argi], "-verbose") == 0)
-        {
-            ++nVerbose;
-        }
-    }
-
-    UPstream::debug = nVerbose;
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
 
     #include "setRootCase.H"
 
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
index 443d4d32d8..760474570f 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
     // enable noConstant by switching
     if (!args.found("noConstant"))
     {
-        args.setOption("constant", "");
+        args.setOption("constant");
     }
     else
     {
diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
index f1c9fca80a..695e2a961e 100644
--- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
+++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
@@ -402,7 +402,6 @@ int main(int argc, char *argv[])
 
     timeSelector::addOptions();
 
-    argList::addOptionCompat("dry-run", {"test", 1806});
     argList::addDryRunOption
     (
         "Test only do not change any files"
@@ -425,7 +424,7 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    const bool dryrun = args.found("dry-run");
+    const bool dryrun = args.dryRun();
     if (dryrun)
     {
         Info<< "-dry-run option: no changes made" << nl << endl;
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 3a7fa55ae4..aff2757899 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -166,10 +166,13 @@ void Foam::Time::readDict()
         }
         controlDict_.watchIndices().clear();
 
-        // The new handler, create with some verbosity
+        // Reporting verbosity corresponding to detail level
+        const bool verbose = (::Foam::infoDetailLevel > 0);
+
+        // The new handler
         refPtr<fileOperation> newHandler
         (
-            fileOperation::New(fileHandlerName, true)
+            fileOperation::New(fileHandlerName, verbose)
         );
 
         // Install the new handler
@@ -206,6 +209,9 @@ void Foam::Time::readDict()
 
         IStringStream dummyIs("");
 
+        // Reporting verbosity corresponding to detail level
+        const bool verbose = (::Foam::infoDetailLevel > 0);
+
         forAllConstIters(objs, iter)
         {
             const List<simpleRegIOobject*>& objects = *iter;
@@ -214,7 +220,7 @@ void Foam::Time::readDict()
             {
                 obj->readData(dummyIs);
 
-                if (Foam::infoDetailLevel > 0)
+                if (verbose)
                 {
                     Info<< "    ";
                     obj->writeData(Info);
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index a19a57e842..6ded4cec85 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -54,6 +54,7 @@ License
 
 bool Foam::argList::argsMandatory_ = true;
 bool Foam::argList::checkProcessorDirectories_ = true;
+bool Foam::argList::parallelThreads_ = false;
 
 Foam::SLList<Foam::string>    Foam::argList::validArgs;
 Foam::HashSet<Foam::string>   Foam::argList::advancedOptions;
@@ -122,6 +123,14 @@ Foam::argList::initValidTables::initValidTables()
 
     argList::addBoolOption("parallel", "Run in parallel");
     validParOptions.set("parallel", "");
+
+    argList::addBoolOption
+    (
+        "mpi-threads",
+        "Request use of MPI threads",
+        true  //  advanced option
+    );
+
     argList::addOption
     (
         "roots",
@@ -401,7 +410,7 @@ void Foam::argList::addOption
 
 void Foam::argList::setAdvanced(const word& optName, bool advanced)
 {
-    if (advanced && validOptions.found(optName))
+    if (advanced && validOptions.contains(optName))
     {
         advancedOptions.set(optName);
     }
@@ -504,7 +513,13 @@ void Foam::argList::addDryRunOption
     bool advanced
 )
 {
-    argList::addBoolOption("dry-run", usage, advanced);
+    const word optName("dry-run", false);
+
+    argList::addBoolOption(optName, usage, advanced);
+    if (!advanced)
+    {
+        advancedOptions.erase(optName);  // Avoid 'stickiness'
+    }
 }
 
 
@@ -514,13 +529,24 @@ void Foam::argList::addVerboseOption
     bool advanced
 )
 {
+    const word optName("verbose", false);
+
     if (usage.empty())
     {
-        argList::addBoolOption("verbose", "Additional verbosity", advanced);
+        argList::addBoolOption
+        (
+            optName,
+            "Additional verbosity (can be used multiple times)",
+            advanced
+        );
     }
     else
     {
-        argList::addBoolOption("verbose", usage, advanced);
+        argList::addBoolOption(optName, usage, advanced);
+    }
+    if (!advanced)
+    {
+        advancedOptions.erase(optName);  // Avoid 'stickiness'
     }
 }
 
@@ -569,10 +595,17 @@ void Foam::argList::noParallel()
     removeOption("decomposeParDict");
     removeOption("hostRoots");
     removeOption("world");
+    removeOption("mpi-threads");
     validParOptions.clear();
 }
 
 
+void Foam::argList::parallelThreads_on()
+{
+    parallelThreads_ = true;
+}
+
+
 void Foam::argList::noCheckProcessorDirectories()
 {
     checkProcessorDirectories_ = false;
@@ -581,11 +614,18 @@ void Foam::argList::noCheckProcessorDirectories()
 
 bool Foam::argList::postProcess(int argc, char *argv[])
 {
-    for (int i=1; i<argc; ++i)
+    for (int argi = 1; argi < argc; ++argi)
     {
-        if (argv[i] == '-' + postProcessOptionName)
+        const char *optName = argv[argi];
+
+        if (optName[0] == '-')
         {
-            return true;
+            ++optName;  // Looks like an option, skip leading '-'
+
+            if (optName == postProcessOptionName)
+            {
+                return true;
+            }
         }
     }
 
@@ -593,6 +633,20 @@ bool Foam::argList::postProcess(int argc, char *argv[])
 }
 
 
+int Foam::argList::verbose(int argc, char *argv[])
+{
+    int num = 0;
+    for (int argi = 1; argi < argc; ++argi)
+    {
+        if (strcmp(argv[argi], "-verbose") == 0)
+        {
+            ++num;
+        }
+    }
+    return num;
+}
+
+
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 Foam::word Foam::argList::envExecutable()
@@ -694,6 +748,8 @@ int Foam::argList::optionIgnore(const word& optName)
         }
     }
 
+    // TBD: could ignore -verbose, -dry-run etc if they are not active...
+
     return 0; // Do not skip
 }
 
@@ -711,15 +767,19 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
     args_[0] = fileName(argv[0]);
     for (int argi = 1; argi < argc; ++argi)
     {
-        if (strcmp(argv[argi], "(") == 0)
+        const char *optName = argv[argi];
+
+        if (optName[0] == '(' && optName[1] == '\0')
         {
+            // Begin list
             ++depth;
             group += '(';
         }
-        else if (strcmp(argv[argi], ")") == 0)
+        else if (optName[0] == ')' && optName[1] == '\0')
         {
             if (depth)
             {
+                // End list
                 --depth;
                 group += ')';
                 if (!depth)
@@ -730,6 +790,7 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
             }
             else
             {
+                // A stray ')' - likely never happens
                 args_[nArgs++] = argv[argi];
             }
         }
@@ -740,12 +801,11 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
             group += argv[argi];
             group += '"';
         }
-        else if (argv[argi][0] == '-')
+        else if (optName[0] == '-')
         {
-            // Appears to be an option
-            const char *optName = &argv[argi][1];
+            ++optName;  // Looks like an option, skip leading '-'
 
-            if (validOptions.found(optName))
+            if (validOptions.contains(optName))
             {
                 // Known option name
                 args_[nArgs++] = argv[argi];
@@ -848,59 +908,117 @@ Foam::argList::argList
     bool initialise
 )
 :
+    runControl_(),
     args_(argc),
     options_(argc),
     libs_()
 {
-    // Check for -fileHandler, which requires an argument.
-    word handlerType;
-    for (int argi = argc-2; argi > 0; --argi)
-    {
-        if (argv[argi][0] == '-')
-        {
-            const char *optName = &argv[argi][1];
+    // Pre-scan for some options needed for initial setup:
+    //   -fileHandler (takes an argument)
+    //   -mpi-threads (bool option)
+    //
+    // Also handle -dry-run and -verbose counting
+    // (it is left to the application to decide what to do with them).
+    // Detect any parallel run options
 
-            if (strcmp(optName, "fileHandler") == 0)
-            {
-                handlerType = argv[argi+1];
-                break;
-            }
-        }
-    }
-    if (handlerType.empty())
+    word fileHandlerName;
+
+    if (parallelThreads_)
     {
-        handlerType = Foam::getEnv("FOAM_FILEHANDLER");
-        if (handlerType.empty())
-        {
-            handlerType = fileOperation::defaultFileHandler;
-        }
+        // Default -mpi-threads configured statically from application
+        runControl_.threads(true);
     }
 
-    // Detect any parallel options
-    const bool needsThread = fileOperations::fileOperationInitialise::New
-    (
-        handlerType,
-        argc,
-        argv
-    )().needsThreading();
-
-
-    // Check if this run is a parallel run by searching for any parallel option
-    // If found call runPar which might filter argv
     for (int argi = 1; argi < argc; ++argi)
     {
-        if (argv[argi][0] == '-')
-        {
-            const char *optName = &argv[argi][1];
+        const char *optName = argv[argi];
 
-            if (validParOptions.found(optName))
+        if (optName[0] == '-')
+        {
+            ++optName;  // Looks like an option, skip leading '-'
+            bool emitErrorMessage = false;
+
+            if (strcmp(optName, "dry-run") == 0)
             {
-                runControl_.runPar(argc, argv, needsThread);
-                break;
+                runControl_.incrDryRun();
+            }
+            else if (strcmp(optName, "verbose") == 0)
+            {
+                runControl_.incrVerbose();
+            }
+            else if (strcmp(optName, "mpi-threads") == 0)
+            {
+                runControl_.threads(true);
+            }
+            else if (strcmp(optName, "fileHandler") == 0)
+            {
+                // Requires a parameter
+                if (argi < argc-1)
+                {
+                    ++argi;
+                    fileHandlerName = argv[argi];
+                }
+                else
+                {
+                    emitErrorMessage = true;
+                }
+            }
+            else if (validParOptions.contains(optName))
+            {
+                // Contains a parallel run option
+                runControl_.parRun(true);
+            }
+
+            if (emitErrorMessage)
+            {
+                // Missing argument: emit message but not exit or
+                // FatalError since Pstream etc are not yet initialised
+
+                Info<< nl
+                    << "Error: option '-" << optName
+                    << "' requires an argument" << nl << nl;
+
+                //NO: UPstream::exit(1);  // works for serial and parallel
             }
         }
     }
 
+    // No -fileHandler specifed, get from environment or use default
+    if (fileHandlerName.empty())
+    {
+        fileHandlerName = Foam::getEnv("FOAM_FILEHANDLER");
+        if (fileHandlerName.empty())
+        {
+            fileHandlerName = fileOperation::defaultFileHandler;
+        }
+    }
+
+    // Parse out any additional fileHandler-specific options
+    // (may alter argv list). Recover its threading requirements
+    {
+        auto fileOperationInit = fileOperations::fileOperationInitialise::New
+        (
+            fileHandlerName,
+            argc,
+            argv
+        );
+
+        if (fileOperationInit && fileOperationInit->needsThreading())
+        {
+            runControl_.threads(true);
+        }
+    }
+
+    // Parallel job options detected?
+    // - start parallel run (possibly filters argv as a side-effect)
+    if (runControl_.parRun())
+    {
+        runControl_.runPar(argc, argv);
+    }
+
+
+    // ------------------------------------------------------------------------
+
     // Convert argv -> args_ and capture ( ... ) lists
     regroupArgv(argc, argv);
     commandLine_ += args_[0];
@@ -908,9 +1026,6 @@ Foam::argList::argList
     // Set executable name immediately - useful when emitting errors.
     executable_ = fileName(args_[0]).name();
 
-    // Count -dry-run and -verbose switches
-    int numDryRun = 0, numVerbose = 0;
-
     // Check arguments and options, argv[0] was already handled
     int nArgs = 1;
     for (int argi = 1; argi < args_.size(); ++argi)
@@ -918,9 +1033,11 @@ Foam::argList::argList
         commandLine_ += ' ';
         commandLine_ += args_[argi];
 
-        if (args_[argi][0] == '-')
+        const char *optName = args_[argi].data();
+
+        if (optName[0] == '-')
         {
-            const char *optName = &args_[argi][1];
+            ++optName;  // Looks like an option, skip leading '-'
 
             if (!*optName)
             {
@@ -949,7 +1066,7 @@ Foam::argList::argList
 
             if (wantArg)
             {
-                // Known option and expects a parameter
+                // Option expects a parameter
                 // - get it or emit a FatalError.
 
                 ++argi;
@@ -1019,18 +1136,11 @@ Foam::argList::argList
 
                 options_.insert(optName, "");
 
-                // Special increment handling for some known flags
-                if (wantArg.good())
-                {
-                    if (strcmp(optName, "dry-run") == 0)
-                    {
-                        ++numDryRun;
-                    }
-                    else if (strcmp(optName, "verbose") == 0)
-                    {
-                        ++numVerbose;
-                    }
-                }
+                // // Special increment handling for some known flags
+                // if (wantArg.good())
+                // {
+                //     ...
+                // }
             }
         }
         else
@@ -1043,10 +1153,6 @@ Foam::argList::argList
         }
     }
 
-    // Commit number of -dry-run and -verbose flag occurrences
-    runControl_.dryRun(numDryRun);
-    runControl_.verbose(numVerbose);
-
     args_.resize(nArgs);
 
     parse(checkArgs, checkOpts, initialise);
@@ -1093,42 +1199,42 @@ void Foam::argList::parse
         bool quickExit = false;
 
         // Display either application or source documentation, not both
-        if (options_.found("doc"))
+        if (options_.contains("doc"))
         {
             displayDoc(false);
             quickExit = true;
         }
-        else if (options_.found("doc-source"))
+        else if (options_.contains("doc-source"))
         {
             displayDoc(true);
             quickExit = true;
         }
 
         // Display either short or full help, not both
-        if (options_.found("help-full"))
+        if (options_.contains("help-full"))
         {
             printUsage(true);
             quickExit = true;
         }
-        else if (options_.found("help-notes"))
+        else if (options_.contains("help-notes"))
         {
             printNotes();
             Info<< nl;
             quickExit = true;
         }
-        else if (options_.found("help"))
+        else if (options_.contains("help"))
         {
             printUsage(false);
             quickExit = true;
         }
-        else if (options_.found("help-man"))
+        else if (options_.contains("help-man"))
         {
             printMan();
             quickExit = true;
         }
 
         // Allow independent display of compatibility information
-        if (options_.found("help-compat"))
+        if (options_.contains("help-compat"))
         {
             printCompat();
             quickExit = true;
@@ -1221,19 +1327,19 @@ void Foam::argList::parse
     // 5. '-fileHandler' commmand-line option
 
     {
-        word handlerType
+        word fileHandlerName
         (
             options_.lookup("fileHandler", Foam::getEnv("FOAM_FILEHANDLER"))
         );
 
-        if (handlerType.empty())
+        if (fileHandlerName.empty())
         {
-            handlerType = fileOperation::defaultFileHandler;
+            fileHandlerName = fileOperation::defaultFileHandler;
         }
 
         (void) fileOperation::fileHandler
         (
-            fileOperation::New(handlerType, bannerEnabled())
+            fileOperation::New(fileHandlerName, bannerEnabled())
         );
     }
 
@@ -1346,7 +1452,7 @@ void Foam::argList::parse
                     dictNProcs = roots.size()+1;
                 }
             }
-            else if (options_.found("hostRoots"))
+            else if (options_.contains("hostRoots"))
             {
                 source = "-hostRoots";
                 runControl_.distributed(true);
@@ -1546,7 +1652,7 @@ void Foam::argList::parse
                 }
 
                 // Distribute the master's argument list (with new root)
-                const bool hadCaseOpt = options_.found("case");
+                const bool hadCaseOpt = options_.contains("case");
                 for (const int subproci : Pstream::subProcs())
                 {
                     options_.set("case", roots[subproci-1]/globalCase_);
@@ -1841,15 +1947,15 @@ Foam::argList::~argList()
 
 bool Foam::argList::allowFunctionObjects() const
 {
-    if (validOptions.found("withFunctionObjects"))
+    if (validOptions.contains("withFunctionObjects"))
     {
         // '-withFunctionObjects' is available and explicitly enabled
-        return options_.found("withFunctionObjects");
+        return options_.contains("withFunctionObjects");
     }
-    else if (validOptions.found("noFunctionObjects"))
+    else if (validOptions.contains("noFunctionObjects"))
     {
         // '-noFunctionObjects' is available and not explicitly disabled
-        return !options_.found("noFunctionObjects");
+        return !options_.contains("noFunctionObjects");
     }
 
     // Disallow functions if there is no way to enable/disable them
@@ -1859,7 +1965,7 @@ bool Foam::argList::allowFunctionObjects() const
 
 bool Foam::argList::allowLibs() const
 {
-    return !options_.found("no-libs");
+    return !options_.contains("no-libs");
 }
 
 
@@ -1867,32 +1973,29 @@ bool Foam::argList::allowLibs() const
 
 Foam::label Foam::argList::count(const UList<word>& optionNames) const
 {
-    label n = 0;
+    label num = 0;
     for (const word& optName : optionNames)
     {
-        if (options_.found(optName))
+        if (options_.contains(optName))
         {
-            ++n;
+            ++num;
         }
     }
-    return n;
+    return num;
 }
 
 
-Foam::label Foam::argList::count
-(
-    std::initializer_list<word> optionNames
-) const
+Foam::label Foam::argList::count(std::initializer_list<word> optionNames) const
 {
-    label n = 0;
+    label num = 0;
     for (const word& optName : optionNames)
     {
-        if (options_.found(optName))
+        if (options_.contains(optName))
         {
-            ++n;
+            ++num;
         }
     }
-    return n;
+    return num;
 }
 
 
@@ -1912,7 +2015,9 @@ bool Foam::argList::setOption(const word& optName, const string& param)
         return false;
     }
 
-    if (options_.found(optName) ? (options_[optName] != param) : true)
+    const auto optIter = options_.cfind(optName);
+
+    if (!optIter.good() || (optIter.val() != param))
     {
         options_.set(optName, param);
         return true;
@@ -1930,7 +2035,6 @@ bool Foam::argList::unsetOption(const word& optName)
         optName == "case"
      || optName == "parallel"
      || optName == "roots"
-     || optName == "hostRoots"
     )
     {
         FatalErrorInFunction
@@ -2040,8 +2144,8 @@ bool Foam::argList::check(bool checkArgs, bool checkOpts) const
                 const word& optName = iter.key();
                 if
                 (
-                    !validOptions.found(optName)
-                 && !validParOptions.found(optName)
+                    !validOptions.contains(optName)
+                 && !validParOptions.contains(optName)
                 )
                 {
                     FatalError
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 8a101e8781..0b0efa5844 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -124,12 +124,15 @@ class argList
 {
     // Private Data
 
-        //- Track if command arguments are mandatory/optional
+        //- Command arguments are mandatory (default) or optional
         static bool argsMandatory_;
 
-        //- Track enabled/disabled checking of processor directories state
+        //- Check presence of processor directories (default: on)
         static bool checkProcessorDirectories_;
 
+        //- MPI threads are desired for the application (default: off)
+        static bool parallelThreads_;
+
         //- Switch on/off parallel mode, dry-run etc.
         //  Construct first so destructor is done last.
         ParRunControl runControl_;
@@ -645,11 +648,11 @@ public:
         //- Remove the parallel options
         static void noParallel();
 
-        //- Remove checking of processor directories
+        //- Disable checking of processor directories
         static void noCheckProcessorDirectories();
 
-        //- Return true if the post-processing option is specified
-        static bool postProcess(int argc, char *argv[]);
+        //- MPI threads are desired for the application
+        static void parallelThreads_on();
 
         //- Set option directly (use with caution)
         //  An option with an empty param is a bool option.
@@ -664,6 +667,15 @@ public:
         bool unsetOption(const word& optName);
 
 
+    // Helpers
+
+        //- True if the post-processing option is found in the \c argv list
+        static bool postProcess(int argc, char *argv[]);
+
+        //- The number of times -verbose is found in the \c argv list
+        static int verbose(int argc, char *argv[]);
+
+
     // Print
 
         //- Print option compatibility
diff --git a/src/OpenFOAM/global/argList/argListHelp.C b/src/OpenFOAM/global/argList/argListHelp.C
index 883fbebb93..042e429734 100644
--- a/src/OpenFOAM/global/argList/argListHelp.C
+++ b/src/OpenFOAM/global/argList/argListHelp.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,7 +102,7 @@ static void printManOption(const word& optName)
         argList::optionUsage.lookup(optName, string::null)
     );
 
-    if (argList::validParOptions.found(optName))
+    if (argList::validParOptions.contains(optName))
     {
         Info<< "\\fB[Parallel option]\\fR" << nl;
     }
@@ -314,7 +314,7 @@ void Foam::argList::printMan() const
     for (const word& optName : validOptions.sortedToc())
     {
         // Normal (non-advanced) options
-        if (!advancedOptions.found(optName))
+        if (!advancedOptions.contains(optName))
         {
             printManOption(optName);
         }
@@ -333,7 +333,7 @@ void Foam::argList::printMan() const
     for (const word& optName : validOptions.sortedToc())
     {
         // Advanced options
-        if (advancedOptions.found(optName))
+        if (advancedOptions.contains(optName))
         {
             printManOption(optName);
         }
@@ -418,7 +418,7 @@ void Foam::argList::printUsage(bool full) const
     for (const word& optName : validOptions.sortedToc())
     {
         // Suppress advanced options for regular -help.
-        if (full || !advancedOptions.found(optName))
+        if (full || !advancedOptions.contains(optName))
         {
             printOption(optName);
         }
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index e58279e41c..e5ef0046c6 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ inline void Foam::argList::readList(ITstream& is, List<T>& list)
     {
         // Single token - treat like List with one entry
         list.resize(1);
-        is >> list.first();
+        is >> list.front();
     }
     else
     {
@@ -177,7 +177,7 @@ Foam::argList::options() noexcept
 
 inline bool Foam::argList::found(const word& optName) const
 {
-    return options_.found(optName);
+    return options_.contains(optName);
 }
 
 
@@ -309,7 +309,7 @@ inline T Foam::argList::getOrDefault
     const T& deflt
 ) const
 {
-    if (found(optName))
+    if (options_.contains(optName))
     {
         return get<T>(optName);
     }
@@ -325,7 +325,7 @@ inline bool Foam::argList::readIfPresent
     T& val
 ) const
 {
-    if (found(optName))
+    if (options_.contains(optName))
     {
         val = get<T>(optName);
         return true;
@@ -376,7 +376,7 @@ inline Foam::List<T> Foam::argList::getList
 {
     List<T> list;
 
-    if (mandatory || found(optName))
+    if (mandatory || options_.contains(optName))
     {
         ITstream is(options_[optName]);
 
@@ -396,7 +396,7 @@ inline bool Foam::argList::readListIfPresent
     List<T>& list
 ) const
 {
-    if (found(optName))
+    if (options_.contains(optName))
     {
         ITstream is(options_[optName]);
 
diff --git a/src/OpenFOAM/global/argList/parRun.H b/src/OpenFOAM/global/argList/parRun.H
index 3610ab67c0..0b7d8e3412 100644
--- a/src/OpenFOAM/global/argList/parRun.H
+++ b/src/OpenFOAM/global/argList/parRun.H
@@ -37,10 +37,10 @@ Note
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef argListRunControl_H
-#define argListRunControl_H
+#ifndef Foam_argListRunControl_H
+#define Foam_argListRunControl_H
 
-#include "Pstream.H"
+#include "UPstream.H"
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,21 +54,38 @@ namespace Foam
 
 class ParRunControl
 {
-    int dryRun_;
-    int verbose_;
-    bool parallel_;
-    bool distributed_;
+    // Private Data
+
+        //- The dry-run level
+        int dryRun_;
+
+        //- The verbosity level
+        int verbose_;
+
+        //- True if this is (or will be) a parallel run
+        bool parallel_;
+
+        //- Uses distributed roots
+        bool distributed_;
+
+        //- MPI threads are desired
+        bool needsThread_;
+
 
 public:
 
-    //- Default construct
-    ParRunControl()
-    :
-        dryRun_(0),
-        verbose_(0),
-        parallel_(false),
-        distributed_(false)
-    {}
+    // Constructors
+
+        //- Default construct
+        ParRunControl() noexcept
+        :
+            dryRun_(0),
+            verbose_(0),
+            parallel_(false),
+            distributed_(false),
+            needsThread_(false)
+        {}
+
 
     //- Destructor. Shutdown (finalize) MPI as required
     ~ParRunControl()
@@ -81,27 +98,56 @@ public:
     }
 
 
-    // Parallel Control
+    // Member Functions - General Control
 
-        //- Initialize Pstream for a parallel run
-        void runPar(int& argc, char**& argv, bool needsThread)
+        //- Return the dry-run level (default: 0)
+        int dryRun() const noexcept { return dryRun_; }
+
+        //- Increase the dry-run level
+        void incrDryRun(int level = 1) noexcept { dryRun_ += level; }
+
+        //- Change dry-run level, returns old value
+        int dryRun(const int level) noexcept
         {
-            if (!UPstream::init(argc, argv, needsThread))
-            {
-                Info<< "Failed to start parallel run" << endl;
-                UPstream::exit(1);
-            }
-            parallel_ = true;
+            int old(dryRun_);
+            dryRun_ = level;
+            return old;
+        }
+
+        //- Return the verbosity level (default: 0)
+        int verbose() const noexcept { return verbose_; }
+
+        //- Increase the verbosity level
+        void incrVerbose(int level = 1) noexcept { verbose_ += level; }
+
+        //- Change verbosity level, returns old value
+        int verbose(const int level) noexcept
+        {
+            int old(verbose_);
+            verbose_ = level;
+            return old;
         }
 
 
-        //- True if this is a parallel run
+    // Member Functions - Parallel Control
+
+        //- True if this is (or will be) a parallel run
         bool parRun() const noexcept
         {
             return parallel_;
         }
 
-        //- True if this is a parallel run and uses distributed roots.
+        //- Set as parallel run on/off, return the previous value.
+        //  Use with \b extreme caution if runPar() has already been
+        //  called.
+        bool parRun(const bool on) noexcept
+        {
+            bool old(parallel_);
+            parallel_ = on;
+            return old;
+        }
+
+        //- True if a parallel run and uses distributed roots.
         bool distributed() const noexcept
         {
             return (parallel_ && distributed_);
@@ -113,35 +159,27 @@ public:
             distributed_ = (parallel_ && on);
         }
 
-
-    // General Control
-
-        //- Non-zero if set as 'dry-run'
-        int dryRun() const noexcept
+        //- True if MPI threads are desired (default: false)
+        bool threads() const noexcept
         {
-            return dryRun_;
+            return needsThread_;
         }
 
-        //- Change 'dry-run', return old value
-        int dryRun(const int level) noexcept
+        //- Set preference for use of MPI threads
+        void threads(bool on) noexcept
         {
-            int old(dryRun_);
-            dryRun_ = level;
-            return old;
+            needsThread_ = on;
         }
 
-        //- Non-zero if set as 'verbose'
-        int verbose() const noexcept
+        //- Initialize UPstream for a parallel run
+        void runPar(int& argc, char**& argv)
         {
-            return verbose_;
-        }
-
-        //- Change 'verbose', return old value
-        int verbose(const int level) noexcept
-        {
-            int old(verbose_);
-            verbose_ = level;
-            return old;
+            if (!UPstream::init(argc, argv, needsThread_))
+            {
+                Info<< "Failed to start parallel run" << endl;
+                UPstream::exit(1);
+            }
+            parallel_ = true;
         }
 };
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 1b982ca32a..0f22ca74c3 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -282,13 +282,17 @@ bool Foam::UPstream::init(int& argc, char**& argv, const bool needsThread)
     if (UPstream::debug)
     {
         Pout<< "UPstream::init :"
-            << " thread-support : wanted:" << needsThread
+            << " thread-support : requested:" << needsThread
             << " obtained:"
-            <<  (
-                    provided_thread_support == MPI_THREAD_MULTIPLE
-                  ? "MPI_THREAD_MULTIPLE"
-                  : "MPI_THREAD_SINGLE"
-                )
+            << (
+                   (provided_thread_support == MPI_THREAD_SINGLE)
+                 ? "SINGLE"
+                 : (provided_thread_support == MPI_THREAD_SERIALIZED)
+                 ? "SERIALIZED"
+                 : (provided_thread_support == MPI_THREAD_MULTIPLE)
+                 ? "MULTIPLE"
+                 : "other"
+               )
             << " procs:" << numprocs
             << " rank:" << myRank
             << " world:" << world << endl;

From f9d0895707ae78dc4d82183fe116f07edf74250b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 16 Jun 2023 17:50:12 +0200
Subject: [PATCH 313/348] ENH: avoid spurious library loading for decomposePar,
 redistributePar

- individual processor Time databases are purely for internal logistics
  and should not be introducing any new library symbols: these will
  already have been loaded in the outer loop.
---
 .../decomposePar/decomposePar.C               |  9 ++++---
 .../decomposePar/domainDecomposition.C        | 11 +++-----
 .../redistributePar/redistributePar.C         |  3 ++-
 .../faDecompose/faMeshDecomposition.C         | 26 +++++++++----------
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 3ab664458e..333e2901e9 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -724,7 +724,9 @@ int main(int argc, char *argv[])
                     (
                         Time::controlDictName,
                         args.rootPath(),
-                        args.caseName()/("processor" + Foam::name(proci))
+                        args.caseName()/("processor" + Foam::name(proci)),
+                        false,  // No function objects
+                        false   // No extra controlDict libs
                     );
                     // processorDb.setTime(runTime);
 
@@ -1247,8 +1249,9 @@ int main(int argc, char *argv[])
                         (
                             Time::controlDictName,
                             args.rootPath(),
-                            args.caseName()
-                          / ("processor" + Foam::name(proci))
+                            args.caseName()/("processor" + Foam::name(proci)),
+                            false,  // No function objects
+                            false   // No extra controlDict libs
                         );
 
                         processorDb.setTime(runTime);
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 5a72003470..b74b27975b 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -315,19 +315,14 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
 
         // Create processor mesh without a boundary
 
-        fileName processorCasePath
-        (
-            time().caseName()/("processor" + Foam::name(proci))
-        );
-
         // create a database
         Time processorDb
         (
             Time::controlDictName,
             time().rootPath(),
-            processorCasePath,
-            word("system"),
-            word("constant")
+            time().caseName()/("processor" + Foam::name(proci)),
+            false,  // No function objects
+            false   // No extra controlDict libs
         );
         processorDb.setTime(time());
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 24c95b6377..7aeee6df86 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -1245,7 +1245,8 @@ int main(int argc, char *argv[])
         runTime.globalCaseName(),
         runTime.system(),
         runTime.constant(),
-        false                   // enableFunctionObjects
+        false,  // No function objects
+        false   // No extra controlDict libs
     );
 
 
diff --git a/src/parallel/decompose/faDecompose/faMeshDecomposition.C b/src/parallel/decompose/faDecompose/faMeshDecomposition.C
index 3ab6a59f60..49518eb545 100644
--- a/src/parallel/decompose/faDecompose/faMeshDecomposition.C
+++ b/src/parallel/decompose/faDecompose/faMeshDecomposition.C
@@ -53,7 +53,9 @@ void Foam::faMeshDecomposition::distributeFaces()
         (
             Time::controlDictName,
             time().rootPath(),
-            time().caseName()/("processor" + Foam::name(proci))
+            time().caseName()/("processor" + Foam::name(proci)),
+            false,  // No function objects
+            false   // No extra controlDict libs
         );
 
         polyMesh procFvMesh
@@ -235,7 +237,9 @@ void Foam::faMeshDecomposition::decomposeMesh()
         (
             Time::controlDictName,
             time().rootPath(),
-            time().caseName()/("processor" + Foam::name(procI))
+            time().caseName()/("processor" + Foam::name(procI)),
+            false,  // No function objects
+            false   // No extra controlDict libs
         );
 
         polyMesh procFvMesh
@@ -1012,17 +1016,14 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
     for (label procI = 0; procI < nProcs(); procI++)
     {
-        fileName processorCasePath
-        (
-            time().caseName()/("processor" + Foam::name(procI))
-        );
-
         // create a database
         Time processorDb
         (
             Time::controlDictName,
             time().rootPath(),
-            processorCasePath
+            time().caseName()/("processor" + Foam::name(procI)),
+            false,  // No function objects
+            false   // No extra controlDict libs
         );
 
 
@@ -1134,17 +1135,14 @@ bool Foam::faMeshDecomposition::writeDecomposition()
     {
         // Create processor mesh without a boundary
 
-        fileName processorCasePath
-        (
-            time().caseName()/("processor" + Foam::name(procI))
-        );
-
         // create a database
         Time processorDb
         (
             Time::controlDictName,
             time().rootPath(),
-            processorCasePath
+            time().caseName()/("processor" + Foam::name(procI)),
+            false,  // No function objects
+            false   // No extra controlDict libs
         );
 
         // Read volume mesh

From 34f12219bdb2b7c54373a9232fea1387659f122d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 19 Jun 2023 16:51:43 +0200
Subject: [PATCH 314/348] ENH: base-level construct patch field with value

- more consistent with fvPatchField
---
 .../basic/fixedValue/fixedValuePointPatchField.C   | 12 ++++++++++++
 .../basic/fixedValue/fixedValuePointPatchField.H   |  8 ++++++++
 .../basic/value/valuePointPatchField.C             | 13 +++++++++++++
 .../basic/value/valuePointPatchField.H             |  8 ++++++++
 .../basic/fixedValue/fixedValueFaPatchField.C      | 12 ++++++++++++
 .../basic/fixedValue/fixedValueFaPatchField.H      |  8 ++++++++
 .../faPatchFields/faPatchField/faPatchField.C      | 14 ++++++++++++++
 .../faPatchFields/faPatchField/faPatchField.H      |  8 ++++++++
 .../basic/fixedValue/fixedValueFaePatchField.C     | 12 ++++++++++++
 .../basic/fixedValue/fixedValueFaePatchField.H     |  8 ++++++++
 .../faePatchFields/faePatchField/faePatchField.C   | 14 ++++++++++++++
 .../faePatchFields/faePatchField/faePatchField.H   |  8 ++++++++
 .../basic/fixedValue/fixedValueFvsPatchField.C     | 12 ++++++++++++
 .../basic/fixedValue/fixedValueFvsPatchField.H     |  9 ++++++++-
 .../fvsPatchFields/fvsPatchField/fvsPatchField.C   | 14 ++++++++++++++
 .../fvsPatchFields/fvsPatchField/fvsPatchField.H   |  8 ++++++++
 16 files changed, 167 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
index 3a7cbedfc0..686033987e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
@@ -42,6 +42,18 @@ Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
 {}
 
 
+template<class Type>
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
+(
+    const pointPatch& p,
+    const DimensionedField<Type, pointMesh>& iF,
+    const Type& value
+)
+:
+    valuePointPatchField<Type>(p, iF, value)
+{}
+
+
 template<class Type>
 Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index ff6437ae20..06203b7ad8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -69,6 +69,14 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fixedValuePointPatchField
+        (
+            const pointPatch&,
+            const DimensionedField<Type, pointMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and dictionary
         fixedValuePointPatchField
         (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index e7f1095996..a0e4ad4ee0 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -76,6 +76,19 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
 {}
 
 
+template<class Type>
+Foam::valuePointPatchField<Type>::valuePointPatchField
+(
+    const pointPatch& p,
+    const DimensionedField<Type, pointMesh>& iF,
+    const Type& value
+)
+:
+    pointPatchField<Type>(p, iF),
+    Field<Type>(p.size(), value)
+{}
+
+
 template<class Type>
 Foam::valuePointPatchField<Type>::valuePointPatchField
 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index c551a4ed93..cf04967233 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -96,6 +96,14 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        valuePointPatchField
+        (
+            const pointPatch&,
+            const DimensionedField<Type, pointMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and dictionary
         valuePointPatchField
         (
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
index 28c18cd859..718107a795 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
@@ -40,6 +40,18 @@ Foam::fixedValueFaPatchField<Type>::fixedValueFaPatchField
 {}
 
 
+template<class Type>
+Foam::fixedValueFaPatchField<Type>::fixedValueFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Type& value
+)
+:
+    faPatchField<Type>(p, iF, value)
+{}
+
+
 template<class Type>
 Foam::fixedValueFaPatchField<Type>::fixedValueFaPatchField
 (
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
index 399e628e44..f096315cee 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
@@ -72,6 +72,14 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fixedValueFaPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and dictionary
         fixedValueFaPatchField
         (
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index 6441d0a4fc..69bb63d39d 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -78,6 +78,20 @@ Foam::faPatchField<Type>::faPatchField
 {}
 
 
+template<class Type>
+Foam::faPatchField<Type>::faPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const Type& value
+)
+:
+    faPatchFieldBase(p),
+    Field<Type>(p.size(), value),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::faPatchField<Type>::faPatchField
 (
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index 93b73c61ff..2398f33d9f 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -337,6 +337,14 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        faPatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, areaMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and patch field
         faPatchField
         (
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
index d6e9b19c99..f836aea397 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
@@ -41,6 +41,18 @@ Foam::fixedValueFaePatchField<Type>::fixedValueFaePatchField
 {}
 
 
+template<class Type>
+Foam::fixedValueFaePatchField<Type>::fixedValueFaePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const Type& value
+)
+:
+    faePatchField<Type>(p, iF, value)
+{}
+
+
 template<class Type>
 Foam::fixedValueFaePatchField<Type>::fixedValueFaePatchField
 (
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
index 9892f9923c..7fca5c8086 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
@@ -72,6 +72,14 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fixedValueFaePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and dictionary
         fixedValueFaePatchField
         (
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
index b843d9fe41..3de23895c3 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.C
@@ -77,6 +77,20 @@ Foam::faePatchField<Type>::faePatchField
 {}
 
 
+template<class Type>
+Foam::faePatchField<Type>::faePatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, edgeMesh>& iF,
+    const Type& value
+)
+:
+    faePatchFieldBase(p),
+    Field<Type>(p.size(), value),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::faePatchField<Type>::faePatchField
 (
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
index b2fe67f877..0271bea5e5 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
@@ -299,6 +299,14 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        faePatchField
+        (
+            const faPatch&,
+            const DimensionedField<Type, edgeMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and patch field
         faePatchField
         (
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index d884e73356..e681852103 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -40,6 +40,18 @@ Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 {}
 
 
+template<class Type>
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const Type& value
+)
+:
+    fvsPatchField<Type>(p, iF, value)
+{}
+
+
 template<class Type>
 Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
 (
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index 5189bfd2a2..463444a94d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -53,7 +53,6 @@ class fixedValueFvsPatchField
 :
     public fvsPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -69,6 +68,14 @@ public:
             const DimensionedField<Type, surfaceMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fixedValueFvsPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and dictionary
         fixedValueFvsPatchField
         (
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 9154558752..b197203cb2 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -80,6 +80,20 @@ Foam::fvsPatchField<Type>::fvsPatchField
 {}
 
 
+template<class Type>
+Foam::fvsPatchField<Type>::fvsPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, surfaceMesh>& iF,
+    const Type& value
+)
+:
+    fvsPatchFieldBase(p),
+    Field<Type>(p.size(), value),
+    internalField_(iF)
+{}
+
+
 template<class Type>
 Foam::fvsPatchField<Type>::fvsPatchField
 (
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index 3d305997a5..c302023d45 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -293,6 +293,14 @@ public:
             const DimensionedField<Type, surfaceMesh>&
         );
 
+        //- Construct from patch, internal field and value
+        fvsPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, surfaceMesh>&,
+            const Type& value
+        );
+
         //- Construct from patch, internal field and patch field
         fvsPatchField
         (

From e54ead28e86f78c367f10fffc400d11bf483f92d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 19 Jun 2023 16:54:53 +0200
Subject: [PATCH 315/348] BUG: zeroFixedValue pointPatch not set correctly
 (fixes #2807)

---
 .../zeroFixedValuePointPatchField.C           | 52 +++++++------------
 .../zeroFixedValuePointPatchField.H           |  8 ++-
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
index 6b26992fbc..b29ccc1191 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,43 +28,35 @@ License
 
 #include "zeroFixedValuePointPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
-zeroFixedValuePointPatchField
+Foam::zeroFixedValuePointPatchField<Type>::zeroFixedValuePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF
 )
 :
-    fixedValuePointPatchField<Type>(p, iF)
+    // Field is zero
+    fixedValuePointPatchField<Type>(p, iF, Type(Zero))
 {}
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
-zeroFixedValuePointPatchField
+Foam::zeroFixedValuePointPatchField<Type>::zeroFixedValuePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
     const dictionary& dict
 )
 :
-    fixedValuePointPatchField<Type>(p, iF, dict, false)
-{
-    fixedValuePointPatchField<Type>::operator=(Type(Zero));
-}
+    // Field is zero
+    fixedValuePointPatchField<Type>(p, iF, Type(Zero))
+{}
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
-zeroFixedValuePointPatchField
+Foam::zeroFixedValuePointPatchField<Type>::zeroFixedValuePointPatchField
 (
     const zeroFixedValuePointPatchField<Type>& ptf,
     const pointPatch& p,
@@ -71,27 +64,26 @@ zeroFixedValuePointPatchField
     const pointPatchFieldMapper& mapper
 )
 :
-    fixedValuePointPatchField<Type>(ptf, p, iF, mapper)
-{
-    // For safety re-evaluate
-    fixedValuePointPatchField<Type>::operator=(Type(Zero));
-}
+    // Field is zero : no mapping needed
+    fixedValuePointPatchField<Type>(p, iF, Type(Zero))
+{}
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
-zeroFixedValuePointPatchField
+Foam::zeroFixedValuePointPatchField<Type>::zeroFixedValuePointPatchField
 (
     const zeroFixedValuePointPatchField<Type>& ptf
 )
 :
     fixedValuePointPatchField<Type>(ptf)
-{}
+{
+    // Field is zero. For safety, re-assign
+    valuePointPatchField<Type>::operator=(Type(Zero));
+}
 
 
 template<class Type>
-zeroFixedValuePointPatchField<Type>::
-zeroFixedValuePointPatchField
+Foam::zeroFixedValuePointPatchField<Type>::zeroFixedValuePointPatchField
 (
     const zeroFixedValuePointPatchField<Type>& ptf,
     const DimensionedField<Type, pointMesh>& iF
@@ -99,13 +91,9 @@ zeroFixedValuePointPatchField
 :
     fixedValuePointPatchField<Type>(ptf, iF)
 {
-    // For safety re-evaluate
-    fixedValuePointPatchField<Type>::operator=(Type(Zero));
+    // Field is zero. For safety, re-assign
+    valuePointPatchField<Type>::operator=(Type(Zero));
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
index 8b52d2d10e..41862edb7b 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef zeroFixedValuePointPatchField_H
-#define zeroFixedValuePointPatchField_H
+#ifndef Foam_zeroFixedValuePointPatchField_H
+#define Foam_zeroFixedValuePointPatchField_H
 
 #include "fixedValuePointPatchField.H"
 
@@ -53,7 +53,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-          Class zeroFixedValuePointPatchField Declaration
+                Class zeroFixedValuePointPatchField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -61,7 +61,6 @@ class zeroFixedValuePointPatchField
 :
     public fixedValuePointPatchField<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -135,7 +134,6 @@ public:
                 )
             );
         }
-
 };
 
 

From fc86e524513d9f99d882ba45e83bb1281ba29d20 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 16 Jun 2023 14:25:12 +0200
Subject: [PATCH 316/348] ENH: extrapolateInternal() method for patch fields

- provides a more succinct way of writing

      {fa,fv}PatchField<Type>::patchInternalField(*this)

  as well as a consistent naming that can be used for patches derived
  from valuePointPatchField

ENH: readGradientEntry helper method for fixedGradient conditions

- simplifies coding and logic.
- support different read construct modes for fixedGradient
---
 .../tractionDisplacementFvPatchVectorField.C  |  4 +-
 ...DisplacementCorrectionFvPatchVectorField.C |  4 +-
 .../fixedValuePointPatchFieldTemplate.C       |  4 +-
 .../fixedValuePointPatchFieldTemplate.H       |  4 +-
 .../basic/value/valuePointPatchField.C        | 17 +++++
 .../basic/value/valuePointPatchField.H        |  3 +
 ...entHeatFluxTemperatureFvPatchScalarField.C | 10 +--
 .../basic/calculated/calculatedFaPatchField.C |  4 +-
 .../basic/calculated/calculatedFaPatchField.H |  2 +-
 .../basic/coupled/coupledFaPatchField.C       |  4 +-
 .../basic/coupled/coupledFaPatchField.H       |  2 +-
 .../extrapolatedCalculatedFaPatchField.C      |  6 +-
 .../fixedGradient/fixedGradientFaPatchField.C | 75 +++++++++++++++----
 .../fixedGradient/fixedGradientFaPatchField.H | 54 +++++++++++--
 .../basic/fixedValue/fixedValueFaPatchField.C |  4 +-
 .../basic/fixedValue/fixedValueFaPatchField.H |  2 +-
 .../zeroGradient/zeroGradientFaPatchField.C   |  6 +-
 .../constraint/cyclic/cyclicFaPatchField.C    |  4 +-
 .../constraint/cyclic/cyclicFaPatchField.H    |  2 +-
 .../faPatchFields/faPatchField/faPatchField.C |  7 ++
 .../faPatchFields/faPatchField/faPatchField.H |  3 +
 .../calculated/calculatedFaePatchField.C      |  4 +-
 .../calculated/calculatedFaePatchField.H      |  2 +-
 .../basic/coupled/coupledFaePatchField.C      |  4 +-
 .../basic/coupled/coupledFaePatchField.H      |  2 +-
 .../fixedValue/fixedValueFaePatchField.C      |  4 +-
 .../fixedValue/fixedValueFaePatchField.H      |  2 +-
 .../exprFixedValueFvPatchField.C              |  2 +-
 .../exprFixedValueFvPatchField.H              |  2 +-
 .../extrapolatedCalculatedFvPatchField.C      |  6 +-
 .../fixedGradient/fixedGradientFvPatchField.C | 51 ++++++++++++-
 .../fixedGradient/fixedGradientFvPatchField.H | 25 +++++--
 .../zeroGradient/zeroGradientFvPatchField.C   |  7 +-
 .../fixedFluxPressureFvPatchScalarField.C     | 12 +--
 .../fvPatchFields/fvPatchField/fvPatchField.C |  7 ++
 .../fvPatchFields/fvPatchField/fvPatchField.H |  3 +
 ...fixedIncidentRadiationFvPatchScalarField.C | 11 +--
 .../sorptionWallFunctionFvPatchScalarField.C  | 11 +--
 ...haContactAngleTwoPhaseFvPatchScalarField.C |  9 +--
 39 files changed, 269 insertions(+), 116 deletions(-)

diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index 4db517c658..234dacdfda 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -47,7 +47,7 @@ tractionDisplacementFvPatchVectorField
     traction_(p.size(), Zero),
     pressure_(p.size(), Zero)
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 
@@ -79,7 +79,7 @@ tractionDisplacementFvPatchVectorField
     traction_("traction", dict, p.size()),
     pressure_("pressure", dict, p.size())
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index 20b3a8c8cf..040072da1b 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -47,7 +47,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     traction_(p.size(), Zero),
     pressure_(p.size(), Zero)
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 
@@ -79,7 +79,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     traction_("traction", dict, p.size()),
     pressure_("pressure", dict, p.size())
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 
diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C
index b69bcdf734..39006e5318 100644
--- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C
+++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C
@@ -125,10 +125,10 @@ ${typeName}FixedValuePointPatch${FieldType}
     const pointPatch& p,
     const DimensionedField<${TemplateType}, pointMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    parent_bctype(p, iF, dict, valueRequired)
+    parent_bctype(p, iF, dict, requireValue)
 {
     if (${verbose:-false})
     {
diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
index 85a9cf08fc..d46cd3e1a6 100644
--- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
@@ -89,8 +89,8 @@ public:
         (
             const pointPatch&,
             const DimensionedField<${TemplateType}, pointMesh>&,
-            const dictionary&,
-            const bool valueRequired=true
+            const dictionary& dict,
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping a copy onto a new patch
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index a0e4ad4ee0..9718da72b3 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -62,6 +62,23 @@ bool Foam::valuePointPatchField<Type>::readValueEntry
 }
 
 
+template<class Type>
+void Foam::valuePointPatchField<Type>::extrapolateInternal()
+{
+    const labelUList& meshPoints = pointPatchFieldBase::patch().meshPoints();
+
+    const Field<Type>& iF = this->primitiveField();
+    Field<Type>& pfld = *this;
+
+    pfld.resize_nocopy(meshPoints.size());  // In general this is a no-op
+
+    forAll(meshPoints, i)
+    {
+        pfld[i] = iF[meshPoints[i]];
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index cf04967233..15c6514696 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -74,6 +74,9 @@ protected:
             Field<Type>::writeEntry("value", os);
         }
 
+        //- Assign the patch field from the internal field
+        void extrapolateInternal();
+
 
 public:
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index d6563ca590..93561f57ec 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -106,15 +106,9 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     Cp0_(Function1<scalar>::New("Cp0", dict, &db())),
     q_(PatchFunction1<scalar>::New(p.patch(), "q", dict))
 {
-    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
-
-    if (hasGrad && this->readValueEntry(dict))
+    if (!this->readGradientEntry(dict) || !this->readValueEntry(dict))
     {
-        gradient().assign(*hasGrad, p.size());
-    }
-    else
-    {
-        fvPatchField<scalar>::patchInternalField(*this);
+        extrapolateInternal();
         gradient() = Zero;
     }
 }
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
index 4ea2400fef..4f8eefa33c 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C
@@ -48,10 +48,10 @@ Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    faPatchField<Type>(p, iF, dict, valueRequired)
+    faPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
index 4cda540f43..9f180b65f2 100644
--- a/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H
@@ -79,7 +79,7 @@ public:
             const DimensionedField<Type, areaMesh>&,
             const dictionary& dict,
             //! The "value" entry (default: optional)
-            IOobjectOption::readOption valueRequired = IOobjectOption::LAZY_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::LAZY_READ
         );
 
         //- Construct by mapping given patch field onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
index 321c607100..b0e5f2a93a 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.C
@@ -74,11 +74,11 @@ Foam::coupledFaPatchField<Type>::coupledFaPatchField
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     lduInterfaceField(refCast<const lduInterface>(p, dict)),
-    faPatchField<Type>(p, iF, dict, valueRequired)
+    faPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
index 57416d3c44..243016b805 100644
--- a/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
@@ -90,7 +90,7 @@ public:
             const DimensionedField<Type, areaMesh>&,
             const dictionary& dict,
             //! The "value" entry (default: mandatory)
-            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given coupledFaPatchField onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
index d605cd73db..f390d85116 100644
--- a/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.C
@@ -54,8 +54,7 @@ extrapolatedCalculatedFaPatchField
 :
     calculatedFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    // Set to the internal field
-    faPatchField<Type>::patchInternalField(*this);
+    faPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
 }
 
 
@@ -109,8 +108,7 @@ void Foam::extrapolatedCalculatedFaPatchField<Type>::evaluate
         this->updateCoeffs();
     }
 
-    // Set to the internal field
-    faPatchField<Type>::patchInternalField(*this);
+    faPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
     calculatedFaPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
index 88c2bde870..07a045ce06 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +29,39 @@ License
 #include "fixedGradientFaPatchField.H"
 #include "dictionary.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::fixedGradientFaPatchField<Type>::readGradientEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = faPatchFieldBase::patch();
+
+
+    const auto* eptr = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (eptr)
+    {
+        gradient_.assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'gradient' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -42,6 +76,32 @@ Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
 {}
 
 
+template<class Type>
+Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
+(
+    const faPatch& p,
+    const DimensionedField<Type, areaMesh>& iF,
+    const dictionary& dict,
+    IOobjectOption::readOption requireGrad
+)
+:
+    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
+    gradient_(p.size())
+{
+    if (readGradientEntry(dict, requireGrad))
+    {
+        evaluate();
+    }
+    else
+    {
+        // Not read (eg, optional and missing):
+        // - treat as zero-gradient, do not evaluate
+        faPatchField<Type>::extrapolateInternal();
+        gradient_ = Zero;
+    }
+}
+
+
 template<class Type>
 Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
 (
@@ -56,21 +116,6 @@ Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
 {}
 
 
-template<class Type>
-Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
-(
-    const faPatch& p,
-    const DimensionedField<Type, areaMesh>& iF,
-    const dictionary& dict
-)
-:
-    faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
-    gradient_("gradient", dict, p.size())
-{
-    evaluate();
-}
-
-
 template<class Type>
 Foam::fixedGradientFaPatchField<Type>::fixedGradientFaPatchField
 (
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
index 0c38a45a41..abedc11327 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +28,35 @@ Class
     Foam::fixedGradientFaPatchField
 
 Description
+    This boundary condition supplies a fixed gradient condition, such that
+    the patch values are calculated using:
+
+        \f[
+            x_p = x_c + \frac{\nabla(x)}{\Delta}
+        \f]
+
+    where
+    \vartable
+        x_p      | patch values
+        x_c      | internal field values
+        \nabla(x)| gradient (user-specified)
+        \Delta   | inverse distance from patch face centre to cell centre
+    \endvartable
+
+Usage
+    \table
+        Property     | Description             | Required    | Default value
+        gradient     | gradient                | yes         |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    <patchName>
+    {
+        type            fixedGradient;
+        gradient        uniform 0;
+    }
+    \endverbatim
 
 Author
     Zeljko Tukovic, FMENA
@@ -37,8 +67,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedGradientFaPatchField_H
-#define fixedGradientFaPatchField_H
+#ifndef Foam_fixedGradientFaPatchField_H
+#define Foam_fixedGradientFaPatchField_H
 
 #include "faPatchField.H"
 
@@ -56,10 +86,22 @@ class fixedGradientFaPatchField
 :
     public faPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         Field<Type> gradient_;
 
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "gradient" entry into corresponding member
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readGradientEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
 
 public:
 
@@ -76,12 +118,14 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct from patch, internal field and dictionary
+        //- Construct from patch, internal field and dictionary.
         fixedGradientFaPatchField
         (
             const faPatch&,
             const DimensionedField<Type, areaMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "gradient" entry (default: mandatory)
+            IOobjectOption::readOption requireGrad = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given fixedGradient patch field
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
index 718107a795..728fa8e89b 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.C
@@ -58,10 +58,10 @@ Foam::fixedValueFaPatchField<Type>::fixedValueFaPatchField
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    faPatchField<Type>(p, iF, dict, valueRequired)
+    faPatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
index f096315cee..b99f739ee9 100644
--- a/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H
@@ -87,7 +87,7 @@ public:
             const DimensionedField<Type, areaMesh>&,
             const dictionary&,
             //! The "value" entry (default: mandatory)
-            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given fixedValue patch field
diff --git a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
index edaa2ded0a..c6e04893bc 100644
--- a/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.C
@@ -64,8 +64,7 @@ Foam::zeroGradientFaPatchField<Type>::zeroGradientFaPatchField
 :
     faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    // Set to the internal field
-    faPatchField<Type>::patchInternalField(*this);
+    faPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
 }
 
 
@@ -100,8 +99,7 @@ void Foam::zeroGradientFaPatchField<Type>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    // Set to the internal field
-    faPatchField<Type>::patchInternalField(*this);
+    faPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
     faPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
index e27ad11d7a..8aa6296aa0 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
@@ -73,7 +73,7 @@ Foam::cyclicFaPatchField<Type>::cyclicFaPatchField
     const faPatch& p,
     const DimensionedField<Type, areaMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
     coupledFaPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
@@ -90,7 +90,7 @@ Foam::cyclicFaPatchField<Type>::cyclicFaPatchField
             << exit(FatalIOError);
     }
 
-    if (IOobjectOption::isReadRequired(valueRequired))
+    if (IOobjectOption::isReadRequired(requireValue))
     {
         this->evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
index b81064f795..359800d18c 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H
@@ -100,7 +100,7 @@ public:
             const DimensionedField<Type, areaMesh>&,
             const dictionary& dict,
             //! Evaluate (default: mandatory)
-            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping given cyclicFaPatchField onto a new patch
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
index 69bb63d39d..c1dfe10883 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.C
@@ -63,6 +63,13 @@ bool Foam::faPatchField<Type>::readValueEntry
 }
 
 
+template<class Type>
+void Foam::faPatchField<Type>::extrapolateInternal()
+{
+    faPatchFieldBase::patch().patchInternalField(internalField_, *this);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
index 2398f33d9f..35a6ef29e5 100644
--- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
@@ -273,6 +273,9 @@ protected:
             Field<Type>::writeEntry("value", os);
         }
 
+        //- Assign the patch field from the internal field
+        void extrapolateInternal();
+
 
 public:
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
index ab40effddc..5fc16ad869 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C
@@ -61,10 +61,10 @@ Foam::calculatedFaePatchField<Type>::calculatedFaePatchField
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    faePatchField<Type>(p, iF, dict, valueRequired)
+    faePatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
index f63080c194..723426ff2e 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H
@@ -79,7 +79,7 @@ public:
             const DimensionedField<Type, edgeMesh>&,
             const dictionary& dict,
             //! The "value" entry (default: mandatory)
-            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping given patch field onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
index 5cd1efeef7..200e7bce10 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.C
@@ -71,10 +71,10 @@ Foam::coupledFaePatchField<Type>::coupledFaePatchField
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    faePatchField<Type>(p, iF, dict, valueRequired)
+    faePatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
index f119f21e85..507cb9ad0f 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H
@@ -88,7 +88,7 @@ public:
             const DimensionedField<Type, edgeMesh>&,
             const dictionary& dict,
             //! The "value" entry (default: optional)
-            IOobjectOption::readOption valueRequired = IOobjectOption::LAZY_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::LAZY_READ
         );
 
         //- Construct by mapping the given coupledFaePatchField onto a new patch
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
index f836aea397..6d92628dda 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.C
@@ -59,10 +59,10 @@ Foam::fixedValueFaePatchField<Type>::fixedValueFaePatchField
     const faPatch& p,
     const DimensionedField<Type, edgeMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption valueRequired
+    IOobjectOption::readOption requireValue
 )
 :
-    faePatchField<Type>(p, iF, dict, valueRequired)
+    faePatchField<Type>(p, iF, dict, requireValue)
 {}
 
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
index 7fca5c8086..ae9585421c 100644
--- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
+++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H
@@ -87,7 +87,7 @@ public:
             const DimensionedField<Type, edgeMesh>&,
             const dictionary& dict,
             //! The "value" entry (default: mandatory)
-            IOobjectOption::readOption valueRequired = IOobjectOption::MUST_READ
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given fixedValue patch field
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
index fcf136ecbd..c3cf0df50c 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
@@ -82,7 +82,7 @@ Foam::exprFixedValueFvPatchField<Type>::exprFixedValueFvPatchField
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
     const dictionary& dict,
-    const bool valueRequired
+    IOobjectOption::readOption requireValue  // (ignored)
 )
 :
     parent_bctype(p, iF), // bypass dictionary constructor
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
index b4d375eefc..f922e6c6ac 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
@@ -110,7 +110,7 @@ public:
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
             const dictionary& dict,
-            const bool valueRequired=true
+            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping onto a new patch
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
index a1442f4e1a..cad4002f40 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C
@@ -54,8 +54,7 @@ extrapolatedCalculatedFvPatchField
 :
     calculatedFvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    // Set to the internal field
-    fvPatchField<Type>::patchInternalField(*this);
+    fvPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
 }
 
 
@@ -109,8 +108,7 @@ void Foam::extrapolatedCalculatedFvPatchField<Type>::evaluate
         this->updateCoeffs();
     }
 
-    // Set to the internal field
-    fvPatchField<Type>::patchInternalField(*this);
+    fvPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
     calculatedFvPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index 22af67b072..720315fd82 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +29,39 @@ License
 #include "fixedGradientFvPatchField.H"
 #include "dictionary.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::fixedGradientFvPatchField<Type>::readGradientEntry
+(
+    const dictionary& dict,
+    IOobjectOption::readOption readOpt
+)
+{
+    if (!IOobjectOption::isAnyRead(readOpt)) return false;
+    const auto& p = fvPatchFieldBase::patch();
+
+
+    const auto* eptr = dict.findEntry("gradient", keyType::LITERAL);
+
+    if (eptr)
+    {
+        gradient_.assign(*eptr, p.size());
+        return true;
+    }
+
+    if (IOobjectOption::isReadRequired(readOpt))
+    {
+        FatalIOErrorInFunction(dict)
+            << "Required entry 'gradient' : missing for patch " << p.name()
+            << " in dictionary " << dict.relativeName() << nl
+            << exit(FatalIOError);
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -47,13 +81,24 @@ Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    IOobjectOption::readOption requireGrad
 )
 :
     fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
-    gradient_("gradient", dict, p.size())
+    gradient_(p.size())
 {
-    evaluate();
+    if (readGradientEntry(dict, requireGrad))
+    {
+        evaluate();
+    }
+    else
+    {
+        // Not read (eg, optional and missing):
+        // - treat as zero-gradient, do not evaluate
+        fvPatchField<Type>::extrapolateInternal();
+        gradient_ = Zero;
+    }
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
index 9e44899544..5d10c6a2a9 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,8 +66,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedGradientFvPatchField_H
-#define fixedGradientFvPatchField_H
+#ifndef Foam_fixedGradientFvPatchField_H
+#define Foam_fixedGradientFvPatchField_H
 
 #include "fvPatchField.H"
 
@@ -84,10 +85,22 @@ class fixedGradientFvPatchField
 :
     public fvPatchField<Type>
 {
-    // Private data
+    // Private Data
 
         Field<Type> gradient_;
 
+protected:
+
+    // Protected Member Functions
+
+        //- Read the "gradient" entry into corresponding member
+        //  The reading can be optional (default), mandatory etc.
+        //  \returns True on success
+        bool readGradientEntry
+        (
+            const dictionary& dict,
+            IOobjectOption::readOption readOpt = IOobjectOption::LAZY_READ
+        );
 
 public:
 
@@ -104,12 +117,14 @@ public:
             const DimensionedField<Type, volMesh>&
         );
 
-        //- Construct from patch, internal field and dictionary
+        //- Construct from patch, internal field and dictionary.
         fixedGradientFvPatchField
         (
             const fvPatch&,
             const DimensionedField<Type, volMesh>&,
-            const dictionary&
+            const dictionary& dict,
+            //! The "gradient" entry (default: mandatory)
+            IOobjectOption::readOption requireGrad = IOobjectOption::MUST_READ
         );
 
         //- Construct by mapping the given fixedGradientFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index fd5dfca10d..65f532974f 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,8 +52,7 @@ Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
 :
     fvPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    // Set to the internal field
-    fvPatchField<Type>::patchInternalField(*this);
+    fvPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
 }
 
 
@@ -100,8 +100,7 @@ void Foam::zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    // Set to the internal field
-    fvPatchField<Type>::patchInternalField(*this);
+    fvPatchField<Type>::extrapolateInternal();  // Zero-gradient patch values
     fvPatchField<Type>::evaluate();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index 3187bf0a3b..86b218959d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -57,15 +57,9 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 {
     fvPatchFieldBase::readDict(dict);
 
-    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
-
-    if (hasGrad && this->readValueEntry(dict))
+    if (!this->readGradientEntry(dict) || !this->readValueEntry(dict))
     {
-        gradient().assign(*hasGrad, p.size());
-    }
-    else
-    {
-        fvPatchField<scalar>::patchInternalField(*this);
+        extrapolateInternal();
         gradient() = Zero;
     }
 }
@@ -85,7 +79,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     patchType() = ptf.patchType();
 
     // Map gradient. Set unmapped values and overwrite with mapped ptf
-    gradient() = 0.0;
+    gradient() = Zero;
     gradient().map(ptf.gradient(), mapper);
 
     // Evaluate the value field from the gradient if the internal field is valid
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index d0f5908b10..0590efeb01 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -65,6 +65,13 @@ bool Foam::fvPatchField<Type>::readValueEntry
 }
 
 
+template<class Type>
+void Foam::fvPatchField<Type>::extrapolateInternal()
+{
+    fvPatchFieldBase::patch().patchInternalField(internalField_, *this);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 1382ab356c..0bacf8304d 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -302,6 +302,9 @@ protected:
             Field<Type>::writeEntry("value", os);
         }
 
+        //- Assign the patch field from the internal field
+        void extrapolateInternal();
+
 
 public:
 
diff --git a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
index d74e60c07b..d005c768df 100644
--- a/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
@@ -77,16 +77,9 @@ fixedIncidentRadiationFvPatchScalarField
     temperatureCoupledBase(patch(), dict),
     qrIncident_("qrIncident", dict, p.size())
 {
-    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
-
-    if (hasGrad && this->readValueEntry(dict))
+    if (!this->readGradientEntry(dict) || !this->readValueEntry(dict))
     {
-        gradient().assign(*hasGrad, p.size());
-    }
-    else
-    {
-        // Still reading so cannot yet evaluate. Make up a value.
-        fvPatchField<scalar>::patchInternalField(*this);
+        extrapolateInternal();
         gradient() = Zero;
     }
 }
diff --git a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
index 3bf82af083..8e4a513a37 100644
--- a/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/wallFunctions/sorptionWallFunction/sorptionWallFunctionFvPatchScalarField.C
@@ -303,16 +303,9 @@ sorptionWallFunctionFvPatchScalarField::sorptionWallFunctionFvPatchScalarField
             << exit(FatalIOError);
     }
 
-    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
-
-    if (hasGrad && this->readValueEntry(dict))
+    if (!this->readGradientEntry(dict) || !this->readValueEntry(dict))
     {
-        gradient().assign(*hasGrad, p.size());
-    }
-    else
-    {
-        // Fallback: set to zero-gradient
-        fvPatchField<scalar>::patchInternalField(*this);
+        extrapolateInternal();
         gradient() = Zero;
     }
 }
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
index 216b17537c..5a13143fb0 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
@@ -70,18 +70,15 @@ alphaContactAngleTwoPhaseFvPatchScalarField
     fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
     limit_(limitControlNames_.get("limit", dict))
 {
-    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
-
-    if (hasGrad)
+    if (this->readGradientEntry(dict))
     {
-        gradient().assign(*hasGrad, p.size());
         fixedGradientFvPatchScalarField::updateCoeffs();
         fixedGradientFvPatchScalarField::evaluate();
     }
     else
     {
         // Fallback: set to zero-gradient
-        fvPatchField<scalar>::patchInternalField(*this);
+        extrapolateInternal();
         gradient() = Zero;
     }
 }
@@ -142,7 +139,7 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
     }
     else if (limit_ == lcZeroGradient)
     {
-        gradient() = 0.0;
+        gradient() = Zero;
     }
 
     fixedGradientFvPatchScalarField::evaluate();

From 97459771adaa7ab9e85808871b2277a980f86bb1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 16 Jun 2023 15:59:07 +0200
Subject: [PATCH 317/348] ENH: more consistent handling/documentation of
 'value' entry (#2703)

- for boundary conditions such as uniformFixed, uniformMixed etc the
  optional 'value' entry (optional) is used for the initial values and
  restarts.  Otherwise the various Function1 or PatchFunction1 entries
  are evaluated and used determine the boundary condition values.

  In most cases this is OK, but in some case such coded or expression
  entries with references to other fields it can be problematic since
  they may reference fields (eg, phi) that have not yet been created.

  For these cases the 'value' entry will be needed: documentation
  updated accordingly.

STYLE: eliminate some unneeded/unused declaration headers
---
 .../codedFixedValuePointPatchField.C          |  3 +
 .../codedFixedValuePointPatchField.H          |  3 +
 .../codedFixedValuePointPatchFields.C         | 20 +++----
 .../codedFixedValuePointPatchFields.H         | 51 ----------------
 ...VaryingUniformFixedValuePointPatchFields.C | 19 +++---
 ...VaryingUniformFixedValuePointPatchFields.H | 59 -------------------
 .../fixedShearStressFvPatchVectorField.C      |  2 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |  2 +-
 .../omegaWallFunctionFvPatchScalarField.C     |  4 +-
 .../freeSurfaceVelocityFvPatchVectorField.C   |  3 +-
 ...yMotionDisplacementPointPatchVectorField.C |  2 +-
 .../processor/processorFaPatchField.C         |  2 +-
 .../clampedPlate/clampedPlateFaPatchField.C   |  3 +-
 .../inletOutlet/inletOutletFaPatchField.C     |  7 +--
 .../inletOutlet/inletOutletFaPatchField.H     |  2 +-
 .../outletInlet/outletInletFaPatchField.C     | 10 ++--
 .../outletInlet/outletInletFaPatchField.H     |  3 +-
 ...timeVaryingUniformFixedValueFaPatchField.C |  3 +
 ...imeVaryingUniformFixedValueFaPatchFields.C | 15 ++---
 ...imeVaryingUniformFixedValueFaPatchFields.H | 51 ----------------
 .../uniformFixedGradientFaPatchField.C        |  9 ++-
 .../uniformFixedGradientFaPatchField.H        |  6 ++
 .../uniformFixedGradientFaPatchFields.C       |  3 +-
 .../uniformFixedGradientFaPatchFields.H       | 50 ----------------
 .../uniformFixedValueFaPatchField.C           |  4 ++
 .../uniformFixedValueFaPatchField.H           |  6 ++
 .../uniformFixedValueFaPatchFields.C          |  3 +-
 .../uniformFixedValueFaPatchFields.H          | 50 ----------------
 .../uniformMixed/uniformMixedFaPatchField.C   |  6 +-
 .../uniformMixed/uniformMixedFaPatchField.H   |  6 ++
 .../uniformMixed/uniformMixedFaPatchFields.C  |  3 +-
 .../uniformMixed/uniformMixedFaPatchFields.H  | 50 ----------------
 .../exprFixedValueFvPatchField.C              | 11 +---
 .../exprFixedValueFvPatchField.H              |  5 +-
 .../fvPatchFields/exprMixedFvPatchField.C     |  5 +-
 .../fvPatchFields/exprMixedFvPatchField.H     |  5 ++
 .../exprValuePointPatchField.C                | 19 +++---
 .../exprValuePointPatchField.H                |  5 +-
 .../exprValuePointPatchFields.C               | 20 +++----
 .../exprValuePointPatchFields.H               | 51 ----------------
 .../cyclicAMI/cyclicAMIFvPatchField.C         |  2 +-
 .../processor/processorFvPatchField.C         |  2 +-
 .../derived/advective/advectiveFvPatchField.C |  4 +-
 .../codedFixedValueFvPatchField.C             |  5 +-
 .../codedFixedValueFvPatchField.H             |  3 +
 .../codedFixedValueFvPatchFields.C            | 18 +++---
 .../codedFixedValueFvPatchFields.H            | 51 ----------------
 .../codedMixed/codedMixedFvPatchField.H       |  4 +-
 .../codedMixed/codedMixedFvPatchFields.C      | 18 +++---
 .../codedMixed/codedMixedFvPatchFields.H      | 51 ----------------
 ...lectrostaticDepositionFvPatchScalarField.C |  2 +-
 .../fluxCorrectedVelocityFvPatchVectorField.C |  7 +--
 .../inletOutlet/inletOutletFvPatchField.C     |  8 +--
 .../inletOutlet/inletOutletFvPatchField.H     |  4 +-
 .../outletInlet/outletInletFvPatchField.C     | 10 ++--
 .../outletInlet/outletInletFvPatchField.H     |  6 +-
 .../outletMappedUniformInletFvPatchField.C    |  4 +-
 ...utletPhaseMeanVelocityFvPatchVectorField.C |  4 +-
 .../supersonicFreestreamFvPatchVectorField.C  |  2 +-
 ...timeVaryingMappedFixedValueFvPatchFields.C | 15 ++---
 ...timeVaryingMappedFixedValueFvPatchFields.H | 51 ----------------
 .../turbulentInletFvPatchField.C              |  2 +-
 .../uniformFixedGradientFvPatchField.C        | 10 +++-
 .../uniformFixedGradientFvPatchField.H        |  6 ++
 .../uniformFixedGradientFvPatchFields.C       | 18 +++---
 .../uniformFixedGradientFvPatchFields.H       | 51 ----------------
 .../uniformFixedValueFvPatchField.C           |  4 ++
 .../uniformFixedValueFvPatchField.H           |  6 ++
 .../uniformFixedValueFvPatchFields.C          |  3 +-
 .../uniformFixedValueFvPatchFields.H          | 50 ----------------
 .../uniformMixed/uniformMixedFvPatchField.C   |  6 +-
 .../uniformMixed/uniformMixedFvPatchField.H   |  6 ++
 .../uniformMixed/uniformMixedFvPatchFields.C  |  3 +-
 .../uniformMixed/uniformMixedFvPatchFields.H  | 50 ----------------
 .../variableHeightFlowRateFvPatchField.C      |  2 +-
 .../fvPatchFields/fvPatchField/fvPatchField.C |  2 +-
 ...oupledTemperatureMixedFvPatchScalarField.C | 10 ++--
 ...meVaryingMappedFixedValuePointPatchField.C |  2 +-
 ...eVaryingMappedFixedValuePointPatchFields.C | 19 +++---
 ...eVaryingMappedFixedValuePointPatchFields.H | 59 -------------------
 .../uniformFixedValuePointPatchField.C        |  9 ++-
 .../uniformFixedValuePointPatchField.H        | 15 ++++-
 .../uniformFixedValuePointPatchFields.C       |  5 +-
 .../uniformFixedValuePointPatchFields.H       | 58 ------------------
 .../oversetPolyPatch/oversetFvPatchField.C    |  2 +-
 ...imeVaryingMassSorptionFvPatchScalarField.C |  2 +-
 ...veViewFactorFixedValueFvPatchScalarField.C |  2 +-
 .../alphaFixedPressureFvPatchScalarField.C    |  3 +-
 .../waveMakerPointPatchVectorField.C          |  2 +-
 89 files changed, 269 insertions(+), 990 deletions(-)
 delete mode 100644 src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.H
 delete mode 100644 src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H
 delete mode 100644 src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H
 delete mode 100644 src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H
 delete mode 100644 src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H
 delete mode 100644 src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H

diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
index 0defd8cd73..b289adb034 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@@ -188,6 +188,9 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
 
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
         // Evaluate to assign a value
         this->evaluate(Pstream::commsTypes::blocking);
     }
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index c398dc6131..438acf74ce 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
@@ -31,6 +31,9 @@ Description
     Constructs on-the-fly a new boundary condition (derived from
     fixedValuePointPatchField) which is then used to evaluate.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the code is executed.
+
     The code entries:
     \plaintable
        codeInclude | include files
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C
index 486d38dc8e..4b5b841ecd 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C
@@ -25,21 +25,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "codedFixedValuePointPatchFields.H"
-#include "pointPatchFields.H"
+#include "codedFixedValuePointPatchField.H"
 #include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "fieldTypes.H"
+#include "pointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePointPatchFields(codedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePointPatchFieldTypedefs(codedFixedValue);
+    makePointPatchFields(codedFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.H
deleted file mode 100644
index 01eb26d731..0000000000
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedFixedValuePointPatchFields_H
-#define codedFixedValuePointPatchFields_H
-
-#include "codedFixedValuePointPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePointPatchFieldTypedefs(codedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.C
index eb0a717429..d00560a32c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.C
@@ -25,21 +25,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeVaryingUniformFixedValuePointPatchFields.H"
-#include "pointPatchFields.H"
+#include "timeVaryingUniformFixedValuePointPatchField.H"
 #include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "pointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePointPatchFields(timeVaryingUniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePointPatchFieldTypedefs(timeVaryingUniformFixedValue);
+    makePointPatchFields(timeVaryingUniformFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.H b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.H
deleted file mode 100644
index 0a853e19ed..0000000000
--- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchFields.H
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-InClass
-    Foam::timeVaryingUniformFixedValuePointPatchFields
-
-Description
-
-SourceFiles
-    timeVaryingUniformFixedValuePointPatchFields.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef timeVaryingUniformFixedValuePointPatchFields_H
-#define timeVaryingUniformFixedValuePointPatchFields_H
-
-#include "timeVaryingUniformFixedValuePointPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePointPatchFieldTypedefs(timeVaryingUniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index da6fc26d91..6ab7e77e16 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -56,7 +56,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
     fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     tau0_(dict.getOrDefault<vector>("tau", Zero))
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    this->extrapolateInternal();  // Zero-gradient patch values
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index b4175b385b..61c67a8726 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -366,7 +366,7 @@ epsilonWallFunctionFvPatchScalarField
     cornerWeights_()
 {
     // Apply zero-gradient condition on start-up
-    fvPatchField<scalar>::patchInternalField(*this);
+    this->extrapolateInternal();
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index ec53d93776..7339e1bd88 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -358,8 +358,8 @@ Foam::omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     omega_(),
     cornerWeights_()
 {
-    // apply zero-gradient condition on start-up
-    fvPatchField<scalar>::patchInternalField(*this);
+    // Apply zero-gradient condition on start-up
+    this->extrapolateInternal();
 }
 
 
diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
index 2091fb1a56..64a3d3136a 100644
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
@@ -70,7 +70,8 @@ freeSurfaceVelocityFvPatchVectorField
     fixedGradientFvPatchVectorField(p, iF)
 {
     fvPatchFieldBase::readDict(dict);
-    fvPatchField<vector>::patchInternalField(*this);
+    // Apply zero-gradient condition on start-up
+    this->extrapolateInternal();
 }
 
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index e2c2ce7f8e..b2a84771c6 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -59,7 +59,7 @@ solidBodyMotionDisplacementPointPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchVectorField(p, iF, dict, false),
+    fixedValuePointPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
     SBMFPtr_(solidBodyMotionFunction::New(dict, this->db().time())),
     localPoints0Ptr_(nullptr)
 {
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index fe31f3761c..429fccf4f0 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -120,7 +120,7 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        faPatchField<Type>::patchInternalField(*this);
+        this->extrapolateInternal();  // Zero-gradient patch values
     }
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
index f7bf73b384..41f9a88f19 100644
--- a/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.C
@@ -58,8 +58,7 @@ clampedPlateFaPatchField<Type>::clampedPlateFaPatchField
 :
     faPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ)
 {
-    // Set to the internal field
-    faPatchField<Type>::patchInternalField(*this);
+    this->extrapolateInternal();  // Zero-gradient patch values
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
index cf626198f4..9e485dae5e 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.C
@@ -74,14 +74,13 @@ Foam::inletOutletFaPatchField<Type>::inletOutletFaPatchField
 {
     // Require inletValue (MUST_READ)
     this->refValue().assign("inletValue", dict, p.size());
+    this->refGrad() = Zero;
+    this->valueFraction() = 0;
 
     if (!this->readValueEntry(dict))
     {
-        faPatchField<Type>::operator=(this->refValue());
+        faPatchField<Type>::extrapolateInternal();
     }
-
-    this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H
index 85e2c34108..88abbde9c8 100644
--- a/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H
@@ -39,6 +39,7 @@ Usage
         Property     | Description             | Required    | Default value
         phi          | Flux field name         | no          | phi
         inletValue   | Inlet value for reverse flow | yes    |
+        value        | initial field value          | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -55,7 +56,6 @@ Usage
     The mode of operation is determined by the sign of the flux across the
     patch edges.
 
-
 Note
     Sign conventions:
     - Positive flux (out of domain): apply zero-gradient condition
diff --git a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C
index be919d76fb..8702efcc85 100644
--- a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.C
@@ -41,7 +41,7 @@ Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
 {
     this->refValue() = *this;
     this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
+    this->valueFraction() = 0;
 }
 
 
@@ -72,15 +72,15 @@ Foam::outletInletFaPatchField<Type>::outletInletFaPatchField
 {
     faPatchFieldBase::readDict(dict);
 
+    // Require outletValue (MUST_READ)
     this->refValue().assign("outletValue", dict, p.size());
+    this->refGrad() = Zero;
+    this->valueFraction() = 0;
 
     if (!this->readValueEntry(dict))
     {
-        faPatchField<Type>::operator=(this->refValue());
+        faPatchField<Type>::extrapolateInternal();
     }
-
-    this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H
index 47ba41fba7..3b9187c63b 100644
--- a/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H
@@ -38,6 +38,7 @@ Usage
         Property     | Description             | Required    | Default value
         phi          | Flux field name         | no          | phi
         outletValue  | Outlet value for reverse flow | yes   |
+        value        | initial field value     | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -92,7 +93,7 @@ protected:
 
     // Protected Data
 
-        //- Name of flux field
+        //- Name of flux field (default: phi)
         word phiName_;
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
index 3aeb93c440..2486bd621a 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.C
@@ -58,6 +58,9 @@ timeVaryingUniformFixedValueFaPatchField
 {
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
         updateCoeffs();
     }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
index fa19e8c9d8..b3894d4a8d 100644
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
@@ -26,21 +26,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeVaryingUniformFixedValueFaPatchFields.H"
+#include "timeVaryingUniformFixedValueFaPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "areaFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeFaPatchFields(timeVaryingUniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeFaPatchTypeFieldTypedefs(timeVaryingUniformFixedValue);
+    makeFaPatchFields(timeVaryingUniformFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H
deleted file mode 100644
index d99c594ba6..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2017 Wikki Ltd
-    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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_timeVaryingUniformFixedValueFaPatchFields_H
-#define Foam_timeVaryingUniformFixedValueFaPatchFields_H
-
-#include "timeVaryingUniformFixedValueFaPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeFaPatchTypeFieldTypedefs(timeVaryingUniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C
index f74667880c..650cdbef1a 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.C
@@ -73,7 +73,14 @@ Foam::uniformFixedGradientFaPatchField<Type>::uniformFixedGradientFaPatchField
         )
     )
 {
-    this->evaluate();
+    if (!this->readValueEntry(dict))
+    {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
+        this->evaluate();
+    }
 }
 
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H
index 52e0f026b6..7340d59a20 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H
@@ -36,6 +36,7 @@ Usage
     \table
         Property     | Description                  | Required | Default
         uniformGradient | uniform gradient          | yes |
+        value        | initial field value          | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -51,6 +52,11 @@ Note
     The uniformGradient entry is a Function1 type.
     The example above gives the usage for supplying a constant value.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the \c uniformGradient is used for the evaluation.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 See also
     Foam::Function1Types
     Foam::fixedGradientFaPatchField
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
index 2e6a854e5c..1e96ea8957 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformFixedGradientFaPatchFields.H"
+#include "uniformFixedGradientFaPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "areaFields.H"
 #include "edgeFields.H"
@@ -34,6 +34,7 @@ License
 
 namespace Foam
 {
+    makeFaPatchTypeFieldTypedefs(uniformFixedGradient);
     makeFaPatchFields(uniformFixedGradient);
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H
deleted file mode 100644
index 7e7a2973d6..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchFields.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2023 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_uniformFixedGradientFaPatchFields_H
-#define Foam_uniformFixedGradientFaPatchFields_H
-
-#include "uniformFixedGradientFaPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeFaPatchTypeFieldTypedefs(uniformFixedGradient);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
index 804b049a5f..b7cef206c5 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.C
@@ -75,6 +75,10 @@ Foam::uniformFixedValueFaPatchField<Type>::uniformFixedValueFaPatchField
 {
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
         this->evaluate();
     }
 }
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H
index 7761219779..4af170d7b8 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H
@@ -36,6 +36,7 @@ Usage
     \table
         Property     | Description                  | Required | Default
         uniformValue | uniform value                | yes |
+        value        | initial field value          | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -52,6 +53,11 @@ Note
     able to describe time varying functions.
     The example above gives the usage for supplying a constant value.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the \c uniformValue is evaluated.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 See also
     Foam::Function1Types
     Foam::fixedValueFaPatchField
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C
index 8bacac29af..aa666b756c 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.C
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformFixedValueFaPatchFields.H"
+#include "uniformFixedValueFaPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "areaFields.H"
 #include "edgeFields.H"
@@ -34,6 +34,7 @@ License
 
 namespace Foam
 {
+    makeFaPatchTypeFieldTypedefs(uniformFixedValue);
     makeFaPatchFields(uniformFixedValue);
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H
deleted file mode 100644
index a4cd5cf48f..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchFields.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2023 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_uniformFixedValueFaPatchFields_H
-#define Foam_uniformFixedValueFaPatchFields_H
-
-#include "uniformFixedValueFaPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeFaPatchTypeFieldTypedefs(uniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
index cf9c1dd88d..8f29c0f425 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.C
@@ -120,6 +120,10 @@ Foam::uniformMixedFaPatchField<Type>::uniformMixedFaPatchField
     // Use restart value if provided...
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
         this->evaluate();
     }
 }
@@ -240,7 +244,7 @@ void Foam::uniformMixedFaPatchField<Type>::write(Ostream& os) const
         valueFractionFunc_->writeData(os);
     }
 
-    // Eg, for visualisation
+    // For visualisation / restart
     faPatchField<Type>::writeValueEntry(os);
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H
index bd2819f6f4..620a16dbad 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H
@@ -41,6 +41,7 @@ Usage
         uniformValue | uniform value                    | partly | 0
         uniformGradient | uniform gradient              | partly | 0
         uniformValueFraction | uniform valueFraction    | partly | depends
+        value        | initial field value              | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -67,6 +68,11 @@ Note
     If both \c uniformValue and \c uniformGradient are defined,
     the \c uniformValueFraction must also be defined.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the function(s) are used for the evaluation.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 See also
     Foam::Function1Types
     Foam::mixedFaPatchField
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C
index d7f518c1a1..17c8df4ff6 100644
--- a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C
+++ b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.C
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformMixedFaPatchFields.H"
+#include "uniformMixedFaPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "areaFields.H"
 #include "edgeFields.H"
@@ -34,6 +34,7 @@ License
 
 namespace Foam
 {
+    makeFaPatchTypeFieldTypedefs(uniformMixed);
     makeFaPatchFields(uniformMixed);
 }
 
diff --git a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H b/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H
deleted file mode 100644
index 4f91619e41..0000000000
--- a/src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchFields.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2023 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_uniformMixedFaPatchFields_H
-#define Foam_uniformMixedFaPatchFields_H
-
-#include "uniformMixedFaPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makeFaPatchTypeFieldTypedefs(uniformMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
index c3cf0df50c..1616af6fbb 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.C
@@ -128,15 +128,10 @@ Foam::exprFixedValueFvPatchField<Type>::exprFixedValueFvPatchField
     // Since we bypassed dictionary constructor
     fvPatchFieldBase::readDict(dict);
 
-    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-    if (hasValue)
+    if (!this->readValueEntry(dict))
     {
-        Field<Type>::assign(*hasValue, p.size());
-    }
-    else
-    {
-        (*this) == this->patchInternalField();
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
 
         #ifdef FULLDEBUG
         WarningInFunction
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
index f922e6c6ac..69395b5c62 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
@@ -32,11 +32,14 @@ Description
 Usage
     \table
         Property     | Description                          | Required | Default
-        value        | fixed value                          | yes |
         valueExpr    | expression for uniformValue          | yes |
+        value        | initial field value                  | optional |
     \endtable
 
 Note
+    The \c value entry (optional) is used for the initial values.
+    Otherwise uses a zero-gradient condition for the initial value.
+
     This boundary condition is deprecated in favour of
     Foam::uniformFixedValueFvPatchField
     with expression entries.
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
index 80e4db62ba..8907e0141c 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
@@ -169,7 +169,6 @@ Foam::exprMixedFvPatchField<Type>::exprMixedFvPatchField
     // Since we bypassed dictionary constructor
     fvPatchFieldBase::readDict(dict);
 
-    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
     const auto* hasRefValue = dict.findEntry("refValue", keyType::LITERAL);
 
     const auto* hasRefGradient
@@ -184,10 +183,8 @@ Foam::exprMixedFvPatchField<Type>::exprMixedFvPatchField
         this->refValue().assign(*hasRefValue, p.size());
     }
 
-    if (hasValue)
+    if (this->readValueEntry(dict))
     {
-        Field<Type>::assign(*hasValue, p.size());
-
         if (!hasRefValue)
         {
             // Ensure refValue has a sensible value for the "update" below
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
index 437d0dc4c5..32bfa068db 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
@@ -35,9 +35,14 @@ Usage
         valueExpr    | expression for uniformValue          | partly  | 0
         gradientExpr | expression for uniformGradient       | partly  | 0
         fractionExpr | expression for valueFraction         | partly  | depends
+        value        | initial field value                  | optional |
     \endtable
 
 Note
+    The \c value entry (optional) is used for the initial values.
+    Otherwise uses some heuristics of other entries
+    (not properly documented now since this boundary condition is deprecated).
+
     This boundary condition is deprecated in favour of
     Foam::uniformMixedFvPatchField,
     Foam::uniformFixedValueFvPatchField,
diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
index 1fdce54c39..f3e64884e2 100644
--- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
+++ b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.C
@@ -115,6 +115,11 @@ Foam::exprValuePointPatchField<Type>::exprValuePointPatchField
         dict_
     )
 {
+    //FUTURE?
+    //DeprecatedInFunction(2212)
+    //    << "Use uniformFixedValue with an expression Function1 instead." << nl
+    //    << "    This boundary condition will be removed in the future" << endl;
+
     // Require valueExpr
     if (this->valueExpr_.empty())
     {
@@ -125,18 +130,10 @@ Foam::exprValuePointPatchField<Type>::exprValuePointPatchField
 
     driver_.readDict(dict_);
 
-    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
-
-    if (hasValue)
+    if (!this->readValueEntry(dict))
     {
-        Field<Type>::assign(*hasValue, p.size());
-    }
-    else
-    {
-        // Note: valuePointPatchField defaults to Zero
-        // but internalField might be better
-
-        Field<Type>::operator=(Zero);
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
     }
 
     if (this->evalOnConstruct_)
diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.H b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.H
index 0c286e2028..fa328a5428 100644
--- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.H
+++ b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchField.H
@@ -32,10 +32,13 @@ Description
 Usage
     \table
         Property     | Description                          | Required | Default
-        value        | fixed value                          | yes |
         valueExpr    | expression for uniformValue          | yes |
+        value        | initial field value                  | optional |
     \endtable
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise uses zero-gradient values.
+
 SourceFiles
     exprValuePointPatchField.C
 
diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.C b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.C
index e9cca570dd..068e427213 100644
--- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.C
+++ b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.C
@@ -25,21 +25,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "exprValuePointPatchFields.H"
-#include "pointPatchFields.H"
+#include "exprValuePointPatchField.H"
 #include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "fieldTypes.H"
+#include "pointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePointPatchFields(exprValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePointPatchFieldTypedefs(exprValue);
+    makePointPatchFields(exprValue);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.H b/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.H
deleted file mode 100644
index b0035fcac8..0000000000
--- a/src/finiteVolume/expressions/fields/pointPatchFields/exprValuePointPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprValuePointPatchFields_H
-#define exprValuePointPatchFields_H
-
-#include "exprValuePointPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePointPatchFieldTypedefs(exprValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index e2ba9698b8..ae2ed8a07a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -77,7 +77,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
         }
         else
         {
-            fvPatchField<Type>::patchInternalField(*this);
+            this->extrapolateInternal();  // Zero-gradient patch values
         }
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 19da597026..a4c1e57ea7 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -89,7 +89,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 47285e9e8f..250b46a0ea 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -91,12 +91,12 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::patchInternalField(*this);
+        this->extrapolateInternal();  // Zero-gradient patch values
     }
 
     this->refValue() = *this;
     this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
+    this->valueFraction() = 0;
 
     if (dict.readIfPresent("lInf", lInf_))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 1eb6787657..fad36642e6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -188,9 +188,10 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
 
     if (!this->readValueEntry(dict))
     {
-        // Assign dummy value to get redirectPatchField not fail
-        fvPatchField<Type>::patchInternalField(*this);
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
 
+        // Evaluate to assign a value
         this->evaluate(Pstream::commsTypes::blocking);
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
index 4daf935f7a..0c747c5cb8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
@@ -34,6 +34,9 @@ Description
     Constructs on-the-fly a new boundary condition (derived from
     fixedValueFvPatchField) which is then used to evaluate.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the code is executed.
+
     The code entries:
     \plaintable
        codeInclude | include files
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C
index ff73d00582..9cef5b1e59 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C
@@ -25,21 +25,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "codedFixedValueFvPatchFields.H"
+#include "codedFixedValueFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
+#include "fieldTypes.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(codedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeFieldTypedefs(codedFixedValue);
+    makePatchFields(codedFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.H
deleted file mode 100644
index e50357bd1d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedFixedValueFvPatchFields_H
-#define codedFixedValueFvPatchFields_H
-
-#include "codedFixedValueFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(codedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
index 89bbc2320d..821b473d23 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
@@ -107,8 +107,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef codedMixedFvPatchField_H
-#define codedMixedFvPatchField_H
+#ifndef Foam_codedMixedFvPatchField_H
+#define Foam_codedMixedFvPatchField_H
 
 #include "mixedFvPatchFields.H"
 #include "codedBase.H"
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C
index 701cbc491e..675fe1ea22 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C
@@ -25,21 +25,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "codedMixedFvPatchFields.H"
+#include "codedMixedFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
+#include "fieldTypes.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(codedMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeFieldTypedefs(codedMixed);
+    makePatchFields(codedMixed);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.H
deleted file mode 100644
index 6b6f74088d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedMixedFvPatchFields_H
-#define codedMixedFvPatchFields_H
-
-#include "codedMixedFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(codedMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
index 7ee4400f50..2ffd8892c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C
@@ -208,7 +208,7 @@ electrostaticDepositionFvPatchScalarField
 {
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<scalar>::patchInternalField(*this);
+        this->extrapolateInternal();  // Zero-gradient patch values
     }
 
     // If flow is multiphase
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index 820552d8b8..72a2dab920 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -70,13 +70,10 @@ fluxCorrectedVelocityFvPatchVectorField
     const dictionary& dict
 )
 :
-    zeroGradientFvPatchVectorField(p, iF),
+    zeroGradientFvPatchVectorField(p, iF, dict),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho"))
-{
-    fvPatchFieldBase::readDict(dict);
-    fvPatchField<vector>::patchInternalField(*this);
-}
+{}
 
 
 Foam::fluxCorrectedVelocityFvPatchVectorField::
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index c926569410..202c391118 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -73,15 +73,15 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 {
     fvPatchFieldBase::readDict(dict);
 
+    // Require inletValue (MUST_READ)
     this->refValue().assign("inletValue", dict, p.size());
+    this->refGrad() = Zero;
+    this->valueFraction() = 0;
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::operator=(this->refValue());
+        fvPatchField<Type>::extrapolateInternal();
     }
-
-    this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
index ac1e29355b..fbf117c729 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H
@@ -38,6 +38,7 @@ Usage
         Property     | Description             | Required    | Default value
         phi          | Flux field name         | no          | phi
         inletValue   | Inlet value for reverse flow | yes    |
+        value        | initial field value          | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -88,10 +89,9 @@ class inletOutletFvPatchField
 :
     public mixedFvPatchField<Type>
 {
-
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Name of flux field
         word phiName_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 37455d8f86..a111bb8f48 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -42,7 +42,7 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 {
     this->refValue() = *this;
     this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
+    this->valueFraction() = 0;
 }
 
 
@@ -73,15 +73,15 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 {
     fvPatchFieldBase::readDict(dict);
 
+    // Require outletValue (MUST_READ)
     this->refValue().assign("outletValue", dict, p.size());
+    this->refGrad() = Zero;
+    this->valueFraction() = 0;
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::operator=(this->refValue());
+        fvPatchField<Type>::extrapolateInternal();
     }
-
-    this->refGrad() = Zero;
-    this->valueFraction() = 0.0;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
index 1d192b571b..1f7e51e3c8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H
@@ -38,6 +38,7 @@ Usage
         Property     | Description             | Required    | Default value
         phi          | Flux field name         | no          | phi
         outletValue  | Outlet value for reverse flow | yes   |
+        value        | initial field value     | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -88,12 +89,11 @@ class outletInletFvPatchField
 :
     public mixedFvPatchField<Type>
 {
-
 protected:
 
-    // Protected data
+    // Protected Data
 
-        //- Name of flux field
+        //- Name of flux field (default: phi)
         word phiName_;
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 9c3ac4ac2e..72ae806e5a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -171,7 +171,7 @@ outletMappedUniformInletFvPatchField
     if (!this->readValueEntry(dict))
     {
         // Fallback: set to the internal field
-        fvPatchField<Type>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 }
 
@@ -205,7 +205,7 @@ outletMappedUniformInletFvPatchField
     else
     {
         // Fallback: set to the internal field
-        fvPatchField<Type>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index 4f9e0f9036..6d90bf382b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -82,11 +82,11 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
 
     refValue() = Zero;
     refGrad() = Zero;
-    valueFraction() = 0.0;
+    valueFraction() = 0;
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<vector>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 4962f0bf82..82e5da352f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -76,7 +76,7 @@ supersonicFreestreamFvPatchVectorField
 
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<vector>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 
     refValue() = *this;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.C
index dece9ac093..0118c3d73a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.C
@@ -25,21 +25,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeVaryingMappedFixedValueFvPatchFields.H"
+#include "timeVaryingMappedFixedValueFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(timeVaryingMappedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makePatchTypeFieldTypedefs(timeVaryingMappedFixedValue);
+    makePatchFields(timeVaryingMappedFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.H
deleted file mode 100644
index a25c560f9d..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef timeVaryingMappedFixedValueFvPatchFields_H
-#define timeVaryingMappedFixedValueFvPatchFields_H
-
-#include "timeVaryingMappedFixedValueFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(timeVaryingMappedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 1e4b44e756..09ffae29c7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -62,7 +62,7 @@ Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
 {
     if (!this->readValueEntry(dict))
     {
-        fixedValueFvPatchField<Type>::operator==(referenceField_);
+        fvPatchField<Type>::operator=(referenceField_);
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index d265cadd19..6908ce378d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -70,7 +70,15 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
     )
 {
     fvPatchFieldBase::readDict(dict);
-    this->evaluate();
+
+    if (!this->readValueEntry(dict))
+    {
+        // Ensure field has initialised values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
+        this->evaluate();
+    }
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index 34bdbb50a0..8b0cb4129b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -37,6 +37,7 @@ Usage
     \table
         Property     | Description                  | Required | Default
         uniformGradient | uniform gradient          | yes |
+        value        | initial field value          | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -53,6 +54,11 @@ Note
     able to describe time and spatial varying functions.
     The example above gives the usage for supplying a constant value.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the \c uniformGradient is used for the evaluation.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 See also
     Foam::Function1Types
     Foam::fixedGradientFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.C
index a8f054cb16..9de644cc31 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.C
@@ -25,21 +25,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformFixedGradientFvPatchFields.H"
+#include "uniformFixedGradientFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
+#include "fieldTypes.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePatchFields(uniformFixedGradient);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeFieldTypedefs(uniformFixedGradient);
+    makePatchFields(uniformFixedGradient);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.H
deleted file mode 100644
index fd835e1462..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef uniformFixedGradientFvPatchFields_H
-#define uniformFixedGradientFvPatchFields_H
-
-#include "uniformFixedGradientFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(uniformFixedGradient);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index 4e876b1a07..2ad1312c4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -68,6 +68,10 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 {
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
         this->evaluate();
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index fa5f8a3442..68e8e90021 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -37,6 +37,7 @@ Usage
     \table
         Property     | Description                  | Required | Default
         uniformValue | uniform value                | yes |
+        value        | initial field value          | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -53,6 +54,11 @@ Note
     able to describe time and spatial varying functions.
     The example above gives the usage for supplying a constant value.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the \c uniformValue is evaluated.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 See also
     Foam::Function1Types
     Foam::fixedValueFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C
index 10bb316d17..179ab87e23 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.C
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformFixedValueFvPatchFields.H"
+#include "uniformFixedValueFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
@@ -33,6 +33,7 @@ License
 
 namespace Foam
 {
+    makePatchTypeFieldTypedefs(uniformFixedValue);
     makePatchFields(uniformFixedValue);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H
deleted file mode 100644
index 761395c42e..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_uniformFixedValueFvPatchFields_H
-#define Foam_uniformFixedValueFvPatchFields_H
-
-#include "uniformFixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(uniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
index ca2817148a..9d017c0a14 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.C
@@ -110,6 +110,10 @@ Foam::uniformMixedFvPatchField<Type>::uniformMixedFvPatchField
     // Use restart value if provided...
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
         this->evaluate();
     }
 }
@@ -230,7 +234,7 @@ void Foam::uniformMixedFvPatchField<Type>::write(Ostream& os) const
         valueFractionFunc_->writeData(os);
     }
 
-    // Eg, for visualisation
+    // For visualisation / restart
     fvPatchField<Type>::writeValueEntry(os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H
index ccaa055b31..9d1bdd8954 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchField.H
@@ -44,6 +44,7 @@ Usage
         uniformValue | uniform value                    | partly | 0
         uniformGradient | uniform gradient              | partly | 0
         uniformValueFraction | uniform valueFraction    | partly | depends
+        value        | initial field value              | optional |
     \endtable
 
     Example of the boundary condition specification:
@@ -70,6 +71,11 @@ Note
     If both \c uniformValue and \c uniformGradient are defined,
     the \c uniformValueFraction must also be defined.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the function(s) are used for the evaluation.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 See also
     Foam::Function1Types
     Foam::mixedFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C
index e307da0c65..0f0ea8e0c3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.C
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformMixedFvPatchFields.H"
+#include "uniformMixedFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volFields.H"
 
@@ -33,6 +33,7 @@ License
 
 namespace Foam
 {
+    makePatchTypeFieldTypedefs(uniformMixed);
     makePatchFields(uniformMixed);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H
deleted file mode 100644
index 25eac16d84..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformMixed/uniformMixedFvPatchFields.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2023 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_uniformMixedFvPatchFields_H
-#define Foam_uniformMixedFvPatchFields_H
-
-#include "uniformMixedFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(uniformMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index a569a669dc..d75750e956 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -86,7 +86,7 @@ Foam::variableHeightFlowRateFvPatchScalarField
     if (!this->readValueEntry(dict))
     {
         // Fallback: set to the internal field
-        fvPatchField<scalar>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 
     this->refValue() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 0590efeb01..ada91e0d51 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -176,7 +176,7 @@ Foam::fvPatchField<Type>::fvPatchField
     // For unmapped faces set to internal field value (zero-gradient)
     if (notNull(iF) && mapper.hasUnmapped())
     {
-        fvPatchField<Type>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
     this->map(ptf, mapper);
 }
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index 7dad174696..a872e8724b 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -160,7 +160,7 @@ externalCoupledTemperatureMixedFvPatchScalarField
         // or extrapolated value
         if (!this->readValueEntry(dict))
         {
-            fvPatchField<scalar>::patchInternalField(*this);
+            fvPatchField<scalar>::extrapolateInternal();
         }
 
         // Initialise as a fixed value
@@ -254,7 +254,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
     const scalarField& Twall = *this;
 
     // Fluid temperature [K]
-    tmp<scalarField> tfluid;
+    scalarField Tfluid(size());
 
     if (refTempType_ == refTemperatureType::USER)
     {
@@ -262,16 +262,14 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
         const scalar currTref =
             Tref_->value(this->db().time().timeOutputValue());
 
-        tfluid = tmp<scalarField>::New(size(), currTref);
+        Tfluid = currTref;
     }
     else
     {
         // Near wall cell temperature
-        tfluid = patchInternalField();
+        this->patchInternalField(Tfluid);
     }
 
-    const scalarField Tfluid(tfluid);
-
     // Heat transfer coefficient [W/m2/K]
     // This htc needs to be always larger or equal to zero
     //const scalarField htc(qDot/max(Twall - Tfluid, 1e-3));
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index c9618353cc..e2475907e1 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -64,7 +64,7 @@ timeVaryingMappedFixedValuePointPatchField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchField<Type>(p, iF, dict, false),
+    fixedValuePointPatchField<Type>(p, iF, dict, IOobjectOption::NO_READ),
     setAverage_(dict.getOrDefault("setAverage", false)),
     perturb_(dict.getOrDefault("perturb", 1e-5)),
     fieldTableName_(iF.name()),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
index 3eb48c72dc..223b099c36 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
@@ -25,21 +25,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeVaryingMappedFixedValuePointPatchFields.H"
-#include "pointPatchFields.H"
+#include "timeVaryingMappedFixedValuePointPatchField.H"
 #include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "pointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-makePointPatchFields(timeVaryingMappedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePointPatchFieldTypedefs(timeVaryingMappedFixedValue);
+    makePointPatchFields(timeVaryingMappedFixedValue);
+}
 
 // ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H
deleted file mode 100644
index 00d45b81e6..0000000000
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2012 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/>.
-
-InClass
-    Foam::timeVaryingMappedFixedValuePointPatchFields
-
-Description
-
-SourceFiles
-    timeVaryingMappedFixedValuePointPatchFields.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef timeVaryingMappedFixedValuePointPatchFields_H
-#define timeVaryingMappedFixedValuePointPatchFields_H
-
-#include "timeVaryingMappedFixedValuePointPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePointPatchFieldTypedefs(timeVaryingMappedFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
index 2f291298c0..8ff95a4c48 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -32,6 +32,9 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
 
+// Alternative
+// refCast<const facePointPatch>(p).patch()
+
 template<class Type>
 const Foam::polyPatch&
 Foam::uniformFixedValuePointPatchField<Type>::getPatch(const pointPatch& p)
@@ -87,6 +90,10 @@ uniformFixedValuePointPatchField
 {
     if (!this->readValueEntry(dict))
     {
+        // Ensure field has reasonable initial values
+        this->extrapolateInternal();
+
+        // Evaluate to assign a value
         this->evaluate();
     }
 }
@@ -194,7 +201,7 @@ void Foam::uniformFixedValuePointPatchField<Type>::updateCoeffs()
     }
     const scalar t = this->db().time().timeOutputValue();
 
-    fixedValuePointPatchField<Type>::operator==(refValueFunc_->value(t));
+    valuePointPatchField<Type>::operator=(refValueFunc_->value(t));
     fixedValuePointPatchField<Type>::updateCoeffs();
 }
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
index 3a4ce68d21..c98e567de3 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -28,7 +28,14 @@ Class
     Foam::uniformFixedValuePointPatchField
 
 Description
-    Enables the specification of a uniform fixed value boundary condition.
+    Enables the specification of a uniform fixed value condition.
+
+Usage
+    \table
+        Property     | Description                  | Required | Default
+        uniformValue | uniform value                | yes |
+        value        | initial field value          | optional |
+    \endtable
 
     Example of the boundary condition specification:
     \verbatim
@@ -39,10 +46,16 @@ Description
     }
     \endverbatim
 
+Note
     The uniformValue entry is a PatchFunction1 type,
     able to describe time and spatial varying functions.
     The example above gives the usage for supplying a constant value.
 
+    The \c value entry (optional) is used for the initial values.
+    Otherwise the \c uniformValue is evaluated.
+    In some cases (eg, coded or expression entries with references to other
+    fields) this can be problematic and the \c value entry will be needed.
+
 SourceFiles
     uniformFixedValuePointPatchField.C
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
index 0595cf7294..fb3de7a60b 100644
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
+++ b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.C
@@ -25,14 +25,15 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uniformFixedValuePointPatchFields.H"
-#include "pointPatchFields.H"
+#include "uniformFixedValuePointPatchField.H"
 #include "addToRunTimeSelectionTable.H"
+#include "pointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makePointPatchFieldTypedefs(uniformFixedValue);
     makePointPatchFields(uniformFixedValue);
 }
 
diff --git a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H b/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
deleted file mode 100644
index de229bc32f..0000000000
--- a/src/meshTools/fields/pointPatchFields/uniformFixedValue/uniformFixedValuePointPatchFields.H
+++ /dev/null
@@ -1,58 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 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/>.
-
-InClass
-    Foam::uniformFixedValuePointPatchFields
-
-Description
-
-SourceFiles
-    uniformFixedValuePointPatchFields.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Foam_uniformFixedValuePointPatchFields_H
-#define Foam_uniformFixedValuePointPatchFields_H
-
-#include "uniformFixedValuePointPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePointPatchFieldTypedefs(uniformFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index 0329d406fc..3beba4a72f 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -113,7 +113,7 @@ Foam::oversetFvPatchField<Type>::oversetFvPatchField
     // Use 'value' supplied, or set to internal field
     if (!this->readValueEntry(dict))
     {
-        fvPatchField<Type>::patchInternalField(*this);
+        fvPatchField<Type>::extrapolateInternal();
     }
 }
 
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
index 9c2ccd71b3..771d7e0b77 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/derivedFvPatchFields/timeVaryingMassSorption/timeVaryingMassSorptionFvPatchScalarField.C
@@ -80,7 +80,7 @@ timeVaryingMassSorptionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     kabs_(dict.getCheck<scalar>("kabs", scalarMinMax::ge(0))),
     max_(dict.getCheck<scalar>("max", scalarMinMax::ge(0))),
     kdes_(dict.getCheckOrDefault<scalar>("kdes", 0, scalarMinMax::ge(0)))
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 764b071fe9..16ec788656 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -69,7 +69,7 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     qro_("qro", dict, p.size())
 {
     if (!this->readValueEntry(dict))
diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index 71b2a02c5d..d7fa1c573a 100644
--- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -69,7 +69,8 @@ alphaFixedPressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, false),
+    // The 'value' is optional (handled below)
+    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
     p_("p", dict, p.size())
 {
     if (!this->readValueEntry(dict))
diff --git a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
index 9db52d9592..332d62a412 100644
--- a/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
+++ b/src/waveModels/derivedPointPatchFields/waveMaker/waveMakerPointPatchVectorField.C
@@ -166,7 +166,7 @@ Foam::waveMakerPointPatchVectorField::waveMakerPointPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchField<vector>(p, iF, dict, false),
+    fixedValuePointPatchField<vector>(p, iF, dict, IOobjectOption::NO_READ),
     motionType_(motionTypeNames.get("motionType", dict)),
     n_(dict.get<vector>("n")),
     gHat_(Zero),

From 67bd9119ee9a98ce41bd8f58a524125723e35118 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 23 May 2023 13:07:13 +0200
Subject: [PATCH 318/348] CONFIG: update kahip (3.15) and petsc (3.19.2)
 versions

- kahip includes patches to compile with gcc-13,
  improved CMake MPI detection

- petsc is the latest production release
---
 etc/config.csh/petsc | 4 ++--
 etc/config.sh/kahip  | 4 ++--
 etc/config.sh/petsc  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/config.csh/petsc b/etc/config.csh/petsc
index 2806e0512d..b4518e6053 100644
--- a/etc/config.csh/petsc
+++ b/etc/config.csh/petsc
@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2022 OpenCFD Ltd.
+#     Copyright (C) 2018-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -30,7 +30,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-set petsc_version=petsc-3.17.2
+set petsc_version=petsc-3.19.2
 setenv PETSC_ARCH_PATH "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version"
 
 # END OF (NORMAL) USER EDITABLE PART
diff --git a/etc/config.sh/kahip b/etc/config.sh/kahip
index 135c4e2dd0..ff7cec0813 100644
--- a/etc/config.sh/kahip
+++ b/etc/config.sh/kahip
@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#     Copyright (C) 2017-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -36,7 +36,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-KAHIP_VERSION=kahip-3.14
+KAHIP_VERSION=kahip-3.15
 export KAHIP_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$KAHIP_VERSION
 
 # END OF (NORMAL) USER EDITABLE PART
diff --git a/etc/config.sh/petsc b/etc/config.sh/petsc
index 1dad20841f..c512ebb376 100644
--- a/etc/config.sh/petsc
+++ b/etc/config.sh/petsc
@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2022 OpenCFD Ltd.
+#     Copyright (C) 2018-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -27,7 +27,7 @@
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
 
-petsc_version=petsc-3.18.2
+petsc_version=petsc-3.19.2
 export PETSC_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version"
 
 # END OF (NORMAL) USER EDITABLE PART

From 3de090e602acfd470c3f8ec6f66799096352c5cf Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 20 Jun 2023 08:40:07 +0200
Subject: [PATCH 319/348] BUG: UPstream::shutdown misbehaves with external
 initialisation (fixes #2808)

- freeCommmunicatorComponents needs an additional bounds check.
  When MPI is initialized outside of OpenFOAM, there are no
  UPstream communicator equivalents
---
 src/Pstream/mpi/UPstream.C | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 0f22ca74c3..a28903f259 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -695,11 +695,20 @@ void Foam::UPstream::freeCommunicatorComponents(const label index)
     }
 
     // Not touching the first two communicators (SELF, WORLD)
-    if (index > 1)
+    // or anything out-of bounds.
+    //
+    // No UPstream communicator indices when MPI is initialized outside
+    // of OpenFOAM - thus needs a bounds check too!
+
+    if
+    (
+        index > 1
+     && index < PstreamGlobals::MPICommunicators_.size()
+    )
     {
         if
         (
-            (true == PstreamGlobals::pendingMPIFree_[index])
+            PstreamGlobals::pendingMPIFree_[index]
          && (MPI_COMM_NULL != PstreamGlobals::MPICommunicators_[index])
         )
         {

From 32386d0b398124cce0c5654587d1f9a48d006ca1 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Tue, 20 Jun 2023 17:33:39 +0100
Subject: [PATCH 320/348] TUT: turbulentFlatPlate: tighten solver settings for
 epsilon (fixes #2810)

---
 .../turbulentFlatPlate/setups.orig/common/system/fvSolution   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution
index ffbb1ac2f3..dfdd0f1491 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution
@@ -30,7 +30,7 @@ solvers
         mergeLevels     1;
     }
 
-    "(U|k|epsilon|R|nuTilda)"
+    "(U|R|nuTilda)"
     {
         solver          smoothSolver;
         smoother        symGaussSeidel;
@@ -38,7 +38,7 @@ solvers
         relTol          0.1;
     }
 
-    omega
+    "(omega|epsilon|k)"
     {
         solver          PBiCGStab;
         preconditioner  DILU;

From 09edb23c1d9b19f825c368e8355e85c113983382 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 21 Jun 2023 13:00:00 +0100
Subject: [PATCH 321/348] BUG: collated fails with controlDict watch files

- files might have been set during token reading so only on
  known on master processor.
  Broadcast names to all processors (even alhough they are only
  checked on master) so that the watched states remain synchronised
---
 applications/test/findTimes/Test-findTimes.C | 19 +++++++++++++++----
 src/OpenFOAM/db/Time/Time.C                  |  6 ++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/applications/test/findTimes/Test-findTimes.C b/applications/test/findTimes/Test-findTimes.C
index 9b91b2b213..7b6e908d15 100644
--- a/applications/test/findTimes/Test-findTimes.C
+++ b/applications/test/findTimes/Test-findTimes.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,18 +39,28 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    argList::noParallel();
+    argList::addBoolOption("setTime", "Time::setTime(..) for each instance");
     // timeSelector::addOptions();
     timeSelector::addOptions(true, true);
 
     #include "setRootCase.H"
-    #include "createTime.H"
 
-    Info<< "Times found:" << runTime.times() << endl;
+    Info<< "Using fileHandler: " << fileHandler().type() << endl;
+
+    #include "createTime.H"
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    Info<< "Times selected:" << timeDirs << endl;
+    Pout<< "Times selected:" << timeDirs << endl;
+
+    if (args.found("setTime"))
+    {
+        forAll(timeDirs, timei)
+        {
+            runTime.setTime(timeDirs[timei], timei);
+        }
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index a35e9d7b0c..1df4fcee23 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -397,6 +397,12 @@ void Foam::Time::setMonitoring(const bool forceProfiling)
     if (runTimeModifiable_)
     {
         // Monitor all files that controlDict depends on
+        // Files might have been set during token reading so only on master
+        // processor. Broadcast names to all processors
+        // (even although they are only checked on master)
+        // so that the watched states are synchronised
+
+        Pstream::broadcast(controlDict_.files(), UPstream::worldComm);
         fileHandler().addWatches(controlDict_, controlDict_.files());
     }
 

From c6741f5073dba2e22b922034340cb6fc052b8c99 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 21 Jun 2023 15:04:35 +0200
Subject: [PATCH 322/348] CONFIG: update completion cache (csh)

- drop the '-doc-source' from csh completion (rarely used option)
- includes the '-mpi-thread' and other newer options
---
 bin/tools/foamCreateCompletionCache |   6 +-
 bin/tools/help-filter               |   5 +-
 etc/config.sh/completion_cache      | 587 +++++++++++++---------------
 3 files changed, 278 insertions(+), 320 deletions(-)

diff --git a/bin/tools/foamCreateCompletionCache b/bin/tools/foamCreateCompletionCache
index 014b0829ea..7cc535afd9 100755
--- a/bin/tools/foamCreateCompletionCache
+++ b/bin/tools/foamCreateCompletionCache
@@ -6,7 +6,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2017-2022 OpenCFD Ltd.
+#     Copyright (C) 2017-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -144,6 +144,7 @@ HEADER
 #   -help-full
 #
 # Ignores
+#   -doc-source   Advanced (deprecated?) option
 #   -help-man     Internal option
 #   -hostRoots    Advanced distributed run option
 #   -roots        Advanced distributed run option
@@ -163,7 +164,8 @@ extractOptions()
     local helpText=$($appName -help-full 2>/dev/null | \
         sed -ne '1,/^[Oo]ptions:/d' \
             -e '/^ \{8\}/d;' \
-            -e 's/^ *//; /^$/d; /^[^-]/d; /^--/d; /^-help-man/d;' \
+            -e 's/^ *//; /^$/d; /^[^-]/d; /^--/d;' \
+            -e '/^-doc-source/d; /^-help-man/d;' \
             -e '/^-hostRoots /d; /^-roots /d;' \
             -e '/^-lib /d; /^-no-libs /d;' \
             -e '/^-[a-z]*-switch /d;' \
diff --git a/bin/tools/help-filter b/bin/tools/help-filter
index c65403ed07..df91b04d15 100755
--- a/bin/tools/help-filter
+++ b/bin/tools/help-filter
@@ -6,7 +6,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
-#     Copyright (C) 2020-2022 OpenCFD Ltd.
+#     Copyright (C) 2020-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -24,7 +24,8 @@
 
 sed -ne '1,/^[Oo]ptions:/d' \
     -e '/^ \{8\}/d;' \
-    -e 's/^ *//; /^$/d; /^[^-]/d; /^--/d; /^-help-man/d;' \
+    -e 's/^ *//; /^$/d; /^[^-]/d; /^--/d;' \
+    -e '/^-doc-source/d; /^-help-man/d;' \
     -e '/^-hostRoots /d; /^-roots /d;' \
     -e '/^-lib /d; /^-no-libs /d;' \
     -e '/^-[a-z]*-switch /d;' \
diff --git a/etc/config.sh/completion_cache b/etc/config.sh/completion_cache
index 7cfead3145..8c2c396df3 100644
--- a/etc/config.sh/completion_cache
+++ b/etc/config.sh/completion_cache
@@ -12,322 +12,277 @@ declare -gA _of_complete_cache_;
 _of_complete_cache_=()
 
 #------------------------------------------------------------------------------
-_of_complete_cache_[acousticFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[adiabaticFlameT]="-case -fileHandler | -doc -doc-source -help"
-_of_complete_cache_[adjointOptimisationFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[adjointShapeOptimizationFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[ansysToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[applyBoundaryLayer]="-Cbl -case -decomposeParDict -fileHandler -region -world -ybl | -noFunctionObjects -parallel -writeTurbulenceFields -doc -doc-source -help"
-_of_complete_cache_[attachMesh]="-case -fileHandler | -overwrite -doc -doc-source -help"
-_of_complete_cache_[autoPatch]="-case -fileHandler | -overwrite -doc -doc-source -help"
-_of_complete_cache_[blockMesh]="-case -dict -fileHandler -region -time | -merge-points -no-clean -sets -verbose -write-obj -write-vtk -doc -doc-source -help"
-_of_complete_cache_[boundaryFoam]="-case -fileHandler | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[boxTurb]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[buoyantBoussinesqPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[buoyantBoussinesqSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[buoyantPbePimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[buoyantPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[buoyantSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[cartesian2DMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[cartesianMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[cavitatingDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[cavitatingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[cfx4ToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[changeDictionary]="-case -decomposeParDict -dict -fileHandler -instance -region -subDict -time -world | -constant -disablePatchGroups -enableFunctionEntries -latestTime -literalRE -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[checkFaMesh]="-case -decomposeParDict -fileHandler -geometryOrder -region -world | -noFunctionObjects -parallel -write-vtk -doc -doc-source -help"
-_of_complete_cache_[checkMesh]="-case -decomposeParDict -fileHandler -region -regions -time -world -writeFields -writeSets | -allGeometry -allRegions -allTopology -constant -latestTime -meshQuality -noFunctionObjects -noTopology -noZero -parallel -writeAllFields -writeAllSurfaceFields -doc -doc-source -help"
-_of_complete_cache_[checkSurfaceMesh]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[chemFoam]="-case -fileHandler | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -postProcess -doc -doc-source -help"
-_of_complete_cache_[chemkinToFoam]="-case -fileHandler | -newFormat -doc -doc-source -help"
-_of_complete_cache_[chtMultiRegionFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[chtMultiRegionSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[chtMultiRegionTwoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[coalChemistryFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[coldEngineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[collapseEdges]="-case -collapseFaceSet -decomposeParDict -dict -fileHandler -time -world | -collapseFaces -constant -latestTime -noZero -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[combinePatchFaces]="-case -concaveAngle -decomposeParDict -fileHandler -world | -meshQuality -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[compressibleInterDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[compressibleInterFilmFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[compressibleInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[compressibleInterIsoFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[compressibleMultiphaseInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[compressiblePbeTransportFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[computeMoments]="-case -decomposeParDict -fileHandler -time -world | -constant -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[computeSensitivities]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[copySurfaceParts]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[createBaffles]="-case -decomposeParDict -dict -fileHandler -region -world | -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[createBoxTurb]="-case -decomposeParDict -fileHandler -world | -createBlockMesh -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[createExternalCoupledPatchGeometry]="-case -commsDir -decomposeParDict -fileHandler -region -regions -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[createPatch]="-case -decomposeParDict -dict -fileHandler -region -regions -world | -allRegions -overwrite -parallel -writeObj -doc -doc-source -help"
-_of_complete_cache_[createZeroDirectory]="-case -decomposeParDict -fileHandler -templateDir -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[cumulativeDisplacement]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[datToFoam]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[decomposePar]="-case -decomposeParDict -domains -fileHandler -method -region -regions -time | -allRegions -cellDist -constant -copyUniform -copyZero -dry-run -fields -force -ifRequired -latestTime -no-fields -no-finite-area -no-lagrangian -no-sets -noFunctionObjects -noZero -verbose -doc -doc-source -help"
-_of_complete_cache_[deformedGeom]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[denseAGFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[diluteVdfTransportFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[dnsFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[DPMDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[DPMFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[driftFluxFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[dsmcFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[dsmcInitialise]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[electrostaticFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[engineCompRatio]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[engineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[engineSwirl]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[ensightToFoam]="-case -fileHandler -mergeTol -scale | -keepHandedness -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[equilibriumCO]="-case -fileHandler | -doc -doc-source -help"
-_of_complete_cache_[equilibriumFlameT]="-case -fileHandler | -doc -doc-source -help"
-_of_complete_cache_[explicitRhoFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[extrude2DMesh]="-case -decomposeParDict -fileHandler -world | -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[extrudeEdgesInto2DSurface]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[extrudeMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[extrudeToRegionMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[faceAgglomerate]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[faParkerFukushimaFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[faSavageHutterFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[faTwoLayerAvalancheFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[financialFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[fireFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[fireToFoam]="-case -fileHandler -scale | -ascii -check -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[flattenMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[FLMAToSurface]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[fluent3DMeshToFoam]="-case -fileHandler -ignoreCellGroups -ignoreFaceGroups -scale | -cubit -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[fluentMeshToFoam]="-2D -case -fileHandler -scale | -noFunctionObjects -writeSets -writeZones -doc -doc-source -help"
-_of_complete_cache_[FMSToSurface]="-case -fileHandler | -exportFeatureEdges -exportSubsets -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[FMSToVTK]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[foamDataToFluent]="-case -fileHandler -time | -latestTime -noFunctionObjects -noZero -doc -doc-source -help"
-_of_complete_cache_[foamDictionary]="-add -case -decomposeParDict -diff -diff-etc -entry -fileHandler -precision -set -world | -disableFunctionEntries -expand -includes -keywords -noFunctionObjects -parallel -remove -value -doc -doc-source -help"
-_of_complete_cache_[foamFormatConvert]="-case -decomposeParDict -fileHandler -region -time -world | -constant -enableFunctionEntries -latestTime -noConstant -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[foamHasLibrary]="-fileHandler | -detail -or -verbose -doc -doc-source -help"
-_of_complete_cache_[foamHelp]="-case -decomposeParDict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[foamListRegions]="-case -fileHandler | -doc -doc-source -help"
-_of_complete_cache_[foamListTimes]="-case -fileHandler -time | -constant -latestTime -noZero -processor -rm -verbose -withZero -doc -doc-source -help"
-_of_complete_cache_[foamMeshToFluent]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[foamRestoreFields]="-case -decomposeParDict -fileHandler -method -region -regions -time -world | -allRegions -constant -dry-run -latestTime -noZero -parallel -processor -verbose -withZero -doc -doc-source -help"
-_of_complete_cache_[foamToEnsight]="-case -cellZones -decomposeParDict -exclude-fields -exclude-patches -faceZones -fields -fileHandler -index -name -patches -region -regions -time -width -world | -allRegions -ascii -constant -latestTime -nearCellValue -no-boundary -no-cellZones -no-fields -no-finite-area -no-internal -no-lagrangian -no-mesh -no-overwrite -no-point-data -noFunctionObjects -noZero -nodeValues -parallel -verbose -doc -doc-source -help"
-_of_complete_cache_[foamToFireMesh]="-case -fileHandler -scale -time | -ascii -constant -latestTime -noFunctionObjects -noZero -doc -doc-source -help"
-_of_complete_cache_[foamToGMV]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[foamToStarMesh]="-case -fileHandler -scale -time | -constant -latestTime -noBnd -noFunctionObjects -noZero -doc -doc-source -help"
-_of_complete_cache_[foamToSurface]="-case -fileHandler -scale -time | -constant -latestTime -noFunctionObjects -noZero -tri -doc -doc-source -help"
-_of_complete_cache_[foamToTetDualMesh]="-case -decomposeParDict -fileHandler -time -world | -constant -latestTime -noFunctionObjects -noZero -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[foamToVTK]="-case -cellSet -cellZone -decomposeParDict -exclude-fields -exclude-patches -faceSet -faceZones -fields -fileHandler -name -patches -pointSet -region -regions -time -world | -allRegions -ascii -constant -latestTime -legacy -nearCellValue -no-boundary -no-fields -no-finite-area -no-internal -no-lagrangian -no-point-data -noFunctionObjects -noZero -one-boundary -overwrite -parallel -poly-decomp -processor-fields -surfaceFields -verbose -with-ids -with-point-ids -doc -doc-source -help"
-_of_complete_cache_[foamUpgradeCyclics]="-case -decomposeParDict -fileHandler -region -time -world | -constant -dry-run -enableFunctionEntries -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[foamyHexMesh]="-case -decomposeParDict -fileHandler -world | -checkGeometry -conformationOnly -parallel -doc -doc-source -help"
-_of_complete_cache_[foamyQuadMesh]="-case -fileHandler -pointsFile | -noFunctionObjects -overwrite -doc -doc-source -help"
-_of_complete_cache_[gambitToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[generateBoundaryLayers]="-case -decomposeParDict -fileHandler -world | -2DLayers -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[generateMoments]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[gmshToFoam]="-case -fileHandler -region | -keepOrientation -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[gridToSTL]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[icoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[icoReactingMultiphaseInterFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[icoUncoupledKinematicParcelDyMFoam]="-case -cloud -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[icoUncoupledKinematicParcelFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[ideasUnvToFoam]="-case -fileHandler | -dump -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[importSurfaceAsSubset]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[improveMeshQuality]="-case -constrainedCellsSet -decomposeParDict -fileHandler -nIterations -nLoops -nSurfaceIterations -qualityThreshold -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[improveSymmetryPlanes]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[insideCells]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[interCondensatingEvaporatingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[interFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[interIsoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[interMixingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[interPhaseChangeDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[interPhaseChangeFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[kinematicParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[kivaToFoam]="-case -file -fileHandler -version -zHeadMin | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[laplacianFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[liquidFilmFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[lumpedPointForces]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -noZero -parallel -vtk -doc -doc-source -help"
-_of_complete_cache_[lumpedPointMovement]="-case -decomposeParDict -fileHandler -max -scale -span -visual-length -world | -dry-run -parallel -removeLock -slave -doc -doc-source -help"
-_of_complete_cache_[lumpedPointZones]="-case -decomposeParDict -fileHandler -region -visual-length -world | -dry-run -no-interpolate -parallel -verbose -doc -doc-source -help"
-_of_complete_cache_[magneticFoam]="-case -decomposeParDict -fileHandler -world | -HdotGradH -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noB -noFunctionObjects -noH -parallel -doc -doc-source -help"
-_of_complete_cache_[makeFaMesh]="-case -decomposeParDict -dict -empty-patch -fileHandler -region -world | -dry-run -no-decompose -no-fields -noFunctionObjects -parallel -write-edges-obj -write-vtk -doc -doc-source -help"
-_of_complete_cache_[mapFields]="-case -fileHandler -mapMethod -sourceDecomposeParDict -sourceRegion -sourceTime -targetDecomposeParDict -targetRegion | -consistent -noFunctionObjects -parallelSource -parallelTarget -subtract -doc -doc-source -help"
-_of_complete_cache_[mapFieldsPar]="-case -decomposeParDict -fields -fileHandler -mapMethod -patchMapMethod -procMapMethod -sourceRegion -sourceTime -targetRegion -world | -consistent -no-lagrangian -noFunctionObjects -parallel -subtract -doc -doc-source -help"
-_of_complete_cache_[mdEquilibrationFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[mdFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[mdInitialise]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[mergeMeshes]="-addRegion -case -decomposeParDict -fileHandler -masterRegion -resultTime -world | -noFunctionObjects -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[mergeOrSplitBaffles]="-case -decomposeParDict -dict -fileHandler -region -world | -detectOnly -overwrite -parallel -split -doc -doc-source -help"
-_of_complete_cache_[mergeSurfacePatches]="-case -fileHandler -output -patchIdRange -patchIds -patchNames | -keep -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[meshToFPMA]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[mhdFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[mirrorMesh]="-case -decomposeParDict -dict -fileHandler -world | -noFunctionObjects -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[mixingTransportFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[mixtureAdiabaticFlameT]="-case -fileHandler | -doc -doc-source -help"
-_of_complete_cache_[modifyMesh]="-case -decomposeParDict -dict -fileHandler -world | -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[moveDynamicMesh]="-case -decomposeParDict -fileHandler -region -world | -checkAMI -noFunctionObjects -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[moveEngineMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[moveMesh]="-case -decomposeParDict -deltaT -endTime -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[MPPICDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[MPPICFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[MPPICInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[mshToFoam]="-case -fileHandler | -hex -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[multiphaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[multiphaseInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[netgenNeutralToFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[noise]="-case -decomposeParDict -dict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[nonNewtonianIcoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[objToVTK]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[oneWayCoupledVdfTransportFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[orientFaceZone]="-case -decomposeParDict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[overBuoyantPimpleDyMFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[overCompressibleInterDyMFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[overInterDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[overInterPhaseChangeDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[overLaplacianDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[overPimpleDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[overPotentialFoam]="-case -decomposeParDict -fileHandler -pName -world | -initialiseUBCs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -withFunctionObjects -writePhi -writep -doc -doc-source -help"
-_of_complete_cache_[overRhoPimpleDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[overRhoSimpleFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[overSimpleFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[particleTracks]="-case -decomposeParDict -dict -fields -fileHandler -format -region -stride -time -world | -constant -latestTime -noFunctionObjects -noZero -parallel -verbose -doc -doc-source -help"
-_of_complete_cache_[patchesToSubsets]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[patchSummary]="-case -decomposeParDict -fileHandler -region -time -world | -constant -expand -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[pbeFoam]="-case -fileHandler | -noFunctionObjects -postProcess -doc -doc-source -help"
-_of_complete_cache_[pbeTransportFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[pdfPlot]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[PDRblockMesh]="-case -dict -fileHandler -time | -no-clean -no-outer -print-dict -write-dict -doc -doc-source -help"
-_of_complete_cache_[PDRFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[PDRMesh]="-case -decomposeParDict -fileHandler -world | -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[PDRsetFields]="-case -dict -fileHandler -time | -dry-run -legacy -doc -doc-source -help"
-_of_complete_cache_[pimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[pisoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[plot3dToFoam]="-2D -case -fileHandler -scale | -noBlank -noFunctionObjects -singleBlock -doc -doc-source -help"
-_of_complete_cache_[pMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[polydisperseBubbleFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[polyDualMesh]="-case -fileHandler | -concaveMultiCells -doNotPreserveFaceZones -noFunctionObjects -overwrite -splitAllFaces -doc -doc-source -help"
-_of_complete_cache_[porousSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[postChannel]="-case -fileHandler -time | -constant -latestTime -noFunctionObjects -noZero -doc -doc-source -help"
-_of_complete_cache_[postProcess]="-case -decomposeParDict -dict -field -fields -fileHandler -func -funcs -region -time -world | -constant -latestTime -list -noFunctionObjects -noZero -parallel -profiling -doc -doc-source -help"
-_of_complete_cache_[potentialFoam]="-case -decomposeParDict -fileHandler -pName -region -world | -dry-run -dry-run-write -initialiseUBCs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -withFunctionObjects -writePhi -writep -writephi -doc -doc-source -help"
-_of_complete_cache_[potentialFreeSurfaceDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[potentialFreeSurfaceFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[preparePar]="-case -decomposeParDict -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[profilingSummary]="-case -fileHandler -time | -constant -latestTime -noZero -withZero -doc -doc-source -help"
-_of_complete_cache_[reactingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[reactingHeterogenousParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[reactingMultiphaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[reactingParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[reactingTwoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[reconstructPar]="-case -fields -fileHandler -lagrangianFields -region -regions -time | -allRegions -constant -latestTime -newTimes -no-fields -no-lagrangian -no-sets -noFunctionObjects -noZero -verbose -withZero -doc -doc-source -help"
-_of_complete_cache_[reconstructParMesh]="-case -fileHandler -mergeTol -region -regions -time | -addressing-only -allRegions -cellDist -constant -fullMatch -latestTime -noFunctionObjects -noZero -procMatch -verbose -withZero -doc -doc-source -help"
-_of_complete_cache_[reconstructPointDistribution]="-case -decomposeParDict -fileHandler -time -world | -constant -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[redistributePar]="-case -decomposeParDict -fileHandler -region -regions -time -world | -allRegions -cellDist -constant -decompose -dry-run -latestTime -newTimes -no-finite-area -noZero -overwrite -parallel -reconstruct -verbose -withZero -doc -doc-source -help"
-_of_complete_cache_[refineHexMesh]="-case -decomposeParDict -fileHandler -region -world | -minSet -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[refinementLevel]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -readLevel -doc -doc-source -help"
-_of_complete_cache_[refineMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -all -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[refineWallLayer]="-case -decomposeParDict -fileHandler -useSet -world | -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[releaseAreaMapping]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[removeFaces]="-case -decomposeParDict -fileHandler -world | -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[removeSurfaceFacets]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[renumberMesh]="-case -decomposeParDict -dict -fileHandler -region -regions -time -world | -allRegions -constant -frontWidth -latestTime -noZero -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[rhoCentralFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rhoPimpleAdiabaticFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rhoPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rhoPorousSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rhoReactingBuoyantFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rhoReactingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rhoSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rotateMesh]="-case -decomposeParDict -fileHandler -region -regions -time -world | -allRegions -constant -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[scalarTransportFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[scaleMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[scaleSurfaceMesh]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[selectCells]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[setAlphaField]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[setExprBoundaryFields]="-case -decomposeParDict -dict -fileHandler -load-fields -region -time -world | -ascii -backup -cache-fields -dry-run -latestTime -noZero -parallel -withFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[setExprFields]="-case -decomposeParDict -dict -dimensions -expression -field -field-mask -fileHandler -load-fields -region -time -value-patches -world | -ascii -create -debug-parser -dry-run -dummy-phi -keepPatches -latestTime -no-variable-cache -noZero -parallel -verbose -withFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[setFields]="-case -decomposeParDict -dict -fileHandler -region -world | -no-finite-area -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[setSet]="-batch -case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -loop -noFunctionObjects -noSync -noVTK -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[setsToZones]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -noFlipMap -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[setTurbulenceFields]="-case -decomposeParDict -dict -fileHandler -region -world | -parallel -doc -doc-source -help"
-_of_complete_cache_[shallowWaterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[simpleCoalParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[simpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[simpleReactingParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[simpleSprayFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[singleCellMesh]="-case -decomposeParDict -fileHandler -time -world | -constant -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[slopeMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[smapToFoam]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[smoothSurfaceData]="-case -decomposeParDict -field -fileHandler -radius -read-format -sweeps -world | -noFunctionObjects -parallel -verbose -doc -doc-source -help"
-_of_complete_cache_[snappyHexMesh]="-case -decomposeParDict -dict -fileHandler -outFile -patches -region -surfaceSimplify -world | -checkGeometry -dry-run -overwrite -parallel -profiling -doc -doc-source -help"
-_of_complete_cache_[snappyRefineMesh]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[solidDisplacementFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[solidEquilibriumDisplacementFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[solidFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[sonicDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[sonicFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[sonicLiquidFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[sphereSurfactantFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[splitCells]="-case -fileHandler -set -tol | -geometry -overwrite -doc -doc-source -help"
-_of_complete_cache_[splitMesh]="-case -fileHandler | -overwrite -doc -doc-source -help"
-_of_complete_cache_[splitMeshRegions]="-addZones -blockedFaces -case -cellZonesFileOnly -combineZones -decomposeParDict -fileHandler -insidePoint -region -world | -cellZones -cellZonesOnly -detectOnly -largestOnly -makeCellZones -overwrite -parallel -prefixRegion -sloppyCellZones -useFaceZones -doc -doc-source -help"
-_of_complete_cache_[sprayDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[sprayFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[SRFPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[SRFSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[star4ToFoam]="-case -fileHandler -scale | -ascii -noFunctionObjects -solids -doc -doc-source -help"
-_of_complete_cache_[steadyParticleTracks]="-case -dict -fileHandler -region -time | -constant -latestTime -noFunctionObjects -noZero -verbose -doc -doc-source -help"
-_of_complete_cache_[stitchMesh]="-case -dict -fileHandler -region -toleranceDict | -integral -intermediate -overwrite -partial -perfect -doc -doc-source -help"
-_of_complete_cache_[subsetMesh]="-case -decomposeParDict -fileHandler -patch -patches -region -resultTime -world | -overwrite -parallel -zone -doc -doc-source -help"
-_of_complete_cache_[subsetToPatch]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceAdd]="-case -fileHandler -points -scale | -mergeRegions -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceBooleanFeatures]="-case -fileHandler -scale -trim | -invertedSpace -no-cgal -noFunctionObjects -perturb -surf1Baffle -surf2Baffle -doc -doc-source -help"
-_of_complete_cache_[surfaceCheck]="-case -fileHandler -outputThreshold -writeSets | -blockMesh -checkSelfIntersection -noFunctionObjects -splitNonManifold -verbose -doc -doc-source -help"
-_of_complete_cache_[surfaceClean]="-case -fileHandler -scale | -no-clean -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceCoarsen]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceConvert]="-case -fileHandler -precision -read-format -scale -write-format | -clean -group -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceFeatureConvert]="-case -fileHandler -read-format -scale -write-format | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceFeatureEdges]="-angle -case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceFeatureExtract]="-case -dict -fileHandler | -doc -doc-source -help"
-_of_complete_cache_[surfaceFind]="-case -fileHandler -x -y -z | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceGenerateBoundingBox]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceHookUp]="-case -dict -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceInertia]="-case -density -fileHandler -referencePoint | -noFunctionObjects -shellProperties -doc -doc-source -help"
-_of_complete_cache_[surfaceInflate]="-case -featureAngle -fileHandler -nSmooth | -checkSelfIntersection -debug -doc -doc-source -help"
-_of_complete_cache_[surfaceLambdaMuSmooth]="-featureFile | -doc -doc-source -help"
-_of_complete_cache_[surfaceMeshConvert]="-case -dict -fileHandler -from -read-format -read-scale -to -write-format -write-scale | -clean -noFunctionObjects -tri -doc -doc-source -help"
-_of_complete_cache_[surfaceMeshExport]="-case -dict -fileHandler -from -name -read-scale -to -write-format -write-scale | -clean -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceMeshExtract]="-case -decomposeParDict -excludePatches -faceZones -fileHandler -patches -region -time -world | -constant -excludeProcPatches -latestTime -noFunctionObjects -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[surfaceMeshImport]="-case -dict -fileHandler -from -name -read-format -read-scale -to -write-scale | -clean -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceMeshInfo]="-case -fileHandler -scale | -areas -noFunctionObjects -xml -doc -doc-source -help"
-_of_complete_cache_[surfaceOrient]="-case -fileHandler -scale | -inside -noFunctionObjects -usePierceTest -doc -doc-source -help"
-_of_complete_cache_[surfacePatch]="-case -dict -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfacePointMerge]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceRedistributePar]="-case -decomposeParDict -fileHandler -world | -keepNonMapped -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[surfaceRefineRedGreen]="-case -fileHandler -steps | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceSplitByPatch]="-case -excludePatches -fileHandler -patches | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceSplitByTopology]=" | -doc -doc-source -help"
-_of_complete_cache_[surfaceSplitNonManifolds]="-case -fileHandler | -debug -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceSubset]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceToFMS]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceToPatch]="-case -faceSet -fileHandler -tol | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceTransformPoints]="-case -centre -fileHandler -read-format -read-scale -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -translate -write-format -write-scale -yawPitchRoll | -auto-centre -noFunctionObjects -recentre -doc -doc-source -help"
-_of_complete_cache_[surfactantFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[temporalInterpolate]="-case -decomposeParDict -divisions -fields -fileHandler -interpolationType -region -time -world | -constant -latestTime -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[tetgenToFoam]="-case -decomposeParDict -fileHandler -world | -noFaceFile -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[tetMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[thermoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[topoSet]="-case -decomposeParDict -dict -fileHandler -region -time -world | -constant -latestTime -noFunctionObjects -noSync -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[transformPoints]="-case -centre -decomposeParDict -fileHandler -region -regions -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -scale -time -translate -world -yawPitchRoll | -allRegions -auto-centre -noFunctionObjects -parallel -recentre -rotateFields -doc -doc-source -help"
-_of_complete_cache_[twoLiquidMixingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[twoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[uncoupledKinematicParcelDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[uncoupledKinematicParcelFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[vdfTransportFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[viewFactorsGen]="-case -decomposeParDict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[vtkUnstructuredToFoam]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[wallFunctionTable]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[writeActiveDesignVariables]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[writeMeshObj]="-case -cell -cellSet -decomposeParDict -face -faceSet -fileHandler -point -region -time -world | -constant -latestTime -noZero -parallel -patchEdges -patchFaces -doc -doc-source -help"
-_of_complete_cache_[writeMorpherCPs]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[XiDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[XiEngineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[XiFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[zipUpMesh]="-case -decomposeParDict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
+_of_complete_cache_[acousticFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[adiabaticFlameT]="-case -fileHandler | -doc -help"
+_of_complete_cache_[adjointOptimisationFoam]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[adjointShapeOptimizationFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[ansysToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -help"
+_of_complete_cache_[applyBoundaryLayer]="-Cbl -case -decomposeParDict -fileHandler -region -world -ybl | -mpi-threads -noFunctionObjects -parallel -writeTurbulenceFields -doc -help"
+_of_complete_cache_[attachMesh]="-case -fileHandler | -overwrite -doc -help"
+_of_complete_cache_[autoPatch]="-case -fileHandler | -overwrite -doc -help"
+_of_complete_cache_[blockMesh]="-case -dict -fileHandler -region -time | -merge-points -no-clean -sets -verbose -write-obj -write-vtk -doc -help"
+_of_complete_cache_[boundaryFoam]="-case -fileHandler | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -doc -help"
+_of_complete_cache_[boxTurb]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[buoyantBoussinesqPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[buoyantBoussinesqSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[buoyantPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[buoyantSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[cavitatingDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[cavitatingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[cfx4ToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -help"
+_of_complete_cache_[changeDictionary]="-case -decomposeParDict -dict -fileHandler -instance -region -subDict -time -world | -constant -disablePatchGroups -enableFunctionEntries -latestTime -literalRE -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[checkFaMesh]="-case -decomposeParDict -fileHandler -geometryOrder -region -world | -mpi-threads -noFunctionObjects -parallel -write-vtk -doc -help"
+_of_complete_cache_[checkMesh]="-case -decomposeParDict -fileHandler -region -regions -time -world -writeFields -writeSets | -allGeometry -allRegions -allTopology -constant -latestTime -meshQuality -mpi-threads -noFunctionObjects -noTopology -noZero -parallel -write-edges -writeAllFields -writeAllSurfaceFields -doc -help"
+_of_complete_cache_[chemFoam]="-case -fileHandler | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -postProcess -doc -help"
+_of_complete_cache_[chemkinToFoam]="-case -fileHandler | -newFormat -doc -help"
+_of_complete_cache_[chtMultiRegionFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[chtMultiRegionSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[chtMultiRegionTwoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[coalChemistryFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[coldEngineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[collapseEdges]="-case -collapseFaceSet -decomposeParDict -dict -fileHandler -time -world | -collapseFaces -constant -latestTime -mpi-threads -noZero -overwrite -parallel -doc -help"
+_of_complete_cache_[combinePatchFaces]="-case -concaveAngle -decomposeParDict -fileHandler -world | -meshQuality -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[compressibleInterDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[compressibleInterFilmFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[compressibleInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[compressibleInterIsoFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[compressibleMultiphaseInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[computeSensitivities]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[createBaffles]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[createBoxTurb]="-case -decomposeParDict -fileHandler -world | -createBlockMesh -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[createExternalCoupledPatchGeometry]="-case -commsDir -decomposeParDict -fileHandler -region -regions -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[createPatch]="-case -decomposeParDict -dict -fileHandler -region -regions -world | -allRegions -mpi-threads -overwrite -parallel -writeObj -doc -help"
+_of_complete_cache_[createZeroDirectory]="-case -decomposeParDict -fileHandler -templateDir -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[cumulativeDisplacement]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[datToFoam]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[decomposePar]="-case -decomposeParDict -domains -fileHandler -method -region -regions -time | -allRegions -cellDist -constant -copyUniform -copyZero -dry-run -fields -force -ifRequired -latestTime -no-fields -no-finite-area -no-lagrangian -no-sets -noFunctionObjects -noZero -verbose -doc -help"
+_of_complete_cache_[deformedGeom]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[dnsFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[DPMDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[DPMFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[driftFluxFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[dsmcFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[dsmcInitialise]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[electrostaticFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[engineCompRatio]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[engineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[engineSwirl]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[ensightToFoam]="-case -fileHandler -mergeTol -scale | -keepHandedness -noFunctionObjects -doc -help"
+_of_complete_cache_[equilibriumCO]="-case -fileHandler | -doc -help"
+_of_complete_cache_[equilibriumFlameT]="-case -fileHandler | -doc -help"
+_of_complete_cache_[extrude2DMesh]="-case -decomposeParDict -fileHandler -world | -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[extrudeMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[extrudeToRegionMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -noFunctionObjects -overwrite -parallel -doc -help"
+_of_complete_cache_[faceAgglomerate]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[financialFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[fireFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[fireToFoam]="-case -fileHandler -scale | -ascii -check -noFunctionObjects -doc -help"
+_of_complete_cache_[flattenMesh]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[fluent3DMeshToFoam]="-case -fileHandler -ignoreCellGroups -ignoreFaceGroups -scale | -cubit -noFunctionObjects -doc -help"
+_of_complete_cache_[fluentMeshToFoam]="-2D -case -fileHandler -scale | -noFunctionObjects -writeSets -writeZones -doc -help"
+_of_complete_cache_[foamDataToFluent]="-case -fileHandler -time | -latestTime -noFunctionObjects -noZero -doc -help"
+_of_complete_cache_[foamDictionary]="-add -case -decomposeParDict -diff -diff-etc -entry -fileHandler -precision -set -world | -disableFunctionEntries -expand -includes -keywords -mpi-threads -noFunctionObjects -parallel -remove -value -doc -help"
+_of_complete_cache_[foamFormatConvert]="-case -decomposeParDict -fileHandler -region -time -world | -constant -enableFunctionEntries -latestTime -mpi-threads -noConstant -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[foamHasLibrary]="-fileHandler | -detail -or -verbose -doc -help"
+_of_complete_cache_[foamHelp]="-case -decomposeParDict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[foamListRegions]="-case -fileHandler | -doc -help"
+_of_complete_cache_[foamListTimes]="-case -fileHandler -time | -constant -latestTime -noZero -processor -rm -verbose -withZero -doc -help"
+_of_complete_cache_[foamMeshToFluent]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[foamRestoreFields]="-case -decomposeParDict -fileHandler -method -region -regions -time -world | -allRegions -constant -dry-run -latestTime -mpi-threads -noZero -parallel -processor -verbose -withZero -doc -help"
+_of_complete_cache_[foamToEnsight]="-case -cellZones -decomposeParDict -exclude-fields -exclude-patches -faceZones -fields -fileHandler -index -name -patches -region -regions -time -width -world | -allRegions -ascii -constant -latestTime -mpi-threads -nearCellValue -no-boundary -no-cellZones -no-fields -no-finite-area -no-internal -no-lagrangian -no-mesh -no-overwrite -no-point-data -noFunctionObjects -noZero -nodeValues -parallel -verbose -doc -help"
+_of_complete_cache_[foamToFireMesh]="-case -fileHandler -scale -time | -ascii -constant -latestTime -noFunctionObjects -noZero -doc -help"
+_of_complete_cache_[foamToGMV]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[foamToStarMesh]="-case -fileHandler -scale -time | -constant -latestTime -noBnd -noFunctionObjects -noZero -doc -help"
+_of_complete_cache_[foamToSurface]="-case -fileHandler -scale -time | -constant -latestTime -noFunctionObjects -noZero -tri -doc -help"
+_of_complete_cache_[foamToTetDualMesh]="-case -decomposeParDict -fileHandler -time -world | -constant -latestTime -mpi-threads -noFunctionObjects -noZero -overwrite -parallel -doc -help"
+_of_complete_cache_[foamToVTK]="-case -cellSet -cellZone -decomposeParDict -exclude-fields -exclude-patches -faceSet -faceZones -fields -fileHandler -name -patches -pointSet -region -regions -time -world | -allRegions -ascii -constant -latestTime -legacy -mpi-threads -nearCellValue -no-boundary -no-fields -no-finite-area -no-internal -no-lagrangian -no-point-data -noFunctionObjects -noZero -one-boundary -overwrite -parallel -poly-decomp -processor-fields -surfaceFields -verbose -with-ids -with-point-ids -doc -help"
+_of_complete_cache_[foamUpgradeCyclics]="-case -decomposeParDict -fileHandler -region -time -world | -constant -dry-run -enableFunctionEntries -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[foamyHexMesh]="-case -decomposeParDict -fileHandler -world | -checkGeometry -conformationOnly -mpi-threads -parallel -doc -help"
+_of_complete_cache_[foamyQuadMesh]="-case -fileHandler -pointsFile | -noFunctionObjects -overwrite -doc -help"
+_of_complete_cache_[gambitToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -help"
+_of_complete_cache_[gmshToFoam]="-case -fileHandler -region | -keepOrientation -noFunctionObjects -doc -help"
+_of_complete_cache_[icoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[icoReactingMultiphaseInterFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[icoUncoupledKinematicParcelDyMFoam]="-case -cloud -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[icoUncoupledKinematicParcelFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[ideasUnvToFoam]="-case -fileHandler | -dump -noFunctionObjects -doc -help"
+_of_complete_cache_[insideCells]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[interCondensatingEvaporatingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[interFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[interIsoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[interMixingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[interPhaseChangeDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[interPhaseChangeFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[kinematicParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[kivaToFoam]="-case -file -fileHandler -version -zHeadMin | -noFunctionObjects -doc -help"
+_of_complete_cache_[laplacianFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[liquidFilmFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[lumpedPointForces]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -mpi-threads -noZero -parallel -vtk -doc -help"
+_of_complete_cache_[lumpedPointMovement]="-case -decomposeParDict -fileHandler -max -scale -span -visual-length -world | -dry-run -mpi-threads -parallel -removeLock -slave -doc -help"
+_of_complete_cache_[lumpedPointZones]="-case -decomposeParDict -fileHandler -region -visual-length -world | -dry-run -mpi-threads -no-interpolate -parallel -verbose -doc -help"
+_of_complete_cache_[magneticFoam]="-case -decomposeParDict -fileHandler -world | -HdotGradH -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noB -noFunctionObjects -noH -parallel -doc -help"
+_of_complete_cache_[makeFaMesh]="-case -decomposeParDict -dict -empty-patch -fileHandler -region -world | -dry-run -mpi-threads -no-decompose -no-fields -noFunctionObjects -parallel -write-edges-obj -write-vtk -doc -help"
+_of_complete_cache_[mapFields]="-case -fileHandler -mapMethod -sourceDecomposeParDict -sourceRegion -sourceTime -targetDecomposeParDict -targetRegion | -consistent -noFunctionObjects -parallelSource -parallelTarget -subtract -doc -help"
+_of_complete_cache_[mapFieldsPar]="-case -decomposeParDict -fields -fileHandler -mapMethod -patchMapMethod -procMapMethod -sourceRegion -sourceTime -targetRegion -world | -consistent -mpi-threads -no-lagrangian -noFunctionObjects -parallel -subtract -doc -help"
+_of_complete_cache_[mdEquilibrationFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[mdFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[mdInitialise]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[mergeMeshes]="-addRegion -case -decomposeParDict -fileHandler -masterRegion -resultTime -world | -mpi-threads -noFunctionObjects -overwrite -parallel -doc -help"
+_of_complete_cache_[mergeOrSplitBaffles]="-case -decomposeParDict -dict -fileHandler -region -world | -detectOnly -mpi-threads -overwrite -parallel -split -doc -help"
+_of_complete_cache_[mhdFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[mirrorMesh]="-case -decomposeParDict -dict -fileHandler -world | -mpi-threads -noFunctionObjects -overwrite -parallel -doc -help"
+_of_complete_cache_[mixtureAdiabaticFlameT]="-case -fileHandler | -doc -help"
+_of_complete_cache_[modifyMesh]="-case -decomposeParDict -dict -fileHandler -world | -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[moveDynamicMesh]="-case -decomposeParDict -fileHandler -region -world | -checkAMI -mpi-threads -noFunctionObjects -overwrite -parallel -doc -help"
+_of_complete_cache_[moveEngineMesh]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[moveMesh]="-case -decomposeParDict -deltaT -endTime -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[MPPICDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[MPPICFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[MPPICInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[mshToFoam]="-case -fileHandler | -hex -noFunctionObjects -doc -help"
+_of_complete_cache_[multiphaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[multiphaseInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[netgenNeutralToFoam]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[noise]="-case -decomposeParDict -dict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[nonNewtonianIcoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[objToVTK]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[orientFaceZone]="-case -decomposeParDict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[overBuoyantPimpleDyMFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[overCompressibleInterDyMFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[overInterDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[overInterPhaseChangeDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[overLaplacianDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[overPimpleDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[overPotentialFoam]="-case -decomposeParDict -fileHandler -pName -region -world | -dry-run -dry-run-write -initialiseUBCs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -withFunctionObjects -writePhi -writep -writephi -doc -help"
+_of_complete_cache_[overRhoPimpleDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[overRhoSimpleFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[overSimpleFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[particleTracks]="-case -decomposeParDict -dict -fields -fileHandler -format -region -stride -time -world | -constant -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -verbose -doc -help"
+_of_complete_cache_[patchSummary]="-case -decomposeParDict -fileHandler -region -time -world | -constant -expand -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[pdfPlot]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[PDRblockMesh]="-case -dict -fileHandler -time | -no-clean -no-outer -print-dict -write-dict -doc -help"
+_of_complete_cache_[PDRFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[PDRMesh]="-case -decomposeParDict -fileHandler -world | -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[PDRsetFields]="-case -dict -fileHandler -time | -dry-run -legacy -doc -help"
+_of_complete_cache_[pimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[pisoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[plot3dToFoam]="-2D -case -fileHandler -scale | -noBlank -noFunctionObjects -singleBlock -doc -help"
+_of_complete_cache_[polyDualMesh]="-case -fileHandler | -concaveMultiCells -doNotPreserveFaceZones -noFunctionObjects -overwrite -splitAllFaces -doc -help"
+_of_complete_cache_[porousSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[postChannel]="-case -fileHandler -time | -constant -latestTime -noFunctionObjects -noZero -doc -help"
+_of_complete_cache_[postProcess]="-case -decomposeParDict -dict -field -fields -fileHandler -func -funcs -region -time -world | -constant -latestTime -list -mpi-threads -noFunctionObjects -noZero -parallel -profiling -doc -help"
+_of_complete_cache_[potentialFoam]="-case -decomposeParDict -fileHandler -pName -region -world | -dry-run -dry-run-write -initialiseUBCs -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -withFunctionObjects -writePhi -writep -writephi -doc -help"
+_of_complete_cache_[potentialFreeSurfaceDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[potentialFreeSurfaceFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[profilingSummary]="-case -fileHandler -time | -constant -latestTime -noZero -withZero -doc -help"
+_of_complete_cache_[reactingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[reactingHeterogenousParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[reactingMultiphaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[reactingParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[reactingTwoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[reconstructPar]="-case -fields -fileHandler -lagrangianFields -region -regions -time | -allRegions -constant -latestTime -newTimes -no-fields -no-lagrangian -no-sets -noFunctionObjects -noZero -verbose -withZero -doc -help"
+_of_complete_cache_[reconstructParMesh]="-case -fileHandler -mergeTol -region -regions -time | -addressing-only -allRegions -cellDist -constant -fullMatch -latestTime -noFunctionObjects -noZero -procMatch -verbose -withZero -doc -help"
+_of_complete_cache_[redistributePar]="-case -decomposeParDict -fileHandler -region -regions -time -world | -allRegions -cellDist -constant -decompose -dry-run -latestTime -mpi-threads -newTimes -no-finite-area -noZero -overwrite -parallel -reconstruct -verbose -withZero -doc -help"
+_of_complete_cache_[refineHexMesh]="-case -decomposeParDict -fileHandler -region -world | -minSet -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[refinementLevel]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -readLevel -doc -help"
+_of_complete_cache_[refineMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -all -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[refineWallLayer]="-case -decomposeParDict -fileHandler -useSet -world | -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[removeFaces]="-case -decomposeParDict -fileHandler -world | -mpi-threads -overwrite -parallel -doc -help"
+_of_complete_cache_[renumberMesh]="-case -decomposeParDict -dict -fileHandler -region -regions -time -world | -allRegions -constant -frontWidth -latestTime -mpi-threads -noZero -overwrite -parallel -doc -help"
+_of_complete_cache_[rhoCentralFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rhoPimpleAdiabaticFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rhoPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rhoPorousSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rhoReactingBuoyantFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rhoReactingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rhoSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[rotateMesh]="-case -decomposeParDict -fileHandler -region -regions -time -world | -allRegions -constant -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[scalarTransportFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[selectCells]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[setAlphaField]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[setExprBoundaryFields]="-case -decomposeParDict -dict -fileHandler -load-fields -region -time -world | -ascii -backup -cache-fields -dry-run -latestTime -mpi-threads -noZero -parallel -withFunctionObjects -doc -help"
+_of_complete_cache_[setExprFields]="-case -decomposeParDict -dict -dimensions -expression -field -field-mask -fileHandler -load-fields -region -time -value-patches -world | -ascii -create -debug-parser -dry-run -dummy-phi -keepPatches -latestTime -mpi-threads -no-variable-cache -noZero -parallel -verbose -withFunctionObjects -doc -help"
+_of_complete_cache_[setFields]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -no-finite-area -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[setSet]="-batch -case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -loop -mpi-threads -noFunctionObjects -noSync -noVTK -noZero -parallel -doc -help"
+_of_complete_cache_[setsToZones]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -mpi-threads -noFlipMap -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[setTurbulenceFields]="-case -decomposeParDict -dict -fileHandler -region -world | -mpi-threads -parallel -doc -help"
+_of_complete_cache_[shallowWaterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[simpleCoalParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[simpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[simpleReactingParcelFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[simpleSprayFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[singleCellMesh]="-case -decomposeParDict -fileHandler -time -world | -constant -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[smapToFoam]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[smoothSurfaceData]="-case -decomposeParDict -field -fileHandler -radius -read-format -sweeps -world | -mpi-threads -noFunctionObjects -parallel -verbose -doc -help"
+_of_complete_cache_[snappyHexMesh]="-case -decomposeParDict -dict -fileHandler -outFile -patches -region -surfaceSimplify -world | -checkGeometry -dry-run -mpi-threads -overwrite -parallel -profiling -doc -help"
+_of_complete_cache_[snappyRefineMesh]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[solidDisplacementFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[solidEquilibriumDisplacementFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[solidFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[sonicDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[sonicFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[sonicLiquidFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[sphereSurfactantFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[splitCells]="-case -fileHandler -set -tol | -geometry -overwrite -doc -help"
+_of_complete_cache_[splitMesh]="-case -fileHandler | -overwrite -doc -help"
+_of_complete_cache_[splitMeshRegions]="-addZones -blockedFaces -case -cellZonesFileOnly -combineZones -decomposeParDict -fileHandler -insidePoint -region -world | -cellZones -cellZonesOnly -detectOnly -largestOnly -makeCellZones -mpi-threads -overwrite -parallel -prefixRegion -sloppyCellZones -useFaceZones -doc -help"
+_of_complete_cache_[sprayDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[sprayFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[SRFPimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[SRFSimpleFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[star4ToFoam]="-case -fileHandler -scale | -ascii -noFunctionObjects -solids -doc -help"
+_of_complete_cache_[steadyParticleTracks]="-case -dict -fileHandler -region -time | -constant -latestTime -noFunctionObjects -noZero -verbose -doc -help"
+_of_complete_cache_[stitchMesh]="-case -dict -fileHandler -region -toleranceDict | -integral -intermediate -overwrite -partial -perfect -doc -help"
+_of_complete_cache_[subsetMesh]="-case -decomposeParDict -fileHandler -patch -patches -region -resultTime -world | -mpi-threads -overwrite -parallel -zone -doc -help"
+_of_complete_cache_[surfaceAdd]="-case -fileHandler -points -scale | -mergeRegions -noFunctionObjects -verbose -doc -help"
+_of_complete_cache_[surfaceBooleanFeatures]="-case -fileHandler -scale -trim | -invertedSpace -no-cgal -noFunctionObjects -perturb -surf1Baffle -surf2Baffle -doc -help"
+_of_complete_cache_[surfaceCheck]="-case -fileHandler -outputThreshold -writeSets | -blockMesh -checkSelfIntersection -noFunctionObjects -splitNonManifold -verbose -doc -help"
+_of_complete_cache_[surfaceClean]="-case -fileHandler -scale | -no-clean -noFunctionObjects -verbose -doc -help"
+_of_complete_cache_[surfaceCoarsen]="-case -fileHandler -scale | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceConvert]="-case -fileHandler -precision -read-format -scale -write-format | -clean -group -noFunctionObjects -verbose -doc -help"
+_of_complete_cache_[surfaceFeatureConvert]="-case -fileHandler -read-format -scale -write-format | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceFeatureExtract]="-case -dict -fileHandler | -doc -help"
+_of_complete_cache_[surfaceFind]="-case -fileHandler -x -y -z | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceHookUp]="-case -dict -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceInertia]="-case -density -fileHandler -referencePoint | -noFunctionObjects -shellProperties -doc -help"
+_of_complete_cache_[surfaceInflate]="-case -featureAngle -fileHandler -nSmooth | -checkSelfIntersection -debug -doc -help"
+_of_complete_cache_[surfaceLambdaMuSmooth]="-featureFile | -doc -help"
+_of_complete_cache_[surfaceMeshConvert]="-case -dict -fileHandler -from -read-format -read-scale -to -write-format -write-scale | -clean -noFunctionObjects -tri -verbose -doc -help"
+_of_complete_cache_[surfaceMeshExport]="-case -dict -fileHandler -from -name -read-scale -to -write-format -write-scale | -clean -noFunctionObjects -verbose -doc -help"
+_of_complete_cache_[surfaceMeshExtract]="-case -decomposeParDict -excludePatches -faceZones -fileHandler -patches -region -time -world | -constant -excludeProcPatches -latestTime -mpi-threads -noFunctionObjects -noZero -parallel -doc -help"
+_of_complete_cache_[surfaceMeshImport]="-case -dict -fileHandler -from -name -read-format -read-scale -to -write-scale | -clean -noFunctionObjects -verbose -doc -help"
+_of_complete_cache_[surfaceMeshInfo]="-case -fileHandler -scale | -areas -noFunctionObjects -xml -doc -help"
+_of_complete_cache_[surfaceOrient]="-case -fileHandler -scale | -inside -noFunctionObjects -usePierceTest -doc -help"
+_of_complete_cache_[surfacePatch]="-case -dict -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfacePointMerge]="-case -fileHandler -scale | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceRedistributePar]="-case -decomposeParDict -fileHandler -world | -keepNonMapped -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[surfaceRefineRedGreen]="-case -fileHandler -steps | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceSplitByPatch]="-case -excludePatches -fileHandler -patches | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceSplitByTopology]=" | -doc -help"
+_of_complete_cache_[surfaceSplitNonManifolds]="-case -fileHandler | -debug -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceSubset]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceToPatch]="-case -faceSet -fileHandler -tol | -noFunctionObjects -doc -help"
+_of_complete_cache_[surfaceTransformPoints]="-case -centre -fileHandler -read-format -read-scale -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -translate -write-format -write-scale -yawPitchRoll | -auto-centre -noFunctionObjects -recentre -doc -help"
+_of_complete_cache_[surfactantFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[temporalInterpolate]="-case -decomposeParDict -divisions -fields -fileHandler -interpolationType -region -time -world | -constant -latestTime -mpi-threads -noZero -parallel -doc -help"
+_of_complete_cache_[tetgenToFoam]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFaceFile -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[thermoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[topoSet]="-case -decomposeParDict -dict -fileHandler -region -time -world | -constant -latestTime -mpi-threads -noFunctionObjects -noSync -noZero -parallel -doc -help"
+_of_complete_cache_[transformPoints]="-case -centre -decomposeParDict -fileHandler -region -regions -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -scale -time -translate -world -yawPitchRoll | -allRegions -auto-centre -mpi-threads -noFunctionObjects -parallel -recentre -rotateFields -doc -help"
+_of_complete_cache_[twoLiquidMixingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[twoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[uncoupledKinematicParcelDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[uncoupledKinematicParcelFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[viewFactorsGen]="-case -decomposeParDict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[vtkUnstructuredToFoam]="-case -fileHandler | -noFunctionObjects -doc -help"
+_of_complete_cache_[wallFunctionTable]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[writeActiveDesignVariables]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[writeMeshObj]="-case -cell -cellSet -decomposeParDict -face -faceSet -fileHandler -point -region -time -world | -constant -latestTime -mpi-threads -noZero -parallel -patchEdges -patchFaces -doc -help"
+_of_complete_cache_[writeMorpherCPs]="-case -decomposeParDict -fileHandler -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
+_of_complete_cache_[XiDyMFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[XiEngineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[XiFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -mpi-threads -noFunctionObjects -parallel -postProcess -doc -help"
+_of_complete_cache_[zipUpMesh]="-case -decomposeParDict -fileHandler -region -world | -mpi-threads -noFunctionObjects -parallel -doc -help"
 _of_complete_cache_[paraFoam]="-case -region | -block -vtk -touch -touch-all -touch-proc -plugin-path= -help"
 _of_complete_cache_[wmake]=" | -s -a -q -k -j -update -debug -debug-O[g0123] -build-root= -module-prefix= -module-prefix= -no-openfoam -openmp -no-openmp -no-scheduler -show-api -show-ext-so -show-c -show-cflags -show-cxx -show-cxxflags -show-cflags-arch -show-cxxflags-arch -show-compile-c -show-compile-cxx -show-path-c -show-path-cxx -show-mpi-compile -show-mpi-link -show-openmp-compile -show-openmp-link -pwd -version -help"
 

From aaf1fcf460a3468cdaed67b2d70495285a64c795 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 21 Jun 2023 15:29:52 +0200
Subject: [PATCH 323/348] SUBMODULE: updates for adios, avalanche,
 external-solver

- adios: minor updates
- avalanche: bug fixes, improvements, new solver
- external-solver: improved cache handling, error checks, etc
---
 modules/adios           | 2 +-
 modules/avalanche       | 2 +-
 modules/external-solver | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/adios b/modules/adios
index d51b1c14da..b13298ef3b 160000
--- a/modules/adios
+++ b/modules/adios
@@ -1 +1 @@
-Subproject commit d51b1c14da3435a3b7c3e202c04b82d81f53cb82
+Subproject commit b13298ef3b8b7fe88535c7c4053146f82f5af760
diff --git a/modules/avalanche b/modules/avalanche
index f97d2c3513..54d15f2f41 160000
--- a/modules/avalanche
+++ b/modules/avalanche
@@ -1 +1 @@
-Subproject commit f97d2c3513ac99db65521cb112ae2c3974c4c265
+Subproject commit 54d15f2f419d8c9cbbebd12544a20a8f95577804
diff --git a/modules/external-solver b/modules/external-solver
index 94874d0d60..5841a4a0e8 160000
--- a/modules/external-solver
+++ b/modules/external-solver
@@ -1 +1 @@
-Subproject commit 94874d0d60764047ee513d90edf8adaea767ed0a
+Subproject commit 5841a4a0e8a71546cca929ffaf441661c6b773d4

From da98104a79891629ffadd6aba1147f7e5f783f03 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Wed, 21 Jun 2023 13:00:09 +0100
Subject: [PATCH 324/348] COMP: streamFunction: avoid over-eager optimisation
 (fixes #2603)

---
 src/functionObjects/field/streamFunction/streamFunction.C | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/functionObjects/field/streamFunction/streamFunction.C b/src/functionObjects/field/streamFunction/streamFunction.C
index 3329d20131..741efa28d4 100644
--- a/src/functionObjects/field/streamFunction/streamFunction.C
+++ b/src/functionObjects/field/streamFunction/streamFunction.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,8 +64,6 @@ Foam::tmp<Foam::pointScalarField> Foam::functionObjects::streamFunction::calc
       & Vector<label>(Vector<label>::X, Vector<label>::Y, Vector<label>::Z)
     );
 
-    scalar thickness = vector(slabNormal) & mesh_.bounds().span();
-
     const pointMesh& pMesh = pointMesh::New(mesh_);
 
     auto tstreamFunction = tmp<pointScalarField>::New
@@ -395,6 +393,9 @@ Foam::tmp<Foam::pointScalarField> Foam::functionObjects::streamFunction::calc
     } while (!finished);
 
     // Normalise the stream-function by the 2D mesh thickness
+    // calculate thickness here to avoid compiler oddness (#2603)
+    const scalar thickness = vector(slabNormal) & mesh_.bounds().span();
+
     streamFunction /= thickness;
     streamFunction.boundaryFieldRef() = 0.0;
 

From d3419e4e56ec640a2bb2574bf8c5335b7b0f851b Mon Sep 17 00:00:00 2001
From: Mattijs Janssens <ext-mjanssens@esi-group.com>
Date: Wed, 21 Jun 2023 14:25:17 +0000
Subject: [PATCH 325/348] ENH: snappyHexMesh: enable late balancing. Fixes
 #2792

---
 etc/caseDicts/annotated/snappyHexMeshDict     |  21 +-
 .../meshRefinement/meshRefinement.H           |  19 +-
 .../meshRefinement/meshRefinementRefine.C     | 280 +++++++++---------
 .../refinementParameters.C                    |   7 +-
 .../refinementParameters.H                    |  20 +-
 .../snappyHexMeshDriver/snappyRefineDriver.C  |  70 +++--
 6 files changed, 254 insertions(+), 163 deletions(-)

diff --git a/etc/caseDicts/annotated/snappyHexMeshDict b/etc/caseDicts/annotated/snappyHexMeshDict
index 501b508980..8ebd27da57 100644
--- a/etc/caseDicts/annotated/snappyHexMeshDict
+++ b/etc/caseDicts/annotated/snappyHexMeshDict
@@ -100,8 +100,8 @@ castellatedMeshControls
     // ~~~~~~~~~~~~~~~~~~~~~
 
     // If local number of cells is >= maxLocalCells on any processor
-    // switches from from refinement followed by balancing
-    // (current method) to (weighted) balancing before refinement.
+    // algorithm switches from refinement followed by (weighted) balancing
+    // to (weighted) balancing followed by refinement.
     maxLocalCells 100000;
 
     // Overall cell limit (approximately). Refinement will stop immediately
@@ -123,9 +123,24 @@ castellatedMeshControls
     // Allow a certain level of imbalance during refining
     // (since balancing is quite expensive)
     // Expressed as fraction of perfect balance (= overall number of cells /
-    // nProcs). 0=balance always.
+    // nProcs). 0=balance always. Can be triggered by using maxCellUnbalance
     maxLoadUnbalance 0.10;
 
+    // Optional absolute unbalance start trigger. Used to avoid balancing
+    // in first refinement iterations since balancing is expensive for
+    // high core counts
+    // The trigger value is used for two checks:
+    // a: if on any processor the number of new added cells <= maxCellUnbalance
+    //    the balancing is skipped
+    // b: if on any processor the value 
+    //    (new cell count of proc - idealCellCount) <= maxCellUnbalance
+    //    the balancing is skipped
+    // Set to -1 to deactivate
+    //maxCellUnbalance 200000;
+
+    // Optional forcing balancing after the mesh is completely refined
+    //balanceAtEnd     false;
+
     // Number of buffer layers between different levels.
     // 1 means normal 2:1 refinement restriction, larger means slower
     // refinement.
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index 2e985707b7..fce8d76e65 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1271,6 +1271,17 @@ public:
             //- Refine some cells
             autoPtr<mapPolyMesh> refine(const labelList& cellsToRefine);
 
+            //- Balance the mesh
+            autoPtr<mapDistributePolyMesh> balance
+            (
+                const string& msg,
+                decompositionMethod& decomposer,
+                fvMeshDistribute& distributor,
+                labelList& cellsToRefine,
+                const scalar maxLoadUnbalance,
+                const label maxCellUnbalance
+            );
+
             //- Refine some cells and rebalance
             autoPtr<mapDistributePolyMesh> refineAndBalance
             (
@@ -1278,7 +1289,8 @@ public:
                 decompositionMethod& decomposer,
                 fvMeshDistribute& distributor,
                 const labelList& cellsToRefine,
-                const scalar maxLoadUnbalance
+                const scalar maxLoadUnbalance,
+                const label maxCellUnbalance
             );
 
             //- Balance before refining some cells
@@ -1288,7 +1300,8 @@ public:
                 decompositionMethod& decomposer,
                 fvMeshDistribute& distributor,
                 const labelList& cellsToRefine,
-                const scalar maxLoadUnbalance
+                const scalar maxLoadUnbalance,
+                const label maxCellUnbalance
             );
 
             //- Calculate list of cells to directionally refine
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index 312cfa7df3..4bbd5808d6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -2598,6 +2598,120 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
 }
 
 
+// Load balancing
+Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
+(
+    const string& msg,
+    decompositionMethod& decomposer,
+    fvMeshDistribute& distributor,
+    labelList& cellsToRefine,
+    const scalar maxLoadUnbalance,
+    const label maxCellUnbalance
+)
+{
+    autoPtr<mapDistributePolyMesh> distMap;
+
+    if (Pstream::nProcs() > 1)
+    {
+        // First check if we need to balance at all. Precalculate number of
+        // cells after refinement and see what maximum difference is.
+        const scalar nNewCells =
+            scalar(mesh_.nCells() + 7*cellsToRefine.size());
+        const scalar nNewCellsAll = returnReduce(nNewCells, sumOp<scalar>());
+        const scalar nIdealNewCells = nNewCellsAll / Pstream::nProcs();
+        const scalar unbalance = returnReduce
+        (
+            mag(1.0-nNewCells/nIdealNewCells),
+            maxOp<scalar>()
+        );
+
+        // Trigger the balancing to avoid too early balancing for better
+        // scaling performance.
+        const scalar nNewCellsOnly = scalar(7*cellsToRefine.size());
+
+        const label maxNewCells =
+            label(returnReduce(nNewCellsOnly, maxOp<scalar>()));
+
+        const label maxDeltaCells =
+            label(mag(returnReduce(nNewCells, maxOp<scalar>())-nIdealNewCells));
+
+        // New trigger to avoid too early balancing
+        // 1. Check if globally one proc exceeds the maxCellUnbalance value
+        //    related to the new added cells at the refinement loop
+        // 2. Check if globally one proc exceeds the maxCellUnbalance based on
+        //    the average cell count a proc should have
+        if
+        (
+            (maxNewCells <= maxCellUnbalance)
+         && (maxDeltaCells <= maxCellUnbalance)
+        )
+        {
+            Info<< "Skipping balancing since trigger value not reached:" << "\n"
+                << "    Trigger cell count: " << maxCellUnbalance << nl
+                << "    Max new cell count in proc: " << maxNewCells << nl
+                << "    Max difference between new cells and balanced: "
+                << maxDeltaCells << nl
+                << "    Max load unbalance " << maxLoadUnbalance
+                << nl <<endl;
+        }
+        else
+        {
+            if (unbalance <= maxLoadUnbalance)
+            {
+                Info<< "Skipping balancing since max unbalance " << unbalance
+                    << " is less than allowable " << maxLoadUnbalance
+                    << endl;
+            }
+            else
+            {
+                scalarField cellWeights(mesh_.nCells(), 1);
+                forAll(cellsToRefine, i)
+                {
+                    cellWeights[cellsToRefine[i]] += 7;
+                }
+
+                distMap = balance
+                (
+                    false,  //keepZoneFaces
+                    false,  //keepBaffles
+                    cellWeights,
+                    decomposer,
+                    distributor
+                );
+
+                // Update cells to refine
+                distMap().distributeCellIndices(cellsToRefine);
+
+                Info<< "Balanced mesh in = "
+                    << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+                printMeshInfo(debug, "After balancing " + msg);
+
+
+                if (debug&meshRefinement::MESH)
+                {
+                    Pout<< "Writing balanced " << msg
+                        << " mesh to time " << timeName() << endl;
+                    write
+                    (
+                        debugType(debug),
+                        writeType(writeLevel() | WRITEMESH),
+                        mesh_.time().path()/timeName()
+                    );
+                    Pout<< "Dumped debug data in = "
+                        << mesh_.time().cpuTimeIncrement() << " s" << endl;
+
+                    // test all is still synced across proc patches
+                    checkData();
+                }
+            }
+        }
+    }
+
+    return distMap;
+}
+
+
 // Do refinement of consistent set of cells followed by truncation and
 // load balancing.
 Foam::autoPtr<Foam::mapDistributePolyMesh>
@@ -2607,10 +2721,13 @@ Foam::meshRefinement::refineAndBalance
     decompositionMethod& decomposer,
     fvMeshDistribute& distributor,
     const labelList& cellsToRefine,
-    const scalar maxLoadUnbalance
+    const scalar maxLoadUnbalance,
+    const label maxCellUnbalance
 )
 {
-    // Do all refinement
+    // Refinement
+    // ~~~~~~~~~~
+
     refine(cellsToRefine);
 
     if (debug&meshRefinement::MESH)
@@ -2638,63 +2755,17 @@ Foam::meshRefinement::refineAndBalance
     // Load balancing
     // ~~~~~~~~~~~~~~
 
-    autoPtr<mapDistributePolyMesh> distMap;
+    labelList noCellsToRefine;
 
-    if (Pstream::nProcs() > 1)
-    {
-        scalar nIdealCells =
-            mesh_.globalData().nTotalCells()
-          / Pstream::nProcs();
-
-        scalar unbalance = returnReduce
-        (
-            mag(1.0-mesh_.nCells()/nIdealCells),
-            maxOp<scalar>()
-        );
-
-        if (unbalance <= maxLoadUnbalance)
-        {
-            Info<< "Skipping balancing since max unbalance " << unbalance
-                << " is less than allowable " << maxLoadUnbalance
-                << endl;
-        }
-        else
-        {
-            scalarField cellWeights(mesh_.nCells(), 1);
-
-            distMap = balance
-            (
-                false,  //keepZoneFaces
-                false,  //keepBaffles
-                cellWeights,
-                decomposer,
-                distributor
-            );
-
-            Info<< "Balanced mesh in = "
-                << mesh_.time().cpuTimeIncrement() << " s" << endl;
-
-            printMeshInfo(debug, "After balancing " + msg);
-
-
-            if (debug&meshRefinement::MESH)
-            {
-                Pout<< "Writing balanced " << msg
-                    << " mesh to time " << timeName() << endl;
-                write
-                (
-                    debugType(debug),
-                    writeType(writeLevel() | WRITEMESH),
-                    mesh_.time().path()/timeName()
-                );
-                Pout<< "Dumped debug data in = "
-                    << mesh_.time().cpuTimeIncrement() << " s" << endl;
-
-                // test all is still synced across proc patches
-                checkData();
-            }
-        }
-    }
+    auto distMap = balance
+    (
+        msg,
+        decomposer,
+        distributor,
+        noCellsToRefine,    // mesh is already refined; no need to predict
+        maxLoadUnbalance,
+        maxCellUnbalance
+    );
 
     return distMap;
 }
@@ -2708,7 +2779,8 @@ Foam::meshRefinement::balanceAndRefine
     decompositionMethod& decomposer,
     fvMeshDistribute& distributor,
     const labelList& initCellsToRefine,
-    const scalar maxLoadUnbalance
+    const scalar maxLoadUnbalance,
+    const label maxCellUnbalance
 )
 {
     labelList cellsToRefine(initCellsToRefine);
@@ -2737,90 +2809,24 @@ Foam::meshRefinement::balanceAndRefine
     //}
 
 
+
     // Load balancing
     // ~~~~~~~~~~~~~~
 
-    autoPtr<mapDistributePolyMesh> distMap;
-
-    if (Pstream::nProcs() > 1)
-    {
-        // First check if we need to balance at all. Precalculate number of
-        // cells after refinement and see what maximum difference is.
-        scalar nNewCells = scalar(mesh_.nCells() + 7*cellsToRefine.size());
-        scalar nIdealNewCells =
-            returnReduce(nNewCells, sumOp<scalar>())
-          / Pstream::nProcs();
-        scalar unbalance = returnReduce
-        (
-            mag(1.0-nNewCells/nIdealNewCells),
-            maxOp<scalar>()
-        );
-
-        if (unbalance <= maxLoadUnbalance)
-        {
-            Info<< "Skipping balancing since max unbalance " << unbalance
-                << " is less than allowable " << maxLoadUnbalance
-                << endl;
-        }
-        else
-        {
-            scalarField cellWeights(mesh_.nCells(), 1);
-            forAll(cellsToRefine, i)
-            {
-                cellWeights[cellsToRefine[i]] += 7;
-            }
-
-            distMap = balance
-            (
-                false,  //keepZoneFaces
-                false,  //keepBaffles
-                cellWeights,
-                decomposer,
-                distributor
-            );
-
-            // Update cells to refine
-            distMap().distributeCellIndices(cellsToRefine);
-
-            Info<< "Balanced mesh in = "
-                << mesh_.time().cpuTimeIncrement() << " s" << endl;
-        }
-
-        //{
-        //    globalIndex globalCells(mesh_.nCells());
-        //
-        //    Info<< "** Distribution after balancing:" << endl;
-        //    for (const int procI : Pstream::allProcs())
-        //    {
-        //        Info<< "    " << procI << '\t'
-        //            << globalCells.localSize(procI) << endl;
-        //    }
-        //    Info<< endl;
-        //}
-
-        printMeshInfo(debug, "After balancing " + msg);
-
-        if (debug&meshRefinement::MESH)
-        {
-            Pout<< "Writing balanced " << msg
-                << " mesh to time " << timeName() << endl;
-            write
-            (
-                debugType(debug),
-                writeType(writeLevel() | WRITEMESH),
-                mesh_.time().path()/timeName()
-            );
-            Pout<< "Dumped debug data in = "
-                << mesh_.time().cpuTimeIncrement() << " s" << endl;
-
-            // test all is still synced across proc patches
-            checkData();
-        }
-    }
+    auto distMap = balance
+    (
+        msg,
+        decomposer,
+        distributor,
+        cellsToRefine,
+        maxLoadUnbalance,
+        maxCellUnbalance
+    );
 
 
     // Refinement
     // ~~~~~~~~~~
+    // Note: uses updated cellsToRefine
 
     refine(cellsToRefine);
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
index e76bf72f91..ffe72e5d0e 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2020,2022 OpenCFD Ltd.
+    Copyright (C) 2015-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,6 +85,7 @@ Foam::refinementParameters::refinementParameters
         dict.getOrDefault("useTopologicalSnapDetection", true)
     ),
     maxLoadUnbalance_(dict.getOrDefault<scalar>("maxLoadUnbalance", 0)),
+    maxCellUnbalance_(dict.getOrDefault<label>("maxCellUnbalance", -1)),
     handleSnapProblems_
     (
         dict.getOrDefault<Switch>("handleSnapProblems", true)
@@ -97,6 +98,10 @@ Foam::refinementParameters::refinementParameters
     nFilterIter_(dict.getOrDefault<label>("nFilterIter", 2)),
     minCellFraction_(dict.getOrDefault<scalar>("minCellFraction", 0)),
     nMinCells_(dict.getOrDefault<label>("nMinCells", 0)),
+    balanceAtEnd_
+    (
+        dict.getOrDefault("balanceAtEnd", false)
+    ),
     dryRun_(dryRun)
 {
     point locationInMesh;
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
index 117ab78d55..3a7abce76d 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2014 OpenFOAM Foundation
-    Copyright (C) 2015-2020,2022 OpenCFD Ltd.
+    Copyright (C) 2015-2020,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -108,6 +108,9 @@ class refinementParameters
         //- Allowed load unbalance
         const scalar maxLoadUnbalance_;
 
+        //- Trigger cell count to start balancing
+        const label maxCellUnbalance_;
+
         const Switch handleSnapProblems_;
 
         const Switch interfaceRefine_;
@@ -120,6 +123,9 @@ class refinementParameters
 
         const label nMinCells_;
 
+        //- Force final balancing after castellation
+        const bool balanceAtEnd_;
+
         const bool dryRun_;
 
 
@@ -228,6 +234,12 @@ public:
                 return maxLoadUnbalance_;
             }
 
+            //- Trigger cell count to start balancing
+            label maxCellUnbalance() const
+            {
+                return maxCellUnbalance_;
+            }
+
             bool handleSnapProblems() const
             {
                 return handleSnapProblems_;
@@ -266,6 +278,12 @@ public:
                 return nMinCells_;
             }
 
+            //- Force final balancing after castallation
+            bool balanceAtEnd() const
+            {
+                return balanceAtEnd_;
+            }
+
 
         // Other
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index c56eb54fad..4832b63339 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -179,7 +179,8 @@ Foam::label Foam::snappyRefineDriver::featureEdgeRefine
                     decomposer_,
                     distributor_,
                     cellsToRefine,
-                    refineParams.maxLoadUnbalance()
+                    refineParams.maxLoadUnbalance(),
+                    refineParams.maxCellUnbalance()
                 );
             }
             else
@@ -190,7 +191,8 @@ Foam::label Foam::snappyRefineDriver::featureEdgeRefine
                     decomposer_,
                     distributor_,
                     cellsToRefine,
-                    refineParams.maxLoadUnbalance()
+                    refineParams.maxLoadUnbalance(),
+                    refineParams.maxCellUnbalance()
                 );
             }
         }
@@ -313,7 +315,8 @@ Foam::label Foam::snappyRefineDriver::smallFeatureRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
         else
@@ -324,7 +327,8 @@ Foam::label Foam::snappyRefineDriver::smallFeatureRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
     }
@@ -490,7 +494,8 @@ Foam::label Foam::snappyRefineDriver::surfaceOnlyRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
         else
@@ -501,7 +506,8 @@ Foam::label Foam::snappyRefineDriver::surfaceOnlyRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
     }
@@ -742,7 +748,8 @@ Foam::label Foam::snappyRefineDriver::gapOnlyRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
         else
@@ -753,7 +760,8 @@ Foam::label Foam::snappyRefineDriver::gapOnlyRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
     }
@@ -967,7 +975,8 @@ Foam::label Foam::snappyRefineDriver::bigGapOnlyRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
         else
@@ -978,7 +987,8 @@ Foam::label Foam::snappyRefineDriver::bigGapOnlyRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
     }
@@ -1090,6 +1100,22 @@ Foam::label Foam::snappyRefineDriver::danglingCellRefine
         {
             Info<< "Stopping refining since too few cells selected."
                 << nl << endl;
+
+            if (refineParams.balanceAtEnd())
+            {
+                Info<< "Final mesh balancing" << endl;
+
+                meshRefiner_.balance
+                (
+                    "",
+                    decomposer_,
+                    distributor_,
+                    cellsToRefine,
+                    0,
+                    -1
+                );
+            }
+
             break;
         }
 
@@ -1108,7 +1134,8 @@ Foam::label Foam::snappyRefineDriver::danglingCellRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
         else
@@ -1119,7 +1146,8 @@ Foam::label Foam::snappyRefineDriver::danglingCellRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
     }
@@ -1453,7 +1481,8 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
                     decomposer_,
                     distributor_,
                     cellsToRefine,
-                    refineParams.maxLoadUnbalance()
+                    refineParams.maxLoadUnbalance(),
+                    refineParams.maxCellUnbalance()
                 );
             }
             else
@@ -1464,7 +1493,8 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
                     decomposer_,
                     distributor_,
                     cellsToRefine,
-                    refineParams.maxLoadUnbalance()
+                    refineParams.maxLoadUnbalance(),
+                    refineParams.maxCellUnbalance()
                 );
             }
         }
@@ -1701,7 +1731,8 @@ Foam::label Foam::snappyRefineDriver::boundaryRefinementInterfaceRefine
                     decomposer_,
                     distributor_,
                     cellsToRefine,
-                    refineParams.maxLoadUnbalance()
+                    refineParams.maxLoadUnbalance(),
+                    refineParams.maxCellUnbalance()
                 );
             }
             else
@@ -1712,7 +1743,8 @@ Foam::label Foam::snappyRefineDriver::boundaryRefinementInterfaceRefine
                     decomposer_,
                     distributor_,
                     cellsToRefine,
-                    refineParams.maxLoadUnbalance()
+                    refineParams.maxLoadUnbalance(),
+                    refineParams.maxCellUnbalance()
                 );
             }
         }
@@ -1961,7 +1993,8 @@ Foam::label Foam::snappyRefineDriver::shellRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
         else
@@ -1972,7 +2005,8 @@ Foam::label Foam::snappyRefineDriver::shellRefine
                 decomposer_,
                 distributor_,
                 cellsToRefine,
-                refineParams.maxLoadUnbalance()
+                refineParams.maxLoadUnbalance(),
+                refineParams.maxCellUnbalance()
             );
         }
     }

From 0411a75e2467ef5eb5d888ba4bedb8f568eb7350 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 22 Jun 2023 12:27:45 +0100
Subject: [PATCH 326/348] BUG: purgeWrite: not working for overset. Fixes #2815

---
 src/overset/oversetFvMesh/oversetFvMeshBase.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/overset/oversetFvMesh/oversetFvMeshBase.C b/src/overset/oversetFvMesh/oversetFvMeshBase.C
index bdf08b1fbb..b5a9578028 100644
--- a/src/overset/oversetFvMesh/oversetFvMeshBase.C
+++ b/src/overset/oversetFvMesh/oversetFvMeshBase.C
@@ -630,7 +630,7 @@ bool Foam::oversetFvMeshBase::writeObject
 ) const
 {
     // For postprocessing : write cellTypes and zoneID
-    bool ok = false;
+    bool ok = true;
     {
         const cellCellStencilObject& overlap = Stencil::New(mesh_);
 

From 3dee3438d5129358e5ff56166b799b77cc27b252 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 21 Jun 2023 20:38:44 +0200
Subject: [PATCH 327/348] ENH: improve send/recv robustness in the presence of
 processorCyclic (#2814)

- the changes introduced in f215ad15d176 aim to reduce unnecessary
  point-to-point communication. However, if there are also
  processorCyclic boundaries involved, there are multiple connections
  between any two processors, so simply skipping empty sends will cause
  synchronization problems.

  Eg,

    On the send side:
        patch0to1_a is zero (doesn't send) and patch0to1_b does send
        (to the same processor).

    On the receive side:
        patch1to0_a receives the data intended for patch1to0_b !

  Remedy
  ======
     Simply stream all of send data into PstreamBuffers
     (regardless if empty or non-empty) but track the sends
     as a bit operation: empty (0) or non-empty (1)

     Reset the buffer slots that were only sent empty data.
     This adds an additional local overhead but avoids communication
     as much as possible.
---
 .../polyMesh/globalMeshData/globalPoints.C    | 52 +++++++++++-----
 .../polyMesh/syncTools/syncToolsTemplates.C   | 62 ++++++++++++++++---
 .../fvMesh/fvMeshSubset/fvMeshSubset.C        | 34 +++++-----
 .../algorithms/MeshWave/FaceCellWave.C        | 60 +++++++++++++-----
 .../algorithms/PointEdgeWave/PointEdgeWave.C  | 31 ++++++++--
 .../isoAdvection/isoAdvection.C               | 14 +++--
 6 files changed, 187 insertions(+), 66 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 50443ca893..361c64c051 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -487,6 +487,9 @@ void Foam::globalPoints::sendPatchPoints
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
     const labelPairList& patchInfo = globalTransforms_.patchTransformSign();
 
+    // Reset send/recv information
+    pBufs.clear();
+
     // Information to send:
 
     // The patch face
@@ -499,6 +502,19 @@ void Foam::globalPoints::sendPatchPoints
     DynamicList<labelPairList> allInfo;
 
 
+    // Reduce communication by only sending non-zero data,
+    // but with multiply-connected processor/processor
+    // (eg, processorCyclic) also need to send zero information
+    // to keep things synchronised
+
+    // Has non-zero data sent
+    Map<int> isActiveSend(0);
+
+    if (UPstream::parRun())
+    {
+        isActiveSend.resize(2*min(patches.size(),pBufs.nProcs()));
+    }
+
     forAll(patches, patchi)
     {
         const polyPatch& pp = patches[patchi];
@@ -508,7 +524,7 @@ void Foam::globalPoints::sendPatchPoints
 
         if
         (
-            (Pstream::parRun() && isA<processorPolyPatch>(pp))
+            (UPstream::parRun() && isA<processorPolyPatch>(pp))
          && (mergeSeparated || patchInfo[patchi].first() == -1)
         )
         {
@@ -561,21 +577,32 @@ void Foam::globalPoints::sendPatchPoints
             }
 
 
-            if (!patchFaces.empty())
+            // Send to neighbour
             {
-                // Send to neighbour
+                UOPstream toNbr(nbrProci, pBufs);
+                toNbr << patchFaces << indexInFace << allInfo;
+
+                // Record if send is required (data are non-zero)
+                isActiveSend(nbrProci) |= int(!patchFaces.empty());
+
                 if (debug)
                 {
-                    Pout<< " Sending from " << pp.name() << " to proc:"
+                    Pout<< "Sending from " << pp.name() << " to proc:"
                         << nbrProci << " point information:"
                         << patchFaces.size() << endl;
                 }
-
-                UOPstream toNeighbour(nbrProci, pBufs);
-                toNeighbour << patchFaces << indexInFace << allInfo;
             }
         }
     }
+
+    // Eliminate unnecessary sends
+    forAllConstIters(isActiveSend, iter)
+    {
+        if (!iter.val())
+        {
+            pBufs.clearSend(iter.key());
+        }
+    }
 }
 
 
@@ -606,7 +633,7 @@ void Foam::globalPoints::receivePatchPoints
 
         if
         (
-            (Pstream::parRun() && isA<processorPolyPatch>(pp))
+            (UPstream::parRun() && isA<processorPolyPatch>(pp))
          && (mergeSeparated || patchInfo[patchi].first() == -1)
         )
         {
@@ -615,6 +642,7 @@ void Foam::globalPoints::receivePatchPoints
 
             if (!pBufs.recvDataCount(nbrProci))
             {
+                // Nothing to receive
                 continue;
             }
 
@@ -623,8 +651,8 @@ void Foam::globalPoints::receivePatchPoints
             List<labelPairList> nbrInfo;
 
             {
-                UIPstream fromNeighbour(nbrProci, pBufs);
-                fromNeighbour >> patchFaces >> indexInFace >> nbrInfo;
+                UIPstream fromNbr(nbrProci, pBufs);
+                fromNbr >> patchFaces >> indexInFace >> nbrInfo;
             }
 
             if (debug)
@@ -929,8 +957,6 @@ void Foam::globalPoints::calculateSharedPoints
 
     // Do one exchange iteration to get neighbour points.
     {
-        pBufs.clear();
-
         sendPatchPoints
         (
             mergeSeparated,
@@ -962,8 +988,6 @@ void Foam::globalPoints::calculateSharedPoints
 
     do
     {
-        pBufs.clear();
-
         sendPatchPoints
         (
             mergeSeparated,
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index f24116864f..0cd73e8a6a 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -130,7 +130,15 @@ void Foam::syncTools::syncPointMap
         DynamicList<label> neighbProcs;
         PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
-        // Send
+        // Sample and send.
+        // Reduce communication by only sending non-zero data,
+        // but with multiply-connected processor/processor
+        // (eg, processorCyclic) also need to send zero information
+        // to keep things synchronised
+
+        // If data needs to be sent
+        Map<int> isActiveSend(2*min(patches.size(),pBufs.nProcs()));
+
         for (const polyPatch& pp : patches)
         {
             const auto* ppp = isA<processorPolyPatch>(pp);
@@ -140,10 +148,10 @@ void Foam::syncTools::syncPointMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                neighbProcs.push_back(nbrProci);
+                // Neighbour connectivity
+                neighbProcs.push_uniq(nbrProci);
 
                 // Get data per patchPoint in neighbouring point numbers.
-
                 const labelList& meshPts = procPatch.meshPoints();
                 const labelList& nbrPts = procPatch.neighbPoints();
 
@@ -161,14 +169,27 @@ void Foam::syncTools::syncPointMap
                     }
                 }
 
-                if (!patchInfo.empty())
+
+                // Send to neighbour
                 {
                     UOPstream toNbr(nbrProci, pBufs);
                     toNbr << patchInfo;
+
+                    // Record if send is required (non-empty data)
+                    isActiveSend(nbrProci) |= int(!patchInfo.empty());
                 }
             }
         }
 
+        // Eliminate unnecessary sends
+        forAllConstIters(isActiveSend, iter)
+        {
+            if (!iter.val())
+            {
+                pBufs.clearSend(iter.key());
+            }
+        }
+
         // Limit exchange to involved procs
         pBufs.finishedNeighbourSends(neighbProcs);
 
@@ -185,6 +206,7 @@ void Foam::syncTools::syncPointMap
 
                 if (!pBufs.recvDataCount(nbrProci))
                 {
+                    // Nothing to receive
                     continue;
                 }
 
@@ -386,7 +408,15 @@ void Foam::syncTools::syncEdgeMap
         DynamicList<label> neighbProcs;
         PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
-        // Send
+        // Sample and send.
+        // Reduce communication by only sending non-zero data,
+        // but with multiply-connected processor/processor
+        // (eg, processorCyclic) also need to send zero information
+        // to keep things synchronised
+
+        // If data needs to be sent
+        Map<int> isActiveSend(2*min(patches.size(),pBufs.nProcs()));
+
         for (const polyPatch& pp : patches)
         {
             const auto* ppp = isA<processorPolyPatch>(pp);
@@ -396,10 +426,10 @@ void Foam::syncTools::syncEdgeMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                neighbProcs.push_back(nbrProci);
+                // Neighbour connectivity
+                neighbProcs.push_uniq(nbrProci);
 
                 // Get data per patch edge in neighbouring edge.
-
                 const edgeList& edges = procPatch.edges();
                 const labelList& meshPts = procPatch.meshPoints();
                 const labelList& nbrPts = procPatch.neighbPoints();
@@ -419,14 +449,26 @@ void Foam::syncTools::syncEdgeMap
                     }
                 }
 
-                if (!patchInfo.empty())
+                // Send to neighbour
                 {
                     UOPstream toNbr(nbrProci, pBufs);
                     toNbr << patchInfo;
+
+                    // Record if send is required (non-empty data)
+                    isActiveSend(nbrProci) |= int(!patchInfo.empty());
                 }
             }
         }
 
+        // Eliminate unnecessary sends
+        forAllConstIters(isActiveSend, iter)
+        {
+            if (!iter.val())
+            {
+                pBufs.clearSend(iter.key());
+            }
+        }
+
         // Limit exchange to involved procs
         pBufs.finishedNeighbourSends(neighbProcs);
 
@@ -443,6 +485,7 @@ void Foam::syncTools::syncEdgeMap
 
                 if (!pBufs.recvDataCount(nbrProci))
                 {
+                    // Nothing to receive
                     continue;
                 }
 
@@ -1138,7 +1181,8 @@ void Foam::syncTools::syncBoundaryFaceList
                     const auto& procPatch = *ppp;
                     const label nbrProci = procPatch.neighbProcNo();
 
-                    neighbProcs.push_back(nbrProci);
+                    // Neighbour connectivity
+                    neighbProcs.push_uniq(nbrProci);
 
                     const SubList<T> fld
                     (
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index c31af3cca9..de5d2dfed0 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -172,24 +172,23 @@ void Foam::fvMeshSubset::doCoupledPatches
 
     label nUncoupled = 0;
 
-    if (syncPar && Pstream::parRun())
+    if (syncPar && UPstream::parRun())
     {
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
         // Send face usage across processor patches
-        for (const polyPatch& pp : oldPatches)
+        if (!nCellsUsingFace.empty())
         {
-            const auto* procPatch = isA<processorPolyPatch>(pp);
-
-            if (procPatch)
+            for (const polyPatch& pp : oldPatches)
             {
-                const label nbrProci = procPatch->neighbProcNo();
+                const auto* procPatch = isA<processorPolyPatch>(pp);
 
-                if (!nCellsUsingFace.empty())
+                if (procPatch)
                 {
-                    UOPstream toNeighbour(nbrProci, pBufs);
+                    const label nbrProci = procPatch->neighbProcNo();
 
-                    toNeighbour <<
+                    UOPstream toNbr(nbrProci, pBufs);
+                    toNbr <<
                         SubList<label>(nCellsUsingFace, pp.size(), pp.start());
                 }
             }
@@ -208,19 +207,18 @@ void Foam::fvMeshSubset::doCoupledPatches
 
                 if (!pBufs.recvDataCount(nbrProci))
                 {
+                    // Nothing to receive
                     continue;
                 }
 
-                UIPstream fromNeighbour(nbrProci, pBufs);
-
-                const labelList nbrList(fromNeighbour);
-
-                // Combine with this side.
-
-                if (!nCellsUsingFace.empty())
+                labelList nbrCellsUsingFace;
                 {
-                    const labelList& nbrCellsUsingFace(nbrList);
+                    UIPstream fromNbr(nbrProci, pBufs);
+                    fromNbr >> nbrCellsUsingFace;
+                }
 
+                if (!nCellsUsingFace.empty() && !nbrCellsUsingFace.empty())
+                {
                     // Combine with this side.
 
                     forAll(pp, i)
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index 11bdfed7b5..4f459c172a 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -532,6 +532,19 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
     // Reset buffers
     pBufs_.clear();
 
+
+    // Information to send:
+    DynamicList<Type> sendFacesInfo;
+    DynamicList<label> sendFaces;
+
+    // Reduce communication by only sending non-zero data,
+    // but with multiply-connected processor/processor
+    // (eg, processorCyclic) also need to send zero information
+    // to keep things synchronised
+
+    // If data needs to be sent
+    Map<int> isActiveSend(2*neighbourProcs.size());
+
     for (const label patchi : procPatches)
     {
         const auto& procPatch =
@@ -539,13 +552,12 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
 
         const label nbrProci = procPatch.neighbProcNo();
 
-        // Allocate buffers
-        label nSendFaces;
-        labelList sendFaces(procPatch.size());
-        List<Type> sendFacesInfo(procPatch.size());
+        // Resize buffers
+        sendFaces.resize_nocopy(procPatch.size());
+        sendFacesInfo.resize_nocopy(procPatch.size());
 
         // Determine which faces changed on current patch
-        nSendFaces = getChangedPatchFaces
+        const label nSendFaces = getChangedPatchFaces
         (
             procPatch,
             0,
@@ -554,6 +566,10 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
             sendFacesInfo
         );
 
+        // Shrink
+        sendFaces.resize(nSendFaces);
+        sendFacesInfo.resize(nSendFaces);
+
         // Adapt wallInfo for leaving domain
         leaveDomain
         (
@@ -563,19 +579,29 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
             sendFacesInfo
         );
 
-        if (nSendFaces)
+        // Send to neighbour
         {
+            UOPstream toNbr(nbrProci, pBufs_);
+            toNbr << sendFaces << sendFacesInfo;
+
+            // Record if send is required (non-empty data)
+            isActiveSend(nbrProci) |= int(!sendFaces.empty());
+
             if (debug & 2)
             {
                 Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
-                    << "  send:" << nSendFaces << " to proc:" << nbrProci
+                    << "  send:" << sendFaces.size() << " to proc:" << nbrProci
                     << endl;
             }
+        }
+    }
 
-            UOPstream os(nbrProci, pBufs_);
-            os
-                << SubList<label>(sendFaces, nSendFaces)
-                << SubList<Type>(sendFacesInfo, nSendFaces);
+    // Eliminate unnecessary sends
+    forAllConstIters(isActiveSend, iter)
+    {
+        if (!iter.val())
+        {
+            pBufs_.clearSend(iter.key());
         }
     }
 
@@ -591,6 +617,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
 
         if (!pBufs_.recvDataCount(nbrProci))
         {
+            // Nothing to receive
             continue;
         }
 
@@ -602,6 +629,8 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
             is >> receiveFaces >> receiveFacesInfo;
         }
 
+        const label nReceiveFaces = receiveFaces.size();
+
         if (debug & 2)
         {
             Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
@@ -615,7 +644,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
             transform
             (
                 procPatch.forwardT(),
-                receiveFaces.size(),
+                nReceiveFaces,
                 receiveFacesInfo
             );
         }
@@ -624,7 +653,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
         enterDomain
         (
             procPatch,
-            receiveFaces.size(),
+            nReceiveFaces,
             receiveFaces,
             receiveFacesInfo
         );
@@ -633,7 +662,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
         mergeFaceInfo
         (
             procPatch,
-            receiveFaces.size(),
+            nReceiveFaces,
             receiveFaces,
             receiveFacesInfo
         );
@@ -656,12 +685,11 @@ void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
             const auto& nbrPatch = cycPatch.neighbPatch();
 
             // Allocate buffers
-            label nReceiveFaces;
             labelList receiveFaces(patch.size());
             List<Type> receiveFacesInfo(patch.size());
 
             // Determine which faces changed
-            nReceiveFaces = getChangedPatchFaces
+            const label nReceiveFaces = getChangedPatchFaces
             (
                 nbrPatch,
                 0,
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index 02398a72db..c284c27772 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -320,6 +320,15 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
     DynamicList<label> thisPoints;
     DynamicList<label> nbrPoints;
 
+
+    // Reduce communication by only sending non-zero data,
+    // but with multiply-connected processor/processor
+    // (eg, processorCyclic) also need to send zero information
+    // to keep things synchronised
+
+    // If data needs to be sent
+    Map<int> isActiveSend(2*neighbourProcs.size());
+
     for (const label patchi : procPatches)
     {
         const auto& procPatch =
@@ -329,8 +338,10 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
 
         patchInfo.clear();
         patchInfo.reserve(procPatch.nPoints());
+
         thisPoints.clear();
         thisPoints.reserve(procPatch.nPoints());
+
         nbrPoints.clear();
         nbrPoints.reserve(procPatch.nPoints());
 
@@ -350,20 +361,31 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         // Adapt for leaving domain
         leaveDomain(procPatch, thisPoints, patchInfo);
 
-        if (patchInfo.size())
+        // Send to neighbour
         {
+            UOPstream toNbr(nbrProci, pBufs_);
+            toNbr << nbrPoints << patchInfo;
+
+            // Record if send is required (non-empty data)
+            isActiveSend(nbrProci) |= int(!patchInfo.empty());
+
             //if (debug & 2)
             //{
             //    Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
             //        << "  send:" << patchInfo.size()
             //        << " to proc:" << nbrProci << endl;
             //}
-
-            UOPstream os(nbrProci, pBufs_);
-            os << nbrPoints << patchInfo;
         }
     }
 
+    // Eliminate unnecessary sends
+    forAllConstIters(isActiveSend, iter)
+    {
+        if (!iter.val())
+        {
+            pBufs_.clearSend(iter.key());
+        }
+    }
 
     // Finished sends
     pBufs_.finishedNeighbourSends(neighbourProcs);
@@ -382,6 +404,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
 
         if (!pBufs_.recvDataCount(nbrProci))
         {
+            // Nothing to receive
             continue;
         }
 
diff --git a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
index d9b3f75e15..1b54ff2ca1 100644
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
@@ -497,7 +497,7 @@ Foam::DynamicList<Foam::label>  Foam::isoAdvection::syncProcPatches
     if (Pstream::parRun())
     {
         DynamicList<label> neighProcs;
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
         // Send
         for (const label patchi : procPatchLabels_)
@@ -506,8 +506,8 @@ Foam::DynamicList<Foam::label>  Foam::isoAdvection::syncProcPatches
                 refCast<const processorPolyPatch>(patches[patchi]);
             const label nbrProci = procPatch.neighbProcNo();
 
-            neighProcs.append(nbrProci);
-            UOPstream toNbr(nbrProci, pBufs);
+            // Neighbour connectivity
+            neighProcs.push_uniq(nbrProci);
 
             const scalarField& pFlux = dVf.boundaryField()[patchi];
             const List<label>& surfCellFacesOnProcPatch =
@@ -519,6 +519,7 @@ Foam::DynamicList<Foam::label>  Foam::isoAdvection::syncProcPatches
                 surfCellFacesOnProcPatch
             );
 
+            UOPstream toNbr(nbrProci, pBufs);
             toNbr << surfCellFacesOnProcPatch << dVfPatch;
         }
 
@@ -533,11 +534,14 @@ Foam::DynamicList<Foam::label>  Foam::isoAdvection::syncProcPatches
                 refCast<const processorPolyPatch>(patches[patchi]);
             const label nbrProci = procPatch.neighbProcNo();
 
-            UIPstream fromNeighb(nbrProci, pBufs);
             List<label> faceIDs;
             List<scalar> nbrdVfs;
 
-            fromNeighb >> faceIDs >> nbrdVfs;
+            {
+                UIPstream fromNbr(nbrProci, pBufs);
+                fromNbr >> faceIDs >> nbrdVfs;
+            }
+
             if (returnSyncedFaces)
             {
                 List<label> syncedFaceI(faceIDs);

From d5ed01dc70eac52f73746d9f7ef023216d4b8e72 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 22 Jun 2023 09:00:21 +0200
Subject: [PATCH 328/348] ENH: boundary mesh nProcessorPatches() method

- returns the number of processorPolyPatch patches (finiteVolume)
  or else the number of processorFaPatch patches (finiteArea).

  These can be useful when sizing lists etc.
---
 .../polyBoundaryMesh/polyBoundaryMesh.C       | 24 ++++++++++++++++---
 .../polyBoundaryMesh/polyBoundaryMesh.H       |  3 +++
 .../faMesh/faBoundaryMesh/faBoundaryMesh.C    | 24 ++++++++++++++++---
 .../faMesh/faBoundaryMesh/faBoundaryMesh.H    |  3 +++
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index a4d40ccc17..7b46a559c2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -541,7 +541,7 @@ Foam::label Foam::polyBoundaryMesh::nNonProcessor() const
 {
     const polyPatchList& patches = *this;
 
-    label nonProc = 0;
+    label count = 0;
 
     for (const polyPatch& p : patches)
     {
@@ -550,10 +550,28 @@ Foam::label Foam::polyBoundaryMesh::nNonProcessor() const
             break;
         }
 
-        ++nonProc;
+        ++count;
     }
 
-    return nonProc;
+    return count;
+}
+
+
+Foam::label Foam::polyBoundaryMesh::nProcessorPatches() const
+{
+    const polyPatchList& patches = *this;
+
+    label count = 0;
+
+    for (const polyPatch& p : patches)
+    {
+        if (isA<processorPolyPatch>(p))
+        {
+            ++count;
+        }
+    }
+
+    return count;
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index c747c780e3..ef84511089 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -175,6 +175,9 @@ public:
         //- The number of patches before the first processor patch.
         label nNonProcessor() const;
 
+        //- The number of processorPolyPatch patches
+        label nProcessorPatches() const;
+
         //- Return a list of patch names
         wordList names() const;
 
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
index 1906cca5ab..7c95397c4a 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@@ -309,7 +309,7 @@ Foam::label Foam::faBoundaryMesh::nNonProcessor() const
 {
     const faPatchList& patches = *this;
 
-    label nonProc = 0;
+    label count = 0;
 
     for (const faPatch& p : patches)
     {
@@ -318,10 +318,28 @@ Foam::label Foam::faBoundaryMesh::nNonProcessor() const
             break;
         }
 
-        ++nonProc;
+        ++count;
     }
 
-    return nonProc;
+    return count;
+}
+
+
+Foam::label Foam::faBoundaryMesh::nProcessorPatches() const
+{
+    const faPatchList& patches = *this;
+
+    label count = 0;
+
+    for (const faPatch& p : patches)
+    {
+        if (isA<processorFaPatch>(p))
+        {
+            ++count;
+        }
+    }
+
+    return count;
 }
 
 
diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
index 5e399a3a21..d65331d25d 100644
--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H
@@ -152,6 +152,9 @@ public:
         //- The number of patches before the first processor patch.
         label nNonProcessor() const;
 
+        //- The number of processorFaPatch patches
+        label nProcessorPatches() const;
+
         //- Return a list of patch names
         wordList names() const;
 

From c5c7f2b7fefaf87419abdbe880a064933f46f178 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 22 Jun 2023 09:14:47 +0200
Subject: [PATCH 329/348] ENH: reduce local overheads in send/recv bookkeeping
 (#2814)

- replace Map with a List or DynamicList to reduce the number of
  operations and allocations within the loops.

  Use polyBoundaryMesh::nProcessorPatches() for initial capacity
  to avoid reallocations.
---
 .../polyMesh/syncTools/syncToolsTemplates.C   | 81 +++++++++++++------
 .../algorithms/MeshWave/FaceCellWave.C        | 26 +++---
 .../algorithms/PointEdgeWave/PointEdgeWave.C  | 27 ++++---
 3 files changed, 91 insertions(+), 43 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 0cd73e8a6a..1d556af782 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -127,7 +127,9 @@ void Foam::syncTools::syncPointMap
 
     if (UPstream::parRun())
     {
-        DynamicList<label> neighbProcs;
+        // Presize according to number of processor patches
+        // (global topology information may not yet be available...)
+        DynamicList<label> neighbProcs(patches.nProcessorPatches());
         PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
         // Sample and send.
@@ -136,8 +138,8 @@ void Foam::syncTools::syncPointMap
         // (eg, processorCyclic) also need to send zero information
         // to keep things synchronised
 
-        // If data needs to be sent
-        Map<int> isActiveSend(2*min(patches.size(),pBufs.nProcs()));
+        // If data needs to be sent (index corresponding to neighbProcs)
+        DynamicList<bool> isActiveSend(neighbProcs.capacity());
 
         for (const polyPatch& pp : patches)
         {
@@ -148,9 +150,6 @@ void Foam::syncTools::syncPointMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                // Neighbour connectivity
-                neighbProcs.push_uniq(nbrProci);
-
                 // Get data per patchPoint in neighbouring point numbers.
                 const labelList& meshPts = procPatch.meshPoints();
                 const labelList& nbrPts = procPatch.neighbPoints();
@@ -170,23 +169,40 @@ void Foam::syncTools::syncPointMap
                 }
 
 
+                const bool hasSendData = (!patchInfo.empty());
+
+                // Neighbour connectivity (push_uniq)
+                // - record if send is required (non-empty data)
+                {
+                    label nbrIndex = neighbProcs.find(nbrProci);
+                    if (nbrIndex < 0)
+                    {
+                        nbrIndex = neighbProcs.size();
+                        neighbProcs.push_back(nbrProci);
+                        isActiveSend.push_back(false);
+                    }
+
+                    if (hasSendData)
+                    {
+                        isActiveSend[nbrIndex] = true;
+                    }
+                }
+
+
                 // Send to neighbour
                 {
                     UOPstream toNbr(nbrProci, pBufs);
                     toNbr << patchInfo;
-
-                    // Record if send is required (non-empty data)
-                    isActiveSend(nbrProci) |= int(!patchInfo.empty());
                 }
             }
         }
 
         // Eliminate unnecessary sends
-        forAllConstIters(isActiveSend, iter)
+        forAll(neighbProcs, nbrIndex)
         {
-            if (!iter.val())
+            if (!isActiveSend[nbrIndex])
             {
-                pBufs.clearSend(iter.key());
+                pBufs.clearSend(neighbProcs[nbrIndex]);
             }
         }
 
@@ -405,7 +421,9 @@ void Foam::syncTools::syncEdgeMap
 
     if (UPstream::parRun())
     {
-        DynamicList<label> neighbProcs;
+        // Presize according to number of processor patches
+        // (global topology information may not yet be available...)
+        DynamicList<label> neighbProcs(patches.nProcessorPatches());
         PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
         // Sample and send.
@@ -414,8 +432,8 @@ void Foam::syncTools::syncEdgeMap
         // (eg, processorCyclic) also need to send zero information
         // to keep things synchronised
 
-        // If data needs to be sent
-        Map<int> isActiveSend(2*min(patches.size(),pBufs.nProcs()));
+        // If data needs to be sent (index corresponding to neighbProcs)
+        DynamicList<bool> isActiveSend(neighbProcs.capacity());
 
         for (const polyPatch& pp : patches)
         {
@@ -426,9 +444,6 @@ void Foam::syncTools::syncEdgeMap
                 const auto& procPatch = *ppp;
                 const label nbrProci = procPatch.neighbProcNo();
 
-                // Neighbour connectivity
-                neighbProcs.push_uniq(nbrProci);
-
                 // Get data per patch edge in neighbouring edge.
                 const edgeList& edges = procPatch.edges();
                 const labelList& meshPts = procPatch.meshPoints();
@@ -449,23 +464,41 @@ void Foam::syncTools::syncEdgeMap
                     }
                 }
 
+
+                const bool hasSendData = (!patchInfo.empty());
+
+                // Neighbour connectivity (push_uniq)
+                // and record if send is required (non-empty data)
+                {
+                    label nbrIndex = neighbProcs.find(nbrProci);
+                    if (nbrIndex < 0)
+                    {
+                        nbrIndex = neighbProcs.size();
+                        neighbProcs.push_back(nbrProci);
+                        isActiveSend.push_back(false);
+                    }
+
+                    if (hasSendData)
+                    {
+                        isActiveSend[nbrIndex] = true;
+                    }
+                }
+
+
                 // Send to neighbour
                 {
                     UOPstream toNbr(nbrProci, pBufs);
                     toNbr << patchInfo;
-
-                    // Record if send is required (non-empty data)
-                    isActiveSend(nbrProci) |= int(!patchInfo.empty());
                 }
             }
         }
 
         // Eliminate unnecessary sends
-        forAllConstIters(isActiveSend, iter)
+        forAll(neighbProcs, nbrIndex)
         {
-            if (!iter.val())
+            if (!isActiveSend[nbrIndex])
             {
-                pBufs.clearSend(iter.key());
+                pBufs.clearSend(neighbProcs[nbrIndex]);
             }
         }
 
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index 4f459c172a..2960a380a7 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -542,8 +542,8 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
     // (eg, processorCyclic) also need to send zero information
     // to keep things synchronised
 
-    // If data needs to be sent
-    Map<int> isActiveSend(2*neighbourProcs.size());
+    // If data needs to be sent (index corresponding to neighbourProcs)
+    List<bool> isActiveSend(neighbourProcs.size(), false);
 
     for (const label patchi : procPatches)
     {
@@ -579,14 +579,21 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
             sendFacesInfo
         );
 
+        // Record if send is required (non-empty data)
+        if (!sendFaces.empty())
+        {
+            const label nbrIndex = neighbourProcs.find(nbrProci);
+            if (nbrIndex >= 0)  // Safety check (should be unnecessary)
+            {
+                isActiveSend[nbrIndex] = true;
+            }
+        }
+
         // Send to neighbour
         {
             UOPstream toNbr(nbrProci, pBufs_);
             toNbr << sendFaces << sendFacesInfo;
 
-            // Record if send is required (non-empty data)
-            isActiveSend(nbrProci) |= int(!sendFaces.empty());
-
             if (debug & 2)
             {
                 Pout<< " Processor patch " << patchi << ' ' << procPatch.name()
@@ -597,17 +604,18 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
     }
 
     // Eliminate unnecessary sends
-    forAllConstIters(isActiveSend, iter)
+    forAll(neighbourProcs, nbrIndex)
     {
-        if (!iter.val())
+        if (!isActiveSend[nbrIndex])
         {
-            pBufs_.clearSend(iter.key());
+            pBufs_.clearSend(neighbourProcs[nbrIndex]);
         }
     }
 
-    // Finished sends
+    // Limit exchange to involved procs
     pBufs_.finishedNeighbourSends(neighbourProcs);
 
+
     for (const label patchi : procPatches)
     {
         const auto& procPatch =
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index c284c27772..cfa618db20 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -326,8 +326,8 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
     // (eg, processorCyclic) also need to send zero information
     // to keep things synchronised
 
-    // If data needs to be sent
-    Map<int> isActiveSend(2*neighbourProcs.size());
+    // If data needs to be sent (index corresponding to neighbourProcs)
+    List<bool> isActiveSend(neighbourProcs.size(), false);
 
     for (const label patchi : procPatches)
     {
@@ -361,14 +361,21 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
         // Adapt for leaving domain
         leaveDomain(procPatch, thisPoints, patchInfo);
 
+        // Record if send is required (non-empty data)
+        if (!patchInfo.empty())
+        {
+            const label nbrIndex = neighbourProcs.find(nbrProci);
+            if (nbrIndex >= 0)  // Safety check (should be unnecessary)
+            {
+                isActiveSend[nbrIndex] = true;
+            }
+        }
+
         // Send to neighbour
         {
             UOPstream toNbr(nbrProci, pBufs_);
             toNbr << nbrPoints << patchInfo;
 
-            // Record if send is required (non-empty data)
-            isActiveSend(nbrProci) |= int(!patchInfo.empty());
-
             //if (debug & 2)
             //{
             //    Pout<< "Processor patch " << patchi << ' ' << procPatch.name()
@@ -379,15 +386,15 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
     }
 
     // Eliminate unnecessary sends
-    forAllConstIters(isActiveSend, iter)
+    forAll(neighbourProcs, nbrIndex)
     {
-        if (!iter.val())
+        if (!isActiveSend[nbrIndex])
         {
-            pBufs_.clearSend(iter.key());
+            pBufs_.clearSend(neighbourProcs[nbrIndex]);
         }
     }
 
-    // Finished sends
+    // Limit exchange to involved procs
     pBufs_.finishedNeighbourSends(neighbourProcs);
 
 

From a3e6af8fcf72ee29126007f9e75b869b60b40b35 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 22 Jun 2023 15:08:38 +0100
Subject: [PATCH 330/348] BUG: processorCyclic: cell->point interpolation.
 Fixes #2817

---
 .../processorCyclicPointPatchField.C          | 20 +++++++++----------
 .../processorCyclicPointPatchField.H          |  3 +++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
index 8dee733480..0554b28a9c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
@@ -95,19 +95,19 @@ void Foam::processorCyclicPointPatchField<Type>::initSwapAddSeparated
 {
     if (Pstream::parRun())
     {
-        // Get internal field into correct order for opposite side
-        Field<Type> pf
+        // Get internal field into correct order for opposite side. Note use
+        // of member data buffer since using non-blocking. Could be optimised
+        // out if not using non-blocking...
+        sendBuf_ = this->patchInternalField
         (
-            this->patchInternalField
-            (
-                pField,
-                procPatch_.reverseMeshPoints()
-            )
+            pField,
+            procPatch_.reverseMeshPoints()
         );
 
         if (commsType == Pstream::commsTypes::nonBlocking)
         {
-            recvBuf_.resize_nocopy(pf.size());
+            recvBuf_.resize_nocopy(sendBuf_.size());
+
             UIPstream::read
             (
                 commsType,
@@ -122,8 +122,8 @@ void Foam::processorCyclicPointPatchField<Type>::initSwapAddSeparated
         (
             commsType,
             procPatch_.neighbProcNo(),
-            pf.cdata_bytes(),
-            pf.size_bytes(),
+            sendBuf_.cdata_bytes(),
+            sendBuf_.size_bytes(),
             procPatch_.tag(),
             procPatch_.comm()
         );
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index b4d5a5396a..7dd46e4f74 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
@@ -60,6 +60,9 @@ class processorCyclicPointPatchField
         //- Local reference to processor patch
         const processorCyclicPointPatch& procPatch_;
 
+        //- Send buffer for non-blocking communication
+        mutable Field<Type> sendBuf_;
+
         //- Receive buffer for non-blocking communication
         mutable Field<Type> recvBuf_;
 

From 360aad19dc07c820ab2a6d05b6d19765d6fa1ca0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 22 Jun 2023 12:44:45 +0200
Subject: [PATCH 331/348] DOC: document the NBX and PstreamBuffers parameters

---
 etc/controlDict                               | 29 ++++++++++++++-----
 .../db/IOstreams/Pstreams/PstreamBuffers.C    | 12 ++++----
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |  4 +--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/etc/controlDict b/etc/controlDict
index f74e10d1ea..4b70f24001 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -141,10 +141,6 @@ OptimisationSwitches
     // Min number of processors to change to tree communication
     nProcsSimpleSum 0;
 
-    // Min number processor to use non-blocking exchange (NBX) algorithm
-    // However, a zero value == disabled.
-    nonBlockingExchange 0;
-
     // MPI buffer size (bytes).
     // Can override with the MPI_BUFFER_SIZE env variable.
     // The default and minimum is (20000000).
@@ -152,22 +148,39 @@ OptimisationSwitches
 
     // Optional max size (bytes) for unstructured data exchanges. In some
     // phases of OpenFOAM it can send over very large data chunks
-    // (e.g. in parallel load balancing) and some Pstream implementations have
+    // (e.g. in parallel load balancing) and some MPI implementations have
     // problems with this. Setting this variable > 0 indicates that the
     // data exchange needs to be done in multiple passes, each of maxCommsSize.
     // This is not switched on by default since it requires an additional
     // global reduction, even if multi-pass is not needed)
     maxCommsSize    0;
 
-    // Optional (quite experimental) feature in lduMatrixUpdate
+    // Optional (experimental) feature in lduMatrixUpdate
     // to poll (processor) interfaces for individual readiness
     // instead of waiting for all to complete first.
+    //   -1 : wait for any requests to finish and dispatch when possible
+    //    0 : non-polling
+    //   >0 : number of times to poll for requests (and dispatch) before
+    //        reverting to non-polling (deprecated)
     nPollProcInterfaces 0;
 
+    // Min number of processors to use non-blocking exchange (NBX) algorithm
+    //   >0 : enabled
+    nbx.min         0;
+
     // Additional non-blocking exchange (NBX) tuning parameters (experimental)
-    // 0: none, 1: initial barrier
+    //    0 : none
+    //    1 : initial barrier
     nbx.tuning      0;
 
+    // Additional PstreamBuffers tuning parameters (experimental)
+    //   -1 : PEX with all-to-all for buffer sizes and point-to-point
+    //        for contents (legacy approach)
+    //    0 : hybrid PEX with NBX for buffer sizes and point-to-point
+    //        for contents (proposed new approach)
+    //    1 : full NBX for buffer sizes and contents (very experimental)
+    pbufs.tuning   -1;
+
 
     // =====
     // Other
@@ -1025,6 +1038,8 @@ DebugSwitches
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 DimensionedConstants
 {
     unitSet SI; // USCS
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index c8de9f243e..8c047dbdf5 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -35,12 +35,12 @@ License
 
 int Foam::PstreamBuffers::algorithm
 (
-    // Not really the most creative name...
-    Foam::debug::optimisationSwitch("pbufs.algorithm", -1)
+    // Name may change in the future (JUN-2023)
+    Foam::debug::optimisationSwitch("pbufs.tuning", -1)
 );
 registerOptSwitch
 (
-    "pbufs.algorithm",
+    "pbufs.tuning",
     int,
     Foam::PstreamBuffers::algorithm
 );
@@ -48,9 +48,9 @@ registerOptSwitch
 
 // Simple enumerations
 // -------------------
-static constexpr int algorithm_PEX_allToAll = -1;  // OpenFOAM 2212 and earlier
-//static constexpr int algorithm_PEX_hybrid = 0;   // New default?
-static constexpr int algorithm_full_NBX = 1;       // Experimental
+static constexpr int algorithm_PEX_allToAll = -1;  // Traditional PEX
+//static constexpr int algorithm_PEX_hybrid = 0;   // Possible new default?
+static constexpr int algorithm_full_NBX = 1;       // Very experimental
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 2aa12b7311..6e9fa98636 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -799,11 +799,11 @@ registerOptSwitch
 
 int Foam::UPstream::nProcsNonblockingExchange
 (
-    Foam::debug::optimisationSwitch("nonBlockingExchange", 0)
+    Foam::debug::optimisationSwitch("nbx.min", 0)
 );
 registerOptSwitch
 (
-    "nonBlockingExchange",
+    "nbx.min",
     int,
     Foam::UPstream::nProcsNonblockingExchange
 );

From 6a1e56e6e9b570dbfe0797d9a0a95a05b516518b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 22 Jun 2023 15:54:58 +0200
Subject: [PATCH 332/348] SUBMODULE: updates for OpenQBMM

- https://github.com/OpenQBMM/OpenQBMM/releases/tag/OpenFOAM-v2306
---
 modules/OpenQBMM | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/OpenQBMM b/modules/OpenQBMM
index ec923f2487..253d099ee9 160000
--- a/modules/OpenQBMM
+++ b/modules/OpenQBMM
@@ -1 +1 @@
-Subproject commit ec923f24874e29419ef4153e4993919804fb9e86
+Subproject commit 253d099ee945426a2e827711f8e66452f159aeb9

From 7edacd3ab08db977f0de457522d8f36bdd540f4a Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Thu, 22 Jun 2023 17:34:31 +0100
Subject: [PATCH 333/348] ENH: yPlus: eliminate field IO control of controlDict
 (fixes #2813)

---
 src/functionObjects/field/yPlus/yPlus.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C
index 68365a610e..4296484fd3 100644
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,7 +87,7 @@ Foam::functionObjects::yPlus::yPlus
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
+                IOobject::NO_WRITE,
                 IOobject::REGISTER
             ),
             mesh_,

From 2afd2320ce5e2ac09e489ce9c485049ac920c55f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 23 Jun 2023 13:05:27 +0200
Subject: [PATCH 334/348] ENH: yPlus: support disable of field writing (#2813)

- for simulations where the yPlus is needed for other purposes or
  just for obtaining information on the patches it can be useful
  to disable field writing and save disk space.

  The 'writeFields' flag (as per some other function objects)
  has been added control writing the yPlus volume field.

  If unspecified, the default value is 'true' so that the yPlus
  function object continues to work as before.
  However, this default may change to 'false' in the future to align
  with other function objects.

ENH: wallShearStress: support disable of field writing

- similar to yPlus, the write() method combines writing information
  and writing the fields. The 'writeFields' flag allows some
  separation of that logic.
---
 .../postProcessing/fields/wallShearStress     |  3 +-
 etc/caseDicts/postProcessing/fields/yPlus     |  3 +-
 .../field/wallShearStress/wallShearStress.C   | 22 +++++----
 .../field/wallShearStress/wallShearStress.H   | 26 ++++++++---
 src/functionObjects/field/yPlus/yPlus.C       | 46 ++++++++++---------
 src/functionObjects/field/yPlus/yPlus.H       | 25 +++++++---
 .../BFGS-continuation/system/controlDict      |  3 +-
 .../opt/losses/BFGS-oneGo/system/controlDict  |  3 +-
 .../SA/opt/losses/BFGS/op1/system/controlDict |  3 +-
 .../SA/opt/nutSqr/system/controlDict          |  3 +-
 .../opt/powerDissipation/system/controlDict   |  3 +-
 .../kOmegaSST/opt/system/controlDict          |  3 +-
 .../setups.orig/common/system/controlDict     |  5 +-
 .../fullCase/system/controlDict               |  3 +-
 .../setups.orig/common/system/wallFields      |  6 +--
 .../laminar/cylinder2D/system/controlDict     |  3 +-
 .../RAS/cavity/system/FOs/FOwallShearStress   |  5 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOyPlus    |  4 +-
 .../setups.orig/common/system/controlDict     |  5 +-
 .../setups.orig/common/system/controlDict     |  3 +-
 .../setups.orig/common/system/controlDict     |  4 +-
 .../setups.orig/common/system/controlDict     |  4 +-
 22 files changed, 119 insertions(+), 66 deletions(-)

diff --git a/etc/caseDicts/postProcessing/fields/wallShearStress b/etc/caseDicts/postProcessing/fields/wallShearStress
index 8eafd7db2d..414f29a42d 100644
--- a/etc/caseDicts/postProcessing/fields/wallShearStress
+++ b/etc/caseDicts/postProcessing/fields/wallShearStress
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
@@ -14,6 +14,7 @@ Description
 type            wallShearStress;
 libs            (fieldFunctionObjects);
 
+writeFields     yes;
 executeControl  writeTime;
 writeControl    writeTime;
 
diff --git a/etc/caseDicts/postProcessing/fields/yPlus b/etc/caseDicts/postProcessing/fields/yPlus
index d7ee28137b..d3e463db75 100644
--- a/etc/caseDicts/postProcessing/fields/yPlus
+++ b/etc/caseDicts/postProcessing/fields/yPlus
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
@@ -13,6 +13,7 @@ Description
 type            yPlus;
 libs            (fieldFunctionObjects);
 
+writeFields     yes;
 executeControl  writeTime;
 writeControl    writeTime;
 
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index 43feefd219..0f27187334 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,7 +90,7 @@ Foam::functionObjects::wallShearStress::wallShearStress
 :
     fvMeshFunctionObject(name, runTime, dict),
     writeFile(mesh_, name, typeName, dict),
-    patchSet_()
+    writeFields_(true)  // May change in the future
 {
     read(dict);
 
@@ -125,6 +125,9 @@ bool Foam::functionObjects::wallShearStress::read(const dictionary& dict)
     fvMeshFunctionObject::read(dict);
     writeFile::read(dict);
 
+    writeFields_ = true;   // May change in the future
+    dict.readIfPresent("writeFields", writeFields_);
+
     const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
     patchSet_ =
@@ -221,10 +224,13 @@ bool Foam::functionObjects::wallShearStress::write()
     const auto& wallShearStress =
         obr_.lookupObject<volVectorField>(scopedName(typeName));
 
-    Log << type() << " " << name() << " write:" << nl
-        << "    writing field " << wallShearStress.name() << endl;
+    Log << type() << ' ' << name() << " write:" << nl;
 
-    wallShearStress.write();
+    if (writeFields_)
+    {
+        Log << "    writing field " << wallShearStress.name() << endl;
+        wallShearStress.write();
+    }
 
     const fvPatchList& patches = mesh_.boundary();
 
@@ -234,10 +240,10 @@ bool Foam::functionObjects::wallShearStress::write()
 
         const vectorField& ssp = wallShearStress.boundaryField()[patchi];
 
-        vector minSsp = gMin(ssp);
-        vector maxSsp = gMax(ssp);
+        const vector minSsp = gMin(ssp);
+        const vector maxSsp = gMax(ssp);
 
-        if (Pstream::master())
+        if (UPstream::master())
         {
             writeCurrentTime(file());
 
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.H b/src/functionObjects/field/wallShearStress/wallShearStress.H
index f0c119a8b8..c0908f1276 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.H
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,8 +65,8 @@ Usage
         // Optional entries (runtime modifiable)
         patches     (<patch1> ... <patchN>); // (wall1 "(wall2|wall3)");
 
-        // Optional (inherited) entries
-        ...
+        // Optional entries
+        writeFields     true;
     }
     \endverbatim
 
@@ -76,6 +76,7 @@ Usage
       type         | Type name: wallShearStress            | word |  yes  | -
       libs         | Library name: fieldFunctionObjects    | word |  yes  | -
       patches    | Names of operand patches   | wordList | no | all wall patches
+      writeFields | Flag to write shear stress field       | bool |  no   | true
     \endtable
 
     The inherited entries are elaborated in:
@@ -87,6 +88,12 @@ Usage
         <solver> -postProcess -func wallShearStress
     \endverbatim
 
+Note
+    The \c writeFields flag currently defaults to \c true
+    (for consistency with previous versions that did not have that flag)
+    but this is subject to change in the near future for consistency
+    with other function objects.
+
 See also
     - Foam::functionObject
     - Foam::functionObjects::fvMeshFunctionObject
@@ -98,8 +105,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef functionObjects_wallShearStress_H
-#define functionObjects_wallShearStress_H
+#ifndef Foam_functionObjects_wallShearStress_H
+#define Foam_functionObjects_wallShearStress_H
 
 #include "fvMeshFunctionObject.H"
 #include "writeFile.H"
@@ -122,6 +129,12 @@ class wallShearStress
     public fvMeshFunctionObject,
     public writeFile
 {
+    // Private Data
+
+        //- Write the shear stress field ?
+        bool writeFields_;
+
+
 protected:
 
     // Protected Data
@@ -178,7 +191,8 @@ public:
         //- Calculate the wall shear-stress
         virtual bool execute();
 
-        //- Write the wall shear-stress
+        //- Report min/max and log to file,
+        //- write the wall shear-stress volume field.
         virtual bool write();
 };
 
diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C
index 4296484fd3..b175a154bf 100644
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@@ -71,7 +71,8 @@ Foam::functionObjects::yPlus::yPlus
 :
     fvMeshFunctionObject(name, runTime, dict),
     writeFile(obr_, name, typeName, dict),
-    useWallFunction_(true)
+    useWallFunction_(true),
+    writeFields_(true)  // May change in the future
 {
     read(dict);
 
@@ -105,7 +106,11 @@ bool Foam::functionObjects::yPlus::read(const dictionary& dict)
 {
     if (fvMeshFunctionObject::read(dict) && writeFile::read(dict))
     {
-        useWallFunction_ = dict.getOrDefault("useWallFunction", true);
+        useWallFunction_ = true;
+        writeFields_ = true;   // May change in the future
+
+        dict.readIfPresent("useWallFunction", useWallFunction_);
+        dict.readIfPresent("writeFields", writeFields_);
 
         return true;
     }
@@ -144,19 +149,12 @@ bool Foam::functionObjects::yPlus::execute()
         {
             const fvPatch& patch = patches[patchi];
 
-            if
-            (
-                isA<nutWallFunctionFvPatchScalarField>(nutBf[patchi])
-             && useWallFunction_
-            )
-            {
-                const nutWallFunctionFvPatchScalarField& nutPf =
-                    dynamic_cast<const nutWallFunctionFvPatchScalarField&>
-                    (
-                        nutBf[patchi]
-                    );
+            const auto* nutWallPatch =
+                isA<nutWallFunctionFvPatchScalarField>(nutBf[patchi]);
 
-                yPlusBf[patchi] = nutPf.yPlus();
+            if (useWallFunction_ && nutWallPatch)
+            {
+                yPlusBf[patchi] = nutWallPatch->yPlus();
             }
             else if (isA<wallFvPatch>(patch))
             {
@@ -194,10 +192,13 @@ bool Foam::functionObjects::yPlus::write()
 {
     const auto& yPlus = obr_.lookupObject<volScalarField>(scopedName(typeName));
 
-    Log << type() << " " << name() << " write:" << nl
-        << "    writing field " << yPlus.name() << endl;
+    Log << type() << ' ' << name() << " write:" << nl;
 
-    yPlus.write();
+    if (writeFields_)
+    {
+        Log << "    writing field " << yPlus.name() << endl;
+        yPlus.write();
+    }
 
     const volScalarField::Boundary& yPlusBf = yPlus.boundaryField();
     const fvPatchList& patches = mesh_.boundary();
@@ -214,12 +215,8 @@ bool Foam::functionObjects::yPlus::write()
             const scalar maxYplus = gMax(yPlusp);
             const scalar avgYplus = gAverage(yPlusp);
 
-            if (Pstream::master())
+            if (UPstream::master())
             {
-                Log << "    patch " << patch.name()
-                    << " y+ : min = " << minYplus << ", max = " << maxYplus
-                    << ", average = " << avgYplus << nl;
-
                 writeCurrentTime(file());
                 file()
                     << token::TAB << patch.name()
@@ -228,6 +225,11 @@ bool Foam::functionObjects::yPlus::write()
                     << token::TAB << avgYplus
                     << endl;
             }
+
+            Log << "    patch " << patch.name()
+                << " y+ : min = " << minYplus
+                << ", max = " << maxYplus
+                << ", average = " << avgYplus << endl;
         }
     }
 
diff --git a/src/functionObjects/field/yPlus/yPlus.H b/src/functionObjects/field/yPlus/yPlus.H
index 1e70952e53..4bb5cf922b 100644
--- a/src/functionObjects/field/yPlus/yPlus.H
+++ b/src/functionObjects/field/yPlus/yPlus.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2021 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,8 @@ Usage
         libs        (fieldFunctionObjects);
 
         // Optional entries
-        useWallFunction    true;
+        useWallFunction true;
+        writeFields     true;
 
         // Optional (inherited) entries
         ...
@@ -67,6 +68,7 @@ Usage
                       --> the selected nut wall function to compute yPlus, <!--
                       --> otherwise directly compute yPlus from flow field <!--
                       -->                             | bool | no    | true
+      writeFields | Flag to write yPlus field         | bool |  no   | true
     \endtable
 
     The inherited entries are elaborated in:
@@ -78,6 +80,12 @@ Usage
         <solver> -postProcess -func yPlus
     \endverbatim
 
+Note
+    The \c writeFields flag currently defaults to \c true
+    (for consistency with previous versions that did not have that flag)
+    but this is subject to change in the near future for consistency
+    with other function objects.
+
 See also
     - Foam::functionObject
     - Foam::functionObjects::fvMeshFunctionObject
@@ -89,8 +97,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef functionObjects_yPlus_H
-#define functionObjects_yPlus_H
+#ifndef Foam_functionObjects_yPlus_H
+#define Foam_functionObjects_yPlus_H
 
 #include "fvMeshFunctionObject.H"
 #include "writeFile.H"
@@ -100,7 +108,6 @@ SourceFiles
 
 namespace Foam
 {
-
 namespace functionObjects
 {
 
@@ -115,9 +122,12 @@ class yPlus
 {
     // Private Data
 
-        //- Flag to use the wall function expressions to compute yPlus
+        //- Use the wall function expressions to compute yPlus ?
         bool useWallFunction_;
 
+        //- Write the yPlus field ?
+        bool writeFields_;
+
 
     // Private Member Functions
 
@@ -160,7 +170,8 @@ public:
         //- Calculate the yPlus field
         virtual bool execute();
 
-        //- Write the yPlus field
+        //- Report min/max/avg (per patch) and log to file,
+        //- write the yPlus volume field.
         virtual bool write();
 };
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/controlDict
index bd3afebdbd..d9ac5b98f9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@ functions
     {
         type            yPlus;
         libs            ( fieldFunctionObjects );
+        writeFields     yes;
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/controlDict
index ae926e76be..a3ffc30a3f 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/controlDict
index 864d2f3e04..0fbae566f2 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/controlDict
index c0facbdebc..eb85fbff54 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/controlDict
index c0facbdebc..eb85fbff54 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
     }
 }
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/controlDict
index 062df0c51f..6969c98c94 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@ functions
 //  {
 //      type            yPlus;
 //      libs            ("libfieldFunctionObjects.so");
+//      writeFields     yes;
 //      writeControl    writeTime;
 //  }
 }
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
index 929b6b6e83..4f989675b3 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -55,10 +55,11 @@ functions
     {
         type                wallShearStress;
         libs                (fieldFunctionObjects);
+        log                 yes;
         patches             ( bottom top );
         writePrecision      10;
+        writeFields         yes;
         writeToFile         yes;
-        log                 yes;
         executeControl      timeStep;
         executeInterval     1;
         writeControl        writeTime;
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
index ed1545581b..4ee2b6e92e 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -95,6 +95,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
     }
     fieldAverage1
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/wallFields b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/wallFields
index 96dd57ccc0..4e2f5be5a3 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/wallFields
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/wallFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -12,6 +12,7 @@ wallShearStress
     libs            (fieldFunctionObjects);
 
     enabled         true;
+    writeFields     yes;
     writeControl    writeTime;
 
     patches         ( bottomWall );
@@ -23,9 +24,8 @@ yPlus
     libs            (fieldFunctionObjects);
 
     enabled         true;
+    writeFields     yes;
     writeControl    writeTime;
-
-    patches         ( bottomWall );
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict
index d320288472..15e96d1720 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -127,6 +127,7 @@ functions
         type            yPlus;
         libs            (fieldFunctionObjects);
         timeStart       10;
+        writeFields     yes;
         executeControl  timeStep;
         executeInterval 1;
         writeControl    writeTime;
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwallShearStress b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwallShearStress
index cd1734adb7..fa4c519f16 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwallShearStress
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwallShearStress
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -13,7 +13,8 @@ wallShearStress1
     libs            (fieldFunctionObjects);
 
     // Optional entries
-    patches          (fixedWalls);
+    patches         (fixedWalls);
+    writeFields     yes;
 
     // Optional (inherited) entries
     writePrecision  10;
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOyPlus b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOyPlus
index 59daa21b93..3a2703be6e 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOyPlus
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOyPlus
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -22,6 +22,8 @@ yPlus1
     log             true;
     timeStart       0;
     timeEnd         1000;
+
+    writeFields     yes;
     executeControl  timeStep;
     executeInterval 1;
     writeControl    writeTime;
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/controlDict b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/controlDict
index 7610822619..216f8b088f 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -81,6 +81,7 @@ functions
     {
         type            wallShearStress;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
         patches         (bump);
     }
@@ -89,8 +90,8 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         writeControl    writeTime;
-        patches         (bump);
     }
 
     cellCentres
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/controlDict b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/controlDict
index 75cd7443f4..b7c163a514 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -59,6 +59,7 @@ functions
         type            yPlus;
         libs            (fieldFunctionObjects);
         patches         (fixedWall);
+        writeFields     yes;
         writeControl    writeTime;
     }
 
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
index 98f9267e3a..df51edf6b6 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -61,6 +61,7 @@ functions
     {
         type            wallShearStress;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         patches         ( bottom );
         executeControl  writeTime;
         writeControl    writeTime;
@@ -70,6 +71,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         executeControl  writeTime;
         writeControl    writeTime;
     }
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
index 3411cc17b7..8bc3f48401 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -61,6 +61,7 @@ functions
     {
         type            wallShearStress;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         patches         ( bottom );
         executeControl  writeTime;
         writeControl    writeTime;
@@ -70,6 +71,7 @@ functions
     {
         type            yPlus;
         libs            (fieldFunctionObjects);
+        writeFields     yes;
         executeControl  writeTime;
         writeControl    writeTime;
     }

From 642d8a9dfa4db5e87b47e96eca767c1455c06cb1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 23 Jun 2023 14:02:21 +0200
Subject: [PATCH 335/348] COMP: guards around #define OMPI_SKIP_MPICXX (avoids
 compiler warnings)

---
 .../test/00-dummy/library/mpi/dummyMpiLib.cpp     |  8 ++++++++
 .../test/parallel-comm2/Test-parallel-comm2.C     |  8 ++++++++
 .../test/parallel-comm3a/Test-parallel-comm3a.C   |  9 +++++++++
 .../Test-parallel-external-init.C                 | 11 +++++++++--
 .../processorTopology/Test-processorTopology.C    |  8 ++++++++
 src/Pstream/mpi/PstreamGlobals.H                  |  8 ++++++++
 src/Pstream/mpi/UPstreamWrapping.H                |  8 ++++++++
 src/parallel/decompose/kahipDecomp/kahipDecomp.C  | 15 +++++++++++----
 src/parallel/decompose/metisDecomp/metisDecomp.C  |  4 ++++
 .../decompose/ptscotchDecomp/ptscotchDecomp.C     | 10 +++++++++-
 .../decompose/scotchDecomp/scotchDecomp.C         |  5 +++++
 src/renumber/zoltanRenumber/zoltanRenumber.C      |  8 ++++++++
 12 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/applications/test/00-dummy/library/mpi/dummyMpiLib.cpp b/applications/test/00-dummy/library/mpi/dummyMpiLib.cpp
index a0c5ed3430..cd01738148 100644
--- a/applications/test/00-dummy/library/mpi/dummyMpiLib.cpp
+++ b/applications/test/00-dummy/library/mpi/dummyMpiLib.cpp
@@ -27,6 +27,14 @@ License
 
 #include "dummyLib.H"
 #include <iostream>
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //
diff --git a/applications/test/parallel-comm2/Test-parallel-comm2.C b/applications/test/parallel-comm2/Test-parallel-comm2.C
index 5f9f575bf6..6da3b03faa 100644
--- a/applications/test/parallel-comm2/Test-parallel-comm2.C
+++ b/applications/test/parallel-comm2/Test-parallel-comm2.C
@@ -40,6 +40,14 @@ Description
 #include "IOstreams.H"
 #include "PstreamReduceOps.H"
 #include "SHA1.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 using namespace Foam;
diff --git a/applications/test/parallel-comm3a/Test-parallel-comm3a.C b/applications/test/parallel-comm3a/Test-parallel-comm3a.C
index 26403bc256..2dc745988b 100644
--- a/applications/test/parallel-comm3a/Test-parallel-comm3a.C
+++ b/applications/test/parallel-comm3a/Test-parallel-comm3a.C
@@ -40,10 +40,19 @@ Description
 #include "IOstreams.H"
 #include "StringStream.H"
 #include "Random.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 using namespace Foam;
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void printRequests(const UList<MPI_Request>& requests)
 {
diff --git a/applications/test/parallel-external-init/Test-parallel-external-init.C b/applications/test/parallel-external-init/Test-parallel-external-init.C
index a838739ee1..6c1af9fedc 100644
--- a/applications/test/parallel-external-init/Test-parallel-external-init.C
+++ b/applications/test/parallel-external-init/Test-parallel-external-init.C
@@ -38,10 +38,17 @@ Description
 #include "vector.H"
 #include "IOstreams.H"
 #include "Pstream.H"
-
-#include <mpi.h>
 #include <iostream>
 
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
+#include <mpi.h>
+
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/processorTopology/Test-processorTopology.C b/applications/test/processorTopology/Test-processorTopology.C
index ffad839c58..786e5bf070 100644
--- a/applications/test/processorTopology/Test-processorTopology.C
+++ b/applications/test/processorTopology/Test-processorTopology.C
@@ -33,6 +33,14 @@ Description
 #include "polyMesh.H"
 #include "globalMeshData.H"
 #include "OFstream.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 using namespace Foam;
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index d2ce681ce0..fb8aaec350 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -41,6 +41,14 @@ SourceFiles
 
 #include "DynamicList.H"
 #include "UPstream.H"  // for UPstream::Request
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/UPstreamWrapping.H b/src/Pstream/mpi/UPstreamWrapping.H
index 984a4f857e..828c9336d0 100644
--- a/src/Pstream/mpi/UPstreamWrapping.H
+++ b/src/Pstream/mpi/UPstreamWrapping.H
@@ -39,6 +39,14 @@ SourceFiles
 #define Foam_UPstreamWrapping_H
 
 #include "UPstream.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/parallel/decompose/kahipDecomp/kahipDecomp.C b/src/parallel/decompose/kahipDecomp/kahipDecomp.C
index bc3990d107..8d29fdd6ac 100644
--- a/src/parallel/decompose/kahipDecomp/kahipDecomp.C
+++ b/src/parallel/decompose/kahipDecomp/kahipDecomp.C
@@ -29,13 +29,20 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "Time.H"
 #include "PrecisionAdaptor.H"
+#include <map>
+#include <string>
+#include <vector>
+
+// Probably not needed, but in case we pickup parhip_interface.h
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 
 #include "kaHIP_interface.h"
 
-#include <string>
-#include <map>
-#include <vector>
-
 // Provide a clear error message if we have a severe size mismatch
 // Allow widening, but not narrowing
 
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index 41fc7258c5..efa706b58b 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -32,8 +32,12 @@ License
 #include "PrecisionAdaptor.H"
 
 // Probably not needed...
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
 
 #include "metis.h"
 
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 6fc60079e7..cbe191fa8f 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -32,12 +32,20 @@ License
 #include "Time.H"
 #include "PrecisionAdaptor.H"
 #include "OFstream.H"
+#include <cstdio>
 #include <limits>
 
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
+
 // Avoid too many warnings from mpi.h
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 
-#include <cstdio>
 #include <mpi.h>
 #include "ptscotch.h"
 
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index a16695326b..1768b7169e 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -32,11 +32,16 @@ License
 #include "Time.H"
 #include "PrecisionAdaptor.H"
 #include "OFstream.H"
+#include <cstdio>
 #include <limits>
 
 // Probably not needed, but in case we pickup a ptscotch.h ...
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
 
 #include "scotch.h"
 
diff --git a/src/renumber/zoltanRenumber/zoltanRenumber.C b/src/renumber/zoltanRenumber/zoltanRenumber.C
index cca2e8a07b..7b50f620d0 100644
--- a/src/renumber/zoltanRenumber/zoltanRenumber.C
+++ b/src/renumber/zoltanRenumber/zoltanRenumber.C
@@ -59,6 +59,14 @@ SourceFiles
 #include "globalIndex.H"
 #include "uint.H"
 
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
+
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #include "zoltan.h"
 #include <mpi.h>

From c3660b41230091e4e81b8813e236cd76cbf215b4 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Wed, 14 Jun 2023 12:35:14 +0100
Subject: [PATCH 336/348] STYLE: AMI - updated output to show AMI patch names

Helps when running/debugging cases with multiple AMI patches

Example:

AMI: Creating AMI for source:AMI1 and target:AMI2
AMI: Patch source faces: 96
AMI: Patch target faces: 96
AMI: Patch source sum(weights) min:1 max:1 average:1
AMI: Patch target sum(weights) min:1 max:1 average:1
---
 .../AMIInterpolation/AMIInterpolation/AMIInterpolation.C    | 6 ++----
 .../cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C       | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 7d797052ae..5a743787fa 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -768,10 +768,8 @@ bool Foam::AMIInterpolation::calculate
     }
 
     Info<< indent
-        << "AMI: Creating addressing and weights between "
-        << srcTotalSize << " source faces and "
-        << tgtTotalSize << " target faces"
-        << endl;
+        << "AMI: Patch source faces: " << srcTotalSize << nl
+        << "AMI: Patch target faces: " << tgtTotalSize << endl;
 
     singlePatchProc_ = calcDistribution(srcPatch, tgtPatch);
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 5fba5daa5a..89aa2fc668 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -386,6 +386,9 @@ void Foam::cyclicAMIPolyPatch::resetAMI(const UList<point>& points) const
     pointField srcPoints(localPoints());
     pointField nbrPoints(nbr.localPoints());
 
+    Info<< "AMI: Creating AMI for source:" << name()
+        << " and target:" << nbr.name() << endl;
+
     if (debug)
     {
         const Time& t = boundaryMesh().mesh().time();

From b264d2e913ea2291888e71000f8dd192b0f33e2c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 26 Jun 2023 09:16:09 +0200
Subject: [PATCH 337/348] CONFIG: reinstate FOAM_LD_LIBRARY_PATH adjustments
 (#2801)

- the special MacOS dlopen handling (commit f584ec97d097)
  did not fully solve the problem with SIP clearing.

  Eg, sourcing the RunFunctions (for runParallel) triggers SIP and
  clears DYLD_LIBRARY_PATH. With the cleared path it finds the dummy
  libraries: the dummy Pstream::init() fails.
---
 bin/foamJob            | 7 +++++++
 bin/tools/RunFunctions | 7 +++++++
 etc/config.csh/unset   | 4 ++--
 etc/config.sh/unset    | 4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bin/foamJob b/bin/foamJob
index 6221eb67df..75a963e93c 100755
--- a/bin/foamJob
+++ b/bin/foamJob
@@ -23,6 +23,13 @@
 # If dispatching via foamExec
 foamExec="$WM_PROJECT_DIR/bin/tools/foamExec"
 
+# Darwin workaround - SIP clearing DYLD_LIBRARY_PATH variable
+if [ -n "$FOAM_LD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
+then
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
+fi
+
+
 #------------------------------------------------------------------------------
 
 usage() {
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 68364b7738..f8482f63f2 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -25,6 +25,13 @@
 # Basic sanity checks
 [ -d "$FOAM_TUTORIALS" ] || echo "No OpenFOAM tutorials? : $FOAM_TUTORIALS" 1>&2
 
+# Darwin workaround - SIP clearing DYLD_LIBRARY_PATH variable
+if [ -n "$FOAM_LD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
+then
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
+fi
+
+
 #------------------------------------------------------------------------------
 
 #
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 2c17414c68..904fc51e9e 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -189,8 +189,8 @@ if ($?DYLD_LIBRARY_PATH) then
     if ("${DYLD_LIBRARY_PATH}" == "") unsetenv DYLD_LIBRARY_PATH
 endif
 
-# Remove any shadow env variables
-unsetenv FOAM_DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
+# Remove shadow env variables
+unsetenv FOAM_LD_LIBRARY_PATH
 
 #------------------------------------------------------------------------------
 # Cleanup aliases
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 318291b0d2..a2ff864ec1 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -173,8 +173,8 @@ fi
 [ -n "$LD_LIBRARY_PATH" ] || unset LD_LIBRARY_PATH
 [ -n "$DYLD_LIBRARY_PATH" ] || unset DYLD_LIBRARY_PATH
 
-# Remove any shadow env variables
-unset FOAM_DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
+# Remove shadow env variables
+unset FOAM_LD_LIBRARY_PATH
 
 #------------------------------------------------------------------------------
 # Cleanup aliases and functions

From c9645e61a645f2c685ddaf7e8ae146ae94c46d09 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Sun, 25 Jun 2023 18:58:12 +0100
Subject: [PATCH 338/348] ENH: AMI - added option to control area
 normailisation mode

The optional areaNormalisationMode entry determines how the area normalisation
is performed. Options are:

- `project`: tri face area dotted with patch face normal; same as v2212 (default)
- `mag`: tri face area magnitude (v2206 and earlier)

Example usage:

    AMI1
    {
        type            cyclicAMI;
        ...
        areaNormalisationMode mag;
        //areaNormalisationMode project;
    }
---
 .../advancingFrontAMI/advancingFrontAMI.C     | 73 ++++++++++++++++---
 .../advancingFrontAMI/advancingFrontAMI.H     | 14 ++++
 2 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C
index ca25ff1160..f835c6c70e 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.C
@@ -40,6 +40,14 @@ namespace Foam
     defineTypeNameAndDebug(advancingFrontAMI, 0);
 }
 
+
+const Foam::Enum<Foam::advancingFrontAMI::areaNormalisationMode>
+Foam::advancingFrontAMI::areaNormalisationModeNames_
+{
+    { areaNormalisationMode::project, "project" },
+    { areaNormalisationMode::mag, "mag" },
+};
+
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::advancingFrontAMI::checkPatches() const
@@ -384,16 +392,38 @@ void Foam::advancingFrontAMI::triangulatePatch
 
         const DynamicList<face>& triFaces = tris[facei];
         magSf[facei] = 0;
-        for (const face& f : triFaces)
+
+        switch (areaNormalisationMode_)
         {
-            magSf[facei] +=
-                triPointRef
-                (
-                    points[f[0]],
-                    points[f[1]],
-                    points[f[2]]
-                ).areaNormal()
-              & faceNormals[facei];
+            case areaNormalisationMode::project:
+            {
+                for (const face& f : triFaces)
+                {
+                    magSf[facei] +=
+                        triPointRef
+                        (
+                            points[f[0]],
+                            points[f[1]],
+                            points[f[2]]
+                        ).areaNormal()
+                      & faceNormals[facei];
+                }
+                break;
+            }
+            case areaNormalisationMode::mag:
+            {
+                for (const face& f : triFaces)
+                {
+                    magSf[facei] +=
+                        triPointRef
+                        (
+                            points[f[0]],
+                            points[f[1]],
+                            points[f[2]]
+                        ).mag();
+                }
+                break;
+            }
         }
     }
 }
@@ -447,8 +477,25 @@ Foam::advancingFrontAMI::advancingFrontAMI
             dict,
             faceAreaIntersect::tmMesh
         )
+    ),
+    areaNormalisationMode_
+    (
+        areaNormalisationModeNames_.getOrDefault
+        (
+            "areaNormalisationMode",
+            dict,
+            areaNormalisationMode::project
+        )
     )
-{}
+{
+    DebugInfo
+        << "AMI: maxDistance2:" << maxDistance2_
+        << " minCosAngle:" << minCosAngle_
+        << " triMode:" << faceAreaIntersect::triangulationModeNames_[triMode_]
+        << " areaNormalisationMode:"
+        << areaNormalisationModeNames_[areaNormalisationMode_]
+        << endl;
+}
 
 
 Foam::advancingFrontAMI::advancingFrontAMI
@@ -470,7 +517,8 @@ Foam::advancingFrontAMI::advancingFrontAMI
     extendedTgtFaceIDs_(),
     extendedTgtMapPtr_(nullptr),
     srcNonOverlap_(),
-    triMode_(triMode)
+    triMode_(triMode),
+    areaNormalisationMode_(areaNormalisationMode::project)
 {}
 
 
@@ -487,7 +535,8 @@ Foam::advancingFrontAMI::advancingFrontAMI(const advancingFrontAMI& ami)
     extendedTgtFaceIDs_(),
     extendedTgtMapPtr_(nullptr),
     srcNonOverlap_(),
-    triMode_(ami.triMode_)
+    triMode_(ami.triMode_),
+    areaNormalisationMode_(ami.areaNormalisationMode_)
 {}
 
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H
index 5cfec3e12d..368d61fe2a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMI.H
@@ -57,6 +57,17 @@ class advancingFrontAMI
 :
     public AMIInterpolation
 {
+public:
+
+    //- Area normalisation mode
+    enum class areaNormalisationMode
+    {
+        project,
+        mag
+    };
+
+    static const Enum<areaNormalisationMode> areaNormalisationModeNames_;
+
 
 private:
 
@@ -143,6 +154,9 @@ protected:
         //- Face triangulation mode
         const faceAreaIntersect::triangulationMode triMode_;
 
+        //- Area normalisation mode; default = project
+        areaNormalisationMode areaNormalisationMode_;
+
 
     // Protected Member Functions
 

From f93b4338d5e4c2beb5836859c215aa1429f8afed Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 26 Jun 2023 10:17:01 +0100
Subject: [PATCH 339/348] ENH: Added new limitTurbulenceViscosity fvOption

Corrects turbulence viscosity field (e.g. nut) within a specified
region by applying a maximum limit, set according to a coefficient
multiplied by the laminar viscosity:

    \nu_{t,max} = c \nu

Corrections applied to:

  nut  | Turbulence vicosity                   [m2/s2]

Usage
    Minimal example by using \c constant/fvOptions:
    \verbatim
    limitTurbulenceViscosity1
    {
        // Mandatory entries (unmodifiable)
        type            limitTurbulenceViscosity;

        // Optional entries (runtime modifiable)
        nut             nut;
        c               1e5;

        // Mandatory/Optional (inherited) entries
        ...
    }
---
 src/fvOptions/Make/files                      |   2 +-
 .../limitTurbulenceViscosity.C                | 249 ++++++++++++++++++
 .../limitTurbulenceViscosity.H                | 170 ++++++++++++
 3 files changed, 420 insertions(+), 1 deletion(-)
 create mode 100644 src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.C
 create mode 100644 src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.H

diff --git a/src/fvOptions/Make/files b/src/fvOptions/Make/files
index 10013764ff..16b1c4e446 100644
--- a/src/fvOptions/Make/files
+++ b/src/fvOptions/Make/files
@@ -65,6 +65,6 @@ $(derivedConstraints)/velocityDampingConstraint/velocityDampingConstraint.C
 
 corrections/limitTemperature/limitTemperature.C
 corrections/limitVelocity/limitVelocity.C
-
+corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.C
 
 LIB = $(FOAM_LIBBIN)/libfvOptions
diff --git a/src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.C b/src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.C
new file mode 100644
index 0000000000..6c039accce
--- /dev/null
+++ b/src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.C
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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 "limitTurbulenceViscosity.H"
+#include "fvMesh.H"
+#include "transportModel.H"
+#include "fluidThermo.H"
+#include "turbulenceModel.H"
+#include "processorFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(limitTurbulenceViscosity, 0);
+    addToRunTimeSelectionTable(option, limitTurbulenceViscosity, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::fv::limitTurbulenceViscosity::writeFileHeader(Ostream& os)
+{
+    writeHeaderValue(os, "Nut", nutName_);
+    writeHeaderValue(os, "c", c_);
+    writeCommented(os, "Time");
+    writeTabbed(os, "nLimitedCells_[count]");
+    writeTabbed(os, "nLimitedCells_[%]");
+
+    os  << endl;
+
+    writtenHeader_ = true;
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::fv::limitTurbulenceViscosity::nu() const
+{
+    const auto* turbPtr =
+        mesh_.cfindObject<turbulenceModel>(turbulenceModel::propertiesName);
+    if (turbPtr)
+    {
+        return turbPtr->nu();
+    }
+
+    const auto* thermoPtr =
+        mesh_.cfindObject<fluidThermo>(fluidThermo::dictName);
+    if (thermoPtr)
+    {
+        return thermoPtr->nu();
+    }
+
+    const auto* laminarPtr =
+        mesh_.cfindObject<transportModel>("transportProperties");
+    if (laminarPtr)
+    {
+        return laminarPtr->nu();
+    }
+
+    const auto* dictPtr = mesh_.cfindObject<dictionary>("transportProperties");
+    if (dictPtr)
+    {
+        return
+            tmp<volScalarField>::New
+            (
+                IOobject
+                (
+                    "nu",
+                    mesh_.time().timeName(),
+                    mesh_,
+                    IOobject::NO_READ
+                ),
+                mesh_,
+                dimensionedScalar("nu", dimViscosity, *dictPtr)
+            );
+    }
+
+    FatalErrorInFunction
+        << "No valid model for laminar viscosity"
+        << exit(FatalError);
+
+    return nullptr;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::limitTurbulenceViscosity::limitTurbulenceViscosity
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    fv::cellSetOption(name, modelType, dict, mesh),
+    writeFile(mesh, name, typeName, dict, false),
+    nutName_("nut"),
+    c_(1e5)
+{
+    if (isActive())
+    {
+        read(dict);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::fv::limitTurbulenceViscosity::read(const dictionary& dict)
+{
+    if (!(fv::cellSetOption::read(dict) && writeFile::read(dict)))
+    {
+        return false;
+    }
+
+    coeffs_.readIfPresent("nut", nutName_);
+    coeffs_.readIfPresent("c", c_);
+
+    fieldNames_.resize(1, nutName_);
+
+    fv::option::resetApplied();
+
+    if (canResetFile())
+    {
+        resetFile(typeName);
+    }
+
+    if (canWriteHeader())
+    {
+        writeFileHeader(file());
+    }
+
+
+    return true;
+}
+
+
+void Foam::fv::limitTurbulenceViscosity::correct(volScalarField& nut)
+{
+    const auto& tnu = this->nu();
+    const auto& nu = tnu();
+
+    const label nTotCells(returnReduce(cells_.size(), sumOp<label>()));
+
+    label nAboveMax = 0;
+    for (const label celli : cells_)
+    {
+        const scalar nutLim = c_*nu[celli];
+
+        if (nut[celli] > nutLim)
+        {
+            nut[celli] = nutLim;
+            ++nAboveMax;
+        }
+    }
+
+    reduce(nAboveMax, sumOp<label>());
+
+    // Percent, max 2 decimal places
+    const auto percent = [](scalar num, label denom) -> scalar
+    {
+        return (denom ? 1e-2*round(1e4*num/denom) : 0);
+    };
+
+    const scalar nAboveMaxPercent = percent(nAboveMax, nTotCells);
+
+    Info<< type() << ' ' << name_ << " limited " << nAboveMax << " ("
+        << nAboveMaxPercent << "%) of cells" << endl;
+
+    if (canWriteToFile())
+    {
+        file()
+            << mesh_.time().timeOutputValue() << token::TAB
+            << nAboveMax << token::TAB
+            << nAboveMaxPercent
+            << endl;
+    }
+
+
+    // Handle boundaries in the case of 'all'
+    if (!cellSetOption::useSubMesh())
+    {
+        const volScalarField::Boundary& nubf = nu.boundaryField();
+        volScalarField::Boundary& nutbf = nut.boundaryFieldRef();
+
+        for (auto& nutp : nutbf)
+        {
+            // if (!nutp.fixesValue())
+            {
+                const scalarField& nup = nubf[nutp.patch().index()];
+
+                forAll(nutp, facei)
+                {
+                    scalar nutLim = c_*nup[facei];
+                    if (nutp[facei] > nutLim)
+                    {
+                        nutp[facei] = nutLim;
+                    }
+                }
+            }
+        }
+    }
+
+
+    if (nAboveMax)
+    {
+        // We've changed internal values so give boundary conditions
+        // opportunity to correct
+
+        // Note: calling nut.correctBoundaryConditions() will re-evaluate wall
+        // functions and potentially (re-)introduce out-of-bounds values
+        //nut.correctBoundaryConditions();
+        if (UPstream::parRun())
+        {
+            nut.boundaryFieldRef().evaluateCoupled<processorFvPatch>();
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.H b/src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.H
new file mode 100644
index 0000000000..b499fb9330
--- /dev/null
+++ b/src/fvOptions/corrections/limitTurbulenceViscosity/limitTurbulenceViscosity.H
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2023 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::fv::limitTurbulenceViscosity
+
+Group
+    grpFvOptionsCorrections
+
+Description
+    Corrects turbulence viscosity field (e.g. \c nut) within a specified
+    region by applying a maximum limit, set according to a coefficient
+    multiplied by the laminar viscosity:
+
+    \f[
+        \nu_{t,max} = c \nu
+    \f]
+
+    Corrections applied to:
+    \verbatim
+      nut  | Turbulence vicosity                   [m2/s2]
+    \endverbatim
+
+Usage
+    Minimal example by using \c constant/fvOptions:
+    \verbatim
+    limitTurbulenceViscosity1
+    {
+        // Mandatory entries (unmodifiable)
+        type            limitTurbulenceViscosity;
+
+        // Optional entries (runtime modifiable)
+        nut             nut;
+        c               1e5;
+
+        // Mandatory/Optional (inherited) entries
+        ...
+    }
+    \endverbatim
+
+    where the entries mean:
+    \table
+      Property  | Description                | Type   | Reqd  | Dflt
+      type      | Type name: limitTurbulenceViscosity | word  | yes   | -
+      nut       | Name of nut field          | word   | no    | nut
+      c         | Limiting coefficient       | scalar | yes   | 1e5
+    \endtable
+
+    The inherited entries are elaborated in:
+      - \link fvOption.H \endlink
+      - \link cellSetOption.H \endlink
+      - \link writeFile.H \endlink
+
+SourceFiles
+    limitTurbulenceViscosity.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fv_limitTurbulenceViscosity_H
+#define fv_limitTurbulenceViscosity_H
+
+#include "cellSetOption.H"
+#include "writeFile.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class limitTurbulenceViscosity Declaration
+\*---------------------------------------------------------------------------*/
+
+class limitTurbulenceViscosity
+:
+    public fv::cellSetOption,
+    public functionObjects::writeFile
+{
+protected:
+
+    // Protected Data
+
+        //- Name of turbulence viscosity field
+        word nutName_;
+
+        //- Limiting coefficient []
+        scalar c_;
+
+
+    // Protected Member Functions
+
+        //- Write file header information
+        void writeFileHeader(Ostream& os);
+
+        //- Return laminar viscosity
+        tmp<volScalarField> nu() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("limitTurbulenceViscosity");
+
+
+    // Constructors
+
+        //- Construct from components
+        limitTurbulenceViscosity
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+        //- No copy construct
+        limitTurbulenceViscosity(const limitTurbulenceViscosity&) = delete;
+
+        //- No copy assignment
+        void operator=(const limitTurbulenceViscosity&) = delete;
+
+
+    //- Destructor
+    virtual ~limitTurbulenceViscosity() = default;
+
+
+    // Member Functions
+
+        //- Read dictionary
+        virtual bool read(const dictionary& dict);
+
+        //- Correct the energy field
+        virtual void correct(volScalarField& nut);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From d6d319d95a2c87f6b91f5368fe26ef9ee5fa3646 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Mon, 26 Jun 2023 10:28:30 +0100
Subject: [PATCH 340/348] TUT: mixerVessel: update problematic entries

---
 .../mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry      | 2 +-
 .../foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
index 476ea8fad2..fe11be6c52 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
@@ -129,7 +129,7 @@ rotating.stl
 
     regions
     {
-        MRF
+        rotating
         {
             name rotating;
         }
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
index b8aaea4cbe..6be34fba4d 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
@@ -93,7 +93,7 @@ rotating.stl
 
     includedAngle       120;
 
-    baffles (MRF);
+    baffles (rotating);
 
     // Write options
     writeObj            yes;

From 4d7c827bd7c4d81f56d21c1987f7f6f23f7c6666 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 26 Jun 2023 12:13:31 +0100
Subject: [PATCH 341/348] ENH: checkMesh: report on processor patch if
 non-parallel. Fixes #698

---
 .../mesh/manipulation/checkMesh/checkTopology.C       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index b93ed914ca..1c2decf3c2 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -855,7 +855,7 @@ Foam::label Foam::checkTopology
 
         for (const polyPatch& pp : patches)
         {
-            if (!isA<processorPolyPatch>(pp))
+            if (!UPstream::parRun() || !isA<processorPolyPatch>(pp))
             {
                 checkPatch
                 (
@@ -873,12 +873,19 @@ Foam::label Foam::checkTopology
 
         // All non-processor boundary patches
         {
+            const label nGlobalPatches
+            (
+                UPstream::parRun()
+              ? patches.nNonProcessor()
+              : patches.size()
+            );
+
             labelList faceLabels
             (
                 identity
                 (
                     (
-                        patches.range(patches.nNonProcessor()-1).end_value()
+                        patches.range(nGlobalPatches-1).end_value()
                       - patches.start()
                     ),
                     patches.start()

From c4b4d1e03e1e2fb8d3c5adafd00e9460a3bc09d0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 26 Jun 2023 17:44:37 +0200
Subject: [PATCH 342/348] BUG: expressions rand() ignores objectRegistry
 timeIndex (fixes #2923)

---
 src/OpenFOAM/expressions/exprDriver/exprDriverFields.C | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriverFields.C b/src/OpenFOAM/expressions/exprDriver/exprDriverFields.C
index 6511cec7bb..60b4e98050 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriverFields.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriverFields.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,9 +41,11 @@ void Foam::expressions::exprDriver::fill_random
 {
     if (seed <= 0)
     {
-        if (timeStatePtr_)
+        const TimeState* ts = this->timeState();
+
+        if (ts)
         {
-            seed = (timeStatePtr_->timeIndex() - seed);
+            seed = (ts->timeIndex() - seed);
         }
         else
         {

From 7b20e888a80fee608f01e7dc13ce21eb42b4ffe7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 27 Jun 2023 13:02:20 +0200
Subject: [PATCH 343/348] REGRESSION: inconsistent constructMap order in
 meshToMesh::calcProcMap

- commit fb69a54bc309 accidentally changed the constructMap compact
  order from linear ordering to local elements first order. Seems to
  interact poorly with other bookkeeping so doing a partial revert,
  but still replacing the old allGatherList with exchangeSizes.

Note:
   the processorLOD method does actually use a constructMap with local
   elements first ordering, so some inconsistency may still exist
   there
---
 .../meshToMesh/meshToMeshParallelOps.C        | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index 180290a469..ed4c3efb38 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -212,27 +212,46 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
                     }
                 }
 
-                // convert dynamicList to labelList
-                forAll(sendMap, proci)
-                {
-                    sendMap[proci].transfer(dynSendMap[proci]);
-                }
-
-                // debug printing
                 if (debug)
                 {
                     Pout<< "Of my " << tgt.nCells()
                         << " target cells I need to send to:" << nl
                         << "\tproc\tcells" << endl;
-                    forAll(sendMap, proci)
+                    forAll(dynSendMap, proci)
                     {
                         Pout<< '\t' << proci << '\t'
-                            << sendMap[proci].size() << endl;
+                            << dynSendMap[proci].size() << endl;
                     }
                 }
+
+                // Convert DynamicList -> List
+                forAll(sendMap, proci)
+                {
+                    sendMap[proci].transfer(dynSendMap[proci]);
+                }
             }
 
-            return autoPtr<mapDistribute>::New(std::move(sendMap));
+
+            labelList recvSizes;
+            Pstream::exchangeSizes(sendMap, recvSizes, UPstream::worldComm);
+
+            // Uses linear receive order
+            labelListList constructMap(UPstream::nProcs());
+
+            label constructSize = 0;
+            forAll(constructMap, proci)
+            {
+                const label len = recvSizes[proci];
+                constructMap[proci] = identity(len, constructSize);
+                constructSize += len;
+            }
+
+            return autoPtr<mapDistribute>::New
+            (
+                constructSize,
+                std::move(sendMap),
+                std::move(constructMap)
+            );
             break;
         }
     }

From 664e8e00607ff2c5eaf3c0899c10a229e332e53a Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 27 Jun 2023 14:27:30 +0100
Subject: [PATCH 344/348] DOC: Updated contibutor list

---
 CONTRIBUTORS.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 447f2a60fe..eabbe79dc1 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -5,17 +5,22 @@ It is likely incomplete...
 
 ## Contributors (alphabetical by surname)
 
+- Horacio Aguerre
+- Yu Ankun
 - Tetsuo Aoyagi
 - Akira Azami
 - William Bainbridge
 - Gabriel Barajas
 - Kutalmis Bercin
+- Julius Bergmann
 - Ivor Clifford
 - Greg Collecutt
 - Jonathan Cranford
+- Santiago Marquez Damian
 - Sergio Ferraris
 - Matej Forman
 - Marian Fuchs
+- Gabriel Gerlero
 - Pawan Ghildiyal
 - Chris Greenshields
 - Bernhard Gschaider
@@ -50,8 +55,11 @@ It is likely incomplete...
 - Gavin Tabor
 - Zeljko Tukovic
 - Eugene De Villiers
+- Louis Vittoz
+- Vuko Vukcevic
 - Yi Wang
 - Norbert Weber
+- Volker Weissmann
 - Henry Weller
 - Niklas Wikstrom
 - Guanyang Xue

From beb0c910a0077ae5a4e10cbb4ca6ec7235973607 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Wed, 28 Jun 2023 11:02:47 +0100
Subject: [PATCH 345/348] REVERT: turbulentTemperatureRadCoupledMixed: remove
 merge-review updates (!609)

---
 ...mperatureRadCoupledMixedFvPatchScalarField.C | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 108f68fe8f..8ca883adfc 100644
--- a/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -474,7 +474,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
 
     scalarField TcNbr;
-    scalarField TpNbr;  // only if verbose_
+    scalarField TpNbr;
     scalarField KDeltaNbr;
 
     if (mpp.sameWorld())
@@ -492,10 +492,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
         // Swap to obtain full local values of neighbour K*delta
         TcNbr = nbrField.patchInternalField();
-        if (verbose_)
-        {
-            TpNbr = nbrField;
-        }
+        TpNbr = nbrField;
         KDeltaNbr = nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs();
     }
     else
@@ -503,17 +500,11 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
         // Different world so use my region,patch. Distribution below will
         // do the reordering.
         TcNbr = patchInternalField();
-        if (verbose_)
-        {
-            TpNbr = Tp;
-        }
+        TpNbr = Tp;
         KDeltaNbr = KDelta;
     }
     distribute(this->internalField().name() + "_value", TcNbr);
-    if (verbose_)
-    {
-        distribute(this->internalField().name() + "_patchValue", TpNbr);
-    }
+    distribute(this->internalField().name() + "_patchValue", TpNbr);
     distribute(this->internalField().name() + "_weights", KDeltaNbr);
 
     scalarField KDeltaC(this->size(), GREAT);

From 2d145e070ee03892cfa9663d46821e90f622bf0b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Jun 2023 11:58:24 +0100
Subject: [PATCH 346/348] COMP: chtMultiRegionTwoPhaseEulerFoam: compile local
 files only

---
 .../chtMultiRegionTwoPhaseEulerFoam/Make/files                  | 2 +-
 .../chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/files b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/files
index d676e48c65..809bd578c6 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/files
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/files
@@ -1,5 +1,5 @@
 derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
-../solid/solidRegionDiffNo.C
+solid/solidRegionDiffNo.C
 chtMultiRegionTwoPhaseEulerFoam.C
 
 EXE = $(FOAM_APPBIN)/chtMultiRegionTwoPhaseEulerFoam
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C
new file mode 120000
index 0000000000..ac4f3eeeaf
--- /dev/null
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C
@@ -0,0 +1 @@
+../../solid/solidRegionDiffNo.C
\ No newline at end of file

From 763bf4674d5a84ed7d56db07e83643aacde10307 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 26 Jun 2023 22:07:56 +0100
Subject: [PATCH 347/348] RELEASE: Updated headers to v2306

---
 applications/test/Function1/case1/constant/function1Properties  | 2 +-
 applications/test/Function1/case1/system/controlDict            | 2 +-
 applications/test/Hashing2/hashingTests                         | 2 +-
 applications/test/PDRblockMesh/box0/system/PDRblockMeshDict     | 2 +-
 applications/test/PDRblockMesh/box0/system/controlDict          | 2 +-
 applications/test/PDRblockMesh/box0/system/fvSchemes            | 2 +-
 applications/test/PDRblockMesh/box0/system/fvSolution           | 2 +-
 applications/test/PatchFunction1/function1Properties            | 2 +-
 applications/test/codeStream/codeStreamDict1                    | 2 +-
 .../test/coordinateSystem/testCase0/constant/coordinateSystems  | 2 +-
 applications/test/coordinateSystem/testCase0/system/controlDict | 2 +-
 .../test/coordinateSystem/testCase1/constant/coordinateSystems  | 2 +-
 applications/test/coordinateSystem/testCase1/system/controlDict | 2 +-
 applications/test/coordinateSystem/testCsys1                    | 2 +-
 applications/test/coordinateSystem/testCsys2                    | 2 +-
 applications/test/dictionary/blockMeshDict1.calc                | 2 +-
 applications/test/dictionary/blockMeshDict1.eval                | 2 +-
 applications/test/dictionary/testDict                           | 2 +-
 applications/test/dictionary/testDict2                          | 2 +-
 applications/test/dictionary/testDictAPI                        | 2 +-
 applications/test/dictionary/testDictCalc1                      | 2 +-
 applications/test/dictionary/testDictEval1                      | 2 +-
 applications/test/dictionary/testDictEval2                      | 2 +-
 applications/test/dictionary/testDictEval3                      | 2 +-
 applications/test/dictionary/testDictEval4                      | 2 +-
 applications/test/dictionary/testDictList                       | 2 +-
 applications/test/dictionary/testDictRegex                      | 2 +-
 applications/test/dictionary/testPrimitiveEntry                 | 2 +-
 applications/test/dictionary/testSubkeyword                     | 2 +-
 applications/test/dictionaryCopy/testDictCopy                   | 2 +-
 applications/test/exprEntry/testDict1                           | 2 +-
 .../test/fieldMapping/pipe1D/constant/manualDecomposition       | 2 +-
 .../test/fieldMapping/pipe1D/constant/transportProperties       | 2 +-
 applications/test/fieldMapping/pipe1D/system/blockMeshDict      | 2 +-
 applications/test/fieldMapping/pipe1D/system/controlDict        | 2 +-
 applications/test/fieldMapping/pipe1D/system/fvSchemes          | 2 +-
 applications/test/fieldMapping/pipe1D/system/fvSolution         | 2 +-
 applications/test/gravityMeshObject/case1/constant/banana       | 2 +-
 applications/test/gravityMeshObject/case1/constant/g            | 2 +-
 applications/test/gravityMeshObject/case1/constant/saturn       | 2 +-
 applications/test/gravityMeshObject/case1/system/controlDict    | 2 +-
 applications/test/hexRef8/block/constant/manualDecomposition    | 2 +-
 applications/test/hexRef8/block/constant/transportProperties    | 2 +-
 applications/test/hexRef8/block/system/blockMeshDict            | 2 +-
 applications/test/hexRef8/block/system/controlDict              | 2 +-
 applications/test/hexRef8/block/system/fvSchemes                | 2 +-
 applications/test/hexRef8/block/system/fvSolution               | 2 +-
 applications/test/mapDistributePolyMesh/cavity/0/U              | 2 +-
 applications/test/mapDistributePolyMesh/cavity/0/p              | 2 +-
 applications/test/mapDistributePolyMesh/cavity/0/phi            | 2 +-
 .../mapDistributePolyMesh/cavity/constant/transportProperties   | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/blockMeshDict      | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/controlDict        | 2 +-
 .../mapDistributePolyMesh/cavity/system/controlDict-latestTime  | 2 +-
 .../mapDistributePolyMesh/cavity/system/controlDict-startTime   | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/decomposeParDict   | 2 +-
 .../cavity/system/decomposeParDict-hierarchical                 | 2 +-
 .../mapDistributePolyMesh/cavity/system/decomposeParDict-scotch | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/decomposeParDict.2 | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/decomposeParDict.5 | 2 +-
 applications/test/mapDistributePolyMesh/cavity/system/fvSchemes | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/fvSolution         | 2 +-
 .../test/mapDistributePolyMesh/cavity/system/processorField     | 2 +-
 .../mapDistributePolyMesh/cavity/system/renumberMeshDict-random | 2 +-
 .../test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/T   | 2 +-
 .../test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/U   | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/epsilon  | 2 +-
 .../test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/k   | 2 +-
 .../test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p   | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p_rgh    | 2 +-
 .../test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/g   | 2 +-
 .../chtMultiRegionSimpleFoam/fluid/constant/regionProperties    | 2 +-
 .../fluid/constant/topAir/radiationProperties                   | 2 +-
 .../fluid/constant/topAir/thermophysicalProperties              | 2 +-
 .../fluid/constant/topAir/turbulenceProperties                  | 2 +-
 .../chtMultiRegionSimpleFoam/fluid/system/controlDict           | 2 +-
 .../chtMultiRegionSimpleFoam/fluid/system/decomposeParDict      | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSchemes  | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSolution | 2 +-
 .../chtMultiRegionSimpleFoam/fluid/system/topAir/blockMeshDict  | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/T   | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/p   | 2 +-
 .../solid/constant/bottomSolid/radiationProperties              | 2 +-
 .../solid/constant/bottomSolid/thermophysicalProperties         | 2 +-
 .../test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/g   | 2 +-
 .../chtMultiRegionSimpleFoam/solid/constant/regionProperties    | 2 +-
 .../solid/system/bottomSolid/blockMeshDict                      | 2 +-
 .../chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSchemes | 2 +-
 .../solid/system/bottomSolid/fvSolution                         | 2 +-
 .../chtMultiRegionSimpleFoam/solid/system/controlDict           | 2 +-
 .../chtMultiRegionSimpleFoam/solid/system/decomposeParDict      | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSchemes  | 2 +-
 .../multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSolution | 2 +-
 applications/test/multiWorld/solidFoam/solid1/0/T               | 2 +-
 applications/test/multiWorld/solidFoam/solid1/0/p               | 2 +-
 applications/test/multiWorld/solidFoam/solid1/constant/g        | 2 +-
 .../multiWorld/solidFoam/solid1/constant/radiationProperties    | 2 +-
 .../solidFoam/solid1/constant/thermophysicalProperties          | 2 +-
 .../test/multiWorld/solidFoam/solid1/system/blockMeshDict       | 2 +-
 .../test/multiWorld/solidFoam/solid1/system/controlDict         | 2 +-
 .../test/multiWorld/solidFoam/solid1/system/decomposeParDict    | 2 +-
 applications/test/multiWorld/solidFoam/solid1/system/fvSchemes  | 2 +-
 applications/test/multiWorld/solidFoam/solid1/system/fvSolution | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/T     | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/p     | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/T     | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/p     | 2 +-
 applications/test/multiWorld/solidFoam/solid1_solid2/constant/g | 2 +-
 .../solidFoam/solid1_solid2/constant/regionProperties           | 2 +-
 .../solidFoam/solid1_solid2/constant/solid1/radiationProperties | 2 +-
 .../solid1_solid2/constant/solid1/thermophysicalProperties      | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/system/controlDict  | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/system/fvSchemes    | 2 +-
 .../test/multiWorld/solidFoam/solid1_solid2/system/fvSolution   | 2 +-
 .../solidFoam/solid1_solid2/system/fvSolution-energyCoupling    | 2 +-
 .../solidFoam/solid1_solid2/system/solid1/blockMeshDict         | 2 +-
 .../solidFoam/solid1_solid2/system/solid2/blockMeshDict         | 2 +-
 applications/test/multiWorld/solidFoam/solid2/0/T               | 2 +-
 applications/test/multiWorld/solidFoam/solid2/0/p               | 2 +-
 .../test/multiWorld/solidFoam/solid2/system/blockMeshDict       | 2 +-
 applications/test/namedDictionary/testDict1                     | 2 +-
 applications/test/parallelOverset/heatTransfer/0.orig/T         | 2 +-
 .../test/parallelOverset/heatTransfer/0.orig/pointDisplacement  | 2 +-
 applications/test/parallelOverset/heatTransfer/0.orig/zoneID    | 2 +-
 .../test/parallelOverset/heatTransfer/constant/dynamicMeshDict  | 2 +-
 .../parallelOverset/heatTransfer/constant/transportProperties   | 2 +-
 .../test/parallelOverset/heatTransfer/system/blockMeshDict      | 2 +-
 .../test/parallelOverset/heatTransfer/system/controlDict        | 2 +-
 .../test/parallelOverset/heatTransfer/system/decomposeParDict   | 2 +-
 applications/test/parallelOverset/heatTransfer/system/fvSchemes | 2 +-
 .../test/parallelOverset/heatTransfer/system/fvSolution         | 2 +-
 .../test/parallelOverset/heatTransfer/system/postProcessingDict | 2 +-
 .../test/parallelOverset/heatTransfer/system/processorField     | 2 +-
 .../test/parallelOverset/heatTransfer/system/setFieldsDict      | 2 +-
 .../test/parallelOverset/heatTransfer/system/topoSetDict        | 2 +-
 .../patchRegion/cavity_pinched/constant/transportProperties     | 2 +-
 .../test/patchRegion/cavity_pinched/system/blockMeshDict        | 2 +-
 .../test/patchRegion/cavity_pinched/system/collapseDict         | 2 +-
 applications/test/patchRegion/cavity_pinched/system/controlDict | 2 +-
 .../test/patchRegion/cavity_pinched/system/decomposeParDict     | 2 +-
 applications/test/patchRegion/cavity_pinched/system/fvSchemes   | 2 +-
 applications/test/patchRegion/cavity_pinched/system/fvSolution  | 2 +-
 applications/test/reconstructedDistanceFunction/case1/0.orig/U  | 2 +-
 .../test/reconstructedDistanceFunction/case1/0.orig/alpha1      | 2 +-
 .../test/reconstructedDistanceFunction/case1/0.orig/markedCells | 2 +-
 .../test/reconstructedDistanceFunction/case1/constant/g         | 2 +-
 .../case1/constant/transportProperties                          | 2 +-
 .../case1/constant/turbulenceProperties                         | 2 +-
 .../reconstructedDistanceFunction/case1/system/blockMeshDict    | 2 +-
 .../case1/system/changeDictionaryDict                           | 2 +-
 .../test/reconstructedDistanceFunction/case1/system/controlDict | 2 +-
 .../reconstructedDistanceFunction/case1/system/decomposeParDict | 2 +-
 .../test/reconstructedDistanceFunction/case1/system/fvSchemes   | 2 +-
 .../test/reconstructedDistanceFunction/case1/system/fvSolution  | 2 +-
 .../test/reconstructedDistanceFunction/case1/system/isoSurfDict | 2 +-
 .../case1/system/setAlphaFieldDict                              | 2 +-
 .../test/reconstructedDistanceFunction/case1/system/topoSetDict | 2 +-
 applications/test/regex1/testRegexps                            | 2 +-
 applications/test/regex1/testRegexps2                           | 2 +-
 applications/test/router/routerDict                             | 2 +-
 applications/test/setAlphaField/case1/0.orig/T                  | 2 +-
 applications/test/setAlphaField/case1/0.orig/U                  | 2 +-
 applications/test/setAlphaField/case1/0.orig/alpha.water        | 2 +-
 applications/test/setAlphaField/case1/0.orig/p                  | 2 +-
 applications/test/setAlphaField/case1/0.orig/p_rgh              | 2 +-
 applications/test/setAlphaField/case1/constant/g                | 2 +-
 .../test/setAlphaField/case1/constant/thermophysicalProperties  | 2 +-
 .../setAlphaField/case1/constant/thermophysicalProperties.air   | 2 +-
 .../setAlphaField/case1/constant/thermophysicalProperties.water | 2 +-
 .../test/setAlphaField/case1/constant/turbulenceProperties      | 2 +-
 applications/test/setAlphaField/case1/system/blockMeshDict      | 2 +-
 applications/test/setAlphaField/case1/system/controlDict        | 2 +-
 applications/test/setAlphaField/case1/system/decomposeParDict   | 2 +-
 applications/test/setAlphaField/case1/system/fvSchemes          | 2 +-
 applications/test/setAlphaField/case1/system/fvSolution         | 2 +-
 applications/test/setAlphaField/case1/system/setAlphaFieldDict  | 2 +-
 applications/test/spline/test-splines                           | 2 +-
 .../test/syncTools/block_2x2x1/constant/transportProperties     | 2 +-
 applications/test/syncTools/block_2x2x1/system/blockMeshDict    | 2 +-
 applications/test/syncTools/block_2x2x1/system/controlDict      | 2 +-
 applications/test/syncTools/block_2x2x1/system/decomposeParDict | 2 +-
 applications/test/syncTools/block_2x2x1/system/fvSchemes        | 2 +-
 applications/test/syncTools/block_2x2x1/system/fvSolution       | 2 +-
 applications/test/volField/cavity/0/U                           | 2 +-
 applications/test/volField/cavity/0/p                           | 2 +-
 applications/test/volField/cavity/constant/transportProperties  | 2 +-
 applications/test/volField/cavity/system/blockMeshDict          | 2 +-
 applications/test/volField/cavity/system/controlDict            | 2 +-
 applications/test/volField/cavity/system/fvSchemes              | 2 +-
 applications/test/volField/cavity/system/fvSolution             | 2 +-
 applications/test/wordRe/testRegexps                            | 2 +-
 applications/test/zoneDistribute/case1/system/blockMeshDict     | 2 +-
 applications/test/zoneDistribute/case1/system/controlDict       | 2 +-
 applications/test/zoneDistribute/case1/system/decomposeParDict  | 2 +-
 applications/test/zoneDistribute/case1/system/fvSchemes         | 2 +-
 applications/test/zoneDistribute/case1/system/fvSolution        | 2 +-
 applications/test/zoneDistribute/case1/system/meshQualityDict   | 2 +-
 applications/test/zoneDistribute/case1/system/snappyHexMeshDict | 2 +-
 .../test/zoneDistribute/case1/system/surfaceFeatureExtractDict  | 2 +-
 .../lagrangian/particleTracks/particleTrackProperties           | 2 +-
 .../preProcessing/PDR/pdrFields/obstacles/ObstaclesDict         | 2 +-
 .../utilities/preProcessing/setAlphaField/setAlphaFieldDict     | 2 +-
 .../setExprBoundaryFields/setExprBoundaryFieldsDict             | 2 +-
 .../utilities/preProcessing/setExprFields/setExprFieldsDict     | 2 +-
 .../utilities/surface/surfaceMeshConvert/coordinateSystems      | 2 +-
 etc/caseDicts/annotated/PDRMeshDict                             | 2 +-
 etc/caseDicts/annotated/PDRblockMeshDict                        | 2 +-
 etc/caseDicts/annotated/adiabaticFlameTDict                     | 2 +-
 etc/caseDicts/annotated/adiosWriteDict                          | 2 +-
 etc/caseDicts/annotated/blockMeshDict                           | 2 +-
 etc/caseDicts/annotated/boxTurbDict                             | 2 +-
 etc/caseDicts/annotated/changeDictionaryDict                    | 2 +-
 etc/caseDicts/annotated/collapseDict                            | 2 +-
 etc/caseDicts/annotated/createBafflesDict                       | 2 +-
 etc/caseDicts/annotated/createBoxTurbDict                       | 2 +-
 etc/caseDicts/annotated/createPatchDict                         | 2 +-
 etc/caseDicts/annotated/decomposeParDict                        | 2 +-
 etc/caseDicts/annotated/dsmcInitialiseDict                      | 2 +-
 etc/caseDicts/annotated/equilibriumFlameTDict                   | 2 +-
 etc/caseDicts/annotated/extrude2DMeshDict                       | 2 +-
 etc/caseDicts/annotated/extrudeMeshDict                         | 2 +-
 etc/caseDicts/annotated/extrudeToRegionMeshDict                 | 2 +-
 etc/caseDicts/annotated/fieldCoordinateSystemTransformDict      | 2 +-
 etc/caseDicts/annotated/foamDataToFluentDict                    | 2 +-
 etc/caseDicts/annotated/foamyHexMeshDict                        | 2 +-
 etc/caseDicts/annotated/foamyQuadMeshDict                       | 2 +-
 etc/caseDicts/annotated/mapFieldsDict                           | 2 +-
 etc/caseDicts/annotated/mdEquilibrationDict                     | 2 +-
 etc/caseDicts/annotated/mdInitialiseDict                        | 2 +-
 etc/caseDicts/annotated/mergeOrSplitBafflesDict                 | 2 +-
 etc/caseDicts/annotated/meshQualityDict-collapseEdges           | 2 +-
 etc/caseDicts/annotated/mirrorMeshDict                          | 2 +-
 etc/caseDicts/annotated/mixtureAdiabaticFlameTDict              | 2 +-
 etc/caseDicts/annotated/modifyMeshDict                          | 2 +-
 etc/caseDicts/annotated/noiseDict                               | 2 +-
 etc/caseDicts/annotated/obstaclesDict                           | 2 +-
 etc/caseDicts/annotated/optimisationDict                        | 2 +-
 etc/caseDicts/annotated/particleTrackDict                       | 2 +-
 etc/caseDicts/annotated/pdfDict                                 | 2 +-
 etc/caseDicts/annotated/postChannelDict                         | 2 +-
 etc/caseDicts/annotated/potentialDict                           | 2 +-
 etc/caseDicts/annotated/probesDict                              | 2 +-
 etc/caseDicts/annotated/processorFieldDict                      | 2 +-
 etc/caseDicts/annotated/readFieldsDict                          | 2 +-
 etc/caseDicts/annotated/refineMeshDict                          | 2 +-
 etc/caseDicts/annotated/renumberMeshDict                        | 2 +-
 etc/caseDicts/annotated/runTimePostProcessingDict               | 2 +-
 etc/caseDicts/annotated/sampleDict                              | 2 +-
 etc/caseDicts/annotated/selectCellsDict                         | 2 +-
 etc/caseDicts/annotated/setAlphaFieldDict                       | 2 +-
 etc/caseDicts/annotated/setExprBoundaryFieldsDict               | 2 +-
 etc/caseDicts/annotated/setExprFieldsDict                       | 2 +-
 etc/caseDicts/annotated/setFieldsDict                           | 2 +-
 etc/caseDicts/annotated/snappyHexMeshDict                       | 2 +-
 etc/caseDicts/annotated/snappyRefineMeshDict                    | 2 +-
 etc/caseDicts/annotated/stitchMeshDict                          | 2 +-
 etc/caseDicts/annotated/surfaceFeatureExtractDict               | 2 +-
 etc/caseDicts/annotated/surfaceHookUpDict                       | 2 +-
 etc/caseDicts/annotated/surfacePatchDict                        | 2 +-
 etc/caseDicts/annotated/surfaceSubsetDict                       | 2 +-
 etc/caseDicts/annotated/toleranceDict                           | 2 +-
 etc/caseDicts/annotated/topoSetDict                             | 2 +-
 etc/caseDicts/annotated/topoSetSourcesDict                      | 2 +-
 etc/caseDicts/annotated/turbulenceFieldsDict                    | 2 +-
 etc/caseDicts/annotated/viewFactorsDict                         | 2 +-
 etc/caseDicts/annotated/wallFunctionDict                        | 2 +-
 .../createZeroDirectoryTemplates/boundaryConditions/boundaries  | 2 +-
 .../boundaryConditions/fluid/buoyant/inlet                      | 2 +-
 .../boundaryConditions/fluid/buoyant/inletOptions               | 2 +-
 .../boundaryConditions/fluid/buoyant/outlet                     | 2 +-
 .../boundaryConditions/fluid/buoyant/outletOptions              | 2 +-
 .../boundaryConditions/fluid/buoyant/wall                       | 2 +-
 .../boundaryConditions/fluid/buoyant/wallOptions                | 2 +-
 .../boundaryConditions/fluid/compressible/inlet                 | 2 +-
 .../boundaryConditions/fluid/compressible/inletOptions          | 2 +-
 .../boundaryConditions/fluid/compressible/outlet                | 2 +-
 .../boundaryConditions/fluid/compressible/outletOptions         | 2 +-
 .../boundaryConditions/fluid/compressible/wall                  | 2 +-
 .../boundaryConditions/fluid/compressible/wallOptions           | 2 +-
 .../boundaryConditions/fluid/incompressible/inlet               | 2 +-
 .../boundaryConditions/fluid/incompressible/inletOptions        | 2 +-
 .../boundaryConditions/fluid/incompressible/outlet              | 2 +-
 .../boundaryConditions/fluid/incompressible/wall                | 2 +-
 .../boundaryConditions/fluid/incompressible/wallOptions         | 2 +-
 .../createZeroDirectoryTemplates/boundaryConditions/fluid/inlet | 2 +-
 .../boundaryConditions/fluid/inletOptions                       | 2 +-
 .../boundaryConditions/fluid/outlet                             | 2 +-
 .../boundaryConditions/fluid/outletOptions                      | 2 +-
 .../createZeroDirectoryTemplates/boundaryConditions/fluid/wall  | 2 +-
 .../boundaryConditions/fluid/wallOptions                        | 2 +-
 .../createZeroDirectoryTemplates/boundaryConditions/solid/wall  | 2 +-
 .../boundaryConditions/solid/wallOptions                        | 2 +-
 .../createZeroDirectoryTemplates/models/turbulence/kEpsilon     | 2 +-
 .../createZeroDirectoryTemplates/models/turbulence/kOmega       | 2 +-
 .../createZeroDirectoryTemplates/models/turbulence/kOmegaSST    | 2 +-
 .../createZeroDirectoryTemplates/models/turbulence/laminar      | 2 +-
 .../createZeroDirectoryTemplates/solvers/chtMultiRegionFoam     | 2 +-
 etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam      | 2 +-
 etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam   | 2 +-
 etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam     | 2 +-
 .../createZeroDirectoryTemplates/solvers/rhoPimpleFoam          | 2 +-
 etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam   | 2 +-
 etc/caseDicts/foamyHexMeshDict                                  | 2 +-
 etc/caseDicts/general/coordinateSystem/cartesianXY              | 2 +-
 etc/caseDicts/general/coordinateSystem/cartesianXZ              | 2 +-
 etc/caseDicts/general/coordinateSystem/cartesianYZ              | 2 +-
 etc/caseDicts/general/coordinateSystem/cylindrical              | 2 +-
 etc/caseDicts/general/fvOptions/porosity/porousZone             | 2 +-
 etc/caseDicts/general/fvSolution/relaxationFactors/steadyState  | 2 +-
 etc/caseDicts/general/fvSolution/relaxationFactors/transient    | 2 +-
 etc/caseDicts/insitu/adios/adiosWrite.cfg                       | 2 +-
 etc/caseDicts/insitu/catalyst/catalyst.cfg                      | 2 +-
 etc/caseDicts/mesh/generation/meshQualityDict.cfg               | 2 +-
 etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg             | 2 +-
 etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict     | 2 +-
 etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict        | 2 +-
 etc/caseDicts/meshQualityDict                                   | 2 +-
 etc/caseDicts/postProcessing/fields/AMIWeights                  | 2 +-
 etc/caseDicts/postProcessing/fields/CourantNo                   | 2 +-
 etc/caseDicts/postProcessing/fields/LambVector                  | 2 +-
 etc/caseDicts/postProcessing/fields/Lambda2                     | 2 +-
 etc/caseDicts/postProcessing/fields/MachNo                      | 2 +-
 etc/caseDicts/postProcessing/fields/ObukhovLength               | 2 +-
 etc/caseDicts/postProcessing/fields/PecletNo                    | 2 +-
 etc/caseDicts/postProcessing/fields/Q                           | 2 +-
 etc/caseDicts/postProcessing/fields/R                           | 2 +-
 etc/caseDicts/postProcessing/fields/XiReactionRate              | 2 +-
 etc/caseDicts/postProcessing/fields/add                         | 2 +-
 etc/caseDicts/postProcessing/fields/components                  | 2 +-
 etc/caseDicts/postProcessing/fields/ddt                         | 2 +-
 etc/caseDicts/postProcessing/fields/div                         | 2 +-
 etc/caseDicts/postProcessing/fields/energySpectrum              | 2 +-
 etc/caseDicts/postProcessing/fields/enstrophy                   | 2 +-
 etc/caseDicts/postProcessing/fields/fieldMinMax                 | 2 +-
 etc/caseDicts/postProcessing/fields/flowType                    | 2 +-
 etc/caseDicts/postProcessing/fields/grad                        | 2 +-
 etc/caseDicts/postProcessing/fields/heatTransferCoeff           | 2 +-
 etc/caseDicts/postProcessing/fields/log                         | 2 +-
 etc/caseDicts/postProcessing/fields/mag                         | 2 +-
 etc/caseDicts/postProcessing/fields/magSqr                      | 2 +-
 etc/caseDicts/postProcessing/fields/processorField              | 2 +-
 etc/caseDicts/postProcessing/fields/randomise                   | 2 +-
 etc/caseDicts/postProcessing/fields/randomise.cfg               | 2 +-
 etc/caseDicts/postProcessing/fields/streamFunction              | 2 +-
 etc/caseDicts/postProcessing/fields/subtract                    | 2 +-
 etc/caseDicts/postProcessing/fields/turbulenceFields            | 2 +-
 etc/caseDicts/postProcessing/fields/vorticity                   | 2 +-
 etc/caseDicts/postProcessing/fields/wallHeatFlux                | 2 +-
 etc/caseDicts/postProcessing/fields/writeCellCentres            | 2 +-
 etc/caseDicts/postProcessing/fields/writeCellVolumes            | 2 +-
 etc/caseDicts/postProcessing/fields/writeObjects                | 2 +-
 etc/caseDicts/postProcessing/flowRate/flowRateFaceZone          | 2 +-
 etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg      | 2 +-
 etc/caseDicts/postProcessing/flowRate/flowRatePatch             | 2 +-
 etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg         | 2 +-
 etc/caseDicts/postProcessing/flowRate/volFlowRateSurface        | 2 +-
 etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg    | 2 +-
 etc/caseDicts/postProcessing/forces/forceCoeffs.cfg             | 2 +-
 etc/caseDicts/postProcessing/forces/forceCoeffsCompressible     | 2 +-
 etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible   | 2 +-
 .../postProcessing/forces/forceCoeffsIncompressible.cfg         | 2 +-
 etc/caseDicts/postProcessing/forces/forces.cfg                  | 2 +-
 etc/caseDicts/postProcessing/forces/forcesCompressible          | 2 +-
 etc/caseDicts/postProcessing/forces/forcesIncompressible        | 2 +-
 etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg    | 2 +-
 etc/caseDicts/postProcessing/graphs/graph.cfg                   | 2 +-
 etc/caseDicts/postProcessing/graphs/sampleDict.cfg              | 2 +-
 etc/caseDicts/postProcessing/graphs/singleGraph                 | 2 +-
 etc/caseDicts/postProcessing/lagrangian/dsmcFields              | 2 +-
 etc/caseDicts/postProcessing/minMax/cellMax                     | 2 +-
 etc/caseDicts/postProcessing/minMax/cellMin                     | 2 +-
 etc/caseDicts/postProcessing/minMax/cellMin.cfg                 | 2 +-
 etc/caseDicts/postProcessing/minMax/cellMinMax.cfg              | 2 +-
 etc/caseDicts/postProcessing/minMax/faceMax                     | 2 +-
 etc/caseDicts/postProcessing/minMax/faceMin                     | 2 +-
 etc/caseDicts/postProcessing/minMax/faceMin.cfg                 | 2 +-
 etc/caseDicts/postProcessing/minMax/faceMinMax.cfg              | 2 +-
 etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg             | 2 +-
 etc/caseDicts/postProcessing/minMax/minMaxComponents            | 2 +-
 etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg        | 2 +-
 etc/caseDicts/postProcessing/minMax/minMaxMagnitude             | 2 +-
 etc/caseDicts/postProcessing/numerical/solverInfo               | 2 +-
 etc/caseDicts/postProcessing/numerical/solverInfo.cfg           | 2 +-
 etc/caseDicts/postProcessing/pressure/pressure.cfg              | 2 +-
 etc/caseDicts/postProcessing/pressure/pressureDifference.cfg    | 2 +-
 etc/caseDicts/postProcessing/pressure/pressureDifferencePatch   | 2 +-
 .../postProcessing/pressure/pressureDifferencePatch.cfg         | 2 +-
 etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface | 2 +-
 .../postProcessing/pressure/pressureDifferenceSurface.cfg       | 2 +-
 etc/caseDicts/postProcessing/pressure/staticPressure            | 2 +-
 etc/caseDicts/postProcessing/pressure/staticPressure.cfg        | 2 +-
 etc/caseDicts/postProcessing/pressure/totalPressureCompressible | 2 +-
 .../postProcessing/pressure/totalPressureCompressible.cfg       | 2 +-
 .../postProcessing/pressure/totalPressureIncompressible         | 2 +-
 .../postProcessing/pressure/totalPressureIncompressible.cfg     | 2 +-
 etc/caseDicts/postProcessing/probes/boundaryCloud               | 2 +-
 etc/caseDicts/postProcessing/probes/boundaryCloud.cfg           | 2 +-
 etc/caseDicts/postProcessing/probes/cloud.cfg                   | 2 +-
 etc/caseDicts/postProcessing/probes/internalCloud               | 2 +-
 etc/caseDicts/postProcessing/probes/internalCloud.cfg           | 2 +-
 etc/caseDicts/postProcessing/probes/probes                      | 2 +-
 etc/caseDicts/postProcessing/probes/probes.cfg                  | 2 +-
 .../postProcessing/solvers/scalarTransport/scalarTransport      | 2 +-
 .../postProcessing/solvers/scalarTransport/scalarTransport.cfg  | 2 +-
 etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg     | 2 +-
 etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg        | 2 +-
 etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage     | 2 +-
 etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate   | 2 +-
 .../postProcessing/surfaceFieldValue/surfaceRegion.cfg          | 2 +-
 .../postProcessing/surfaceFieldValue/triSurfaceRegion.cfg       | 2 +-
 etc/caseDicts/postProcessing/visualization/runTimePostPro.cfg   | 2 +-
 etc/caseDicts/postProcessing/visualization/streamlines          | 2 +-
 etc/caseDicts/postProcessing/visualization/streamlines.cfg      | 2 +-
 etc/caseDicts/postProcessing/visualization/surfaces             | 2 +-
 etc/caseDicts/postProcessing/visualization/surfaces.cfg         | 2 +-
 etc/caseDicts/solvers/scalarTransport/s                         | 2 +-
 etc/caseDicts/solvers/scalarTransport/scalarTransportDict       | 2 +-
 etc/caseDicts/solvers/scalarTransport/scalarTransportDict.cfg   | 2 +-
 etc/caseDicts/surface/surfaceFeatureExtractDict.cfg             | 2 +-
 etc/cellModels                                                  | 2 +-
 etc/colourTables                                                | 2 +-
 etc/templates/axisymmetricJet/0/U                               | 2 +-
 etc/templates/axisymmetricJet/0/epsilon                         | 2 +-
 etc/templates/axisymmetricJet/0/k                               | 2 +-
 etc/templates/axisymmetricJet/0/nut                             | 2 +-
 etc/templates/axisymmetricJet/0/omega                           | 2 +-
 etc/templates/axisymmetricJet/0/p                               | 2 +-
 etc/templates/axisymmetricJet/constant/transportProperties      | 2 +-
 etc/templates/axisymmetricJet/constant/turbulenceProperties     | 2 +-
 etc/templates/axisymmetricJet/system/blockMeshDict              | 2 +-
 etc/templates/axisymmetricJet/system/controlDict                | 2 +-
 etc/templates/axisymmetricJet/system/extrudeMeshDict            | 2 +-
 etc/templates/axisymmetricJet/system/fvSchemes                  | 2 +-
 etc/templates/axisymmetricJet/system/fvSolution                 | 2 +-
 etc/templates/axisymmetricJet/system/graph                      | 2 +-
 etc/templates/closedVolume/0/T                                  | 2 +-
 etc/templates/closedVolume/0/U                                  | 2 +-
 etc/templates/closedVolume/0/alphat                             | 2 +-
 etc/templates/closedVolume/0/epsilon                            | 2 +-
 etc/templates/closedVolume/0/k                                  | 2 +-
 etc/templates/closedVolume/0/nut                                | 2 +-
 etc/templates/closedVolume/0/omega                              | 2 +-
 etc/templates/closedVolume/0/p                                  | 2 +-
 etc/templates/closedVolume/0/p_rgh                              | 2 +-
 etc/templates/closedVolume/constant/g                           | 2 +-
 etc/templates/closedVolume/constant/transportProperties         | 2 +-
 etc/templates/closedVolume/constant/turbulenceProperties        | 2 +-
 etc/templates/closedVolume/system/blockMeshDict                 | 2 +-
 etc/templates/closedVolume/system/controlDict                   | 2 +-
 etc/templates/closedVolume/system/fvSchemes                     | 2 +-
 etc/templates/closedVolume/system/fvSolution                    | 2 +-
 etc/templates/closedVolume/system/meshQualityDict               | 2 +-
 etc/templates/closedVolume/system/snappyHexMeshDict             | 2 +-
 etc/templates/closedVolume/system/surfaceFeatureExtractDict     | 2 +-
 etc/templates/closedVolumeRotating/0/U                          | 2 +-
 etc/templates/closedVolumeRotating/0/k                          | 2 +-
 etc/templates/closedVolumeRotating/0/nut                        | 2 +-
 etc/templates/closedVolumeRotating/0/omega                      | 2 +-
 etc/templates/closedVolumeRotating/0/p                          | 2 +-
 etc/templates/closedVolumeRotating/constant/MRFProperties       | 2 +-
 etc/templates/closedVolumeRotating/constant/dynamicMeshDict     | 2 +-
 .../closedVolumeRotating/constant/rotatingZoneProperties        | 2 +-
 etc/templates/closedVolumeRotating/constant/transportProperties | 2 +-
 .../closedVolumeRotating/constant/turbulenceProperties          | 2 +-
 etc/templates/closedVolumeRotating/system/blockMeshDict         | 2 +-
 etc/templates/closedVolumeRotating/system/blockMeshDict-box     | 2 +-
 etc/templates/closedVolumeRotating/system/controlDict           | 2 +-
 etc/templates/closedVolumeRotating/system/createBafflesDict     | 2 +-
 etc/templates/closedVolumeRotating/system/fvSchemes             | 2 +-
 etc/templates/closedVolumeRotating/system/fvSolution            | 2 +-
 etc/templates/closedVolumeRotating/system/meshQualityDict       | 2 +-
 etc/templates/closedVolumeRotating/system/snappyHexMeshDict     | 2 +-
 .../closedVolumeRotating/system/surfaceFeatureExtractDict       | 2 +-
 etc/templates/compressibleInflowOutflow/0/T                     | 2 +-
 etc/templates/compressibleInflowOutflow/0/U                     | 2 +-
 etc/templates/compressibleInflowOutflow/0/alphat                | 2 +-
 etc/templates/compressibleInflowOutflow/0/epsilon               | 2 +-
 etc/templates/compressibleInflowOutflow/0/k                     | 2 +-
 etc/templates/compressibleInflowOutflow/0/nut                   | 2 +-
 etc/templates/compressibleInflowOutflow/0/omega                 | 2 +-
 etc/templates/compressibleInflowOutflow/0/p                     | 2 +-
 .../compressibleInflowOutflow/constant/thermophysicalProperties | 2 +-
 .../compressibleInflowOutflow/constant/turbulenceProperties     | 2 +-
 etc/templates/compressibleInflowOutflow/system/blockMeshDict    | 2 +-
 etc/templates/compressibleInflowOutflow/system/controlDict      | 2 +-
 etc/templates/compressibleInflowOutflow/system/fvSchemes        | 2 +-
 etc/templates/compressibleInflowOutflow/system/fvSolution       | 2 +-
 etc/templates/compressibleInflowOutflow/system/meshQualityDict  | 2 +-
 .../compressibleInflowOutflow/system/snappyHexMeshDict          | 2 +-
 .../compressibleInflowOutflow/system/surfaceFeatureExtractDict  | 2 +-
 etc/templates/inflowOutflow/0/U                                 | 2 +-
 etc/templates/inflowOutflow/0/k                                 | 2 +-
 etc/templates/inflowOutflow/0/nut                               | 2 +-
 etc/templates/inflowOutflow/0/omega                             | 2 +-
 etc/templates/inflowOutflow/0/p                                 | 2 +-
 etc/templates/inflowOutflow/constant/transportProperties        | 2 +-
 etc/templates/inflowOutflow/constant/turbulenceProperties       | 2 +-
 etc/templates/inflowOutflow/system/blockMeshDict                | 2 +-
 etc/templates/inflowOutflow/system/controlDict                  | 2 +-
 etc/templates/inflowOutflow/system/fvSchemes                    | 2 +-
 etc/templates/inflowOutflow/system/fvSolution                   | 2 +-
 etc/templates/inflowOutflow/system/meshQualityDict              | 2 +-
 etc/templates/inflowOutflow/system/snappyHexMeshDict            | 2 +-
 etc/templates/inflowOutflow/system/surfaceFeatureExtractDict    | 2 +-
 etc/templates/inflowOutflowRotating/0/U                         | 2 +-
 etc/templates/inflowOutflowRotating/0/k                         | 2 +-
 etc/templates/inflowOutflowRotating/0/nut                       | 2 +-
 etc/templates/inflowOutflowRotating/0/omega                     | 2 +-
 etc/templates/inflowOutflowRotating/0/p                         | 2 +-
 etc/templates/inflowOutflowRotating/constant/MRFProperties      | 2 +-
 etc/templates/inflowOutflowRotating/constant/dynamicMeshDict    | 2 +-
 .../inflowOutflowRotating/constant/rotatingZoneProperties       | 2 +-
 .../inflowOutflowRotating/constant/transportProperties          | 2 +-
 .../inflowOutflowRotating/constant/turbulenceProperties         | 2 +-
 etc/templates/inflowOutflowRotating/system/blockMeshDict        | 2 +-
 etc/templates/inflowOutflowRotating/system/blockMeshDict-box    | 2 +-
 etc/templates/inflowOutflowRotating/system/controlDict          | 2 +-
 etc/templates/inflowOutflowRotating/system/createBafflesDict    | 2 +-
 etc/templates/inflowOutflowRotating/system/fvSchemes            | 2 +-
 etc/templates/inflowOutflowRotating/system/fvSolution           | 2 +-
 etc/templates/inflowOutflowRotating/system/meshQualityDict      | 2 +-
 etc/templates/inflowOutflowRotating/system/snappyHexMeshDict    | 2 +-
 .../inflowOutflowRotating/system/surfaceFeatureExtractDict      | 2 +-
 src/conversion/ccm/remapping                                    | 2 +-
 src/conversion/common/tables/remappingDict                      | 2 +-
 src/dynamicFvMesh/dynamicRefineBalancedFvMesh/balanceParDict    | 2 +-
 src/dynamicFvMesh/dynamicRefineBalancedFvMesh/dynamicMeshDict   | 2 +-
 src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict           | 2 +-
 .../cfdTools/general/solutionControl/loopControl/fvSolution     | 2 +-
 src/lumpedPointMotion/lumpedPointMovementDict                   | 2 +-
 src/sampling/probes/probesDict                                  | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/0.orig/U                        | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/0.orig/p                        | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict            | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties    | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties   | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict            | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/system/controlDict              | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes                | 2 +-
 tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution               | 2 +-
 tutorials/IO/dictionary/fatal-ending1.dict                      | 2 +-
 tutorials/IO/dictionary/fatal-ending2.dict                      | 2 +-
 tutorials/IO/dictionary/fatal-ending3.dict                      | 2 +-
 tutorials/IO/dictionary/fatal-ending4.dict                      | 2 +-
 tutorials/IO/dictionary/fatal-premature-ending1.dict            | 2 +-
 tutorials/IO/dictionary/fatal-premature-ending2.dict            | 2 +-
 tutorials/IO/dictionary/fatal-primitive-ending1.dict            | 2 +-
 tutorials/IO/dictionary/fatal-primitive-ending2.dict            | 2 +-
 tutorials/IO/dictionary/fatal-primitive-ending3.dict            | 2 +-
 tutorials/IO/dictionary/good-empty2.dict                        | 2 +-
 tutorials/IO/dictionary/good-ending1.dict                       | 2 +-
 tutorials/IO/dictionary/good-if1.dict                           | 2 +-
 tutorials/IO/dictionary/good-if2.dict                           | 2 +-
 tutorials/IO/dictionary/good-if3.dict                           | 2 +-
 tutorials/IO/dictionary/good-primitive-ending1.dict             | 2 +-
 tutorials/IO/dictionary/good-word-expand.dict                   | 2 +-
 tutorials/IO/dictionary/missed-ending3.dict                     | 2 +-
 tutorials/IO/fileHandler/0.orig/U                               | 2 +-
 tutorials/IO/fileHandler/constant/g                             | 2 +-
 tutorials/IO/fileHandler/constant/kinematicCloudPositions       | 2 +-
 tutorials/IO/fileHandler/constant/kinematicCloudProperties      | 2 +-
 tutorials/IO/fileHandler/constant/transportProperties           | 2 +-
 tutorials/IO/fileHandler/constant/turbulenceProperties          | 2 +-
 tutorials/IO/fileHandler/system/blockMeshDict                   | 2 +-
 tutorials/IO/fileHandler/system/controlDict                     | 2 +-
 tutorials/IO/fileHandler/system/decomposeParDict                | 2 +-
 tutorials/IO/fileHandler/system/fvSchemes                       | 2 +-
 tutorials/IO/fileHandler/system/fvSolution                      | 2 +-
 tutorials/IO/systemCall/0.orig/U                                | 2 +-
 tutorials/IO/systemCall/0.orig/include/fixedInlet               | 2 +-
 tutorials/IO/systemCall/0.orig/include/frontBackUpperPatches    | 2 +-
 tutorials/IO/systemCall/0.orig/include/initialConditions        | 2 +-
 tutorials/IO/systemCall/0.orig/k                                | 2 +-
 tutorials/IO/systemCall/0.orig/nut                              | 2 +-
 tutorials/IO/systemCall/0.orig/omega                            | 2 +-
 tutorials/IO/systemCall/0.orig/p                                | 2 +-
 tutorials/IO/systemCall/constant/transportProperties            | 2 +-
 tutorials/IO/systemCall/constant/turbulenceProperties           | 2 +-
 tutorials/IO/systemCall/system/blockMeshDict                    | 2 +-
 tutorials/IO/systemCall/system/controlDict                      | 2 +-
 tutorials/IO/systemCall/system/decomposeParDict                 | 2 +-
 tutorials/IO/systemCall/system/fvSchemes                        | 2 +-
 tutorials/IO/systemCall/system/fvSolution                       | 2 +-
 tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/T    | 2 +-
 tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/U    | 2 +-
 .../basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/epsilon    | 2 +-
 .../2DImplicitCyclic/0.orig/include/emptyPatches                | 2 +-
 tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/k    | 2 +-
 tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p    | 2 +-
 .../basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p_rgh      | 2 +-
 tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/g  | 2 +-
 .../2DImplicitCyclic/constant/leftSolid/radiationProperties     | 2 +-
 .../constant/leftSolid/thermophysicalProperties                 | 2 +-
 .../2DImplicitCyclic/constant/regionProperties                  | 2 +-
 .../2DImplicitCyclic/constant/rightFluid/radiationProperties    | 2 +-
 .../constant/rightFluid/thermophysicalProperties                | 2 +-
 .../2DImplicitCyclic/constant/rightFluid/turbulenceProperties   | 2 +-
 .../chtMultiRegionFoam/2DImplicitCyclic/system/blockMeshDict    | 2 +-
 .../chtMultiRegionFoam/2DImplicitCyclic/system/controlDict      | 2 +-
 .../basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSchemes  | 2 +-
 .../basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSolution | 2 +-
 .../2DImplicitCyclic/system/leftSolid/changeDictionaryDict      | 2 +-
 .../2DImplicitCyclic/system/leftSolid/fvSchemes                 | 2 +-
 .../2DImplicitCyclic/system/leftSolid/fvSolution                | 2 +-
 .../2DImplicitCyclic/system/rightFluid/changeDictionaryDict     | 2 +-
 .../2DImplicitCyclic/system/rightFluid/fvSchemes                | 2 +-
 .../2DImplicitCyclic/system/rightFluid/fvSolution               | 2 +-
 .../chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict      | 2 +-
 .../chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1   | 2 +-
 tutorials/basic/laplacianFoam/flange/0.orig/T                   | 2 +-
 .../basic/laplacianFoam/flange/constant/transportProperties     | 2 +-
 tutorials/basic/laplacianFoam/flange/system/controlDict         | 2 +-
 tutorials/basic/laplacianFoam/flange/system/decomposeParDict    | 2 +-
 tutorials/basic/laplacianFoam/flange/system/fvSchemes           | 2 +-
 tutorials/basic/laplacianFoam/flange/system/fvSolution          | 2 +-
 tutorials/basic/laplacianFoam/implicitAMI/0/T                   | 2 +-
 .../laplacianFoam/implicitAMI/constant/transportProperties      | 2 +-
 tutorials/basic/laplacianFoam/implicitAMI/system/blockMeshDict  | 2 +-
 tutorials/basic/laplacianFoam/implicitAMI/system/controlDict    | 2 +-
 .../basic/laplacianFoam/implicitAMI/system/decomposeParDict     | 2 +-
 tutorials/basic/laplacianFoam/implicitAMI/system/fvSchemes      | 2 +-
 tutorials/basic/laplacianFoam/implicitAMI/system/fvSolution     | 2 +-
 .../multiWorld1/common/constant/transportProperties             | 2 +-
 .../basic/laplacianFoam/multiWorld1/common/system/controlDict   | 2 +-
 .../laplacianFoam/multiWorld1/common/system/decomposeParDict    | 2 +-
 .../basic/laplacianFoam/multiWorld1/common/system/fvSchemes     | 2 +-
 .../basic/laplacianFoam/multiWorld1/common/system/fvSolution    | 2 +-
 tutorials/basic/laplacianFoam/multiWorld1/left/0.orig/T         | 2 +-
 .../basic/laplacianFoam/multiWorld1/left/system/blockMeshDict   | 2 +-
 tutorials/basic/laplacianFoam/multiWorld1/right/0.orig/T        | 2 +-
 .../basic/laplacianFoam/multiWorld1/right/system/blockMeshDict  | 2 +-
 .../multiWorld2/common/constant/transportProperties             | 2 +-
 .../basic/laplacianFoam/multiWorld2/common/system/controlDict   | 2 +-
 .../laplacianFoam/multiWorld2/common/system/decomposeParDict    | 2 +-
 .../basic/laplacianFoam/multiWorld2/common/system/fvSchemes     | 2 +-
 .../basic/laplacianFoam/multiWorld2/common/system/fvSolution    | 2 +-
 tutorials/basic/laplacianFoam/multiWorld2/slab1/0.orig/T        | 2 +-
 .../basic/laplacianFoam/multiWorld2/slab1/system/blockMeshDict  | 2 +-
 tutorials/basic/laplacianFoam/multiWorld2/slab2/0.orig/T        | 2 +-
 .../basic/laplacianFoam/multiWorld2/slab2/system/blockMeshDict  | 2 +-
 tutorials/basic/laplacianFoam/multiWorld2/slab3/0.orig/T        | 2 +-
 .../basic/laplacianFoam/multiWorld2/slab3/system/blockMeshDict  | 2 +-
 tutorials/basic/laplacianFoam/multiWorld2/slab4/0.orig/T        | 2 +-
 .../basic/laplacianFoam/multiWorld2/slab4/system/blockMeshDict  | 2 +-
 tutorials/basic/laplacianFoam/multiWorld2/top/0.orig/T          | 2 +-
 .../basic/laplacianFoam/multiWorld2/top/system/blockMeshDict    | 2 +-
 .../basic/laplacianFoam/multiWorld2/top/system/createPatchDict  | 2 +-
 .../laplacianFoam/multiWorld2/top/system/topoSetDict.patches    | 2 +-
 tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T      | 2 +-
 .../overLaplacianDyMFoam/heatTransfer/0.orig/cellDisplacement   | 2 +-
 .../overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement  | 2 +-
 tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID | 2 +-
 .../overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict  | 2 +-
 .../heatTransfer/constant/transportProperties                   | 2 +-
 .../overLaplacianDyMFoam/heatTransfer/system/blockMeshDict      | 2 +-
 .../basic/overLaplacianDyMFoam/heatTransfer/system/controlDict  | 2 +-
 .../overLaplacianDyMFoam/heatTransfer/system/decomposeParDict   | 2 +-
 .../basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes    | 2 +-
 .../basic/overLaplacianDyMFoam/heatTransfer/system/fvSolution   | 2 +-
 .../overLaplacianDyMFoam/heatTransfer/system/setFieldsDict      | 2 +-
 .../basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict  | 2 +-
 .../heatTransferFluxConservation1D/0.orig/T                     | 2 +-
 .../heatTransferFluxConservation1D/0.orig/cellDisplacement      | 2 +-
 .../heatTransferFluxConservation1D/0.orig/pointDisplacement     | 2 +-
 .../heatTransferFluxConservation1D/0.orig/zoneID                | 2 +-
 .../heatTransferFluxConservation1D/constant/dynamicMeshDict     | 2 +-
 .../heatTransferFluxConservation1D/constant/transportProperties | 2 +-
 .../heatTransferFluxConservation1D/system/blockMeshDict         | 2 +-
 .../heatTransferFluxConservation1D/system/controlDict           | 2 +-
 .../heatTransferFluxConservation1D/system/fvSchemes             | 2 +-
 .../heatTransferFluxConservation1D/system/fvSolution            | 2 +-
 .../heatTransferFluxConservation1D/system/setFieldsDict         | 2 +-
 .../heatTransferFluxConservation1D/system/topoSetDict           | 2 +-
 .../overPotentialFoam/cylinder/cylinderAndBackground/0.orig/U   | 2 +-
 .../cylinderAndBackground/0.orig/include/initialConditions      | 2 +-
 .../overPotentialFoam/cylinder/cylinderAndBackground/0.orig/p   | 2 +-
 .../cylinder/cylinderAndBackground/0.orig/pointDisplacement     | 2 +-
 .../cylinder/cylinderAndBackground/0.orig/zoneID                | 2 +-
 .../cylinder/cylinderAndBackground/constant/dynamicMeshDict     | 2 +-
 .../cylinder/cylinderAndBackground/system/blockMeshDict         | 2 +-
 .../cylinder/cylinderAndBackground/system/controlDict           | 2 +-
 .../cylinder/cylinderAndBackground/system/fvSchemes             | 2 +-
 .../cylinder/cylinderAndBackground/system/fvSolution            | 2 +-
 .../cylinder/cylinderAndBackground/system/setFieldsDict         | 2 +-
 .../cylinder/cylinderAndBackground/system/topoSetDict           | 2 +-
 .../overPotentialFoam/cylinder/cylinderMesh/system/controlDict  | 2 +-
 .../cylinder/cylinderMesh/system/createPatchDict                | 2 +-
 .../cylinder/cylinderMesh/system/extrudeMeshDict                | 2 +-
 .../overPotentialFoam/cylinder/cylinderMesh/system/fvSchemes    | 2 +-
 .../overPotentialFoam/cylinder/cylinderMesh/system/fvSolution   | 2 +-
 tutorials/basic/potentialFoam/cylinder/0.orig/U                 | 2 +-
 tutorials/basic/potentialFoam/cylinder/0.orig/p                 | 2 +-
 tutorials/basic/potentialFoam/cylinder/system/blockMeshDict     | 2 +-
 tutorials/basic/potentialFoam/cylinder/system/controlDict       | 2 +-
 tutorials/basic/potentialFoam/cylinder/system/decomposeParDict  | 2 +-
 tutorials/basic/potentialFoam/cylinder/system/fvSchemes         | 2 +-
 tutorials/basic/potentialFoam/cylinder/system/fvSolution        | 2 +-
 tutorials/basic/potentialFoam/pitzDaily/0.orig/U                | 2 +-
 tutorials/basic/potentialFoam/pitzDaily/0.orig/p                | 2 +-
 tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict    | 2 +-
 tutorials/basic/potentialFoam/pitzDaily/system/controlDict      | 2 +-
 tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes        | 2 +-
 tutorials/basic/potentialFoam/pitzDaily/system/fvSolution       | 2 +-
 tutorials/basic/scalarTransportFoam/pitzDaily/0/T               | 2 +-
 tutorials/basic/scalarTransportFoam/pitzDaily/0/U               | 2 +-
 .../scalarTransportFoam/pitzDaily/constant/transportProperties  | 2 +-
 .../basic/scalarTransportFoam/pitzDaily/system/blockMeshDict    | 2 +-
 .../scalarTransportFoam/pitzDaily/system/changeDictionaryDict   | 2 +-
 .../basic/scalarTransportFoam/pitzDaily/system/controlDict      | 2 +-
 tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes  | 2 +-
 tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/0/U                      | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/0/p                      | 2 +-
 .../basic/simpleFoam/implicitAMI/constant/transportProperties   | 2 +-
 .../basic/simpleFoam/implicitAMI/constant/turbulenceProperties  | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/system/blockMeshDict     | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/system/controlDict       | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/system/decomposeParDict  | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/system/fvSchemes         | 2 +-
 tutorials/basic/simpleFoam/implicitAMI/system/fvSolution        | 2 +-
 .../flamePropagationWithObstacles/constant/PDRProperties        | 2 +-
 .../flamePropagationWithObstacles/constant/combustionProperties | 2 +-
 .../flamePropagationWithObstacles/constant/dynamicMeshDict      | 2 +-
 .../combustion/PDRFoam/flamePropagationWithObstacles/constant/g | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../flamePropagationWithObstacles/constant/turbulenceProperties | 2 +-
 .../PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict    | 2 +-
 .../PDRFoam/flamePropagationWithObstacles/system/blockMeshDict  | 2 +-
 .../flamePropagationWithObstacles/system/changeDictionaryDict   | 2 +-
 .../PDRFoam/flamePropagationWithObstacles/system/controlDict    | 2 +-
 .../flamePropagationWithObstacles/system/decomposeParDict       | 2 +-
 .../PDRFoam/flamePropagationWithObstacles/system/fvSchemes      | 2 +-
 .../PDRFoam/flamePropagationWithObstacles/system/fvSolution     | 2 +-
 .../PDRFoam/flamePropagationWithObstacles/system/topoSetDict    | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep            | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp            | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers           | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su              | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/T               | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu              | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/U               | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi              | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp              | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/b               | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon         | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft              | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/k               | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut             | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/0.orig/p               | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/constant/PDRProperties | 2 +-
 .../PDRFoam/pipeLattice/constant/combustionProperties           | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/constant/g             | 2 +-
 .../PDRFoam/pipeLattice/constant/thermophysicalProperties       | 2 +-
 .../PDRFoam/pipeLattice/constant/turbulenceProperties           | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/geometry/obstaclesDict | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/geometry/pipeLattice   | 2 +-
 .../combustion/PDRFoam/pipeLattice/system/PDRblockMeshDict      | 2 +-
 .../combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict      | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/system/controlDict     | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/system/fvSchemes       | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/system/fvSolution      | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/system/probes          | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/system/setFieldsDict   | 2 +-
 tutorials/combustion/PDRFoam/pipeLattice/system/topoSetDict     | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su      | 2 +-
 tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu      | 2 +-
 tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi      | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat  | 2 +-
 tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft      | 2 +-
 tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut     | 2 +-
 tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/0.orig/pPotential         | 2 +-
 .../annularCombustorTurbine/constant/combustionProperties       | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict  | 2 +-
 .../combustion/XiDyMFoam/annularCombustorTurbine/constant/g     | 2 +-
 .../annularCombustorTurbine/constant/thermophysicalProperties   | 2 +-
 .../annularCombustorTurbine/constant/turbulenceProperties       | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/FOXiReactionRate   | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/blockMeshDict      | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/controlDict        | 2 +-
 .../annularCombustorTurbine/system/createPatchDict.ami          | 2 +-
 .../annularCombustorTurbine/system/createPatchDict.cyclic       | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/decomposeParDict   | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/fvSchemes          | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/fvSolution         | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/meshQualityDict    | 2 +-
 .../XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict  | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Su    | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/T     | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Tu    | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/U     | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Xi    | 2 +-
 .../combustion/XiDyMFoam/oscillatingCylinder/0.orig/alphat      | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/b     | 2 +-
 .../combustion/XiDyMFoam/oscillatingCylinder/0.orig/epsilon     | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/ft    | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/k     | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/nut   | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/p     | 2 +-
 .../XiDyMFoam/oscillatingCylinder/0.orig/pointDisplacementy     | 2 +-
 .../XiDyMFoam/oscillatingCylinder/constant/combustionProperties | 2 +-
 .../XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict      | 2 +-
 tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g   | 2 +-
 .../oscillatingCylinder/constant/thermophysicalProperties       | 2 +-
 .../XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties | 2 +-
 .../XiDyMFoam/oscillatingCylinder/system/blockMeshDict          | 2 +-
 .../combustion/XiDyMFoam/oscillatingCylinder/system/controlDict | 2 +-
 .../combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes   | 2 +-
 .../combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution  | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/Su              | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/T               | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu              | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/U               | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi              | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat          | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/b               | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon         | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/ft              | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/fu              | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/k               | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/nut             | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/-180/p               | 2 +-
 .../XiEngineFoam/kivaTest/constant/combustionProperties         | 2 +-
 .../combustion/XiEngineFoam/kivaTest/constant/engineGeometry    | 2 +-
 .../XiEngineFoam/kivaTest/constant/thermophysicalProperties     | 2 +-
 .../XiEngineFoam/kivaTest/constant/turbulenceProperties         | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict   | 2 +-
 .../combustion/XiEngineFoam/kivaTest/system/decomposeParDict    | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes     | 2 +-
 tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution    | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su       | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T        | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu       | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U        | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi       | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat   | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b        | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon  | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft       | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu       | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k        | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut      | 2 +-
 tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p        | 2 +-
 .../RAS/moriyoshiHomogeneous/constant/combustionProperties      | 2 +-
 .../RAS/moriyoshiHomogeneous/constant/thermophysicalProperties  | 2 +-
 .../constant/thermophysicalProperties.hydrogen                  | 2 +-
 .../RAS/moriyoshiHomogeneous/constant/turbulenceProperties      | 2 +-
 .../XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict        | 2 +-
 .../XiFoam/RAS/moriyoshiHomogeneous/system/controlDict          | 2 +-
 .../combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes | 2 +-
 .../XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution           | 2 +-
 tutorials/combustion/chemFoam/gri/chemkin/transportProperties   | 2 +-
 tutorials/combustion/chemFoam/gri/constant/chemistryProperties  | 2 +-
 tutorials/combustion/chemFoam/gri/constant/initialConditions    | 2 +-
 .../combustion/chemFoam/gri/constant/thermophysicalProperties   | 2 +-
 tutorials/combustion/chemFoam/gri/system/controlDict            | 2 +-
 tutorials/combustion/chemFoam/gri/system/fvSchemes              | 2 +-
 tutorials/combustion/chemFoam/gri/system/fvSolution             | 2 +-
 tutorials/combustion/chemFoam/h2/chemkin/transportProperties    | 2 +-
 tutorials/combustion/chemFoam/h2/constant/chemistryProperties   | 2 +-
 tutorials/combustion/chemFoam/h2/constant/initialConditions     | 2 +-
 .../combustion/chemFoam/h2/constant/thermophysicalProperties    | 2 +-
 tutorials/combustion/chemFoam/h2/system/controlDict             | 2 +-
 tutorials/combustion/chemFoam/h2/system/fvSchemes               | 2 +-
 tutorials/combustion/chemFoam/h2/system/fvSolution              | 2 +-
 .../combustion/chemFoam/ic8h18/chemkin/transportProperties      | 2 +-
 .../combustion/chemFoam/ic8h18/constant/chemistryProperties     | 2 +-
 tutorials/combustion/chemFoam/ic8h18/constant/initialConditions | 2 +-
 .../chemFoam/ic8h18/constant/thermophysicalProperties           | 2 +-
 tutorials/combustion/chemFoam/ic8h18/system/controlDict         | 2 +-
 tutorials/combustion/chemFoam/ic8h18/system/fvSchemes           | 2 +-
 tutorials/combustion/chemFoam/ic8h18/system/fvSolution          | 2 +-
 .../combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties | 2 +-
 .../chemFoam/ic8h18_TDAC/constant/chemistryProperties           | 2 +-
 .../combustion/chemFoam/ic8h18_TDAC/constant/initialConditions  | 2 +-
 .../chemFoam/ic8h18_TDAC/constant/thermophysicalProperties      | 2 +-
 tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict    | 2 +-
 tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSchemes      | 2 +-
 tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution     | 2 +-
 .../combustion/chemFoam/nc7h16/chemkin/transportProperties      | 2 +-
 .../combustion/chemFoam/nc7h16/constant/chemistryProperties     | 2 +-
 tutorials/combustion/chemFoam/nc7h16/constant/initialConditions | 2 +-
 .../chemFoam/nc7h16/constant/thermophysicalProperties           | 2 +-
 tutorials/combustion/chemFoam/nc7h16/system/controlDict         | 2 +-
 tutorials/combustion/chemFoam/nc7h16/system/fvSchemes           | 2 +-
 tutorials/combustion/chemFoam/nc7h16/system/fvSolution          | 2 +-
 .../combustion/coldEngineFoam/freePiston/0/include/caseSettings | 2 +-
 .../coldEngineFoam/freePiston/constant/engineGeometry           | 2 +-
 tutorials/combustion/coldEngineFoam/freePiston/constant/g       | 2 +-
 .../coldEngineFoam/freePiston/constant/thermophysicalProperties | 2 +-
 .../coldEngineFoam/freePiston/constant/turbulenceProperties     | 2 +-
 .../combustion/coldEngineFoam/freePiston/system/blockMeshDict   | 2 +-
 .../combustion/coldEngineFoam/freePiston/system/controlDict     | 2 +-
 tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes | 2 +-
 .../combustion/coldEngineFoam/freePiston/system/fvSolution      | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/C7H16  | 2 +-
 .../combustion/fireFoam/LES/compartmentFire/0.orig/IDefault     | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/N2     | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/O2     | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/T      | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/U      | 2 +-
 .../combustion/fireFoam/LES/compartmentFire/0.orig/Ydefault     | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/alphat | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/k      | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/nut    | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p      | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p_rgh  | 2 +-
 .../fireFoam/LES/compartmentFire/0.orig/panelRegion/T           | 2 +-
 .../fireFoam/LES/compartmentFire/0.orig/panelRegion/p           | 2 +-
 .../fireFoam/LES/compartmentFire/constant/additionalControls    | 2 +-
 .../LES/compartmentFire/constant/boundaryRadiationProperties    | 2 +-
 .../fireFoam/LES/compartmentFire/constant/combustionProperties  | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/constant/g    | 2 +-
 tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef | 2 +-
 .../compartmentFire/constant/panelRegion/radiationProperties    | 2 +-
 .../constant/panelRegion/thermophysicalProperties               | 2 +-
 .../fireFoam/LES/compartmentFire/constant/pyrolysisZones        | 2 +-
 .../fireFoam/LES/compartmentFire/constant/radiationProperties   | 2 +-
 .../LES/compartmentFire/constant/reactingCloud1Properties       | 2 +-
 .../fireFoam/LES/compartmentFire/constant/surfaceFilmProperties | 2 +-
 .../LES/compartmentFire/constant/thermo.compressibleGas         | 2 +-
 .../LES/compartmentFire/constant/thermophysicalProperties       | 2 +-
 .../fireFoam/LES/compartmentFire/constant/turbulenceProperties  | 2 +-
 .../fireFoam/LES/compartmentFire/system/blockMeshDict.m4        | 2 +-
 .../combustion/fireFoam/LES/compartmentFire/system/controlDict  | 2 +-
 .../fireFoam/LES/compartmentFire/system/createPatchDict         | 2 +-
 .../fireFoam/LES/compartmentFire/system/decomposeParDict        | 2 +-
 .../fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict | 2 +-
 .../combustion/fireFoam/LES/compartmentFire/system/fvSchemes    | 2 +-
 .../combustion/fireFoam/LES/compartmentFire/system/fvSolution   | 2 +-
 .../LES/compartmentFire/system/panelRegion/decomposeParDict     | 2 +-
 .../fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes   | 2 +-
 .../fireFoam/LES/compartmentFire/system/panelRegion/fvSolution  | 2 +-
 .../fireFoam/LES/compartmentFire/system/snappyHexMeshDict       | 2 +-
 .../combustion/fireFoam/LES/compartmentFire/system/topoSetDict  | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/C3H8   | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/0.orig/IDefault        | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/N2     | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/O2     | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/T      | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/U      | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/0.orig/Ydefault        | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/alphat | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Tf   | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Uf   | 2 +-
 .../flameSpreadWaterSuppressionPanel/0.orig/filmRegion/deltaf   | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/k      | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/nut    | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p      | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p_rgh  | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/ph_rgh | 2 +-
 .../flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/T   | 2 +-
 .../0.orig/pyrolysisRegion/Y0Default                            | 2 +-
 .../0.orig/pyrolysisRegion/char                                 | 2 +-
 .../flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/p   | 2 +-
 .../flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/qr  | 2 +-
 .../0.orig/pyrolysisRegion/wood                                 | 2 +-
 .../constant/additionalControls                                 | 2 +-
 .../constant/boundaryRadiationProperties                        | 2 +-
 .../constant/combustionProperties                               | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g    | 2 +-
 .../fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef | 2 +-
 .../constant/pyrolysisRegion/chemistryProperties                | 2 +-
 .../constant/pyrolysisRegion/radiationProperties                | 2 +-
 .../constant/pyrolysisRegion/thermo.solid                       | 2 +-
 .../constant/pyrolysisRegion/thermophysicalProperties           | 2 +-
 .../flameSpreadWaterSuppressionPanel/constant/pyrolysisZones    | 2 +-
 .../constant/radiationProperties                                | 2 +-
 .../constant/reactingCloud1Positions                            | 2 +-
 .../constant/reactingCloud1Properties                           | 2 +-
 .../constant/surfaceFilmProperties                              | 2 +-
 .../constant/thermo.compressibleGas                             | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict   | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/system/controlDict     | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/system/createPatchDict | 2 +-
 .../system/extrudeToRegionMeshDictFilm                          | 2 +-
 .../system/extrudeToRegionMeshDictPyr                           | 2 +-
 .../system/filmRegion/changeDictionaryDict                      | 2 +-
 .../system/filmRegion/createPatchDict                           | 2 +-
 .../system/filmRegion/fvSchemes                                 | 2 +-
 .../system/filmRegion/fvSolution                                | 2 +-
 .../system/filmRegion/topoSetDict                               | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/system/fvSchemes       | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/system/fvSolution      | 2 +-
 .../system/pyrolysisRegion/fvSchemes                            | 2 +-
 .../system/pyrolysisRegion/fvSolution                           | 2 +-
 .../LES/flameSpreadWaterSuppressionPanel/system/topoSetDict     | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/C3H8   | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/G      | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/IDefault          | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/N2     | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/O2     | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/T      | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/U      | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/Ydefault          | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/alphat | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/k      | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/nut    | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p      | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p_rgh  | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/T     | 2 +-
 .../LES/oppositeBurningPanels/0.orig/panelRegion/Y0Default      | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/char  | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/p     | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/qr    | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/wood  | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/0.orig/ph_rgh | 2 +-
 .../LES/oppositeBurningPanels/constant/additionalControls       | 2 +-
 .../oppositeBurningPanels/constant/boundaryRadiationProperties  | 2 +-
 .../LES/oppositeBurningPanels/constant/combustionProperties     | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/constant/g    | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef | 2 +-
 .../combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef | 2 +-
 .../constant/panelRegion/chemistryProperties                    | 2 +-
 .../constant/panelRegion/radiationProperties                    | 2 +-
 .../LES/oppositeBurningPanels/constant/panelRegion/thermo.solid | 2 +-
 .../constant/panelRegion/thermophysicalProperties               | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones  | 2 +-
 .../LES/oppositeBurningPanels/constant/radiationProperties      | 2 +-
 .../LES/oppositeBurningPanels/constant/reactingCloud1Properties | 2 +-
 .../LES/oppositeBurningPanels/constant/surfaceFilmProperties    | 2 +-
 .../LES/oppositeBurningPanels/constant/thermo.compressibleGas   | 2 +-
 .../LES/oppositeBurningPanels/constant/thermophysicalProperties | 2 +-
 .../LES/oppositeBurningPanels/constant/turbulenceProperties     | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/blockMeshDict     | 2 +-
 .../LES/oppositeBurningPanels/system/cRefine.topoSetDict        | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/controlDict       | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/createPatchDict   | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/decomposeParDict  | 2 +-
 .../LES/oppositeBurningPanels/system/extrudeToRegionMeshDict    | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict     | 2 +-
 .../LES/oppositeBurningPanels/system/fBurner.topoSetDict        | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/fvSchemes         | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/fvSolution        | 2 +-
 .../oppositeBurningPanels/system/panelRegion/decomposeParDict   | 2 +-
 .../LES/oppositeBurningPanels/system/panelRegion/fvSchemes      | 2 +-
 .../LES/oppositeBurningPanels/system/panelRegion/fvSolution     | 2 +-
 .../fireFoam/LES/oppositeBurningPanels/system/refineMeshDict    | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/CH4    | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/G      | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/N2     | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/O2     | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/T      | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/U      | 2 +-
 .../combustion/fireFoam/LES/simplePMMApanel/0.orig/Ydefault     | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/alphat | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/k      | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/nut    | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p      | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p_rgh  | 2 +-
 .../fireFoam/LES/simplePMMApanel/0.orig/panelRegion/PMMA        | 2 +-
 .../fireFoam/LES/simplePMMApanel/0.orig/panelRegion/T           | 2 +-
 .../fireFoam/LES/simplePMMApanel/0.orig/panelRegion/Y0Default   | 2 +-
 .../fireFoam/LES/simplePMMApanel/0.orig/panelRegion/p           | 2 +-
 .../fireFoam/LES/simplePMMApanel/0.orig/panelRegion/qr          | 2 +-
 .../fireFoam/LES/simplePMMApanel/constant/additionalControls    | 2 +-
 .../LES/simplePMMApanel/constant/boundaryRadiationProperties    | 2 +-
 .../fireFoam/LES/simplePMMApanel/constant/combustionProperties  | 2 +-
 tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g    | 2 +-
 .../simplePMMApanel/constant/panelRegion/chemistryProperties    | 2 +-
 .../simplePMMApanel/constant/panelRegion/radiationProperties    | 2 +-
 .../LES/simplePMMApanel/constant/panelRegion/thermo.solid       | 2 +-
 .../constant/panelRegion/thermophysicalProperties               | 2 +-
 .../fireFoam/LES/simplePMMApanel/constant/pyrolysisZones        | 2 +-
 .../fireFoam/LES/simplePMMApanel/constant/radiationProperties   | 2 +-
 .../LES/simplePMMApanel/constant/reactingCloud1Positions        | 2 +-
 .../LES/simplePMMApanel/constant/reactingCloud1Properties       | 2 +-
 .../fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties | 2 +-
 .../LES/simplePMMApanel/constant/thermo.compressibleGas         | 2 +-
 .../LES/simplePMMApanel/constant/thermophysicalProperties       | 2 +-
 .../fireFoam/LES/simplePMMApanel/constant/turbulenceProperties  | 2 +-
 .../fireFoam/LES/simplePMMApanel/system/blockMeshDict           | 2 +-
 .../combustion/fireFoam/LES/simplePMMApanel/system/controlDict  | 2 +-
 .../fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict | 2 +-
 .../combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes    | 2 +-
 .../combustion/fireFoam/LES/simplePMMApanel/system/fvSolution   | 2 +-
 .../fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes   | 2 +-
 .../fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution  | 2 +-
 .../combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict  | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/CH4    | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/0.orig/FSDomega     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/G      | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/0.orig/IDefault     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/N2     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/O2     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/T      | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/U      | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/0.orig/Ydefault     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/alphat | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/k      | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/nut    | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p      | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p_rgh  | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/ph_rgh | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/soot   | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/additionalControls    | 2 +-
 .../LES/smallPoolFire2D/constant/boundaryRadiationProperties    | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/chemistryProperties   | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/combustionProperties  | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g    | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones        | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/radiationProperties   | 2 +-
 .../LES/smallPoolFire2D/constant/reactingCloud1Properties       | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties | 2 +-
 .../LES/smallPoolFire2D/constant/thermo.compressibleGas         | 2 +-
 .../LES/smallPoolFire2D/constant/thermophysicalProperties       | 2 +-
 .../smallPoolFire2D/constant/thermophysicalProperties.twoSteps  | 2 +-
 .../fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties  | 2 +-
 .../fireFoam/LES/smallPoolFire2D/system/blockMeshDict           | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/system/controlDict  | 2 +-
 .../fireFoam/LES/smallPoolFire2D/system/createPatchDict         | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes    | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution   | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict  | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/CH4    | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/G      | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire3D/0.orig/IDefault     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/N2     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/O2     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/T      | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/U      | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire3D/0.orig/Ydefault     | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/alphat | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/k      | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/nut    | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p      | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p_rgh  | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/ph_rgh | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/additionalControls    | 2 +-
 .../LES/smallPoolFire3D/constant/boundaryRadiationProperties    | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/chemistryProperties   | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/combustionProperties  | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g    | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef | 2 +-
 tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones        | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/radiationProperties   | 2 +-
 .../LES/smallPoolFire3D/constant/reactingCloud1Properties       | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties | 2 +-
 .../LES/smallPoolFire3D/constant/thermo.compressibleGas         | 2 +-
 .../LES/smallPoolFire3D/constant/thermophysicalProperties       | 2 +-
 .../fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties  | 2 +-
 .../fireFoam/LES/smallPoolFire3D/system/blockMeshDict           | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire3D/system/controlDict  | 2 +-
 .../fireFoam/LES/smallPoolFire3D/system/createPatchDict         | 2 +-
 .../fireFoam/LES/smallPoolFire3D/system/decomposeParDict        | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes    | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution   | 2 +-
 .../combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict  | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/CH4      | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/G        | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2       | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2O      | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/N2       | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/O2       | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/T        | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/U        | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/Ydefault | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/alphat   | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/epsilon  | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/k        | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/nut      | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/p        | 2 +-
 .../reactingFoam/RAS/DLR_A_LTS/chemkin/transportProperties      | 2 +-
 .../reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties     | 2 +-
 .../reactingFoam/RAS/DLR_A_LTS/constant/combustionProperties    | 2 +-
 tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/g      | 2 +-
 .../RAS/DLR_A_LTS/constant/thermophysicalProperties             | 2 +-
 .../reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties    | 2 +-
 .../combustion/reactingFoam/RAS/DLR_A_LTS/system/blockMeshDict  | 2 +-
 .../combustion/reactingFoam/RAS/DLR_A_LTS/system/controlDict    | 2 +-
 .../reactingFoam/RAS/DLR_A_LTS/system/decomposeParDict          | 2 +-
 .../combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSchemes      | 2 +-
 .../combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution     | 2 +-
 .../combustion/reactingFoam/RAS/DLR_A_LTS/system/setFieldsDict  | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4    | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO     | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2    | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G      | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H      | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2     | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O    | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2     | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O      | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2     | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH     | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T      | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U      | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault     | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon      | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k      | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut    | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p      | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/chemkin/transportProperties    | 2 +-
 .../RAS/SandiaD_LTS/constant/boundaryRadiationProperties        | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties   | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/constant/combustionProperties  | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions  | 2 +-
 tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/g    | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties   | 2 +-
 .../RAS/SandiaD_LTS/constant/thermophysicalProperties           | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties  | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/system/blockMeshDict           | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict  | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSchemes    | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution   | 2 +-
 .../combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict   | 2 +-
 .../reactingFoam/RAS/SandiaD_LTS/system/setFieldsDict           | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/CH4   | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2    | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2O   | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/N2    | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/O2    | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/T     | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/U     | 2 +-
 .../combustion/reactingFoam/RAS/chokedNozzle/0.orig/Ydefault    | 2 +-
 .../combustion/reactingFoam/RAS/chokedNozzle/0.orig/alphat      | 2 +-
 .../combustion/reactingFoam/RAS/chokedNozzle/0.orig/epsilon     | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/k     | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/nut   | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/p     | 2 +-
 .../reactingFoam/RAS/chokedNozzle/constant/chemistryProperties  | 2 +-
 .../reactingFoam/RAS/chokedNozzle/constant/combustionProperties | 2 +-
 tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/g   | 2 +-
 .../RAS/chokedNozzle/constant/thermophysicalProperties          | 2 +-
 .../reactingFoam/RAS/chokedNozzle/constant/turbulenceProperties | 2 +-
 .../reactingFoam/RAS/chokedNozzle/system/blockMeshDict          | 2 +-
 .../combustion/reactingFoam/RAS/chokedNozzle/system/controlDict | 2 +-
 .../reactingFoam/RAS/chokedNozzle/system/decomposeParDict       | 2 +-
 .../combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes   | 2 +-
 .../combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution  | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/CH4       | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/N2        | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/O2        | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/T         | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/U         | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/Ydefault  | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/alphat    | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/epsilon   | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/include   | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/k         | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/nut       | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/0.orig/p         | 2 +-
 .../reactingFoam/RAS/membrane/constant/chemistryProperties      | 2 +-
 .../reactingFoam/RAS/membrane/constant/combustionProperties     | 2 +-
 .../combustion/reactingFoam/RAS/membrane/constant/reactions     | 2 +-
 .../reactingFoam/RAS/membrane/constant/thermo.compressibleGas   | 2 +-
 .../reactingFoam/RAS/membrane/constant/thermophysicalProperties | 2 +-
 .../reactingFoam/RAS/membrane/constant/turbulenceProperties     | 2 +-
 .../combustion/reactingFoam/RAS/membrane/system/blockMeshDict   | 2 +-
 .../combustion/reactingFoam/RAS/membrane/system/controlDict     | 2 +-
 .../reactingFoam/RAS/membrane/system/createBafflesDict          | 2 +-
 tutorials/combustion/reactingFoam/RAS/membrane/system/fvSchemes | 2 +-
 .../combustion/reactingFoam/RAS/membrane/system/fvSolution      | 2 +-
 .../combustion/reactingFoam/RAS/membrane/system/meshQualityDict | 2 +-
 .../combustion/reactingFoam/RAS/membrane/system/setFieldsDict   | 2 +-
 .../reactingFoam/RAS/membrane/system/snappyHexMeshDict          | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4    | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2    | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O    | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2     | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2     | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/T      | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/U      | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D/0/Ydefault          | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D/0/p      | 2 +-
 .../laminar/counterFlowFlame2D/constant/chemistryProperties     | 2 +-
 .../laminar/counterFlowFlame2D/constant/combustionProperties    | 2 +-
 .../laminar/counterFlowFlame2D/constant/thermo.compressibleGas  | 2 +-
 .../counterFlowFlame2D/constant/thermophysicalProperties        | 2 +-
 .../laminar/counterFlowFlame2D/constant/turbulenceProperties    | 2 +-
 .../laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction   | 2 +-
 .../laminar/counterFlowFlame2D/system/blockMeshDict             | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D/system/controlDict  | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes    | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D/system/fvSolution   | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4 | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2 | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2  | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2  | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T   | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U   | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault       | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat         | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p   | 2 +-
 .../laminar/counterFlowFlame2DLTS/constant/chemistryProperties  | 2 +-
 .../laminar/counterFlowFlame2DLTS/constant/combustionProperties | 2 +-
 .../counterFlowFlame2DLTS/constant/thermo.compressibleGas       | 2 +-
 .../counterFlowFlame2DLTS/constant/thermophysicalProperties     | 2 +-
 .../laminar/counterFlowFlame2DLTS/constant/turbulenceProperties | 2 +-
 .../laminar/counterFlowFlame2DLTS/system/blockMeshDict          | 2 +-
 .../laminar/counterFlowFlame2DLTS/system/controlDict            | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes | 2 +-
 .../laminar/counterFlowFlame2DLTS/system/fvSolution             | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CH4   | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CO2   | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/H2O   | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/N2    | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/O2    | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/T     | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/U     | 2 +-
 .../laminar/counterFlowFlame2DLTS_GRI_TDAC/0/Ydefault           | 2 +-
 .../laminar/counterFlowFlame2DLTS_GRI_TDAC/0/alphat             | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/p     | 2 +-
 .../counterFlowFlame2DLTS_GRI_TDAC/constant/chemistryProperties | 2 +-
 .../constant/combustionProperties                               | 2 +-
 .../constant/thermo.compressibleGas                             | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../laminar/counterFlowFlame2DLTS_GRI_TDAC/system/blockMeshDict | 2 +-
 .../laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict   | 2 +-
 .../counterFlowFlame2DLTS_GRI_TDAC/system/decomposeParDict      | 2 +-
 .../laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSchemes     | 2 +-
 .../laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution    | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4           | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2           | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O           | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2 | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2 | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T  | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U  | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault      | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat        | 2 +-
 .../combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p  | 2 +-
 .../laminar/counterFlowFlame2D_GRI/constant/chemistryProperties | 2 +-
 .../counterFlowFlame2D_GRI/constant/combustionProperties        | 2 +-
 .../counterFlowFlame2D_GRI/constant/thermo.compressibleGas      | 2 +-
 .../counterFlowFlame2D_GRI/constant/thermophysicalProperties    | 2 +-
 .../counterFlowFlame2D_GRI/constant/turbulenceProperties        | 2 +-
 .../laminar/counterFlowFlame2D_GRI/system/blockMeshDict         | 2 +-
 .../laminar/counterFlowFlame2D_GRI/system/controlDict           | 2 +-
 .../laminar/counterFlowFlame2D_GRI/system/decomposeParDict      | 2 +-
 .../laminar/counterFlowFlame2D_GRI/system/fvSchemes             | 2 +-
 .../laminar/counterFlowFlame2D_GRI/system/fvSolution            | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4      | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2      | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O      | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2       | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2       | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T        | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U        | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat   | 2 +-
 .../reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p        | 2 +-
 .../counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties    | 2 +-
 .../counterFlowFlame2D_GRI_TDAC/constant/combustionProperties   | 2 +-
 .../counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties   | 2 +-
 .../laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict    | 2 +-
 .../laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict      | 2 +-
 .../laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict | 2 +-
 .../laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes        | 2 +-
 .../laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution       | 2 +-
 .../combustion/rhoReactingFoam/groundAbsorption/0.orig/CH4      | 2 +-
 tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/N2 | 2 +-
 tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/O2 | 2 +-
 tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/T  | 2 +-
 tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/U  | 2 +-
 .../combustion/rhoReactingFoam/groundAbsorption/0.orig/Ydefault | 2 +-
 .../combustion/rhoReactingFoam/groundAbsorption/0.orig/alphat   | 2 +-
 tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/k  | 2 +-
 .../combustion/rhoReactingFoam/groundAbsorption/0.orig/nut      | 2 +-
 tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p  | 2 +-
 .../combustion/rhoReactingFoam/groundAbsorption/0.orig/p_rgh    | 2 +-
 .../groundAbsorption/constant/chemistryProperties               | 2 +-
 .../groundAbsorption/constant/combustionProperties              | 2 +-
 .../rhoReactingFoam/groundAbsorption/constant/fvOptions         | 2 +-
 .../combustion/rhoReactingFoam/groundAbsorption/constant/g      | 2 +-
 .../groundAbsorption/constant/surfaceFilmProperties             | 2 +-
 .../groundAbsorption/constant/thermo.compressibleGas            | 2 +-
 .../groundAbsorption/constant/thermophysicalProperties          | 2 +-
 .../groundAbsorption/constant/turbulenceProperties              | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/blockMeshDict       | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/controlDict         | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/createPatchDict     | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/decomposeParDict    | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/fvSchemes           | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/fvSolution          | 2 +-
 .../rhoReactingFoam/groundAbsorption/system/topoSetDict         | 2 +-
 .../acousticFoam/obliqueAirJet/main/0.orig/h_vibrationShell     | 2 +-
 .../compressible/acousticFoam/obliqueAirJet/main/0.orig/pa      | 2 +-
 .../acousticFoam/obliqueAirJet/main/0.orig/ps_vibrationShell    | 2 +-
 .../acousticFoam/obliqueAirJet/main/0.orig/ws_vibrationShell    | 2 +-
 .../obliqueAirJet/main/constant/transportProperties             | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/blockMeshDict        | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/controlDict          | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/decomposeParDict     | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/faMeshDefinition     | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/faOptions            | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/faSchemes            | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/faSolution           | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/fvSchemes            | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/fvSolution           | 2 +-
 .../acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict    | 2 +-
 .../compressible/acousticFoam/obliqueAirJet/precursor/0.orig/T  | 2 +-
 .../compressible/acousticFoam/obliqueAirJet/precursor/0.orig/U  | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/0.orig/alphat          | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/0.orig/nuTilda         | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/0.orig/nut             | 2 +-
 .../compressible/acousticFoam/obliqueAirJet/precursor/0.orig/p  | 2 +-
 .../obliqueAirJet/precursor/constant/thermophysicalProperties   | 2 +-
 .../obliqueAirJet/precursor/constant/turbulenceProperties       | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/blockMeshDict   | 2 +-
 .../obliqueAirJet/precursor/system/changeDictionaryDict         | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/controlDict     | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/createPatchDict | 2 +-
 .../obliqueAirJet/precursor/system/decomposeParDict             | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/extrudeMeshDict | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/fvSchemes       | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/fvSolution      | 2 +-
 .../acousticFoam/obliqueAirJet/precursor/system/topoSetDict     | 2 +-
 .../compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/T  | 2 +-
 .../compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/U  | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/alphat          | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon         | 2 +-
 .../compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/k  | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/nut             | 2 +-
 .../compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/p  | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID          | 2 +-
 .../twoSimpleRotors/constant/dynamicMeshDict                    | 2 +-
 .../twoSimpleRotors/constant/thermophysicalProperties           | 2 +-
 .../twoSimpleRotors/constant/turbulenceProperties               | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict   | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict     | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes       | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSolution      | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict   | 2 +-
 .../overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict     | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/T                  | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/U                  | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/alphat             | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/epsilon            | 2 +-
 .../cylinderAndBackground/0.orig/include/initialConditions      | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/k                  | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/nut                | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/p                  | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/pointDisplacement  | 2 +-
 .../hotCylinder/cylinderAndBackground/0.orig/zoneID             | 2 +-
 .../hotCylinder/cylinderAndBackground/constant/dynamicMeshDict  | 2 +-
 .../cylinderAndBackground/constant/thermophysicalProperties     | 2 +-
 .../cylinderAndBackground/constant/transportProperties          | 2 +-
 .../cylinderAndBackground/constant/turbulenceProperties         | 2 +-
 .../hotCylinder/cylinderAndBackground/system/blockMeshDict      | 2 +-
 .../hotCylinder/cylinderAndBackground/system/controlDict        | 2 +-
 .../hotCylinder/cylinderAndBackground/system/decomposeParDict   | 2 +-
 .../hotCylinder/cylinderAndBackground/system/fvSchemes          | 2 +-
 .../hotCylinder/cylinderAndBackground/system/fvSolution         | 2 +-
 .../hotCylinder/cylinderAndBackground/system/setFieldsDict      | 2 +-
 .../hotCylinder/cylinderAndBackground/system/topoSetDict        | 2 +-
 .../hotCylinder/cylinderMesh/system/controlDict                 | 2 +-
 .../hotCylinder/cylinderMesh/system/createPatchDict             | 2 +-
 .../hotCylinder/cylinderMesh/system/extrudeMeshDict             | 2 +-
 .../overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSchemes | 2 +-
 .../hotCylinder/cylinderMesh/system/fvSolution                  | 2 +-
 .../LadenburgJet60psi/constant/thermophysicalProperties         | 2 +-
 .../LadenburgJet60psi/constant/turbulenceProperties             | 2 +-
 .../rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict       | 2 +-
 .../rhoCentralFoam/LadenburgJet60psi/system/controlDict         | 2 +-
 .../rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict    | 2 +-
 .../rhoCentralFoam/LadenburgJet60psi/system/fvSchemes           | 2 +-
 .../rhoCentralFoam/LadenburgJet60psi/system/fvSolution          | 2 +-
 .../biconic25-55Run35/constant/thermophysicalProperties         | 2 +-
 .../biconic25-55Run35/constant/turbulenceProperties             | 2 +-
 .../rhoCentralFoam/biconic25-55Run35/system/blockMeshDict       | 2 +-
 .../rhoCentralFoam/biconic25-55Run35/system/collapseDict        | 2 +-
 .../rhoCentralFoam/biconic25-55Run35/system/controlDict         | 2 +-
 .../rhoCentralFoam/biconic25-55Run35/system/fvSchemes           | 2 +-
 .../rhoCentralFoam/biconic25-55Run35/system/fvSolution          | 2 +-
 .../compressible/rhoCentralFoam/biconic25-55Run35/system/sample | 2 +-
 tutorials/compressible/rhoCentralFoam/forwardStep/0/T           | 2 +-
 tutorials/compressible/rhoCentralFoam/forwardStep/0/U           | 2 +-
 tutorials/compressible/rhoCentralFoam/forwardStep/0/p           | 2 +-
 .../forwardStep/constant/thermophysicalProperties               | 2 +-
 .../rhoCentralFoam/forwardStep/constant/turbulenceProperties    | 2 +-
 .../rhoCentralFoam/forwardStep/system/blockMeshDict             | 2 +-
 .../compressible/rhoCentralFoam/forwardStep/system/controlDict  | 2 +-
 .../compressible/rhoCentralFoam/forwardStep/system/fvSchemes    | 2 +-
 .../compressible/rhoCentralFoam/forwardStep/system/fvSolution   | 2 +-
 tutorials/compressible/rhoCentralFoam/movingCone/0/T            | 2 +-
 tutorials/compressible/rhoCentralFoam/movingCone/0/U            | 2 +-
 tutorials/compressible/rhoCentralFoam/movingCone/0/p            | 2 +-
 .../compressible/rhoCentralFoam/movingCone/0/pointMotionUx      | 2 +-
 .../rhoCentralFoam/movingCone/constant/dynamicMeshDict          | 2 +-
 .../rhoCentralFoam/movingCone/constant/thermophysicalProperties | 2 +-
 .../rhoCentralFoam/movingCone/constant/turbulenceProperties     | 2 +-
 .../compressible/rhoCentralFoam/movingCone/system/blockMeshDict | 2 +-
 .../compressible/rhoCentralFoam/movingCone/system/controlDict   | 2 +-
 .../compressible/rhoCentralFoam/movingCone/system/cuttingPlane  | 2 +-
 .../compressible/rhoCentralFoam/movingCone/system/fvSchemes     | 2 +-
 .../compressible/rhoCentralFoam/movingCone/system/fvSolution    | 2 +-
 tutorials/compressible/rhoCentralFoam/obliqueShock/0/T          | 2 +-
 tutorials/compressible/rhoCentralFoam/obliqueShock/0/U          | 2 +-
 tutorials/compressible/rhoCentralFoam/obliqueShock/0/p          | 2 +-
 .../obliqueShock/constant/thermophysicalProperties              | 2 +-
 .../rhoCentralFoam/obliqueShock/constant/turbulenceProperties   | 2 +-
 .../rhoCentralFoam/obliqueShock/system/blockMeshDict            | 2 +-
 .../compressible/rhoCentralFoam/obliqueShock/system/controlDict | 2 +-
 .../compressible/rhoCentralFoam/obliqueShock/system/fvSchemes   | 2 +-
 .../compressible/rhoCentralFoam/obliqueShock/system/fvSolution  | 2 +-
 tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T        | 2 +-
 tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U        | 2 +-
 tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p        | 2 +-
 .../rhoCentralFoam/shockTube/constant/thermophysicalProperties  | 2 +-
 .../rhoCentralFoam/shockTube/constant/turbulenceProperties      | 2 +-
 .../compressible/rhoCentralFoam/shockTube/system/blockMeshDict  | 2 +-
 .../compressible/rhoCentralFoam/shockTube/system/controlDict    | 2 +-
 .../compressible/rhoCentralFoam/shockTube/system/fvSchemes      | 2 +-
 .../compressible/rhoCentralFoam/shockTube/system/fvSolution     | 2 +-
 .../compressible/rhoCentralFoam/shockTube/system/setFieldsDict  | 2 +-
 tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T            | 2 +-
 tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U            | 2 +-
 tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p            | 2 +-
 .../rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties | 2 +-
 .../rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties     | 2 +-
 .../compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict | 2 +-
 .../compressible/rhoCentralFoam/wedge15Ma5/system/controlDict   | 2 +-
 .../compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes     | 2 +-
 .../compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution    | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/T             | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/U             | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/p             | 2 +-
 .../rutlandVortex2D/constant/thermophysicalProperties           | 2 +-
 .../rutlandVortex2D/constant/turbulenceProperties               | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/system/blockMeshDict | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict   | 2 +-
 .../rutlandVortex2D/system/decomposeParDict                     | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSchemes     | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSolution    | 2 +-
 .../rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess    | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T          | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U          | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat     | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k          | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda    | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut        | 2 +-
 tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p          | 2 +-
 .../LES/pitzDaily/constant/thermophysicalProperties             | 2 +-
 .../rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties   | 2 +-
 .../rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict            | 2 +-
 .../compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict | 2 +-
 .../compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes   | 2 +-
 .../compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution  | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/T          | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/U          | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/alphat     | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/epsilon    | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/k          | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nuTilda    | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nut        | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/p          | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunction/constant/fvOptions | 2 +-
 .../RAS/TJunction/constant/thermophysicalProperties             | 2 +-
 .../rhoPimpleFoam/RAS/TJunction/constant/turbulenceProperties   | 2 +-
 .../rhoPimpleFoam/RAS/TJunction/system/blockMeshDict            | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunction/system/controlDict | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunction/system/fvSchemes   | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunction/system/fvSolution  | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/T   | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/alphat    | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/epsilon   | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/k   | 2 +-
 .../compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nuTilda   | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nut | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/constant/fvOptions       | 2 +-
 .../RAS/TJunctionAverage/constant/thermophysicalProperties      | 2 +-
 .../RAS/TJunctionAverage/constant/turbulenceProperties          | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/system/blockMeshDict     | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/system/controlDict       | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/system/decomposeParDict  | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/system/fvSchemes         | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/system/fvSolution        | 2 +-
 .../RAS/TJunctionAverage/system/setExprBoundaryFieldsDict       | 2 +-
 .../rhoPimpleFoam/RAS/TJunctionAverage/system/setExprFieldsDict | 2 +-
 .../compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/T    | 2 +-
 .../compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/U    | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/alphat            | 2 +-
 .../compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/k    | 2 +-
 .../compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/nut  | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/omega             | 2 +-
 .../compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/p    | 2 +-
 .../RAS/aerofoilNACA0012/constant/thermophysicalProperties      | 2 +-
 .../RAS/aerofoilNACA0012/constant/turbulenceProperties          | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict     | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/controlDict       | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict   | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions         | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes         | 2 +-
 .../rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSolution        | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/T    | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/U    | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/alphat     | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/epsilon    | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/k    | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/nut  | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/p    | 2 +-
 .../rhoPimpleFoam/RAS/angledDuct/constant/fvOptions             | 2 +-
 .../RAS/angledDuct/constant/thermophysicalProperties            | 2 +-
 .../rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties  | 2 +-
 .../rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict           | 2 +-
 .../rhoPimpleFoam/RAS/angledDuct/system/controlDict             | 2 +-
 .../RAS/angledDuct/system/decomposeParDict.example              | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes  | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/T | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/U | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/alphat  | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/epsilon | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/k | 2 +-
 .../compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/nut     | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/p | 2 +-
 .../rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions          | 2 +-
 .../RAS/angledDuctLTS/constant/thermophysicalProperties         | 2 +-
 .../RAS/angledDuctLTS/constant/turbulenceProperties             | 2 +-
 .../rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict        | 2 +-
 .../rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict          | 2 +-
 .../rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes            | 2 +-
 .../rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution           | 2 +-
 .../compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/T | 2 +-
 .../compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/U | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/0.orig/alphat         | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/0.orig/epsilon        | 2 +-
 .../compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/k | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/0.orig/nut            | 2 +-
 .../compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/p | 2 +-
 .../RAS/annularThermalMixer/constant/boundaryConditions         | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings | 2 +-
 .../RAS/annularThermalMixer/constant/dynamicMeshDict            | 2 +-
 .../RAS/annularThermalMixer/constant/thermophysicalProperties   | 2 +-
 .../RAS/annularThermalMixer/constant/transportProperties        | 2 +-
 .../RAS/annularThermalMixer/constant/turbulenceProperties       | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/system/blockMeshDict  | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/system/controlDict    | 2 +-
 .../RAS/annularThermalMixer/system/createBafflesDict            | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/system/fvSchemes      | 2 +-
 .../rhoPimpleFoam/RAS/annularThermalMixer/system/fvSolution     | 2 +-
 .../RAS/annularThermalMixer/system/snappyHexMeshDict            | 2 +-
 .../RAS/annularThermalMixer/system/surfaceFeatureExtractDict    | 2 +-
 .../system/surfaceFeatureExtractDictDefaults                    | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T             | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U             | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat        | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon       | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k             | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut           | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega         | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p             | 2 +-
 .../rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties  | 2 +-
 .../rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties      | 2 +-
 .../compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict  | 2 +-
 .../compressible/rhoPimpleFoam/RAS/cavity/system/controlDict    | 2 +-
 .../compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes      | 2 +-
 .../compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution     | 2 +-
 .../rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/T     | 2 +-
 .../rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/U     | 2 +-
 .../RAS/externalCoupledSquareBendLiq/0.orig/alphat              | 2 +-
 .../RAS/externalCoupledSquareBendLiq/0.orig/epsilon             | 2 +-
 .../rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/k     | 2 +-
 .../rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/nut   | 2 +-
 .../rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/p     | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../externalCoupledSquareBendLiq/constant/turbulenceProperties  | 2 +-
 .../rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/controls     | 2 +-
 .../RAS/externalCoupledSquareBendLiq/system/blockMeshDict       | 2 +-
 .../externalCoupledSquareBendLiq/system/changeDictionaryDict    | 2 +-
 .../RAS/externalCoupledSquareBendLiq/system/controlDict         | 2 +-
 .../RAS/externalCoupledSquareBendLiq/system/decomposeParDict    | 2 +-
 .../RAS/externalCoupledSquareBendLiq/system/externalCoupled     | 2 +-
 .../RAS/externalCoupledSquareBendLiq/system/fvSchemes           | 2 +-
 .../RAS/externalCoupledSquareBendLiq/system/fvSolution          | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/T | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/U | 2 +-
 .../compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/alphat  | 2 +-
 .../compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/epsilon | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/k | 2 +-
 .../compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/nut     | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/p | 2 +-
 .../compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/tracer0 | 2 +-
 .../rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties      | 2 +-
 .../rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions          | 2 +-
 .../RAS/mixerVessel2D/constant/thermophysicalProperties         | 2 +-
 .../RAS/mixerVessel2D/constant/transportProperties              | 2 +-
 .../RAS/mixerVessel2D/constant/turbulenceProperties             | 2 +-
 .../rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4     | 2 +-
 .../rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict          | 2 +-
 .../rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes            | 2 +-
 .../rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution           | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/T | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/U | 2 +-
 .../compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/alphat  | 2 +-
 .../compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/epsilon | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/k | 2 +-
 .../compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/nut     | 2 +-
 tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/p | 2 +-
 .../RAS/squareBendLiq/constant/thermophysicalProperties         | 2 +-
 .../RAS/squareBendLiq/constant/turbulenceProperties             | 2 +-
 .../rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict        | 2 +-
 .../rhoPimpleFoam/RAS/squareBendLiq/system/controlDict          | 2 +-
 .../rhoPimpleFoam/RAS/squareBendLiq/system/decomposeParDict     | 2 +-
 .../rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes            | 2 +-
 .../rhoPimpleFoam/RAS/squareBendLiq/system/fvSolution           | 2 +-
 .../rhoPimpleFoam/RAS/squareBendLiq/system/topoSetDict          | 2 +-
 .../rhoPimpleFoam/laminar/helmholtzResonance/0.orig/T           | 2 +-
 .../rhoPimpleFoam/laminar/helmholtzResonance/0.orig/U           | 2 +-
 .../rhoPimpleFoam/laminar/helmholtzResonance/0.orig/p           | 2 +-
 .../helmholtzResonance/constant/thermophysicalProperties        | 2 +-
 .../laminar/helmholtzResonance/constant/turbulenceProperties    | 2 +-
 .../laminar/helmholtzResonance/system/blockMeshDict             | 2 +-
 .../rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict | 2 +-
 .../laminar/helmholtzResonance/system/decomposeParDict          | 2 +-
 .../rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes   | 2 +-
 .../rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution  | 2 +-
 .../compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/T | 2 +-
 .../compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/U | 2 +-
 .../compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/p | 2 +-
 .../laminar/sineWaveDamping/constant/thermophysicalProperties   | 2 +-
 .../laminar/sineWaveDamping/constant/turbulenceProperties       | 2 +-
 .../rhoPimpleFoam/laminar/sineWaveDamping/system/blockMeshDict  | 2 +-
 .../rhoPimpleFoam/laminar/sineWaveDamping/system/controlDict    | 2 +-
 .../rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions      | 2 +-
 .../rhoPimpleFoam/laminar/sineWaveDamping/system/fvSchemes      | 2 +-
 .../rhoPimpleFoam/laminar/sineWaveDamping/system/fvSolution     | 2 +-
 .../compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T | 2 +-
 .../compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat         | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon        | 2 +-
 .../compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/common/0.orig/nut            | 2 +-
 .../compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/common/blockMeshDict         | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions    | 2 +-
 .../angledDuct/common/constant/porosityProperties               | 2 +-
 .../angledDuct/common/constant/thermophysicalProperties         | 2 +-
 .../angledDuct/common/constant/turbulenceProperties             | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict  | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes    | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution   | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict  | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/implicit/system/fluxSummary  | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes    | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution   | 2 +-
 .../rhoPorousSimpleFoam/angledDuct/implicit/system/sampling     | 2 +-
 tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/T  | 2 +-
 tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/U  | 2 +-
 .../compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/alphat   | 2 +-
 tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/k  | 2 +-
 .../compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/nut      | 2 +-
 .../compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/omega    | 2 +-
 tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/p  | 2 +-
 .../aerofoilNACA0012/constant/thermophysicalProperties          | 2 +-
 .../aerofoilNACA0012/constant/turbulenceProperties              | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict         | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/controlDict           | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/decomposeParDict      | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict       | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/fvOptions             | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/fvSchemes             | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/fvSolution            | 2 +-
 .../rhoSimpleFoam/aerofoilNACA0012/system/topoSetDict           | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/T         | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/U         | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/alphat    | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/epsilon   | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/k         | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/nut       | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/p         | 2 +-
 .../angledDuctExplicitFixedCoeff/constant/fvOptions             | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../angledDuctExplicitFixedCoeff/constant/turbulenceProperties  | 2 +-
 .../angledDuctExplicitFixedCoeff/system/blockMeshDict           | 2 +-
 .../angledDuctExplicitFixedCoeff/system/controlDict             | 2 +-
 .../rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes | 2 +-
 .../angledDuctExplicitFixedCoeff/system/fvSolution              | 2 +-
 .../compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/T  | 2 +-
 .../compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/U  | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/0.orig/alphat          | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/0.orig/epsilon         | 2 +-
 .../compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/k  | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/0.orig/nut             | 2 +-
 .../compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/p  | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/0.orig/tracer0         | 2 +-
 .../gasMixing/injectorPipe/constant/thermophysicalProperties    | 2 +-
 .../gasMixing/injectorPipe/constant/turbulenceProperties        | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/system/blockMeshDict   | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/system/controlDict     | 2 +-
 .../gasMixing/injectorPipe/system/decomposeParDict              | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/system/fvSchemes       | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/system/fvSolution      | 2 +-
 .../rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict | 2 +-
 .../gasMixing/injectorPipe/system/snappyHexMeshDict             | 2 +-
 .../gasMixing/injectorPipe/system/surfaceFeatureExtractDict     | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/T        | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/U        | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/alphat   | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/epsilon  | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/k        | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/nut      | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/p        | 2 +-
 .../rhoSimpleFoam/squareBend/constant/thermophysicalProperties  | 2 +-
 .../rhoSimpleFoam/squareBend/constant/turbulenceProperties      | 2 +-
 .../compressible/rhoSimpleFoam/squareBend/system/blockMeshDict  | 2 +-
 .../compressible/rhoSimpleFoam/squareBend/system/controlDict    | 2 +-
 .../rhoSimpleFoam/squareBend/system/decomposeParDict            | 2 +-
 .../compressible/rhoSimpleFoam/squareBend/system/fvSchemes      | 2 +-
 .../compressible/rhoSimpleFoam/squareBend/system/fvSolution     | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBend/system/sampling | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/U     | 2 +-
 .../compressible/rhoSimpleFoam/squareBendLiq/0.orig/alphat      | 2 +-
 .../compressible/rhoSimpleFoam/squareBendLiq/0.orig/epsilon     | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/k     | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/nut   | 2 +-
 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/p     | 2 +-
 .../squareBendLiq/constant/thermophysicalProperties             | 2 +-
 .../rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties   | 2 +-
 .../rhoSimpleFoam/squareBendLiq/system/blockMeshDict            | 2 +-
 .../compressible/rhoSimpleFoam/squareBendLiq/system/controlDict | 2 +-
 .../rhoSimpleFoam/squareBendLiq/system/decomposeParDict         | 2 +-
 .../compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes   | 2 +-
 .../compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution  | 2 +-
 .../compressible/rhoSimpleFoam/squareBendLiq/system/topoSetDict | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/T             | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/U             | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/alphat        | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/epsilon       | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/k             | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/nut           | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/p             | 2 +-
 .../squareBendLiqNoNewtonian/constant/thermophysicalProperties  | 2 +-
 .../squareBendLiqNoNewtonian/constant/turbulenceProperties      | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/system/controlDict   | 2 +-
 .../squareBendLiqNoNewtonian/system/decomposeParDict            | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSchemes     | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSolution    | 2 +-
 .../rhoSimpleFoam/squareBendLiqNoNewtonian/system/topoSetDict   | 2 +-
 tutorials/compressible/sonicDyMFoam/movingCone/0/T              | 2 +-
 tutorials/compressible/sonicDyMFoam/movingCone/0/U              | 2 +-
 tutorials/compressible/sonicDyMFoam/movingCone/0/p              | 2 +-
 tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx  | 2 +-
 .../sonicDyMFoam/movingCone/constant/dynamicMeshDict            | 2 +-
 .../sonicDyMFoam/movingCone/constant/thermophysicalProperties   | 2 +-
 .../sonicDyMFoam/movingCone/constant/turbulenceProperties       | 2 +-
 .../compressible/sonicDyMFoam/movingCone/system/blockMeshDict   | 2 +-
 .../compressible/sonicDyMFoam/movingCone/system/controlDict     | 2 +-
 tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes | 2 +-
 .../compressible/sonicDyMFoam/movingCone/system/fvSolution      | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/T       | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/U       | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/alphat  | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/epsilon | 2 +-
 .../sonicFoam/RAS/nacaAirfoil/0.orig/include/initialConditions  | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/k       | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/nut     | 2 +-
 tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/p       | 2 +-
 .../sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties | 2 +-
 .../sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties     | 2 +-
 .../compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict   | 2 +-
 .../sonicFoam/RAS/nacaAirfoil/system/decomposeParDict           | 2 +-
 .../compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes     | 2 +-
 .../compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution    | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/T                  | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/U                  | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/alphat             | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/epsilon            | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/k                  | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/nut                | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/0/p                  | 2 +-
 .../sonicFoam/RAS/prism/constant/thermophysicalProperties       | 2 +-
 .../sonicFoam/RAS/prism/constant/turbulenceProperties           | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/system/controlDict   | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes     | 2 +-
 tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution    | 2 +-
 tutorials/compressible/sonicFoam/laminar/forwardStep/0/T        | 2 +-
 tutorials/compressible/sonicFoam/laminar/forwardStep/0/U        | 2 +-
 tutorials/compressible/sonicFoam/laminar/forwardStep/0/p        | 2 +-
 .../laminar/forwardStep/constant/thermophysicalProperties       | 2 +-
 .../sonicFoam/laminar/forwardStep/constant/turbulenceProperties | 2 +-
 .../sonicFoam/laminar/forwardStep/system/blockMeshDict          | 2 +-
 .../sonicFoam/laminar/forwardStep/system/controlDict            | 2 +-
 .../compressible/sonicFoam/laminar/forwardStep/system/fvSchemes | 2 +-
 .../sonicFoam/laminar/forwardStep/system/fvSolution             | 2 +-
 tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T     | 2 +-
 tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U     | 2 +-
 tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p     | 2 +-
 .../laminar/shockTube/constant/thermophysicalProperties         | 2 +-
 .../sonicFoam/laminar/shockTube/constant/turbulenceProperties   | 2 +-
 .../sonicFoam/laminar/shockTube/system/blockMeshDict            | 2 +-
 .../compressible/sonicFoam/laminar/shockTube/system/controlDict | 2 +-
 .../compressible/sonicFoam/laminar/shockTube/system/fvSchemes   | 2 +-
 .../compressible/sonicFoam/laminar/shockTube/system/fvSolution  | 2 +-
 .../compressible/sonicFoam/laminar/shockTube/system/sample      | 2 +-
 .../sonicFoam/laminar/shockTube/system/setFieldsDict            | 2 +-
 tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U    | 2 +-
 tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p    | 2 +-
 .../decompressionTank/constant/thermodynamicProperties          | 2 +-
 .../decompressionTank/constant/transportProperties              | 2 +-
 .../sonicLiquidFoam/decompressionTank/system/blockMeshDict      | 2 +-
 .../sonicLiquidFoam/decompressionTank/system/controlDict        | 2 +-
 .../sonicLiquidFoam/decompressionTank/system/fvSchemes          | 2 +-
 .../sonicLiquidFoam/decompressionTank/system/fvSolution         | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN  | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD  | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof      | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE  | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum  | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q   | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM      | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN      | 2 +-
 .../dsmcFoam/freeSpacePeriodic/constant/dsmcProperties          | 2 +-
 .../dsmcFoam/freeSpacePeriodic/system/blockMeshDict             | 2 +-
 .../dsmcFoam/freeSpacePeriodic/system/controlDict               | 2 +-
 .../dsmcFoam/freeSpacePeriodic/system/decomposeParDict          | 2 +-
 .../dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict        | 2 +-
 .../discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes | 2 +-
 .../dsmcFoam/freeSpacePeriodic/system/fvSolution                | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT   | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU   | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN    | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD    | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof  | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE   | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE    | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum    | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q     | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM  | 2 +-
 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN  | 2 +-
 .../dsmcFoam/freeSpaceStream/constant/dsmcProperties            | 2 +-
 .../dsmcFoam/freeSpaceStream/system/blockMeshDict               | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict | 2 +-
 .../dsmcFoam/freeSpaceStream/system/decomposeParDict            | 2 +-
 .../dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict          | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes   | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution  | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT  | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU  | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN   | 2 +-
 tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD   | 2 +-
 tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE  | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE   | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum   | 2 +-
 tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q    | 2 +-
 tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM | 2 +-
 tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN | 2 +-
 .../dsmcFoam/supersonicCorner/constant/dsmcProperties           | 2 +-
 .../dsmcFoam/supersonicCorner/system/blockMeshDict              | 2 +-
 .../dsmcFoam/supersonicCorner/system/controlDict                | 2 +-
 .../dsmcFoam/supersonicCorner/system/decomposeParDict           | 2 +-
 .../dsmcFoam/supersonicCorner/system/dsmcInitialiseDict         | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes  | 2 +-
 .../discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT  | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU  | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN   | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD         | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof       | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE  | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE   | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum   | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q          | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM       | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN       | 2 +-
 .../discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties | 2 +-
 .../discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict    | 2 +-
 .../discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict      | 2 +-
 .../discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict | 2 +-
 .../dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict               | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes  | 2 +-
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/0.orig/U              | 2 +-
 .../periodicCubeArgon/constant/moleculeProperties               | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict  | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/system/controlDict    | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes      | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/system/fvSolution     | 2 +-
 .../periodicCubeArgon/system/mdEquilibrationDict                | 2 +-
 .../periodicCubeArgon/system/mdInitialiseDict                   | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/system/potentialDict  | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/0.orig/U              | 2 +-
 .../periodicCubeWater/constant/moleculeProperties               | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict  | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/system/controlDict    | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/system/fvSchemes      | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/system/fvSolution     | 2 +-
 .../periodicCubeWater/system/mdEquilibrationDict                | 2 +-
 .../periodicCubeWater/system/mdInitialiseDict                   | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/system/potentialDict  | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/0.orig/U                | 2 +-
 .../mdFoam/nanoNozzle/constant/moleculeProperties               | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict    | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/controlDict      | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes        | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/fvSolution       | 2 +-
 .../mdFoam/nanoNozzle/system/mdEquilibrationDict                | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/potentialDict    | 2 +-
 tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi  | 2 +-
 tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho  | 2 +-
 .../electrostaticFoam/chargedWire/constant/physicalProperties   | 2 +-
 .../electrostaticFoam/chargedWire/system/blockMeshDict          | 2 +-
 .../electrostaticFoam/chargedWire/system/controlDict            | 2 +-
 .../electrostaticFoam/chargedWire/system/fvSchemes              | 2 +-
 .../electrostaticFoam/chargedWire/system/fvSolution             | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/0.orig/B            | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/0.orig/U            | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/0.orig/p            | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/0.orig/pB           | 2 +-
 .../mhdFoam/hartmann/constant/transportProperties               | 2 +-
 .../electromagnetics/mhdFoam/hartmann/system/blockMeshDict      | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict  | 2 +-
 .../electromagnetics/mhdFoam/hartmann/system/decomposeParDict   | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes    | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution   | 2 +-
 tutorials/electromagnetics/mhdFoam/hartmann/system/sample       | 2 +-
 tutorials/financial/financialFoam/europeanCall/0/V              | 2 +-
 .../financialFoam/europeanCall/constant/financialProperties     | 2 +-
 .../financial/financialFoam/europeanCall/system/blockMeshDict   | 2 +-
 .../financial/financialFoam/europeanCall/system/controlDict     | 2 +-
 tutorials/financial/financialFoam/europeanCall/system/fvSchemes | 2 +-
 .../financial/financialFoam/europeanCall/system/fvSolution      | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/Us          | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/h           | 2 +-
 .../finiteArea/liquidFilmFoam/cylinder/0.orig/manningField      | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/constant/g         | 2 +-
 .../liquidFilmFoam/cylinder/constant/transportProperties        | 2 +-
 .../finiteArea/liquidFilmFoam/cylinder/system/blockMeshDict     | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/system/controlDict | 2 +-
 .../finiteArea/liquidFilmFoam/cylinder/system/decomposeParDict  | 2 +-
 .../finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition  | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSchemes   | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution  | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes   | 2 +-
 tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSolution  | 2 +-
 .../finiteArea/liquidFilmFoam/cylinder/system/setFieldsDict     | 2 +-
 .../finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cs   | 2 +-
 .../finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cvf  | 2 +-
 .../finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/U    | 2 +-
 .../sphereSurfactantFoam/sphereTransport/system/controlDict     | 2 +-
 .../sphereTransport/system/decomposeParDict                     | 2 +-
 .../sphereTransport/system/faMeshDefinition                     | 2 +-
 .../sphereSurfactantFoam/sphereTransport/system/faSchemes       | 2 +-
 .../sphereSurfactantFoam/sphereTransport/system/faSolution      | 2 +-
 .../sphereSurfactantFoam/sphereTransport/system/fvSchemes       | 2 +-
 .../sphereSurfactantFoam/sphereTransport/system/fvSolution      | 2 +-
 tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Cs    | 2 +-
 tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Us    | 2 +-
 .../surfactantFoam/planeTransport/constant/transportProperties  | 2 +-
 .../surfactantFoam/planeTransport/system/blockMeshDict          | 2 +-
 .../finiteArea/surfactantFoam/planeTransport/system/controlDict | 2 +-
 .../surfactantFoam/planeTransport/system/decomposeParDict       | 2 +-
 .../planeTransport/system/decomposeParDict-procBoundary4        | 2 +-
 .../planeTransport/system/decomposeParDict-procBoundary8        | 2 +-
 .../surfactantFoam/planeTransport/system/faMeshDefinition       | 2 +-
 .../finiteArea/surfactantFoam/planeTransport/system/faSchemes   | 2 +-
 .../finiteArea/surfactantFoam/planeTransport/system/faSolution  | 2 +-
 .../finiteArea/surfactantFoam/planeTransport/system/fvSchemes   | 2 +-
 .../finiteArea/surfactantFoam/planeTransport/system/fvSolution  | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/T    | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/U    | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/0/alphat            | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/0/epsilon           | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/k    | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/nut  | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p    | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/0/p_rgh             | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/constant/g          | 2 +-
 .../BenardCells/constant/transportProperties                    | 2 +-
 .../BenardCells/constant/turbulenceProperties                   | 2 +-
 .../BenardCells/system/blockMeshDict                            | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/system/controlDict  | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/system/fvSchemes    | 2 +-
 .../buoyantBoussinesqPimpleFoam/BenardCells/system/fvSolution   | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/T   | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/U   | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/0.orig/alphat           | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/0.orig/epsilon          | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/k   | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/nut | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p   | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p_rgh            | 2 +-
 .../heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g | 2 +-
 .../hotRoom/constant/transportProperties                        | 2 +-
 .../hotRoom/constant/turbulenceProperties                       | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict    | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict      | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes        | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution       | 2 +-
 .../buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict    | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/T   | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/U   | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/0.orig/alphat           | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/0.orig/epsilon          | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/k   | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/nut | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p   | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p_rgh            | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g | 2 +-
 .../hotRoom/constant/transportProperties                        | 2 +-
 .../hotRoom/constant/turbulenceProperties                       | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict    | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict      | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes        | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution       | 2 +-
 .../buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict    | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/T       | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/U       | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/alphat  | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/epsilon | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/k       | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/nut     | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p       | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p_rgh   | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g     | 2 +-
 .../iglooWithFridges/constant/transportProperties               | 2 +-
 .../iglooWithFridges/constant/turbulenceProperties              | 2 +-
 .../iglooWithFridges/system/blockMeshDict                       | 2 +-
 .../iglooWithFridges/system/controlDict                         | 2 +-
 .../iglooWithFridges/system/decomposeParDict                    | 2 +-
 .../iglooWithFridges/system/fvSchemes                           | 2 +-
 .../iglooWithFridges/system/fvSolution                          | 2 +-
 .../iglooWithFridges/system/meshQualityDict                     | 2 +-
 .../iglooWithFridges/system/snappyHexMeshDict                   | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T       | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U       | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat  | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k       | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut     | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p       | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh   | 2 +-
 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g     | 2 +-
 .../buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties | 2 +-
 .../buoyantPimpleFoam/hotRoom/constant/turbulenceProperties     | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict   | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes     | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution    | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/IDefault        | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/T  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/Ts_ceilingShell | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/U  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/alphat          | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/epsilon         | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/h_ceilingShell  | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/k  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/nut             | 2 +-
 .../heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/0/p_rgh           | 2 +-
 .../constant/boundaryRadiationProperties                        | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/constant/g        | 2 +-
 .../hotRoomWithThermalShell/constant/radiationProperties        | 2 +-
 .../hotRoomWithThermalShell/constant/thermophysicalProperties   | 2 +-
 .../hotRoomWithThermalShell/constant/turbulenceProperties       | 2 +-
 .../hotRoomWithThermalShell/system/blockMeshDict                | 2 +-
 .../hotRoomWithThermalShell/system/controlDict                  | 2 +-
 .../hotRoomWithThermalShell/system/createPatchDict              | 2 +-
 .../hotRoomWithThermalShell/system/decomposeParDict             | 2 +-
 .../hotRoomWithThermalShell/system/faMeshDefinition             | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/system/faOptions  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/system/faSchemes  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/system/faSolution | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSchemes  | 2 +-
 .../buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSolution | 2 +-
 .../hotRoomWithThermalShell/system/topoSetDict                  | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/0.orig/IDefault      | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/0.orig/T             | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/0.orig/U             | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/0.orig/p             | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/0.orig/p_rgh         | 2 +-
 .../thermocoupleTestCase/constant/boundaryRadiationProperties   | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/constant/g           | 2 +-
 .../thermocoupleTestCase/constant/radiationProperties           | 2 +-
 .../thermocoupleTestCase/constant/thermophysicalProperties      | 2 +-
 .../thermocoupleTestCase/constant/turbulenceProperties          | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/system/blockMeshDict | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/system/controlDict   | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/system/fvSchemes     | 2 +-
 .../buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution    | 2 +-
 tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/T | 2 +-
 tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/U | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/alphat  | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/epsilon | 2 +-
 tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/k | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/nut     | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/omega   | 2 +-
 tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p_rgh   | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g     | 2 +-
 .../buoyantCavity/constant/thermophysicalProperties             | 2 +-
 .../buoyantCavity/constant/turbulenceProperties                 | 2 +-
 .../buoyantSimpleFoam/buoyantCavity/system/blockMeshDict        | 2 +-
 .../buoyantSimpleFoam/buoyantCavity/system/controlDict          | 2 +-
 .../buoyantSimpleFoam/buoyantCavity/system/fvSchemes            | 2 +-
 .../buoyantSimpleFoam/buoyantCavity/system/fvSolution           | 2 +-
 .../heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample  | 2 +-
 .../heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T | 2 +-
 .../heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat         | 2 +-
 .../circuitBoardCooling/0.orig/baffle3DRegion/Q                 | 2 +-
 .../circuitBoardCooling/0.orig/baffle3DRegion/T                 | 2 +-
 .../circuitBoardCooling/0.orig/baffle3DRegion/p                 | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon        | 2 +-
 .../0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches    | 2 +-
 .../0.orig/include/1DBaffle/1DbaffleSolidThermo                 | 2 +-
 .../0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches    | 2 +-
 .../0.orig/include/3DBaffle/3DbaffleSolidThermo                 | 2 +-
 .../circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel    | 2 +-
 .../circuitBoardCooling/0.orig/include/baffle3DSetup            | 2 +-
 .../circuitBoardCooling/0.orig/include/wallBafflePatches        | 2 +-
 .../heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/0.orig/nut            | 2 +-
 .../heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh          | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/constant/g            | 2 +-
 .../circuitBoardCooling/constant/thermophysicalProperties       | 2 +-
 .../circuitBoardCooling/constant/turbulenceProperties           | 2 +-
 .../circuitBoardCooling/system/baffle3DRegion/fvSchemes         | 2 +-
 .../circuitBoardCooling/system/baffle3DRegion/fvSolution        | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict  | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/system/controlDict    | 2 +-
 .../circuitBoardCooling/system/createBafflesDict                | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes      | 2 +-
 .../buoyantSimpleFoam/circuitBoardCooling/system/fvSolution     | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/DR     | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PMV    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PPD    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/T      | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/U      | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/alphat | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/0.orig/epsilon             | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/k      | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/nut    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p      | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p_rgh  | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g    | 2 +-
 .../comfortHotRoom/constant/thermophysicalProperties            | 2 +-
 .../comfortHotRoom/constant/turbulenceProperties                | 2 +-
 .../heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOage  | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/FOcomfort           | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict       | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/controlDict         | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/createPatchDict     | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/decomposeParDict    | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/fvOptions           | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/fvSchemes           | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/fvSolution          | 2 +-
 .../buoyantSimpleFoam/comfortHotRoom/system/topoSetDict         | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/G    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/T    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/U    | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/0.orig/alphat            | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/0.orig/epsilon           | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/k    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/nut  | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p    | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/0.orig/p_rgh             | 2 +-
 .../hotRadiationRoom/constant/boundaryRadiationProperties       | 2 +-
 .../heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g  | 2 +-
 .../hotRadiationRoom/constant/radiationProperties               | 2 +-
 .../hotRadiationRoom/constant/thermophysicalProperties          | 2 +-
 .../hotRadiationRoom/constant/turbulenceProperties              | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict     | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/system/controlDict       | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes         | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoom/system/fvSolution        | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/G            | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/IDefault     | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/T            | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/U            | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/alphat       | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/epsilon      | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/k            | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/nut          | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p            | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p_rgh        | 2 +-
 .../hotRadiationRoomFvDOM/constant/boundaryRadiationProperties  | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g          | 2 +-
 .../hotRadiationRoomFvDOM/constant/radiationProperties          | 2 +-
 .../hotRadiationRoomFvDOM/constant/thermophysicalProperties     | 2 +-
 .../hotRadiationRoomFvDOM/constant/turbulenceProperties         | 2 +-
 .../hotRadiationRoomFvDOM/system/blockMeshDict                  | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict  | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes    | 2 +-
 .../buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution   | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/T             | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/U             | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/alphat        | 2 +-
 .../roomWithThickCeiling/0.orig/baffle3DRegion/T                | 2 +-
 .../roomWithThickCeiling/0.orig/baffle3DRegion/p                | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/epsilon       | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/k             | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/nut           | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/p             | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/0.orig/p_rgh         | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/constant/g           | 2 +-
 .../roomWithThickCeiling/constant/thermophysicalProperties      | 2 +-
 .../roomWithThickCeiling/constant/turbulenceProperties          | 2 +-
 .../roomWithThickCeiling/system/baffle3DRegion/fvSchemes        | 2 +-
 .../roomWithThickCeiling/system/baffle3DRegion/fvSolution       | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/system/blockMeshDict | 2 +-
 .../roomWithThickCeiling/system/changeDictionaryDict            | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/system/controlDict   | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/system/fvSchemes     | 2 +-
 .../buoyantSimpleFoam/roomWithThickCeiling/system/fvSolution    | 2 +-
 .../heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/T | 2 +-
 .../heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/U | 2 +-
 .../heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p | 2 +-
 .../buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p_rgh          | 2 +-
 .../simpleCarSolarPanel/constant/boundaryRadiationProperties    | 2 +-
 .../buoyantSimpleFoam/simpleCarSolarPanel/constant/g            | 2 +-
 .../simpleCarSolarPanel/constant/radiationProperties            | 2 +-
 .../simpleCarSolarPanel/constant/thermophysicalProperties       | 2 +-
 .../simpleCarSolarPanel/constant/turbulenceProperties           | 2 +-
 .../buoyantSimpleFoam/simpleCarSolarPanel/system/blockMeshDict  | 2 +-
 .../buoyantSimpleFoam/simpleCarSolarPanel/system/controlDict    | 2 +-
 .../buoyantSimpleFoam/simpleCarSolarPanel/system/fvSchemes      | 2 +-
 .../buoyantSimpleFoam/simpleCarSolarPanel/system/fvSolution     | 2 +-
 .../simpleCarSolarPanel/system/meshQualityDict                  | 2 +-
 .../simpleCarSolarPanel/system/snappyHexMeshDict                | 2 +-
 .../simpleCarSolarPanel/system/surfaceFeatureExtractDict        | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/0.orig/T           | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/0.orig/U           | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/0.orig/epsilon     | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/0.orig/k           | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/0.orig/p           | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/0.orig/p_rgh       | 2 +-
 .../constant/bottomWater/radiationProperties                    | 2 +-
 .../constant/bottomWater/thermophysicalProperties               | 2 +-
 .../constant/bottomWater/turbulenceProperties                   | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/constant/g         | 2 +-
 .../externalCoupledHeater/constant/heater/radiationProperties   | 2 +-
 .../constant/heater/thermophysicalProperties                    | 2 +-
 .../externalCoupledHeater/constant/regionProperties             | 2 +-
 .../constant/topAir/thermophysicalProperties                    | 2 +-
 .../externalCoupledHeater/system/blockMeshDict                  | 2 +-
 .../system/bottomWater/changeDictionaryDict                     | 2 +-
 .../externalCoupledHeater/system/bottomWater/fvSchemes          | 2 +-
 .../externalCoupledHeater/system/bottomWater/fvSolution         | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/system/controlDict | 2 +-
 .../externalCoupledHeater/system/decomposeParDict               | 2 +-
 .../externalCoupledHeater/system/externalCoupled                | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/system/fvSchemes   | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/system/fvSolution  | 2 +-
 .../externalCoupledHeater/system/heater/changeDictionaryDict    | 2 +-
 .../externalCoupledHeater/system/heater/decomposeParDict        | 2 +-
 .../externalCoupledHeater/system/heater/fvSchemes               | 2 +-
 .../externalCoupledHeater/system/heater/fvSolution              | 2 +-
 .../externalCoupledHeater/system/leftSolid/changeDictionaryDict | 2 +-
 .../system/rightSolid/changeDictionaryDict                      | 2 +-
 .../externalCoupledHeater/system/topAir/changeDictionaryDict    | 2 +-
 .../chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/G           | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault    | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/T           | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/U           | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat      | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon     | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/k           | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut         | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/p           | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh       | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr          | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T         | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p         | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T         | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p         | 2 +-
 .../externalSolarLoad/constant/air/boundaryRadiationProperties  | 2 +-
 .../externalSolarLoad/constant/air/radiationProperties          | 2 +-
 .../externalSolarLoad/constant/air/thermophysicalProperties     | 2 +-
 .../externalSolarLoad/constant/air/turbulenceProperties         | 2 +-
 .../externalSolarLoad/constant/air/viewFactorsDict              | 2 +-
 .../externalSolarLoad/constant/floor/radiationProperties        | 2 +-
 .../externalSolarLoad/constant/floor/thermophysicalProperties   | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/constant/g             | 2 +-
 .../externalSolarLoad/constant/regionProperties                 | 2 +-
 .../externalSolarLoad/constant/solid/radiationProperties        | 2 +-
 .../externalSolarLoad/constant/solid/thermophysicalProperties   | 2 +-
 .../externalSolarLoad/system/air/changeDictionaryDict           | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes   | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution  | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/blockMeshDict   | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/controlDict     | 2 +-
 .../externalSolarLoad/system/decomposeParDict                   | 2 +-
 .../externalSolarLoad/system/extrudeToRegionMeshDict            | 2 +-
 .../externalSolarLoad/system/floor/changeDictionaryDict         | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes | 2 +-
 .../externalSolarLoad/system/floor/fvSolution                   | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/fvSchemes       | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/fvSolution      | 2 +-
 .../externalSolarLoad/system/solid/changeDictionaryDict         | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes | 2 +-
 .../externalSolarLoad/system/solid/fvSolution                   | 2 +-
 .../chtMultiRegionFoam/externalSolarLoad/system/topoSetDict     | 2 +-
 .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/T  | 2 +-
 .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/U  | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/0.orig/epsilon         | 2 +-
 .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/k  | 2 +-
 .../heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p  | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/0.orig/p_rgh           | 2 +-
 .../multiRegionHeater/constant/bottomWater/radiationProperties  | 2 +-
 .../constant/bottomWater/thermophysicalProperties               | 2 +-
 .../multiRegionHeater/constant/bottomWater/turbulenceProperties | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/constant/g             | 2 +-
 .../multiRegionHeater/constant/heater/radiationProperties       | 2 +-
 .../multiRegionHeater/constant/heater/thermophysicalProperties  | 2 +-
 .../multiRegionHeater/constant/regionProperties                 | 2 +-
 .../multiRegionHeater/constant/topAir/thermophysicalProperties  | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict   | 2 +-
 .../multiRegionHeater/system/bottomWater/changeDictionaryDict   | 2 +-
 .../multiRegionHeater/system/bottomWater/fvSchemes              | 2 +-
 .../multiRegionHeater/system/bottomWater/fvSolution             | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/system/controlDict     | 2 +-
 .../multiRegionHeater/system/decomposeParDict                   | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/system/fvSchemes       | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/system/fvSolution      | 2 +-
 .../multiRegionHeater/system/heater/changeDictionaryDict        | 2 +-
 .../multiRegionHeater/system/heater/fvSchemes                   | 2 +-
 .../multiRegionHeater/system/heater/fvSolution                  | 2 +-
 .../multiRegionHeater/system/leftSolid/changeDictionaryDict     | 2 +-
 .../multiRegionHeater/system/leftSolid/fvSolution               | 2 +-
 .../multiRegionHeater/system/rightSolid/changeDictionaryDict    | 2 +-
 .../multiRegionHeater/system/rightSolid/fvSolution              | 2 +-
 .../multiRegionHeater/system/topAir/changeDictionaryDict        | 2 +-
 .../multiRegionHeater/system/topAir/fvSolution                  | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/system/topoSetDict     | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/gas/CH4             | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/N2 | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/O2 | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/T  | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/U  | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/gas/Ydefault        | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/gas/alphat          | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/gas/epsilon         | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/k  | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/gas/nut             | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p  | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/gas/p_rgh           | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/solid/T             | 2 +-
 .../chtMultiRegionFoam/reverseBurner/0.orig/solid/p             | 2 +-
 .../heatTransfer/chtMultiRegionFoam/reverseBurner/constant/g    | 2 +-
 .../reverseBurner/constant/gas/chemistryProperties              | 2 +-
 .../reverseBurner/constant/gas/combustionProperties             | 2 +-
 .../chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions     | 2 +-
 .../reverseBurner/constant/gas/radiationProperties              | 2 +-
 .../chtMultiRegionFoam/reverseBurner/constant/gas/reactions     | 2 +-
 .../reverseBurner/constant/gas/thermo.compressibleGas           | 2 +-
 .../reverseBurner/constant/gas/thermophysicalProperties         | 2 +-
 .../reverseBurner/constant/gas/turbulenceProperties             | 2 +-
 .../chtMultiRegionFoam/reverseBurner/constant/regionProperties  | 2 +-
 .../reverseBurner/constant/solid/radiationProperties            | 2 +-
 .../reverseBurner/constant/solid/thermophysicalProperties       | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/blockMeshDict       | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/controlDict         | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/decomposeParDict    | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/fvSchemes           | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/fvSolution          | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes       | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/gas/fvSolution      | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict     | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/solid/fvSchemes     | 2 +-
 .../chtMultiRegionFoam/reverseBurner/system/solid/fvSolution    | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/T         | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/U         | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/alphat    | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/epsilon   | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/k         | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p         | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p_rgh     | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/rho       | 2 +-
 .../constant/bottomAir/radiationProperties                      | 2 +-
 .../constant/bottomAir/thermophysicalProperties                 | 2 +-
 .../constant/bottomAir/turbulenceProperties                     | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/constant/g       | 2 +-
 .../snappyMultiRegionHeater/constant/heater/radiationProperties | 2 +-
 .../constant/heater/thermophysicalProperties                    | 2 +-
 .../snappyMultiRegionHeater/constant/regionProperties           | 2 +-
 .../snappyMultiRegionHeater/system/blockMeshDict                | 2 +-
 .../system/bottomAir/changeDictionaryDict                       | 2 +-
 .../snappyMultiRegionHeater/system/bottomAir/fvSchemes          | 2 +-
 .../snappyMultiRegionHeater/system/bottomAir/fvSolution         | 2 +-
 .../snappyMultiRegionHeater/system/controlDict                  | 2 +-
 .../snappyMultiRegionHeater/system/decomposeParDict             | 2 +-
 .../snappyMultiRegionHeater/system/decomposeParDict.6           | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes | 2 +-
 .../snappyMultiRegionHeater/system/fvSolution                   | 2 +-
 .../snappyMultiRegionHeater/system/heater/changeDictionaryDict  | 2 +-
 .../snappyMultiRegionHeater/system/heater/fvSchemes             | 2 +-
 .../snappyMultiRegionHeater/system/heater/fvSolution            | 2 +-
 .../system/leftSolid/changeDictionaryDict                       | 2 +-
 .../snappyMultiRegionHeater/system/leftSolid/fvSolution         | 2 +-
 .../snappyMultiRegionHeater/system/meshQualityDict              | 2 +-
 .../system/rightSolid/changeDictionaryDict                      | 2 +-
 .../snappyMultiRegionHeater/system/rightSolid/fvSolution        | 2 +-
 .../snappyMultiRegionHeater/system/snappyHexMeshDict            | 2 +-
 .../snappyMultiRegionHeater/system/surfaceFeatureExtractDict    | 2 +-
 .../snappyMultiRegionHeater/system/topAir/changeDictionaryDict  | 2 +-
 .../snappyMultiRegionHeater/system/topAir/fvSolution            | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/T | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/U | 2 +-
 .../snappyMultiRegionHeaterImplicit/0.orig/alphat               | 2 +-
 .../snappyMultiRegionHeaterImplicit/0.orig/epsilon              | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/k | 2 +-
 .../chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p | 2 +-
 .../snappyMultiRegionHeaterImplicit/0.orig/p_rgh                | 2 +-
 .../snappyMultiRegionHeaterImplicit/0.orig/rho                  | 2 +-
 .../constant/bottomAir/radiationProperties                      | 2 +-
 .../constant/bottomAir/thermophysicalProperties                 | 2 +-
 .../constant/bottomAir/turbulenceProperties                     | 2 +-
 .../snappyMultiRegionHeaterImplicit/constant/g                  | 2 +-
 .../constant/heater/radiationProperties                         | 2 +-
 .../constant/heater/thermophysicalProperties                    | 2 +-
 .../snappyMultiRegionHeaterImplicit/constant/regionProperties   | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/blockMeshDict        | 2 +-
 .../system/bottomAir/changeDictionaryDict                       | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/bottomAir/fvSchemes  | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/bottomAir/fvSolution | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/controlDict          | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/decomposeParDict     | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/fvSchemes            | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/fvSolution           | 2 +-
 .../system/heater/changeDictionaryDict                          | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/heater/fvSchemes     | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/heater/fvSolution    | 2 +-
 .../system/leftSolid/changeDictionaryDict                       | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/leftSolid/fvSolution | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/meshQualityDict      | 2 +-
 .../system/rightSolid/changeDictionaryDict                      | 2 +-
 .../system/rightSolid/fvSolution                                | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/snappyHexMeshDict    | 2 +-
 .../system/surfaceFeatureExtractDict                            | 2 +-
 .../system/topAir/changeDictionaryDict                          | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/topAir/fvSolution    | 2 +-
 .../snappyMultiRegionHeaterImplicit/system/topoSetDict.f1       | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/G          | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/IDefault   | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/T          | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/U          | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/alphat     | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/epsilon    | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/k          | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/nut        | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p          | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p_rgh      | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/qr         | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/T        | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/p        | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/T        | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/p        | 2 +-
 .../solarBeamWithTrees/constant/air/boundaryRadiationProperties | 2 +-
 .../solarBeamWithTrees/constant/air/radiationProperties         | 2 +-
 .../solarBeamWithTrees/constant/air/thermophysicalProperties    | 2 +-
 .../solarBeamWithTrees/constant/air/turbulenceProperties        | 2 +-
 .../solarBeamWithTrees/constant/floor/radiationProperties       | 2 +-
 .../solarBeamWithTrees/constant/floor/thermophysicalProperties  | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/constant/g            | 2 +-
 .../solarBeamWithTrees/constant/regionProperties                | 2 +-
 .../solarBeamWithTrees/constant/solid/radiationProperties       | 2 +-
 .../solarBeamWithTrees/constant/solid/thermophysicalProperties  | 2 +-
 .../solarBeamWithTrees/system/air/changeDictionaryDict          | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSchemes  | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSolution | 2 +-
 .../solarBeamWithTrees/system/air/topoSetDict                   | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/blockMeshDict  | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/controlDict    | 2 +-
 .../solarBeamWithTrees/system/decomposeParDict                  | 2 +-
 .../solarBeamWithTrees/system/extrudeToRegionMeshDict           | 2 +-
 .../solarBeamWithTrees/system/floor/changeDictionaryDict        | 2 +-
 .../solarBeamWithTrees/system/floor/fvSchemes                   | 2 +-
 .../solarBeamWithTrees/system/floor/fvSolution                  | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/fvSchemes      | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/fvSolution     | 2 +-
 .../solarBeamWithTrees/system/solid/changeDictionaryDict        | 2 +-
 .../solarBeamWithTrees/system/solid/fvSchemes                   | 2 +-
 .../solarBeamWithTrees/system/solid/fvSolution                  | 2 +-
 .../chtMultiRegionFoam/solarBeamWithTrees/system/topoSetDict    | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O  | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T    | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U    | 2 +-
 .../windshieldCondensation/0.orig/cabin/alphat                  | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k    | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut  | 2 +-
 .../windshieldCondensation/0.orig/cabin/omega                   | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p    | 2 +-
 .../windshieldCondensation/0.orig/cabin/p_rgh                   | 2 +-
 .../windshieldCondensation/0.orig/windshield/T                  | 2 +-
 .../windshieldCondensation/0.orig/windshield/p                  | 2 +-
 .../windshieldCondensation/constant/cabin/radiationProperties   | 2 +-
 .../constant/cabin/thermophysicalProperties                     | 2 +-
 .../windshieldCondensation/constant/cabin/turbulenceProperties  | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/constant/g        | 2 +-
 .../windshieldCondensation/constant/regionProperties            | 2 +-
 .../constant/windshield/radiationProperties                     | 2 +-
 .../constant/windshield/thermophysicalProperties                | 2 +-
 .../windshieldCondensation/system/blockMeshDict                 | 2 +-
 .../windshieldCondensation/system/cabin/fvOptions               | 2 +-
 .../windshieldCondensation/system/cabin/fvSchemes               | 2 +-
 .../windshieldCondensation/system/cabin/fvSolution              | 2 +-
 .../windshieldCondensation/system/cabin/topoSetDict             | 2 +-
 .../windshieldCondensation/system/cabin/topoSetDictRegister     | 2 +-
 .../windshieldCondensation/system/controlDict                   | 2 +-
 .../windshieldCondensation/system/decomposeParDict              | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/system/fvSchemes  | 2 +-
 .../chtMultiRegionFoam/windshieldCondensation/system/fvSolution | 2 +-
 .../windshieldCondensation/system/solverControls                | 2 +-
 .../windshieldCondensation/system/solverControls.0              | 2 +-
 .../windshieldCondensation/system/solverControls.20             | 2 +-
 .../windshieldCondensation/system/solverControls.5              | 2 +-
 .../windshieldCondensation/system/solverControls.60             | 2 +-
 .../windshieldCondensation/system/topoSetDict                   | 2 +-
 .../windshieldCondensation/system/windshield/fvSchemes          | 2 +-
 .../windshieldCondensation/system/windshield/fvSolution         | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T         | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U         | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat    | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k         | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut       | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut       | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega     | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p         | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh     | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T      | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U      | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k      | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut    | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega  | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p      | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh  | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T           | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U           | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p           | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh       | 2 +-
 .../windshieldDefrost/constant/cabin/thermophysicalProperties   | 2 +-
 .../windshieldDefrost/constant/cabin/turbulenceProperties       | 2 +-
 .../constant/exterior/thermophysicalProperties                  | 2 +-
 .../windshieldDefrost/constant/exterior/turbulenceProperties    | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/constant/g             | 2 +-
 .../windshieldDefrost/constant/ice/thermophysicalProperties     | 2 +-
 .../windshieldDefrost/constant/ice/turbulenceProperties         | 2 +-
 .../windshieldDefrost/constant/regionProperties                 | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/blockMeshDict   | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes | 2 +-
 .../windshieldDefrost/system/cabin/fvSolution                   | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/controlDict     | 2 +-
 .../windshieldDefrost/system/decomposeParDict                   | 2 +-
 .../windshieldDefrost/system/exterior/fvSchemes                 | 2 +-
 .../windshieldDefrost/system/exterior/fvSolution                | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/fvSchemes       | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/fvSolution      | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/ice/fvOptions   | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes   | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution  | 2 +-
 .../chtMultiRegionFoam/windshieldDefrost/system/topoSetDict     | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/T        | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/U        | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/alphat   | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/epsilon  | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/k        | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/nut      | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p        | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p_rgh    | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/T          | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/p          | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/T         | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/p         | 2 +-
 .../cpuCabinet/constant/domain0/MRFProperties                   | 2 +-
 .../cpuCabinet/constant/domain0/thermophysicalProperties        | 2 +-
 .../cpuCabinet/constant/domain0/turbulenceProperties            | 2 +-
 .../heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/g | 2 +-
 .../cpuCabinet/constant/regionProperties                        | 2 +-
 .../cpuCabinet/constant/v_CPU/thermophysicalProperties          | 2 +-
 .../cpuCabinet/constant/v_fins/thermophysicalProperties         | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/blockMeshDict    | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/controlDict      | 2 +-
 .../cpuCabinet/system/createBafflesDict                         | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/decomposeParDict | 2 +-
 .../cpuCabinet/system/domain0/decomposeParDict                  | 2 +-
 .../cpuCabinet/system/domain0/fvSchemes                         | 2 +-
 .../cpuCabinet/system/domain0/fvSolution                        | 2 +-
 .../cpuCabinet/system/domain0/topoSetDict                       | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/fvSchemes        | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/fvSolution       | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/meshQualityDict  | 2 +-
 .../cpuCabinet/system/snappyHexMeshDict                         | 2 +-
 .../cpuCabinet/system/surfaceFeatureExtractDict                 | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1   | 2 +-
 .../cpuCabinet/system/v_CPU/decomposeParDict                    | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions  | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSchemes  | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSolution | 2 +-
 .../cpuCabinet/system/v_fins/decomposeParDict                   | 2 +-
 .../chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSchemes | 2 +-
 .../cpuCabinet/system/v_fins/fvSolution                         | 2 +-
 .../chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/T     | 2 +-
 .../chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/U     | 2 +-
 .../externalCoupledHeater/0.orig/epsilon                        | 2 +-
 .../chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/k     | 2 +-
 .../chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p     | 2 +-
 .../chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p_rgh | 2 +-
 .../constant/bottomWater/radiationProperties                    | 2 +-
 .../constant/bottomWater/thermophysicalProperties               | 2 +-
 .../constant/bottomWater/turbulenceProperties                   | 2 +-
 .../chtMultiRegionSimpleFoam/externalCoupledHeater/constant/g   | 2 +-
 .../externalCoupledHeater/constant/heater/radiationProperties   | 2 +-
 .../constant/heater/thermophysicalProperties                    | 2 +-
 .../externalCoupledHeater/constant/regionProperties             | 2 +-
 .../constant/topAir/thermophysicalProperties                    | 2 +-
 .../externalCoupledHeater/system/blockMeshDict                  | 2 +-
 .../externalCoupledHeater/system/bottomAir/fvSchemes            | 2 +-
 .../externalCoupledHeater/system/bottomAir/fvSolution           | 2 +-
 .../system/bottomWater/changeDictionaryDict                     | 2 +-
 .../externalCoupledHeater/system/bottomWater/fvSchemes          | 2 +-
 .../externalCoupledHeater/system/bottomWater/fvSolution         | 2 +-
 .../externalCoupledHeater/system/controlDict                    | 2 +-
 .../externalCoupledHeater/system/decomposeParDict               | 2 +-
 .../externalCoupledHeater/system/externalCoupled                | 2 +-
 .../externalCoupledHeater/system/fvSchemes                      | 2 +-
 .../externalCoupledHeater/system/fvSolution                     | 2 +-
 .../externalCoupledHeater/system/heater/changeDictionaryDict    | 2 +-
 .../externalCoupledHeater/system/heater/fvSchemes               | 2 +-
 .../externalCoupledHeater/system/heater/fvSolution              | 2 +-
 .../externalCoupledHeater/system/leftSolid/changeDictionaryDict | 2 +-
 .../externalCoupledHeater/system/leftSolid/fvSolution           | 2 +-
 .../system/rightSolid/changeDictionaryDict                      | 2 +-
 .../externalCoupledHeater/system/rightSolid/fvSolution          | 2 +-
 .../externalCoupledHeater/system/topAir/changeDictionaryDict    | 2 +-
 .../externalCoupledHeater/system/topAir/fvSolution              | 2 +-
 .../externalCoupledHeater/system/topoSetDict                    | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T         | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U         | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat    | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon   | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k         | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut       | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p         | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh     | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV    | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T      | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U      | 2 +-
 .../heatExchanger/0.orig/porous/htcConst                        | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p      | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh  | 2 +-
 .../heatExchanger/constant/air/MRFProperties                    | 2 +-
 .../heatExchanger/constant/air/fvOptions                        | 2 +-
 .../heatExchanger/constant/air/radiationProperties              | 2 +-
 .../heatExchanger/constant/air/thermophysicalProperties         | 2 +-
 .../heatExchanger/constant/air/turbulenceProperties             | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/constant/g           | 2 +-
 .../heatExchanger/constant/porous/fvOptions                     | 2 +-
 .../heatExchanger/constant/porous/thermophysicalProperties      | 2 +-
 .../heatExchanger/constant/porous/turbulenceProperties          | 2 +-
 .../heatExchanger/constant/regionProperties                     | 2 +-
 .../heatExchanger/system/air/blockMeshDict                      | 2 +-
 .../heatExchanger/system/air/createBafflesDict                  | 2 +-
 .../heatExchanger/system/air/decomposeParDict                   | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes | 2 +-
 .../heatExchanger/system/air/fvSolution                         | 2 +-
 .../heatExchanger/system/air/topoSetDict.1                      | 2 +-
 .../heatExchanger/system/air/topoSetDict.2                      | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/system/controlDict   | 2 +-
 .../heatExchanger/system/decomposeParDict                       | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes     | 2 +-
 .../chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution    | 2 +-
 .../heatExchanger/system/porous/blockMeshDict                   | 2 +-
 .../heatExchanger/system/porous/decomposeParDict                | 2 +-
 .../heatExchanger/system/porous/fvSchemes                       | 2 +-
 .../heatExchanger/system/porous/fvSolution                      | 2 +-
 .../chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/T   | 2 +-
 .../jouleHeatingSolid/0.orig/solid/jouleHeatingSource:V         | 2 +-
 .../jouleHeatingSolid/0.orig/solid/jouleHeatingSource:sigma     | 2 +-
 .../chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/p   | 2 +-
 .../chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/g       | 2 +-
 .../jouleHeatingSolid/constant/regionProperties                 | 2 +-
 .../jouleHeatingSolid/constant/solid/thermophysicalProperties   | 2 +-
 .../jouleHeatingSolid/system/controlDict                        | 2 +-
 .../jouleHeatingSolid/system/decomposeParDict                   | 2 +-
 .../jouleHeatingSolid/system/fvSolution                         | 2 +-
 .../jouleHeatingSolid/system/solid/blockMeshDict                | 2 +-
 .../jouleHeatingSolid/system/solid/fvOptions                    | 2 +-
 .../jouleHeatingSolid/system/solid/fvSchemes                    | 2 +-
 .../jouleHeatingSolid/system/solid/fvSolution                   | 2 +-
 .../multiRegionHeaterRadiation/0.orig/G                         | 2 +-
 .../multiRegionHeaterRadiation/0.orig/IDefault                  | 2 +-
 .../multiRegionHeaterRadiation/0.orig/T                         | 2 +-
 .../multiRegionHeaterRadiation/0.orig/U                         | 2 +-
 .../multiRegionHeaterRadiation/0.orig/epsilon                   | 2 +-
 .../multiRegionHeaterRadiation/0.orig/k                         | 2 +-
 .../multiRegionHeaterRadiation/0.orig/p                         | 2 +-
 .../multiRegionHeaterRadiation/0.orig/p_rgh                     | 2 +-
 .../multiRegionHeaterRadiation/0.orig/qr                        | 2 +-
 .../constant/bottomAir/boundaryRadiationProperties              | 2 +-
 .../constant/bottomAir/radiationProperties                      | 2 +-
 .../constant/bottomAir/thermophysicalProperties                 | 2 +-
 .../constant/bottomAir/turbulenceProperties                     | 2 +-
 .../constant/bottomAir/viewFactorsDict                          | 2 +-
 .../multiRegionHeaterRadiation/constant/g                       | 2 +-
 .../constant/heater/radiationProperties                         | 2 +-
 .../constant/heater/thermophysicalProperties                    | 2 +-
 .../multiRegionHeaterRadiation/constant/regionProperties        | 2 +-
 .../constant/topAir/boundaryRadiationProperties                 | 2 +-
 .../multiRegionHeaterRadiation/constant/topAir/viewFactorsDict  | 2 +-
 .../multiRegionHeaterRadiation/system/blockMeshDict             | 2 +-
 .../system/bottomAir/changeDictionaryDict                       | 2 +-
 .../multiRegionHeaterRadiation/system/bottomAir/fvSchemes       | 2 +-
 .../multiRegionHeaterRadiation/system/bottomAir/fvSolution      | 2 +-
 .../multiRegionHeaterRadiation/system/controlDict               | 2 +-
 .../multiRegionHeaterRadiation/system/decomposeParDict          | 2 +-
 .../multiRegionHeaterRadiation/system/fvSchemes                 | 2 +-
 .../multiRegionHeaterRadiation/system/fvSolution                | 2 +-
 .../system/heater/changeDictionaryDict                          | 2 +-
 .../multiRegionHeaterRadiation/system/heater/fvSchemes          | 2 +-
 .../multiRegionHeaterRadiation/system/heater/fvSolution         | 2 +-
 .../system/leftSolid/changeDictionaryDict                       | 2 +-
 .../multiRegionHeaterRadiation/system/leftSolid/fvSolution      | 2 +-
 .../system/rightSolid/changeDictionaryDict                      | 2 +-
 .../multiRegionHeaterRadiation/system/rightSolid/fvSolution     | 2 +-
 .../system/topAir/changeDictionaryDict                          | 2 +-
 .../multiRegionHeaterRadiation/system/topAir/fvSolution         | 2 +-
 .../multiRegionHeaterRadiation/system/topoSetDict               | 2 +-
 .../solidQuenching2D/0.orig/solid/T                             | 2 +-
 .../solidQuenching2D/0.orig/solid/p                             | 2 +-
 .../solidQuenching2D/0.orig/water/T.gas                         | 2 +-
 .../solidQuenching2D/0.orig/water/T.liquid                      | 2 +-
 .../solidQuenching2D/0.orig/water/U.gas                         | 2 +-
 .../solidQuenching2D/0.orig/water/U.liquid                      | 2 +-
 .../solidQuenching2D/0.orig/water/alpha.gas                     | 2 +-
 .../solidQuenching2D/0.orig/water/alpha.liquid                  | 2 +-
 .../solidQuenching2D/0.orig/water/alphat.gas                    | 2 +-
 .../solidQuenching2D/0.orig/water/alphat.liquid                 | 2 +-
 .../solidQuenching2D/0.orig/water/epsilon.gas                   | 2 +-
 .../solidQuenching2D/0.orig/water/epsilon.liquid                | 2 +-
 .../solidQuenching2D/0.orig/water/f.gas.bubbles                 | 2 +-
 .../solidQuenching2D/0.orig/water/k.gas                         | 2 +-
 .../solidQuenching2D/0.orig/water/k.liquid                      | 2 +-
 .../solidQuenching2D/0.orig/water/nut.gas                       | 2 +-
 .../solidQuenching2D/0.orig/water/nut.liquid                    | 2 +-
 .../solidQuenching2D/0.orig/water/p                             | 2 +-
 .../solidQuenching2D/0.orig/water/p_rgh                         | 2 +-
 .../chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/g | 2 +-
 .../solidQuenching2D/constant/regionProperties                  | 2 +-
 .../solidQuenching2D/constant/solid/radiationProperties         | 2 +-
 .../solidQuenching2D/constant/solid/thermophysicalProperties    | 2 +-
 .../solidQuenching2D/constant/water/fvOptions                   | 2 +-
 .../solidQuenching2D/constant/water/phaseProperties             | 2 +-
 .../constant/water/thermophysicalProperties.gas                 | 2 +-
 .../constant/water/thermophysicalProperties.liquid              | 2 +-
 .../solidQuenching2D/constant/water/turbulenceProperties.gas    | 2 +-
 .../solidQuenching2D/constant/water/turbulenceProperties.liquid | 2 +-
 .../solidQuenching2D/system/blockMeshDict                       | 2 +-
 .../solidQuenching2D/system/controlDict                         | 2 +-
 .../solidQuenching2D/system/decomposeParDict                    | 2 +-
 .../solidQuenching2D/system/fvSchemes                           | 2 +-
 .../solidQuenching2D/system/fvSolution                          | 2 +-
 .../solidQuenching2D/system/solid/changeDictionaryDict          | 2 +-
 .../solidQuenching2D/system/solid/fvSchemes                     | 2 +-
 .../solidQuenching2D/system/solid/fvSolution                    | 2 +-
 .../solidQuenching2D/system/topoSetDict                         | 2 +-
 .../solidQuenching2D/system/water/changeDictionaryDict          | 2 +-
 .../solidQuenching2D/system/water/fvSchemes                     | 2 +-
 .../solidQuenching2D/system/water/fvSolution                    | 2 +-
 .../solidQuenching2D/system/water/setFieldsDict                 | 2 +-
 .../heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/T    | 2 +-
 .../heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/U    | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/0.orig/alphat            | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/0.orig/epsilon           | 2 +-
 .../heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/k    | 2 +-
 .../heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/nut  | 2 +-
 .../heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p    | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/0.orig/p_rgh             | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/0.orig/pointDisplacement | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/0.orig/zoneID            | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/constant/dynamicMeshDict | 2 +-
 .../heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/g  | 2 +-
 .../movingBox/constant/thermophysicalProperties                 | 2 +-
 .../movingBox/constant/turbulenceProperties                     | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/blockMeshDict     | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/controlDict       | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict  | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/fvSchemes         | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/fvSolution        | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/setFieldsDict     | 2 +-
 .../overBuoyantPimpleDyMFoam/movingBox/system/topoSetDict       | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/0/T                 | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/0/U                 | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/0/p                 | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/0/pointMotionUx     | 2 +-
 .../heatTransfer/solidFoam/movingCone/constant/dynamicMeshDict  | 2 +-
 .../solidFoam/movingCone/constant/radiationProperties           | 2 +-
 .../solidFoam/movingCone/constant/thermophysicalProperties      | 2 +-
 .../heatTransfer/solidFoam/movingCone/system/blockMeshDict      | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/system/controlDict  | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/system/fvSchemes    | 2 +-
 tutorials/heatTransfer/solidFoam/movingCone/system/fvSolution   | 2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/Urel      | 2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/epsilon   | 2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/k         | 2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/nut       | 2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/p         | 2 +-
 .../incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties | 2 +-
 .../SRFPimpleFoam/rotor2D/constant/transportProperties          | 2 +-
 .../SRFPimpleFoam/rotor2D/constant/turbulenceProperties         | 2 +-
 .../SRFPimpleFoam/rotor2D/system/blockMeshDict.m4               | 2 +-
 .../incompressible/SRFPimpleFoam/rotor2D/system/controlDict     | 2 +-
 tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes | 2 +-
 .../incompressible/SRFPimpleFoam/rotor2D/system/fvSolution      | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel             | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon          | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/0/k                | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/0/nut              | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/0/omega            | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/0/p                | 2 +-
 .../incompressible/SRFSimpleFoam/mixer/constant/SRFProperties   | 2 +-
 .../SRFSimpleFoam/mixer/constant/transportProperties            | 2 +-
 .../SRFSimpleFoam/mixer/constant/turbulenceProperties           | 2 +-
 .../incompressible/SRFSimpleFoam/mixer/system/blockMeshDict     | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes   | 2 +-
 tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution  | 2 +-
 .../adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/U  | 2 +-
 .../adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/Ua | 2 +-
 .../sensitivityMaps/motorBike/0.orig/include/fixedInlet         | 2 +-
 .../motorBike/0.orig/include/frontBackUpperPatches              | 2 +-
 .../sensitivityMaps/motorBike/0.orig/include/initialConditions  | 2 +-
 .../sensitivityMaps/motorBike/0.orig/nuTilda                    | 2 +-
 .../sensitivityMaps/motorBike/0.orig/nuaTilda                   | 2 +-
 .../sensitivityMaps/motorBike/0.orig/nut                        | 2 +-
 .../adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/p  | 2 +-
 .../adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/pa | 2 +-
 .../sensitivityMaps/motorBike/constant/adjointRASProperties     | 2 +-
 .../sensitivityMaps/motorBike/constant/transportProperties      | 2 +-
 .../sensitivityMaps/motorBike/constant/turbulenceProperties     | 2 +-
 .../sensitivityMaps/motorBike/system/blockMeshDict              | 2 +-
 .../sensitivityMaps/motorBike/system/controlDict                | 2 +-
 .../sensitivityMaps/motorBike/system/decomposeParDict.20        | 2 +-
 .../sensitivityMaps/motorBike/system/faSchemes                  | 2 +-
 .../sensitivityMaps/motorBike/system/faSolution                 | 2 +-
 .../sensitivityMaps/motorBike/system/fvSchemes                  | 2 +-
 .../sensitivityMaps/motorBike/system/fvSolution                 | 2 +-
 .../sensitivityMaps/motorBike/system/meshQualityDict            | 2 +-
 .../sensitivityMaps/motorBike/system/optimisationDict           | 2 +-
 .../sensitivityMaps/motorBike/system/snappyHexMeshDict          | 2 +-
 .../sensitivityMaps/motorBike/system/surfaceFeatureExtractDict  | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/0.orig/U              | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/0.orig/Ua             | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/0.orig/p              | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/0.orig/pa             | 2 +-
 .../naca0012/laminar/drag/constant/adjointRASProperties         | 2 +-
 .../naca0012/laminar/drag/constant/transportProperties          | 2 +-
 .../naca0012/laminar/drag/constant/turbulenceProperties         | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/system/controlDict    | 2 +-
 .../naca0012/laminar/drag/system/decomposeParDict               | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/system/fvSchemes      | 2 +-
 .../sensitivityMaps/naca0012/laminar/drag/system/fvSolution     | 2 +-
 .../naca0012/laminar/drag/system/optimisationDict               | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/0.orig/U              | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/0.orig/Ua             | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/0.orig/p              | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/0.orig/pa             | 2 +-
 .../naca0012/laminar/lift/constant/adjointRASProperties         | 2 +-
 .../naca0012/laminar/lift/constant/transportProperties          | 2 +-
 .../naca0012/laminar/lift/constant/turbulenceProperties         | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/system/controlDict    | 2 +-
 .../naca0012/laminar/lift/system/decomposeParDict               | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/system/fvSchemes      | 2 +-
 .../sensitivityMaps/naca0012/laminar/lift/system/fvSolution     | 2 +-
 .../naca0012/laminar/lift/system/optimisationDict               | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/0.orig/U            | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/0.orig/Ua           | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/0.orig/p            | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/0.orig/pa           | 2 +-
 .../naca0012/laminar/moment/constant/adjointRASProperties       | 2 +-
 .../naca0012/laminar/moment/constant/transportProperties        | 2 +-
 .../naca0012/laminar/moment/constant/turbulenceProperties       | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/system/controlDict  | 2 +-
 .../naca0012/laminar/moment/system/decomposeParDict             | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/system/fvSchemes    | 2 +-
 .../sensitivityMaps/naca0012/laminar/moment/system/fvSolution   | 2 +-
 .../naca0012/laminar/moment/system/optimisationDict             | 2 +-
 .../sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/U   | 2 +-
 .../sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/Ua  | 2 +-
 .../naca0012/turbulent/liftFullSetup/0.orig/nuTilda             | 2 +-
 .../naca0012/turbulent/liftFullSetup/0.orig/nuaTilda            | 2 +-
 .../sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nut | 2 +-
 .../sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/p   | 2 +-
 .../sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/pa  | 2 +-
 .../turbulent/liftFullSetup/constant/adjointRASProperties       | 2 +-
 .../turbulent/liftFullSetup/constant/transportProperties        | 2 +-
 .../turbulent/liftFullSetup/constant/turbulenceProperties       | 2 +-
 .../naca0012/turbulent/liftFullSetup/system/controlDict         | 2 +-
 .../naca0012/turbulent/liftFullSetup/system/decomposeParDict    | 2 +-
 .../naca0012/turbulent/liftFullSetup/system/fvSchemes           | 2 +-
 .../naca0012/turbulent/liftFullSetup/system/fvSolution          | 2 +-
 .../naca0012/turbulent/liftFullSetup/system/optimisationDict    | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/U                | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/Ua               | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/nuTilda          | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/nuaTilda         | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/nut              | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/p                | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/0.orig/pa               | 2 +-
 .../turbulent/liftMinimumSetup/constant/adjointRASProperties    | 2 +-
 .../turbulent/liftMinimumSetup/constant/transportProperties     | 2 +-
 .../turbulent/liftMinimumSetup/constant/turbulenceProperties    | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/system/controlDict      | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/system/decomposeParDict | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/system/fvSchemes        | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/system/fvSolution       | 2 +-
 .../naca0012/turbulent/liftMinimumSetup/system/optimisationDict | 2 +-
 .../sensitivityMaps/sbend/laminar/0.orig/U                      | 2 +-
 .../sensitivityMaps/sbend/laminar/0.orig/Ua                     | 2 +-
 .../sensitivityMaps/sbend/laminar/0.orig/ma                     | 2 +-
 .../sensitivityMaps/sbend/laminar/0.orig/p                      | 2 +-
 .../sensitivityMaps/sbend/laminar/0.orig/pa                     | 2 +-
 .../sensitivityMaps/sbend/laminar/constant/adjointRASProperties | 2 +-
 .../sensitivityMaps/sbend/laminar/constant/transportProperties  | 2 +-
 .../sensitivityMaps/sbend/laminar/constant/turbulenceProperties | 2 +-
 .../sensitivityMaps/sbend/laminar/system/controlDict            | 2 +-
 .../sensitivityMaps/sbend/laminar/system/decomposeParDict       | 2 +-
 .../sensitivityMaps/sbend/laminar/system/fvSchemes              | 2 +-
 .../sensitivityMaps/sbend/laminar/system/fvSolution             | 2 +-
 .../sensitivityMaps/sbend/laminar/system/optimisationDict       | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/U             | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/Ua            | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/nuTilda       | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/nuaTilda      | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/nut           | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/p             | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/0.orig/pa            | 2 +-
 .../sbend/turbulent/highRe/constant/adjointRASProperties        | 2 +-
 .../sbend/turbulent/highRe/constant/transportProperties         | 2 +-
 .../sbend/turbulent/highRe/constant/turbulenceProperties        | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/system/controlDict   | 2 +-
 .../sbend/turbulent/highRe/system/decomposeParDict              | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/system/fvSchemes     | 2 +-
 .../sensitivityMaps/sbend/turbulent/highRe/system/fvSolution    | 2 +-
 .../sbend/turbulent/highRe/system/optimisationDict              | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/U   | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Ua  | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Up2 | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/0.orig/nuTilda             | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/0.orig/nuaTilda            | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nut | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/p   | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/pa  | 2 +-
 .../turbulent/lowRe/multiPoint/constant/adjointRASProperties    | 2 +-
 .../turbulent/lowRe/multiPoint/constant/transportProperties     | 2 +-
 .../turbulent/lowRe/multiPoint/constant/turbulenceProperties    | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/system/controlDict         | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/system/decomposeParDict    | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/system/fvSchemes           | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/system/fvSolution          | 2 +-
 .../sbend/turbulent/lowRe/multiPoint/system/optimisationDict    | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/U  | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/Ua | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/0.orig/nuTilda            | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/0.orig/nuaTilda           | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/0.orig/nut                | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/p  | 2 +-
 .../sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/pa | 2 +-
 .../turbulent/lowRe/singlePoint/constant/adjointRASProperties   | 2 +-
 .../turbulent/lowRe/singlePoint/constant/transportProperties    | 2 +-
 .../turbulent/lowRe/singlePoint/constant/turbulenceProperties   | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/system/controlDict        | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/system/decomposeParDict   | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/system/fvSchemes          | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/system/fvSolution         | 2 +-
 .../sbend/turbulent/lowRe/singlePoint/system/optimisationDict   | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/0/U                  | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/0/Ua                 | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/0/p                  | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/0/pa                 | 2 +-
 .../fork-uneven/flowRate/constant/adjointRASProperties          | 2 +-
 .../fork-uneven/flowRate/constant/dynamicMeshDict               | 2 +-
 .../fork-uneven/flowRate/constant/transportProperties           | 2 +-
 .../fork-uneven/flowRate/constant/turbulenceProperties          | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/system/blockMeshDict | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/system/controlDict   | 2 +-
 .../fork-uneven/flowRate/system/decomposeParDict                | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/system/fvSchemes     | 2 +-
 .../shapeOptimisation/fork-uneven/flowRate/system/fvSolution    | 2 +-
 .../fork-uneven/flowRate/system/optimisationDict                | 2 +-
 .../shapeOptimisation/fork-uneven/flowRatePartition/0/U         | 2 +-
 .../shapeOptimisation/fork-uneven/flowRatePartition/0/Ua        | 2 +-
 .../shapeOptimisation/fork-uneven/flowRatePartition/0/p         | 2 +-
 .../shapeOptimisation/fork-uneven/flowRatePartition/0/pa        | 2 +-
 .../fork-uneven/flowRatePartition/constant/adjointRASProperties | 2 +-
 .../fork-uneven/flowRatePartition/constant/dynamicMeshDict      | 2 +-
 .../fork-uneven/flowRatePartition/constant/transportProperties  | 2 +-
 .../fork-uneven/flowRatePartition/constant/turbulenceProperties | 2 +-
 .../fork-uneven/flowRatePartition/system/blockMeshDict          | 2 +-
 .../fork-uneven/flowRatePartition/system/controlDict            | 2 +-
 .../fork-uneven/flowRatePartition/system/decomposeParDict       | 2 +-
 .../fork-uneven/flowRatePartition/system/fvSchemes              | 2 +-
 .../fork-uneven/flowRatePartition/system/fvSolution             | 2 +-
 .../fork-uneven/flowRatePartition/system/optimisationDict       | 2 +-
 .../shapeOptimisation/fork-uneven/uniformityPatch/0/U           | 2 +-
 .../shapeOptimisation/fork-uneven/uniformityPatch/0/Ua          | 2 +-
 .../shapeOptimisation/fork-uneven/uniformityPatch/0/p           | 2 +-
 .../shapeOptimisation/fork-uneven/uniformityPatch/0/pa          | 2 +-
 .../fork-uneven/uniformityPatch/constant/adjointRASProperties   | 2 +-
 .../fork-uneven/uniformityPatch/constant/dynamicMeshDict        | 2 +-
 .../fork-uneven/uniformityPatch/constant/transportProperties    | 2 +-
 .../fork-uneven/uniformityPatch/constant/turbulenceProperties   | 2 +-
 .../fork-uneven/uniformityPatch/system/blockMeshDict            | 2 +-
 .../fork-uneven/uniformityPatch/system/controlDict              | 2 +-
 .../fork-uneven/uniformityPatch/system/decomposeParDict         | 2 +-
 .../fork-uneven/uniformityPatch/system/fvSchemes                | 2 +-
 .../fork-uneven/uniformityPatch/system/fvSolution               | 2 +-
 .../fork-uneven/uniformityPatch/system/optimisationDict         | 2 +-
 .../shapeOptimisation/motorBike/0.orig/U                        | 2 +-
 .../shapeOptimisation/motorBike/0.orig/Ua                       | 2 +-
 .../shapeOptimisation/motorBike/0.orig/include/fixedInlet       | 2 +-
 .../motorBike/0.orig/include/frontBackUpperPatches              | 2 +-
 .../motorBike/0.orig/include/initialConditions                  | 2 +-
 .../shapeOptimisation/motorBike/0.orig/nuTilda                  | 2 +-
 .../shapeOptimisation/motorBike/0.orig/nuaTilda                 | 2 +-
 .../shapeOptimisation/motorBike/0.orig/nut                      | 2 +-
 .../shapeOptimisation/motorBike/0.orig/p                        | 2 +-
 .../shapeOptimisation/motorBike/0.orig/pa                       | 2 +-
 .../shapeOptimisation/motorBike/constant/adjointRASProperties   | 2 +-
 .../motorBike/constant/controlPoints.org/boxcpsBsplines0        | 2 +-
 .../shapeOptimisation/motorBike/constant/dynamicMeshDict        | 2 +-
 .../shapeOptimisation/motorBike/constant/transportProperties    | 2 +-
 .../shapeOptimisation/motorBike/constant/turbulenceProperties   | 2 +-
 .../shapeOptimisation/motorBike/system/blockMeshDict            | 2 +-
 .../shapeOptimisation/motorBike/system/controlDict              | 2 +-
 .../shapeOptimisation/motorBike/system/decomposeParDict.20      | 2 +-
 .../shapeOptimisation/motorBike/system/fvSchemes                | 2 +-
 .../shapeOptimisation/motorBike/system/fvSolution               | 2 +-
 .../shapeOptimisation/motorBike/system/meshQualityDict          | 2 +-
 .../shapeOptimisation/motorBike/system/optimisationDict         | 2 +-
 .../shapeOptimisation/motorBike/system/snappyHexMeshDict        | 2 +-
 .../motorBike/system/surfaceFeatureExtractDict                  | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/U               | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/Ua              | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/k               | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/ka              | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/nut             | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/omega           | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/p               | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/pa              | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/0/wa              | 2 +-
 .../naca0012/kOmegaSST/lift/constant/adjointRASProperties       | 2 +-
 .../naca0012/kOmegaSST/lift/constant/dynamicMeshDict            | 2 +-
 .../naca0012/kOmegaSST/lift/constant/transportProperties        | 2 +-
 .../naca0012/kOmegaSST/lift/constant/turbulenceProperties       | 2 +-
 .../naca0012/kOmegaSST/lift/system/controlDict                  | 2 +-
 .../naca0012/kOmegaSST/lift/system/decomposeParDict             | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSchemes  | 2 +-
 .../shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSolution | 2 +-
 .../naca0012/kOmegaSST/lift/system/optimisationDict             | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/0.orig/U                | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/0.orig/Ua               | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/0.orig/p                | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/0.orig/pa               | 2 +-
 .../laminar/drag/primalAdjoint/constant/adjointRASProperties    | 2 +-
 .../laminar/drag/primalAdjoint/constant/transportProperties     | 2 +-
 .../laminar/drag/primalAdjoint/constant/turbulenceProperties    | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/system/controlDict      | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/system/decomposeParDict | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/system/fvSchemes        | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/system/fvSolution       | 2 +-
 .../naca0012/laminar/drag/primalAdjoint/system/optimisationDict | 2 +-
 .../naca0012/laminar/lift/opt/constraintProjection/0.orig/U     | 2 +-
 .../naca0012/laminar/lift/opt/constraintProjection/0.orig/Ua    | 2 +-
 .../naca0012/laminar/lift/opt/constraintProjection/0.orig/p     | 2 +-
 .../naca0012/laminar/lift/opt/constraintProjection/0.orig/pa    | 2 +-
 .../lift/opt/constraintProjection/constant/adjointRASProperties | 2 +-
 .../lift/opt/constraintProjection/constant/dynamicMeshDict      | 2 +-
 .../lift/opt/constraintProjection/constant/transportProperties  | 2 +-
 .../lift/opt/constraintProjection/constant/turbulenceProperties | 2 +-
 .../laminar/lift/opt/constraintProjection/system/controlDict    | 2 +-
 .../lift/opt/constraintProjection/system/decomposeParDict       | 2 +-
 .../laminar/lift/opt/constraintProjection/system/fvSchemes      | 2 +-
 .../laminar/lift/opt/constraintProjection/system/fvSolution     | 2 +-
 .../lift/opt/constraintProjection/system/optimisationDict       | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/0.orig/U              | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/0.orig/Ua             | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/0.orig/p              | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/0.orig/pa             | 2 +-
 .../laminar/moment/primalAdjoint/constant/adjointRASProperties  | 2 +-
 .../laminar/moment/primalAdjoint/constant/transportProperties   | 2 +-
 .../laminar/moment/primalAdjoint/constant/turbulenceProperties  | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/system/controlDict    | 2 +-
 .../laminar/moment/primalAdjoint/system/decomposeParDict        | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/system/fvSchemes      | 2 +-
 .../naca0012/laminar/moment/primalAdjoint/system/fvSolution     | 2 +-
 .../laminar/moment/primalAdjoint/system/optimisationDict        | 2 +-
 .../sbend/laminar/opt/constrained/SQP/0.orig/U                  | 2 +-
 .../sbend/laminar/opt/constrained/SQP/0.orig/Ua                 | 2 +-
 .../sbend/laminar/opt/constrained/SQP/0.orig/p                  | 2 +-
 .../sbend/laminar/opt/constrained/SQP/0.orig/pa                 | 2 +-
 .../laminar/opt/constrained/SQP/constant/adjointRASProperties   | 2 +-
 .../sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict  | 2 +-
 .../laminar/opt/constrained/SQP/constant/transportProperties    | 2 +-
 .../laminar/opt/constrained/SQP/constant/turbulenceProperties   | 2 +-
 .../sbend/laminar/opt/constrained/SQP/system/controlDict        | 2 +-
 .../sbend/laminar/opt/constrained/SQP/system/decomposeParDict   | 2 +-
 .../sbend/laminar/opt/constrained/SQP/system/fvSchemes          | 2 +-
 .../sbend/laminar/opt/constrained/SQP/system/fvSolution         | 2 +-
 .../sbend/laminar/opt/constrained/SQP/system/optimisationDict   | 2 +-
 .../laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/U | 2 +-
 .../opt/unconstrained/losses/BFGS-transformBox/0.orig/Ua        | 2 +-
 .../laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/p | 2 +-
 .../opt/unconstrained/losses/BFGS-transformBox/0.orig/pa        | 2 +-
 .../losses/BFGS-transformBox/constant/adjointRASProperties      | 2 +-
 .../losses/BFGS-transformBox/constant/dynamicMeshDict           | 2 +-
 .../losses/BFGS-transformBox/constant/transportProperties       | 2 +-
 .../losses/BFGS-transformBox/constant/turbulenceProperties      | 2 +-
 .../unconstrained/losses/BFGS-transformBox/system/controlDict   | 2 +-
 .../losses/BFGS-transformBox/system/decomposeParDict            | 2 +-
 .../opt/unconstrained/losses/BFGS-transformBox/system/fvSchemes | 2 +-
 .../unconstrained/losses/BFGS-transformBox/system/fvSolution    | 2 +-
 .../losses/BFGS-transformBox/system/optimisationDict            | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/U        | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/Ua       | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/p        | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/pa       | 2 +-
 .../opt/unconstrained/losses/BFGS/constant/adjointRASProperties | 2 +-
 .../opt/unconstrained/losses/BFGS/constant/dynamicMeshDict      | 2 +-
 .../opt/unconstrained/losses/BFGS/constant/transportProperties  | 2 +-
 .../opt/unconstrained/losses/BFGS/constant/turbulenceProperties | 2 +-
 .../laminar/opt/unconstrained/losses/BFGS/system/controlDict    | 2 +-
 .../opt/unconstrained/losses/BFGS/system/decomposeParDict       | 2 +-
 .../laminar/opt/unconstrained/losses/BFGS/system/fvSchemes      | 2 +-
 .../laminar/opt/unconstrained/losses/BFGS/system/fvSolution     | 2 +-
 .../opt/unconstrained/losses/BFGS/system/optimisationDict       | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/SD/0.orig/U          | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/SD/0.orig/Ua         | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/SD/0.orig/p          | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/SD/0.orig/pa         | 2 +-
 .../opt/unconstrained/losses/SD/constant/adjointRASProperties   | 2 +-
 .../opt/unconstrained/losses/SD/constant/dynamicMeshDict        | 2 +-
 .../opt/unconstrained/losses/SD/constant/transportProperties    | 2 +-
 .../opt/unconstrained/losses/SD/constant/turbulenceProperties   | 2 +-
 .../laminar/opt/unconstrained/losses/SD/system/controlDict      | 2 +-
 .../laminar/opt/unconstrained/losses/SD/system/decomposeParDict | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/SD/system/fvSchemes  | 2 +-
 .../sbend/laminar/opt/unconstrained/losses/SD/system/fvSolution | 2 +-
 .../laminar/opt/unconstrained/losses/SD/system/optimisationDict | 2 +-
 .../sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/U | 2 +-
 .../laminar/opt/unconstrained/uniformityCellZone/0.orig/Ua      | 2 +-
 .../sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/p | 2 +-
 .../laminar/opt/unconstrained/uniformityCellZone/0.orig/pa      | 2 +-
 .../uniformityCellZone/constant/adjointRASProperties            | 2 +-
 .../unconstrained/uniformityCellZone/constant/dynamicMeshDict   | 2 +-
 .../uniformityCellZone/constant/transportProperties             | 2 +-
 .../uniformityCellZone/constant/turbulenceProperties            | 2 +-
 .../opt/unconstrained/uniformityCellZone/system/controlDict     | 2 +-
 .../unconstrained/uniformityCellZone/system/decomposeParDict    | 2 +-
 .../opt/unconstrained/uniformityCellZone/system/fvSchemes       | 2 +-
 .../opt/unconstrained/uniformityCellZone/system/fvSolution      | 2 +-
 .../unconstrained/uniformityCellZone/system/optimisationDict    | 2 +-
 .../opt/unconstrained/uniformityCellZone/system/topoSetDict     | 2 +-
 .../shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/U      | 2 +-
 .../shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/Ua     | 2 +-
 .../shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/ma     | 2 +-
 .../shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/p      | 2 +-
 .../shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/pa     | 2 +-
 .../sbend/laminar/primalAdjoint/constant/adjointRASProperties   | 2 +-
 .../sbend/laminar/primalAdjoint/constant/dynamicMeshDict        | 2 +-
 .../sbend/laminar/primalAdjoint/constant/transportProperties    | 2 +-
 .../sbend/laminar/primalAdjoint/constant/turbulenceProperties   | 2 +-
 .../sbend/laminar/primalAdjoint/system/controlDict              | 2 +-
 .../sbend/laminar/primalAdjoint/system/decomposeParDict         | 2 +-
 .../sbend/laminar/primalAdjoint/system/fvSchemes                | 2 +-
 .../sbend/laminar/primalAdjoint/system/fvSolution               | 2 +-
 .../sbend/laminar/primalAdjoint/system/optimisationDict         | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/U    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/Ua   | 2 +-
 .../turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuTilda    | 2 +-
 .../turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuaTilda   | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nut  | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/p    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/pa   | 2 +-
 .../opt/losses/BFGS-continuation/constant/adjointRASProperties  | 2 +-
 .../SA/opt/losses/BFGS-continuation/constant/dynamicMeshDict    | 2 +-
 .../opt/losses/BFGS-continuation/constant/transportProperties   | 2 +-
 .../opt/losses/BFGS-continuation/constant/turbulenceProperties  | 2 +-
 .../SA/opt/losses/BFGS-continuation/system/decomposeParDict     | 2 +-
 .../turbulent/SA/opt/losses/BFGS-continuation/system/fvSchemes  | 2 +-
 .../turbulent/SA/opt/losses/BFGS-continuation/system/fvSolution | 2 +-
 .../SA/opt/losses/BFGS-continuation/system/optimisationDict     | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/U           | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/Ua          | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuTilda     | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuaTilda    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nut         | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/p           | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/pa          | 2 +-
 .../SA/opt/losses/BFGS-oneGo/constant/adjointRASProperties      | 2 +-
 .../turbulent/SA/opt/losses/BFGS-oneGo/constant/dynamicMeshDict | 2 +-
 .../SA/opt/losses/BFGS-oneGo/constant/transportProperties       | 2 +-
 .../SA/opt/losses/BFGS-oneGo/constant/turbulenceProperties      | 2 +-
 .../turbulent/SA/opt/losses/BFGS-oneGo/system/decomposeParDict  | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSchemes   | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSolution  | 2 +-
 .../turbulent/SA/opt/losses/BFGS-oneGo/system/optimisationDict  | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/U      | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Ua     | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Up2    | 2 +-
 .../turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuTilda      | 2 +-
 .../turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuaTilda     | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nut    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/p      | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/pa     | 2 +-
 .../SA/opt/losses/BFGS/multiPoint/constant/adjointRASProperties | 2 +-
 .../SA/opt/losses/BFGS/multiPoint/constant/dynamicMeshDict      | 2 +-
 .../SA/opt/losses/BFGS/multiPoint/constant/transportProperties  | 2 +-
 .../SA/opt/losses/BFGS/multiPoint/constant/turbulenceProperties | 2 +-
 .../turbulent/SA/opt/losses/BFGS/multiPoint/system/controlDict  | 2 +-
 .../SA/opt/losses/BFGS/multiPoint/system/decomposeParDict       | 2 +-
 .../turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSchemes    | 2 +-
 .../turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSolution   | 2 +-
 .../SA/opt/losses/BFGS/multiPoint/system/optimisationDict       | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/U             | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/Ua            | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuTilda       | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuaTilda      | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nut           | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/p             | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/pa            | 2 +-
 .../SA/opt/losses/BFGS/op1/constant/adjointRASProperties        | 2 +-
 .../turbulent/SA/opt/losses/BFGS/op1/constant/dynamicMeshDict   | 2 +-
 .../SA/opt/losses/BFGS/op1/constant/transportProperties         | 2 +-
 .../SA/opt/losses/BFGS/op1/constant/turbulenceProperties        | 2 +-
 .../turbulent/SA/opt/losses/BFGS/op1/system/decomposeParDict    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSchemes     | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSolution    | 2 +-
 .../turbulent/SA/opt/losses/BFGS/op1/system/optimisationDict    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U             | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/Ua            | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuTilda       | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuaTilda      | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nut           | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/p             | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/pa            | 2 +-
 .../SA/opt/losses/BFGS/op2/constant/adjointRASProperties        | 2 +-
 .../turbulent/SA/opt/losses/BFGS/op2/constant/dynamicMeshDict   | 2 +-
 .../SA/opt/losses/BFGS/op2/constant/transportProperties         | 2 +-
 .../SA/opt/losses/BFGS/op2/constant/turbulenceProperties        | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/system/controlDict   | 2 +-
 .../turbulent/SA/opt/losses/BFGS/op2/system/decomposeParDict    | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSchemes     | 2 +-
 .../sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSolution    | 2 +-
 .../turbulent/SA/opt/losses/BFGS/op2/system/optimisationDict    | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/U    | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/Ua   | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/0.orig/nuTilda                | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/0.orig/nuaTilda               | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nut  | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/p    | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/pa   | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/constant/adjointRASProperties | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/constant/dynamicMeshDict      | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/constant/transportProperties  | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/constant/turbulenceProperties | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/system/decomposeParDict       | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/system/fvSchemes              | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/system/fvSolution             | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/system/optimisationDict       | 2 +-
 .../sbend/turbulent/SA/opt/nutSqr/system/topoSetDict            | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/U            | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/Ua           | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/nuTilda      | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/nuaTilda     | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/nut          | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/p            | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/0.orig/pa           | 2 +-
 .../SA/opt/powerDissipation/constant/adjointRASProperties       | 2 +-
 .../turbulent/SA/opt/powerDissipation/constant/dynamicMeshDict  | 2 +-
 .../SA/opt/powerDissipation/constant/transportProperties        | 2 +-
 .../SA/opt/powerDissipation/constant/turbulenceProperties       | 2 +-
 .../turbulent/SA/opt/powerDissipation/system/decomposeParDict   | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/system/fvSchemes    | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/system/fvSolution   | 2 +-
 .../turbulent/SA/opt/powerDissipation/system/optimisationDict   | 2 +-
 .../sbend/turbulent/SA/opt/powerDissipation/system/topoSetDict  | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/U | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/0.orig/Ua                  | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/0.orig/nuTilda             | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/0.orig/nuaTilda            | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/0.orig/nut                 | 2 +-
 .../shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/p | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/0.orig/pa                  | 2 +-
 .../turbulent/SA/primalAdjoint/constant/adjointRASProperties    | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/constant/dynamicMeshDict   | 2 +-
 .../turbulent/SA/primalAdjoint/constant/transportProperties     | 2 +-
 .../turbulent/SA/primalAdjoint/constant/turbulenceProperties    | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/system/controlDict         | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/system/decomposeParDict    | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/system/fvSchemes           | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/system/fvSolution          | 2 +-
 .../sbend/turbulent/SA/primalAdjoint/system/optimisationDict    | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/U          | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/Ua         | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuTilda    | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuaTilda   | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nut        | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/p          | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/0.orig/pa         | 2 +-
 .../SA/primalAdjointFullSetup/constant/adjointRASProperties     | 2 +-
 .../SA/primalAdjointFullSetup/constant/dynamicMeshDict          | 2 +-
 .../SA/primalAdjointFullSetup/constant/transportProperties      | 2 +-
 .../SA/primalAdjointFullSetup/constant/turbulenceProperties     | 2 +-
 .../turbulent/SA/primalAdjointFullSetup/system/controlDict      | 2 +-
 .../turbulent/SA/primalAdjointFullSetup/system/decomposeParDict | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/system/fvSchemes  | 2 +-
 .../sbend/turbulent/SA/primalAdjointFullSetup/system/fvSolution | 2 +-
 .../turbulent/SA/primalAdjointFullSetup/system/optimisationDict | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/U    | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/Ua   | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/k    | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/ka   | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/nut  | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/0.orig/omega                  | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/p    | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/pa   | 2 +-
 .../shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/wa   | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/constant/adjointRASProperties | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/constant/dynamicMeshDict      | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/constant/transportProperties  | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/constant/turbulenceProperties | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/system/decomposeParDict       | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/system/fvSchemes              | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/system/fvSolution             | 2 +-
 .../sbend/turbulent/kOmegaSST/opt/system/optimisationDict       | 2 +-
 .../incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U   | 2 +-
 .../incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua  | 2 +-
 .../adjointShapeOptimizationFoam/pitzDaily/0/epsilon            | 2 +-
 .../incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k   | 2 +-
 .../incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut | 2 +-
 .../incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p   | 2 +-
 .../incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa  | 2 +-
 .../pitzDaily/constant/transportProperties                      | 2 +-
 .../pitzDaily/constant/turbulenceProperties                     | 2 +-
 .../adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict | 2 +-
 .../adjointShapeOptimizationFoam/pitzDaily/system/controlDict   | 2 +-
 .../adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes     | 2 +-
 .../adjointShapeOptimizationFoam/pitzDaily/system/fvSolution    | 2 +-
 .../setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/nut     | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/0.orig/U             | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/0.orig/epsilon       | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/0.orig/k             | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/0.orig/nuTilda       | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/0.orig/omega         | 2 +-
 .../setups.orig/common/constant/transportProperties.template    | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/system/blockMeshDict | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/system/controlDict   | 2 +-
 .../setups.orig/common/system/decomposeParDict                  | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/system/fvSchemes     | 2 +-
 .../steadyBoundaryLayer/setups.orig/common/system/fvSolution    | 2 +-
 .../setups.orig/kEpsilon-nutkWallFunction/0.orig/nut            | 2 +-
 .../kEpsilon-nutkWallFunction/constant/turbulenceProperties     | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavity/0/U              | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavity/0/p              | 2 +-
 .../icoFoam/cavity/cavity/constant/transportProperties          | 2 +-
 .../icoFoam/cavity/cavity/system/PDRblockMeshDict               | 2 +-
 .../incompressible/icoFoam/cavity/cavity/system/blockMeshDict   | 2 +-
 .../incompressible/icoFoam/cavity/cavity/system/controlDict     | 2 +-
 .../icoFoam/cavity/cavity/system/decomposeParDict               | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes | 2 +-
 .../incompressible/icoFoam/cavity/cavity/system/fvSolution      | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U       | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p       | 2 +-
 .../icoFoam/cavity/cavityClipped/constant/transportProperties   | 2 +-
 .../icoFoam/cavity/cavityClipped/system/blockMeshDict           | 2 +-
 .../icoFoam/cavity/cavityClipped/system/controlDict             | 2 +-
 .../icoFoam/cavity/cavityClipped/system/fvSchemes               | 2 +-
 .../icoFoam/cavity/cavityClipped/system/fvSolution              | 2 +-
 .../icoFoam/cavity/cavityClipped/system/mapFieldsDict           | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U         | 2 +-
 tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p         | 2 +-
 .../icoFoam/cavity/cavityGrade/constant/transportProperties     | 2 +-
 .../icoFoam/cavity/cavityGrade/system/blockMeshDict             | 2 +-
 .../icoFoam/cavity/cavityGrade/system/controlDict               | 2 +-
 .../incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes  | 2 +-
 .../incompressible/icoFoam/cavity/cavityGrade/system/fvSolution | 2 +-
 .../icoFoam/cavity/cavityGrade/system/mapFieldsDict             | 2 +-
 tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/U     | 2 +-
 tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/p     | 2 +-
 .../icoFoam/cavityMappingTest/constant/transportProperties      | 2 +-
 .../icoFoam/cavityMappingTest/system/blockMeshDict.coarse       | 2 +-
 .../icoFoam/cavityMappingTest/system/blockMeshDict.fine         | 2 +-
 .../cavityMappingTest/system/coarseMesh/decomposeParDict        | 2 +-
 .../icoFoam/cavityMappingTest/system/coarseMesh/fvSchemes       | 2 +-
 .../icoFoam/cavityMappingTest/system/coarseMesh/fvSolution      | 2 +-
 .../incompressible/icoFoam/cavityMappingTest/system/controlDict | 2 +-
 .../icoFoam/cavityMappingTest/system/decomposeParDict           | 2 +-
 .../incompressible/icoFoam/cavityMappingTest/system/fvSchemes   | 2 +-
 .../incompressible/icoFoam/cavityMappingTest/system/fvSolution  | 2 +-
 tutorials/incompressible/icoFoam/elbow/0.orig/U                 | 2 +-
 tutorials/incompressible/icoFoam/elbow/0.orig/p                 | 2 +-
 .../incompressible/icoFoam/elbow/constant/transportProperties   | 2 +-
 tutorials/incompressible/icoFoam/elbow/system/controlDict       | 2 +-
 .../incompressible/icoFoam/elbow/system/foamDataToFluentDict    | 2 +-
 tutorials/incompressible/icoFoam/elbow/system/fvSchemes         | 2 +-
 tutorials/incompressible/icoFoam/elbow/system/fvSolution        | 2 +-
 .../incompressible/lumpedPointMotion/bridge/steady/0.orig/U     | 2 +-
 .../lumpedPointMotion/bridge/steady/0.orig/epsilon              | 2 +-
 .../lumpedPointMotion/bridge/steady/0.orig/include/controllers  | 2 +-
 .../lumpedPointMotion/bridge/steady/0.orig/include/environ      | 2 +-
 .../bridge/steady/0.orig/include/initialConditions              | 2 +-
 .../incompressible/lumpedPointMotion/bridge/steady/0.orig/k     | 2 +-
 .../incompressible/lumpedPointMotion/bridge/steady/0.orig/nut   | 2 +-
 .../incompressible/lumpedPointMotion/bridge/steady/0.orig/omega | 2 +-
 .../incompressible/lumpedPointMotion/bridge/steady/0.orig/p     | 2 +-
 .../lumpedPointMotion/bridge/steady/0.orig/pointDisplacement    | 2 +-
 .../lumpedPointMotion/bridge/steady/constant/dynamicMeshDict    | 2 +-
 .../bridge/steady/constant/transportProperties                  | 2 +-
 .../bridge/steady/constant/turbulenceProperties                 | 2 +-
 .../lumpedPointMotion/bridge/steady/system/PDRblockMeshDict     | 2 +-
 .../lumpedPointMotion/bridge/steady/system/blockMeshDict        | 2 +-
 .../lumpedPointMotion/bridge/steady/system/controlDict          | 2 +-
 .../lumpedPointMotion/bridge/steady/system/decomposeParDict     | 2 +-
 .../lumpedPointMotion/bridge/steady/system/fvSchemes            | 2 +-
 .../lumpedPointMotion/bridge/steady/system/fvSolution           | 2 +-
 .../bridge/steady/system/lumpedPointControllers                 | 2 +-
 .../lumpedPointMotion/bridge/steady/system/lumpedPointMovement  | 2 +-
 .../lumpedPointMotion/bridge/steady/system/meshQualityDict      | 2 +-
 .../lumpedPointMotion/bridge/steady/system/snappyHexMeshDict    | 2 +-
 .../bridge/steady/system/surfaceFeatureExtractDict              | 2 +-
 .../incompressible/lumpedPointMotion/building/steady/0.orig/U   | 2 +-
 .../lumpedPointMotion/building/steady/0.orig/epsilon            | 2 +-
 .../lumpedPointMotion/building/steady/0.orig/include/environ    | 2 +-
 .../lumpedPointMotion/building/steady/0.orig/include/fixedInlet | 2 +-
 .../building/steady/0.orig/include/initialConditions            | 2 +-
 .../incompressible/lumpedPointMotion/building/steady/0.orig/k   | 2 +-
 .../incompressible/lumpedPointMotion/building/steady/0.orig/nut | 2 +-
 .../lumpedPointMotion/building/steady/0.orig/omega              | 2 +-
 .../incompressible/lumpedPointMotion/building/steady/0.orig/p   | 2 +-
 .../lumpedPointMotion/building/steady/0.orig/pointDisplacement  | 2 +-
 .../lumpedPointMotion/building/steady/constant/dynamicMeshDict  | 2 +-
 .../building/steady/constant/transportProperties                | 2 +-
 .../building/steady/constant/turbulenceProperties               | 2 +-
 .../lumpedPointMotion/building/steady/system/blockMeshDict      | 2 +-
 .../lumpedPointMotion/building/steady/system/controlDict        | 2 +-
 .../lumpedPointMotion/building/steady/system/decomposeParDict   | 2 +-
 .../lumpedPointMotion/building/steady/system/fvSchemes          | 2 +-
 .../lumpedPointMotion/building/steady/system/fvSolution         | 2 +-
 .../building/steady/system/lumpedPointControllers               | 2 +-
 .../building/steady/system/lumpedPointMovement                  | 2 +-
 .../lumpedPointMotion/building/steady/system/meshQualityDict    | 2 +-
 .../lumpedPointMotion/building/steady/system/snappyHexMeshDict  | 2 +-
 .../building/steady/system/surfaceFeatureExtractDict            | 2 +-
 tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U | 2 +-
 tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p | 2 +-
 .../offsetCylinder/constant/transportProperties                 | 2 +-
 .../nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict     | 2 +-
 .../nonNewtonianIcoFoam/offsetCylinder/system/controlDict       | 2 +-
 .../nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes         | 2 +-
 .../nonNewtonianIcoFoam/offsetCylinder/system/fvSolution        | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U   | 2 +-
 .../cylinder/cylinderAndBackground/0.orig/epsilon               | 2 +-
 .../cylinder/cylinderAndBackground/0.orig/include/fixedInlet    | 2 +-
 .../cylinderAndBackground/0.orig/include/initialConditions      | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k   | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p   | 2 +-
 .../cylinder/cylinderAndBackground/0.orig/pointDisplacement     | 2 +-
 .../cylinder/cylinderAndBackground/0.orig/zoneID                | 2 +-
 .../cylinder/cylinderAndBackground/constant/dynamicMeshDict     | 2 +-
 .../cylinder/cylinderAndBackground/constant/transportProperties | 2 +-
 .../cylinderAndBackground/constant/turbulenceProperties         | 2 +-
 .../cylinder/cylinderAndBackground/system/blockMeshDict         | 2 +-
 .../cylinder/cylinderAndBackground/system/controlDict           | 2 +-
 .../cylinder/cylinderAndBackground/system/decomposeParDict      | 2 +-
 .../cylinder/cylinderAndBackground/system/fvSchemes             | 2 +-
 .../cylinder/cylinderAndBackground/system/fvSolution            | 2 +-
 .../cylinder/cylinderAndBackground/system/setFieldsDict         | 2 +-
 .../cylinder/cylinderAndBackground/system/topoSetDict           | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderMesh/system/controlDict  | 2 +-
 .../cylinder/cylinderMesh/system/createPatchDict                | 2 +-
 .../cylinder/cylinderMesh/system/extrudeMeshDict                | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSchemes    | 2 +-
 .../overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSolution   | 2 +-
 .../incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/U    | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/0.orig/epsilon             | 2 +-
 .../incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/k    | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/0.orig/nuTilda             | 2 +-
 .../incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nut  | 2 +-
 .../incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/p    | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/0.orig/pointDisplacement   | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/0.orig/zoneID              | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/constant/dynamicMeshDict   | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/constant/fvOptions         | 2 +-
 .../rotatingSquare/constant/transportProperties                 | 2 +-
 .../rotatingSquare/constant/turbulenceProperties                | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/blockMeshDict       | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/controlDict         | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/decomposeParDict    | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/fvSchemes           | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/fvSolution          | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/setFieldsDict       | 2 +-
 .../overPimpleDyMFoam/rotatingSquare/system/topoSetDict         | 2 +-
 tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U | 2 +-
 .../incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon | 2 +-
 tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k | 2 +-
 .../incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda | 2 +-
 .../incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut     | 2 +-
 tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p | 2 +-
 .../overPimpleDyMFoam/simpleRotor/0.orig/pointDisplacement      | 2 +-
 .../incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID  | 2 +-
 .../overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict      | 2 +-
 .../overPimpleDyMFoam/simpleRotor/constant/transportProperties  | 2 +-
 .../overPimpleDyMFoam/simpleRotor/constant/turbulenceProperties | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/blockMeshDict          | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/controlDict            | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/decomposeParDict       | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/fvSchemes              | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/fvSolution             | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/setFieldsDict          | 2 +-
 .../overPimpleDyMFoam/simpleRotor/system/topoSetDict            | 2 +-
 .../incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U   | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon            | 2 +-
 .../incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/k   | 2 +-
 .../incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/nut | 2 +-
 .../incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p   | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/0.orig/pointDisplacement  | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID             | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict  | 2 +-
 .../twoSimpleRotors/constant/transportProperties                | 2 +-
 .../twoSimpleRotors/constant/turbulenceProperties               | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict      | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/controlDict        | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/decomposeParDict   | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes          | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/fvSolution         | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict      | 2 +-
 .../overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict        | 2 +-
 .../aeroFoil/aeroFoil_overset/constant/transportProperties      | 2 +-
 .../aeroFoil/aeroFoil_overset/constant/turbulenceProperties     | 2 +-
 .../overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict | 2 +-
 .../aeroFoil/aeroFoil_overset/system/createPatchDict            | 2 +-
 .../aeroFoil/aeroFoil_overset/system/extrudeMeshDict            | 2 +-
 .../overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSchemes   | 2 +-
 .../overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSolution  | 2 +-
 .../aeroFoil/aeroFoil_snappyHexMesh/system/blockMeshDict        | 2 +-
 .../aeroFoil/aeroFoil_snappyHexMesh/system/controlDict          | 2 +-
 .../aeroFoil/aeroFoil_snappyHexMesh/system/decomposeParDict     | 2 +-
 .../aeroFoil/aeroFoil_snappyHexMesh/system/fvSchemes            | 2 +-
 .../aeroFoil/aeroFoil_snappyHexMesh/system/fvSolution           | 2 +-
 .../aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict    | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/U         | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon   | 2 +-
 .../0.orig/include/frontBackTopBottomfreePatches                | 2 +-
 .../background_overset/0.orig/include/initialConditions         | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/k         | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda   | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/nut       | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/omega     | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/p         | 2 +-
 .../aeroFoil/background_overset/0.orig/pointDisplacement        | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID    | 2 +-
 .../aeroFoil/background_overset/constant/RASProperties          | 2 +-
 .../aeroFoil/background_overset/constant/dynamicMeshDict        | 2 +-
 .../aeroFoil/background_overset/constant/transportProperties    | 2 +-
 .../aeroFoil/background_overset/constant/turbulenceProperties   | 2 +-
 .../aeroFoil/background_overset/system/blockMeshDict            | 2 +-
 .../aeroFoil/background_overset/system/controlDict              | 2 +-
 .../aeroFoil/background_overset/system/createPatchDict          | 2 +-
 .../aeroFoil/background_overset/system/decomposeParDict         | 2 +-
 .../aeroFoil/background_overset/system/extrudeMeshDict          | 2 +-
 .../overSimpleFoam/aeroFoil/background_overset/system/fvSchemes | 2 +-
 .../aeroFoil/background_overset/system/fvSolution               | 2 +-
 .../aeroFoil/background_overset/system/postProcessingDict       | 2 +-
 .../aeroFoil/background_overset/system/setFieldsDict            | 2 +-
 .../aeroFoil/background_overset/system/topoSetDict              | 2 +-
 .../aeroFoil/background_snappyHexMesh/system/blockMeshDict      | 2 +-
 .../aeroFoil/background_snappyHexMesh/system/controlDict        | 2 +-
 .../aeroFoil/background_snappyHexMesh/system/fvSchemes          | 2 +-
 .../aeroFoil/background_snappyHexMesh/system/fvSolution         | 2 +-
 .../aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict  | 2 +-
 tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/nut | 2 +-
 tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/p   | 2 +-
 .../pimpleFoam/LES/decayIsoTurb/constant/createBoxTurbDict      | 2 +-
 .../pimpleFoam/LES/decayIsoTurb/constant/transportProperties    | 2 +-
 .../pimpleFoam/LES/decayIsoTurb/system/blockMeshDict            | 2 +-
 .../pimpleFoam/LES/decayIsoTurb/system/controlDict              | 2 +-
 .../pimpleFoam/LES/decayIsoTurb/system/decomposeParDict         | 2 +-
 .../incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSchemes | 2 +-
 .../pimpleFoam/LES/decayIsoTurb/system/fvSolution               | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/0.orig/U            | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/0.orig/k            | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/0.orig/nuTilda      | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/0.orig/nut          | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/0.orig/p            | 2 +-
 .../LES/periodicHill/steadyState/constant/transportProperties   | 2 +-
 .../LES/periodicHill/steadyState/constant/turbulenceProperties  | 2 +-
 .../LES/periodicHill/steadyState/system/blockMeshDict           | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/system/controlDict  | 2 +-
 .../LES/periodicHill/steadyState/system/decomposeParDict        | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/system/fvOptions    | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/system/fvSchemes    | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/system/fvSolution   | 2 +-
 .../pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict  | 2 +-
 .../LES/periodicHill/transient/constant/transportProperties     | 2 +-
 .../LES/periodicHill/transient/constant/turbulenceProperties    | 2 +-
 .../pimpleFoam/LES/periodicHill/transient/system/blockMeshDict  | 2 +-
 .../pimpleFoam/LES/periodicHill/transient/system/controlDict    | 2 +-
 .../pimpleFoam/LES/periodicHill/transient/system/cuttingPlane   | 2 +-
 .../LES/periodicHill/transient/system/decomposeParDict          | 2 +-
 .../pimpleFoam/LES/periodicHill/transient/system/fvOptions      | 2 +-
 .../pimpleFoam/LES/periodicHill/transient/system/fvSchemes      | 2 +-
 .../pimpleFoam/LES/periodicHill/transient/system/fvSolution     | 2 +-
 .../pimpleFoam/LES/periodicPlaneChannel/constant/fvOptions      | 2 +-
 .../LES/periodicPlaneChannel/constant/postChannelDict           | 2 +-
 .../LES/periodicPlaneChannel/constant/transportProperties       | 2 +-
 .../LES/periodicPlaneChannel/constant/turbulenceProperties      | 2 +-
 .../pimpleFoam/LES/periodicPlaneChannel/system/blockMeshDict    | 2 +-
 .../pimpleFoam/LES/periodicPlaneChannel/system/controlDict      | 2 +-
 .../pimpleFoam/LES/periodicPlaneChannel/system/decomposeParDict | 2 +-
 .../pimpleFoam/LES/periodicPlaneChannel/system/fvSchemes        | 2 +-
 .../pimpleFoam/LES/periodicPlaneChannel/system/fvSolution       | 2 +-
 .../pimpleFoam/LES/planeChannel/setups.orig/DFM/0.orig/U        | 2 +-
 .../pimpleFoam/LES/planeChannel/setups.orig/DFSEM/0.orig/U      | 2 +-
 .../pimpleFoam/LES/planeChannel/setups.orig/FSM/0.orig/U        | 2 +-
 .../pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/nut   | 2 +-
 .../pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/p     | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/constant/turbulenceProperties            | 2 +-
 .../LES/planeChannel/setups.orig/common/system/blockMeshDict    | 2 +-
 .../LES/planeChannel/setups.orig/common/system/decomposeParDict | 2 +-
 .../LES/planeChannel/setups.orig/common/system/fvSchemes        | 2 +-
 .../LES/planeChannel/setups.orig/common/system/fvSolution       | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/U         | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/k         | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nuTilda   | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nut       | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/p         | 2 +-
 .../surfaceMountedCube/fullCase/constant/transportProperties    | 2 +-
 .../surfaceMountedCube/fullCase/constant/turbulenceProperties   | 2 +-
 .../LES/surfaceMountedCube/fullCase/system/blockMeshDict        | 2 +-
 .../LES/surfaceMountedCube/fullCase/system/decomposeParDict     | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSchemes | 2 +-
 .../LES/surfaceMountedCube/fullCase/system/fvSolution           | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample    | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/U      | 2 +-
 .../LES/surfaceMountedCube/initChannel/0.orig/epsilon           | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/k      | 2 +-
 .../LES/surfaceMountedCube/initChannel/0.orig/nuTilda           | 2 +-
 .../pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nut    | 2 +-
 .../surfaceMountedCube/initChannel/constant/transportProperties | 2 +-
 .../initChannel/constant/turbulenceProperties                   | 2 +-
 .../LES/surfaceMountedCube/initChannel/system/blockMeshDict     | 2 +-
 .../LES/surfaceMountedCube/initChannel/system/controlDict       | 2 +-
 .../LES/surfaceMountedCube/initChannel/system/fvSchemes         | 2 +-
 .../LES/surfaceMountedCube/initChannel/system/fvSolution        | 2 +-
 tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/U     | 2 +-
 .../incompressible/pimpleFoam/LES/vortexShed/0.orig/nuTilda     | 2 +-
 tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nut   | 2 +-
 tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/p     | 2 +-
 .../pimpleFoam/LES/vortexShed/constant/transportProperties      | 2 +-
 .../pimpleFoam/LES/vortexShed/constant/turbulenceProperties     | 2 +-
 .../pimpleFoam/LES/vortexShed/system/blockMeshDict.m4           | 2 +-
 .../incompressible/pimpleFoam/LES/vortexShed/system/controlDict | 2 +-
 .../pimpleFoam/LES/vortexShed/system/decomposeParDict           | 2 +-
 .../incompressible/pimpleFoam/LES/vortexShed/system/fvSchemes   | 2 +-
 .../incompressible/pimpleFoam/LES/vortexShed/system/fvSolution  | 2 +-
 .../pimpleFoam/LES/vortexShed/system/noiseDict-point            | 2 +-
 .../pimpleFoam/LES/vortexShed/system/noiseDict-surface          | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/U  | 2 +-
 .../pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/k  | 2 +-
 .../LES/wallMountedHump/setups.orig/common/0.orig/nuTilda       | 2 +-
 .../LES/wallMountedHump/setups.orig/common/0.orig/nut           | 2 +-
 .../LES/wallMountedHump/setups.orig/common/0.orig/omega         | 2 +-
 .../pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/p  | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/columnAverage | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/controlDict   | 2 +-
 .../wallMountedHump/setups.orig/common/system/decomposeParDict  | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/fieldAverage  | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/fvSchemes     | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/fvSolution    | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/sampleDict    | 2 +-
 .../LES/wallMountedHump/setups.orig/common/system/volFields     | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U           | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon     | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k           | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda     | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut         | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p           | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s           | 2 +-
 .../pimpleFoam/RAS/TJunction/constant/transportProperties       | 2 +-
 .../pimpleFoam/RAS/TJunction/constant/turbulenceProperties      | 2 +-
 .../pimpleFoam/RAS/TJunction/system/blockMeshDict               | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunction/system/controlDict  | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes    | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunction/system/fvSolution   | 2 +-
 .../pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T   | 2 +-
 .../pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/U   | 2 +-
 .../RAS/TJunctionArrheniusBirdCarreauTransport/0/epsilon        | 2 +-
 .../pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/k   | 2 +-
 .../RAS/TJunctionArrheniusBirdCarreauTransport/0/nuTilda        | 2 +-
 .../pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nut | 2 +-
 .../pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/p   | 2 +-
 .../constant/transportProperties                                | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../TJunctionArrheniusBirdCarreauTransport/system/blockMeshDict | 2 +-
 .../RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSchemes | 2 +-
 .../TJunctionArrheniusBirdCarreauTransport/system/fvSolution    | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U   | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon   | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k   | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda   | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p   | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/constant/transportProperties    | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties   | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/system/blockMeshDict            | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/system/controlDict              | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/system/createBafflesDict        | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/system/fvSolution               | 2 +-
 .../pimpleFoam/RAS/TJunctionFan/system/topoSetDict              | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/U   | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/0.orig/epsilon            | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/k   | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/0.orig/nuTilda            | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nut | 2 +-
 .../incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/p   | 2 +-
 .../RAS/TJunctionSwitching/constant/transportProperties         | 2 +-
 .../RAS/TJunctionSwitching/constant/turbulenceProperties        | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/system/blockMeshDict      | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/system/controlDict        | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/system/decomposeParDict   | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/system/fvSchemes          | 2 +-
 .../pimpleFoam/RAS/TJunctionSwitching/system/fvSolution         | 2 +-
 .../incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/U      | 2 +-
 .../incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kl     | 2 +-
 .../incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kt     | 2 +-
 .../incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/nut    | 2 +-
 .../incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/omega  | 2 +-
 .../incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/p      | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/constant/transportProperties | 2 +-
 .../RAS/ellipsekkLOmega/constant/turbulenceProperties           | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/blockMeshDict         | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/changeDictionaryDict  | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/controlDict           | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/createPatchDict       | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/decomposeParDict      | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/fvSchemes             | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/fvSolution            | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict        | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.X      | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.Y      | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/sampling              | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/streamLines           | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/topoSetDict           | 2 +-
 .../pimpleFoam/RAS/ellipsekkLOmega/system/visualization         | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U              | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon        | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k              | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut            | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p              | 2 +-
 .../RAS/oscillatingInletACMI2D/constant/dynamicMeshDict         | 2 +-
 .../RAS/oscillatingInletACMI2D/constant/transportProperties     | 2 +-
 .../RAS/oscillatingInletACMI2D/constant/turbulenceProperties    | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict  | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict    | 2 +-
 .../RAS/oscillatingInletACMI2D/system/decomposeParDict          | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes      | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution     | 2 +-
 .../pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict    | 2 +-
 .../pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/U            | 2 +-
 .../pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/epsilon      | 2 +-
 .../pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/k            | 2 +-
 .../pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/nut          | 2 +-
 .../pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/p            | 2 +-
 .../RAS/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict  | 2 +-
 .../oscillatingInletPeriodicAMI2D/constant/transportProperties  | 2 +-
 .../oscillatingInletPeriodicAMI2D/constant/turbulenceProperties | 2 +-
 .../RAS/oscillatingInletPeriodicAMI2D/system/blockMeshDict      | 2 +-
 .../RAS/oscillatingInletPeriodicAMI2D/system/controlDict        | 2 +-
 .../RAS/oscillatingInletPeriodicAMI2D/system/fvSchemes          | 2 +-
 .../RAS/oscillatingInletPeriodicAMI2D/system/fvSolution         | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U           | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon     | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k           | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda     | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut         | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p           | 2 +-
 .../pimpleFoam/RAS/pitzDaily/constant/transportProperties       | 2 +-
 .../pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties      | 2 +-
 .../pimpleFoam/RAS/pitzDaily/system/blockMeshDict               | 2 +-
 .../incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict  | 2 +-
 .../incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes    | 2 +-
 .../incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution   | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U      | 2 +-
 .../incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon      | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k      | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut    | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p      | 2 +-
 .../pimpleFoam/RAS/propeller/constant/dynamicMeshDict           | 2 +-
 .../pimpleFoam/RAS/propeller/constant/transportProperties       | 2 +-
 .../pimpleFoam/RAS/propeller/constant/turbulenceProperties      | 2 +-
 .../incompressible/pimpleFoam/RAS/propeller/system/AMIWeights   | 2 +-
 .../pimpleFoam/RAS/propeller/system/blockMeshDict               | 2 +-
 .../incompressible/pimpleFoam/RAS/propeller/system/controlDict  | 2 +-
 .../RAS/propeller/system/createInletOutletSets.topoSetDict      | 2 +-
 .../pimpleFoam/RAS/propeller/system/createPatchDict             | 2 +-
 .../pimpleFoam/RAS/propeller/system/decomposeParDict            | 2 +-
 tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces | 2 +-
 .../incompressible/pimpleFoam/RAS/propeller/system/fvSchemes    | 2 +-
 .../incompressible/pimpleFoam/RAS/propeller/system/fvSolution   | 2 +-
 .../pimpleFoam/RAS/propeller/system/snappyHexMeshDict           | 2 +-
 .../pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict   | 2 +-
 .../incompressible/pimpleFoam/RAS/propeller/system/surfaces     | 2 +-
 .../incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/U    | 2 +-
 .../incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/k    | 2 +-
 .../incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/nut  | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/0.orig/omega               | 2 +-
 .../incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/p    | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict   | 2 +-
 .../incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/g  | 2 +-
 .../RAS/rotatingFanInRoom/constant/transportProperties          | 2 +-
 .../RAS/rotatingFanInRoom/constant/turbulenceProperties         | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/blockMeshDict       | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/controlDict         | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/createPatchDict     | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict    | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/fvSchemes           | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/fvSolution          | 2 +-
 .../pimpleFoam/RAS/rotatingFanInRoom/system/snappyHexMeshDict   | 2 +-
 .../RAS/rotatingFanInRoom/system/surfaceFeatureExtractDict      | 2 +-
 .../pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U  | 2 +-
 .../wingMotion2D_pimpleFoam/0.orig/include/fixedInlet           | 2 +-
 .../0.orig/include/frontBackTopBottomPatches                    | 2 +-
 .../wingMotion2D_pimpleFoam/0.orig/include/initialConditions    | 2 +-
 .../pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k  | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut           | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega         | 2 +-
 .../pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p  | 2 +-
 .../wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement | 2 +-
 .../wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict | 2 +-
 .../wingMotion2D_pimpleFoam/constant/transportProperties        | 2 +-
 .../wingMotion2D_pimpleFoam/constant/turbulenceProperties       | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict   | 2 +-
 .../wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict  | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite  | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes     | 2 +-
 .../RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution    | 2 +-
 .../pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U  | 2 +-
 .../wingMotion2D_simpleFoam/0.orig/include/fixedInlet           | 2 +-
 .../0.orig/include/frontBackTopBottomPatches                    | 2 +-
 .../wingMotion2D_simpleFoam/0.orig/include/initialConditions    | 2 +-
 .../pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k  | 2 +-
 .../RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut           | 2 +-
 .../RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega         | 2 +-
 .../pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p  | 2 +-
 .../wingMotion2D_simpleFoam/constant/transportProperties        | 2 +-
 .../wingMotion2D_simpleFoam/constant/turbulenceProperties       | 2 +-
 .../RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict   | 2 +-
 .../wingMotion/wingMotion2D_simpleFoam/system/createPatchDict   | 2 +-
 .../wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict   | 2 +-
 .../RAS/wingMotion/wingMotion2D_simpleFoam/system/forces        | 2 +-
 .../RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes     | 2 +-
 .../RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution    | 2 +-
 .../wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict    | 2 +-
 .../RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict  | 2 +-
 .../wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict | 2 +-
 .../RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes    | 2 +-
 .../RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution   | 2 +-
 .../wingMotion_snappyHexMesh/system/snappyHexMeshDict           | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/0.orig/U              | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/0.orig/contactAngle   | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/0.orig/p              | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/0.orig/pointMotionU   | 2 +-
 .../laminar/contactAngleCavity/constant/dynamicMeshDict         | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/constant/g            | 2 +-
 .../laminar/contactAngleCavity/constant/transportProperties     | 2 +-
 .../laminar/contactAngleCavity/constant/turbulenceProperties    | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/system/blockMeshDict  | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/system/controlDict    | 2 +-
 .../laminar/contactAngleCavity/system/decomposeParDict          | 2 +-
 .../laminar/contactAngleCavity/system/faMeshDefinition          | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/system/faSchemes      | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/system/faSolution     | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/system/fvSchemes      | 2 +-
 .../pimpleFoam/laminar/contactAngleCavity/system/fvSolution     | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/0.orig/C           | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/0.orig/Cs          | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/0.orig/U           | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/0.orig/p           | 2 +-
 .../laminar/contaminatedDroplet2D/0.orig/pointMotionU           | 2 +-
 .../laminar/contaminatedDroplet2D/constant/dynamicMeshDict      | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/constant/g         | 2 +-
 .../laminar/contaminatedDroplet2D/constant/transportProperties  | 2 +-
 .../laminar/contaminatedDroplet2D/constant/turbulenceProperties | 2 +-
 .../laminar/contaminatedDroplet2D/system/blockMeshDict.m4       | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict | 2 +-
 .../laminar/contaminatedDroplet2D/system/decomposeParDict       | 2 +-
 .../laminar/contaminatedDroplet2D/system/decomposeParDict.4     | 2 +-
 .../laminar/contaminatedDroplet2D/system/faMeshDefinition       | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/system/faSchemes   | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/system/faSolution  | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/system/fvSchemes   | 2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution  | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/U | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/p | 2 +-
 .../pimpleFoam/laminar/cylinder2D/constant/transportProperties  | 2 +-
 .../pimpleFoam/laminar/cylinder2D/constant/turbulenceProperties | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/blockMeshDict.coarse   | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/blockMeshDict.main     | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSchemes   | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSolution  | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/decomposeParDict       | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/fvSchemes              | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/fvSolution             | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/mirrorMeshDict         | 2 +-
 .../pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict      | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/U | 2 +-
 .../incompressible/pimpleFoam/laminar/filmPanel0/0.orig/Uf_film | 2 +-
 .../incompressible/pimpleFoam/laminar/filmPanel0/0.orig/hf_film | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/p | 2 +-
 .../incompressible/pimpleFoam/laminar/filmPanel0/constant/g     | 2 +-
 .../pimpleFoam/laminar/filmPanel0/constant/transportProperties  | 2 +-
 .../pimpleFoam/laminar/filmPanel0/constant/turbulenceProperties | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/blockMeshDict          | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/controlDict            | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/decomposeParDict       | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/decomposeParDict.16    | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/decomposeParDict.4     | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/decomposeParDict.8     | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/faMeshDefinition       | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/faSchemes              | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/faSolution             | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/fvSchemes              | 2 +-
 .../pimpleFoam/laminar/filmPanel0/system/fvSolution             | 2 +-
 .../incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U     | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/0/Uf_film              | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/0/hf_film              | 2 +-
 .../incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/p     | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/constant/g             | 2 +-
 .../laminar/inclinedPlaneFilm/constant/transportProperties      | 2 +-
 .../laminar/inclinedPlaneFilm/constant/turbulenceProperties     | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/system/blockMeshDict   | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/system/controlDict     | 2 +-
 .../laminar/inclinedPlaneFilm/system/decomposeParDict           | 2 +-
 .../laminar/inclinedPlaneFilm/system/faMeshDefinition           | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/system/faSchemes       | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/system/faSolution      | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/system/fvSchemes       | 2 +-
 .../pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution      | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/U   | 2 +-
 .../mixerVesselAMI2D-topologyChange/0.orig/epsilon              | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/k   | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/nut | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/p   | 2 +-
 .../mixerVesselAMI2D-topologyChange/constant/dynamicMeshDict    | 2 +-
 .../constant/transportProperties                                | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../mixerVesselAMI2D-topologyChange/system/blockMeshDict.m4     | 2 +-
 .../mixerVesselAMI2D-topologyChange/system/controlDict          | 2 +-
 .../mixerVesselAMI2D-topologyChange/system/decomposeParDict     | 2 +-
 .../mixerVesselAMI2D-topologyChange/system/fvSchemes            | 2 +-
 .../mixerVesselAMI2D-topologyChange/system/fvSolution           | 2 +-
 .../mixerVesselAMI2D-topologyChange/system/topoSetDict          | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/U          | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/epsilon    | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/k          | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/nut        | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/p          | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D/constant/dynamicMeshDict  | 2 +-
 .../mixerVesselAMI2D/constant/transportProperties               | 2 +-
 .../mixerVesselAMI2D/constant/turbulenceProperties              | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D/system/blockMeshDict.m4   | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D/system/controlDict        | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D/system/decomposeParDict   | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSchemes  | 2 +-
 .../laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution | 2 +-
 .../mixerVesselAMI2D/mixerVesselAMI2D/system/topoSetDict        | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U      | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p      | 2 +-
 .../pimpleFoam/laminar/movingCone/0/pointMotionUx               | 2 +-
 .../pimpleFoam/laminar/movingCone/constant/dynamicMeshDict      | 2 +-
 .../pimpleFoam/laminar/movingCone/constant/transportProperties  | 2 +-
 .../pimpleFoam/laminar/movingCone/constant/turbulenceProperties | 2 +-
 .../pimpleFoam/laminar/movingCone/system/blockMeshDict          | 2 +-
 .../pimpleFoam/laminar/movingCone/system/controlDict            | 2 +-
 .../pimpleFoam/laminar/movingCone/system/cuttingPlane           | 2 +-
 .../pimpleFoam/laminar/movingCone/system/fvSchemes              | 2 +-
 .../pimpleFoam/laminar/movingCone/system/fvSolution             | 2 +-
 .../incompressible/pimpleFoam/laminar/planarContraction/0/U     | 2 +-
 .../incompressible/pimpleFoam/laminar/planarContraction/0/p     | 2 +-
 .../incompressible/pimpleFoam/laminar/planarContraction/0/sigma | 2 +-
 .../laminar/planarContraction/constant/transportProperties      | 2 +-
 .../laminar/planarContraction/constant/turbulenceProperties     | 2 +-
 .../pimpleFoam/laminar/planarContraction/system/blockMeshDict   | 2 +-
 .../pimpleFoam/laminar/planarContraction/system/controlDict     | 2 +-
 .../pimpleFoam/laminar/planarContraction/system/fvSchemes       | 2 +-
 .../pimpleFoam/laminar/planarContraction/system/fvSolution      | 2 +-
 .../setups.orig/Maxwell/constant/turbulenceProperties           | 2 +-
 .../setups.orig/Stokes/constant/turbulenceProperties            | 2 +-
 .../laminar/planarPoiseuille/setups.orig/common/0.orig/U        | 2 +-
 .../laminar/planarPoiseuille/setups.orig/common/0.orig/p        | 2 +-
 .../laminar/planarPoiseuille/setups.orig/common/0.orig/sigma    | 2 +-
 .../planarPoiseuille/setups.orig/common/constant/fvOptions      | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../planarPoiseuille/setups.orig/common/system/blockMeshDict    | 2 +-
 .../planarPoiseuille/setups.orig/common/system/controlDict      | 2 +-
 .../planarPoiseuille/setups.orig/common/system/decomposeParDict | 2 +-
 .../planarPoiseuille/setups.orig/common/system/fvSchemes        | 2 +-
 .../planarPoiseuille/setups.orig/common/system/fvSolution       | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/U | 2 +-
 tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/p | 2 +-
 .../pimpleFoam/laminar/sloshing2D/0.orig/pointMotionU           | 2 +-
 .../pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict      | 2 +-
 .../incompressible/pimpleFoam/laminar/sloshing2D/constant/g     | 2 +-
 .../pimpleFoam/laminar/sloshing2D/constant/transportProperties  | 2 +-
 .../pimpleFoam/laminar/sloshing2D/constant/turbulenceProperties | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/blockMeshDict          | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/controlDict            | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/decomposeParDict       | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/faMeshDefinition       | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/faSchemes              | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/faSolution             | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/fvSchemes              | 2 +-
 .../pimpleFoam/laminar/sloshing2D/system/fvSolution             | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict  | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes    | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution   | 2 +-
 .../pisoFoam/LES/motorBike/lesFiles/turbulenceProperties        | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U    | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet  | 2 +-
 .../motorBike/motorBike/0.orig/include/frontBackUpperPatches    | 2 +-
 .../LES/motorBike/motorBike/0.orig/include/initialConditions    | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k    | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda             | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut  | 2 +-
 .../incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p    | 2 +-
 .../LES/motorBike/motorBike/constant/transportProperties        | 2 +-
 .../LES/motorBike/motorBike/constant/turbulenceProperties       | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/blockMeshDict       | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/controlDict         | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/decomposeParDict    | 2 +-
 .../motorBike/motorBike/system/decomposeParDict.hierarchical    | 2 +-
 .../LES/motorBike/motorBike/system/decomposeParDict.ptscotch    | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/forceCoeffs         | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/fvSchemes           | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/fvSolution          | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/samples             | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict   | 2 +-
 .../LES/motorBike/motorBike/system/stabilizationSchemes         | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/streamLines         | 2 +-
 .../pisoFoam/LES/motorBike/motorBike/system/visualization       | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U             | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k             | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda       | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut           | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p             | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s             | 2 +-
 .../pisoFoam/LES/pitzDaily/constant/transportProperties         | 2 +-
 .../pisoFoam/LES/pitzDaily/constant/turbulenceProperties        | 2 +-
 .../incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict  | 2 +-
 .../incompressible/pisoFoam/LES/pitzDaily/system/controlDict    | 2 +-
 .../incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes      | 2 +-
 .../incompressible/pisoFoam/LES/pitzDaily/system/fvSolution     | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U       | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k       | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut     | 2 +-
 tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p       | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/constant/transportProperties   | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties  | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/system/blockMeshDict           | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/system/controlDict             | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/system/decomposeParDict        | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/system/fvSchemes               | 2 +-
 .../pisoFoam/LES/pitzDailyMapped/system/fvSolution              | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/U           | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/epsilon     | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/k           | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nuTilda     | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nut         | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/omega       | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/p           | 2 +-
 .../pisoFoam/RAS/cavity/constant/transportProperties            | 2 +-
 .../pisoFoam/RAS/cavity/constant/turbulenceProperties           | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOCourantNo   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambVector  | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambda2     | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOPecletNo    | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOQ     | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOadd   | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOblendingFactor             | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOcomponents  | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOcontinuityError            | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt   | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt2  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOdiv   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOenstrophy   | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOfieldAverage               | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOflowType    | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflux  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOgrad  | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOhistogram   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOlimitFields | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlog   | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmag   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOmagSqr      | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOmomentum    | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOmultiFieldValue            | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiply    | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOnearWallFields             | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnorm  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpow   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOpressure    | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOprocessorField             | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOproudmanAcousticPower      | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOrandomise   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOreadFields  | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOreference   | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOsetFlow     | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOsolverInfo  | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOstreamFunction             | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamLine  | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOsubtract    | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOsurfaceDistance            | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOsurfaceInterpolate         | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOturbulenceFields           | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOvalueAverage               | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOvolFieldValue              | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/FOs/FOvorticity   | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOwriteCellCentres           | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOwriteCellVolumes           | 2 +-
 .../pisoFoam/RAS/cavity/system/FOs/FOzeroGradient               | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/blockMeshDict     | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict | 2 +-
 .../incompressible/pisoFoam/RAS/cavity/system/decomposeParDict  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes   | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U        | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k        | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda  | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut      | 2 +-
 tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p        | 2 +-
 .../pisoFoam/RAS/cavityCoupledU/constant/transportProperties    | 2 +-
 .../pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties   | 2 +-
 .../pisoFoam/RAS/cavityCoupledU/system/blockMeshDict            | 2 +-
 .../pisoFoam/RAS/cavityCoupledU/system/controlDict              | 2 +-
 .../incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes | 2 +-
 .../pisoFoam/RAS/cavityCoupledU/system/fvSolution               | 2 +-
 .../incompressible/pisoFoam/laminar/porousBlockage/0.orig/U     | 2 +-
 .../incompressible/pisoFoam/laminar/porousBlockage/0.orig/p     | 2 +-
 .../pisoFoam/laminar/porousBlockage/constant/fvOptions          | 2 +-
 .../laminar/porousBlockage/constant/transportProperties         | 2 +-
 .../laminar/porousBlockage/constant/turbulenceProperties        | 2 +-
 .../pisoFoam/laminar/porousBlockage/system/blockMeshDict        | 2 +-
 .../pisoFoam/laminar/porousBlockage/system/controlDict          | 2 +-
 .../pisoFoam/laminar/porousBlockage/system/fvSchemes            | 2 +-
 .../pisoFoam/laminar/porousBlockage/system/fvSolution           | 2 +-
 .../pisoFoam/laminar/porousBlockage/system/topoSetDict          | 2 +-
 .../incompressible/porousSimpleFoam/angledDuct/common/0.orig/T  | 2 +-
 .../incompressible/porousSimpleFoam/angledDuct/common/0.orig/U  | 2 +-
 .../porousSimpleFoam/angledDuct/common/0.orig/epsilon           | 2 +-
 .../incompressible/porousSimpleFoam/angledDuct/common/0.orig/k  | 2 +-
 .../porousSimpleFoam/angledDuct/common/0.orig/nut               | 2 +-
 .../incompressible/porousSimpleFoam/angledDuct/common/0.orig/p  | 2 +-
 .../porousSimpleFoam/angledDuct/common/blockMeshDict            | 2 +-
 .../angledDuct/common/constant/porosityProperties               | 2 +-
 .../angledDuct/common/constant/transportProperties              | 2 +-
 .../angledDuct/common/constant/turbulenceProperties             | 2 +-
 .../porousSimpleFoam/angledDuct/explicit/system/controlDict     | 2 +-
 .../porousSimpleFoam/angledDuct/explicit/system/fvSchemes       | 2 +-
 .../porousSimpleFoam/angledDuct/explicit/system/fvSolution      | 2 +-
 .../porousSimpleFoam/angledDuct/implicit/system/controlDict     | 2 +-
 .../porousSimpleFoam/angledDuct/implicit/system/fvSchemes       | 2 +-
 .../porousSimpleFoam/angledDuct/implicit/system/fvSolution      | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/0.orig/T              | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/0.orig/U              | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/0.orig/epsilon        | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/0.orig/k              | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/0.orig/nut            | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/0.orig/p              | 2 +-
 .../straightDuctImplicit/constant/porosityProperties            | 2 +-
 .../straightDuctImplicit/constant/transportProperties           | 2 +-
 .../straightDuctImplicit/constant/turbulenceProperties          | 2 +-
 .../system/backgroundMeshDecomposition/fvSolution               | 2 +-
 .../straightDuctImplicit/system/cellShapeControlMesh/fvSolution | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/system/collapseDict   | 2 +-
 .../straightDuctImplicit/system/collapseDict.collapseFaces      | 2 +-
 .../straightDuctImplicit/system/collapseDict.indirectPatchFaces | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/system/controlDict    | 2 +-
 .../straightDuctImplicit/system/decomposeParDict                | 2 +-
 .../straightDuctImplicit/system/foamyHexMeshDict                | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/system/fvSchemes      | 2 +-
 .../porousSimpleFoam/straightDuctImplicit/system/fvSolution     | 2 +-
 .../straightDuctImplicit/system/meshDict.conformationSurfaces   | 2 +-
 .../straightDuctImplicit/system/meshDict.geometry               | 2 +-
 .../straightDuctImplicit/system/meshDict.shapeControlFunctions  | 2 +-
 .../straightDuctImplicit/system/meshQualityDict                 | 2 +-
 .../straightDuctImplicit/system/surfaceFeatureExtractDict       | 2 +-
 tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h   | 2 +-
 tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h0  | 2 +-
 .../incompressible/shallowWaterFoam/squareBump/0.orig/hTotal    | 2 +-
 tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hU  | 2 +-
 .../squareBump/constant/gravitationalProperties                 | 2 +-
 .../shallowWaterFoam/squareBump/system/blockMeshDict            | 2 +-
 .../shallowWaterFoam/squareBump/system/controlDict              | 2 +-
 .../incompressible/shallowWaterFoam/squareBump/system/fvSchemes | 2 +-
 .../shallowWaterFoam/squareBump/system/fvSolution               | 2 +-
 .../shallowWaterFoam/squareBump/system/setFieldsDict            | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/ReThetat         | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/U                | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/gammaInt         | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/k                | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/nut              | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/omega            | 2 +-
 tutorials/incompressible/simpleFoam/T3A/0.orig/p                | 2 +-
 .../incompressible/simpleFoam/T3A/constant/transportProperties  | 2 +-
 .../incompressible/simpleFoam/T3A/constant/turbulenceProperties | 2 +-
 tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict    | 2 +-
 tutorials/incompressible/simpleFoam/T3A/system/controlDict      | 2 +-
 tutorials/incompressible/simpleFoam/T3A/system/fvSchemes        | 2 +-
 tutorials/incompressible/simpleFoam/T3A/system/fvSolution       | 2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/0.orig/U          | 2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda    | 2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut        | 2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/0.orig/p          | 2 +-
 .../simpleFoam/airFoil2D/constant/transportProperties           | 2 +-
 .../simpleFoam/airFoil2D/constant/turbulenceProperties          | 2 +-
 .../incompressible/simpleFoam/airFoil2D/system/controlDict      | 2 +-
 .../incompressible/simpleFoam/airFoil2D/system/decomposeParDict | 2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes  | 2 +-
 tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution | 2 +-
 .../incompressible/simpleFoam/backwardFacingStep2D/0.orig/U     | 2 +-
 .../simpleFoam/backwardFacingStep2D/0.orig/epsilon              | 2 +-
 .../incompressible/simpleFoam/backwardFacingStep2D/0.orig/k     | 2 +-
 .../simpleFoam/backwardFacingStep2D/0.orig/nuTilda              | 2 +-
 .../incompressible/simpleFoam/backwardFacingStep2D/0.orig/nut   | 2 +-
 .../incompressible/simpleFoam/backwardFacingStep2D/0.orig/omega | 2 +-
 .../incompressible/simpleFoam/backwardFacingStep2D/0.orig/p     | 2 +-
 .../backwardFacingStep2D/constant/transportProperties           | 2 +-
 .../backwardFacingStep2D/constant/turbulenceProperties          | 2 +-
 .../simpleFoam/backwardFacingStep2D/system/blockMeshDict        | 2 +-
 .../simpleFoam/backwardFacingStep2D/system/controlDict          | 2 +-
 .../simpleFoam/backwardFacingStep2D/system/fvSchemes            | 2 +-
 .../simpleFoam/backwardFacingStep2D/system/fvSolution           | 2 +-
 .../bump2D/setups.orig/SpalartAllmaras/0.orig/nuTilda           | 2 +-
 .../setups.orig/SpalartAllmaras/constant/turbulenceProperties   | 2 +-
 .../simpleFoam/bump2D/setups.orig/common/0.orig/U               | 2 +-
 .../simpleFoam/bump2D/setups.orig/common/0.orig/nut             | 2 +-
 .../simpleFoam/bump2D/setups.orig/common/0.orig/p               | 2 +-
 .../bump2D/setups.orig/common/constant/transportProperties      | 2 +-
 .../simpleFoam/bump2D/setups.orig/common/system/blockMeshDict   | 2 +-
 .../bump2D/setups.orig/common/system/decomposeParDict           | 2 +-
 .../simpleFoam/bump2D/setups.orig/common/system/fvSchemes       | 2 +-
 .../simpleFoam/bump2D/setups.orig/common/system/fvSolution      | 2 +-
 .../simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/epsilon  | 2 +-
 .../simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/f        | 2 +-
 .../simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/k        | 2 +-
 .../simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/phit     | 2 +-
 .../setups.orig/kEpsilonPhitF/constant/turbulenceProperties     | 2 +-
 .../simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/k            | 2 +-
 .../simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/omega        | 2 +-
 .../bump2D/setups.orig/kOmegaSST/constant/turbulenceProperties  | 2 +-
 tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/U      | 2 +-
 .../incompressible/simpleFoam/mixerVessel2D/0.orig/epsilon      | 2 +-
 tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/k      | 2 +-
 tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/nut    | 2 +-
 tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/p      | 2 +-
 .../simpleFoam/mixerVessel2D/constant/MRFProperties             | 2 +-
 .../simpleFoam/mixerVessel2D/constant/transportProperties       | 2 +-
 .../simpleFoam/mixerVessel2D/constant/turbulenceProperties      | 2 +-
 .../simpleFoam/mixerVessel2D/system/blockMeshDict.m4            | 2 +-
 .../incompressible/simpleFoam/mixerVessel2D/system/controlDict  | 2 +-
 .../incompressible/simpleFoam/mixerVessel2D/system/fvSchemes    | 2 +-
 .../incompressible/simpleFoam/mixerVessel2D/system/fvSolution   | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/0.orig/U          | 2 +-
 .../simpleFoam/motorBike/0.orig/include/fixedInlet              | 2 +-
 .../simpleFoam/motorBike/0.orig/include/frontBackUpperPatches   | 2 +-
 .../simpleFoam/motorBike/0.orig/include/initialConditions       | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/0.orig/k          | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/0.orig/nut        | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/0.orig/omega      | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/0.orig/p          | 2 +-
 .../simpleFoam/motorBike/constant/transportProperties           | 2 +-
 .../simpleFoam/motorBike/constant/turbulenceProperties          | 2 +-
 .../incompressible/simpleFoam/motorBike/system/blockMeshDict    | 2 +-
 .../incompressible/simpleFoam/motorBike/system/controlDict      | 2 +-
 .../incompressible/simpleFoam/motorBike/system/cuttingPlane     | 2 +-
 .../simpleFoam/motorBike/system/decomposeParDict.6              | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes  | 2 +-
 tutorials/incompressible/simpleFoam/motorBike/system/fvSolution | 2 +-
 .../incompressible/simpleFoam/motorBike/system/meshQualityDict  | 2 +-
 .../simpleFoam/motorBike/system/snappyHexMeshDict               | 2 +-
 .../incompressible/simpleFoam/motorBike/system/streamLines      | 2 +-
 .../simpleFoam/motorBike/system/surfaceFeatureExtractDict       | 2 +-
 .../incompressible/simpleFoam/motorBike/system/topoSetDict      | 2 +-
 .../simpleFoam/motorBike/system/wallBoundedStreamLines          | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U         | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon   | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k         | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda   | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut       | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p         | 2 +-
 .../simpleFoam/pipeCyclic/constant/transportProperties          | 2 +-
 .../simpleFoam/pipeCyclic/constant/turbulenceProperties         | 2 +-
 .../incompressible/simpleFoam/pipeCyclic/system/blockMeshDict   | 2 +-
 .../incompressible/simpleFoam/pipeCyclic/system/controlDict     | 2 +-
 .../simpleFoam/pipeCyclic/system/decomposeParDict               | 2 +-
 tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes | 2 +-
 .../incompressible/simpleFoam/pipeCyclic/system/fvSolution      | 2 +-
 .../incompressible/simpleFoam/pipeCyclic/system/topoSetDict     | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/U               | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon         | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/k               | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda         | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/nut             | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/omega           | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/0/p               | 2 +-
 .../simpleFoam/pitzDaily/constant/transportProperties           | 2 +-
 .../simpleFoam/pitzDaily/constant/turbulenceProperties          | 2 +-
 .../incompressible/simpleFoam/pitzDaily/system/blockMeshDict    | 2 +-
 .../incompressible/simpleFoam/pitzDaily/system/controlDict      | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes  | 2 +-
 tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution | 2 +-
 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U      | 2 +-
 .../incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon      | 2 +-
 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k      | 2 +-
 .../incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda      | 2 +-
 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut    | 2 +-
 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p      | 2 +-
 .../simpleFoam/pitzDailyExptInlet/constant/transportProperties  | 2 +-
 .../simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties | 2 +-
 .../simpleFoam/pitzDailyExptInlet/system/blockMeshDict          | 2 +-
 .../simpleFoam/pitzDailyExptInlet/system/controlDict            | 2 +-
 .../simpleFoam/pitzDailyExptInlet/system/decomposeParDict       | 2 +-
 .../simpleFoam/pitzDailyExptInlet/system/fvSchemes              | 2 +-
 .../simpleFoam/pitzDailyExptInlet/system/fvSolution             | 2 +-
 tutorials/incompressible/simpleFoam/rotatingCylinders/0/U       | 2 +-
 tutorials/incompressible/simpleFoam/rotatingCylinders/0/p       | 2 +-
 .../simpleFoam/rotatingCylinders/constant/MRFProperties         | 2 +-
 .../simpleFoam/rotatingCylinders/constant/transportProperties   | 2 +-
 .../simpleFoam/rotatingCylinders/constant/turbulenceProperties  | 2 +-
 .../simpleFoam/rotatingCylinders/system/blockMeshDict           | 2 +-
 .../simpleFoam/rotatingCylinders/system/controlDict             | 2 +-
 .../simpleFoam/rotatingCylinders/system/fvSchemes               | 2 +-
 .../simpleFoam/rotatingCylinders/system/fvSolution              | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/0.orig/U          | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/0.orig/k          | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/0.orig/nut        | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/0.orig/omega      | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/0.orig/p          | 2 +-
 .../simpleFoam/rotorDisk/constant/transportProperties           | 2 +-
 .../simpleFoam/rotorDisk/constant/turbulenceProperties          | 2 +-
 .../incompressible/simpleFoam/rotorDisk/system/blockMeshDict    | 2 +-
 .../incompressible/simpleFoam/rotorDisk/system/controlDict      | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions  | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes  | 2 +-
 tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution | 2 +-
 .../incompressible/simpleFoam/rotorDisk/system/meshQualityDict  | 2 +-
 .../simpleFoam/rotorDisk/system/snappyHexMeshDict               | 2 +-
 .../simpleFoam/rotorDisk/system/surfaceFeatureExtractDict       | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/0.orig/U          | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/0.orig/epsilon    | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/0.orig/k          | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/0.orig/nut        | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/0.orig/p          | 2 +-
 .../simpleFoam/simpleCar/constant/transportProperties           | 2 +-
 .../simpleFoam/simpleCar/constant/turbulenceProperties          | 2 +-
 .../incompressible/simpleFoam/simpleCar/system/blockMeshDict    | 2 +-
 .../incompressible/simpleFoam/simpleCar/system/controlDict      | 2 +-
 .../incompressible/simpleFoam/simpleCar/system/createPatchDict  | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions  | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes  | 2 +-
 tutorials/incompressible/simpleFoam/simpleCar/system/fvSolution | 2 +-
 .../simpleFoam/simpleCar/system/referencePressure               | 2 +-
 .../incompressible/simpleFoam/simpleCar/system/topoSetDict      | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/0.orig/U         | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/0.orig/epsilon   | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/0.orig/k         | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/0.orig/nut       | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/0.orig/p         | 2 +-
 .../simpleFoam/squareBend/constant/transportProperties          | 2 +-
 .../simpleFoam/squareBend/constant/turbulenceProperties         | 2 +-
 .../incompressible/simpleFoam/squareBend/system/blockMeshDict   | 2 +-
 .../incompressible/simpleFoam/squareBend/system/controlDict     | 2 +-
 .../simpleFoam/squareBend/system/decomposeParDict               | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes | 2 +-
 .../incompressible/simpleFoam/squareBend/system/fvSolution      | 2 +-
 tutorials/incompressible/simpleFoam/squareBend/system/sampling  | 2 +-
 .../incompressible/simpleFoam/squareBend/system/topoSetDict     | 2 +-
 tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U      | 2 +-
 .../incompressible/simpleFoam/turbineSiting/0.orig/epsilon      | 2 +-
 .../simpleFoam/turbineSiting/0.orig/include/ABLConditions       | 2 +-
 .../simpleFoam/turbineSiting/0.orig/include/fixedInlet          | 2 +-
 .../simpleFoam/turbineSiting/0.orig/include/initialConditions   | 2 +-
 .../simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches   | 2 +-
 tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k      | 2 +-
 tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut    | 2 +-
 tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p      | 2 +-
 .../incompressible/simpleFoam/turbineSiting/constant/fvOptions  | 2 +-
 .../simpleFoam/turbineSiting/constant/transportProperties       | 2 +-
 .../simpleFoam/turbineSiting/constant/turbulenceProperties      | 2 +-
 .../simpleFoam/turbineSiting/system/blockMeshDict               | 2 +-
 .../incompressible/simpleFoam/turbineSiting/system/controlDict  | 2 +-
 .../simpleFoam/turbineSiting/system/decomposeParDict            | 2 +-
 .../incompressible/simpleFoam/turbineSiting/system/fvSchemes    | 2 +-
 .../incompressible/simpleFoam/turbineSiting/system/fvSolution   | 2 +-
 .../simpleFoam/turbineSiting/system/setExprBoundaryFieldsDict   | 2 +-
 .../simpleFoam/turbineSiting/system/setExprFieldsDict           | 2 +-
 .../simpleFoam/turbineSiting/system/snappyHexMeshDict           | 2 +-
 .../incompressible/simpleFoam/turbineSiting/system/topoSetDict  | 2 +-
 .../simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/U   | 2 +-
 .../simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/p   | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/system/blockMeshDict.template            | 2 +-
 .../setups.orig/common/system/decomposeParDict                  | 2 +-
 .../turbulentFlatPlate/setups.orig/common/system/fvSchemes      | 2 +-
 .../turbulentFlatPlate/setups.orig/common/system/fvSolution     | 2 +-
 .../turbulentFlatPlate/setups.orig/kEpsilon/0.orig/epsilon      | 2 +-
 .../simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/k | 2 +-
 .../turbulentFlatPlate/setups.orig/kEpsilon/0.orig/nut          | 2 +-
 .../setups.orig/kEpsilon/constant/turbulenceProperties          | 2 +-
 .../turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/k           | 2 +-
 .../turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/nut         | 2 +-
 .../turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/omega       | 2 +-
 .../setups.orig/kOmegaSST/constant/turbulenceProperties         | 2 +-
 .../incompressible/simpleFoam/windAroundBuildings/0.orig/U      | 2 +-
 .../simpleFoam/windAroundBuildings/0.orig/epsilon               | 2 +-
 .../incompressible/simpleFoam/windAroundBuildings/0.orig/k      | 2 +-
 .../incompressible/simpleFoam/windAroundBuildings/0.orig/nut    | 2 +-
 .../incompressible/simpleFoam/windAroundBuildings/0.orig/p      | 2 +-
 .../simpleFoam/windAroundBuildings/constant/transportProperties | 2 +-
 .../windAroundBuildings/constant/turbulenceProperties           | 2 +-
 .../simpleFoam/windAroundBuildings/system/blockMeshDict         | 2 +-
 .../simpleFoam/windAroundBuildings/system/controlDict           | 2 +-
 .../simpleFoam/windAroundBuildings/system/decomposeParDict      | 2 +-
 .../simpleFoam/windAroundBuildings/system/fvSchemes             | 2 +-
 .../simpleFoam/windAroundBuildings/system/fvSolution            | 2 +-
 .../simpleFoam/windAroundBuildings/system/meshQualityDict       | 2 +-
 .../simpleFoam/windAroundBuildings/system/snappyHexMeshDict     | 2 +-
 .../windAroundBuildings/system/surfaceFeatureExtractDict        | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air                | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/0/p                    | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g             | 2 +-
 .../DPMFoam/Goldschmidt/constant/kinematicCloudPositions        | 2 +-
 .../DPMFoam/Goldschmidt/constant/kinematicCloudProperties       | 2 +-
 .../lagrangian/DPMFoam/Goldschmidt/constant/transportProperties | 2 +-
 .../DPMFoam/Goldschmidt/constant/turbulenceProperties.air       | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict   | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict     | 2 +-
 .../lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict      | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes       | 2 +-
 tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution      | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/0/U.air                | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/0/p                    | 2 +-
 .../lagrangian/MPPICDyMFoam/column/constant/dynamicMeshDict     | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/constant/g             | 2 +-
 .../MPPICDyMFoam/column/constant/kinematicCloudPositions        | 2 +-
 .../MPPICDyMFoam/column/constant/kinematicCloudProperties       | 2 +-
 .../lagrangian/MPPICDyMFoam/column/constant/transportProperties | 2 +-
 .../MPPICDyMFoam/column/constant/turbulenceProperties.air       | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/system/blockMeshDict   | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/system/controlDict     | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/system/fvSchemes       | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/column/system/fvSolution      | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/U.air       | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/p           | 2 +-
 .../MPPICDyMFoam/denseRotor2DAMI/constant/dynamicMeshDict       | 2 +-
 tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/g    | 2 +-
 .../denseRotor2DAMI/constant/kinematicCloudProperties           | 2 +-
 .../MPPICDyMFoam/denseRotor2DAMI/constant/transportProperties   | 2 +-
 .../denseRotor2DAMI/constant/turbulenceProperties.air           | 2 +-
 .../MPPICDyMFoam/denseRotor2DAMI/system/blockMeshDict           | 2 +-
 .../lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/controlDict  | 2 +-
 .../lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSchemes    | 2 +-
 .../lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSolution   | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air              | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p                  | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g           | 2 +-
 .../MPPICFoam/Goldschmidt/constant/kinematicCloudPositions      | 2 +-
 .../MPPICFoam/Goldschmidt/constant/kinematicCloudProperties     | 2 +-
 .../MPPICFoam/Goldschmidt/constant/transportProperties          | 2 +-
 .../MPPICFoam/Goldschmidt/constant/turbulenceProperties.air     | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict   | 2 +-
 .../lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict    | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes     | 2 +-
 tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution    | 2 +-
 tutorials/lagrangian/MPPICFoam/column/0/U.air                   | 2 +-
 tutorials/lagrangian/MPPICFoam/column/0/p                       | 2 +-
 tutorials/lagrangian/MPPICFoam/column/constant/g                | 2 +-
 .../MPPICFoam/column/constant/kinematicCloudPositions           | 2 +-
 .../MPPICFoam/column/constant/kinematicCloudProperties          | 2 +-
 .../lagrangian/MPPICFoam/column/constant/transportProperties    | 2 +-
 .../MPPICFoam/column/constant/turbulenceProperties.air          | 2 +-
 tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict      | 2 +-
 tutorials/lagrangian/MPPICFoam/column/system/controlDict        | 2 +-
 tutorials/lagrangian/MPPICFoam/column/system/fvSchemes          | 2 +-
 tutorials/lagrangian/MPPICFoam/column/system/fvSolution         | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air             | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air             | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air           | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p                 | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/constant/g               | 2 +-
 .../MPPICFoam/cyclone/constant/kinematicCloudProperties         | 2 +-
 .../lagrangian/MPPICFoam/cyclone/constant/transportProperties   | 2 +-
 .../MPPICFoam/cyclone/constant/turbulenceProperties.air         | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict     | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict       | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict  | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes         | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution        | 2 +-
 tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict | 2 +-
 tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air         | 2 +-
 tutorials/lagrangian/MPPICFoam/injectionChannel/0/p             | 2 +-
 tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g      | 2 +-
 .../injectionChannel/constant/kinematicCloudProperties          | 2 +-
 .../MPPICFoam/injectionChannel/constant/transportProperties     | 2 +-
 .../injectionChannel/constant/turbulenceProperties.air          | 2 +-
 .../lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict  | 2 +-
 .../lagrangian/MPPICFoam/injectionChannel/system/controlDict    | 2 +-
 .../lagrangian/MPPICFoam/injectionChannel/system/fvSchemes      | 2 +-
 .../lagrangian/MPPICFoam/injectionChannel/system/fvSolution     | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4     | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO      | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2     | 2 +-
 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2      | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O     | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2      | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2      | 2 +-
 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T | 2 +-
 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat  | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon | 2 +-
 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut     | 2 +-
 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p | 2 +-
 .../simplifiedSiwek/constant/boundaryRadiationProperties        | 2 +-
 .../simplifiedSiwek/constant/chemistryProperties                | 2 +-
 .../simplifiedSiwek/constant/coalCloud1Positions                | 2 +-
 .../simplifiedSiwek/constant/coalCloud1Properties               | 2 +-
 .../simplifiedSiwek/constant/combustionProperties               | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/constant/foam.dat         | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/constant/fvOptions        | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g     | 2 +-
 .../simplifiedSiwek/constant/limestoneCloud1Properties          | 2 +-
 .../simplifiedSiwek/constant/limestonePositions                 | 2 +-
 .../simplifiedSiwek/constant/radiationProperties                | 2 +-
 .../simplifiedSiwek/constant/thermophysicalProperties           | 2 +-
 .../simplifiedSiwek/constant/turbulenceProperties               | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/system/blockMeshDict      | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/system/controlDict        | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/system/decomposeParDict   | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/system/fvSchemes          | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/system/fvSolution         | 2 +-
 .../coalChemistryFoam/simplifiedSiwek/system/topoSetDict        | 2 +-
 .../mixerVesselAMI2D/0.orig/U                                   | 2 +-
 .../mixerVesselAMI2D/constant/dynamicMeshDict                   | 2 +-
 .../mixerVesselAMI2D/constant/g                                 | 2 +-
 .../mixerVesselAMI2D/constant/kinematicCloudPositions           | 2 +-
 .../mixerVesselAMI2D/constant/kinematicCloudProperties          | 2 +-
 .../mixerVesselAMI2D/constant/transportProperties               | 2 +-
 .../mixerVesselAMI2D/constant/turbulenceProperties              | 2 +-
 .../mixerVesselAMI2D/system/blockMeshDict.m4                    | 2 +-
 .../mixerVesselAMI2D/system/controlDict                         | 2 +-
 .../mixerVesselAMI2D/system/fvSchemes                           | 2 +-
 .../mixerVesselAMI2D/system/fvSolution                          | 2 +-
 .../hopper/hopperEmptying/0.orig/U                              | 2 +-
 .../hopper/hopperEmptying/0.orig/mu                             | 2 +-
 .../hopper/hopperEmptying/0.orig/rho                            | 2 +-
 .../hopper/hopperEmptying/constant/g                            | 2 +-
 .../hopper/hopperEmptying/constant/kinematicCloudProperties     | 2 +-
 .../hopper/hopperEmptying/constant/transportProperties          | 2 +-
 .../hopper/hopperEmptying/constant/turbulenceProperties         | 2 +-
 .../hopper/hopperEmptying/system/blockMeshDict                  | 2 +-
 .../hopper/hopperEmptying/system/controlDict                    | 2 +-
 .../hopper/hopperEmptying/system/decomposeParDict               | 2 +-
 .../hopper/hopperEmptying/system/fvSchemes                      | 2 +-
 .../hopper/hopperEmptying/system/fvSolution                     | 2 +-
 .../hopper/hopperEmptying/system/mapFieldsDict                  | 2 +-
 .../hopper/hopperInitialState/0/U                               | 2 +-
 .../hopper/hopperInitialState/constant/g                        | 2 +-
 .../hopper/hopperInitialState/constant/kinematicCloudPositions  | 2 +-
 .../hopper/hopperInitialState/constant/kinematicCloudProperties | 2 +-
 .../hopper/hopperInitialState/constant/transportProperties      | 2 +-
 .../hopper/hopperInitialState/constant/turbulenceProperties     | 2 +-
 .../hopper/hopperInitialState/system/blockMeshDict              | 2 +-
 .../hopper/hopperInitialState/system/controlDict                | 2 +-
 .../hopper/hopperInitialState/system/decomposeParDict           | 2 +-
 .../hopper/hopperInitialState/system/fvSchemes                  | 2 +-
 .../hopper/hopperInitialState/system/fvSolution                 | 2 +-
 .../lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/T  | 2 +-
 .../lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/U  | 2 +-
 .../kinematicParcelFoam/pitzDailyWithSprinklers/0/Uf_film       | 2 +-
 .../kinematicParcelFoam/pitzDailyWithSprinklers/0/epsilon       | 2 +-
 .../kinematicParcelFoam/pitzDailyWithSprinklers/0/hf_film       | 2 +-
 .../lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/k  | 2 +-
 .../kinematicParcelFoam/pitzDailyWithSprinklers/0/nut           | 2 +-
 .../lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/p  | 2 +-
 .../kinematicParcelFoam/pitzDailyWithSprinklers/constant/g      | 2 +-
 .../pitzDailyWithSprinklers/constant/kinematicCloudProperties   | 2 +-
 .../pitzDailyWithSprinklers/constant/transportProperties        | 2 +-
 .../pitzDailyWithSprinklers/constant/turbulenceProperties       | 2 +-
 .../pitzDailyWithSprinklers/system/blockMeshDict                | 2 +-
 .../pitzDailyWithSprinklers/system/controlDict                  | 2 +-
 .../pitzDailyWithSprinklers/system/decomposeParDict             | 2 +-
 .../pitzDailyWithSprinklers/system/faMeshDefinition             | 2 +-
 .../pitzDailyWithSprinklers/system/faSchemes                    | 2 +-
 .../pitzDailyWithSprinklers/system/faSolution                   | 2 +-
 .../pitzDailyWithSprinklers/system/fvSchemes                    | 2 +-
 .../pitzDailyWithSprinklers/system/fvSolution                   | 2 +-
 tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/U       | 2 +-
 tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/p       | 2 +-
 .../lagrangian/kinematicParcelFoam/spinningDisk/constant/g      | 2 +-
 .../spinningDisk/constant/kinematicCloudProperties              | 2 +-
 .../spinningDisk/constant/transportProperties                   | 2 +-
 .../spinningDisk/constant/turbulenceProperties                  | 2 +-
 .../kinematicParcelFoam/spinningDisk/system/blockMeshDict       | 2 +-
 .../kinematicParcelFoam/spinningDisk/system/controlDict         | 2 +-
 .../kinematicParcelFoam/spinningDisk/system/decomposeParDict    | 2 +-
 .../kinematicParcelFoam/spinningDisk/system/fvSchemes           | 2 +-
 .../kinematicParcelFoam/spinningDisk/system/fvSolution          | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/N2         | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/O2         | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/T          | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/U          | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/alphat     | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/k          | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/nut        | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/omega      | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/p          | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh      | 2 +-
 .../rectangularDuct/constant/chemistryProperties                | 2 +-
 .../rectangularDuct/constant/combustionProperties               | 2 +-
 .../rectangularDuct/constant/foam.dat                           | 2 +-
 .../reactingHeterogenousParcelFoam/rectangularDuct/constant/g   | 2 +-
 .../rectangularDuct/constant/particleTrackDict                  | 2 +-
 .../rectangularDuct/constant/radiationProperties                | 2 +-
 .../rectangularDuct/constant/reactingCloud1Properties           | 2 +-
 .../rectangularDuct/constant/thermophysicalProperties           | 2 +-
 .../rectangularDuct/constant/turbulenceProperties               | 2 +-
 .../rectangularDuct/system/blockMeshDict                        | 2 +-
 .../rectangularDuct/system/controlDict                          | 2 +-
 .../rectangularDuct/system/decomposeParDict                     | 2 +-
 .../rectangularDuct/system/fvSchemes                            | 2 +-
 .../rectangularDuct/system/fvSolution                           | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/0.orig/T     | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/0.orig/U     | 2 +-
 .../airRecirculationRoom/steady/0.orig/alphat                   | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/0.orig/k     | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/0.orig/nut   | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/0.orig/omega | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/0.orig/p     | 2 +-
 .../airRecirculationRoom/steady/constant/fvOptions              | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/steady/constant/g   | 2 +-
 .../steady/constant/thermophysicalProperties                    | 2 +-
 .../airRecirculationRoom/steady/constant/turbulenceProperties   | 2 +-
 .../airRecirculationRoom/steady/system/blockMeshDict            | 2 +-
 .../airRecirculationRoom/steady/system/controlDict              | 2 +-
 .../airRecirculationRoom/steady/system/decomposeParDict         | 2 +-
 .../airRecirculationRoom/steady/system/fvSchemes                | 2 +-
 .../airRecirculationRoom/steady/system/fvSolution               | 2 +-
 .../airRecirculationRoom/steady/system/snappyHexMeshDict        | 2 +-
 .../steady/system/surfaceFeatureExtractDict                     | 2 +-
 .../airRecirculationRoom/transient/0.orig/CO2                   | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/transient/0.orig/G  | 2 +-
 .../airRecirculationRoom/transient/0.orig/H2O                   | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/transient/0.orig/N2 | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/transient/0.orig/O2 | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/transient/0.orig/T  | 2 +-
 .../airRecirculationRoom/transient/0.orig/alphat                | 2 +-
 .../reactingParcelFoam/airRecirculationRoom/transient/0.orig/k  | 2 +-
 .../airRecirculationRoom/transient/0.orig/nut                   | 2 +-
 .../airRecirculationRoom/transient/0.orig/omega                 | 2 +-
 .../airRecirculationRoom/transient/0.orig/p_rgh                 | 2 +-
 .../airRecirculationRoom/transient/constant/chemistryProperties | 2 +-
 .../transient/constant/combustionProperties                     | 2 +-
 .../airRecirculationRoom/transient/constant/fvOptions           | 2 +-
 .../airRecirculationRoom/transient/constant/g                   | 2 +-
 .../transient/constant/particleTrackProperties                  | 2 +-
 .../airRecirculationRoom/transient/constant/radiationProperties | 2 +-
 .../transient/constant/reactingCloud1Properties                 | 2 +-
 .../transient/constant/thermo.incompressiblePoly                | 2 +-
 .../transient/constant/thermophysicalProperties                 | 2 +-
 .../transient/constant/turbulenceProperties                     | 2 +-
 .../airRecirculationRoom/transient/system/controlDict           | 2 +-
 .../airRecirculationRoom/transient/system/decomposeParDict      | 2 +-
 .../airRecirculationRoom/transient/system/fvSchemes             | 2 +-
 .../airRecirculationRoom/transient/system/fvSolution            | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4   | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2   | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O   | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2    | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2    | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T     | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U     | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut   | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p     | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh | 2 +-
 .../lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho   | 2 +-
 .../counterFlowFlame2DLTS/constant/chemistryProperties          | 2 +-
 .../counterFlowFlame2DLTS/constant/combustionProperties         | 2 +-
 .../reactingParcelFoam/counterFlowFlame2DLTS/constant/g         | 2 +-
 .../counterFlowFlame2DLTS/constant/radiationProperties          | 2 +-
 .../counterFlowFlame2DLTS/constant/reactingCloud1Properties     | 2 +-
 .../counterFlowFlame2DLTS/constant/thermo.compressibleGas       | 2 +-
 .../counterFlowFlame2DLTS/constant/thermophysicalProperties     | 2 +-
 .../counterFlowFlame2DLTS/constant/turbulenceProperties         | 2 +-
 .../counterFlowFlame2DLTS/system/blockMeshDict                  | 2 +-
 .../reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict | 2 +-
 .../reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes   | 2 +-
 .../reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O     | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2      | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2      | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh   | 2 +-
 .../reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf        | 2 +-
 .../reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf        | 2 +-
 .../reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf    | 2 +-
 .../reactingParcelFoam/cylinder/constant/chemistryProperties    | 2 +-
 .../reactingParcelFoam/cylinder/constant/combustionProperties   | 2 +-
 .../lagrangian/reactingParcelFoam/cylinder/constant/foam.dat    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g     | 2 +-
 .../cylinder/constant/parcelInjectionProperties                 | 2 +-
 .../reactingParcelFoam/cylinder/constant/radiationProperties    | 2 +-
 .../cylinder/constant/reactingCloud1Properties                  | 2 +-
 .../reactingParcelFoam/cylinder/constant/surfaceFilmProperties  | 2 +-
 .../cylinder/constant/thermophysicalProperties                  | 2 +-
 .../reactingParcelFoam/cylinder/constant/turbulenceProperties   | 2 +-
 .../lagrangian/reactingParcelFoam/cylinder/system/blockMeshDict | 2 +-
 .../lagrangian/reactingParcelFoam/cylinder/system/controlDict   | 2 +-
 .../reactingParcelFoam/cylinder/system/createPatchDict          | 2 +-
 .../reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict  | 2 +-
 .../lagrangian/reactingParcelFoam/cylinder/system/fvSchemes     | 2 +-
 .../lagrangian/reactingParcelFoam/cylinder/system/fvSolution    | 2 +-
 .../lagrangian/reactingParcelFoam/cylinder/system/topoSetDict   | 2 +-
 .../reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes | 2 +-
 .../cylinder/system/wallFilmRegion/fvSolution                   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G         | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2        | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2        | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T         | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U         | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k         | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p         | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh     | 2 +-
 .../reactingParcelFoam/filter/constant/chemistryProperties      | 2 +-
 .../reactingParcelFoam/filter/constant/combustionProperties     | 2 +-
 .../lagrangian/reactingParcelFoam/filter/constant/fvOptions     | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/constant/g       | 2 +-
 .../filter/constant/parcelInjectionProperties                   | 2 +-
 .../reactingParcelFoam/filter/constant/particleTrackProperties  | 2 +-
 .../filter/constant/particleTrackProperties.animate             | 2 +-
 .../filter/constant/particleTrackProperties.static              | 2 +-
 .../reactingParcelFoam/filter/constant/radiationProperties      | 2 +-
 .../reactingParcelFoam/filter/constant/reactingCloud1Properties | 2 +-
 .../filter/constant/thermo.incompressiblePoly                   | 2 +-
 .../reactingParcelFoam/filter/constant/thermophysicalProperties | 2 +-
 .../reactingParcelFoam/filter/constant/turbulenceProperties     | 2 +-
 .../lagrangian/reactingParcelFoam/filter/system/blockMeshDict   | 2 +-
 .../reactingParcelFoam/filter/system/changeDictionaryDict       | 2 +-
 .../lagrangian/reactingParcelFoam/filter/system/controlDict     | 2 +-
 .../reactingParcelFoam/filter/system/createBafflesDict          | 2 +-
 .../reactingParcelFoam/filter/system/decomposeParDict           | 2 +-
 tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes | 2 +-
 .../lagrangian/reactingParcelFoam/filter/system/fvSolution      | 2 +-
 .../lagrangian/reactingParcelFoam/filter/system/topoSetDict     | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O     | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2      | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2      | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut     | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh   | 2 +-
 .../reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf        | 2 +-
 .../reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf        | 2 +-
 .../reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf    | 2 +-
 .../reactingParcelFoam/hotBoxes/constant/chemistryProperties    | 2 +-
 .../reactingParcelFoam/hotBoxes/constant/combustionProperties   | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g     | 2 +-
 .../reactingParcelFoam/hotBoxes/constant/radiationProperties    | 2 +-
 .../hotBoxes/constant/reactingCloud1Properties                  | 2 +-
 .../reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties  | 2 +-
 .../hotBoxes/constant/thermophysicalProperties                  | 2 +-
 .../reactingParcelFoam/hotBoxes/constant/turbulenceProperties   | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/patchifyObstacles    | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/system/blockMeshDict | 2 +-
 .../reactingParcelFoam/hotBoxes/system/changeDictionaryDict     | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/system/controlDict   | 2 +-
 .../reactingParcelFoam/hotBoxes/system/decomposeParDict         | 2 +-
 .../reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict  | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes     | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution    | 2 +-
 .../lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict   | 2 +-
 .../hotBoxes/system/wallFilmRegion.orig/decomposeParDict        | 2 +-
 .../hotBoxes/system/wallFilmRegion.orig/fvSchemes               | 2 +-
 .../hotBoxes/system/wallFilmRegion.orig/fvSolution              | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/T         | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/U         | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film   | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault  | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat    | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon   | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film   | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/k         | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut       | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/p         | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh     | 2 +-
 .../liquidFilmStepWithSprinklers/constant/foam.dat              | 2 +-
 .../reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g  | 2 +-
 .../constant/reactingCloud1Properties                           | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../liquidFilmStepWithSprinklers/constant/turbulenceProperties  | 2 +-
 .../liquidFilmStepWithSprinklers/system/blockMeshDict           | 2 +-
 .../liquidFilmStepWithSprinklers/system/controlDict             | 2 +-
 .../liquidFilmStepWithSprinklers/system/decomposeParDict        | 2 +-
 .../liquidFilmStepWithSprinklers/system/faMeshDefinition        | 2 +-
 .../liquidFilmStepWithSprinklers/system/faSchemes               | 2 +-
 .../liquidFilmStepWithSprinklers/system/faSolution              | 2 +-
 .../liquidFilmStepWithSprinklers/system/fvSchemes               | 2 +-
 .../liquidFilmStepWithSprinklers/system/fvSolution              | 2 +-
 tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/G   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/H2O | 2 +-
 tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/T   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/U   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/air | 2 +-
 tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p   | 2 +-
 .../lagrangian/reactingParcelFoam/movingInjectorBox/0/p_rgh     | 2 +-
 .../movingInjectorBox/constant/chemistryProperties              | 2 +-
 .../movingInjectorBox/constant/combustionProperties             | 2 +-
 .../lagrangian/reactingParcelFoam/movingInjectorBox/constant/g  | 2 +-
 .../movingInjectorBox/constant/reactingCloud1Properties         | 2 +-
 .../movingInjectorBox/constant/thermo.incompressiblePoly        | 2 +-
 .../movingInjectorBox/constant/thermophysicalProperties         | 2 +-
 .../movingInjectorBox/constant/turbulenceProperties             | 2 +-
 .../reactingParcelFoam/movingInjectorBox/system/blockMeshDict   | 2 +-
 .../reactingParcelFoam/movingInjectorBox/system/controlDict     | 2 +-
 .../reactingParcelFoam/movingInjectorBox/system/fvSchemes       | 2 +-
 .../reactingParcelFoam/movingInjectorBox/system/fvSolution      | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p    | 2 +-
 .../lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh      | 2 +-
 .../reactingParcelFoam/parcelInBox/constant/chemistryProperties | 2 +-
 .../parcelInBox/constant/combustionProperties                   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g  | 2 +-
 .../reactingParcelFoam/parcelInBox/constant/radiationProperties | 2 +-
 .../parcelInBox/constant/reactingCloud1Positions                | 2 +-
 .../parcelInBox/constant/reactingCloud1Properties               | 2 +-
 .../parcelInBox/constant/thermo.incompressiblePoly              | 2 +-
 .../parcelInBox/constant/thermophysicalProperties               | 2 +-
 .../parcelInBox/constant/turbulenceProperties                   | 2 +-
 .../reactingParcelFoam/parcelInBox/system/blockMeshDict         | 2 +-
 .../reactingParcelFoam/parcelInBox/system/controlDict           | 2 +-
 .../lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes  | 2 +-
 .../lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution | 2 +-
 .../lagrangian/reactingParcelFoam/parcelInBox/system/probesDict | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2  | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2  | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T   | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U   | 2 +-
 .../reactingParcelFoam/rectangularChannel/0.orig/alphat         | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k   | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut | 2 +-
 .../reactingParcelFoam/rectangularChannel/0.orig/omega          | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p   | 2 +-
 .../reactingParcelFoam/rectangularChannel/0.orig/p_rgh          | 2 +-
 .../rectangularChannel/constant/chemistryProperties             | 2 +-
 .../rectangularChannel/constant/combustionProperties            | 2 +-
 .../reactingParcelFoam/rectangularChannel/constant/foam.dat     | 2 +-
 .../lagrangian/reactingParcelFoam/rectangularChannel/constant/g | 2 +-
 .../rectangularChannel/constant/radiationProperties             | 2 +-
 .../rectangularChannel/constant/reactingCloud1Properties        | 2 +-
 .../rectangularChannel/constant/thermophysicalProperties        | 2 +-
 .../rectangularChannel/constant/turbulenceProperties            | 2 +-
 .../reactingParcelFoam/rectangularChannel/system/blockMeshDict  | 2 +-
 .../reactingParcelFoam/rectangularChannel/system/controlDict    | 2 +-
 .../rectangularChannel/system/decomposeParDict                  | 2 +-
 .../reactingParcelFoam/rectangularChannel/system/fvSchemes      | 2 +-
 .../reactingParcelFoam/rectangularChannel/system/fvSolution     | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O   | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/T     | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/U     | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/air   | 2 +-
 .../reactingParcelFoam/recycleParticles/0.orig/alphat           | 2 +-
 .../reactingParcelFoam/recycleParticles/0.orig/epsilon          | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/k     | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut   | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/p     | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh | 2 +-
 .../recycleParticles/constant/chemistryProperties               | 2 +-
 .../recycleParticles/constant/combustionProperties              | 2 +-
 .../lagrangian/reactingParcelFoam/recycleParticles/constant/g   | 2 +-
 .../recycleParticles/constant/radiationProperties               | 2 +-
 .../recycleParticles/constant/reactingCloud1Properties          | 2 +-
 .../recycleParticles/constant/thermo.incompressiblePoly         | 2 +-
 .../recycleParticles/constant/thermophysicalProperties          | 2 +-
 .../recycleParticles/constant/turbulenceProperties              | 2 +-
 .../reactingParcelFoam/recycleParticles/system/blockMeshDict    | 2 +-
 .../reactingParcelFoam/recycleParticles/system/controlDict      | 2 +-
 .../reactingParcelFoam/recycleParticles/system/decomposeParDict | 2 +-
 .../reactingParcelFoam/recycleParticles/system/fvSchemes        | 2 +-
 .../reactingParcelFoam/recycleParticles/system/fvSolution       | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p   | 2 +-
 .../lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh     | 2 +-
 .../reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf    | 2 +-
 .../reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf    | 2 +-
 .../rivuletPanel/0.orig/wallFilmRegion/deltaf                   | 2 +-
 .../rivuletPanel/constant/chemistryProperties                   | 2 +-
 .../rivuletPanel/constant/combustionProperties                  | 2 +-
 .../reactingParcelFoam/rivuletPanel/constant/foam.dat           | 2 +-
 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g | 2 +-
 .../rivuletPanel/constant/parcelInjectionProperties             | 2 +-
 .../rivuletPanel/constant/radiationProperties                   | 2 +-
 .../rivuletPanel/constant/reactingCloud1Properties              | 2 +-
 .../rivuletPanel/constant/surfaceFilmProperties                 | 2 +-
 .../rivuletPanel/constant/thermophysicalProperties              | 2 +-
 .../rivuletPanel/constant/turbulenceProperties                  | 2 +-
 .../reactingParcelFoam/rivuletPanel/system/blockMeshDict        | 2 +-
 .../reactingParcelFoam/rivuletPanel/system/controlDict          | 2 +-
 .../reactingParcelFoam/rivuletPanel/system/createPatchDict      | 2 +-
 .../rivuletPanel/system/extrudeToRegionMeshDict                 | 2 +-
 .../lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes | 2 +-
 .../reactingParcelFoam/rivuletPanel/system/fvSolution           | 2 +-
 .../rivuletPanel/system/wallFilmRegion.topoSet                  | 2 +-
 .../rivuletPanel/system/wallFilmRegion/createPatchDict          | 2 +-
 .../rivuletPanel/system/wallFilmRegion/fvSchemes                | 2 +-
 .../rivuletPanel/system/wallFilmRegion/fvSolution               | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O  | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2   | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U    | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p    | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh      | 2 +-
 .../reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Tf     | 2 +-
 .../reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Uf     | 2 +-
 .../reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/deltaf | 2 +-
 .../reactingParcelFoam/splashPanel/constant/chemistryProperties | 2 +-
 .../splashPanel/constant/combustionProperties                   | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat | 2 +-
 tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g  | 2 +-
 .../splashPanel/constant/parcelInjectionProperties              | 2 +-
 .../reactingParcelFoam/splashPanel/constant/radiationProperties | 2 +-
 .../splashPanel/constant/reactingCloud1Properties               | 2 +-
 .../splashPanel/constant/surfaceFilmProperties                  | 2 +-
 .../splashPanel/constant/thermophysicalProperties               | 2 +-
 .../splashPanel/constant/turbulenceProperties                   | 2 +-
 .../reactingParcelFoam/splashPanel/system/blockMeshDict         | 2 +-
 .../reactingParcelFoam/splashPanel/system/controlDict           | 2 +-
 .../reactingParcelFoam/splashPanel/system/createPatchDict       | 2 +-
 .../splashPanel/system/extrudeToRegionMeshDict                  | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes  | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanel/system/fvSolution | 2 +-
 .../splashPanel/system/wallFilmRegion.topoSet                   | 2 +-
 .../splashPanel/system/wallFilmRegion/createPatchDict           | 2 +-
 .../system/wallFilmRegion/createWallFilmRegionPatches.topoSet   | 2 +-
 .../splashPanel/system/wallFilmRegion/fvSchemes                 | 2 +-
 .../splashPanel/system/wallFilmRegion/fvSolution                | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/H2O    | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/N2     | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/O2     | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/T      | 2 +-
 .../reactingParcelFoam/splashPanelFilm/0.orig/Tf_film           | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/U      | 2 +-
 .../reactingParcelFoam/splashPanelFilm/0.orig/Uf_film           | 2 +-
 .../reactingParcelFoam/splashPanelFilm/0.orig/hf_film           | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p      | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p_rgh  | 2 +-
 .../splashPanelFilm/constant/chemistryProperties                | 2 +-
 .../splashPanelFilm/constant/combustionProperties               | 2 +-
 .../reactingParcelFoam/splashPanelFilm/constant/foam.dat        | 2 +-
 .../lagrangian/reactingParcelFoam/splashPanelFilm/constant/g    | 2 +-
 .../splashPanelFilm/constant/parcelInjectionProperties          | 2 +-
 .../splashPanelFilm/constant/radiationProperties                | 2 +-
 .../splashPanelFilm/constant/reactingCloud1Properties           | 2 +-
 .../splashPanelFilm/constant/surfaceFilmProperties.remove       | 2 +-
 .../splashPanelFilm/constant/thermophysicalProperties           | 2 +-
 .../splashPanelFilm/constant/turbulenceProperties               | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/blockMeshDict     | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/controlDict       | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/createPatchDict   | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/faMeshDefinition  | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/faSchemes         | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/faSolution        | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/fvSchemes         | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/fvSolution        | 2 +-
 .../reactingParcelFoam/splashPanelFilm/system/topoSetDict       | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O    | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/T      | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/U      | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/air    | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/k      | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut    | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega  | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/p      | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh  | 2 +-
 .../verticalChannel/constant/chemistryProperties                | 2 +-
 .../verticalChannel/constant/combustionProperties               | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannel/constant/g    | 2 +-
 .../verticalChannel/constant/particleTrackProperties            | 2 +-
 .../verticalChannel/constant/radiationProperties                | 2 +-
 .../verticalChannel/constant/reactingCloud1Properties           | 2 +-
 .../verticalChannel/constant/thermo.incompressiblePoly          | 2 +-
 .../verticalChannel/constant/thermophysicalProperties           | 2 +-
 .../verticalChannel/constant/turbulenceProperties               | 2 +-
 .../reactingParcelFoam/verticalChannel/system/blockMeshDict     | 2 +-
 .../reactingParcelFoam/verticalChannel/system/controlDict       | 2 +-
 .../reactingParcelFoam/verticalChannel/system/decomposeParDict  | 2 +-
 .../reactingParcelFoam/verticalChannel/system/fvSchemes         | 2 +-
 .../reactingParcelFoam/verticalChannel/system/fvSolution        | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T   | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U   | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/0.orig/alphat         | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k   | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/0.orig/omega          | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p   | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh          | 2 +-
 .../verticalChannelLTS/constant/chemistryProperties             | 2 +-
 .../verticalChannelLTS/constant/combustionProperties            | 2 +-
 .../lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g | 2 +-
 .../verticalChannelLTS/constant/particleTrackDict               | 2 +-
 .../verticalChannelLTS/constant/radiationProperties             | 2 +-
 .../verticalChannelLTS/constant/reactingCloud1Properties        | 2 +-
 .../verticalChannelLTS/constant/thermo.incompressiblePoly       | 2 +-
 .../verticalChannelLTS/constant/thermophysicalProperties        | 2 +-
 .../verticalChannelLTS/constant/turbulenceProperties            | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/system/blockMeshDict  | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/system/controlDict    | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/system/fvSchemes      | 2 +-
 .../reactingParcelFoam/verticalChannelLTS/system/fvSolution     | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/H2O         | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/T           | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/U           | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/air         | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/alphat      | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/k           | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/nut         | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/omega       | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/0.orig/p           | 2 +-
 .../verticalChannel/constant/chemistryProperties                | 2 +-
 .../verticalChannel/constant/combustionProperties               | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/constant/g         | 2 +-
 .../verticalChannel/constant/particleTrackDict                  | 2 +-
 .../verticalChannel/constant/radiationProperties                | 2 +-
 .../verticalChannel/constant/reactingCloud1Properties           | 2 +-
 .../verticalChannel/constant/thermo.incompressiblePoly          | 2 +-
 .../verticalChannel/constant/thermophysicalProperties           | 2 +-
 .../verticalChannel/constant/turbulenceProperties               | 2 +-
 .../verticalChannel/system/blockMeshDict                        | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/system/controlDict | 2 +-
 .../verticalChannel/system/decomposeParDict                     | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/system/fvOptions   | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/system/fvSchemes   | 2 +-
 .../simpleReactingParcelFoam/verticalChannel/system/fvSolution  | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/N2             | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/O2             | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/T              | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/U              | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/Ydefault       | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/alphat         | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/epsilon        | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/k              | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/nut            | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/p              | 2 +-
 .../lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties | 2 +-
 .../sprayFoam/aachenBomb/constant/chemistryProperties           | 2 +-
 .../sprayFoam/aachenBomb/constant/combustionProperties          | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/constant/g            | 2 +-
 .../sprayFoam/aachenBomb/constant/radiationProperties           | 2 +-
 .../sprayFoam/aachenBomb/constant/sprayCloudProperties          | 2 +-
 .../sprayFoam/aachenBomb/constant/thermophysicalProperties      | 2 +-
 .../sprayFoam/aachenBomb/constant/turbulenceProperties          | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict  | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict    | 2 +-
 .../lagrangian/sprayFoam/aachenBomb/system/decomposeParDict     | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes      | 2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution     | 2 +-
 .../uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/T         | 2 +-
 .../uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/U         | 2 +-
 .../uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/p         | 2 +-
 .../rotor2DAMI/constant/dynamicMeshDict                         | 2 +-
 .../uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/g       | 2 +-
 .../rotor2DAMI/constant/kinematicCloudProperties                | 2 +-
 .../rotor2DAMI/constant/thermophysicalProperties                | 2 +-
 .../rotor2DAMI/constant/turbulenceProperties                    | 2 +-
 .../rotor2DAMI/system/blockMeshDict                             | 2 +-
 .../rotor2DAMI/system/controlDict                               | 2 +-
 .../uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSchemes | 2 +-
 .../rotor2DAMI/system/fvSolution                                | 2 +-
 tutorials/mesh/PDRblockMesh/box0/system/PDRblockMeshDict        | 2 +-
 tutorials/mesh/PDRblockMesh/box0/system/controlDict             | 2 +-
 tutorials/mesh/PDRblockMesh/box0/system/fvSchemes               | 2 +-
 tutorials/mesh/PDRblockMesh/box0/system/fvSolution              | 2 +-
 tutorials/mesh/blockMesh/mergePairs/system/blockMeshDict        | 2 +-
 tutorials/mesh/blockMesh/mergePairs/system/controlDict          | 2 +-
 tutorials/mesh/blockMesh/pipe/system/blockMeshDict              | 2 +-
 tutorials/mesh/blockMesh/pipe/system/controlDict                | 2 +-
 tutorials/mesh/blockMesh/pipe/system/fvSchemes                  | 2 +-
 tutorials/mesh/blockMesh/pipe/system/fvSolution                 | 2 +-
 tutorials/mesh/blockMesh/sphere/system/blockMeshDict            | 2 +-
 tutorials/mesh/blockMesh/sphere/system/controlDict              | 2 +-
 tutorials/mesh/blockMesh/sphere/system/fvSchemes                | 2 +-
 tutorials/mesh/blockMesh/sphere/system/fvSolution               | 2 +-
 tutorials/mesh/blockMesh/sphere7/system/blockMeshDict           | 2 +-
 tutorials/mesh/blockMesh/sphere7/system/controlDict             | 2 +-
 tutorials/mesh/blockMesh/sphere7/system/fvSchemes               | 2 +-
 tutorials/mesh/blockMesh/sphere7/system/fvSolution              | 2 +-
 .../mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict   | 2 +-
 .../mesh/blockMesh/sphere7ProjectedEdges/system/controlDict     | 2 +-
 tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSchemes | 2 +-
 .../mesh/blockMesh/sphere7ProjectedEdges/system/fvSolution      | 2 +-
 .../mesh/blockMesh/spheroid7Projected/system/blockMeshDict      | 2 +-
 tutorials/mesh/blockMesh/spheroid7Projected/system/controlDict  | 2 +-
 tutorials/mesh/blockMesh/spheroid7Projected/system/fvSchemes    | 2 +-
 tutorials/mesh/blockMesh/spheroid7Projected/system/fvSolution   | 2 +-
 tutorials/mesh/blockMesh/spheroidProjected/system/blockMeshDict | 2 +-
 tutorials/mesh/blockMesh/spheroidProjected/system/controlDict   | 2 +-
 tutorials/mesh/blockMesh/spheroidProjected/system/fvSchemes     | 2 +-
 tutorials/mesh/blockMesh/spheroidProjected/system/fvSolution    | 2 +-
 .../multiRegionHeater_autoPatch/0.orig/bottomSolid/T            | 2 +-
 .../multiRegionHeater_autoPatch/0.orig/bottomSolid/p            | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/T  | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/p  | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/T | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/p | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/topAir/T     | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/topAir/U     | 2 +-
 .../multiRegionHeater_autoPatch/0.orig/topAir/epsilon           | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/topAir/k     | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p     | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p_rgh | 2 +-
 .../constant/bottomSolid/radiationProperties                    | 2 +-
 .../constant/bottomSolid/thermophysicalProperties               | 2 +-
 .../mesh/createPatch/multiRegionHeater_autoPatch/constant/g     | 2 +-
 .../multiRegionHeater_autoPatch/constant/regionProperties       | 2 +-
 .../constant/topAir/radiationProperties                         | 2 +-
 .../constant/topAir/thermophysicalProperties                    | 2 +-
 .../constant/topAir/turbulenceProperties                        | 2 +-
 .../system/bottomSolid/blockMeshDict                            | 2 +-
 .../system/bottomSolid/createPatchDict                          | 2 +-
 .../multiRegionHeater_autoPatch/system/bottomSolid/fvSchemes    | 2 +-
 .../multiRegionHeater_autoPatch/system/bottomSolid/fvSolution   | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/system/controlDict  | 2 +-
 .../multiRegionHeater_autoPatch/system/decomposeParDict         | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/system/fvSchemes    | 2 +-
 .../createPatch/multiRegionHeater_autoPatch/system/fvSolution   | 2 +-
 .../multiRegionHeater_autoPatch/system/leftSolid/blockMeshDict  | 2 +-
 .../multiRegionHeater_autoPatch/system/rightSolid/blockMeshDict | 2 +-
 .../multiRegionHeater_autoPatch/system/topAir/blockMeshDict     | 2 +-
 .../multiRegionHeater_autoPatch/system/topAir/createPatchDict   | 2 +-
 .../multiRegionHeater_autoPatch/system/topAir/fvSchemes         | 2 +-
 .../multiRegionHeater_autoPatch/system/topAir/fvSolution        | 2 +-
 .../extrudeMesh/faceZoneExtrusion/constant/transportProperties  | 2 +-
 .../mesh/extrudeMesh/faceZoneExtrusion/system/blockMeshDict     | 2 +-
 tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/controlDict | 2 +-
 .../mesh/extrudeMesh/faceZoneExtrusion/system/decomposeParDict  | 2 +-
 .../mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict   | 2 +-
 .../extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict.flip   | 2 +-
 tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSchemes   | 2 +-
 tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSolution  | 2 +-
 tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict | 2 +-
 .../mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip  | 2 +-
 tutorials/mesh/extrudeMesh/polyline/system/controlDict          | 2 +-
 tutorials/mesh/extrudeMesh/polyline/system/extrudeMeshDict      | 2 +-
 tutorials/mesh/extrudeMesh/polyline/system/fvSchemes            | 2 +-
 tutorials/mesh/extrudeMesh/polyline/system/fvSolution           | 2 +-
 .../blob/system/backgroundMeshDecomposition/blockMeshDict       | 2 +-
 .../blob/system/backgroundMeshDecomposition/decomposeParDict    | 2 +-
 .../blob/system/backgroundMeshDecomposition/fvSolution          | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/collapseDict            | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/controlDict             | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict        | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict        | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/fvSchemes               | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/fvSolution              | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict         | 2 +-
 tutorials/mesh/foamyHexMesh/blob/system/topoSetDict             | 2 +-
 .../flange/system/backgroundMeshDecomposition/blockMeshDict     | 2 +-
 .../flange/system/backgroundMeshDecomposition/decomposeParDict  | 2 +-
 .../flange/system/backgroundMeshDecomposition/fvSolution        | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/collapseDict          | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/controlDict           | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict      | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/faceSetDict           | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict      | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/fvSchemes             | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/fvSolution            | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry     | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict       | 2 +-
 .../mesh/foamyHexMesh/flange/system/topoSetDict-background      | 2 +-
 tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices    | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U                | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1     | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon          | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k                | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut              | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh            | 2 +-
 .../mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict      | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/constant/g              | 2 +-
 .../mesh/foamyHexMesh/mixerVessel/constant/transportProperties  | 2 +-
 .../mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties | 2 +-
 .../system/backgroundMeshDecomposition/blockMeshDict            | 2 +-
 .../mixerVessel/system/backgroundMeshDecomposition/fvSolution   | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict     | 2 +-
 .../foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces  | 2 +-
 .../mixerVessel/system/collapseDict.indirectPatchFaces          | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict      | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict  | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes        | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution       | 2 +-
 .../foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl   | 2 +-
 .../mixerVessel/system/meshDict.conformationSurfaces            | 2 +-
 .../mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry      | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict  | 2 +-
 tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict    | 2 +-
 .../foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict   | 2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict    | 2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict     | 2 +-
 .../mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict      | 2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes       | 2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution      | 2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict | 2 +-
 tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict     | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T                   | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U                   | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p                   | 2 +-
 .../foamyQuadMesh/OpenCFD/constant/thermophysicalProperties     | 2 +-
 .../mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties    | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict         | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher  | 2 +-
 .../foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam     | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict    | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict   | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict   | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes           | 2 +-
 tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution          | 2 +-
 .../mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict | 2 +-
 tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict  | 2 +-
 .../mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict  | 2 +-
 .../mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict  | 2 +-
 tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes    | 2 +-
 tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution   | 2 +-
 .../jaggedBoundary/system/surfaceFeatureExtractDict             | 2 +-
 tutorials/mesh/foamyQuadMesh/square/system/controlDict          | 2 +-
 tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict    | 2 +-
 tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict    | 2 +-
 tutorials/mesh/foamyQuadMesh/square/system/fvSchemes            | 2 +-
 tutorials/mesh/foamyQuadMesh/square/system/fvSolution           | 2 +-
 .../mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict  | 2 +-
 .../moveDynamicMesh/SnakeRiverCanyon/0.orig/pointDisplacement   | 2 +-
 .../moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict   | 2 +-
 .../SnakeRiverCanyon/constant/transportProperties               | 2 +-
 .../mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict  | 2 +-
 .../mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict    | 2 +-
 .../moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict    | 2 +-
 .../mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes      | 2 +-
 .../mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution     | 2 +-
 .../box2D_moveDynamicMesh/0.orig/cellDisplacement               | 2 +-
 .../box2D_moveDynamicMesh/0.orig/pointDisplacement              | 2 +-
 .../box2D_moveDynamicMesh/constant/dynamicMeshDict              | 2 +-
 .../box2D_moveDynamicMesh/constant/transportProperties          | 2 +-
 .../box2D_moveDynamicMesh/constant/turbulenceProperties         | 2 +-
 .../relativeMotion/box2D_moveDynamicMesh/system/controlDict     | 2 +-
 .../box2D_moveDynamicMesh/system/decomposeParDict               | 2 +-
 .../relativeMotion/box2D_moveDynamicMesh/system/extrudeMeshDict | 2 +-
 .../relativeMotion/box2D_moveDynamicMesh/system/fvSchemes       | 2 +-
 .../relativeMotion/box2D_moveDynamicMesh/system/fvSolution      | 2 +-
 .../box_snappyHexMesh/constant/transportProperties              | 2 +-
 .../box_snappyHexMesh/constant/turbulenceProperties             | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/blockMeshDict       | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/controlDict         | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/createPatchDict     | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/decomposeParDict    | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/fvSchemes           | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/fvSolution          | 2 +-
 .../relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict   | 2 +-
 .../moveDynamicMesh/twistingColumn/constant/dynamicMeshDict     | 2 +-
 .../moveDynamicMesh/twistingColumn/constant/transportProperties | 2 +-
 .../mesh/moveDynamicMesh/twistingColumn/system/blockMeshDict    | 2 +-
 .../mesh/moveDynamicMesh/twistingColumn/system/controlDict      | 2 +-
 .../mesh/moveDynamicMesh/twistingColumn/system/decomposeParDict | 2 +-
 tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSchemes  | 2 +-
 tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSolution | 2 +-
 tutorials/mesh/parallel/cavity/0.orig/U                         | 2 +-
 tutorials/mesh/parallel/cavity/0.orig/p                         | 2 +-
 tutorials/mesh/parallel/cavity/constant/transportProperties     | 2 +-
 tutorials/mesh/parallel/cavity/system/blockMeshDict             | 2 +-
 tutorials/mesh/parallel/cavity/system/controlDict               | 2 +-
 tutorials/mesh/parallel/cavity/system/controlDict-latestTime    | 2 +-
 tutorials/mesh/parallel/cavity/system/controlDict-startTime     | 2 +-
 tutorials/mesh/parallel/cavity/system/decomposeParDict          | 2 +-
 tutorials/mesh/parallel/cavity/system/decomposeParDict.5        | 2 +-
 tutorials/mesh/parallel/cavity/system/fvSchemes                 | 2 +-
 tutorials/mesh/parallel/cavity/system/fvSolution                | 2 +-
 tutorials/mesh/parallel/cavity/system/renumberMeshDict-random   | 2 +-
 tutorials/mesh/parallel/filter/0.orig/G                         | 2 +-
 tutorials/mesh/parallel/filter/0.orig/H2O                       | 2 +-
 tutorials/mesh/parallel/filter/0.orig/N2                        | 2 +-
 tutorials/mesh/parallel/filter/0.orig/O2                        | 2 +-
 tutorials/mesh/parallel/filter/0.orig/T                         | 2 +-
 tutorials/mesh/parallel/filter/0.orig/U                         | 2 +-
 tutorials/mesh/parallel/filter/0.orig/alphat                    | 2 +-
 tutorials/mesh/parallel/filter/0.orig/epsilon                   | 2 +-
 tutorials/mesh/parallel/filter/0.orig/k                         | 2 +-
 tutorials/mesh/parallel/filter/0.orig/nut                       | 2 +-
 tutorials/mesh/parallel/filter/0.orig/p                         | 2 +-
 tutorials/mesh/parallel/filter/0.orig/p_rgh                     | 2 +-
 tutorials/mesh/parallel/filter/constant/chemistryProperties     | 2 +-
 tutorials/mesh/parallel/filter/constant/combustionProperties    | 2 +-
 tutorials/mesh/parallel/filter/constant/g                       | 2 +-
 .../mesh/parallel/filter/constant/parcelInjectionProperties     | 2 +-
 tutorials/mesh/parallel/filter/constant/particleTrackProperties | 2 +-
 tutorials/mesh/parallel/filter/constant/radiationProperties     | 2 +-
 .../mesh/parallel/filter/constant/reactingCloud1Properties      | 2 +-
 .../mesh/parallel/filter/constant/thermo.incompressiblePoly     | 2 +-
 .../mesh/parallel/filter/constant/thermophysicalProperties      | 2 +-
 tutorials/mesh/parallel/filter/constant/turbulenceProperties    | 2 +-
 tutorials/mesh/parallel/filter/system/blockMeshDict             | 2 +-
 tutorials/mesh/parallel/filter/system/controlDict               | 2 +-
 tutorials/mesh/parallel/filter/system/createBafflesDict         | 2 +-
 tutorials/mesh/parallel/filter/system/decomposeParDict          | 2 +-
 tutorials/mesh/parallel/filter/system/fvOptions                 | 2 +-
 tutorials/mesh/parallel/filter/system/fvSchemes                 | 2 +-
 tutorials/mesh/parallel/filter/system/fvSolution                | 2 +-
 tutorials/mesh/parallel/filter/system/topoSetDict               | 2 +-
 tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict  | 2 +-
 tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict    | 2 +-
 tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes      | 2 +-
 tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution     | 2 +-
 .../refineMesh/refineFieldDirs/system/refineMeshDict.range1     | 2 +-
 .../refineMesh/refineFieldDirs/system/refineMeshDict.range2     | 2 +-
 .../refineMesh/refineFieldDirs/system/refineMeshDict.range3     | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1   | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2   | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3   | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1    | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2    | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3    | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4    | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5    | 2 +-
 .../mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6    | 2 +-
 tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/U       | 2 +-
 tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/p       | 2 +-
 .../addLayersToFaceZone/constant/transportProperties            | 2 +-
 .../addLayersToFaceZone/constant/turbulenceProperties           | 2 +-
 .../mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict | 2 +-
 .../mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict   | 2 +-
 .../snappyHexMesh/addLayersToFaceZone/system/decomposeParDict   | 2 +-
 .../mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes     | 2 +-
 .../mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution    | 2 +-
 .../snappyHexMesh/addLayersToFaceZone/system/meshQualityDict    | 2 +-
 .../snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict  | 2 +-
 .../mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict   | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../aerofoilNACA0012_directionalRefinement/system/blockMeshDict | 2 +-
 .../aerofoilNACA0012_directionalRefinement/system/controlDict   | 2 +-
 .../aerofoilNACA0012_directionalRefinement/system/fvSchemes     | 2 +-
 .../aerofoilNACA0012_directionalRefinement/system/fvSolution    | 2 +-
 .../system/meshQualityDict                                      | 2 +-
 .../system/snappyHexMeshDict                                    | 2 +-
 .../mesh/snappyHexMesh/airfoilWithLayers/system/blockMeshDict   | 2 +-
 .../mesh/snappyHexMesh/airfoilWithLayers/system/controlDict     | 2 +-
 tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSchemes | 2 +-
 .../mesh/snappyHexMesh/airfoilWithLayers/system/fvSolution      | 2 +-
 .../mesh/snappyHexMesh/airfoilWithLayers/system/meshQualityDict | 2 +-
 .../snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict    | 2 +-
 .../airfoilWithLayers/system/surfaceFeatureExtractDict          | 2 +-
 .../snappyHexMesh/block_with_curvature/system/blockMeshDict     | 2 +-
 .../mesh/snappyHexMesh/block_with_curvature/system/controlDict  | 2 +-
 .../mesh/snappyHexMesh/block_with_curvature/system/fvSchemes    | 2 +-
 .../mesh/snappyHexMesh/block_with_curvature/system/fvSolution   | 2 +-
 .../snappyHexMesh/block_with_curvature/system/meshQualityDict   | 2 +-
 .../snappyHexMesh/block_with_curvature/system/snappyHexMeshDict | 2 +-
 .../block_with_curvature/system/snappyHexMeshDict.orig          | 2 +-
 .../block_with_curvature/system/surfaceFeatureExtractDict       | 2 +-
 .../distributedTriSurfaceMesh/system/blockMeshDict              | 2 +-
 .../snappyHexMesh/distributedTriSurfaceMesh/system/controlDict  | 2 +-
 .../distributedTriSurfaceMesh/system/decomposeParDict           | 2 +-
 .../snappyHexMesh/distributedTriSurfaceMesh/system/fvSchemes    | 2 +-
 .../snappyHexMesh/distributedTriSurfaceMesh/system/fvSolution   | 2 +-
 .../distributedTriSurfaceMesh/system/meshQualityDict            | 2 +-
 .../distributedTriSurfaceMesh/system/snappyHexMeshDict          | 2 +-
 .../mesh/snappyHexMesh/faceZoneRegions/system/blockMeshDict     | 2 +-
 tutorials/mesh/snappyHexMesh/faceZoneRegions/system/controlDict | 2 +-
 tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSchemes   | 2 +-
 tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSolution  | 2 +-
 .../mesh/snappyHexMesh/faceZoneRegions/system/meshQualityDict   | 2 +-
 .../mesh/snappyHexMesh/faceZoneRegions/system/snappyHexMeshDict | 2 +-
 .../faceZoneRegions/system/surfaceFeatureExtractDict            | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict        | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/controlDict          | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict     | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/fvSchemes            | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/fvSolution           | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict      | 2 +-
 tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict    | 2 +-
 .../mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict  | 2 +-
 tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict | 2 +-
 tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict   | 2 +-
 .../mesh/snappyHexMesh/gap_detection/system/decomposeParDict    | 2 +-
 tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes     | 2 +-
 tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution    | 2 +-
 .../mesh/snappyHexMesh/gap_detection/system/meshQualityDict     | 2 +-
 .../mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict   | 2 +-
 .../iglooWithFridgesDirectionalRefinement/system/blockMeshDict  | 2 +-
 .../iglooWithFridgesDirectionalRefinement/system/controlDict    | 2 +-
 .../system/decomposeParDict                                     | 2 +-
 .../iglooWithFridgesDirectionalRefinement/system/fvSchemes      | 2 +-
 .../iglooWithFridgesDirectionalRefinement/system/fvSolution     | 2 +-
 .../system/meshQualityDict                                      | 2 +-
 .../system/snappyHexMeshDict                                    | 2 +-
 .../snappyHexMesh/motorBike_leakDetection/system/blockMeshDict  | 2 +-
 .../snappyHexMesh/motorBike_leakDetection/system/controlDict    | 2 +-
 .../motorBike_leakDetection/system/decomposeParDict             | 2 +-
 .../mesh/snappyHexMesh/motorBike_leakDetection/system/fvSchemes | 2 +-
 .../snappyHexMesh/motorBike_leakDetection/system/fvSolution     | 2 +-
 .../motorBike_leakDetection/system/meshQualityDict              | 2 +-
 .../motorBike_leakDetection/system/snappyHexMeshDict            | 2 +-
 .../motorBike_leakDetection/system/surfaceFeatureExtractDict    | 2 +-
 .../mesh/snappyHexMesh/opposite_walls/system/blockMeshDict      | 2 +-
 tutorials/mesh/snappyHexMesh/opposite_walls/system/controlDict  | 2 +-
 .../mesh/snappyHexMesh/opposite_walls/system/decomposeParDict   | 2 +-
 tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSchemes    | 2 +-
 tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSolution   | 2 +-
 .../mesh/snappyHexMesh/opposite_walls/system/meshQualityDict    | 2 +-
 .../mesh/snappyHexMesh/opposite_walls/system/snappyHexMeshDict  | 2 +-
 .../sphere_gapClosure/constant/transportProperties              | 2 +-
 .../mesh/snappyHexMesh/sphere_gapClosure/system/blockMeshDict   | 2 +-
 .../mesh/snappyHexMesh/sphere_gapClosure/system/controlDict     | 2 +-
 .../snappyHexMesh/sphere_gapClosure/system/decomposeParDict     | 2 +-
 .../snappyHexMesh/sphere_gapClosure/system/decomposeParDict.16  | 2 +-
 tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSchemes | 2 +-
 .../mesh/snappyHexMesh/sphere_gapClosure/system/fvSolution      | 2 +-
 .../snappyHexMesh/sphere_gapClosure/system/snappyHexMeshDict    | 2 +-
 .../mesh/snappyHexMesh/sphere_gapClosure/system/topoSetDict     | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/blockMeshDict     | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/controlDict       | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/createPatchDict   | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/fvSchemes         | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/fvSolution        | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/stitchMeshDict    | 2 +-
 tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict       | 2 +-
 .../mesh/stitchMesh/simple-cube1/system/topoSetDict.patches     | 2 +-
 tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U    | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water           | 2 +-
 .../multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/epsilon    | 2 +-
 tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/k    | 2 +-
 tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/nut  | 2 +-
 .../multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh      | 2 +-
 tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g  | 2 +-
 .../twoPhasePachuka/constant/kinematicCloudProperties           | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/constant/transportProperties | 2 +-
 .../twoPhasePachuka/constant/turbulenceProperties               | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/blockMeshDict.m4      | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/controlDict           | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/createPatchDict       | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/decomposeParDict      | 2 +-
 .../multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes  | 2 +-
 .../multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/setFieldsDict         | 2 +-
 .../MPPICInterFoam/twoPhasePachuka/system/topoSetDict           | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U       | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour  | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/k       | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/nut     | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p       | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho     | 2 +-
 .../LES/throttle/constant/thermodynamicProperties               | 2 +-
 .../cavitatingFoam/LES/throttle/constant/transportProperties    | 2 +-
 .../cavitatingFoam/LES/throttle/constant/turbulenceProperties   | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/controlDict   | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/fvSchemes     | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/fvSolution    | 2 +-
 .../cavitatingFoam/LES/throttle/system/refineMeshDict           | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U     | 2 +-
 .../cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour           | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k     | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut   | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p     | 2 +-
 tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho   | 2 +-
 .../LES/throttle3D/constant/thermodynamicProperties             | 2 +-
 .../cavitatingFoam/LES/throttle3D/constant/transportProperties  | 2 +-
 .../cavitatingFoam/LES/throttle3D/constant/turbulenceProperties | 2 +-
 .../cavitatingFoam/LES/throttle3D/system/blockMeshDict          | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle3D/system/controlDict | 2 +-
 .../cavitatingFoam/LES/throttle3D/system/decomposeParDict       | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes   | 2 +-
 .../multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution  | 2 +-
 .../cavitatingFoam/LES/throttle3D/system/refineMeshDict         | 2 +-
 .../cavitatingFoam/LES/throttle3D/system/topoSetDict.1          | 2 +-
 .../cavitatingFoam/LES/throttle3D/system/topoSetDict.2          | 2 +-
 .../cavitatingFoam/LES/throttle3D/system/topoSetDict.3          | 2 +-
 tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U       | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour  | 2 +-
 tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/k       | 2 +-
 tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/nut     | 2 +-
 tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/omega   | 2 +-
 tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p       | 2 +-
 tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho     | 2 +-
 .../RAS/throttle/constant/thermodynamicProperties               | 2 +-
 .../cavitatingFoam/RAS/throttle/constant/transportProperties    | 2 +-
 .../cavitatingFoam/RAS/throttle/constant/turbulenceProperties   | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/controlDict   | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes     | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/fvSolution    | 2 +-
 .../cavitatingFoam/RAS/throttle/system/refineMeshDict           | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 | 2 +-
 .../multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 | 2 +-
 .../compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T    | 2 +-
 .../compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U    | 2 +-
 .../laminar/sloshingTank2D/0.orig/alpha.water                   | 2 +-
 .../compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p    | 2 +-
 .../laminar/sloshingTank2D/0.orig/p_rgh                         | 2 +-
 .../laminar/sloshingTank2D/constant/dynamicMeshDict             | 2 +-
 .../compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g  | 2 +-
 .../laminar/sloshingTank2D/constant/thermophysicalProperties    | 2 +-
 .../sloshingTank2D/constant/thermophysicalProperties.air        | 2 +-
 .../sloshingTank2D/constant/thermophysicalProperties.water      | 2 +-
 .../laminar/sloshingTank2D/constant/transportProperties         | 2 +-
 .../laminar/sloshingTank2D/constant/turbulenceProperties        | 2 +-
 .../laminar/sloshingTank2D/system/blockMeshDict.m4              | 2 +-
 .../laminar/sloshingTank2D/system/controlDict                   | 2 +-
 .../laminar/sloshingTank2D/system/decomposeParDict              | 2 +-
 .../laminar/sloshingTank2D/system/fvSchemes                     | 2 +-
 .../laminar/sloshingTank2D/system/fvSolution                    | 2 +-
 .../laminar/sloshingTank2D/system/setFieldsDict                 | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T        | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.air    | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.water  | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/0.orig/U        | 2 +-
 .../laminar/sphereDrop/0.orig/alpha.water                       | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p        | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p_rgh    | 2 +-
 .../laminar/sphereDrop/constant/dynamicMeshDict                 | 2 +-
 .../compressibleInterDyMFoam/laminar/sphereDrop/constant/g      | 2 +-
 .../laminar/sphereDrop/constant/thermophysicalProperties        | 2 +-
 .../laminar/sphereDrop/constant/thermophysicalProperties.air    | 2 +-
 .../laminar/sphereDrop/constant/thermophysicalProperties.water  | 2 +-
 .../laminar/sphereDrop/constant/transportProperties             | 2 +-
 .../laminar/sphereDrop/constant/turbulenceProperties            | 2 +-
 .../laminar/sphereDrop/include/meshModifiers                    | 2 +-
 .../laminar/sphereDrop/system/blockMeshDict                     | 2 +-
 .../laminar/sphereDrop/system/controlDict                       | 2 +-
 .../laminar/sphereDrop/system/createPatchDict                   | 2 +-
 .../laminar/sphereDrop/system/decomposeParDict                  | 2 +-
 .../laminar/sphereDrop/system/fvSchemes                         | 2 +-
 .../laminar/sphereDrop/system/fvSolution                        | 2 +-
 .../laminar/sphereDrop/system/setFieldsDict                     | 2 +-
 .../laminar/sphereDrop/system/topoSetDict                       | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/0.orig/T          | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/0.orig/U          | 2 +-
 .../laminar/climbingRod/0.orig/alpha.liquid                     | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/0.orig/p          | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh      | 2 +-
 .../laminar/climbingRod/0.orig/sigma.liquid                     | 2 +-
 .../laminar/climbingRod/constant/fvOptions                      | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/constant/g        | 2 +-
 .../laminar/climbingRod/constant/thermophysicalProperties       | 2 +-
 .../laminar/climbingRod/constant/thermophysicalProperties.air   | 2 +-
 .../climbingRod/constant/thermophysicalProperties.liquid        | 2 +-
 .../laminar/climbingRod/constant/turbulenceProperties           | 2 +-
 .../laminar/climbingRod/constant/turbulenceProperties.air       | 2 +-
 .../laminar/climbingRod/constant/turbulenceProperties.liquid    | 2 +-
 .../laminar/climbingRod/system/blockMeshDict                    | 2 +-
 .../laminar/climbingRod/system/controlDict                      | 2 +-
 .../laminar/climbingRod/system/extrudeMeshDict                  | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/system/fvSchemes  | 2 +-
 .../compressibleInterFoam/laminar/climbingRod/system/fvSolution | 2 +-
 .../laminar/climbingRod/system/setFieldsDict                    | 2 +-
 .../compressibleInterFoam/laminar/depthCharge2D/0.orig/T        | 2 +-
 .../compressibleInterFoam/laminar/depthCharge2D/0.orig/U        | 2 +-
 .../laminar/depthCharge2D/0.orig/alpha.water                    | 2 +-
 .../compressibleInterFoam/laminar/depthCharge2D/0.orig/p        | 2 +-
 .../compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh    | 2 +-
 .../compressibleInterFoam/laminar/depthCharge2D/constant/g      | 2 +-
 .../laminar/depthCharge2D/constant/thermophysicalProperties     | 2 +-
 .../laminar/depthCharge2D/constant/thermophysicalProperties.air | 2 +-
 .../depthCharge2D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/depthCharge2D/constant/turbulenceProperties         | 2 +-
 .../laminar/depthCharge2D/system/blockMeshDict                  | 2 +-
 .../laminar/depthCharge2D/system/controlDict                    | 2 +-
 .../laminar/depthCharge2D/system/fvSchemes                      | 2 +-
 .../laminar/depthCharge2D/system/fvSolution                     | 2 +-
 .../laminar/depthCharge2D/system/setFieldsDict                  | 2 +-
 .../compressibleInterFoam/laminar/depthCharge3D/0.orig/T        | 2 +-
 .../compressibleInterFoam/laminar/depthCharge3D/0.orig/U        | 2 +-
 .../laminar/depthCharge3D/0.orig/alpha.water                    | 2 +-
 .../compressibleInterFoam/laminar/depthCharge3D/0.orig/p        | 2 +-
 .../compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh    | 2 +-
 .../compressibleInterFoam/laminar/depthCharge3D/constant/g      | 2 +-
 .../laminar/depthCharge3D/constant/thermophysicalProperties     | 2 +-
 .../laminar/depthCharge3D/constant/thermophysicalProperties.air | 2 +-
 .../depthCharge3D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/depthCharge3D/constant/turbulenceProperties         | 2 +-
 .../laminar/depthCharge3D/system/blockMeshDict                  | 2 +-
 .../laminar/depthCharge3D/system/controlDict                    | 2 +-
 .../laminar/depthCharge3D/system/decomposeParDict               | 2 +-
 .../laminar/depthCharge3D/system/fvSchemes                      | 2 +-
 .../laminar/depthCharge3D/system/fvSolution                     | 2 +-
 .../laminar/depthCharge3D/system/setFieldsDict                  | 2 +-
 .../compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T    | 2 +-
 .../compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U    | 2 +-
 .../laminar/waterCooler/fluid/0.orig/alpha.water                | 2 +-
 .../compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p    | 2 +-
 .../laminar/waterCooler/fluid/0.orig/p_rgh                      | 2 +-
 .../compressibleInterFoam/laminar/waterCooler/fluid/constant/g  | 2 +-
 .../laminar/waterCooler/fluid/constant/thermophysicalProperties | 2 +-
 .../waterCooler/fluid/constant/thermophysicalProperties.air     | 2 +-
 .../waterCooler/fluid/constant/thermophysicalProperties.water   | 2 +-
 .../laminar/waterCooler/fluid/constant/turbulenceProperties     | 2 +-
 .../laminar/waterCooler/fluid/system/blockMeshDict              | 2 +-
 .../laminar/waterCooler/fluid/system/controlDict                | 2 +-
 .../laminar/waterCooler/fluid/system/decomposeParDict           | 2 +-
 .../laminar/waterCooler/fluid/system/fvSchemes                  | 2 +-
 .../laminar/waterCooler/fluid/system/fvSolution                 | 2 +-
 .../laminar/waterCooler/fluid/system/setFieldsDict              | 2 +-
 .../compressibleInterFoam/laminar/waterCooler/solid/0/T         | 2 +-
 .../compressibleInterFoam/laminar/waterCooler/solid/0/p         | 2 +-
 .../laminar/waterCooler/solid/constant/radiationProperties      | 2 +-
 .../laminar/waterCooler/solid/constant/thermophysicalProperties | 2 +-
 .../laminar/waterCooler/solid/system/blockMeshDict              | 2 +-
 .../laminar/waterCooler/solid/system/controlDict                | 2 +-
 .../laminar/waterCooler/solid/system/decomposeParDict           | 2 +-
 .../laminar/waterCooler/solid/system/fvSchemes                  | 2 +-
 .../laminar/waterCooler/solid/system/fvSolution                 | 2 +-
 .../compressibleInterIsoFoam/laminar/climbingRod/0.orig/T       | 2 +-
 .../compressibleInterIsoFoam/laminar/climbingRod/0.orig/U       | 2 +-
 .../laminar/climbingRod/0.orig/alpha.liquid                     | 2 +-
 .../compressibleInterIsoFoam/laminar/climbingRod/0.orig/p       | 2 +-
 .../compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh   | 2 +-
 .../laminar/climbingRod/0.orig/sigma.liquid                     | 2 +-
 .../laminar/climbingRod/constant/fvOptions                      | 2 +-
 .../compressibleInterIsoFoam/laminar/climbingRod/constant/g     | 2 +-
 .../laminar/climbingRod/constant/thermophysicalProperties       | 2 +-
 .../laminar/climbingRod/constant/thermophysicalProperties.air   | 2 +-
 .../climbingRod/constant/thermophysicalProperties.liquid        | 2 +-
 .../laminar/climbingRod/constant/turbulenceProperties           | 2 +-
 .../laminar/climbingRod/constant/turbulenceProperties.air       | 2 +-
 .../laminar/climbingRod/constant/turbulenceProperties.liquid    | 2 +-
 .../laminar/climbingRod/system/blockMeshDict                    | 2 +-
 .../laminar/climbingRod/system/controlDict                      | 2 +-
 .../laminar/climbingRod/system/extrudeMeshDict                  | 2 +-
 .../laminar/climbingRod/system/fvSchemes                        | 2 +-
 .../laminar/climbingRod/system/fvSolution                       | 2 +-
 .../laminar/climbingRod/system/setFieldsDict                    | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T     | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U     | 2 +-
 .../laminar/depthCharge2D/0.orig/alpha.water                    | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p     | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge2D/constant/g   | 2 +-
 .../laminar/depthCharge2D/constant/thermophysicalProperties     | 2 +-
 .../laminar/depthCharge2D/constant/thermophysicalProperties.air | 2 +-
 .../depthCharge2D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/depthCharge2D/constant/turbulenceProperties         | 2 +-
 .../laminar/depthCharge2D/system/blockMeshDict                  | 2 +-
 .../laminar/depthCharge2D/system/controlDict                    | 2 +-
 .../laminar/depthCharge2D/system/decomposeParDict               | 2 +-
 .../laminar/depthCharge2D/system/fvSchemes                      | 2 +-
 .../laminar/depthCharge2D/system/fvSolution                     | 2 +-
 .../laminar/depthCharge2D/system/setAlphaFieldDict              | 2 +-
 .../laminar/depthCharge2D/system/setFieldsDict                  | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T     | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U     | 2 +-
 .../laminar/depthCharge3D/0.orig/alpha.water                    | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p     | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh | 2 +-
 .../compressibleInterIsoFoam/laminar/depthCharge3D/constant/g   | 2 +-
 .../laminar/depthCharge3D/constant/thermophysicalProperties     | 2 +-
 .../laminar/depthCharge3D/constant/thermophysicalProperties.air | 2 +-
 .../depthCharge3D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/depthCharge3D/constant/turbulenceProperties         | 2 +-
 .../laminar/depthCharge3D/system/blockMeshDict                  | 2 +-
 .../laminar/depthCharge3D/system/controlDict                    | 2 +-
 .../laminar/depthCharge3D/system/decomposeParDict               | 2 +-
 .../laminar/depthCharge3D/system/fvSchemes                      | 2 +-
 .../laminar/depthCharge3D/system/fvSolution                     | 2 +-
 .../laminar/depthCharge3D/system/setFieldsDict                  | 2 +-
 .../laminar/damBreak4phase/0.orig/T                             | 2 +-
 .../laminar/damBreak4phase/0.orig/U                             | 2 +-
 .../laminar/damBreak4phase/0.orig/alpha.air                     | 2 +-
 .../laminar/damBreak4phase/0.orig/alpha.mercury                 | 2 +-
 .../laminar/damBreak4phase/0.orig/alpha.oil                     | 2 +-
 .../laminar/damBreak4phase/0.orig/alpha.water                   | 2 +-
 .../laminar/damBreak4phase/0.orig/alphas                        | 2 +-
 .../laminar/damBreak4phase/0.orig/p                             | 2 +-
 .../laminar/damBreak4phase/0.orig/p_rgh                         | 2 +-
 .../laminar/damBreak4phase/constant/g                           | 2 +-
 .../laminar/damBreak4phase/constant/thermophysicalProperties    | 2 +-
 .../damBreak4phase/constant/thermophysicalProperties.air        | 2 +-
 .../damBreak4phase/constant/thermophysicalProperties.mercury    | 2 +-
 .../damBreak4phase/constant/thermophysicalProperties.oil        | 2 +-
 .../damBreak4phase/constant/thermophysicalProperties.water      | 2 +-
 .../laminar/damBreak4phase/constant/turbulenceProperties        | 2 +-
 .../laminar/damBreak4phase/system/blockMeshDict                 | 2 +-
 .../laminar/damBreak4phase/system/controlDict                   | 2 +-
 .../laminar/damBreak4phase/system/decomposeParDict              | 2 +-
 .../laminar/damBreak4phase/system/fvSchemes                     | 2 +-
 .../laminar/damBreak4phase/system/fvSolution                    | 2 +-
 .../laminar/damBreak4phase/system/setFieldsDict                 | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U                 | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge      | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon           | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k                 | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut               | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh             | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g          | 2 +-
 .../driftFluxFoam/RAS/dahl/constant/transportProperties         | 2 +-
 .../driftFluxFoam/RAS/dahl/constant/turbulenceProperties        | 2 +-
 .../multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict      | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict  | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes    | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution   | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/U   | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge         | 2 +-
 .../multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/epsilon   | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/k   | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/nut | 2 +-
 .../multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh     | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties      | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g | 2 +-
 .../RAS/mixerVessel2D/constant/transportProperties              | 2 +-
 .../RAS/mixerVessel2D/constant/turbulenceProperties             | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4     | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/system/controlDict          | 2 +-
 .../multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/system/fvSolution           | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict        | 2 +-
 .../driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict          | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U          | 2 +-
 .../multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge     | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon    | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k          | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut        | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh      | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g        | 2 +-
 .../driftFluxFoam/RAS/tank3D/constant/transportProperties       | 2 +-
 .../driftFluxFoam/RAS/tank3D/constant/turbulenceProperties      | 2 +-
 .../multiphase/driftFluxFoam/RAS/tank3D/system/controlDict      | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes  | 2 +-
 tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution | 2 +-
 .../evaporationMultiComponent/0.orig/T                          | 2 +-
 .../evaporationMultiComponent/0.orig/U                          | 2 +-
 .../evaporationMultiComponent/0.orig/air.gas                    | 2 +-
 .../evaporationMultiComponent/0.orig/alpha.gas                  | 2 +-
 .../evaporationMultiComponent/0.orig/alpha.liquid               | 2 +-
 .../evaporationMultiComponent/0.orig/alphat                     | 2 +-
 .../evaporationMultiComponent/0.orig/epsilon                    | 2 +-
 .../evaporationMultiComponent/0.orig/k                          | 2 +-
 .../evaporationMultiComponent/0.orig/nut                        | 2 +-
 .../evaporationMultiComponent/0.orig/p                          | 2 +-
 .../evaporationMultiComponent/0.orig/p_rgh                      | 2 +-
 .../evaporationMultiComponent/0.orig/vapour.gas                 | 2 +-
 .../evaporationMultiComponent/constant/g                        | 2 +-
 .../evaporationMultiComponent/constant/phaseProperties          | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../evaporationMultiComponent/constant/turbulenceProperties     | 2 +-
 .../evaporationMultiComponent/system/blockMeshDict              | 2 +-
 .../evaporationMultiComponent/system/controlDict                | 2 +-
 .../evaporationMultiComponent/system/fvSchemes                  | 2 +-
 .../evaporationMultiComponent/system/fvSolution                 | 2 +-
 .../evaporationMultiComponent/system/setFieldsDict              | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/CO2.gas                | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/O2.liquid              | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/T                      | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/U                      | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/air.gas                | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/alpha.gas              | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/alpha.liquid           | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/alpha.mercury          | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/alpha.oil              | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/alphat                 | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/p                      | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/p_rgh                  | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/vapour.gas             | 2 +-
 .../inertMultiphaseMultiComponent/0.orig/water.liquid           | 2 +-
 .../inertMultiphaseMultiComponent/constant/g                    | 2 +-
 .../inertMultiphaseMultiComponent/constant/phaseProperties      | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../constant/thermophysicalProperties.mercury                   | 2 +-
 .../constant/thermophysicalProperties.oil                       | 2 +-
 .../inertMultiphaseMultiComponent/constant/turbulenceProperties | 2 +-
 .../inertMultiphaseMultiComponent/system/blockMeshDict          | 2 +-
 .../inertMultiphaseMultiComponent/system/controlDict            | 2 +-
 .../inertMultiphaseMultiComponent/system/fvSchemes              | 2 +-
 .../inertMultiphaseMultiComponent/system/fvSolution             | 2 +-
 .../inertMultiphaseMultiComponent/system/setFieldsDict          | 2 +-
 .../icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/T    | 2 +-
 .../icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/U    | 2 +-
 .../mixerVesselAMI2D/0.orig/alpha.gas                           | 2 +-
 .../mixerVesselAMI2D/0.orig/alpha.liquid                        | 2 +-
 .../mixerVesselAMI2D/0.orig/alpha.mercury                       | 2 +-
 .../mixerVesselAMI2D/0.orig/alpha.oil                           | 2 +-
 .../mixerVesselAMI2D/0.orig/alphat                              | 2 +-
 .../mixerVesselAMI2D/0.orig/epsilon                             | 2 +-
 .../icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/k    | 2 +-
 .../mixerVesselAMI2D/0.orig/p_rgh                               | 2 +-
 .../mixerVesselAMI2D/constant/dynamicMeshDict                   | 2 +-
 .../icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/g  | 2 +-
 .../mixerVesselAMI2D/constant/phaseProperties                   | 2 +-
 .../mixerVesselAMI2D/constant/thermophysicalProperties.gas      | 2 +-
 .../mixerVesselAMI2D/constant/thermophysicalProperties.liquid   | 2 +-
 .../mixerVesselAMI2D/constant/thermophysicalProperties.mercury  | 2 +-
 .../mixerVesselAMI2D/constant/thermophysicalProperties.oil      | 2 +-
 .../mixerVesselAMI2D/constant/turbulenceProperties              | 2 +-
 .../mixerVesselAMI2D/system/blockMeshDict.m4                    | 2 +-
 .../mixerVesselAMI2D/system/controlDict                         | 2 +-
 .../mixerVesselAMI2D/system/decomposeParDict                    | 2 +-
 .../mixerVesselAMI2D/system/fvSchemes                           | 2 +-
 .../mixerVesselAMI2D/system/fvSolution                          | 2 +-
 .../mixerVesselAMI2D/system/setFieldsDict                       | 2 +-
 .../mixerVesselAMI2D/system/topoSetDict                         | 2 +-
 .../icoReactingMultiphaseInterFoam/oxideFormation/0.orig/T      | 2 +-
 .../icoReactingMultiphaseInterFoam/oxideFormation/0.orig/U      | 2 +-
 .../oxideFormation/0.orig/alpha.gas                             | 2 +-
 .../oxideFormation/0.orig/alpha.liquid                          | 2 +-
 .../oxideFormation/0.orig/alpha.oxide                           | 2 +-
 .../icoReactingMultiphaseInterFoam/oxideFormation/0.orig/p_rgh  | 2 +-
 .../icoReactingMultiphaseInterFoam/oxideFormation/constant/g    | 2 +-
 .../oxideFormation/constant/phaseProperties                     | 2 +-
 .../oxideFormation/constant/thermophysicalProperties.gas        | 2 +-
 .../oxideFormation/constant/thermophysicalProperties.liquid     | 2 +-
 .../oxideFormation/constant/thermophysicalProperties.oxide      | 2 +-
 .../oxideFormation/constant/turbulenceProperties                | 2 +-
 .../oxideFormation/system/blockMeshDict                         | 2 +-
 .../oxideFormation/system/controlDict                           | 2 +-
 .../oxideFormation/system/decomposeParDict                      | 2 +-
 .../oxideFormation/system/fvSchemes                             | 2 +-
 .../oxideFormation/system/fvSolution                            | 2 +-
 .../icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/T     | 2 +-
 .../icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/U     | 2 +-
 .../poolEvaporation/0.orig/air.gas                              | 2 +-
 .../poolEvaporation/0.orig/alpha.gas                            | 2 +-
 .../poolEvaporation/0.orig/alpha.liquid                         | 2 +-
 .../icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/p_rgh | 2 +-
 .../poolEvaporation/0.orig/vapour.gas                           | 2 +-
 .../icoReactingMultiphaseInterFoam/poolEvaporation/constant/g   | 2 +-
 .../poolEvaporation/constant/phaseProperties                    | 2 +-
 .../poolEvaporation/constant/thermophysicalProperties.gas       | 2 +-
 .../poolEvaporation/constant/thermophysicalProperties.liquid    | 2 +-
 .../poolEvaporation/constant/turbulenceProperties               | 2 +-
 .../poolEvaporation/system/blockMeshDict                        | 2 +-
 .../poolEvaporation/system/controlDict                          | 2 +-
 .../poolEvaporation/system/decomposeParDict                     | 2 +-
 .../poolEvaporation/system/fvSchemes                            | 2 +-
 .../poolEvaporation/system/fvSolution                           | 2 +-
 .../poolEvaporation/system/setFieldsDict                        | 2 +-
 .../poolEvaporationMultiComponent/0.orig/T                      | 2 +-
 .../poolEvaporationMultiComponent/0.orig/U                      | 2 +-
 .../poolEvaporationMultiComponent/0.orig/air.gas                | 2 +-
 .../poolEvaporationMultiComponent/0.orig/alpha.gas              | 2 +-
 .../poolEvaporationMultiComponent/0.orig/alpha.liquid           | 2 +-
 .../poolEvaporationMultiComponent/0.orig/alphat                 | 2 +-
 .../poolEvaporationMultiComponent/0.orig/epsilon                | 2 +-
 .../poolEvaporationMultiComponent/0.orig/k                      | 2 +-
 .../poolEvaporationMultiComponent/0.orig/nut                    | 2 +-
 .../poolEvaporationMultiComponent/0.orig/p                      | 2 +-
 .../poolEvaporationMultiComponent/0.orig/p_rgh                  | 2 +-
 .../poolEvaporationMultiComponent/0.orig/vapour.gas             | 2 +-
 .../poolEvaporationMultiComponent/constant/g                    | 2 +-
 .../poolEvaporationMultiComponent/constant/phaseProperties      | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../poolEvaporationMultiComponent/constant/turbulenceProperties | 2 +-
 .../poolEvaporationMultiComponent/system/blockMeshDict          | 2 +-
 .../poolEvaporationMultiComponent/system/controlDict            | 2 +-
 .../poolEvaporationMultiComponent/system/decomposeParDict       | 2 +-
 .../poolEvaporationMultiComponent/system/fvSchemes              | 2 +-
 .../poolEvaporationMultiComponent/system/fvSolution             | 2 +-
 .../poolEvaporationMultiComponent/system/setFieldsDict          | 2 +-
 .../icoReactingMultiphaseInterFoam/solidMelting2D/0/T           | 2 +-
 .../icoReactingMultiphaseInterFoam/solidMelting2D/0/U           | 2 +-
 .../solidMelting2D/0/alpha.liquid                               | 2 +-
 .../icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.solid | 2 +-
 .../icoReactingMultiphaseInterFoam/solidMelting2D/0/p_rgh       | 2 +-
 .../icoReactingMultiphaseInterFoam/solidMelting2D/constant/g    | 2 +-
 .../solidMelting2D/constant/phaseProperties                     | 2 +-
 .../solidMelting2D/constant/thermophysicalProperties.liquid     | 2 +-
 .../solidMelting2D/constant/thermophysicalProperties.solid      | 2 +-
 .../solidMelting2D/constant/turbulenceProperties                | 2 +-
 .../solidMelting2D/system/blockMeshDict                         | 2 +-
 .../solidMelting2D/system/controlDict                           | 2 +-
 .../solidMelting2D/system/fvSchemes                             | 2 +-
 .../solidMelting2D/system/fvSolution                            | 2 +-
 .../condensatingVessel/0.orig/T                                 | 2 +-
 .../condensatingVessel/0.orig/U                                 | 2 +-
 .../condensatingVessel/0.orig/alpha.liquid                      | 2 +-
 .../condensatingVessel/0.orig/epsilon                           | 2 +-
 .../condensatingVessel/0.orig/k                                 | 2 +-
 .../condensatingVessel/0.orig/nut                               | 2 +-
 .../condensatingVessel/0.orig/omega                             | 2 +-
 .../condensatingVessel/0.orig/p                                 | 2 +-
 .../condensatingVessel/0.orig/p_rgh                             | 2 +-
 .../condensatingVessel/constant/g                               | 2 +-
 .../condensatingVessel/constant/phaseChangeProperties           | 2 +-
 .../condensatingVessel/constant/thermophysicalProperties        | 2 +-
 .../condensatingVessel/constant/transportProperties             | 2 +-
 .../condensatingVessel/constant/turbulenceProperties            | 2 +-
 .../condensatingVessel/system/blockMeshDict                     | 2 +-
 .../condensatingVessel/system/controlDict                       | 2 +-
 .../condensatingVessel/system/fvSchemes                         | 2 +-
 .../condensatingVessel/system/fvSolution                        | 2 +-
 tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U        | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel     | 2 +-
 tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k        | 2 +-
 tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda  | 2 +-
 tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut      | 2 +-
 tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh    | 2 +-
 tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g      | 2 +-
 .../interFoam/LES/nozzleFlow2D/constant/transportProperties     | 2 +-
 .../interFoam/LES/nozzleFlow2D/constant/turbulenceProperties    | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict  | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/controlDict    | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes      | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution     | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1  | 2 +-
 .../multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2  | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U             | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water   | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k             | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut           | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega         | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh         | 2 +-
 .../multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement   | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/constant/g           | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef        | 2 +-
 .../interFoam/RAS/DTCHull/constant/transportProperties          | 2 +-
 .../interFoam/RAS/DTCHull/constant/turbulenceProperties         | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict   | 2 +-
 .../multiphase/interFoam/RAS/DTCHull/system/decomposeParDict    | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes     | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution    | 2 +-
 .../multiphase/interFoam/RAS/DTCHull/system/meshQualityDict     | 2 +-
 .../multiphase/interFoam/RAS/DTCHull/system/refineMeshDict      | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict | 2 +-
 .../multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict   | 2 +-
 .../interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict      | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U       | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water   | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k       | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut     | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega   | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh   | 2 +-
 .../interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement        | 2 +-
 .../interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict        | 2 +-
 .../interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g     | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef  | 2 +-
 .../interFoam/RAS/DTCHullMoving/constant/transportProperties    | 2 +-
 .../interFoam/RAS/DTCHullMoving/constant/turbulenceProperties   | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/controlDict   | 2 +-
 .../interFoam/RAS/DTCHullMoving/system/decomposeParDict         | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes     | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution    | 2 +-
 .../interFoam/RAS/DTCHullMoving/system/meshQualityDict          | 2 +-
 .../interFoam/RAS/DTCHullMoving/system/refineMeshDict           | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict | 2 +-
 .../interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict        | 2 +-
 .../RAS/DTCHullMoving/system/surfaceFeatureExtractDict          | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 | 2 +-
 .../multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U          | 2 +-
 .../multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water      | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/epsilon    | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/k          | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/nut        | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh      | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/s          | 2 +-
 .../multiphase/interFoam/RAS/angledDuct/constant/fvOptions      | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/constant/g        | 2 +-
 .../interFoam/RAS/angledDuct/constant/transportProperties       | 2 +-
 .../interFoam/RAS/angledDuct/constant/turbulenceProperties      | 2 +-
 .../multiphase/interFoam/RAS/angledDuct/system/blockMeshDict    | 2 +-
 .../multiphase/interFoam/RAS/angledDuct/system/controlDict      | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes  | 2 +-
 tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution | 2 +-
 tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/U   | 2 +-
 .../interFoam/RAS/damBreak/damBreak/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/RAS/damBreak/damBreak/0.orig/epsilon   | 2 +-
 tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/k   | 2 +-
 .../multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda   | 2 +-
 tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nut | 2 +-
 .../multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g | 2 +-
 .../RAS/damBreak/damBreak/constant/transportProperties          | 2 +-
 .../RAS/damBreak/damBreak/constant/turbulenceProperties         | 2 +-
 .../interFoam/RAS/damBreak/damBreak/system/blockMeshDict        | 2 +-
 .../interFoam/RAS/damBreak/damBreak/system/controlDict          | 2 +-
 .../interFoam/RAS/damBreak/damBreak/system/decomposeParDict     | 2 +-
 .../multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes | 2 +-
 .../interFoam/RAS/damBreak/damBreak/system/fvSolution           | 2 +-
 .../interFoam/RAS/damBreak/damBreak/system/setFieldsDict        | 2 +-
 .../multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/U      | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/0.orig/alpha.water       | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/0.orig/epsilon           | 2 +-
 .../multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/k      | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/0.orig/nuTilda           | 2 +-
 .../multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nut    | 2 +-
 .../multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/p_rgh  | 2 +-
 .../multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g    | 2 +-
 .../RAS/damBreakPorousBaffle/constant/transportProperties       | 2 +-
 .../RAS/damBreakPorousBaffle/constant/turbulenceProperties      | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict     | 2 +-
 .../RAS/damBreakPorousBaffle/system/changeDictionaryDict        | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/system/controlDict       | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/system/fvSchemes         | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/system/fvSolution        | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict     | 2 +-
 .../interFoam/RAS/damBreakPorousBaffle/system/topoSetDict       | 2 +-
 .../multiphase/interFoam/RAS/electrostaticDeposition/0.orig/U   | 2 +-
 .../interFoam/RAS/electrostaticDeposition/0.orig/alpha.water    | 2 +-
 .../RAS/electrostaticDeposition/0.orig/electricPotential:V      | 2 +-
 .../multiphase/interFoam/RAS/electrostaticDeposition/0.orig/k   | 2 +-
 .../multiphase/interFoam/RAS/electrostaticDeposition/0.orig/nut | 2 +-
 .../interFoam/RAS/electrostaticDeposition/0.orig/omega          | 2 +-
 .../interFoam/RAS/electrostaticDeposition/0.orig/p_rgh          | 2 +-
 .../RAS/electrostaticDeposition/constant/dynamicMeshDict        | 2 +-
 .../multiphase/interFoam/RAS/electrostaticDeposition/constant/g | 2 +-
 .../interFoam/RAS/electrostaticDeposition/constant/hRef         | 2 +-
 .../RAS/electrostaticDeposition/constant/transportProperties    | 2 +-
 .../RAS/electrostaticDeposition/constant/turbulenceProperties   | 2 +-
 .../RAS/electrostaticDeposition/system/FOelectricPotential      | 2 +-
 .../interFoam/RAS/electrostaticDeposition/system/blockMeshDict  | 2 +-
 .../interFoam/RAS/electrostaticDeposition/system/controlDict    | 2 +-
 .../RAS/electrostaticDeposition/system/decomposeParDict         | 2 +-
 .../interFoam/RAS/electrostaticDeposition/system/fvSchemes      | 2 +-
 .../interFoam/RAS/electrostaticDeposition/system/fvSolution     | 2 +-
 .../RAS/electrostaticDeposition/system/meshQualityDict          | 2 +-
 .../interFoam/RAS/electrostaticDeposition/system/setFieldsDict  | 2 +-
 .../RAS/electrostaticDeposition/system/snappyHexMeshDict        | 2 +-
 tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U      | 2 +-
 .../multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water  | 2 +-
 .../multiphase/interFoam/RAS/floatingObject/0.orig/epsilon      | 2 +-
 tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k      | 2 +-
 tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut    | 2 +-
 tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh  | 2 +-
 .../interFoam/RAS/floatingObject/0.orig/pointDisplacement       | 2 +-
 .../interFoam/RAS/floatingObject/constant/dynamicMeshDict       | 2 +-
 .../RAS/floatingObject/constant/dynamicMeshDict.sixDoF          | 2 +-
 tutorials/multiphase/interFoam/RAS/floatingObject/constant/g    | 2 +-
 .../interFoam/RAS/floatingObject/constant/transportProperties   | 2 +-
 .../interFoam/RAS/floatingObject/constant/turbulenceProperties  | 2 +-
 .../interFoam/RAS/floatingObject/system/blockMeshDict           | 2 +-
 .../multiphase/interFoam/RAS/floatingObject/system/controlDict  | 2 +-
 .../interFoam/RAS/floatingObject/system/decomposeParDict        | 2 +-
 .../multiphase/interFoam/RAS/floatingObject/system/fvSchemes    | 2 +-
 .../multiphase/interFoam/RAS/floatingObject/system/fvSolution   | 2 +-
 .../interFoam/RAS/floatingObject/system/setFieldsDict           | 2 +-
 .../multiphase/interFoam/RAS/floatingObject/system/topoSetDict  | 2 +-
 tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U      | 2 +-
 .../multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water  | 2 +-
 .../multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon      | 2 +-
 tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k      | 2 +-
 tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut    | 2 +-
 tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh  | 2 +-
 .../interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict       | 2 +-
 tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g    | 2 +-
 .../interFoam/RAS/mixerVesselAMI/constant/transportProperties   | 2 +-
 .../interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties  | 2 +-
 .../interFoam/RAS/mixerVesselAMI/system/blockMeshDict           | 2 +-
 .../multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict  | 2 +-
 .../interFoam/RAS/mixerVesselAMI/system/createBafflesDict       | 2 +-
 .../interFoam/RAS/mixerVesselAMI/system/decomposeParDict        | 2 +-
 .../multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes    | 2 +-
 .../multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution   | 2 +-
 .../interFoam/RAS/mixerVesselAMI/system/setFieldsDict           | 2 +-
 .../RAS/mixerVesselAMI/system/surfaceFeatureExtractDict         | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/0.orig/U           | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k           | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/0.orig/nut         | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega       | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh       | 2 +-
 .../multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/constant/g         | 2 +-
 .../interFoam/RAS/motorBike/constant/transportProperties        | 2 +-
 .../interFoam/RAS/motorBike/constant/turbulenceProperties       | 2 +-
 .../multiphase/interFoam/RAS/motorBike/system/blockMeshDict     | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict | 2 +-
 .../interFoam/RAS/motorBike/system/controlDict_nextWrite        | 2 +-
 .../multiphase/interFoam/RAS/motorBike/system/controlDict_run   | 2 +-
 .../multiphase/interFoam/RAS/motorBike/system/decomposeParDict  | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes   | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution  | 2 +-
 .../multiphase/interFoam/RAS/motorBike/system/meshQualityDict   | 2 +-
 tutorials/multiphase/interFoam/RAS/motorBike/system/minMax      | 2 +-
 .../multiphase/interFoam/RAS/motorBike/system/setFieldsDict     | 2 +-
 .../multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict | 2 +-
 .../interFoam/RAS/motorBike/system/surfaceFeatureExtractDict    | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/U        | 2 +-
 .../multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water    | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k        | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/nut      | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega    | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh    | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s        | 2 +-
 tutorials/multiphase/interFoam/RAS/waterChannel/constant/g      | 2 +-
 .../interFoam/RAS/waterChannel/constant/transportProperties     | 2 +-
 .../interFoam/RAS/waterChannel/constant/turbulenceProperties    | 2 +-
 .../multiphase/interFoam/RAS/waterChannel/system/blockMeshDict  | 2 +-
 .../multiphase/interFoam/RAS/waterChannel/system/controlDict    | 2 +-
 .../interFoam/RAS/waterChannel/system/extrudeMeshDict           | 2 +-
 .../interFoam/RAS/waterChannel/system/extrudeMeshDict.1         | 2 +-
 .../interFoam/RAS/waterChannel/system/extrudeMeshDict.2         | 2 +-
 .../multiphase/interFoam/RAS/waterChannel/system/fvSchemes      | 2 +-
 .../multiphase/interFoam/RAS/waterChannel/system/fvSolution     | 2 +-
 .../multiphase/interFoam/RAS/waterChannel/system/setFieldsDict  | 2 +-
 tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U        | 2 +-
 .../multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water    | 2 +-
 tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon  | 2 +-
 .../interFoam/RAS/weirOverflow/0.orig/include/initialConditions | 2 +-
 tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k        | 2 +-
 tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut      | 2 +-
 tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh    | 2 +-
 tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g      | 2 +-
 .../interFoam/RAS/weirOverflow/constant/transportProperties     | 2 +-
 .../interFoam/RAS/weirOverflow/constant/turbulenceProperties    | 2 +-
 .../multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict  | 2 +-
 .../multiphase/interFoam/RAS/weirOverflow/system/controlDict    | 2 +-
 .../multiphase/interFoam/RAS/weirOverflow/system/fvSchemes      | 2 +-
 .../multiphase/interFoam/RAS/weirOverflow/system/fvSolution     | 2 +-
 .../multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict  | 2 +-
 tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/U   | 2 +-
 .../interFoam/laminar/capillaryRise/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/laminar/capillaryRise/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g | 2 +-
 .../laminar/capillaryRise/constant/transportProperties          | 2 +-
 .../laminar/capillaryRise/constant/turbulenceProperties         | 2 +-
 .../interFoam/laminar/capillaryRise/system/blockMeshDict        | 2 +-
 .../interFoam/laminar/capillaryRise/system/controlDict          | 2 +-
 .../multiphase/interFoam/laminar/capillaryRise/system/fvSchemes | 2 +-
 .../interFoam/laminar/capillaryRise/system/fvSolution           | 2 +-
 .../interFoam/laminar/capillaryRise/system/setFieldsDict        | 2 +-
 .../multiphase/interFoam/laminar/damBreak/damBreak/0.orig/U     | 2 +-
 .../interFoam/laminar/damBreak/damBreak/0.orig/alpha.water      | 2 +-
 .../multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh | 2 +-
 .../multiphase/interFoam/laminar/damBreak/damBreak/constant/g   | 2 +-
 .../laminar/damBreak/damBreak/constant/transportProperties      | 2 +-
 .../laminar/damBreak/damBreak/constant/turbulenceProperties     | 2 +-
 .../interFoam/laminar/damBreak/damBreak/system/blockMeshDict    | 2 +-
 .../interFoam/laminar/damBreak/damBreak/system/controlDict      | 2 +-
 .../interFoam/laminar/damBreak/damBreak/system/decomposeParDict | 2 +-
 .../interFoam/laminar/damBreak/damBreak/system/fvSchemes        | 2 +-
 .../interFoam/laminar/damBreak/damBreak/system/fvSolution       | 2 +-
 .../interFoam/laminar/damBreak/damBreak/system/setFieldsDict    | 2 +-
 .../multiphase/interFoam/laminar/damBreakPermeable/0.orig/U     | 2 +-
 .../interFoam/laminar/damBreakPermeable/0.orig/alpha.water      | 2 +-
 .../interFoam/laminar/damBreakPermeable/0.orig/epsilon          | 2 +-
 .../multiphase/interFoam/laminar/damBreakPermeable/0.orig/k     | 2 +-
 .../multiphase/interFoam/laminar/damBreakPermeable/0.orig/nut   | 2 +-
 .../multiphase/interFoam/laminar/damBreakPermeable/0.orig/p_rgh | 2 +-
 .../multiphase/interFoam/laminar/damBreakPermeable/constant/g   | 2 +-
 .../laminar/damBreakPermeable/constant/transportProperties      | 2 +-
 .../laminar/damBreakPermeable/constant/turbulenceProperties     | 2 +-
 .../interFoam/laminar/damBreakPermeable/system/blockMeshDict    | 2 +-
 .../interFoam/laminar/damBreakPermeable/system/controlDict      | 2 +-
 .../interFoam/laminar/damBreakPermeable/system/decomposeParDict | 2 +-
 .../interFoam/laminar/damBreakPermeable/system/fvSchemes        | 2 +-
 .../interFoam/laminar/damBreakPermeable/system/fvSolution       | 2 +-
 .../interFoam/laminar/damBreakPermeable/system/setFieldsDict    | 2 +-
 .../multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U  | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water   | 2 +-
 .../multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k  | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/0.orig/nut           | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/0.orig/omega         | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh         | 2 +-
 .../laminar/damBreakWithObstacle/constant/dynamicMeshDict       | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/constant/g           | 2 +-
 .../laminar/damBreakWithObstacle/constant/transportProperties   | 2 +-
 .../laminar/damBreakWithObstacle/constant/turbulenceProperties  | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/system/blockMeshDict | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/system/controlDict   | 2 +-
 .../laminar/damBreakWithObstacle/system/decomposeParDict        | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/system/fvSchemes     | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/system/fvSolution    | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/system/setFieldsDict | 2 +-
 .../interFoam/laminar/damBreakWithObstacle/system/topoSetDict   | 2 +-
 tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/U   | 2 +-
 .../interFoam/laminar/mixerVessel2D/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh     | 2 +-
 .../interFoam/laminar/mixerVessel2D/constant/MRFProperties      | 2 +-
 tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g | 2 +-
 .../laminar/mixerVessel2D/constant/transportProperties          | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties         | 2 +-
 .../interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4     | 2 +-
 .../interFoam/laminar/mixerVessel2D/system/controlDict          | 2 +-
 .../multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes | 2 +-
 .../interFoam/laminar/mixerVessel2D/system/fvSolution           | 2 +-
 .../interFoam/laminar/mixerVessel2D/system/setFieldsDict        | 2 +-
 .../interFoam/laminar/mixerVessel2D/system/topoSetDict          | 2 +-
 tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/U  | 2 +-
 .../interFoam/laminar/oscillatingBox/0.orig/alpha.water         | 2 +-
 .../multiphase/interFoam/laminar/oscillatingBox/0.orig/nut      | 2 +-
 .../multiphase/interFoam/laminar/oscillatingBox/0.orig/p_rgh    | 2 +-
 .../interFoam/laminar/oscillatingBox/constant/dynamicMeshDict   | 2 +-
 .../multiphase/interFoam/laminar/oscillatingBox/constant/g      | 2 +-
 .../laminar/oscillatingBox/constant/transportProperties         | 2 +-
 .../laminar/oscillatingBox/constant/turbulenceProperties        | 2 +-
 .../interFoam/laminar/oscillatingBox/system/blockMeshDict       | 2 +-
 .../interFoam/laminar/oscillatingBox/system/controlDict         | 2 +-
 .../interFoam/laminar/oscillatingBox/system/decomposeParDict    | 2 +-
 .../interFoam/laminar/oscillatingBox/system/fvSchemes           | 2 +-
 .../interFoam/laminar/oscillatingBox/system/fvSolution          | 2 +-
 .../interFoam/laminar/oscillatingBox/system/setFieldsDict       | 2 +-
 .../interFoam/laminar/oscillatingBox/system/topoSetDict         | 2 +-
 .../multiphase/interFoam/laminar/sloshingCylinder/0.orig/U      | 2 +-
 .../interFoam/laminar/sloshingCylinder/0.orig/alpha.water       | 2 +-
 .../multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh  | 2 +-
 .../interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict | 2 +-
 .../multiphase/interFoam/laminar/sloshingCylinder/constant/g    | 2 +-
 .../laminar/sloshingCylinder/constant/transportProperties       | 2 +-
 .../laminar/sloshingCylinder/constant/turbulenceProperties      | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/blockMeshDict     | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/controlDict       | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/decomposeParDict  | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/fvSchemes         | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/fvSolution        | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/meshQualityDict   | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/setFieldsDict     | 2 +-
 .../interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict | 2 +-
 tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U  | 2 +-
 .../interFoam/laminar/sloshingTank2D/0.orig/alpha.water         | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh    | 2 +-
 .../interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict   | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank2D/constant/g      | 2 +-
 .../laminar/sloshingTank2D/constant/transportProperties         | 2 +-
 .../laminar/sloshingTank2D/constant/turbulenceProperties        | 2 +-
 .../interFoam/laminar/sloshingTank2D/system/blockMeshDict.m4    | 2 +-
 .../interFoam/laminar/sloshingTank2D/system/controlDict         | 2 +-
 .../interFoam/laminar/sloshingTank2D/system/decomposeParDict    | 2 +-
 .../interFoam/laminar/sloshingTank2D/system/fvSchemes           | 2 +-
 .../interFoam/laminar/sloshingTank2D/system/fvSolution          | 2 +-
 .../interFoam/laminar/sloshingTank2D/system/setFieldsDict       | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U    | 2 +-
 .../interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water     | 2 +-
 .../interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh           | 2 +-
 .../laminar/sloshingTank2D3DoF/constant/dynamicMeshDict         | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g  | 2 +-
 .../laminar/sloshingTank2D3DoF/constant/transportProperties     | 2 +-
 .../laminar/sloshingTank2D3DoF/constant/turbulenceProperties    | 2 +-
 .../laminar/sloshingTank2D3DoF/system/blockMeshDict.m4          | 2 +-
 .../interFoam/laminar/sloshingTank2D3DoF/system/controlDict     | 2 +-
 .../laminar/sloshingTank2D3DoF/system/decomposeParDict          | 2 +-
 .../interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes       | 2 +-
 .../interFoam/laminar/sloshingTank2D3DoF/system/fvSolution      | 2 +-
 .../interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict   | 2 +-
 tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U  | 2 +-
 .../interFoam/laminar/sloshingTank3D/0.orig/alpha.water         | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh    | 2 +-
 .../interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict   | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank3D/constant/g      | 2 +-
 .../laminar/sloshingTank3D/constant/transportProperties         | 2 +-
 .../laminar/sloshingTank3D/constant/turbulenceProperties        | 2 +-
 .../interFoam/laminar/sloshingTank3D/system/blockMeshDict.m4    | 2 +-
 .../interFoam/laminar/sloshingTank3D/system/controlDict         | 2 +-
 .../interFoam/laminar/sloshingTank3D/system/decomposeParDict    | 2 +-
 .../interFoam/laminar/sloshingTank3D/system/fvSchemes           | 2 +-
 .../interFoam/laminar/sloshingTank3D/system/fvSolution          | 2 +-
 .../interFoam/laminar/sloshingTank3D/system/setFieldsDict       | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U    | 2 +-
 .../interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water     | 2 +-
 .../interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh           | 2 +-
 .../laminar/sloshingTank3D3DoF/constant/dynamicMeshDict         | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g  | 2 +-
 .../laminar/sloshingTank3D3DoF/constant/transportProperties     | 2 +-
 .../laminar/sloshingTank3D3DoF/constant/turbulenceProperties    | 2 +-
 .../laminar/sloshingTank3D3DoF/system/blockMeshDict.m4          | 2 +-
 .../interFoam/laminar/sloshingTank3D3DoF/system/controlDict     | 2 +-
 .../laminar/sloshingTank3D3DoF/system/decomposeParDict          | 2 +-
 .../interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes       | 2 +-
 .../interFoam/laminar/sloshingTank3D3DoF/system/fvSolution      | 2 +-
 .../interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict   | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U    | 2 +-
 .../interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water     | 2 +-
 .../interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh           | 2 +-
 .../laminar/sloshingTank3D6DoF/constant/dynamicMeshDict         | 2 +-
 .../multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g  | 2 +-
 .../laminar/sloshingTank3D6DoF/constant/transportProperties     | 2 +-
 .../laminar/sloshingTank3D6DoF/constant/turbulenceProperties    | 2 +-
 .../laminar/sloshingTank3D6DoF/system/blockMeshDict.m4          | 2 +-
 .../interFoam/laminar/sloshingTank3D6DoF/system/controlDict     | 2 +-
 .../laminar/sloshingTank3D6DoF/system/decomposeParDict          | 2 +-
 .../interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes       | 2 +-
 .../interFoam/laminar/sloshingTank3D6DoF/system/fvSolution      | 2 +-
 .../interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict   | 2 +-
 tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U   | 2 +-
 .../interFoam/laminar/testTubeMixer/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh     | 2 +-
 .../interFoam/laminar/testTubeMixer/constant/dynamicMeshDict    | 2 +-
 tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g | 2 +-
 .../laminar/testTubeMixer/constant/transportProperties          | 2 +-
 .../laminar/testTubeMixer/constant/turbulenceProperties         | 2 +-
 .../interFoam/laminar/testTubeMixer/system/blockMeshDict        | 2 +-
 .../interFoam/laminar/testTubeMixer/system/controlDict          | 2 +-
 .../interFoam/laminar/testTubeMixer/system/decomposeParDict     | 2 +-
 .../multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes | 2 +-
 .../interFoam/laminar/testTubeMixer/system/fvSolution           | 2 +-
 .../interFoam/laminar/testTubeMixer/system/setFieldsDict        | 2 +-
 .../laminar/vofToLagrangian/eulerianInjection/0.orig/U          | 2 +-
 .../vofToLagrangian/eulerianInjection/0.orig/alpha.water        | 2 +-
 .../laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh      | 2 +-
 .../laminar/vofToLagrangian/eulerianInjection/constant/g        | 2 +-
 .../eulerianInjection/constant/transportProperties              | 2 +-
 .../eulerianInjection/constant/turbulenceProperties             | 2 +-
 .../vofToLagrangian/eulerianInjection/system/blockMeshDict      | 2 +-
 .../vofToLagrangian/eulerianInjection/system/controlDict        | 2 +-
 .../vofToLagrangian/eulerianInjection/system/decomposeParDict   | 2 +-
 .../laminar/vofToLagrangian/eulerianInjection/system/fvSchemes  | 2 +-
 .../laminar/vofToLagrangian/eulerianInjection/system/fvSolution | 2 +-
 .../vofToLagrangian/eulerianInjection/system/setFieldsDict      | 2 +-
 .../eulerianInjection/system/topoSetDict.createBlockage         | 2 +-
 .../eulerianInjection/system/topoSetDict.createCollector        | 2 +-
 .../eulerianInjection/system/topoSetDict.createPatch            | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/N2   | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/O2   | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/T    | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/U    | 2 +-
 .../lagrangianDistributionInjection/0.orig/Ydefault             | 2 +-
 .../lagrangianDistributionInjection/0.orig/alphat               | 2 +-
 .../lagrangianDistributionInjection/0.orig/epsilon              | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/k    | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/nut  | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/0.orig/p    | 2 +-
 .../constant/chemistryProperties                                | 2 +-
 .../constant/combustionProperties                               | 2 +-
 .../vofToLagrangian/lagrangianDistributionInjection/constant/g  | 2 +-
 .../constant/radiationProperties                                | 2 +-
 .../constant/sprayCloudProperties                               | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../lagrangianDistributionInjection/system/blockMeshDict        | 2 +-
 .../lagrangianDistributionInjection/system/controlDict          | 2 +-
 .../lagrangianDistributionInjection/system/decomposeParDict     | 2 +-
 .../lagrangianDistributionInjection/system/fvSchemes            | 2 +-
 .../lagrangianDistributionInjection/system/fvSolution           | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/N2       | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/O2       | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/T        | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/U        | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/alphat   | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon  | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/k        | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/nut      | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/0.orig/p        | 2 +-
 .../lagrangianParticleInjection/constant/chemistryProperties    | 2 +-
 .../lagrangianParticleInjection/constant/combustionProperties   | 2 +-
 .../vofToLagrangian/lagrangianParticleInjection/constant/g      | 2 +-
 .../lagrangianParticleInjection/constant/radiationProperties    | 2 +-
 .../lagrangianParticleInjection/constant/sprayCloudProperties   | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../lagrangianParticleInjection/constant/turbulenceProperties   | 2 +-
 .../lagrangianParticleInjection/system/blockMeshDict            | 2 +-
 .../lagrangianParticleInjection/system/controlDict              | 2 +-
 .../lagrangianParticleInjection/system/decomposeParDict         | 2 +-
 .../lagrangianParticleInjection/system/fvSchemes                | 2 +-
 .../lagrangianParticleInjection/system/fvSolution               | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U   | 2 +-
 .../interFoam/laminar/waves/cnoidal/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g | 2 +-
 .../laminar/waves/cnoidal/constant/transportProperties          | 2 +-
 .../laminar/waves/cnoidal/constant/turbulenceProperties         | 2 +-
 .../interFoam/laminar/waves/cnoidal/constant/waveProperties     | 2 +-
 .../interFoam/laminar/waves/cnoidal/system/blockMeshDict        | 2 +-
 .../interFoam/laminar/waves/cnoidal/system/controlDict          | 2 +-
 .../interFoam/laminar/waves/cnoidal/system/decomposeParDict     | 2 +-
 .../multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes | 2 +-
 .../interFoam/laminar/waves/cnoidal/system/fvSolution           | 2 +-
 .../interFoam/laminar/waves/cnoidal/system/setFieldsDict        | 2 +-
 .../interFoam/laminar/waves/irregularMultiDirection/0.orig/U    | 2 +-
 .../laminar/waves/irregularMultiDirection/0.orig/alpha.water    | 2 +-
 .../laminar/waves/irregularMultiDirection/0.orig/p_rgh          | 2 +-
 .../interFoam/laminar/waves/irregularMultiDirection/constant/g  | 2 +-
 .../waves/irregularMultiDirection/constant/transportProperties  | 2 +-
 .../waves/irregularMultiDirection/constant/turbulenceProperties | 2 +-
 .../waves/irregularMultiDirection/constant/waveProperties       | 2 +-
 .../laminar/waves/irregularMultiDirection/system/blockMeshDict  | 2 +-
 .../laminar/waves/irregularMultiDirection/system/controlDict    | 2 +-
 .../waves/irregularMultiDirection/system/decomposeParDict       | 2 +-
 .../laminar/waves/irregularMultiDirection/system/fvSchemes      | 2 +-
 .../laminar/waves/irregularMultiDirection/system/fvSolution     | 2 +-
 .../laminar/waves/irregularMultiDirection/system/setFieldsDict  | 2 +-
 .../laminar/waves/mangroveInteraction/0.orig/MangrovesIndex     | 2 +-
 .../interFoam/laminar/waves/mangroveInteraction/0.orig/U        | 2 +-
 .../laminar/waves/mangroveInteraction/0.orig/alpha.water        | 2 +-
 .../interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon  | 2 +-
 .../interFoam/laminar/waves/mangroveInteraction/0.orig/k        | 2 +-
 .../interFoam/laminar/waves/mangroveInteraction/0.orig/nut      | 2 +-
 .../interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh    | 2 +-
 .../interFoam/laminar/waves/mangroveInteraction/constant/g      | 2 +-
 .../waves/mangroveInteraction/constant/transportProperties      | 2 +-
 .../waves/mangroveInteraction/constant/turbulenceProperties     | 2 +-
 .../laminar/waves/mangroveInteraction/constant/waveProperties   | 2 +-
 .../laminar/waves/mangroveInteraction/system/blockMeshDict      | 2 +-
 .../laminar/waves/mangroveInteraction/system/controlDict        | 2 +-
 .../laminar/waves/mangroveInteraction/system/decomposeParDict   | 2 +-
 .../laminar/waves/mangroveInteraction/system/fvOptions          | 2 +-
 .../laminar/waves/mangroveInteraction/system/fvSchemes          | 2 +-
 .../laminar/waves/mangroveInteraction/system/fvSolution         | 2 +-
 .../laminar/waves/mangroveInteraction/system/setFieldsDict      | 2 +-
 .../laminar/waves/mangroveInteraction/system/topoSetDict        | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U  | 2 +-
 .../interFoam/laminar/waves/solitary/0.orig/alpha.water         | 2 +-
 .../multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh    | 2 +-
 .../multiphase/interFoam/laminar/waves/solitary/constant/g      | 2 +-
 .../laminar/waves/solitary/constant/transportProperties         | 2 +-
 .../laminar/waves/solitary/constant/turbulenceProperties        | 2 +-
 .../interFoam/laminar/waves/solitary/constant/waveProperties    | 2 +-
 .../interFoam/laminar/waves/solitary/system/blockMeshDict       | 2 +-
 .../interFoam/laminar/waves/solitary/system/controlDict         | 2 +-
 .../interFoam/laminar/waves/solitary/system/decomposeParDict    | 2 +-
 .../interFoam/laminar/waves/solitary/system/fvSchemes           | 2 +-
 .../interFoam/laminar/waves/solitary/system/fvSolution          | 2 +-
 .../interFoam/laminar/waves/solitary/system/setFieldsDict       | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/0.orig/U           | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh       | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/constant/g         | 2 +-
 .../laminar/waves/solitaryGrimshaw/constant/transportProperties | 2 +-
 .../waves/solitaryGrimshaw/constant/turbulenceProperties        | 2 +-
 .../laminar/waves/solitaryGrimshaw/constant/waveProperties      | 2 +-
 .../laminar/waves/solitaryGrimshaw/system/blockMeshDict         | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/system/controlDict | 2 +-
 .../laminar/waves/solitaryGrimshaw/system/decomposeParDict      | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes   | 2 +-
 .../interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution  | 2 +-
 .../laminar/waves/solitaryGrimshaw/system/setFieldsDict         | 2 +-
 .../multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U | 2 +-
 .../interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water  | 2 +-
 .../interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh        | 2 +-
 .../interFoam/laminar/waves/solitaryMcCowan/constant/g          | 2 +-
 .../laminar/waves/solitaryMcCowan/constant/transportProperties  | 2 +-
 .../laminar/waves/solitaryMcCowan/constant/turbulenceProperties | 2 +-
 .../laminar/waves/solitaryMcCowan/constant/waveProperties       | 2 +-
 .../laminar/waves/solitaryMcCowan/system/blockMeshDict          | 2 +-
 .../interFoam/laminar/waves/solitaryMcCowan/system/controlDict  | 2 +-
 .../laminar/waves/solitaryMcCowan/system/decomposeParDict       | 2 +-
 .../interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes    | 2 +-
 .../interFoam/laminar/waves/solitaryMcCowan/system/fvSolution   | 2 +-
 .../laminar/waves/solitaryMcCowan/system/setFieldsDict          | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U   | 2 +-
 .../interFoam/laminar/waves/stokesI/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g | 2 +-
 .../laminar/waves/stokesI/constant/transportProperties          | 2 +-
 .../laminar/waves/stokesI/constant/turbulenceProperties         | 2 +-
 .../interFoam/laminar/waves/stokesI/constant/waveProperties     | 2 +-
 .../interFoam/laminar/waves/stokesI/system/blockMeshDict        | 2 +-
 .../interFoam/laminar/waves/stokesI/system/controlDict          | 2 +-
 .../interFoam/laminar/waves/stokesI/system/decomposeParDict     | 2 +-
 .../multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes | 2 +-
 .../interFoam/laminar/waves/stokesI/system/fvSolution           | 2 +-
 .../interFoam/laminar/waves/stokesI/system/setFieldsDict        | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U  | 2 +-
 .../interFoam/laminar/waves/stokesII/0.orig/alpha.water         | 2 +-
 .../multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh    | 2 +-
 .../multiphase/interFoam/laminar/waves/stokesII/constant/g      | 2 +-
 .../laminar/waves/stokesII/constant/transportProperties         | 2 +-
 .../laminar/waves/stokesII/constant/turbulenceProperties        | 2 +-
 .../interFoam/laminar/waves/stokesII/constant/waveProperties    | 2 +-
 .../interFoam/laminar/waves/stokesII/system/blockMeshDict       | 2 +-
 .../interFoam/laminar/waves/stokesII/system/controlDict         | 2 +-
 .../interFoam/laminar/waves/stokesII/system/decomposeParDict    | 2 +-
 .../interFoam/laminar/waves/stokesII/system/fvSchemes           | 2 +-
 .../interFoam/laminar/waves/stokesII/system/fvSolution          | 2 +-
 .../interFoam/laminar/waves/stokesII/system/setFieldsDict       | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U   | 2 +-
 .../interFoam/laminar/waves/stokesV/0.orig/alpha.water          | 2 +-
 .../multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g | 2 +-
 .../laminar/waves/stokesV/constant/transportProperties          | 2 +-
 .../laminar/waves/stokesV/constant/turbulenceProperties         | 2 +-
 .../interFoam/laminar/waves/stokesV/constant/waveProperties     | 2 +-
 .../interFoam/laminar/waves/stokesV/system/blockMeshDict        | 2 +-
 .../interFoam/laminar/waves/stokesV/system/controlDict          | 2 +-
 .../interFoam/laminar/waves/stokesV/system/decomposeParDict     | 2 +-
 .../multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes | 2 +-
 .../interFoam/laminar/waves/stokesV/system/fvSolution           | 2 +-
 .../interFoam/laminar/waves/stokesV/system/setFieldsDict        | 2 +-
 .../multiphase/interFoam/laminar/waves/streamFunction/0.orig/U  | 2 +-
 .../interFoam/laminar/waves/streamFunction/0.orig/alpha.water   | 2 +-
 .../interFoam/laminar/waves/streamFunction/0.orig/p_rgh         | 2 +-
 .../interFoam/laminar/waves/streamFunction/constant/g           | 2 +-
 .../laminar/waves/streamFunction/constant/transportProperties   | 2 +-
 .../laminar/waves/streamFunction/constant/turbulenceProperties  | 2 +-
 .../laminar/waves/streamFunction/constant/waveProperties        | 2 +-
 .../interFoam/laminar/waves/streamFunction/system/blockMeshDict | 2 +-
 .../interFoam/laminar/waves/streamFunction/system/controlDict   | 2 +-
 .../laminar/waves/streamFunction/system/decomposeParDict        | 2 +-
 .../interFoam/laminar/waves/streamFunction/system/fvSchemes     | 2 +-
 .../interFoam/laminar/waves/streamFunction/system/fvSolution    | 2 +-
 .../interFoam/laminar/waves/streamFunction/system/setFieldsDict | 2 +-
 .../multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U   | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water    | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh          | 2 +-
 .../laminar/waves/waveMakerFlap/0.orig/pointDisplacement        | 2 +-
 .../laminar/waves/waveMakerFlap/constant/dynamicMeshDict        | 2 +-
 .../multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g | 2 +-
 .../laminar/waves/waveMakerFlap/constant/transportProperties    | 2 +-
 .../laminar/waves/waveMakerFlap/constant/turbulenceProperties   | 2 +-
 .../laminar/waves/waveMakerFlap/constant/waveProperties         | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict  | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/system/controlDict    | 2 +-
 .../laminar/waves/waveMakerFlap/system/decomposeParDict         | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/system/fvSchemes      | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/system/fvSolution     | 2 +-
 .../interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict  | 2 +-
 .../interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U   | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water   | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh         | 2 +-
 .../waves/waveMakerMultiPaddleFlap/0.orig/pointDisplacement     | 2 +-
 .../waves/waveMakerMultiPaddleFlap/constant/dynamicMeshDict     | 2 +-
 .../interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g | 2 +-
 .../waves/waveMakerMultiPaddleFlap/constant/transportProperties | 2 +-
 .../waveMakerMultiPaddleFlap/constant/turbulenceProperties      | 2 +-
 .../waves/waveMakerMultiPaddleFlap/constant/waveProperties      | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/system/controlDict   | 2 +-
 .../waves/waveMakerMultiPaddleFlap/system/decomposeParDict      | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes     | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution    | 2 +-
 .../laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict | 2 +-
 .../interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U | 2 +-
 .../laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water | 2 +-
 .../laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh       | 2 +-
 .../waves/waveMakerMultiPaddlePiston/0.orig/pointDisplacement   | 2 +-
 .../waves/waveMakerMultiPaddlePiston/constant/dynamicMeshDict   | 2 +-
 .../laminar/waves/waveMakerMultiPaddlePiston/constant/g         | 2 +-
 .../waveMakerMultiPaddlePiston/constant/transportProperties     | 2 +-
 .../waveMakerMultiPaddlePiston/constant/turbulenceProperties    | 2 +-
 .../waves/waveMakerMultiPaddlePiston/constant/waveProperties    | 2 +-
 .../waves/waveMakerMultiPaddlePiston/system/blockMeshDict       | 2 +-
 .../laminar/waves/waveMakerMultiPaddlePiston/system/controlDict | 2 +-
 .../waves/waveMakerMultiPaddlePiston/system/decomposeParDict    | 2 +-
 .../laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes   | 2 +-
 .../laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution  | 2 +-
 .../waves/waveMakerMultiPaddlePiston/system/setFieldsDict       | 2 +-
 .../multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U | 2 +-
 .../interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water  | 2 +-
 .../interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh        | 2 +-
 .../laminar/waves/waveMakerPiston/0.orig/pointDisplacement      | 2 +-
 .../laminar/waves/waveMakerPiston/constant/dynamicMeshDict      | 2 +-
 .../interFoam/laminar/waves/waveMakerPiston/constant/g          | 2 +-
 .../laminar/waves/waveMakerPiston/constant/transportProperties  | 2 +-
 .../laminar/waves/waveMakerPiston/constant/turbulenceProperties | 2 +-
 .../laminar/waves/waveMakerPiston/constant/waveProperties       | 2 +-
 .../laminar/waves/waveMakerPiston/system/blockMeshDict          | 2 +-
 .../interFoam/laminar/waves/waveMakerPiston/system/controlDict  | 2 +-
 .../laminar/waves/waveMakerPiston/system/decomposeParDict       | 2 +-
 .../interFoam/laminar/waves/waveMakerPiston/system/fvSchemes    | 2 +-
 .../interFoam/laminar/waves/waveMakerPiston/system/fvSolution   | 2 +-
 .../laminar/waves/waveMakerPiston/system/setFieldsDict          | 2 +-
 .../interFoam/laminar/waves/waveMakerSolitary/0.orig/U          | 2 +-
 .../laminar/waves/waveMakerSolitary/0.orig/alpha.water          | 2 +-
 .../interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh      | 2 +-
 .../laminar/waves/waveMakerSolitary/0.orig/pointDisplacement    | 2 +-
 .../laminar/waves/waveMakerSolitary/constant/dynamicMeshDict    | 2 +-
 .../interFoam/laminar/waves/waveMakerSolitary/constant/g        | 2 +-
 .../waves/waveMakerSolitary/constant/transportProperties        | 2 +-
 .../waves/waveMakerSolitary/constant/turbulenceProperties       | 2 +-
 .../laminar/waves/waveMakerSolitary/constant/waveProperties     | 2 +-
 .../laminar/waves/waveMakerSolitary/system/blockMeshDict        | 2 +-
 .../laminar/waves/waveMakerSolitary/system/controlDict          | 2 +-
 .../laminar/waves/waveMakerSolitary/system/decomposeParDict     | 2 +-
 .../interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes  | 2 +-
 .../interFoam/laminar/waves/waveMakerSolitary/system/fvSolution | 2 +-
 .../laminar/waves/waveMakerSolitary/system/setFieldsDict        | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/0.orig/U             | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/0.orig/alpha.water   | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/0.orig/p_rgh         | 2 +-
 .../multiphase/interIsoFoam/damBreak/constant/dynamicMeshDict   | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/constant/g           | 2 +-
 .../interIsoFoam/damBreak/constant/transportProperties          | 2 +-
 .../interIsoFoam/damBreak/constant/turbulenceProperties         | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/system/blockMeshDict | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/system/controlDict   | 2 +-
 .../multiphase/interIsoFoam/damBreak/system/decomposeParDict    | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/system/fvSchemes     | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/system/fvSolution    | 2 +-
 tutorials/multiphase/interIsoFoam/damBreak/system/setFieldsDict | 2 +-
 tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U | 2 +-
 .../interIsoFoam/damBreakWithObstacle/0.orig/alpha.water        | 2 +-
 .../multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh   | 2 +-
 .../interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict  | 2 +-
 .../multiphase/interIsoFoam/damBreakWithObstacle/constant/g     | 2 +-
 .../damBreakWithObstacle/constant/transportProperties           | 2 +-
 .../damBreakWithObstacle/constant/turbulenceProperties          | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/blockMeshDict      | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/controlDict        | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/decomposeParDict   | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/fvSchemes          | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/fvSolution         | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/setFieldsDict      | 2 +-
 .../interIsoFoam/damBreakWithObstacle/system/topoSetDict        | 2 +-
 tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/U   | 2 +-
 .../interIsoFoam/discInConstantFlow/0.orig/alpha.water          | 2 +-
 .../multiphase/interIsoFoam/discInConstantFlow/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/g | 2 +-
 .../discInConstantFlow/constant/transportProperties             | 2 +-
 .../discInConstantFlow/constant/turbulenceProperties            | 2 +-
 .../interIsoFoam/discInConstantFlow/system/blockMeshDict        | 2 +-
 .../interIsoFoam/discInConstantFlow/system/controlDict          | 2 +-
 .../multiphase/interIsoFoam/discInConstantFlow/system/fvSchemes | 2 +-
 .../interIsoFoam/discInConstantFlow/system/fvSolution           | 2 +-
 .../interIsoFoam/discInConstantFlow/system/setAlphaFieldDict    | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U           | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/0.orig/alpha.water | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/0.orig/p_rgh       | 2 +-
 .../discInConstantFlowCyclicBCs/constant/dynamicMeshDict        | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/constant/g         | 2 +-
 .../discInConstantFlowCyclicBCs/constant/transportProperties    | 2 +-
 .../discInConstantFlowCyclicBCs/constant/turbulenceProperties   | 2 +-
 .../discInConstantFlowCyclicBCs/system/blockMeshDict            | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict | 2 +-
 .../discInConstantFlowCyclicBCs/system/decomposeParDict         | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes   | 2 +-
 .../interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution  | 2 +-
 .../discInConstantFlowCyclicBCs/system/setAlphaFieldDict        | 2 +-
 .../multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/U   | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/0.orig/alpha.water    | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/0.orig/p_rgh          | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/0.orig/porosity       | 2 +-
 .../multiphase/interIsoFoam/discInConstantPorousFlow/constant/g | 2 +-
 .../discInConstantPorousFlow/constant/porosityProperties        | 2 +-
 .../discInConstantPorousFlow/constant/transportProperties       | 2 +-
 .../discInConstantPorousFlow/constant/turbulenceProperties      | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/system/blockMeshDict  | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/system/controlDict    | 2 +-
 .../discInConstantPorousFlow/system/decomposeParDict            | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/system/fvSchemes      | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/system/fvSolution     | 2 +-
 .../discInConstantPorousFlow/system/setAlphaFieldDict           | 2 +-
 .../interIsoFoam/discInConstantPorousFlow/system/setFieldsDict  | 2 +-
 .../multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/U   | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/0.orig/alpha.water    | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/0.orig/p_rgh          | 2 +-
 .../multiphase/interIsoFoam/discInReversedVortexFlow/constant/g | 2 +-
 .../discInReversedVortexFlow/constant/transportProperties       | 2 +-
 .../discInReversedVortexFlow/constant/turbulenceProperties      | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/blockMeshDict  | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/controlDict    | 2 +-
 .../discInReversedVortexFlow/system/decomposeParDict            | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/fvSchemes      | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/fvSolution     | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/refineMeshDict | 2 +-
 .../discInReversedVortexFlow/system/setAlphaFieldDict           | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/topoSetDict    | 2 +-
 .../interIsoFoam/discInReversedVortexFlow/system/topoSetDict2   | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/0.orig/U              | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/0.orig/alpha.water    | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/0.orig/p_rgh          | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/constant/g            | 2 +-
 .../interIsoFoam/iobasin/constant/transportProperties           | 2 +-
 .../interIsoFoam/iobasin/constant/turbulenceProperties          | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/system/blockMeshDict  | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/system/controlDict    | 2 +-
 .../multiphase/interIsoFoam/iobasin/system/createPatchDict      | 2 +-
 .../multiphase/interIsoFoam/iobasin/system/decomposeParDict     | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/system/fvSchemes      | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/system/fvSolution     | 2 +-
 tutorials/multiphase/interIsoFoam/iobasin/system/setFieldsDict  | 2 +-
 .../interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/U        | 2 +-
 .../notchedDiscInSolidBodyRotation/0.orig/alpha.water           | 2 +-
 .../interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/p_rgh    | 2 +-
 .../interIsoFoam/notchedDiscInSolidBodyRotation/constant/g      | 2 +-
 .../notchedDiscInSolidBodyRotation/constant/transportProperties | 2 +-
 .../constant/turbulenceProperties                               | 2 +-
 .../notchedDiscInSolidBodyRotation/system/blockMeshDict         | 2 +-
 .../notchedDiscInSolidBodyRotation/system/controlDict           | 2 +-
 .../notchedDiscInSolidBodyRotation/system/fvSchemes             | 2 +-
 .../notchedDiscInSolidBodyRotation/system/fvSolution            | 2 +-
 .../notchedDiscInSolidBodyRotation/system/setAlphaFieldDict     | 2 +-
 .../notchedDiscInSolidBodyRotation/system/setFieldsDict         | 2 +-
 tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U       | 2 +-
 .../multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water   | 2 +-
 tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh   | 2 +-
 .../interIsoFoam/sloshingTank2D/constant/dynamicMeshDict        | 2 +-
 tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g     | 2 +-
 .../interIsoFoam/sloshingTank2D/constant/transportProperties    | 2 +-
 .../interIsoFoam/sloshingTank2D/constant/turbulenceProperties   | 2 +-
 .../interIsoFoam/sloshingTank2D/system/blockMeshDict.m4         | 2 +-
 .../multiphase/interIsoFoam/sloshingTank2D/system/controlDict   | 2 +-
 .../interIsoFoam/sloshingTank2D/system/decomposeParDict         | 2 +-
 .../multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes     | 2 +-
 .../multiphase/interIsoFoam/sloshingTank2D/system/fvSolution    | 2 +-
 .../multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict | 2 +-
 .../multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/U | 2 +-
 .../interIsoFoam/sphereInReversedVortexFlow/0.orig/alpha.water  | 2 +-
 .../interIsoFoam/sphereInReversedVortexFlow/0.orig/p_rgh        | 2 +-
 .../interIsoFoam/sphereInReversedVortexFlow/constant/g          | 2 +-
 .../sphereInReversedVortexFlow/constant/transportProperties     | 2 +-
 .../sphereInReversedVortexFlow/constant/turbulenceProperties    | 2 +-
 .../sphereInReversedVortexFlow/system/blockMeshDict             | 2 +-
 .../interIsoFoam/sphereInReversedVortexFlow/system/controlDict  | 2 +-
 .../sphereInReversedVortexFlow/system/decomposeParDict          | 2 +-
 .../interIsoFoam/sphereInReversedVortexFlow/system/fvSchemes    | 2 +-
 .../interIsoFoam/sphereInReversedVortexFlow/system/fvSolution   | 2 +-
 .../sphereInReversedVortexFlow/system/setAlphaFieldDict         | 2 +-
 tutorials/multiphase/interIsoFoam/standingWave/0.orig/U         | 2 +-
 .../multiphase/interIsoFoam/standingWave/0.orig/alpha.water     | 2 +-
 tutorials/multiphase/interIsoFoam/standingWave/0.orig/p_rgh     | 2 +-
 .../interIsoFoam/standingWave/constant/dynamicMeshDict          | 2 +-
 tutorials/multiphase/interIsoFoam/standingWave/constant/g       | 2 +-
 .../interIsoFoam/standingWave/constant/transportProperties      | 2 +-
 .../interIsoFoam/standingWave/constant/turbulenceProperties     | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/blockMeshDict   | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/controlDict     | 2 +-
 .../interIsoFoam/standingWave/system/decomposeParDict           | 2 +-
 tutorials/multiphase/interIsoFoam/standingWave/system/fvSchemes | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/fvSolution      | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/refineMeshDict1 | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/refineMeshDict2 | 2 +-
 .../interIsoFoam/standingWave/system/setAlphaFieldDict          | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/topoSetDict1    | 2 +-
 .../multiphase/interIsoFoam/standingWave/system/topoSetDict2    | 2 +-
 .../multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U  | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water   | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/0.orig/p_rgh         | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/constant/g           | 2 +-
 .../waveExampleStreamFunction/constant/transportProperties      | 2 +-
 .../waveExampleStreamFunction/constant/turbulenceProperties     | 2 +-
 .../waveExampleStreamFunction/constant/waveProperties           | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/system/blockMeshDict | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/system/controlDict   | 2 +-
 .../waveExampleStreamFunction/system/decomposeParDict           | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/system/fvSchemes     | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/system/fvSolution    | 2 +-
 .../interIsoFoam/waveExampleStreamFunction/system/setFieldsDict | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/U         | 2 +-
 .../multiphase/interIsoFoam/weirOverflow/0.orig/alpha.water     | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/epsilon   | 2 +-
 .../interIsoFoam/weirOverflow/0.orig/include/initialConditions  | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/k         | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/nut       | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/p_rgh     | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/constant/g       | 2 +-
 .../interIsoFoam/weirOverflow/constant/transportProperties      | 2 +-
 .../interIsoFoam/weirOverflow/constant/turbulenceProperties     | 2 +-
 .../multiphase/interIsoFoam/weirOverflow/system/blockMeshDict   | 2 +-
 .../multiphase/interIsoFoam/weirOverflow/system/controlDict     | 2 +-
 tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSchemes | 2 +-
 .../multiphase/interIsoFoam/weirOverflow/system/fvSolution      | 2 +-
 .../multiphase/interIsoFoam/weirOverflow/system/setFieldsDict   | 2 +-
 tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/U  | 2 +-
 .../interMixingFoam/laminar/damBreak/0.orig/alpha.air           | 2 +-
 .../interMixingFoam/laminar/damBreak/0.orig/alpha.other         | 2 +-
 .../interMixingFoam/laminar/damBreak/0.orig/alpha.water         | 2 +-
 .../multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh    | 2 +-
 .../multiphase/interMixingFoam/laminar/damBreak/constant/g      | 2 +-
 .../laminar/damBreak/constant/transportProperties               | 2 +-
 .../laminar/damBreak/constant/turbulenceProperties              | 2 +-
 .../interMixingFoam/laminar/damBreak/system/blockMeshDict       | 2 +-
 .../interMixingFoam/laminar/damBreak/system/controlDict         | 2 +-
 .../interMixingFoam/laminar/damBreak/system/decomposeParDict    | 2 +-
 .../interMixingFoam/laminar/damBreak/system/fvSchemes           | 2 +-
 .../interMixingFoam/laminar/damBreak/system/fvSolution          | 2 +-
 .../interMixingFoam/laminar/damBreak/system/setFieldsDict       | 2 +-
 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U | 2 +-
 .../interPhaseChangeDyMFoam/propeller/0.orig/alpha.water        | 2 +-
 .../multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon | 2 +-
 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k | 2 +-
 .../multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut     | 2 +-
 .../multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh   | 2 +-
 .../interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict  | 2 +-
 .../multiphase/interPhaseChangeDyMFoam/propeller/constant/g     | 2 +-
 .../propeller/constant/transportProperties                      | 2 +-
 .../propeller/constant/turbulenceProperties                     | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/blockMeshDict      | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/controlDict        | 2 +-
 .../propeller/system/createInletOutletSets.topoSetDict          | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/createPatchDict    | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/decomposeParDict   | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/fvSchemes          | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/fvSolution         | 2 +-
 .../interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict  | 2 +-
 .../propeller/system/surfaceFeatureExtractDict                  | 2 +-
 .../multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi | 2 +-
 .../multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U   | 2 +-
 .../interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water    | 2 +-
 .../interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh          | 2 +-
 .../multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g | 2 +-
 .../cavitatingBullet/constant/transportProperties               | 2 +-
 .../cavitatingBullet/constant/turbulenceProperties              | 2 +-
 .../interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict  | 2 +-
 .../interPhaseChangeFoam/cavitatingBullet/system/controlDict    | 2 +-
 .../cavitatingBullet/system/decomposeParDict                    | 2 +-
 .../interPhaseChangeFoam/cavitatingBullet/system/fvSchemes      | 2 +-
 .../interPhaseChangeFoam/cavitatingBullet/system/fvSolution     | 2 +-
 .../cavitatingBullet/system/snappyHexMeshDict                   | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air    | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water  | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta    | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air    | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water  | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air           | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water         | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh    | 2 +-
 .../multiphase/multiphaseEulerFoam/bubbleColumn/constant/g      | 2 +-
 .../bubbleColumn/constant/transportProperties                   | 2 +-
 .../bubbleColumn/constant/turbulenceProperties                  | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/system/blockMeshDict       | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/system/controlDict         | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/system/fvSchemes           | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/system/fvSolution          | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/system/setFieldsDict       | 2 +-
 .../multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U      | 2 +-
 .../multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air  | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury         | 2 +-
 .../multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil  | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/U.water           | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air         | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury     | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil         | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water       | 2 +-
 .../multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh  | 2 +-
 .../multiphase/multiphaseEulerFoam/damBreak4phase/constant/g    | 2 +-
 .../damBreak4phase/constant/motionProperties                    | 2 +-
 .../damBreak4phase/constant/transportProperties                 | 2 +-
 .../damBreak4phase/constant/turbulenceProperties                | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/system/blockMeshDict     | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/system/controlDict       | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/system/decomposeParDict  | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/system/fvSchemes         | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/system/fvSolution        | 2 +-
 .../multiphaseEulerFoam/damBreak4phase/system/setFieldsDict     | 2 +-
 .../multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U  | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air         | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury     | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil         | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water       | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air     | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil     | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water   | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh         | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/constant/g           | 2 +-
 .../damBreak4phaseFine/constant/motionProperties                | 2 +-
 .../damBreak4phaseFine/constant/transportProperties             | 2 +-
 .../damBreak4phaseFine/constant/turbulenceProperties            | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/system/controlDict   | 2 +-
 .../damBreak4phaseFine/system/decomposeParDict                  | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes     | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution    | 2 +-
 .../multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta   | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air   | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury          | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil   | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air          | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury      | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil          | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water        | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/epsilon | 2 +-
 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/k | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh   | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties    | 2 +-
 .../multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g     | 2 +-
 .../mixerVessel2D/constant/interfacialProperties                | 2 +-
 .../mixerVessel2D/constant/transportProperties                  | 2 +-
 .../mixerVessel2D/constant/turbulenceProperties                 | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4   | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/system/controlDict        | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/system/fvSchemes          | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/system/fvSolution         | 2 +-
 .../multiphaseEulerFoam/mixerVessel2D/system/topoSetDict        | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/0.orig/U         | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air | 2 +-
 .../laminar/damBreak4phase/0.orig/alpha.mercury                 | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil | 2 +-
 .../laminar/damBreak4phase/0.orig/alpha.water                   | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas    | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh     | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/constant/g       | 2 +-
 .../laminar/damBreak4phase/constant/motionProperties            | 2 +-
 .../laminar/damBreak4phase/constant/transportProperties         | 2 +-
 .../laminar/damBreak4phase/constant/turbulenceProperties        | 2 +-
 .../laminar/damBreak4phase/system/blockMeshDict                 | 2 +-
 .../laminar/damBreak4phase/system/controlDict                   | 2 +-
 .../laminar/damBreak4phase/system/decomposeParDict              | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes | 2 +-
 .../laminar/damBreak4phase/system/fvSolution                    | 2 +-
 .../laminar/damBreak4phase/system/setFieldsDict                 | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U     | 2 +-
 .../laminar/damBreak4phaseFine/0.orig/alpha.air                 | 2 +-
 .../laminar/damBreak4phaseFine/0.orig/alpha.mercury             | 2 +-
 .../laminar/damBreak4phaseFine/0.orig/alpha.oil                 | 2 +-
 .../laminar/damBreak4phaseFine/0.orig/alpha.water               | 2 +-
 .../laminar/damBreak4phaseFine/0.orig/alphas                    | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g   | 2 +-
 .../laminar/damBreak4phaseFine/constant/motionProperties        | 2 +-
 .../laminar/damBreak4phaseFine/constant/transportProperties     | 2 +-
 .../laminar/damBreak4phaseFine/constant/turbulenceProperties    | 2 +-
 .../laminar/damBreak4phaseFine/system/blockMeshDict             | 2 +-
 .../laminar/damBreak4phaseFine/system/controlDict               | 2 +-
 .../laminar/damBreak4phaseFine/system/decomposeParDict          | 2 +-
 .../laminar/damBreak4phaseFine/system/fvSchemes                 | 2 +-
 .../laminar/damBreak4phaseFine/system/fvSolution                | 2 +-
 .../laminar/damBreak4phaseFine/system/setFieldsDict             | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T          | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U          | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air  | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.mercury                  | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil  | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.water                    | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh      | 2 +-
 .../laminar/mixerVessel2D/constant/MRFProperties                | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/constant/g        | 2 +-
 .../laminar/mixerVessel2D/constant/transportProperties          | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties         | 2 +-
 .../laminar/mixerVessel2D/system/blockMeshDict.m4               | 2 +-
 .../laminar/mixerVessel2D/system/controlDict                    | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes  | 2 +-
 .../multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution | 2 +-
 .../laminar/mixerVessel2D/system/setFieldsDict                  | 2 +-
 .../laminar/mixerVessel2D/system/topoSetDict                    | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/T                        | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/U                        | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/alpha.water              | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/alphat                   | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/epsilon                  | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/k                        | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/nut                      | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/p                        | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/p_rgh                    | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/pointDisplacement        | 2 +-
 .../compressibleTwoSimpleRotors/0.orig/zoneID                   | 2 +-
 .../compressibleTwoSimpleRotors/constant/dynamicMeshDict        | 2 +-
 .../compressibleTwoSimpleRotors/constant/g                      | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../constant/thermophysicalProperties.air                       | 2 +-
 .../constant/thermophysicalProperties.water                     | 2 +-
 .../compressibleTwoSimpleRotors/constant/turbulenceProperties   | 2 +-
 .../compressibleTwoSimpleRotors/system/blockMeshDict            | 2 +-
 .../compressibleTwoSimpleRotors/system/controlDict              | 2 +-
 .../compressibleTwoSimpleRotors/system/decomposeParDict         | 2 +-
 .../compressibleTwoSimpleRotors/system/fvSchemes                | 2 +-
 .../compressibleTwoSimpleRotors/system/fvSolution               | 2 +-
 .../compressibleTwoSimpleRotors/system/setFieldsDict            | 2 +-
 .../compressibleTwoSimpleRotors/system/topoSetDict              | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/U           | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/alpha.water | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/epsilon     | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/k           | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/nut         | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/p_rgh       | 2 +-
 .../floatingBody/background/0.orig/pointDisplacement            | 2 +-
 .../overInterDyMFoam/floatingBody/background/0.orig/zoneID      | 2 +-
 .../floatingBody/background/constant/dynamicMeshDict            | 2 +-
 .../overInterDyMFoam/floatingBody/background/constant/g         | 2 +-
 .../floatingBody/background/constant/transportProperties        | 2 +-
 .../floatingBody/background/constant/turbulenceProperties       | 2 +-
 .../floatingBody/background/system/blockMeshDict                | 2 +-
 .../overInterDyMFoam/floatingBody/background/system/controlDict | 2 +-
 .../floatingBody/background/system/decomposeParDict             | 2 +-
 .../overInterDyMFoam/floatingBody/background/system/fvSchemes   | 2 +-
 .../overInterDyMFoam/floatingBody/background/system/fvSolution  | 2 +-
 .../floatingBody/background/system/setFieldsDict                | 2 +-
 .../overInterDyMFoam/floatingBody/background/system/topoSetDict | 2 +-
 .../floatingBody/floatingBody/system/blockMeshDict              | 2 +-
 .../floatingBody/floatingBody/system/controlDict                | 2 +-
 .../overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes | 2 +-
 .../floatingBody/floatingBody/system/fvSolution                 | 2 +-
 .../floatingBody/floatingBody/system/topoSetDict                | 2 +-
 .../overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U | 2 +-
 .../floatingBodyWithSpring/background/0.orig/alpha.water        | 2 +-
 .../floatingBodyWithSpring/background/0.orig/epsilon            | 2 +-
 .../overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k | 2 +-
 .../floatingBodyWithSpring/background/0.orig/nut                | 2 +-
 .../floatingBodyWithSpring/background/0.orig/p_rgh              | 2 +-
 .../floatingBodyWithSpring/background/0.orig/pointDisplacement  | 2 +-
 .../floatingBodyWithSpring/background/0.orig/zoneID             | 2 +-
 .../floatingBodyWithSpring/background/constant/dynamicMeshDict  | 2 +-
 .../floatingBodyWithSpring/background/constant/g                | 2 +-
 .../background/constant/transportProperties                     | 2 +-
 .../background/constant/turbulenceProperties                    | 2 +-
 .../floatingBodyWithSpring/background/system/blockMeshDict      | 2 +-
 .../floatingBodyWithSpring/background/system/controlDict        | 2 +-
 .../floatingBodyWithSpring/background/system/decomposeParDict   | 2 +-
 .../floatingBodyWithSpring/background/system/fvSchemes          | 2 +-
 .../floatingBodyWithSpring/background/system/fvSolution         | 2 +-
 .../floatingBodyWithSpring/background/system/setFieldsDict      | 2 +-
 .../floatingBodyWithSpring/background/system/topoSetDict        | 2 +-
 .../floatingBodyWithSpring/floatingBody/system/blockMeshDict    | 2 +-
 .../floatingBodyWithSpring/floatingBody/system/controlDict      | 2 +-
 .../floatingBodyWithSpring/floatingBody/system/fvSchemes        | 2 +-
 .../floatingBodyWithSpring/floatingBody/system/fvSolution       | 2 +-
 .../floatingBodyWithSpring/floatingBody/system/topoSetDict      | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/0.orig/U          | 2 +-
 .../rigidBodyHull/background/0.orig/alpha.water                 | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon    | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/0.orig/k          | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/0.orig/nut        | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh      | 2 +-
 .../rigidBodyHull/background/0.orig/pointDisplacement           | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID     | 2 +-
 .../rigidBodyHull/background/constant/dynamicMeshDict           | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/constant/g        | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/constant/hRef     | 2 +-
 .../rigidBodyHull/background/constant/transportProperties       | 2 +-
 .../rigidBodyHull/background/constant/turbulenceProperties      | 2 +-
 .../rigidBodyHull/background/system/blockMeshDict               | 2 +-
 .../rigidBodyHull/background/system/controlDict                 | 2 +-
 .../rigidBodyHull/background/system/createPatchDict             | 2 +-
 .../rigidBodyHull/background/system/decomposeParDict            | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/system/fvOptions  | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/system/fvSchemes  | 2 +-
 .../overInterDyMFoam/rigidBodyHull/background/system/fvSolution | 2 +-
 .../rigidBodyHull/background/system/setFieldsDict               | 2 +-
 .../rigidBodyHull/background/system/snappyHexMeshDict           | 2 +-
 .../rigidBodyHull/background/system/topoSetDict                 | 2 +-
 .../rigidBodyHull/background/system/topoSetDict.cHullProp       | 2 +-
 .../rigidBodyHull/overset-1/system/blockMeshDict                | 2 +-
 .../overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict | 2 +-
 .../rigidBodyHull/overset-1/system/decomposeParDict             | 2 +-
 .../overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes   | 2 +-
 .../overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution  | 2 +-
 .../rigidBodyHull/overset-1/system/snappyHexMeshDict            | 2 +-
 .../rigidBodyHull/overset-1/system/surfaceFeatureExtractDict    | 2 +-
 .../rigidBodyHull/overset-2/system/blockMeshDict                | 2 +-
 .../overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict | 2 +-
 .../rigidBodyHull/overset-2/system/decomposeParDict             | 2 +-
 .../overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes   | 2 +-
 .../overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution  | 2 +-
 .../rigidBodyHull/overset-2/system/snappyHexMeshDict            | 2 +-
 .../rigidBodyHull/overset-2/system/surfaceFeatureExtractDict    | 2 +-
 tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/U      | 2 +-
 .../multiphase/overInterDyMFoam/simpleRotor/0.orig/alpha.water  | 2 +-
 tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p      | 2 +-
 tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh  | 2 +-
 .../overInterDyMFoam/simpleRotor/0.orig/pointDisplacement       | 2 +-
 tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/zoneID | 2 +-
 .../overInterDyMFoam/simpleRotor/constant/dynamicMeshDict       | 2 +-
 .../multiphase/overInterDyMFoam/simpleRotor/constant/fvOptions  | 2 +-
 tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/g    | 2 +-
 .../overInterDyMFoam/simpleRotor/constant/transportProperties   | 2 +-
 .../overInterDyMFoam/simpleRotor/constant/turbulenceProperties  | 2 +-
 .../overInterDyMFoam/simpleRotor/system/blockMeshDict           | 2 +-
 .../multiphase/overInterDyMFoam/simpleRotor/system/controlDict  | 2 +-
 .../overInterDyMFoam/simpleRotor/system/decomposeParDict        | 2 +-
 .../multiphase/overInterDyMFoam/simpleRotor/system/fvSchemes    | 2 +-
 .../multiphase/overInterDyMFoam/simpleRotor/system/fvSolution   | 2 +-
 .../overInterDyMFoam/simpleRotor/system/setFieldsDict           | 2 +-
 .../multiphase/overInterDyMFoam/simpleRotor/system/topoSetDict  | 2 +-
 tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U  | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water         | 2 +-
 .../multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon  | 2 +-
 tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k  | 2 +-
 .../multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut      | 2 +-
 tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p  | 2 +-
 .../multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh    | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement   | 2 +-
 .../multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID   | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict   | 2 +-
 .../multiphase/overInterDyMFoam/twoSimpleRotors/constant/g      | 2 +-
 .../twoSimpleRotors/constant/transportProperties                | 2 +-
 .../twoSimpleRotors/constant/turbulenceProperties               | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/blockMeshDict       | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/controlDict         | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/decomposeParDict    | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/fvSchemes           | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/fvSolution          | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/setFieldsDict       | 2 +-
 .../overInterDyMFoam/twoSimpleRotors/system/topoSetDict         | 2 +-
 .../multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/U    | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/0.orig/alpha.water     | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/0.orig/epsilon         | 2 +-
 .../multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/k    | 2 +-
 .../multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/nut  | 2 +-
 .../multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p    | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/0.orig/p_rgh           | 2 +-
 .../twoSquaresOutDomain/0.orig/pointDisplacement                | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/0.orig/zoneID          | 2 +-
 .../twoSquaresOutDomain/constant/dynamicMeshDict                | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/constant/fvOptions     | 2 +-
 .../multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/g  | 2 +-
 .../twoSquaresOutDomain/constant/transportProperties            | 2 +-
 .../twoSquaresOutDomain/constant/turbulenceProperties           | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/system/blockMeshDict   | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/system/controlDict     | 2 +-
 .../twoSquaresOutDomain/system/decomposeParDict                 | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/system/fvSchemes       | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/system/fvSolution      | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/system/setFieldsDict   | 2 +-
 .../overInterDyMFoam/twoSquaresOutDomain/system/topoSetDict     | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/U        | 2 +-
 .../twoSimpleRotors/0.orig/alpha.water                          | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alphat   | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/epsilon  | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/k        | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/nut      | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p        | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p_rgh    | 2 +-
 .../twoSimpleRotors/0.orig/pointDisplacement                    | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/zoneID   | 2 +-
 .../twoSimpleRotors/constant/dynamicMeshDict                    | 2 +-
 .../overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/g      | 2 +-
 .../twoSimpleRotors/constant/transportProperties                | 2 +-
 .../twoSimpleRotors/constant/turbulenceProperties               | 2 +-
 .../twoSimpleRotors/system/blockMeshDict                        | 2 +-
 .../twoSimpleRotors/system/controlDict                          | 2 +-
 .../twoSimpleRotors/system/decomposeParDict                     | 2 +-
 .../twoSimpleRotors/system/fvSchemes                            | 2 +-
 .../twoSimpleRotors/system/fvSolution                           | 2 +-
 .../twoSimpleRotors/system/setFieldsDict                        | 2 +-
 .../twoSimpleRotors/system/topoSetDict                          | 2 +-
 .../potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U         | 2 +-
 .../potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p         | 2 +-
 .../potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh      | 2 +-
 .../oscillatingBox/0.orig/pointDisplacement                     | 2 +-
 .../oscillatingBox/constant/dynamicMeshDict                     | 2 +-
 .../potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g       | 2 +-
 .../oscillatingBox/constant/transportProperties                 | 2 +-
 .../oscillatingBox/constant/turbulenceProperties                | 2 +-
 .../oscillatingBox/system/blockMeshDict                         | 2 +-
 .../oscillatingBox/system/controlDict                           | 2 +-
 .../oscillatingBox/system/createPatchDict                       | 2 +-
 .../potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes | 2 +-
 .../oscillatingBox/system/fvSolution                            | 2 +-
 .../oscillatingBox/system/topoSetDict                           | 2 +-
 .../oscillatingBox/system/topoSetDict-selectBottom              | 2 +-
 .../multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U | 2 +-
 .../multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p | 2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh         | 2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/constant/g          | 2 +-
 .../oscillatingBox/constant/transportProperties                 | 2 +-
 .../oscillatingBox/constant/turbulenceProperties                | 2 +-
 .../oscillatingBox/system/blockMeshDict                         | 2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/system/controlDict  | 2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes    | 2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution   | 2 +-
 .../potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict  | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/T.gas                       | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/T.liquid                    | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/U.gas                       | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/U.gas2                      | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/U.liquid                    | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/alpha.gas                   | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/alpha.liquid                | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/alphat.gas                  | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/alphat.liquid               | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/epsilon.gas                 | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/epsilon.liquid              | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/k.gas                       | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/k.liquid                    | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/nut.gas                     | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/nut.liquid                  | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/p                           | 2 +-
 .../RAS/wallBoiling1D_2phase/0.orig/p_rgh                       | 2 +-
 .../RAS/wallBoiling1D_2phase/constant/g                         | 2 +-
 .../RAS/wallBoiling1D_2phase/constant/phaseProperties           | 2 +-
 .../wallBoiling1D_2phase/constant/thermophysicalProperties.gas  | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas  | 2 +-
 .../wallBoiling1D_2phase/constant/turbulenceProperties.liquid   | 2 +-
 .../RAS/wallBoiling1D_2phase/system/blockMeshDict               | 2 +-
 .../RAS/wallBoiling1D_2phase/system/controlDict                 | 2 +-
 .../RAS/wallBoiling1D_2phase/system/fvSchemes                   | 2 +-
 .../RAS/wallBoiling1D_2phase/system/fvSolution                  | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/T.gas                       | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/T.gas2                      | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/T.liquid                    | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/U.gas                       | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/U.gas2                      | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/U.liquid                    | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/alpha.gas                   | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/alpha.gas2                  | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/alpha.liquid                | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/alphat.gas                  | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/alphat.gas2                 | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/alphat.liquid               | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/epsilon.gas                 | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/epsilon.gas2                | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/epsilon.liquid              | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/k.gas                       | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/k.gas2                      | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/k.liquid                    | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/nut.gas                     | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/nut.gas2                    | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/nut.liquid                  | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/p                           | 2 +-
 .../RAS/wallBoiling1D_3phase/0.orig/p_rgh                       | 2 +-
 .../RAS/wallBoiling1D_3phase/constant/g                         | 2 +-
 .../RAS/wallBoiling1D_3phase/constant/phaseProperties           | 2 +-
 .../wallBoiling1D_3phase/constant/thermophysicalProperties.gas  | 2 +-
 .../wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas  | 2 +-
 .../RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 | 2 +-
 .../wallBoiling1D_3phase/constant/turbulenceProperties.liquid   | 2 +-
 .../RAS/wallBoiling1D_3phase/system/blockMeshDict               | 2 +-
 .../RAS/wallBoiling1D_3phase/system/controlDict                 | 2 +-
 .../RAS/wallBoiling1D_3phase/system/fvSchemes                   | 2 +-
 .../RAS/wallBoiling1D_3phase/system/fvSolution                  | 2 +-
 .../laminar/bubbleColumn/0.orig/T.air                           | 2 +-
 .../laminar/bubbleColumn/0.orig/T.water                         | 2 +-
 .../laminar/bubbleColumn/0.orig/Theta                           | 2 +-
 .../laminar/bubbleColumn/0.orig/U.air                           | 2 +-
 .../laminar/bubbleColumn/0.orig/U.water                         | 2 +-
 .../laminar/bubbleColumn/0.orig/alpha.air                       | 2 +-
 .../laminar/bubbleColumn/0.orig/alpha.water                     | 2 +-
 .../reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p   | 2 +-
 .../laminar/bubbleColumn/0.orig/p_rgh                           | 2 +-
 .../reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g | 2 +-
 .../laminar/bubbleColumn/constant/phaseProperties               | 2 +-
 .../laminar/bubbleColumn/constant/thermophysicalProperties.air  | 2 +-
 .../bubbleColumn/constant/thermophysicalProperties.water        | 2 +-
 .../laminar/bubbleColumn/constant/turbulenceProperties.air      | 2 +-
 .../laminar/bubbleColumn/constant/turbulenceProperties.water    | 2 +-
 .../laminar/bubbleColumn/system/blockMeshDict                   | 2 +-
 .../laminar/bubbleColumn/system/controlDict                     | 2 +-
 .../laminar/bubbleColumn/system/fvSchemes                       | 2 +-
 .../laminar/bubbleColumn/system/fvSolution                      | 2 +-
 .../laminar/bubbleColumn/system/setFieldsDict                   | 2 +-
 .../laminar/mixerVessel2D/0.orig/T.air                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/T.mercury                      | 2 +-
 .../laminar/mixerVessel2D/0.orig/T.oil                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/T.water                        | 2 +-
 .../laminar/mixerVessel2D/0.orig/Theta                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/U.air                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/U.mercury                      | 2 +-
 .../laminar/mixerVessel2D/0.orig/U.oil                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/U.water                        | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.air                      | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.mercury                  | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.oil                      | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.water                    | 2 +-
 .../reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p  | 2 +-
 .../laminar/mixerVessel2D/0.orig/p_rgh                          | 2 +-
 .../laminar/mixerVessel2D/constant/MRFProperties                | 2 +-
 .../laminar/mixerVessel2D/constant/g                            | 2 +-
 .../laminar/mixerVessel2D/constant/phaseProperties              | 2 +-
 .../laminar/mixerVessel2D/constant/thermophysicalProperties.air | 2 +-
 .../mixerVessel2D/constant/thermophysicalProperties.mercury     | 2 +-
 .../laminar/mixerVessel2D/constant/thermophysicalProperties.oil | 2 +-
 .../mixerVessel2D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.air     | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.mercury | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.oil     | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.water   | 2 +-
 .../laminar/mixerVessel2D/system/blockMeshDict.m4               | 2 +-
 .../laminar/mixerVessel2D/system/controlDict                    | 2 +-
 .../laminar/mixerVessel2D/system/fvSchemes                      | 2 +-
 .../laminar/mixerVessel2D/system/fvSolution                     | 2 +-
 .../laminar/mixerVessel2D/system/topoSetDict                    | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water   | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta     | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water   | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air | 2 +-
 .../LES/bubbleColumn/0.orig/alphat.air                          | 2 +-
 .../LES/bubbleColumn/0.orig/alphat.water                        | 2 +-
 .../LES/bubbleColumn/0.orig/epsilon.air                         | 2 +-
 .../LES/bubbleColumn/0.orig/epsilon.water                       | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water   | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air   | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p         | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh     | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g       | 2 +-
 .../LES/bubbleColumn/constant/phaseProperties                   | 2 +-
 .../LES/bubbleColumn/constant/thermophysicalProperties.air      | 2 +-
 .../LES/bubbleColumn/constant/thermophysicalProperties.water    | 2 +-
 .../LES/bubbleColumn/constant/turbulenceProperties.air          | 2 +-
 .../LES/bubbleColumn/constant/turbulenceProperties.water        | 2 +-
 .../LES/bubbleColumn/system/blockMeshDict                       | 2 +-
 .../LES/bubbleColumn/system/controlDict                         | 2 +-
 .../reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes | 2 +-
 .../LES/bubbleColumn/system/fvSolution                          | 2 +-
 .../LES/bubbleColumn/system/setFieldsDict                       | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas      | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids          | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas      | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids          | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas           | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas      | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas    | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids | 2 +-
 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p    | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh      | 2 +-
 .../multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g   | 2 +-
 .../RAS/LBend/constant/phaseProperties                          | 2 +-
 .../RAS/LBend/constant/thermophysicalProperties.gas             | 2 +-
 .../RAS/LBend/constant/thermophysicalProperties.solids          | 2 +-
 .../RAS/LBend/constant/turbulenceProperties.gas                 | 2 +-
 .../RAS/LBend/constant/turbulenceProperties.solids              | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict    | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict      | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes        | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution       | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air | 2 +-
 .../RAS/bubbleColumn/0.orig/alphat.air                          | 2 +-
 .../RAS/bubbleColumn/0.orig/alphat.water                        | 2 +-
 .../RAS/bubbleColumn/0.orig/epsilon.air                         | 2 +-
 .../RAS/bubbleColumn/0.orig/epsilon.water                       | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm  | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km        | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g       | 2 +-
 .../RAS/bubbleColumn/constant/phaseProperties                   | 2 +-
 .../RAS/bubbleColumn/constant/thermophysicalProperties.air      | 2 +-
 .../RAS/bubbleColumn/constant/thermophysicalProperties.water    | 2 +-
 .../RAS/bubbleColumn/constant/turbulenceProperties.air          | 2 +-
 .../RAS/bubbleColumn/constant/turbulenceProperties.water        | 2 +-
 .../RAS/bubbleColumn/system/blockMeshDict                       | 2 +-
 .../RAS/bubbleColumn/system/controlDict                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes | 2 +-
 .../RAS/bubbleColumn/system/fvSolution                          | 2 +-
 .../RAS/bubbleColumn/system/setFieldsDict                       | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas          | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid       | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas           | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas          | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid       | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas            | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid         | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas            | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid         | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas     | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas        | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid     | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas       | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas      | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas            | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas          | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/p                | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh            | 2 +-
 .../constant/chemistryProperties.gas                            | 2 +-
 .../constant/combustionProperties.gas                           | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/constant/g              | 2 +-
 .../bubbleColumnEvaporatingReacting/constant/phaseProperties    | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../constant/turbulenceProperties.gas                           | 2 +-
 .../constant/turbulenceProperties.liquid                        | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict    | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/system/controlDict      | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/system/fvSchemes        | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/system/fvSolution       | 2 +-
 .../RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict    | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/T.air                   | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/T.water                 | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/Theta                   | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/U.air                   | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/U.water                 | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/alpha.air               | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/alphat.air              | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/alphat.water            | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/epsilon.air             | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/epsilon.water           | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/epsilonm                | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles           | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/k.air                   | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/k.water                 | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/km                      | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/nut.air                 | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/nut.water               | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/p                       | 2 +-
 .../RAS/bubbleColumnPolydisperse/0.orig/p_rgh                   | 2 +-
 .../RAS/bubbleColumnPolydisperse/constant/g                     | 2 +-
 .../RAS/bubbleColumnPolydisperse/constant/phaseProperties       | 2 +-
 .../constant/thermophysicalProperties.air                       | 2 +-
 .../constant/thermophysicalProperties.water                     | 2 +-
 .../bubbleColumnPolydisperse/constant/turbulenceProperties.air  | 2 +-
 .../constant/turbulenceProperties.water                         | 2 +-
 .../RAS/bubbleColumnPolydisperse/system/blockMeshDict           | 2 +-
 .../RAS/bubbleColumnPolydisperse/system/controlDict             | 2 +-
 .../RAS/bubbleColumnPolydisperse/system/fvSchemes               | 2 +-
 .../RAS/bubbleColumnPolydisperse/system/fvSolution              | 2 +-
 .../RAS/bubbleColumnPolydisperse/system/setFieldsDict           | 2 +-
 .../RAS/bubbleColumnPolydisperse/system/topoSetDict             | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air     | 2 +-
 .../RAS/fluidisedBed/0.orig/T.particles                         | 2 +-
 .../RAS/fluidisedBed/0.orig/Theta.particles                     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air     | 2 +-
 .../RAS/fluidisedBed/0.orig/U.particles                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air | 2 +-
 .../RAS/fluidisedBed/0.orig/alpha.particles                     | 2 +-
 .../RAS/fluidisedBed/0.orig/alphat.air                          | 2 +-
 .../RAS/fluidisedBed/0.orig/alphat.particles                    | 2 +-
 .../RAS/fluidisedBed/0.orig/epsilon.air                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air   | 2 +-
 .../RAS/fluidisedBed/0.orig/nut.particles                       | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g       | 2 +-
 .../RAS/fluidisedBed/constant/phaseProperties                   | 2 +-
 .../RAS/fluidisedBed/constant/thermophysicalProperties.air      | 2 +-
 .../fluidisedBed/constant/thermophysicalProperties.particles    | 2 +-
 .../RAS/fluidisedBed/constant/turbulenceProperties.air          | 2 +-
 .../RAS/fluidisedBed/constant/turbulenceProperties.particles    | 2 +-
 .../RAS/fluidisedBed/system/blockMeshDict                       | 2 +-
 .../RAS/fluidisedBed/system/controlDict                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes | 2 +-
 .../RAS/fluidisedBed/system/fvSolution                          | 2 +-
 .../RAS/fluidisedBed/system/setFieldsDict                       | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.gas      | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.liquid   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.gas      | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.liquid   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.gas  | 2 +-
 .../RAS/wallBoiling/0.orig/alpha.liquid                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.gas | 2 +-
 .../RAS/wallBoiling/0.orig/alphat.liquid                        | 2 +-
 .../RAS/wallBoiling/0.orig/epsilon.gas                          | 2 +-
 .../RAS/wallBoiling/0.orig/epsilon.liquid                       | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.gas      | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.liquid   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.gas    | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.liquid | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p          | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p_rgh      | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g        | 2 +-
 .../RAS/wallBoiling/constant/phaseProperties                    | 2 +-
 .../RAS/wallBoiling/constant/thermophysicalProperties.gas       | 2 +-
 .../RAS/wallBoiling/constant/thermophysicalProperties.liquid    | 2 +-
 .../RAS/wallBoiling/constant/turbulenceProperties.gas           | 2 +-
 .../RAS/wallBoiling/constant/turbulenceProperties.liquid        | 2 +-
 .../RAS/wallBoiling/system/blockMeshDict                        | 2 +-
 .../RAS/wallBoiling/system/controlDict                          | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes  | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.gas    | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.liquid | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas    | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas2   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.liquid | 2 +-
 .../RAS/wallBoiling1D/0.orig/alpha.gas                          | 2 +-
 .../RAS/wallBoiling1D/0.orig/alpha.liquid                       | 2 +-
 .../RAS/wallBoiling1D/0.orig/alphat.gas                         | 2 +-
 .../RAS/wallBoiling1D/0.orig/alphat.liquid                      | 2 +-
 .../RAS/wallBoiling1D/0.orig/epsilon.gas                        | 2 +-
 .../RAS/wallBoiling1D/0.orig/epsilon.liquid                     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.gas    | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.liquid | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.gas  | 2 +-
 .../RAS/wallBoiling1D/0.orig/nut.liquid                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p        | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p_rgh    | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g      | 2 +-
 .../RAS/wallBoiling1D/constant/phaseProperties                  | 2 +-
 .../RAS/wallBoiling1D/constant/thermophysicalProperties.gas     | 2 +-
 .../RAS/wallBoiling1D/constant/thermophysicalProperties.liquid  | 2 +-
 .../RAS/wallBoiling1D/constant/turbulenceProperties.gas         | 2 +-
 .../RAS/wallBoiling1D/constant/turbulenceProperties.liquid      | 2 +-
 .../RAS/wallBoiling1D/system/blockMeshDict                      | 2 +-
 .../RAS/wallBoiling1D/system/controlDict                        | 2 +-
 .../RAS/wallBoiling1D/system/fvSchemes                          | 2 +-
 .../RAS/wallBoiling1D/system/fvSolution                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.gas  | 2 +-
 .../RAS/wallBoilingIATE/0.orig/T.liquid                         | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.gas  | 2 +-
 .../RAS/wallBoilingIATE/0.orig/U.liquid                         | 2 +-
 .../RAS/wallBoilingIATE/0.orig/alpha.gas                        | 2 +-
 .../RAS/wallBoilingIATE/0.orig/alpha.liquid                     | 2 +-
 .../RAS/wallBoilingIATE/0.orig/alphat.gas                       | 2 +-
 .../RAS/wallBoilingIATE/0.orig/alphat.liquid                    | 2 +-
 .../RAS/wallBoilingIATE/0.orig/epsilon.gas                      | 2 +-
 .../RAS/wallBoilingIATE/0.orig/epsilon.liquid                   | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.gas  | 2 +-
 .../RAS/wallBoilingIATE/0.orig/k.liquid                         | 2 +-
 .../RAS/wallBoilingIATE/0.orig/kappai.gas                       | 2 +-
 .../RAS/wallBoilingIATE/0.orig/nut.gas                          | 2 +-
 .../RAS/wallBoilingIATE/0.orig/nut.liquid                       | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p      | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p_rgh  | 2 +-
 .../RAS/wallBoilingIATE/0.orig/water.gas                        | 2 +-
 .../RAS/wallBoilingIATE/0.orig/water.liquid                     | 2 +-
 .../reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g    | 2 +-
 .../RAS/wallBoilingIATE/constant/phaseProperties                | 2 +-
 .../RAS/wallBoilingIATE/constant/thermophysicalProperties.gas   | 2 +-
 .../wallBoilingIATE/constant/thermophysicalProperties.liquid    | 2 +-
 .../RAS/wallBoilingIATE/constant/turbulenceProperties.gas       | 2 +-
 .../RAS/wallBoilingIATE/constant/turbulenceProperties.liquid    | 2 +-
 .../RAS/wallBoilingIATE/system/blockMeshDict                    | 2 +-
 .../RAS/wallBoilingIATE/system/controlDict                      | 2 +-
 .../RAS/wallBoilingIATE/system/fvSchemes                        | 2 +-
 .../RAS/wallBoilingIATE/system/fvSolution                       | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air | 2 +-
 .../laminar/bubbleColumn/0.orig/T.water                         | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air | 2 +-
 .../laminar/bubbleColumn/0.orig/U.water                         | 2 +-
 .../laminar/bubbleColumn/0.orig/alpha.air                       | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p     | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g   | 2 +-
 .../laminar/bubbleColumn/constant/phaseProperties               | 2 +-
 .../laminar/bubbleColumn/constant/thermophysicalProperties.air  | 2 +-
 .../bubbleColumn/constant/thermophysicalProperties.water        | 2 +-
 .../laminar/bubbleColumn/constant/turbulenceProperties.air      | 2 +-
 .../laminar/bubbleColumn/constant/turbulenceProperties.water    | 2 +-
 .../laminar/bubbleColumn/system/blockMeshDict                   | 2 +-
 .../laminar/bubbleColumn/system/controlDict                     | 2 +-
 .../laminar/bubbleColumn/system/fvSchemes                       | 2 +-
 .../laminar/bubbleColumn/system/fvSolution                      | 2 +-
 .../laminar/bubbleColumn/system/setFieldsDict                   | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/CO.gas               | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/H2O.gas              | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/H2O.liquid           | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/T.gas                | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/T.liquid             | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/U.gas                | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/U.liquid             | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/Ydefault             | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/air.gas              | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/air.liquid           | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/alpha.gas            | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/alpha.liquid         | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/p                    | 2 +-
 .../laminar/bubbleColumnEvaporating/0.orig/p_rgh                | 2 +-
 .../laminar/bubbleColumnEvaporating/constant/g                  | 2 +-
 .../laminar/bubbleColumnEvaporating/constant/phaseProperties    | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../bubbleColumnEvaporating/constant/turbulenceProperties.gas   | 2 +-
 .../constant/turbulenceProperties.liquid                        | 2 +-
 .../laminar/bubbleColumnEvaporating/system/blockMeshDict        | 2 +-
 .../laminar/bubbleColumnEvaporating/system/continuityFunctions  | 2 +-
 .../laminar/bubbleColumnEvaporating/system/controlDict          | 2 +-
 .../laminar/bubbleColumnEvaporating/system/decomposeParDict     | 2 +-
 .../laminar/bubbleColumnEvaporating/system/fvSchemes            | 2 +-
 .../laminar/bubbleColumnEvaporating/system/fvSolution           | 2 +-
 .../laminar/bubbleColumnEvaporating/system/setFieldsDict        | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas      | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid   | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas      | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid   | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas    | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.gas  | 2 +-
 .../bubbleColumnEvaporatingDissolving/0.orig/alpha.liquid       | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/p          | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh      | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas  | 2 +-
 .../bubbleColumnEvaporatingDissolving/0.orig/water.liquid       | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/constant/g        | 2 +-
 .../bubbleColumnEvaporatingDissolving/constant/phaseProperties  | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../constant/turbulenceProperties.gas                           | 2 +-
 .../constant/turbulenceProperties.liquid                        | 2 +-
 .../bubbleColumnEvaporatingDissolving/system/blockMeshDict      | 2 +-
 .../bubbleColumnEvaporatingDissolving/system/controlDict        | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes  | 2 +-
 .../laminar/bubbleColumnEvaporatingDissolving/system/fvSolution | 2 +-
 .../bubbleColumnEvaporatingDissolving/system/setFieldsDict      | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/T.air                       | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/T.water                     | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/Theta                       | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/U.air                       | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/U.water                     | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/alpha.air                   | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/kappai.air                  | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/p_rgh                       | 2 +-
 .../laminar/bubbleColumnIATE/constant/g                         | 2 +-
 .../laminar/bubbleColumnIATE/constant/phaseProperties           | 2 +-
 .../bubbleColumnIATE/constant/thermophysicalProperties.air      | 2 +-
 .../bubbleColumnIATE/constant/thermophysicalProperties.water    | 2 +-
 .../laminar/bubbleColumnIATE/constant/turbulenceProperties.air  | 2 +-
 .../bubbleColumnIATE/constant/turbulenceProperties.water        | 2 +-
 .../laminar/bubbleColumnIATE/system/blockMeshDict               | 2 +-
 .../laminar/bubbleColumnIATE/system/controlDict                 | 2 +-
 .../laminar/bubbleColumnIATE/system/fvSchemes                   | 2 +-
 .../laminar/bubbleColumnIATE/system/fvSolution                  | 2 +-
 .../laminar/bubbleColumnIATE/system/setFieldsDict               | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air | 2 +-
 .../laminar/fluidisedBed/0.orig/T.particles                     | 2 +-
 .../laminar/fluidisedBed/0.orig/Theta.particles                 | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air | 2 +-
 .../laminar/fluidisedBed/0.orig/U.particles                     | 2 +-
 .../laminar/fluidisedBed/0.orig/alpha.particles                 | 2 +-
 .../laminar/fluidisedBed/0.orig/alphat.particles                | 2 +-
 .../laminar/fluidisedBed/0.orig/epsilon.air                     | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air | 2 +-
 .../laminar/fluidisedBed/0.orig/nut.air                         | 2 +-
 .../laminar/fluidisedBed/0.orig/nut.particles                   | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p     | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g   | 2 +-
 .../laminar/fluidisedBed/constant/phaseProperties               | 2 +-
 .../laminar/fluidisedBed/constant/thermophysicalProperties.air  | 2 +-
 .../fluidisedBed/constant/thermophysicalProperties.particles    | 2 +-
 .../laminar/fluidisedBed/constant/turbulenceProperties.air      | 2 +-
 .../fluidisedBed/constant/turbulenceProperties.particles        | 2 +-
 .../laminar/fluidisedBed/system/blockMeshDict                   | 2 +-
 .../laminar/fluidisedBed/system/controlDict                     | 2 +-
 .../laminar/fluidisedBed/system/fvSchemes                       | 2 +-
 .../laminar/fluidisedBed/system/fvSolution                      | 2 +-
 .../laminar/fluidisedBed/system/setFieldsDict                   | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air    | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water  | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air    | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water  | 2 +-
 .../laminar/injection/0.orig/alpha.air                          | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p        | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh    | 2 +-
 .../laminar/injection/constant/fvOptions                        | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/injection/constant/g      | 2 +-
 .../laminar/injection/constant/phaseProperties                  | 2 +-
 .../laminar/injection/constant/thermophysicalProperties.air     | 2 +-
 .../laminar/injection/constant/thermophysicalProperties.water   | 2 +-
 .../laminar/injection/constant/turbulenceProperties.air         | 2 +-
 .../laminar/injection/constant/turbulenceProperties.water       | 2 +-
 .../laminar/injection/system/blockMeshDict                      | 2 +-
 .../laminar/injection/system/controlDict                        | 2 +-
 .../laminar/injection/system/fvSchemes                          | 2 +-
 .../laminar/injection/system/fvSolution                         | 2 +-
 .../laminar/injection/system/setFieldsDict                      | 2 +-
 .../laminar/mixerVessel2D/0.orig/T.air                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/T.water                        | 2 +-
 .../laminar/mixerVessel2D/0.orig/Theta                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/U.air                          | 2 +-
 .../laminar/mixerVessel2D/0.orig/U.water                        | 2 +-
 .../laminar/mixerVessel2D/0.orig/alpha.air                      | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p    | 2 +-
 .../laminar/mixerVessel2D/0.orig/p_rgh                          | 2 +-
 .../laminar/mixerVessel2D/constant/MRFProperties                | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g  | 2 +-
 .../laminar/mixerVessel2D/constant/phaseProperties              | 2 +-
 .../laminar/mixerVessel2D/constant/thermophysicalProperties.air | 2 +-
 .../mixerVessel2D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.air     | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.water   | 2 +-
 .../laminar/mixerVessel2D/system/blockMeshDict.m4               | 2 +-
 .../laminar/mixerVessel2D/system/controlDict                    | 2 +-
 .../laminar/mixerVessel2D/system/fvSchemes                      | 2 +-
 .../laminar/mixerVessel2D/system/fvSolution                     | 2 +-
 .../laminar/mixerVessel2D/system/topoSetDict                    | 2 +-
 .../laminar/steamInjection/0.orig/T.steam                       | 2 +-
 .../laminar/steamInjection/0.orig/T.water                       | 2 +-
 .../laminar/steamInjection/0.orig/U.steam                       | 2 +-
 .../laminar/steamInjection/0.orig/U.water                       | 2 +-
 .../laminar/steamInjection/0.orig/alpha.steam                   | 2 +-
 .../laminar/steamInjection/0.orig/alpha.water                   | 2 +-
 .../laminar/steamInjection/0.orig/nut.water                     | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p   | 2 +-
 .../laminar/steamInjection/0.orig/p_rgh                         | 2 +-
 .../laminar/steamInjection/0.orig/water.steam                   | 2 +-
 .../laminar/steamInjection/0.orig/water.water                   | 2 +-
 .../laminar/steamInjection/constant/fvOptions                   | 2 +-
 .../reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g | 2 +-
 .../laminar/steamInjection/constant/phaseProperties             | 2 +-
 .../steamInjection/constant/thermophysicalProperties.steam      | 2 +-
 .../steamInjection/constant/thermophysicalProperties.water      | 2 +-
 .../laminar/steamInjection/constant/turbulenceProperties.steam  | 2 +-
 .../laminar/steamInjection/constant/turbulenceProperties.water  | 2 +-
 .../laminar/steamInjection/system/blockMeshDict                 | 2 +-
 .../laminar/steamInjection/system/controlDict                   | 2 +-
 .../laminar/steamInjection/system/fvSchemes                     | 2 +-
 .../laminar/steamInjection/system/fvSolution                    | 2 +-
 tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U  | 2 +-
 .../twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge        | 2 +-
 .../multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh    | 2 +-
 .../multiphase/twoLiquidMixingFoam/lockExchange/constant/g      | 2 +-
 .../lockExchange/constant/transportProperties                   | 2 +-
 .../lockExchange/constant/turbulenceProperties                  | 2 +-
 .../twoLiquidMixingFoam/lockExchange/system/blockMeshDict       | 2 +-
 .../twoLiquidMixingFoam/lockExchange/system/controlDict         | 2 +-
 .../twoLiquidMixingFoam/lockExchange/system/fvSchemes           | 2 +-
 .../twoLiquidMixingFoam/lockExchange/system/fvSolution          | 2 +-
 .../twoLiquidMixingFoam/lockExchange/system/setFieldsDict       | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air  | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water           | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta  | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air  | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water           | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air         | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air        | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water      | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air       | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water     | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air  | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water           | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air           | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water         | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p      | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh  | 2 +-
 .../multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g    | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties | 2 +-
 .../LES/bubbleColumn/constant/thermophysicalProperties.air      | 2 +-
 .../LES/bubbleColumn/constant/thermophysicalProperties.water    | 2 +-
 .../LES/bubbleColumn/constant/turbulenceProperties.air          | 2 +-
 .../LES/bubbleColumn/constant/turbulenceProperties.water        | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict     | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict       | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes         | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution        | 2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict     | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air  | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water           | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta  | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air  | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water           | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air         | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air        | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water      | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air       | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water     | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm          | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air  | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water           | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km     | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air           | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water         | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p      | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh  | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g    | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties | 2 +-
 .../RAS/bubbleColumn/constant/thermophysicalProperties.air      | 2 +-
 .../RAS/bubbleColumn/constant/thermophysicalProperties.water    | 2 +-
 .../RAS/bubbleColumn/constant/turbulenceProperties.air          | 2 +-
 .../RAS/bubbleColumn/constant/turbulenceProperties.water        | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict     | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict       | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes         | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution        | 2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict     | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air  | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles       | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles   | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air  | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles       | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air         | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles   | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air        | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles  | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air       | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air  | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air           | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles     | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p      | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh  | 2 +-
 .../multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g    | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties | 2 +-
 .../RAS/fluidisedBed/constant/thermophysicalProperties.air      | 2 +-
 .../fluidisedBed/constant/thermophysicalProperties.particles    | 2 +-
 .../RAS/fluidisedBed/constant/turbulenceProperties.air          | 2 +-
 .../RAS/fluidisedBed/constant/turbulenceProperties.particles    | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict     | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict       | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes         | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution        | 2 +-
 .../twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict     | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air         | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water       | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta         | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air         | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water       | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air     | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p  | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh         | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/constant/g           | 2 +-
 .../laminar/bubbleColumn/constant/phaseProperties               | 2 +-
 .../laminar/bubbleColumn/constant/thermophysicalProperties.air  | 2 +-
 .../bubbleColumn/constant/thermophysicalProperties.water        | 2 +-
 .../laminar/bubbleColumn/constant/turbulenceProperties.air      | 2 +-
 .../laminar/bubbleColumn/constant/turbulenceProperties.water    | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict   | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes     | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution    | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air     | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water   | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta     | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air     | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water   | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air | 2 +-
 .../laminar/bubbleColumnIATE/0.orig/kappai.air                  | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p         | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh     | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g       | 2 +-
 .../laminar/bubbleColumnIATE/constant/phaseProperties           | 2 +-
 .../bubbleColumnIATE/constant/thermophysicalProperties.air      | 2 +-
 .../bubbleColumnIATE/constant/thermophysicalProperties.water    | 2 +-
 .../laminar/bubbleColumnIATE/constant/turbulenceProperties.air  | 2 +-
 .../bubbleColumnIATE/constant/turbulenceProperties.water        | 2 +-
 .../laminar/bubbleColumnIATE/system/blockMeshDict               | 2 +-
 .../laminar/bubbleColumnIATE/system/controlDict                 | 2 +-
 .../twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes | 2 +-
 .../laminar/bubbleColumnIATE/system/fvSolution                  | 2 +-
 .../laminar/bubbleColumnIATE/system/setFieldsDict               | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air         | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles   | 2 +-
 .../laminar/fluidisedBed/0.orig/Theta.particles                 | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air         | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles   | 2 +-
 .../laminar/fluidisedBed/0.orig/alpha.particles                 | 2 +-
 .../laminar/fluidisedBed/0.orig/alphat.particles                | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air   | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air         | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air       | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p  | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh         | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/constant/g           | 2 +-
 .../laminar/fluidisedBed/constant/phaseProperties               | 2 +-
 .../laminar/fluidisedBed/constant/thermophysicalProperties.air  | 2 +-
 .../fluidisedBed/constant/thermophysicalProperties.particles    | 2 +-
 .../laminar/fluidisedBed/constant/turbulenceProperties.air      | 2 +-
 .../fluidisedBed/constant/turbulenceProperties.particles        | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict   | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes     | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution    | 2 +-
 .../twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/0.orig/T.water          | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/0.orig/U.water          | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air        | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p     | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/constant/fvOptions      | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/injection/constant/g   | 2 +-
 .../laminar/injection/constant/phaseProperties                  | 2 +-
 .../laminar/injection/constant/thermophysicalProperties.air     | 2 +-
 .../laminar/injection/constant/thermophysicalProperties.water   | 2 +-
 .../laminar/injection/constant/turbulenceProperties.air         | 2 +-
 .../laminar/injection/constant/turbulenceProperties.water       | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/system/blockMeshDict    | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/system/controlDict      | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/system/fvSchemes        | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/system/fvSolution       | 2 +-
 .../twoPhaseEulerFoam/laminar/injection/system/setFieldsDict    | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air        | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water      | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta        | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air        | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water      | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air    | 2 +-
 .../multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh        | 2 +-
 .../laminar/mixerVessel2D/constant/MRFProperties                | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g          | 2 +-
 .../laminar/mixerVessel2D/constant/phaseProperties              | 2 +-
 .../laminar/mixerVessel2D/constant/thermophysicalProperties.air | 2 +-
 .../mixerVessel2D/constant/thermophysicalProperties.water       | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.air     | 2 +-
 .../laminar/mixerVessel2D/constant/turbulenceProperties.water   | 2 +-
 .../laminar/mixerVessel2D/system/blockMeshDict.m4               | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict  | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes    | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution   | 2 +-
 .../twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict  | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp | 2 +-
 .../preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers      | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su   | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T    | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu   | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U    | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi   | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp   | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b    | 2 +-
 .../preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon    | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft   | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k    | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p    | 2 +-
 .../PDRsetFields/simplePipeCage/constant/PDRProperties          | 2 +-
 .../PDRsetFields/simplePipeCage/constant/combustionProperties   | 2 +-
 .../PDRsetFields/simplePipeCage/constant/dynamicMeshDict        | 2 +-
 tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/g  | 2 +-
 .../simplePipeCage/constant/thermophysicalProperties            | 2 +-
 .../PDRsetFields/simplePipeCage/constant/turbulenceProperties   | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group01         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group11         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group14         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group15         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group17         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group21         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group31         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/groups/group41         | 2 +-
 .../PDRsetFields/simplePipeCage/geometry/obstaclesDict          | 2 +-
 .../PDRsetFields/simplePipeCage/system/PDRblockMeshDict         | 2 +-
 .../PDRsetFields/simplePipeCage/system/PDRsetFieldsDict         | 2 +-
 .../PDRsetFields/simplePipeCage/system/controlDict              | 2 +-
 .../PDRsetFields/simplePipeCage/system/createPatchDict          | 2 +-
 .../PDRsetFields/simplePipeCage/system/decomposeParDict         | 2 +-
 .../preProcessing/PDRsetFields/simplePipeCage/system/fvSchemes  | 2 +-
 .../preProcessing/PDRsetFields/simplePipeCage/system/fvSolution | 2 +-
 .../PDRsetFields/simplePipeCage/system/mapFieldsDict            | 2 +-
 .../preProcessing/PDRsetFields/simplePipeCage/system/probes     | 2 +-
 .../PDRsetFields/simplePipeCage/system/refineMeshDict           | 2 +-
 .../PDRsetFields/simplePipeCage/system/setFieldsDict            | 2 +-
 .../PDRsetFields/simplePipeCage/system/setFieldsDict1           | 2 +-
 .../PDRsetFields/simplePipeCage/system/topoSetDict              | 2 +-
 .../createZeroDirectory/cavity/constant/transportProperties     | 2 +-
 .../createZeroDirectory/cavity/system/blockMeshDict             | 2 +-
 .../createZeroDirectory/cavity/system/caseProperties            | 2 +-
 .../preProcessing/createZeroDirectory/cavity/system/controlDict | 2 +-
 .../preProcessing/createZeroDirectory/cavity/system/fvSchemes   | 2 +-
 .../preProcessing/createZeroDirectory/cavity/system/fvSolution  | 2 +-
 .../createZeroDirectory/motorBike/constant/transportProperties  | 2 +-
 .../createZeroDirectory/motorBike/constant/turbulenceProperties | 2 +-
 .../createZeroDirectory/motorBike/system/blockMeshDict          | 2 +-
 .../createZeroDirectory/motorBike/system/controlDict            | 2 +-
 .../createZeroDirectory/motorBike/system/decomposeParDict       | 2 +-
 .../createZeroDirectory/motorBike/system/fvSchemes              | 2 +-
 .../createZeroDirectory/motorBike/system/fvSolution             | 2 +-
 .../createZeroDirectory/motorBike/system/meshQualityDict        | 2 +-
 .../createZeroDirectory/motorBike/system/snappyHexMeshDict      | 2 +-
 .../motorBike/system/surfaceFeatureExtractDict                  | 2 +-
 .../snappyMultiRegionHeater/constant/bottomAir/g                | 2 +-
 .../constant/bottomAir/radiationProperties                      | 2 +-
 .../constant/bottomAir/thermophysicalProperties                 | 2 +-
 .../constant/bottomAir/turbulenceProperties                     | 2 +-
 .../createZeroDirectory/snappyMultiRegionHeater/constant/g      | 2 +-
 .../snappyMultiRegionHeater/constant/heater/radiationProperties | 2 +-
 .../constant/heater/thermophysicalProperties                    | 2 +-
 .../constant/leftSolid/radiationProperties                      | 2 +-
 .../snappyMultiRegionHeater/constant/regionProperties           | 2 +-
 .../constant/rightSolid/radiationProperties                     | 2 +-
 .../snappyMultiRegionHeater/constant/topAir/g                   | 2 +-
 .../snappyMultiRegionHeater/constant/topAir/radiationProperties | 2 +-
 .../constant/topAir/thermophysicalProperties                    | 2 +-
 .../constant/topAir/turbulenceProperties                        | 2 +-
 .../snappyMultiRegionHeater/system/blockMeshDict                | 2 +-
 .../system/bottomAir/changeDictionaryDict                       | 2 +-
 .../snappyMultiRegionHeater/system/bottomAir/decomposeParDict   | 2 +-
 .../snappyMultiRegionHeater/system/bottomAir/fvSchemes          | 2 +-
 .../snappyMultiRegionHeater/system/bottomAir/fvSolution         | 2 +-
 .../snappyMultiRegionHeater/system/controlDict                  | 2 +-
 .../snappyMultiRegionHeater/system/decomposeParDict             | 2 +-
 .../snappyMultiRegionHeater/system/fvSchemes                    | 2 +-
 .../snappyMultiRegionHeater/system/fvSolution                   | 2 +-
 .../snappyMultiRegionHeater/system/heater/changeDictionaryDict  | 2 +-
 .../snappyMultiRegionHeater/system/heater/decomposeParDict      | 2 +-
 .../snappyMultiRegionHeater/system/heater/fvSchemes             | 2 +-
 .../snappyMultiRegionHeater/system/heater/fvSolution            | 2 +-
 .../system/leftSolid/changeDictionaryDict                       | 2 +-
 .../snappyMultiRegionHeater/system/leftSolid/decomposeParDict   | 2 +-
 .../snappyMultiRegionHeater/system/leftSolid/fvSchemes          | 2 +-
 .../system/rightSolid/changeDictionaryDict                      | 2 +-
 .../snappyMultiRegionHeater/system/rightSolid/decomposeParDict  | 2 +-
 .../snappyMultiRegionHeater/system/rightSolid/fvSchemes         | 2 +-
 .../snappyMultiRegionHeater/system/snappyHexMeshDict            | 2 +-
 .../snappyMultiRegionHeater/system/surfaceFeatureExtractDict    | 2 +-
 .../snappyMultiRegionHeater/system/topAir/changeDictionaryDict  | 2 +-
 .../snappyMultiRegionHeater/system/topAir/decomposeParDict      | 2 +-
 .../snappyMultiRegionHeater/system/topAir/fvSchemes             | 2 +-
 .../snappyMultiRegionHeater/system/topAir/fvSolution            | 2 +-
 .../geometric/constant/transportProperties                      | 2 +-
 .../geometric/constant/turbulenceProperties                     | 2 +-
 .../decompositionConstraints/geometric/system/blockMeshDict     | 2 +-
 .../decompositionConstraints/geometric/system/controlDict       | 2 +-
 .../geometric/system/decomposeConstraints                       | 2 +-
 .../decompositionConstraints/geometric/system/decomposeParDict  | 2 +-
 .../geometric/system/decomposeParDict.8                         | 2 +-
 .../decompositionConstraints/geometric/system/fvSchemes         | 2 +-
 .../decompositionConstraints/geometric/system/fvSolution        | 2 +-
 tutorials/resources/geometry/fridgeA.eMesh                      | 2 +-
 .../stressAnalysis/solidDisplacementFoam/plateHole/0.orig/D     | 2 +-
 .../stressAnalysis/solidDisplacementFoam/plateHole/0.orig/T     | 2 +-
 .../plateHole/constant/mechanicalProperties                     | 2 +-
 .../solidDisplacementFoam/plateHole/constant/thermalProperties  | 2 +-
 .../solidDisplacementFoam/plateHole/system/blockMeshDict        | 2 +-
 .../solidDisplacementFoam/plateHole/system/controlDict          | 2 +-
 .../solidDisplacementFoam/plateHole/system/decomposeParDict     | 2 +-
 .../solidDisplacementFoam/plateHole/system/fvSchemes            | 2 +-
 .../solidDisplacementFoam/plateHole/system/fvSolution           | 2 +-
 .../solidDisplacementFoam/plateHole/system/singleGraph          | 2 +-
 .../solidEquilibriumDisplacementFoam/beamEndLoad/0/D            | 2 +-
 .../solidEquilibriumDisplacementFoam/beamEndLoad/0/p            | 2 +-
 .../beamEndLoad/constant/mechanicalProperties                   | 2 +-
 .../beamEndLoad/constant/thermalProperties                      | 2 +-
 .../beamEndLoad/system/blockMeshDict                            | 2 +-
 .../beamEndLoad/system/controlDict                              | 2 +-
 .../beamEndLoad/system/fvSchemes                                | 2 +-
 .../beamEndLoad/system/fvSolution                               | 2 +-
 .../atmDownstreamDevelopment/setups.orig/common/0.orig/U        | 2 +-
 .../setups.orig/common/0.orig/include/ABLConditions             | 2 +-
 .../atmDownstreamDevelopment/setups.orig/common/0.orig/k        | 2 +-
 .../atmDownstreamDevelopment/setups.orig/common/0.orig/nut      | 2 +-
 .../atmDownstreamDevelopment/setups.orig/common/0.orig/p        | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/system/blockMeshDict                     | 2 +-
 .../setups.orig/common/system/controlDict                       | 2 +-
 .../setups.orig/common/system/decomposeParDict                  | 2 +-
 .../setups.orig/common/system/fvSchemes                         | 2 +-
 .../setups.orig/common/system/fvSolution                        | 2 +-
 .../setups.orig/kEpsilon/0.orig/epsilon                         | 2 +-
 .../setups.orig/kEpsilon/constant/turbulenceProperties          | 2 +-
 .../atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/omega | 2 +-
 .../setups.orig/kOmegaSST/constant/turbulenceProperties         | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd       | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD      | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/T        | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/U        | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/alphat   | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/k        | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/nut      | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/0.orig/p_rgh    | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/common/constant/g      | 2 +-
 .../precursor/setups.orig/common/constant/transportProperties   | 2 +-
 .../precursor/setups.orig/common/system/blockMeshDict           | 2 +-
 .../precursor/setups.orig/common/system/controlDict             | 2 +-
 .../precursor/setups.orig/common/system/decomposeParDict        | 2 +-
 .../precursor/setups.orig/common/system/fvSchemes               | 2 +-
 .../precursor/setups.orig/common/system/fvSolution              | 2 +-
 .../precursor/setups.orig/kEpsilon/0.orig/epsilon               | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/qPlant | 2 +-
 .../precursor/setups.orig/kEpsilon/constant/fvOptions           | 2 +-
 .../setups.orig/kEpsilon/constant/turbulenceProperties          | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/kL/0.orig/qPlant       | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions  | 2 +-
 .../precursor/setups.orig/kL/constant/turbulenceProperties      | 2 +-
 .../atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/omega | 2 +-
 .../precursor/setups.orig/kOmegaSST/0.orig/qPlant               | 2 +-
 .../precursor/setups.orig/kOmegaSST/constant/fvOptions          | 2 +-
 .../setups.orig/kOmegaSST/constant/turbulenceProperties         | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/0.orig/T        | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/0.orig/U        | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/0.orig/alphat   | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/0.orig/k        | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/0.orig/nut      | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/0.orig/p_rgh    | 2 +-
 .../successor/setups.orig/common/constant/fvOptions             | 2 +-
 .../atmFlatTerrain/successor/setups.orig/common/constant/g      | 2 +-
 .../successor/setups.orig/common/constant/transportProperties   | 2 +-
 .../successor/setups.orig/common/system/blockMeshDict           | 2 +-
 .../successor/setups.orig/common/system/controlDict             | 2 +-
 .../successor/setups.orig/common/system/createPatchDict         | 2 +-
 .../successor/setups.orig/common/system/decomposeParDict        | 2 +-
 .../successor/setups.orig/common/system/fvSchemes               | 2 +-
 .../successor/setups.orig/common/system/fvSolution              | 2 +-
 .../successor/setups.orig/common/system/mapFieldsDict           | 2 +-
 .../successor/setups.orig/common/system/topoSetDict             | 2 +-
 .../successor/setups.orig/kEpsilon/0.orig/epsilon               | 2 +-
 .../setups.orig/kEpsilon/constant/turbulenceProperties          | 2 +-
 .../atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions  | 2 +-
 .../successor/setups.orig/kL/constant/turbulenceProperties      | 2 +-
 .../atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/omega | 2 +-
 .../setups.orig/kOmegaSST/constant/turbulenceProperties         | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/Cd             | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/LAD            | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/T              | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/U              | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/alphat         | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/epsilon        | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/k              | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/nut            | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/omega          | 2 +-
 .../atmForestStability/setups.orig/common/0.orig/p_rgh          | 2 +-
 .../atmForestStability/setups.orig/common/constant/g            | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/constant/turbulenceProperties            | 2 +-
 .../atmForestStability/setups.orig/common/system/blockMeshDict  | 2 +-
 .../atmForestStability/setups.orig/common/system/controlDict    | 2 +-
 .../setups.orig/common/system/decomposeParDict                  | 2 +-
 .../atmForestStability/setups.orig/common/system/fvSchemes      | 2 +-
 .../atmForestStability/setups.orig/common/system/fvSolution     | 2 +-
 .../atmForestStability/setups.orig/neutral/0.orig/qPlant        | 2 +-
 .../atmForestStability/setups.orig/neutral/constant/fvOptions   | 2 +-
 .../atmForestStability/setups.orig/neutral/system/setFieldsDict | 2 +-
 .../atmForestStability/setups.orig/slightlyStable/0.orig/qPlant | 2 +-
 .../setups.orig/slightlyStable/constant/fvOptions               | 2 +-
 .../setups.orig/slightlyStable/system/setFieldsDict             | 2 +-
 .../setups.orig/slightlyUnstable/0.orig/qPlant                  | 2 +-
 .../setups.orig/slightlyUnstable/constant/fvOptions             | 2 +-
 .../setups.orig/slightlyUnstable/system/setFieldsDict           | 2 +-
 .../atmForestStability/setups.orig/stable/0.orig/qPlant         | 2 +-
 .../atmForestStability/setups.orig/stable/constant/fvOptions    | 2 +-
 .../atmForestStability/setups.orig/stable/system/setFieldsDict  | 2 +-
 .../atmForestStability/setups.orig/unstable/0.orig/qPlant       | 2 +-
 .../atmForestStability/setups.orig/unstable/constant/fvOptions  | 2 +-
 .../setups.orig/unstable/system/setFieldsDict                   | 2 +-
 .../atmForestStability/setups.orig/veryStable/0.orig/qPlant     | 2 +-
 .../setups.orig/veryStable/constant/fvOptions                   | 2 +-
 .../setups.orig/veryStable/system/setFieldsDict                 | 2 +-
 .../multiphase/StefanProblem/setups.orig/common/0.orig/U        | 2 +-
 .../multiphase/StefanProblem/setups.orig/common/0.orig/p_rgh    | 2 +-
 .../multiphase/StefanProblem/setups.orig/common/constant/g      | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/constant/turbulenceProperties            | 2 +-
 .../StefanProblem/setups.orig/common/system/blockMeshDict       | 2 +-
 .../StefanProblem/setups.orig/common/system/decomposeParDict    | 2 +-
 .../setups.orig/icoReactingMultiphaseInterFoam/0.orig/T         | 2 +-
 .../setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.gas | 2 +-
 .../icoReactingMultiphaseInterFoam/0.orig/alpha.liquid          | 2 +-
 .../icoReactingMultiphaseInterFoam/constant/phaseProperties     | 2 +-
 .../constant/thermophysicalProperties.gas                       | 2 +-
 .../constant/thermophysicalProperties.liquid                    | 2 +-
 .../icoReactingMultiphaseInterFoam/system/controlDict           | 2 +-
 .../setups.orig/icoReactingMultiphaseInterFoam/system/fvSchemes | 2 +-
 .../icoReactingMultiphaseInterFoam/system/fvSolution            | 2 +-
 .../icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.gas | 2 +-
 .../system/setAlphaFieldDict.liquid                             | 2 +-
 .../setups.orig/interCondensatingEvaporatingFoam/0.orig/T       | 2 +-
 .../interCondensatingEvaporatingFoam/0.orig/alpha.liquid        | 2 +-
 .../setups.orig/interCondensatingEvaporatingFoam/0.orig/p       | 2 +-
 .../constant/phaseChangeProperties                              | 2 +-
 .../constant/thermophysicalProperties                           | 2 +-
 .../interCondensatingEvaporatingFoam/system/controlDict         | 2 +-
 .../interCondensatingEvaporatingFoam/system/fvSchemes           | 2 +-
 .../interCondensatingEvaporatingFoam/system/fvSolution          | 2 +-
 .../interCondensatingEvaporatingFoam/system/setAlphaFieldDict   | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/0.orig/U             | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/0.orig/alpha.water   | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/0.orig/p_rgh         | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/0.orig/porosity      | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/constant/g           | 2 +-
 .../interIsoFoam/porousDamBreak/constant/porosityProperties     | 2 +-
 .../interIsoFoam/porousDamBreak/constant/transportProperties    | 2 +-
 .../interIsoFoam/porousDamBreak/constant/turbulenceProperties   | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/system/blockMeshDict | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/system/controlDict   | 2 +-
 .../interIsoFoam/porousDamBreak/system/decomposeParDict         | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/system/fvSchemes     | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/system/fvSolution    | 2 +-
 .../multiphase/interIsoFoam/porousDamBreak/system/setFieldsDict | 2 +-
 .../schemes/divergenceExample/0.orig/T                          | 2 +-
 .../schemes/divergenceExample/0.orig/U                          | 2 +-
 .../schemes/divergenceExample/constant/transportProperties      | 2 +-
 .../schemes/divergenceExample/system/blockMeshDict              | 2 +-
 .../schemes/divergenceExample/system/controlDict                | 2 +-
 .../schemes/divergenceExample/system/fvSchemes                  | 2 +-
 .../schemes/divergenceExample/system/fvSchemes.template         | 2 +-
 .../schemes/divergenceExample/system/fvSolution                 | 2 +-
 .../nonOrthogonalChannel/setups.orig/0/system/blockMeshDict     | 2 +-
 .../nonOrthogonalChannel/setups.orig/10/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/20/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/30/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/40/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/50/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/60/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/70/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/80/system/blockMeshDict    | 2 +-
 .../nonOrthogonalChannel/setups.orig/85/system/blockMeshDict    | 2 +-
 .../schemes/nonOrthogonalChannel/setups.orig/common/0.orig/U    | 2 +-
 .../schemes/nonOrthogonalChannel/setups.orig/common/0.orig/k    | 2 +-
 .../schemes/nonOrthogonalChannel/setups.orig/common/0.orig/nut  | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/0.orig/omega        | 2 +-
 .../schemes/nonOrthogonalChannel/setups.orig/common/0.orig/p    | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/constant/turbulenceProperties            | 2 +-
 .../setups.orig/common/system/decomposeParDict                  | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/system/fvSchemes    | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/system/fvSolution   | 2 +-
 .../setups.orig/common/system/sampleEpsilon                     | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/system/sampleG      | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/system/sampleK      | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/system/sampleR      | 2 +-
 .../nonOrthogonalChannel/setups.orig/common/system/sampleU      | 2 +-
 .../skewnessCavity/setups.orig/Gauss-linear/system/fvSchemes    | 2 +-
 .../setups.orig/Gauss-pointLinear/system/fvSchemes              | 2 +-
 .../setups.orig/cellLimited-Gauss-linear-1/system/fvSchemes     | 2 +-
 .../cellLimited-Gauss-pointLinear-1/system/fvSchemes            | 2 +-
 .../cellLimited-iterativeGauss-linear-5-1/system/fvSchemes      | 2 +-
 .../setups.orig/cellLimited-leastSquares-1/system/fvSchemes     | 2 +-
 .../setups.orig/cellMDLimited-Gauss-linear-1/system/fvSchemes   | 2 +-
 .../cellMDLimited-Gauss-pointLinear-1/system/fvSchemes          | 2 +-
 .../cellMDLimited-iterativeGauss-linear-5-1/system/fvSchemes    | 2 +-
 .../setups.orig/cellMDLimited-leastSquares-1/system/fvSchemes   | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../skewnessCavity/setups.orig/common/system/controlDict        | 2 +-
 .../skewnessCavity/setups.orig/common/system/cuttingPlane       | 2 +-
 .../skewnessCavity/setups.orig/common/system/decomposeParDict   | 2 +-
 .../schemes/skewnessCavity/setups.orig/common/system/fvSolution | 2 +-
 .../setups.orig/faceLimited-Gauss-linear-1/system/fvSchemes     | 2 +-
 .../faceLimited-Gauss-pointLinear-1/system/fvSchemes            | 2 +-
 .../faceLimited-iterativeGauss-linear-5-1/system/fvSchemes      | 2 +-
 .../setups.orig/faceLimited-leastSquares-1/system/fvSchemes     | 2 +-
 .../setups.orig/faceMDLimited-Gauss-linear-1/system/fvSchemes   | 2 +-
 .../faceMDLimited-Gauss-pointLinear-1/system/fvSchemes          | 2 +-
 .../faceMDLimited-iterativeGauss-linear-5-1/system/fvSchemes    | 2 +-
 .../setups.orig/faceMDLimited-leastSquares-1/system/fvSchemes   | 2 +-
 .../setups.orig/iterativeGauss-linear-1/system/fvSchemes        | 2 +-
 .../setups.orig/iterativeGauss-linear-10/system/fvSchemes       | 2 +-
 .../setups.orig/iterativeGauss-linear-2/system/fvSchemes        | 2 +-
 .../setups.orig/iterativeGauss-linear-20/system/fvSchemes       | 2 +-
 .../setups.orig/iterativeGauss-linear-3/system/fvSchemes        | 2 +-
 .../setups.orig/iterativeGauss-linear-4/system/fvSchemes        | 2 +-
 .../setups.orig/iterativeGauss-linear-5/system/fvSchemes        | 2 +-
 .../skewnessCavity/setups.orig/leastSquares/system/fvSchemes    | 2 +-
 .../schemes/weightedFluxExample/0.orig/DT                       | 2 +-
 .../schemes/weightedFluxExample/0.orig/T                        | 2 +-
 .../schemes/weightedFluxExample/constant/transportProperties    | 2 +-
 .../schemes/weightedFluxExample/system/blockMeshDict            | 2 +-
 .../schemes/weightedFluxExample/system/controlDict.template     | 2 +-
 .../schemes/weightedFluxExample/system/fvSchemes.template       | 2 +-
 .../schemes/weightedFluxExample/system/fvSolution               | 2 +-
 .../schemes/weightedFluxExample/system/setFieldsDict            | 2 +-
 .../schemes/weightedFluxExample/system/singleGraph              | 2 +-
 .../planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/R | 2 +-
 .../setups.orig/EBRSM.setTurbulenceFields/0.orig/epsilon        | 2 +-
 .../planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/f | 2 +-
 .../planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/k | 2 +-
 .../EBRSM.setTurbulenceFields/constant/turbulenceProperties     | 2 +-
 .../EBRSM.setTurbulenceFields/system/setTurbulenceFieldsDict    | 2 +-
 .../turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/R    | 2 +-
 .../planeChannel/setups.orig/EBRSM/0.orig/epsilon               | 2 +-
 .../turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/f    | 2 +-
 .../turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/k    | 2 +-
 .../setups.orig/EBRSM/constant/turbulenceProperties             | 2 +-
 .../turbulenceModels/planeChannel/setups.orig/common/0.orig/U   | 2 +-
 .../turbulenceModels/planeChannel/setups.orig/common/0.orig/nut | 2 +-
 .../turbulenceModels/planeChannel/setups.orig/common/0.orig/p   | 2 +-
 .../planeChannel/setups.orig/common/constant/fvOptions          | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../planeChannel/setups.orig/common/system/blockMeshDict        | 2 +-
 .../planeChannel/setups.orig/common/system/decomposeParDict     | 2 +-
 .../planeChannel/setups.orig/common/system/fvSchemes            | 2 +-
 .../planeChannel/setups.orig/common/system/fvSolution           | 2 +-
 .../planeChannel/setups.orig/common/system/sampleEpsilon        | 2 +-
 .../planeChannel/setups.orig/common/system/sampleF              | 2 +-
 .../planeChannel/setups.orig/common/system/sampleG              | 2 +-
 .../planeChannel/setups.orig/common/system/sampleK              | 2 +-
 .../planeChannel/setups.orig/common/system/sampleR              | 2 +-
 .../planeChannel/setups.orig/common/system/sampleU              | 2 +-
 .../planeChannel/setups.orig/kOmegaSST/0.orig/k                 | 2 +-
 .../planeChannel/setups.orig/kOmegaSST/0.orig/omega             | 2 +-
 .../setups.orig/kOmegaSST/constant/turbulenceProperties         | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/DFM/0.orig/T           | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/DFM/0.orig/U           | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/DFSEM/0.orig/U         | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/FSM/0.orig/T           | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/FSM/0.orig/U           | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/common/0.orig/T        | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/common/0.orig/nut      | 2 +-
 .../oneCellThickPlaneChannel/setups.orig/common/0.orig/p        | 2 +-
 .../setups.orig/common/constant/transportProperties             | 2 +-
 .../setups.orig/common/constant/turbulenceProperties            | 2 +-
 .../setups.orig/common/system/blockMeshDict                     | 2 +-
 .../setups.orig/common/system/controlDict                       | 2 +-
 .../setups.orig/common/system/decomposeParDict                  | 2 +-
 .../setups.orig/common/system/fvSchemes                         | 2 +-
 .../setups.orig/common/system/fvSolution                        | 2 +-
 8430 files changed, 8430 insertions(+), 8430 deletions(-)

diff --git a/applications/test/Function1/case1/constant/function1Properties b/applications/test/Function1/case1/constant/function1Properties
index 668c53ad2c..c68ef17c95 100644
--- a/applications/test/Function1/case1/constant/function1Properties
+++ b/applications/test/Function1/case1/constant/function1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/Function1/case1/system/controlDict b/applications/test/Function1/case1/system/controlDict
index 61cc73ad57..19b09f0e35 100644
--- a/applications/test/Function1/case1/system/controlDict
+++ b/applications/test/Function1/case1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/Hashing2/hashingTests b/applications/test/Hashing2/hashingTests
index 1d7862f347..76ae87fadf 100644
--- a/applications/test/Hashing2/hashingTests
+++ b/applications/test/Hashing2/hashingTests
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/PDRblockMesh/box0/system/PDRblockMeshDict b/applications/test/PDRblockMesh/box0/system/PDRblockMeshDict
index 62275b7f96..5d57398b0e 100644
--- a/applications/test/PDRblockMesh/box0/system/PDRblockMeshDict
+++ b/applications/test/PDRblockMesh/box0/system/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/PDRblockMesh/box0/system/controlDict b/applications/test/PDRblockMesh/box0/system/controlDict
index 9c4e692681..ae30d28c45 100644
--- a/applications/test/PDRblockMesh/box0/system/controlDict
+++ b/applications/test/PDRblockMesh/box0/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/PDRblockMesh/box0/system/fvSchemes b/applications/test/PDRblockMesh/box0/system/fvSchemes
index 7ca0c02163..fc8d4b875e 100644
--- a/applications/test/PDRblockMesh/box0/system/fvSchemes
+++ b/applications/test/PDRblockMesh/box0/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/PDRblockMesh/box0/system/fvSolution b/applications/test/PDRblockMesh/box0/system/fvSolution
index 91b6093d5a..edc1c9cab0 100644
--- a/applications/test/PDRblockMesh/box0/system/fvSolution
+++ b/applications/test/PDRblockMesh/box0/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/PatchFunction1/function1Properties b/applications/test/PatchFunction1/function1Properties
index f57f527acd..591728ce8b 100644
--- a/applications/test/PatchFunction1/function1Properties
+++ b/applications/test/PatchFunction1/function1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/codeStream/codeStreamDict1 b/applications/test/codeStream/codeStreamDict1
index 1387598d86..e67a7e776a 100644
--- a/applications/test/codeStream/codeStreamDict1
+++ b/applications/test/codeStream/codeStreamDict1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/coordinateSystem/testCase0/constant/coordinateSystems b/applications/test/coordinateSystem/testCase0/constant/coordinateSystems
index 1ed0e924a5..461c7355d5 100644
--- a/applications/test/coordinateSystem/testCase0/constant/coordinateSystems
+++ b/applications/test/coordinateSystem/testCase0/constant/coordinateSystems
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/coordinateSystem/testCase0/system/controlDict b/applications/test/coordinateSystem/testCase0/system/controlDict
index 51f7481489..1487413aca 100644
--- a/applications/test/coordinateSystem/testCase0/system/controlDict
+++ b/applications/test/coordinateSystem/testCase0/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/coordinateSystem/testCase1/constant/coordinateSystems b/applications/test/coordinateSystem/testCase1/constant/coordinateSystems
index d4c97f13f3..25af1c6fb4 100644
--- a/applications/test/coordinateSystem/testCase1/constant/coordinateSystems
+++ b/applications/test/coordinateSystem/testCase1/constant/coordinateSystems
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/coordinateSystem/testCase1/system/controlDict b/applications/test/coordinateSystem/testCase1/system/controlDict
index 51f7481489..1487413aca 100644
--- a/applications/test/coordinateSystem/testCase1/system/controlDict
+++ b/applications/test/coordinateSystem/testCase1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/coordinateSystem/testCsys1 b/applications/test/coordinateSystem/testCsys1
index 8a3817a638..a737507b54 100644
--- a/applications/test/coordinateSystem/testCsys1
+++ b/applications/test/coordinateSystem/testCsys1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/coordinateSystem/testCsys2 b/applications/test/coordinateSystem/testCsys2
index e71186ad44..50dc037a1d 100644
--- a/applications/test/coordinateSystem/testCsys2
+++ b/applications/test/coordinateSystem/testCsys2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/blockMeshDict1.calc b/applications/test/dictionary/blockMeshDict1.calc
index 4bf82d6d26..b190feed0b 100644
--- a/applications/test/dictionary/blockMeshDict1.calc
+++ b/applications/test/dictionary/blockMeshDict1.calc
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/blockMeshDict1.eval b/applications/test/dictionary/blockMeshDict1.eval
index 22dd705f2d..889af59007 100644
--- a/applications/test/dictionary/blockMeshDict1.eval
+++ b/applications/test/dictionary/blockMeshDict1.eval
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDict b/applications/test/dictionary/testDict
index 3e3e5f9bf6..de3cad9ef3 100644
--- a/applications/test/dictionary/testDict
+++ b/applications/test/dictionary/testDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDict2 b/applications/test/dictionary/testDict2
index 9b0b1ddf46..e03aeeac21 100644
--- a/applications/test/dictionary/testDict2
+++ b/applications/test/dictionary/testDict2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictAPI b/applications/test/dictionary/testDictAPI
index 1445d3823e..cd3bd2235e 100644
--- a/applications/test/dictionary/testDictAPI
+++ b/applications/test/dictionary/testDictAPI
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictCalc1 b/applications/test/dictionary/testDictCalc1
index ba1d6183f0..f1ee7feb9f 100644
--- a/applications/test/dictionary/testDictCalc1
+++ b/applications/test/dictionary/testDictCalc1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictEval1 b/applications/test/dictionary/testDictEval1
index a7b47e5254..55557dcc46 100644
--- a/applications/test/dictionary/testDictEval1
+++ b/applications/test/dictionary/testDictEval1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictEval2 b/applications/test/dictionary/testDictEval2
index 829ae56b7d..9858fcaa68 100644
--- a/applications/test/dictionary/testDictEval2
+++ b/applications/test/dictionary/testDictEval2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictEval3 b/applications/test/dictionary/testDictEval3
index 6688de7716..ce56383db6 100644
--- a/applications/test/dictionary/testDictEval3
+++ b/applications/test/dictionary/testDictEval3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictEval4 b/applications/test/dictionary/testDictEval4
index 716088e163..50642119ca 100644
--- a/applications/test/dictionary/testDictEval4
+++ b/applications/test/dictionary/testDictEval4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictList b/applications/test/dictionary/testDictList
index e0d0d35167..36442f0ca7 100644
--- a/applications/test/dictionary/testDictList
+++ b/applications/test/dictionary/testDictList
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex
index 3c5c38c7e3..88f846bcb1 100644
--- a/applications/test/dictionary/testDictRegex
+++ b/applications/test/dictionary/testDictRegex
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testPrimitiveEntry b/applications/test/dictionary/testPrimitiveEntry
index 2ae1c681dc..716cb9a334 100644
--- a/applications/test/dictionary/testPrimitiveEntry
+++ b/applications/test/dictionary/testPrimitiveEntry
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionary/testSubkeyword b/applications/test/dictionary/testSubkeyword
index cf0c3ee936..ab65e3fc1c 100644
--- a/applications/test/dictionary/testSubkeyword
+++ b/applications/test/dictionary/testSubkeyword
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/dictionaryCopy/testDictCopy b/applications/test/dictionaryCopy/testDictCopy
index 90b7e58913..55dd129ba6 100644
--- a/applications/test/dictionaryCopy/testDictCopy
+++ b/applications/test/dictionaryCopy/testDictCopy
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/exprEntry/testDict1 b/applications/test/exprEntry/testDict1
index 85716dee12..0264f1e307 100644
--- a/applications/test/exprEntry/testDict1
+++ b/applications/test/exprEntry/testDict1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/fieldMapping/pipe1D/constant/manualDecomposition b/applications/test/fieldMapping/pipe1D/constant/manualDecomposition
index 05e3b70a42..576d5567fd 100644
--- a/applications/test/fieldMapping/pipe1D/constant/manualDecomposition
+++ b/applications/test/fieldMapping/pipe1D/constant/manualDecomposition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/fieldMapping/pipe1D/constant/transportProperties b/applications/test/fieldMapping/pipe1D/constant/transportProperties
index 58dd239414..8a5d941ba2 100644
--- a/applications/test/fieldMapping/pipe1D/constant/transportProperties
+++ b/applications/test/fieldMapping/pipe1D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/fieldMapping/pipe1D/system/blockMeshDict b/applications/test/fieldMapping/pipe1D/system/blockMeshDict
index 96bdaa56e4..f748abe83c 100644
--- a/applications/test/fieldMapping/pipe1D/system/blockMeshDict
+++ b/applications/test/fieldMapping/pipe1D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/fieldMapping/pipe1D/system/controlDict b/applications/test/fieldMapping/pipe1D/system/controlDict
index 70bdecddaa..683314989d 100644
--- a/applications/test/fieldMapping/pipe1D/system/controlDict
+++ b/applications/test/fieldMapping/pipe1D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/fieldMapping/pipe1D/system/fvSchemes b/applications/test/fieldMapping/pipe1D/system/fvSchemes
index 190ec2edaf..5d41848972 100644
--- a/applications/test/fieldMapping/pipe1D/system/fvSchemes
+++ b/applications/test/fieldMapping/pipe1D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/fieldMapping/pipe1D/system/fvSolution b/applications/test/fieldMapping/pipe1D/system/fvSolution
index 9fb01c9746..b4468b5e10 100644
--- a/applications/test/fieldMapping/pipe1D/system/fvSolution
+++ b/applications/test/fieldMapping/pipe1D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/gravityMeshObject/case1/constant/banana b/applications/test/gravityMeshObject/case1/constant/banana
index d0fdecff6d..b47f98bb55 100644
--- a/applications/test/gravityMeshObject/case1/constant/banana
+++ b/applications/test/gravityMeshObject/case1/constant/banana
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/gravityMeshObject/case1/constant/g b/applications/test/gravityMeshObject/case1/constant/g
index eabbfe9bf2..ea6940e246 100644
--- a/applications/test/gravityMeshObject/case1/constant/g
+++ b/applications/test/gravityMeshObject/case1/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/gravityMeshObject/case1/constant/saturn b/applications/test/gravityMeshObject/case1/constant/saturn
index ab70026f42..8796698bd8 100644
--- a/applications/test/gravityMeshObject/case1/constant/saturn
+++ b/applications/test/gravityMeshObject/case1/constant/saturn
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/gravityMeshObject/case1/system/controlDict b/applications/test/gravityMeshObject/case1/system/controlDict
index b8d3cc1611..857354f046 100644
--- a/applications/test/gravityMeshObject/case1/system/controlDict
+++ b/applications/test/gravityMeshObject/case1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/hexRef8/block/constant/manualDecomposition b/applications/test/hexRef8/block/constant/manualDecomposition
index 05e3b70a42..576d5567fd 100644
--- a/applications/test/hexRef8/block/constant/manualDecomposition
+++ b/applications/test/hexRef8/block/constant/manualDecomposition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/hexRef8/block/constant/transportProperties b/applications/test/hexRef8/block/constant/transportProperties
index 58dd239414..8a5d941ba2 100644
--- a/applications/test/hexRef8/block/constant/transportProperties
+++ b/applications/test/hexRef8/block/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/hexRef8/block/system/blockMeshDict b/applications/test/hexRef8/block/system/blockMeshDict
index a01591a566..b2b7bcaed8 100644
--- a/applications/test/hexRef8/block/system/blockMeshDict
+++ b/applications/test/hexRef8/block/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/hexRef8/block/system/controlDict b/applications/test/hexRef8/block/system/controlDict
index 98da92a54d..b58ae5136d 100644
--- a/applications/test/hexRef8/block/system/controlDict
+++ b/applications/test/hexRef8/block/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/hexRef8/block/system/fvSchemes b/applications/test/hexRef8/block/system/fvSchemes
index 190ec2edaf..5d41848972 100644
--- a/applications/test/hexRef8/block/system/fvSchemes
+++ b/applications/test/hexRef8/block/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/hexRef8/block/system/fvSolution b/applications/test/hexRef8/block/system/fvSolution
index 9fb01c9746..b4468b5e10 100644
--- a/applications/test/hexRef8/block/system/fvSolution
+++ b/applications/test/hexRef8/block/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/0/U b/applications/test/mapDistributePolyMesh/cavity/0/U
index 345e7cbc80..942bc2251c 100644
--- a/applications/test/mapDistributePolyMesh/cavity/0/U
+++ b/applications/test/mapDistributePolyMesh/cavity/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/0/p b/applications/test/mapDistributePolyMesh/cavity/0/p
index 9bb926b8a0..62dc8f8f74 100644
--- a/applications/test/mapDistributePolyMesh/cavity/0/p
+++ b/applications/test/mapDistributePolyMesh/cavity/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/0/phi b/applications/test/mapDistributePolyMesh/cavity/0/phi
index fcbd779a4a..6ec0684c61 100644
--- a/applications/test/mapDistributePolyMesh/cavity/0/phi
+++ b/applications/test/mapDistributePolyMesh/cavity/0/phi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/constant/transportProperties b/applications/test/mapDistributePolyMesh/cavity/constant/transportProperties
index 58dd239414..8a5d941ba2 100644
--- a/applications/test/mapDistributePolyMesh/cavity/constant/transportProperties
+++ b/applications/test/mapDistributePolyMesh/cavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/blockMeshDict b/applications/test/mapDistributePolyMesh/cavity/system/blockMeshDict
index 49693f40d3..1b8f85e19b 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/blockMeshDict
+++ b/applications/test/mapDistributePolyMesh/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/controlDict b/applications/test/mapDistributePolyMesh/cavity/system/controlDict
index 03f933f8ab..00ce5e48bf 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/controlDict
+++ b/applications/test/mapDistributePolyMesh/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/controlDict-latestTime b/applications/test/mapDistributePolyMesh/cavity/system/controlDict-latestTime
index d7b58cca88..c58a73ac3d 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/controlDict-latestTime
+++ b/applications/test/mapDistributePolyMesh/cavity/system/controlDict-latestTime
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/controlDict-startTime b/applications/test/mapDistributePolyMesh/cavity/system/controlDict-startTime
index 03f933f8ab..00ce5e48bf 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/controlDict-startTime
+++ b/applications/test/mapDistributePolyMesh/cavity/system/controlDict-startTime
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict
index 8282c24faa..3e132b855f 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-hierarchical b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-hierarchical
index 5c67cbb416..08ba27cdb1 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-hierarchical
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-hierarchical
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch
index 9ac391e816..3efaac0f09 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict-scotch
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.2 b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.2
index 7f001fcd79..b3fe146337 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.2
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.5 b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.5
index 7d7dd0b07e..db9e469590 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.5
+++ b/applications/test/mapDistributePolyMesh/cavity/system/decomposeParDict.5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/fvSchemes b/applications/test/mapDistributePolyMesh/cavity/system/fvSchemes
index e7eca24ea7..e6055f061a 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/fvSchemes
+++ b/applications/test/mapDistributePolyMesh/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/fvSolution b/applications/test/mapDistributePolyMesh/cavity/system/fvSolution
index 77f9cf1666..30e8d0a5f3 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/fvSolution
+++ b/applications/test/mapDistributePolyMesh/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/processorField b/applications/test/mapDistributePolyMesh/cavity/system/processorField
index f523d4acdc..2cdda89bb4 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/processorField
+++ b/applications/test/mapDistributePolyMesh/cavity/system/processorField
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/mapDistributePolyMesh/cavity/system/renumberMeshDict-random b/applications/test/mapDistributePolyMesh/cavity/system/renumberMeshDict-random
index 6431c5f5c6..85d9a78112 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/renumberMeshDict-random
+++ b/applications/test/mapDistributePolyMesh/cavity/system/renumberMeshDict-random
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/T b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/T
index efd8f76b3c..0655f0cbc3 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/T
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/U b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/U
index 70a4db9ced..331bb94960 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/U
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/epsilon b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/epsilon
index 93fc425d6b..ed2310b654 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/epsilon
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/k b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/k
index 1fc2d3a116..046b48a84d 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/k
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p
index b3a869ba0b..d4ecbbf3a9 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p_rgh b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p_rgh
index 3ccdfa9c4e..40de5745b4 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p_rgh
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/0/topAir/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/g b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/g
index cc323c988f..e4c1d4f712 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/g
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/regionProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/regionProperties
index 11e61d16bc..a6eaae37b5 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/regionProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/radiationProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/radiationProperties
index a462983d60..7cc6634527 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/radiationProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/thermophysicalProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/thermophysicalProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/turbulenceProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/turbulenceProperties
index 3eeaf7f423..3d9b82f999 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/turbulenceProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/constant/topAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/controlDict b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/controlDict
index 5d991bc81c..7ec6f7014c 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/controlDict
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/decomposeParDict b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/decomposeParDict
index 16734c66c1..14439088f3 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/decomposeParDict
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSchemes b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSchemes
index 7ac3b6922b..493a82f15a 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSchemes
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSolution b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSolution
index ac2ef7e278..5eabc33d87 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSolution
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/topAir/blockMeshDict b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/topAir/blockMeshDict
index 5522508993..82c462466e 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/topAir/blockMeshDict
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/fluid/system/topAir/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/T b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/T
index 7cce49246a..f20e44a57a 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/T
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/p b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/p
index e1f725252f..18f9e8d1fc 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/p
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/0/bottomSolid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/radiationProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/radiationProperties
index ab072fe820..2d2854570c 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/radiationProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/thermophysicalProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/thermophysicalProperties
index b486d11f65..26605fddd6 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/thermophysicalProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/bottomSolid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/g b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/g
index cc323c988f..e4c1d4f712 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/g
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/regionProperties b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/regionProperties
index 0fc727567f..c815f125ea 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/regionProperties
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/blockMeshDict b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/blockMeshDict
index 727398469a..4022b9f592 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/blockMeshDict
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSchemes b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSchemes
index fa773b5784..b59dda55bd 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSchemes
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSolution b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSolution
index 1e6946ed06..4868b3536a 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSolution
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/bottomSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/controlDict b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/controlDict
index 5d991bc81c..7ec6f7014c 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/controlDict
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/decomposeParDict b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/decomposeParDict
index 16734c66c1..14439088f3 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/decomposeParDict
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSchemes b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSchemes
index d7d1d4de36..3288d8e1a5 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSchemes
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSolution b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSolution
index 4197f35d5c..3a0f269a8e 100644
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSolution
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/solid/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/0/T b/applications/test/multiWorld/solidFoam/solid1/0/T
index f7b1010cd0..ed24407b26 100644
--- a/applications/test/multiWorld/solidFoam/solid1/0/T
+++ b/applications/test/multiWorld/solidFoam/solid1/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/0/p b/applications/test/multiWorld/solidFoam/solid1/0/p
index 129362983f..05b9f749d5 100644
--- a/applications/test/multiWorld/solidFoam/solid1/0/p
+++ b/applications/test/multiWorld/solidFoam/solid1/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/constant/g b/applications/test/multiWorld/solidFoam/solid1/constant/g
index cc323c988f..e4c1d4f712 100644
--- a/applications/test/multiWorld/solidFoam/solid1/constant/g
+++ b/applications/test/multiWorld/solidFoam/solid1/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/constant/radiationProperties b/applications/test/multiWorld/solidFoam/solid1/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/applications/test/multiWorld/solidFoam/solid1/constant/radiationProperties
+++ b/applications/test/multiWorld/solidFoam/solid1/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/constant/thermophysicalProperties b/applications/test/multiWorld/solidFoam/solid1/constant/thermophysicalProperties
index b486d11f65..26605fddd6 100644
--- a/applications/test/multiWorld/solidFoam/solid1/constant/thermophysicalProperties
+++ b/applications/test/multiWorld/solidFoam/solid1/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/system/blockMeshDict b/applications/test/multiWorld/solidFoam/solid1/system/blockMeshDict
index 23aa2496f1..ac49beae92 100644
--- a/applications/test/multiWorld/solidFoam/solid1/system/blockMeshDict
+++ b/applications/test/multiWorld/solidFoam/solid1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/system/controlDict b/applications/test/multiWorld/solidFoam/solid1/system/controlDict
index 5a89b7e2f9..e5b69ec113 100644
--- a/applications/test/multiWorld/solidFoam/solid1/system/controlDict
+++ b/applications/test/multiWorld/solidFoam/solid1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/system/decomposeParDict b/applications/test/multiWorld/solidFoam/solid1/system/decomposeParDict
index 16734c66c1..14439088f3 100644
--- a/applications/test/multiWorld/solidFoam/solid1/system/decomposeParDict
+++ b/applications/test/multiWorld/solidFoam/solid1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/system/fvSchemes b/applications/test/multiWorld/solidFoam/solid1/system/fvSchemes
index b3b2abb949..5560fac4fa 100644
--- a/applications/test/multiWorld/solidFoam/solid1/system/fvSchemes
+++ b/applications/test/multiWorld/solidFoam/solid1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1/system/fvSolution b/applications/test/multiWorld/solidFoam/solid1/system/fvSolution
index de79f2e08c..aa7d522d47 100644
--- a/applications/test/multiWorld/solidFoam/solid1/system/fvSolution
+++ b/applications/test/multiWorld/solidFoam/solid1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/T b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/T
index f7b1010cd0..ed24407b26 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/T
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/p b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/p
index 129362983f..05b9f749d5 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/p
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid1/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/T b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/T
index 31d45a6426..1d071817bb 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/T
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/p b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/p
index 95fc8eafbd..138f189078 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/p
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/0.orig/solid2/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/g b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/g
index cc323c988f..e4c1d4f712 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/g
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/regionProperties b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/regionProperties
index 33bbd3ae4b..20cd18eb38 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/regionProperties
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/radiationProperties b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/radiationProperties
index a462983d60..7cc6634527 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/radiationProperties
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/thermophysicalProperties b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/thermophysicalProperties
index b486d11f65..26605fddd6 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/thermophysicalProperties
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/constant/solid1/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/system/controlDict b/applications/test/multiWorld/solidFoam/solid1_solid2/system/controlDict
index e4bf97f3dc..0ae2e554c9 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/system/controlDict
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSchemes b/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSchemes
index b3b2abb949..5560fac4fa 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSchemes
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution b/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution
index 7f7e1783cf..f52e921e79 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution-energyCoupling b/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution-energyCoupling
index 7f7e1783cf..f52e921e79 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution-energyCoupling
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/system/fvSolution-energyCoupling
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid1/blockMeshDict b/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid1/blockMeshDict
index 86ffc8106b..8b09116849 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid1/blockMeshDict
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid1/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid2/blockMeshDict b/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid2/blockMeshDict
index 12faef66c7..bbd2655eac 100644
--- a/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid2/blockMeshDict
+++ b/applications/test/multiWorld/solidFoam/solid1_solid2/system/solid2/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid2/0/T b/applications/test/multiWorld/solidFoam/solid2/0/T
index 31d45a6426..1d071817bb 100644
--- a/applications/test/multiWorld/solidFoam/solid2/0/T
+++ b/applications/test/multiWorld/solidFoam/solid2/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid2/0/p b/applications/test/multiWorld/solidFoam/solid2/0/p
index 95fc8eafbd..138f189078 100644
--- a/applications/test/multiWorld/solidFoam/solid2/0/p
+++ b/applications/test/multiWorld/solidFoam/solid2/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/multiWorld/solidFoam/solid2/system/blockMeshDict b/applications/test/multiWorld/solidFoam/solid2/system/blockMeshDict
index 1386fc9aaf..4a9577695a 100644
--- a/applications/test/multiWorld/solidFoam/solid2/system/blockMeshDict
+++ b/applications/test/multiWorld/solidFoam/solid2/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/namedDictionary/testDict1 b/applications/test/namedDictionary/testDict1
index b4b31f32a6..443b0c8476 100644
--- a/applications/test/namedDictionary/testDict1
+++ b/applications/test/namedDictionary/testDict1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/0.orig/T b/applications/test/parallelOverset/heatTransfer/0.orig/T
index c57f101c24..e5e656f0c6 100644
--- a/applications/test/parallelOverset/heatTransfer/0.orig/T
+++ b/applications/test/parallelOverset/heatTransfer/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/0.orig/pointDisplacement b/applications/test/parallelOverset/heatTransfer/0.orig/pointDisplacement
index d316e6c5af..bddbeae50b 100644
--- a/applications/test/parallelOverset/heatTransfer/0.orig/pointDisplacement
+++ b/applications/test/parallelOverset/heatTransfer/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/0.orig/zoneID b/applications/test/parallelOverset/heatTransfer/0.orig/zoneID
index c98d08ee04..0b5b9bf5ab 100644
--- a/applications/test/parallelOverset/heatTransfer/0.orig/zoneID
+++ b/applications/test/parallelOverset/heatTransfer/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/constant/dynamicMeshDict b/applications/test/parallelOverset/heatTransfer/constant/dynamicMeshDict
index bbe9a72477..2e9043ef10 100644
--- a/applications/test/parallelOverset/heatTransfer/constant/dynamicMeshDict
+++ b/applications/test/parallelOverset/heatTransfer/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/constant/transportProperties b/applications/test/parallelOverset/heatTransfer/constant/transportProperties
index 5be874c53d..cc7dd0ba07 100644
--- a/applications/test/parallelOverset/heatTransfer/constant/transportProperties
+++ b/applications/test/parallelOverset/heatTransfer/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/blockMeshDict b/applications/test/parallelOverset/heatTransfer/system/blockMeshDict
index 39f899fdd8..1739fefa1f 100644
--- a/applications/test/parallelOverset/heatTransfer/system/blockMeshDict
+++ b/applications/test/parallelOverset/heatTransfer/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/controlDict b/applications/test/parallelOverset/heatTransfer/system/controlDict
index 29e25a6c43..750ba15e9d 100644
--- a/applications/test/parallelOverset/heatTransfer/system/controlDict
+++ b/applications/test/parallelOverset/heatTransfer/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/decomposeParDict b/applications/test/parallelOverset/heatTransfer/system/decomposeParDict
index 53c14127bb..d8a4d59b95 100644
--- a/applications/test/parallelOverset/heatTransfer/system/decomposeParDict
+++ b/applications/test/parallelOverset/heatTransfer/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/fvSchemes b/applications/test/parallelOverset/heatTransfer/system/fvSchemes
index 2169ee4a03..92e64d6e6f 100644
--- a/applications/test/parallelOverset/heatTransfer/system/fvSchemes
+++ b/applications/test/parallelOverset/heatTransfer/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/fvSolution b/applications/test/parallelOverset/heatTransfer/system/fvSolution
index 447a4fcd6a..8350df8021 100644
--- a/applications/test/parallelOverset/heatTransfer/system/fvSolution
+++ b/applications/test/parallelOverset/heatTransfer/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/postProcessingDict b/applications/test/parallelOverset/heatTransfer/system/postProcessingDict
index 9456aa2597..caf1cccb6a 100644
--- a/applications/test/parallelOverset/heatTransfer/system/postProcessingDict
+++ b/applications/test/parallelOverset/heatTransfer/system/postProcessingDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/processorField b/applications/test/parallelOverset/heatTransfer/system/processorField
index d7e0d45986..0079ea2910 100644
--- a/applications/test/parallelOverset/heatTransfer/system/processorField
+++ b/applications/test/parallelOverset/heatTransfer/system/processorField
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/setFieldsDict b/applications/test/parallelOverset/heatTransfer/system/setFieldsDict
index f2ce1aae45..3f3757908f 100644
--- a/applications/test/parallelOverset/heatTransfer/system/setFieldsDict
+++ b/applications/test/parallelOverset/heatTransfer/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/parallelOverset/heatTransfer/system/topoSetDict b/applications/test/parallelOverset/heatTransfer/system/topoSetDict
index fd76f9d4aa..4e64b77ce5 100644
--- a/applications/test/parallelOverset/heatTransfer/system/topoSetDict
+++ b/applications/test/parallelOverset/heatTransfer/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/constant/transportProperties b/applications/test/patchRegion/cavity_pinched/constant/transportProperties
index 58dd239414..8a5d941ba2 100644
--- a/applications/test/patchRegion/cavity_pinched/constant/transportProperties
+++ b/applications/test/patchRegion/cavity_pinched/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/system/blockMeshDict b/applications/test/patchRegion/cavity_pinched/system/blockMeshDict
index 82abd9a71d..15eb812cce 100644
--- a/applications/test/patchRegion/cavity_pinched/system/blockMeshDict
+++ b/applications/test/patchRegion/cavity_pinched/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/system/collapseDict b/applications/test/patchRegion/cavity_pinched/system/collapseDict
index 959a0a258c..9b2cae70ac 100644
--- a/applications/test/patchRegion/cavity_pinched/system/collapseDict
+++ b/applications/test/patchRegion/cavity_pinched/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/system/controlDict b/applications/test/patchRegion/cavity_pinched/system/controlDict
index 7b2d168c54..b301b93332 100644
--- a/applications/test/patchRegion/cavity_pinched/system/controlDict
+++ b/applications/test/patchRegion/cavity_pinched/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/system/decomposeParDict b/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
index cff5a4df86..cbd062575e 100644
--- a/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
+++ b/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/system/fvSchemes b/applications/test/patchRegion/cavity_pinched/system/fvSchemes
index 5e6f487640..22339b72db 100644
--- a/applications/test/patchRegion/cavity_pinched/system/fvSchemes
+++ b/applications/test/patchRegion/cavity_pinched/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/patchRegion/cavity_pinched/system/fvSolution b/applications/test/patchRegion/cavity_pinched/system/fvSolution
index 32148ca8d9..4e3a7f2c0c 100644
--- a/applications/test/patchRegion/cavity_pinched/system/fvSolution
+++ b/applications/test/patchRegion/cavity_pinched/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/0.orig/U b/applications/test/reconstructedDistanceFunction/case1/0.orig/U
index b2b5a05657..e92cfa2c09 100644
--- a/applications/test/reconstructedDistanceFunction/case1/0.orig/U
+++ b/applications/test/reconstructedDistanceFunction/case1/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/0.orig/alpha1 b/applications/test/reconstructedDistanceFunction/case1/0.orig/alpha1
index f82faf7f77..7b17ad7c30 100644
--- a/applications/test/reconstructedDistanceFunction/case1/0.orig/alpha1
+++ b/applications/test/reconstructedDistanceFunction/case1/0.orig/alpha1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/0.orig/markedCells b/applications/test/reconstructedDistanceFunction/case1/0.orig/markedCells
index 2a21b72a41..382d1a57dc 100644
--- a/applications/test/reconstructedDistanceFunction/case1/0.orig/markedCells
+++ b/applications/test/reconstructedDistanceFunction/case1/0.orig/markedCells
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/constant/g b/applications/test/reconstructedDistanceFunction/case1/constant/g
index 0cb2d0193e..d9baaef759 100644
--- a/applications/test/reconstructedDistanceFunction/case1/constant/g
+++ b/applications/test/reconstructedDistanceFunction/case1/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/constant/transportProperties b/applications/test/reconstructedDistanceFunction/case1/constant/transportProperties
index 8982b4e123..41a4b37aff 100644
--- a/applications/test/reconstructedDistanceFunction/case1/constant/transportProperties
+++ b/applications/test/reconstructedDistanceFunction/case1/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/constant/turbulenceProperties b/applications/test/reconstructedDistanceFunction/case1/constant/turbulenceProperties
index 0d09268dab..bd8a7d1d89 100644
--- a/applications/test/reconstructedDistanceFunction/case1/constant/turbulenceProperties
+++ b/applications/test/reconstructedDistanceFunction/case1/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/blockMeshDict b/applications/test/reconstructedDistanceFunction/case1/system/blockMeshDict
index 68077682fe..1e16c32c82 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/blockMeshDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/changeDictionaryDict b/applications/test/reconstructedDistanceFunction/case1/system/changeDictionaryDict
index c11204936c..5c7380eb48 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/changeDictionaryDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/controlDict b/applications/test/reconstructedDistanceFunction/case1/system/controlDict
index 8b5bb8ef62..e7cbe0c211 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/controlDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/decomposeParDict b/applications/test/reconstructedDistanceFunction/case1/system/decomposeParDict
index d8e87e35d5..d3c0b22198 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/decomposeParDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/fvSchemes b/applications/test/reconstructedDistanceFunction/case1/system/fvSchemes
index 5753fcbcbc..1db44e9245 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/fvSchemes
+++ b/applications/test/reconstructedDistanceFunction/case1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/fvSolution b/applications/test/reconstructedDistanceFunction/case1/system/fvSolution
index 8eb01dd4ed..2b8148405b 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/fvSolution
+++ b/applications/test/reconstructedDistanceFunction/case1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/isoSurfDict b/applications/test/reconstructedDistanceFunction/case1/system/isoSurfDict
index a4003dcdc0..c14146168c 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/isoSurfDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/isoSurfDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/setAlphaFieldDict b/applications/test/reconstructedDistanceFunction/case1/system/setAlphaFieldDict
index f2bc33745a..b8fb308e6b 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/setAlphaFieldDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/reconstructedDistanceFunction/case1/system/topoSetDict b/applications/test/reconstructedDistanceFunction/case1/system/topoSetDict
index ed3d6578fe..3f06f32696 100644
--- a/applications/test/reconstructedDistanceFunction/case1/system/topoSetDict
+++ b/applications/test/reconstructedDistanceFunction/case1/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/regex1/testRegexps b/applications/test/regex1/testRegexps
index 69c3cb61bd..c3e4762349 100644
--- a/applications/test/regex1/testRegexps
+++ b/applications/test/regex1/testRegexps
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/regex1/testRegexps2 b/applications/test/regex1/testRegexps2
index 212876fa2e..9f8eaeb2e7 100644
--- a/applications/test/regex1/testRegexps2
+++ b/applications/test/regex1/testRegexps2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict
index 19d8ce6886..ab4865929b 100644
--- a/applications/test/router/routerDict
+++ b/applications/test/router/routerDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/0.orig/T b/applications/test/setAlphaField/case1/0.orig/T
index 98c6bf0eee..c0716a85ae 100644
--- a/applications/test/setAlphaField/case1/0.orig/T
+++ b/applications/test/setAlphaField/case1/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/0.orig/U b/applications/test/setAlphaField/case1/0.orig/U
index 87aabb11ec..d8272aa942 100644
--- a/applications/test/setAlphaField/case1/0.orig/U
+++ b/applications/test/setAlphaField/case1/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/0.orig/alpha.water b/applications/test/setAlphaField/case1/0.orig/alpha.water
index fcc75bb194..4586b4022f 100644
--- a/applications/test/setAlphaField/case1/0.orig/alpha.water
+++ b/applications/test/setAlphaField/case1/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/0.orig/p b/applications/test/setAlphaField/case1/0.orig/p
index ff0dc51cf2..9215196c72 100644
--- a/applications/test/setAlphaField/case1/0.orig/p
+++ b/applications/test/setAlphaField/case1/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/0.orig/p_rgh b/applications/test/setAlphaField/case1/0.orig/p_rgh
index f931eed4f2..bfce52c4c2 100644
--- a/applications/test/setAlphaField/case1/0.orig/p_rgh
+++ b/applications/test/setAlphaField/case1/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/constant/g b/applications/test/setAlphaField/case1/constant/g
index eabbfe9bf2..ea6940e246 100644
--- a/applications/test/setAlphaField/case1/constant/g
+++ b/applications/test/setAlphaField/case1/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/constant/thermophysicalProperties b/applications/test/setAlphaField/case1/constant/thermophysicalProperties
index 175e20c7c2..a770b441c8 100644
--- a/applications/test/setAlphaField/case1/constant/thermophysicalProperties
+++ b/applications/test/setAlphaField/case1/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/constant/thermophysicalProperties.air b/applications/test/setAlphaField/case1/constant/thermophysicalProperties.air
index f4db97ef98..fca74f87ac 100644
--- a/applications/test/setAlphaField/case1/constant/thermophysicalProperties.air
+++ b/applications/test/setAlphaField/case1/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/constant/thermophysicalProperties.water b/applications/test/setAlphaField/case1/constant/thermophysicalProperties.water
index 086ea1c36a..b7d38365e5 100644
--- a/applications/test/setAlphaField/case1/constant/thermophysicalProperties.water
+++ b/applications/test/setAlphaField/case1/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/constant/turbulenceProperties b/applications/test/setAlphaField/case1/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/applications/test/setAlphaField/case1/constant/turbulenceProperties
+++ b/applications/test/setAlphaField/case1/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/system/blockMeshDict b/applications/test/setAlphaField/case1/system/blockMeshDict
index f7b813cfe6..60b192d77a 100644
--- a/applications/test/setAlphaField/case1/system/blockMeshDict
+++ b/applications/test/setAlphaField/case1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/system/controlDict b/applications/test/setAlphaField/case1/system/controlDict
index d2cc449b66..cbd5573656 100644
--- a/applications/test/setAlphaField/case1/system/controlDict
+++ b/applications/test/setAlphaField/case1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/system/decomposeParDict b/applications/test/setAlphaField/case1/system/decomposeParDict
index 8ec79f387f..6e7a590f86 100644
--- a/applications/test/setAlphaField/case1/system/decomposeParDict
+++ b/applications/test/setAlphaField/case1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/system/fvSchemes b/applications/test/setAlphaField/case1/system/fvSchemes
index 7bf98845d4..9e17f007b9 100644
--- a/applications/test/setAlphaField/case1/system/fvSchemes
+++ b/applications/test/setAlphaField/case1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/system/fvSolution b/applications/test/setAlphaField/case1/system/fvSolution
index 70090f7949..dc70e2058e 100644
--- a/applications/test/setAlphaField/case1/system/fvSolution
+++ b/applications/test/setAlphaField/case1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/setAlphaField/case1/system/setAlphaFieldDict b/applications/test/setAlphaField/case1/system/setAlphaFieldDict
index f1beb0147f..357620b118 100644
--- a/applications/test/setAlphaField/case1/system/setAlphaFieldDict
+++ b/applications/test/setAlphaField/case1/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/spline/test-splines b/applications/test/spline/test-splines
index 0824331ac6..83481fbe95 100644
--- a/applications/test/spline/test-splines
+++ b/applications/test/spline/test-splines
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/syncTools/block_2x2x1/constant/transportProperties b/applications/test/syncTools/block_2x2x1/constant/transportProperties
index afcaedf488..9071b8b124 100644
--- a/applications/test/syncTools/block_2x2x1/constant/transportProperties
+++ b/applications/test/syncTools/block_2x2x1/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/syncTools/block_2x2x1/system/blockMeshDict b/applications/test/syncTools/block_2x2x1/system/blockMeshDict
index 2898761f86..dd3df5a18d 100644
--- a/applications/test/syncTools/block_2x2x1/system/blockMeshDict
+++ b/applications/test/syncTools/block_2x2x1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/syncTools/block_2x2x1/system/controlDict b/applications/test/syncTools/block_2x2x1/system/controlDict
index 4f69b05427..260a65bfff 100644
--- a/applications/test/syncTools/block_2x2x1/system/controlDict
+++ b/applications/test/syncTools/block_2x2x1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/syncTools/block_2x2x1/system/decomposeParDict b/applications/test/syncTools/block_2x2x1/system/decomposeParDict
index 809bbc5da4..78f244d2d2 100644
--- a/applications/test/syncTools/block_2x2x1/system/decomposeParDict
+++ b/applications/test/syncTools/block_2x2x1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/syncTools/block_2x2x1/system/fvSchemes b/applications/test/syncTools/block_2x2x1/system/fvSchemes
index e7eca24ea7..e6055f061a 100644
--- a/applications/test/syncTools/block_2x2x1/system/fvSchemes
+++ b/applications/test/syncTools/block_2x2x1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/syncTools/block_2x2x1/system/fvSolution b/applications/test/syncTools/block_2x2x1/system/fvSolution
index 18c0871add..34ff00cf3f 100644
--- a/applications/test/syncTools/block_2x2x1/system/fvSolution
+++ b/applications/test/syncTools/block_2x2x1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/0/U b/applications/test/volField/cavity/0/U
index 0f58996f49..5b504a1e87 100644
--- a/applications/test/volField/cavity/0/U
+++ b/applications/test/volField/cavity/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/0/p b/applications/test/volField/cavity/0/p
index c6e8b8a275..cb765cb3ae 100644
--- a/applications/test/volField/cavity/0/p
+++ b/applications/test/volField/cavity/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/constant/transportProperties b/applications/test/volField/cavity/constant/transportProperties
index 58dd239414..8a5d941ba2 100644
--- a/applications/test/volField/cavity/constant/transportProperties
+++ b/applications/test/volField/cavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/system/blockMeshDict b/applications/test/volField/cavity/system/blockMeshDict
index 791d66e3a3..f90c953349 100644
--- a/applications/test/volField/cavity/system/blockMeshDict
+++ b/applications/test/volField/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/system/controlDict b/applications/test/volField/cavity/system/controlDict
index 03f933f8ab..00ce5e48bf 100644
--- a/applications/test/volField/cavity/system/controlDict
+++ b/applications/test/volField/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/system/fvSchemes b/applications/test/volField/cavity/system/fvSchemes
index 832e3b9f1b..20999a1849 100644
--- a/applications/test/volField/cavity/system/fvSchemes
+++ b/applications/test/volField/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/volField/cavity/system/fvSolution b/applications/test/volField/cavity/system/fvSolution
index 44712d2727..809367c801 100644
--- a/applications/test/volField/cavity/system/fvSolution
+++ b/applications/test/volField/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/wordRe/testRegexps b/applications/test/wordRe/testRegexps
index c7e7c62e31..fd6fdf41f7 100644
--- a/applications/test/wordRe/testRegexps
+++ b/applications/test/wordRe/testRegexps
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/blockMeshDict b/applications/test/zoneDistribute/case1/system/blockMeshDict
index b70a7e5e37..2a42f5f9e9 100644
--- a/applications/test/zoneDistribute/case1/system/blockMeshDict
+++ b/applications/test/zoneDistribute/case1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/controlDict b/applications/test/zoneDistribute/case1/system/controlDict
index 478638b179..2dec3f0d1f 100644
--- a/applications/test/zoneDistribute/case1/system/controlDict
+++ b/applications/test/zoneDistribute/case1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/decomposeParDict b/applications/test/zoneDistribute/case1/system/decomposeParDict
index 31be663c39..e825d8805b 100644
--- a/applications/test/zoneDistribute/case1/system/decomposeParDict
+++ b/applications/test/zoneDistribute/case1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/fvSchemes b/applications/test/zoneDistribute/case1/system/fvSchemes
index ad48caee27..90ab3dccf7 100644
--- a/applications/test/zoneDistribute/case1/system/fvSchemes
+++ b/applications/test/zoneDistribute/case1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/fvSolution b/applications/test/zoneDistribute/case1/system/fvSolution
index 91b6093d5a..edc1c9cab0 100644
--- a/applications/test/zoneDistribute/case1/system/fvSolution
+++ b/applications/test/zoneDistribute/case1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/meshQualityDict b/applications/test/zoneDistribute/case1/system/meshQualityDict
index 640d4bf70b..13416b1c6b 100644
--- a/applications/test/zoneDistribute/case1/system/meshQualityDict
+++ b/applications/test/zoneDistribute/case1/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/snappyHexMeshDict b/applications/test/zoneDistribute/case1/system/snappyHexMeshDict
index 84b1666880..3554b3df7d 100644
--- a/applications/test/zoneDistribute/case1/system/snappyHexMeshDict
+++ b/applications/test/zoneDistribute/case1/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/test/zoneDistribute/case1/system/surfaceFeatureExtractDict b/applications/test/zoneDistribute/case1/system/surfaceFeatureExtractDict
index 72b3aed23c..938c25395f 100644
--- a/applications/test/zoneDistribute/case1/system/surfaceFeatureExtractDict
+++ b/applications/test/zoneDistribute/case1/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
index 629a0713e6..e258f47597 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/ObstaclesDict b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/ObstaclesDict
index 8cc8f29860..44876015f5 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/obstacles/ObstaclesDict
+++ b/applications/utilities/preProcessing/PDR/pdrFields/obstacles/ObstaclesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaFieldDict b/applications/utilities/preProcessing/setAlphaField/setAlphaFieldDict
index df83b2873b..3317deb556 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaFieldDict
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFieldsDict b/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFieldsDict
index d297bc2f7e..477d527e4b 100644
--- a/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFieldsDict
+++ b/applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/preProcessing/setExprFields/setExprFieldsDict b/applications/utilities/preProcessing/setExprFields/setExprFieldsDict
index 51b8fb3892..884544f886 100644
--- a/applications/utilities/preProcessing/setExprFields/setExprFieldsDict
+++ b/applications/utilities/preProcessing/setExprFields/setExprFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
index 86550d97cc..6f5cf37117 100644
--- a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
+++ b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/PDRMeshDict b/etc/caseDicts/annotated/PDRMeshDict
index ef415d6b44..f678b488bb 100644
--- a/etc/caseDicts/annotated/PDRMeshDict
+++ b/etc/caseDicts/annotated/PDRMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/PDRblockMeshDict b/etc/caseDicts/annotated/PDRblockMeshDict
index 6cda78dc0a..dd6daf31c0 100644
--- a/etc/caseDicts/annotated/PDRblockMeshDict
+++ b/etc/caseDicts/annotated/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/adiabaticFlameTDict b/etc/caseDicts/annotated/adiabaticFlameTDict
index a7333d6f3a..a63677e03f 100644
--- a/etc/caseDicts/annotated/adiabaticFlameTDict
+++ b/etc/caseDicts/annotated/adiabaticFlameTDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/adiosWriteDict b/etc/caseDicts/annotated/adiosWriteDict
index 2baddeb3ef..04da829131 100644
--- a/etc/caseDicts/annotated/adiosWriteDict
+++ b/etc/caseDicts/annotated/adiosWriteDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/blockMeshDict b/etc/caseDicts/annotated/blockMeshDict
index 2e4921bc35..176ca88459 100644
--- a/etc/caseDicts/annotated/blockMeshDict
+++ b/etc/caseDicts/annotated/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/boxTurbDict b/etc/caseDicts/annotated/boxTurbDict
index c525133f7b..feb14eea15 100644
--- a/etc/caseDicts/annotated/boxTurbDict
+++ b/etc/caseDicts/annotated/boxTurbDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/changeDictionaryDict b/etc/caseDicts/annotated/changeDictionaryDict
index ac25d15b02..570f4b4d24 100644
--- a/etc/caseDicts/annotated/changeDictionaryDict
+++ b/etc/caseDicts/annotated/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/collapseDict b/etc/caseDicts/annotated/collapseDict
index b230888607..b904d90e0b 100644
--- a/etc/caseDicts/annotated/collapseDict
+++ b/etc/caseDicts/annotated/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/createBafflesDict b/etc/caseDicts/annotated/createBafflesDict
index 9d32389f48..e1e15cce33 100644
--- a/etc/caseDicts/annotated/createBafflesDict
+++ b/etc/caseDicts/annotated/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/createBoxTurbDict b/etc/caseDicts/annotated/createBoxTurbDict
index a0dacc8859..2e3c798e0e 100644
--- a/etc/caseDicts/annotated/createBoxTurbDict
+++ b/etc/caseDicts/annotated/createBoxTurbDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/createPatchDict b/etc/caseDicts/annotated/createPatchDict
index 956e9c2c02..949668426b 100644
--- a/etc/caseDicts/annotated/createPatchDict
+++ b/etc/caseDicts/annotated/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/decomposeParDict b/etc/caseDicts/annotated/decomposeParDict
index 45577288b9..42f80135f3 100644
--- a/etc/caseDicts/annotated/decomposeParDict
+++ b/etc/caseDicts/annotated/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/dsmcInitialiseDict b/etc/caseDicts/annotated/dsmcInitialiseDict
index 1c1e2fede4..bb609fc9c2 100644
--- a/etc/caseDicts/annotated/dsmcInitialiseDict
+++ b/etc/caseDicts/annotated/dsmcInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/equilibriumFlameTDict b/etc/caseDicts/annotated/equilibriumFlameTDict
index 09fd8cd95c..7b0a4d3c3e 100644
--- a/etc/caseDicts/annotated/equilibriumFlameTDict
+++ b/etc/caseDicts/annotated/equilibriumFlameTDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/extrude2DMeshDict b/etc/caseDicts/annotated/extrude2DMeshDict
index 88fcbc0a24..b220a8e54d 100644
--- a/etc/caseDicts/annotated/extrude2DMeshDict
+++ b/etc/caseDicts/annotated/extrude2DMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/extrudeMeshDict b/etc/caseDicts/annotated/extrudeMeshDict
index 9647112613..ac32763b42 100644
--- a/etc/caseDicts/annotated/extrudeMeshDict
+++ b/etc/caseDicts/annotated/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/extrudeToRegionMeshDict b/etc/caseDicts/annotated/extrudeToRegionMeshDict
index aef517e05a..81b139adc7 100644
--- a/etc/caseDicts/annotated/extrudeToRegionMeshDict
+++ b/etc/caseDicts/annotated/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/fieldCoordinateSystemTransformDict b/etc/caseDicts/annotated/fieldCoordinateSystemTransformDict
index 03e9b0b364..c87c5faa50 100644
--- a/etc/caseDicts/annotated/fieldCoordinateSystemTransformDict
+++ b/etc/caseDicts/annotated/fieldCoordinateSystemTransformDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/foamDataToFluentDict b/etc/caseDicts/annotated/foamDataToFluentDict
index d71cb0ec68..4b651c0c24 100644
--- a/etc/caseDicts/annotated/foamDataToFluentDict
+++ b/etc/caseDicts/annotated/foamDataToFluentDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/foamyHexMeshDict b/etc/caseDicts/annotated/foamyHexMeshDict
index a881ae5347..6c08b8902d 100644
--- a/etc/caseDicts/annotated/foamyHexMeshDict
+++ b/etc/caseDicts/annotated/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/foamyQuadMeshDict b/etc/caseDicts/annotated/foamyQuadMeshDict
index 962fe9efca..94829d90a2 100644
--- a/etc/caseDicts/annotated/foamyQuadMeshDict
+++ b/etc/caseDicts/annotated/foamyQuadMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/mapFieldsDict b/etc/caseDicts/annotated/mapFieldsDict
index ead62bff71..49a2258548 100644
--- a/etc/caseDicts/annotated/mapFieldsDict
+++ b/etc/caseDicts/annotated/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/mdEquilibrationDict b/etc/caseDicts/annotated/mdEquilibrationDict
index 916489eba2..10d62e156d 100644
--- a/etc/caseDicts/annotated/mdEquilibrationDict
+++ b/etc/caseDicts/annotated/mdEquilibrationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/mdInitialiseDict b/etc/caseDicts/annotated/mdInitialiseDict
index a26b6adf1a..10e354e3c3 100644
--- a/etc/caseDicts/annotated/mdInitialiseDict
+++ b/etc/caseDicts/annotated/mdInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/mergeOrSplitBafflesDict b/etc/caseDicts/annotated/mergeOrSplitBafflesDict
index 53d95a9d57..d406aac14b 100644
--- a/etc/caseDicts/annotated/mergeOrSplitBafflesDict
+++ b/etc/caseDicts/annotated/mergeOrSplitBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/meshQualityDict-collapseEdges b/etc/caseDicts/annotated/meshQualityDict-collapseEdges
index abda145570..05b8ff92bf 100644
--- a/etc/caseDicts/annotated/meshQualityDict-collapseEdges
+++ b/etc/caseDicts/annotated/meshQualityDict-collapseEdges
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/mirrorMeshDict b/etc/caseDicts/annotated/mirrorMeshDict
index 110ee17336..d7d1554610 100644
--- a/etc/caseDicts/annotated/mirrorMeshDict
+++ b/etc/caseDicts/annotated/mirrorMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/mixtureAdiabaticFlameTDict b/etc/caseDicts/annotated/mixtureAdiabaticFlameTDict
index eb3ffdabcb..79c75939f7 100644
--- a/etc/caseDicts/annotated/mixtureAdiabaticFlameTDict
+++ b/etc/caseDicts/annotated/mixtureAdiabaticFlameTDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/modifyMeshDict b/etc/caseDicts/annotated/modifyMeshDict
index f15203ce03..3928064066 100644
--- a/etc/caseDicts/annotated/modifyMeshDict
+++ b/etc/caseDicts/annotated/modifyMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/noiseDict b/etc/caseDicts/annotated/noiseDict
index 346be8b014..2cf5604a1b 100644
--- a/etc/caseDicts/annotated/noiseDict
+++ b/etc/caseDicts/annotated/noiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/obstaclesDict b/etc/caseDicts/annotated/obstaclesDict
index 3be74d190e..14a747b1e5 100644
--- a/etc/caseDicts/annotated/obstaclesDict
+++ b/etc/caseDicts/annotated/obstaclesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/optimisationDict b/etc/caseDicts/annotated/optimisationDict
index 6f98454cfe..09df2342c3 100644
--- a/etc/caseDicts/annotated/optimisationDict
+++ b/etc/caseDicts/annotated/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/particleTrackDict b/etc/caseDicts/annotated/particleTrackDict
index 486e1cb8a7..b2c20d2011 100644
--- a/etc/caseDicts/annotated/particleTrackDict
+++ b/etc/caseDicts/annotated/particleTrackDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/pdfDict b/etc/caseDicts/annotated/pdfDict
index 21a531cc8b..bd957b0ee0 100644
--- a/etc/caseDicts/annotated/pdfDict
+++ b/etc/caseDicts/annotated/pdfDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/postChannelDict b/etc/caseDicts/annotated/postChannelDict
index b9ee51c1f9..bc5f825b58 100644
--- a/etc/caseDicts/annotated/postChannelDict
+++ b/etc/caseDicts/annotated/postChannelDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/potentialDict b/etc/caseDicts/annotated/potentialDict
index 768e909c03..d622882e21 100644
--- a/etc/caseDicts/annotated/potentialDict
+++ b/etc/caseDicts/annotated/potentialDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/probesDict b/etc/caseDicts/annotated/probesDict
index 9b33fa3f0e..5c45bf3dfe 100644
--- a/etc/caseDicts/annotated/probesDict
+++ b/etc/caseDicts/annotated/probesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/processorFieldDict b/etc/caseDicts/annotated/processorFieldDict
index 2beb1039f0..97ee877714 100644
--- a/etc/caseDicts/annotated/processorFieldDict
+++ b/etc/caseDicts/annotated/processorFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/readFieldsDict b/etc/caseDicts/annotated/readFieldsDict
index 5c8a2ea6bf..b9e7b35082 100644
--- a/etc/caseDicts/annotated/readFieldsDict
+++ b/etc/caseDicts/annotated/readFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/refineMeshDict b/etc/caseDicts/annotated/refineMeshDict
index f73de82e58..a87c01325b 100644
--- a/etc/caseDicts/annotated/refineMeshDict
+++ b/etc/caseDicts/annotated/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/renumberMeshDict b/etc/caseDicts/annotated/renumberMeshDict
index bd2ffb5c7b..59ac3e68d8 100644
--- a/etc/caseDicts/annotated/renumberMeshDict
+++ b/etc/caseDicts/annotated/renumberMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/runTimePostProcessingDict b/etc/caseDicts/annotated/runTimePostProcessingDict
index d79345c68c..7bf91db6f9 100644
--- a/etc/caseDicts/annotated/runTimePostProcessingDict
+++ b/etc/caseDicts/annotated/runTimePostProcessingDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/sampleDict b/etc/caseDicts/annotated/sampleDict
index a7e8b5e424..7a211ceac4 100644
--- a/etc/caseDicts/annotated/sampleDict
+++ b/etc/caseDicts/annotated/sampleDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/selectCellsDict b/etc/caseDicts/annotated/selectCellsDict
index 2e914ee028..1d76e1dff9 100644
--- a/etc/caseDicts/annotated/selectCellsDict
+++ b/etc/caseDicts/annotated/selectCellsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/setAlphaFieldDict b/etc/caseDicts/annotated/setAlphaFieldDict
index ff9643af1f..d67d561f6b 100644
--- a/etc/caseDicts/annotated/setAlphaFieldDict
+++ b/etc/caseDicts/annotated/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/setExprBoundaryFieldsDict b/etc/caseDicts/annotated/setExprBoundaryFieldsDict
index 68ddac57e4..39ce79e493 100644
--- a/etc/caseDicts/annotated/setExprBoundaryFieldsDict
+++ b/etc/caseDicts/annotated/setExprBoundaryFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/setExprFieldsDict b/etc/caseDicts/annotated/setExprFieldsDict
index d433cc2514..bcf222a020 100644
--- a/etc/caseDicts/annotated/setExprFieldsDict
+++ b/etc/caseDicts/annotated/setExprFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/setFieldsDict b/etc/caseDicts/annotated/setFieldsDict
index 03617bd463..f39b25f6f0 100644
--- a/etc/caseDicts/annotated/setFieldsDict
+++ b/etc/caseDicts/annotated/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/snappyHexMeshDict b/etc/caseDicts/annotated/snappyHexMeshDict
index 8ebd27da57..7f2333bcc4 100644
--- a/etc/caseDicts/annotated/snappyHexMeshDict
+++ b/etc/caseDicts/annotated/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/snappyRefineMeshDict b/etc/caseDicts/annotated/snappyRefineMeshDict
index e9e26342c7..8ee5163ff5 100644
--- a/etc/caseDicts/annotated/snappyRefineMeshDict
+++ b/etc/caseDicts/annotated/snappyRefineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/stitchMeshDict b/etc/caseDicts/annotated/stitchMeshDict
index f45cecf659..d122bc5af8 100644
--- a/etc/caseDicts/annotated/stitchMeshDict
+++ b/etc/caseDicts/annotated/stitchMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/surfaceFeatureExtractDict b/etc/caseDicts/annotated/surfaceFeatureExtractDict
index 2fa9cf3b8b..fae8a42f4c 100644
--- a/etc/caseDicts/annotated/surfaceFeatureExtractDict
+++ b/etc/caseDicts/annotated/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/surfaceHookUpDict b/etc/caseDicts/annotated/surfaceHookUpDict
index 5dd9a8be76..56564db375 100644
--- a/etc/caseDicts/annotated/surfaceHookUpDict
+++ b/etc/caseDicts/annotated/surfaceHookUpDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/surfacePatchDict b/etc/caseDicts/annotated/surfacePatchDict
index 7c43625969..95fc0bf3bd 100644
--- a/etc/caseDicts/annotated/surfacePatchDict
+++ b/etc/caseDicts/annotated/surfacePatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/surfaceSubsetDict b/etc/caseDicts/annotated/surfaceSubsetDict
index 4d743a387d..8548a6de1a 100644
--- a/etc/caseDicts/annotated/surfaceSubsetDict
+++ b/etc/caseDicts/annotated/surfaceSubsetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/toleranceDict b/etc/caseDicts/annotated/toleranceDict
index 60a7f51b41..0e96c74ba5 100644
--- a/etc/caseDicts/annotated/toleranceDict
+++ b/etc/caseDicts/annotated/toleranceDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/topoSetDict b/etc/caseDicts/annotated/topoSetDict
index 01b162d4aa..d10eec2d4f 100644
--- a/etc/caseDicts/annotated/topoSetDict
+++ b/etc/caseDicts/annotated/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/topoSetSourcesDict b/etc/caseDicts/annotated/topoSetSourcesDict
index 5bde8aaeb8..53a868b7f6 100644
--- a/etc/caseDicts/annotated/topoSetSourcesDict
+++ b/etc/caseDicts/annotated/topoSetSourcesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/turbulenceFieldsDict b/etc/caseDicts/annotated/turbulenceFieldsDict
index 6d40d92af1..8a1272ff15 100644
--- a/etc/caseDicts/annotated/turbulenceFieldsDict
+++ b/etc/caseDicts/annotated/turbulenceFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/viewFactorsDict b/etc/caseDicts/annotated/viewFactorsDict
index 874629c395..8b6cb492a4 100644
--- a/etc/caseDicts/annotated/viewFactorsDict
+++ b/etc/caseDicts/annotated/viewFactorsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/annotated/wallFunctionDict b/etc/caseDicts/annotated/wallFunctionDict
index 6ca0f1f037..989829f1f0 100644
--- a/etc/caseDicts/annotated/wallFunctionDict
+++ b/etc/caseDicts/annotated/wallFunctionDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries
index 50479e7ed9..649312c8e9 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet
index 896caf1292..ad5785be8c 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions
index c7658e6c7c..46be3044f1 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet
index 1fe5c18b7d..fdb45aba10 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions
index a7dfe37c19..d67f5d3fda 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall
index 6bd4b56616..6d432ea68c 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
index f1eaf1174b..5f9ebf707c 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet
index 896caf1292..ad5785be8c 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions
index 01a97f4abc..77ba1c221b 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet
index 10f687f9ad..92d2970e08 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions
index 52970f3f22..7e6fc2014b 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall
index f3544ff334..4395b05101 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
index b697854225..457e9eef15 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet
index 1fdf265544..c7e954ae58 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions
index 8a5762e59b..060080cb59 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet
index 16a52284af..45d2462f94 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall
index 016bc86a7a..fc35cfeac6 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions
index 415db99991..859c877096 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet
index 04ac58847b..bca97a68a7 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions
index 96b92c5142..91085fa8d7 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet
index 6c2f88c152..03d2330511 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions
index 6fa45b82e6..49b71e96ec 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall
index 3de2928b5b..7fb2a71781 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions
index 489426634e..6e5a88cf17 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall
index 5507d3f03e..a99ea15a66 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
index 2634df4a2b..8717f07b26 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon
index 3cf583bffe..0f602d543a 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega
index 4b0be59f3a..4870280d64 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST
index 434b16cb38..c2f202dbab 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar
index 2c4036d3bf..cb1e21c417 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam
index 4c96b137ba..2941f2c18c 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam
index 87b67cda76..73c34adbf7 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam
index af76aa7048..de9c171ef0 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam
index ed94cc2176..e71061ae43 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam
index bf5b6da2f4..5c5a096306 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam
index 96223517d9..c0f984d5f1 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/foamyHexMeshDict b/etc/caseDicts/foamyHexMeshDict
index 9543917cfc..d34a6f4e04 100644
--- a/etc/caseDicts/foamyHexMeshDict
+++ b/etc/caseDicts/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXY b/etc/caseDicts/general/coordinateSystem/cartesianXY
index 03869b01ce..398c270621 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianXY
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXY
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXZ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
index 3f475a1f29..35e3fa613b 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianXZ
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianYZ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
index f9780055e5..ce938b10bc 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianYZ
+++ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/coordinateSystem/cylindrical b/etc/caseDicts/general/coordinateSystem/cylindrical
index b3fae79368..a1020c9b75 100644
--- a/etc/caseDicts/general/coordinateSystem/cylindrical
+++ b/etc/caseDicts/general/coordinateSystem/cylindrical
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/fvOptions/porosity/porousZone b/etc/caseDicts/general/fvOptions/porosity/porousZone
index 4662484544..e05107f861 100644
--- a/etc/caseDicts/general/fvOptions/porosity/porousZone
+++ b/etc/caseDicts/general/fvOptions/porosity/porousZone
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState b/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState
index aebc788869..6866349173 100644
--- a/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState
+++ b/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/general/fvSolution/relaxationFactors/transient b/etc/caseDicts/general/fvSolution/relaxationFactors/transient
index c4b4d2f54f..4dc5623380 100644
--- a/etc/caseDicts/general/fvSolution/relaxationFactors/transient
+++ b/etc/caseDicts/general/fvSolution/relaxationFactors/transient
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/insitu/adios/adiosWrite.cfg b/etc/caseDicts/insitu/adios/adiosWrite.cfg
index 8ce734946a..832464fb31 100644
--- a/etc/caseDicts/insitu/adios/adiosWrite.cfg
+++ b/etc/caseDicts/insitu/adios/adiosWrite.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/insitu/catalyst/catalyst.cfg b/etc/caseDicts/insitu/catalyst/catalyst.cfg
index 81541cd07e..88f855a808 100644
--- a/etc/caseDicts/insitu/catalyst/catalyst.cfg
+++ b/etc/caseDicts/insitu/catalyst/catalyst.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/mesh/generation/meshQualityDict.cfg b/etc/caseDicts/mesh/generation/meshQualityDict.cfg
index 8e0688e30a..82cf5d72c4 100644
--- a/etc/caseDicts/mesh/generation/meshQualityDict.cfg
+++ b/etc/caseDicts/mesh/generation/meshQualityDict.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg b/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg
index 622ac5fec8..a302bcdce9 100644
--- a/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg
+++ b/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict b/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict
index b3bcd992a9..fbfd509f56 100644
--- a/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict
+++ b/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
index 01a0b2392d..cbefed41e6 100644
--- a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
+++ b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/meshQualityDict b/etc/caseDicts/meshQualityDict
index 8a511c99b8..b4509b57de 100644
--- a/etc/caseDicts/meshQualityDict
+++ b/etc/caseDicts/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/fields/AMIWeights b/etc/caseDicts/postProcessing/fields/AMIWeights
index 2ab22cf33b..200f0c679e 100644
--- a/etc/caseDicts/postProcessing/fields/AMIWeights
+++ b/etc/caseDicts/postProcessing/fields/AMIWeights
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/CourantNo b/etc/caseDicts/postProcessing/fields/CourantNo
index edcc36f861..87d7127135 100644
--- a/etc/caseDicts/postProcessing/fields/CourantNo
+++ b/etc/caseDicts/postProcessing/fields/CourantNo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/LambVector b/etc/caseDicts/postProcessing/fields/LambVector
index b81bd6b027..ad1a8ae76c 100644
--- a/etc/caseDicts/postProcessing/fields/LambVector
+++ b/etc/caseDicts/postProcessing/fields/LambVector
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2 b/etc/caseDicts/postProcessing/fields/Lambda2
index 0f25111b81..f7eef3dda3 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2
+++ b/etc/caseDicts/postProcessing/fields/Lambda2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/MachNo b/etc/caseDicts/postProcessing/fields/MachNo
index ae9d873294..9f3e897a47 100644
--- a/etc/caseDicts/postProcessing/fields/MachNo
+++ b/etc/caseDicts/postProcessing/fields/MachNo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/ObukhovLength b/etc/caseDicts/postProcessing/fields/ObukhovLength
index 26af2c1788..2d51e933e3 100644
--- a/etc/caseDicts/postProcessing/fields/ObukhovLength
+++ b/etc/caseDicts/postProcessing/fields/ObukhovLength
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/PecletNo b/etc/caseDicts/postProcessing/fields/PecletNo
index 47e7783a17..4635b3a186 100644
--- a/etc/caseDicts/postProcessing/fields/PecletNo
+++ b/etc/caseDicts/postProcessing/fields/PecletNo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/Q b/etc/caseDicts/postProcessing/fields/Q
index eea6b73544..5786b5832a 100644
--- a/etc/caseDicts/postProcessing/fields/Q
+++ b/etc/caseDicts/postProcessing/fields/Q
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/R b/etc/caseDicts/postProcessing/fields/R
index eeb1213217..42020ec538 100644
--- a/etc/caseDicts/postProcessing/fields/R
+++ b/etc/caseDicts/postProcessing/fields/R
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/XiReactionRate b/etc/caseDicts/postProcessing/fields/XiReactionRate
index eb83af64c6..e15ce31ae2 100644
--- a/etc/caseDicts/postProcessing/fields/XiReactionRate
+++ b/etc/caseDicts/postProcessing/fields/XiReactionRate
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/add b/etc/caseDicts/postProcessing/fields/add
index 2b57e673ac..bff2a14299 100644
--- a/etc/caseDicts/postProcessing/fields/add
+++ b/etc/caseDicts/postProcessing/fields/add
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/components b/etc/caseDicts/postProcessing/fields/components
index 093c4e14ea..1560812868 100644
--- a/etc/caseDicts/postProcessing/fields/components
+++ b/etc/caseDicts/postProcessing/fields/components
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/ddt b/etc/caseDicts/postProcessing/fields/ddt
index 5745d97027..6b5285ca82 100644
--- a/etc/caseDicts/postProcessing/fields/ddt
+++ b/etc/caseDicts/postProcessing/fields/ddt
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/div b/etc/caseDicts/postProcessing/fields/div
index e23fad1896..b43f52d0e6 100644
--- a/etc/caseDicts/postProcessing/fields/div
+++ b/etc/caseDicts/postProcessing/fields/div
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/energySpectrum b/etc/caseDicts/postProcessing/fields/energySpectrum
index 04cba6a077..23c42886f9 100644
--- a/etc/caseDicts/postProcessing/fields/energySpectrum
+++ b/etc/caseDicts/postProcessing/fields/energySpectrum
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/enstrophy b/etc/caseDicts/postProcessing/fields/enstrophy
index ece9301b44..d06f66e57c 100644
--- a/etc/caseDicts/postProcessing/fields/enstrophy
+++ b/etc/caseDicts/postProcessing/fields/enstrophy
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/fieldMinMax b/etc/caseDicts/postProcessing/fields/fieldMinMax
index d2bee519ed..ab72d04144 100644
--- a/etc/caseDicts/postProcessing/fields/fieldMinMax
+++ b/etc/caseDicts/postProcessing/fields/fieldMinMax
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/flowType b/etc/caseDicts/postProcessing/fields/flowType
index af4e6c0bf3..3ab5ace5c4 100644
--- a/etc/caseDicts/postProcessing/fields/flowType
+++ b/etc/caseDicts/postProcessing/fields/flowType
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/grad b/etc/caseDicts/postProcessing/fields/grad
index e7bb38bff5..a1983a6cda 100644
--- a/etc/caseDicts/postProcessing/fields/grad
+++ b/etc/caseDicts/postProcessing/fields/grad
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/heatTransferCoeff b/etc/caseDicts/postProcessing/fields/heatTransferCoeff
index cc954fe716..d0eaf72580 100644
--- a/etc/caseDicts/postProcessing/fields/heatTransferCoeff
+++ b/etc/caseDicts/postProcessing/fields/heatTransferCoeff
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/log b/etc/caseDicts/postProcessing/fields/log
index a586e0e4da..8d7d2fe9df 100644
--- a/etc/caseDicts/postProcessing/fields/log
+++ b/etc/caseDicts/postProcessing/fields/log
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/mag b/etc/caseDicts/postProcessing/fields/mag
index 89b2f2df16..3e39886d71 100644
--- a/etc/caseDicts/postProcessing/fields/mag
+++ b/etc/caseDicts/postProcessing/fields/mag
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/magSqr b/etc/caseDicts/postProcessing/fields/magSqr
index 8366b6661a..2ed8d0bd9a 100644
--- a/etc/caseDicts/postProcessing/fields/magSqr
+++ b/etc/caseDicts/postProcessing/fields/magSqr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/processorField b/etc/caseDicts/postProcessing/fields/processorField
index 5c65d7df43..43265ca992 100644
--- a/etc/caseDicts/postProcessing/fields/processorField
+++ b/etc/caseDicts/postProcessing/fields/processorField
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/postProcessing/fields/randomise
index 9b66506fff..633b2af866 100644
--- a/etc/caseDicts/postProcessing/fields/randomise
+++ b/etc/caseDicts/postProcessing/fields/randomise
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/randomise.cfg b/etc/caseDicts/postProcessing/fields/randomise.cfg
index af5888ab54..bab339100e 100644
--- a/etc/caseDicts/postProcessing/fields/randomise.cfg
+++ b/etc/caseDicts/postProcessing/fields/randomise.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/fields/streamFunction b/etc/caseDicts/postProcessing/fields/streamFunction
index d97618afdb..d937576318 100644
--- a/etc/caseDicts/postProcessing/fields/streamFunction
+++ b/etc/caseDicts/postProcessing/fields/streamFunction
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/subtract b/etc/caseDicts/postProcessing/fields/subtract
index 25278dfcbd..4b4eedd15a 100644
--- a/etc/caseDicts/postProcessing/fields/subtract
+++ b/etc/caseDicts/postProcessing/fields/subtract
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/turbulenceFields b/etc/caseDicts/postProcessing/fields/turbulenceFields
index 139769648f..df567f382a 100644
--- a/etc/caseDicts/postProcessing/fields/turbulenceFields
+++ b/etc/caseDicts/postProcessing/fields/turbulenceFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/vorticity b/etc/caseDicts/postProcessing/fields/vorticity
index bc51b6c11d..03854e1d01 100644
--- a/etc/caseDicts/postProcessing/fields/vorticity
+++ b/etc/caseDicts/postProcessing/fields/vorticity
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/wallHeatFlux b/etc/caseDicts/postProcessing/fields/wallHeatFlux
index ef3f3edf00..c6207d8c70 100644
--- a/etc/caseDicts/postProcessing/fields/wallHeatFlux
+++ b/etc/caseDicts/postProcessing/fields/wallHeatFlux
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/writeCellCentres b/etc/caseDicts/postProcessing/fields/writeCellCentres
index 4b835934d0..cf7c8522fe 100644
--- a/etc/caseDicts/postProcessing/fields/writeCellCentres
+++ b/etc/caseDicts/postProcessing/fields/writeCellCentres
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/writeCellVolumes b/etc/caseDicts/postProcessing/fields/writeCellVolumes
index ed73a50349..e859168d88 100644
--- a/etc/caseDicts/postProcessing/fields/writeCellVolumes
+++ b/etc/caseDicts/postProcessing/fields/writeCellVolumes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/fields/writeObjects b/etc/caseDicts/postProcessing/fields/writeObjects
index 5c71062789..fca31d537e 100644
--- a/etc/caseDicts/postProcessing/fields/writeObjects
+++ b/etc/caseDicts/postProcessing/fields/writeObjects
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone
index 5a4107cd45..5f4f205008 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone
+++ b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg
index 403f82b7e8..5328221833 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
index cd55e95599..4ee68ccf0c 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
index 2f683bbbb8..3f17570fa5 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
index 9c3d92278c..aece45af7b 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
index b58e94a7ed..612c70d168 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
index 2b42d2a7d3..fbe6d6eb53 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
index bf8a290924..1500a11403 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
index d3522073e2..15a47fb9b9 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg
index 969f3ebe5a..587c6cf8e9 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg
index 417e35db24..a9ddf00629 100644
--- a/etc/caseDicts/postProcessing/forces/forces.cfg
+++ b/etc/caseDicts/postProcessing/forces/forces.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible
index 597b970467..3b59e77c07 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible
index 3370bb5c16..54189dd62c 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg b/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg
index 19572ecc72..190b4892ca 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg
index 2a56dbe5b6..161a4bb2dc 100644
--- a/etc/caseDicts/postProcessing/graphs/graph.cfg
+++ b/etc/caseDicts/postProcessing/graphs/graph.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict.cfg b/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
index 4627a85963..8e4cb2c8fd 100644
--- a/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
+++ b/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/graphs/singleGraph b/etc/caseDicts/postProcessing/graphs/singleGraph
index 5cae3091fb..a270ace5bd 100644
--- a/etc/caseDicts/postProcessing/graphs/singleGraph
+++ b/etc/caseDicts/postProcessing/graphs/singleGraph
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/lagrangian/dsmcFields b/etc/caseDicts/postProcessing/lagrangian/dsmcFields
index e91143598c..4e428a596c 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:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/minMax/cellMax b/etc/caseDicts/postProcessing/minMax/cellMax
index 2153f9183f..bdabd3524f 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMax
+++ b/etc/caseDicts/postProcessing/minMax/cellMax
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin b/etc/caseDicts/postProcessing/minMax/cellMin
index 740989c889..6538c4588a 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin
+++ b/etc/caseDicts/postProcessing/minMax/cellMin
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin.cfg b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
index ade5add7ce..8f41238594 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
index 030ec560e2..c5369cf24a 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/minMax/faceMax b/etc/caseDicts/postProcessing/minMax/faceMax
index 41401fc472..c0c5480e3a 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMax
+++ b/etc/caseDicts/postProcessing/minMax/faceMax
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin b/etc/caseDicts/postProcessing/minMax/faceMin
index a01c36948b..bd9f4f51ea 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin
+++ b/etc/caseDicts/postProcessing/minMax/faceMin
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin.cfg b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
index 8d9d0c8683..4456bb91e4 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
index d9aa9a049c..3e8d3b3e62 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
index 0deab96a2b..d014da26ff 100644
--- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents b/etc/caseDicts/postProcessing/minMax/minMaxComponents
index 9280dbfe35..b59fe37eb1 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
index ac5dafa46f..7e04c66a63 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
index da106bfd1b..54d92d501a 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
+++ b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/numerical/solverInfo b/etc/caseDicts/postProcessing/numerical/solverInfo
index caba33fd01..a41e304f20 100644
--- a/etc/caseDicts/postProcessing/numerical/solverInfo
+++ b/etc/caseDicts/postProcessing/numerical/solverInfo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/numerical/solverInfo.cfg b/etc/caseDicts/postProcessing/numerical/solverInfo.cfg
index a98999650b..42f73b9e3d 100644
--- a/etc/caseDicts/postProcessing/numerical/solverInfo.cfg
+++ b/etc/caseDicts/postProcessing/numerical/solverInfo.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/pressure.cfg b/etc/caseDicts/postProcessing/pressure/pressure.cfg
index 02ec7a3a56..0b5378cb54 100644
--- a/etc/caseDicts/postProcessing/pressure/pressure.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressure.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
index 4a0fa4d23e..56207f76e7 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
index ec927ccc78..f95322817a 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
index dc20d5ac5c..b38fa02c6e 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
index d02b5e6c85..a75228df41 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
index 1f37adc5ab..2043d89d57 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure b/etc/caseDicts/postProcessing/pressure/staticPressure
index 8cfdb3bb38..74a9bf3836 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
index 030064555a..85eb5b25aa 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
index 3e4004442b..28063bd484 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
index 18b83f821b..79af5a25ed 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
index cf8387ffcb..bd0701c732 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
index 8bd0cd0b2a..d22401460d 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud b/etc/caseDicts/postProcessing/probes/boundaryCloud
index c11f7b6375..8181e97e91 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
index 5dc8f75824..c85bd0823e 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg
index 4529fb6cc3..a16d6e445f 100644
--- a/etc/caseDicts/postProcessing/probes/cloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/cloud.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud b/etc/caseDicts/postProcessing/probes/internalCloud
index b4292eb77c..9ac09ef30f 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud
+++ b/etc/caseDicts/postProcessing/probes/internalCloud
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud.cfg b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
index da72307b94..f417c06bae 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/postProcessing/probes/probes
index cd351b73f8..6aae4d4b44 100644
--- a/etc/caseDicts/postProcessing/probes/probes
+++ b/etc/caseDicts/postProcessing/probes/probes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/postProcessing/probes/probes.cfg
index a9d6dcf17a..9b5ea41dde 100644
--- a/etc/caseDicts/postProcessing/probes/probes.cfg
+++ b/etc/caseDicts/postProcessing/probes/probes.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
index 65957dcc0b..957a56000c 100644
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg
index a77a941f7e..c535c8bec1 100644
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg
index 8565208d56..3415d735f9 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg
index ff61def63b..1cf240b01d 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage b/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage
index 73d1a8a9ac..76ea49426d 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate b/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate
index c94460c6fb..d759f4789b 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg
index cad9e80ae7..3fe6f9461a 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg
index 583fc736c8..45f09b6da5 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceRegion.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/visualization/runTimePostPro.cfg b/etc/caseDicts/postProcessing/visualization/runTimePostPro.cfg
index d546084ed9..5f87042ce4 100644
--- a/etc/caseDicts/postProcessing/visualization/runTimePostPro.cfg
+++ b/etc/caseDicts/postProcessing/visualization/runTimePostPro.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines
index a25bb795b7..e72f5a26fc 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines
+++ b/etc/caseDicts/postProcessing/visualization/streamlines
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
index fd908c3436..224fbcdcee 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg
+++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces b/etc/caseDicts/postProcessing/visualization/surfaces
index 9270ee08d4..c17e03e853 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces
+++ b/etc/caseDicts/postProcessing/visualization/surfaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index 1236898265..d4aa4b6bb4 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2212
+   \\    /   O peration     | Version:  v2306
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/solvers/scalarTransport/s b/etc/caseDicts/solvers/scalarTransport/s
index 16b796627b..065597e728 100644
--- a/etc/caseDicts/solvers/scalarTransport/s
+++ b/etc/caseDicts/solvers/scalarTransport/s
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/solvers/scalarTransport/scalarTransportDict b/etc/caseDicts/solvers/scalarTransport/scalarTransportDict
index 27c382d8e0..aedf420b0e 100644
--- a/etc/caseDicts/solvers/scalarTransport/scalarTransportDict
+++ b/etc/caseDicts/solvers/scalarTransport/scalarTransportDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/solvers/scalarTransport/scalarTransportDict.cfg b/etc/caseDicts/solvers/scalarTransport/scalarTransportDict.cfg
index 9eff5c156a..fb68a619d7 100644
--- a/etc/caseDicts/solvers/scalarTransport/scalarTransportDict.cfg
+++ b/etc/caseDicts/solvers/scalarTransport/scalarTransportDict.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
index 4e20cf3a0f..c0bf6bab0b 100644
--- a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
+++ b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/cellModels b/etc/cellModels
index 9262fa6f4a..949e744e5d 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/colourTables b/etc/colourTables
index e232dc0e80..46fc07d5e2 100644
--- a/etc/colourTables
+++ b/etc/colourTables
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/0/U b/etc/templates/axisymmetricJet/0/U
index 2a01748099..adccf87693 100644
--- a/etc/templates/axisymmetricJet/0/U
+++ b/etc/templates/axisymmetricJet/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/0/epsilon b/etc/templates/axisymmetricJet/0/epsilon
index 84323b104c..c0d6225daa 100644
--- a/etc/templates/axisymmetricJet/0/epsilon
+++ b/etc/templates/axisymmetricJet/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/0/k b/etc/templates/axisymmetricJet/0/k
index e46a4c3899..83105302f0 100644
--- a/etc/templates/axisymmetricJet/0/k
+++ b/etc/templates/axisymmetricJet/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/0/nut b/etc/templates/axisymmetricJet/0/nut
index d7712ee393..f123df1198 100644
--- a/etc/templates/axisymmetricJet/0/nut
+++ b/etc/templates/axisymmetricJet/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/0/omega b/etc/templates/axisymmetricJet/0/omega
index c51974ec76..f76aa7fc84 100644
--- a/etc/templates/axisymmetricJet/0/omega
+++ b/etc/templates/axisymmetricJet/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/0/p b/etc/templates/axisymmetricJet/0/p
index 7079f4c102..6698e37d86 100644
--- a/etc/templates/axisymmetricJet/0/p
+++ b/etc/templates/axisymmetricJet/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/constant/transportProperties b/etc/templates/axisymmetricJet/constant/transportProperties
index 818a5ecbfd..ab2c50c78b 100644
--- a/etc/templates/axisymmetricJet/constant/transportProperties
+++ b/etc/templates/axisymmetricJet/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/constant/turbulenceProperties b/etc/templates/axisymmetricJet/constant/turbulenceProperties
index 2ebd08fa01..c9f93d649d 100644
--- a/etc/templates/axisymmetricJet/constant/turbulenceProperties
+++ b/etc/templates/axisymmetricJet/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/system/blockMeshDict b/etc/templates/axisymmetricJet/system/blockMeshDict
index 120457f6b9..471cabd063 100644
--- a/etc/templates/axisymmetricJet/system/blockMeshDict
+++ b/etc/templates/axisymmetricJet/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/system/controlDict b/etc/templates/axisymmetricJet/system/controlDict
index 60759a4bd6..7f3d066d96 100644
--- a/etc/templates/axisymmetricJet/system/controlDict
+++ b/etc/templates/axisymmetricJet/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/system/extrudeMeshDict b/etc/templates/axisymmetricJet/system/extrudeMeshDict
index 5e910328aa..f198534ef0 100644
--- a/etc/templates/axisymmetricJet/system/extrudeMeshDict
+++ b/etc/templates/axisymmetricJet/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/system/fvSchemes b/etc/templates/axisymmetricJet/system/fvSchemes
index aecae59185..1815aa79b5 100644
--- a/etc/templates/axisymmetricJet/system/fvSchemes
+++ b/etc/templates/axisymmetricJet/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/system/fvSolution b/etc/templates/axisymmetricJet/system/fvSolution
index 4e33246e68..3ff798c818 100644
--- a/etc/templates/axisymmetricJet/system/fvSolution
+++ b/etc/templates/axisymmetricJet/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/axisymmetricJet/system/graph b/etc/templates/axisymmetricJet/system/graph
index eb2acb6739..40079fe673 100644
--- a/etc/templates/axisymmetricJet/system/graph
+++ b/etc/templates/axisymmetricJet/system/graph
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/T b/etc/templates/closedVolume/0/T
index cc181c2c29..b5c279061d 100644
--- a/etc/templates/closedVolume/0/T
+++ b/etc/templates/closedVolume/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/U b/etc/templates/closedVolume/0/U
index ecc4c456f6..279f61a661 100644
--- a/etc/templates/closedVolume/0/U
+++ b/etc/templates/closedVolume/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/alphat b/etc/templates/closedVolume/0/alphat
index f478096a12..4e025fd33b 100644
--- a/etc/templates/closedVolume/0/alphat
+++ b/etc/templates/closedVolume/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/epsilon b/etc/templates/closedVolume/0/epsilon
index 3e62b31adf..f4ff7493a1 100644
--- a/etc/templates/closedVolume/0/epsilon
+++ b/etc/templates/closedVolume/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/k b/etc/templates/closedVolume/0/k
index 01853a41d8..de9e81c883 100644
--- a/etc/templates/closedVolume/0/k
+++ b/etc/templates/closedVolume/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/nut b/etc/templates/closedVolume/0/nut
index 02eec90fae..92c074861f 100644
--- a/etc/templates/closedVolume/0/nut
+++ b/etc/templates/closedVolume/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/omega b/etc/templates/closedVolume/0/omega
index 6ae0ed6262..013e9d15ce 100644
--- a/etc/templates/closedVolume/0/omega
+++ b/etc/templates/closedVolume/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/p b/etc/templates/closedVolume/0/p
index e0476a8f7a..ecf3a35393 100644
--- a/etc/templates/closedVolume/0/p
+++ b/etc/templates/closedVolume/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/0/p_rgh b/etc/templates/closedVolume/0/p_rgh
index d2aff0f32d..6ad393d458 100644
--- a/etc/templates/closedVolume/0/p_rgh
+++ b/etc/templates/closedVolume/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/constant/g b/etc/templates/closedVolume/constant/g
index cc323c988f..e4c1d4f712 100644
--- a/etc/templates/closedVolume/constant/g
+++ b/etc/templates/closedVolume/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/constant/transportProperties b/etc/templates/closedVolume/constant/transportProperties
index e38d4667ca..9778165cfd 100644
--- a/etc/templates/closedVolume/constant/transportProperties
+++ b/etc/templates/closedVolume/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/constant/turbulenceProperties b/etc/templates/closedVolume/constant/turbulenceProperties
index 37eab49b33..1d36a92dc7 100644
--- a/etc/templates/closedVolume/constant/turbulenceProperties
+++ b/etc/templates/closedVolume/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/blockMeshDict b/etc/templates/closedVolume/system/blockMeshDict
index 5cf41c8a41..8342c7b2ec 100644
--- a/etc/templates/closedVolume/system/blockMeshDict
+++ b/etc/templates/closedVolume/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/controlDict b/etc/templates/closedVolume/system/controlDict
index bbb38a0008..9f6ab027fd 100644
--- a/etc/templates/closedVolume/system/controlDict
+++ b/etc/templates/closedVolume/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/fvSchemes b/etc/templates/closedVolume/system/fvSchemes
index 993d5bc108..65de08dab1 100644
--- a/etc/templates/closedVolume/system/fvSchemes
+++ b/etc/templates/closedVolume/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/fvSolution b/etc/templates/closedVolume/system/fvSolution
index f1042bd1d5..70368faf5e 100644
--- a/etc/templates/closedVolume/system/fvSolution
+++ b/etc/templates/closedVolume/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/meshQualityDict b/etc/templates/closedVolume/system/meshQualityDict
index d1452e61ca..41225542c9 100644
--- a/etc/templates/closedVolume/system/meshQualityDict
+++ b/etc/templates/closedVolume/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/snappyHexMeshDict b/etc/templates/closedVolume/system/snappyHexMeshDict
index 85bbc1a5df..fd9e67862d 100644
--- a/etc/templates/closedVolume/system/snappyHexMeshDict
+++ b/etc/templates/closedVolume/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolume/system/surfaceFeatureExtractDict b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
index 9a6941650b..839ce27e60 100644
--- a/etc/templates/closedVolume/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/0/U b/etc/templates/closedVolumeRotating/0/U
index 635adcce01..4ffbf6d1cd 100644
--- a/etc/templates/closedVolumeRotating/0/U
+++ b/etc/templates/closedVolumeRotating/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/0/k b/etc/templates/closedVolumeRotating/0/k
index 263c65f9de..d547d637c8 100644
--- a/etc/templates/closedVolumeRotating/0/k
+++ b/etc/templates/closedVolumeRotating/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/0/nut b/etc/templates/closedVolumeRotating/0/nut
index 02eec90fae..92c074861f 100644
--- a/etc/templates/closedVolumeRotating/0/nut
+++ b/etc/templates/closedVolumeRotating/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/0/omega b/etc/templates/closedVolumeRotating/0/omega
index 2a4dfe5cd8..18e746c048 100644
--- a/etc/templates/closedVolumeRotating/0/omega
+++ b/etc/templates/closedVolumeRotating/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/0/p b/etc/templates/closedVolumeRotating/0/p
index e0476a8f7a..ecf3a35393 100644
--- a/etc/templates/closedVolumeRotating/0/p
+++ b/etc/templates/closedVolumeRotating/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/constant/MRFProperties b/etc/templates/closedVolumeRotating/constant/MRFProperties
index 6b97260db2..3a3561ebe9 100644
--- a/etc/templates/closedVolumeRotating/constant/MRFProperties
+++ b/etc/templates/closedVolumeRotating/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/constant/dynamicMeshDict b/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
index 66e1326d5c..3253714ab1 100644
--- a/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
+++ b/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties b/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties
index 7231865612..74e5fcadb0 100644
--- a/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties
+++ b/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/constant/transportProperties b/etc/templates/closedVolumeRotating/constant/transportProperties
index 818a5ecbfd..ab2c50c78b 100644
--- a/etc/templates/closedVolumeRotating/constant/transportProperties
+++ b/etc/templates/closedVolumeRotating/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/constant/turbulenceProperties b/etc/templates/closedVolumeRotating/constant/turbulenceProperties
index 2ebd08fa01..c9f93d649d 100644
--- a/etc/templates/closedVolumeRotating/constant/turbulenceProperties
+++ b/etc/templates/closedVolumeRotating/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/blockMeshDict b/etc/templates/closedVolumeRotating/system/blockMeshDict
index d9c4f31862..ec399d20fd 100644
--- a/etc/templates/closedVolumeRotating/system/blockMeshDict
+++ b/etc/templates/closedVolumeRotating/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/blockMeshDict-box b/etc/templates/closedVolumeRotating/system/blockMeshDict-box
index 5cf41c8a41..8342c7b2ec 100644
--- a/etc/templates/closedVolumeRotating/system/blockMeshDict-box
+++ b/etc/templates/closedVolumeRotating/system/blockMeshDict-box
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/controlDict b/etc/templates/closedVolumeRotating/system/controlDict
index 4aa09477c1..600f4b5fe8 100644
--- a/etc/templates/closedVolumeRotating/system/controlDict
+++ b/etc/templates/closedVolumeRotating/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/createBafflesDict b/etc/templates/closedVolumeRotating/system/createBafflesDict
index 0ed5336411..85f5fa2d98 100644
--- a/etc/templates/closedVolumeRotating/system/createBafflesDict
+++ b/etc/templates/closedVolumeRotating/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/fvSchemes b/etc/templates/closedVolumeRotating/system/fvSchemes
index 3161e1d7ed..d35e4cdead 100644
--- a/etc/templates/closedVolumeRotating/system/fvSchemes
+++ b/etc/templates/closedVolumeRotating/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/fvSolution b/etc/templates/closedVolumeRotating/system/fvSolution
index 4e33246e68..3ff798c818 100644
--- a/etc/templates/closedVolumeRotating/system/fvSolution
+++ b/etc/templates/closedVolumeRotating/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/meshQualityDict b/etc/templates/closedVolumeRotating/system/meshQualityDict
index d1452e61ca..41225542c9 100644
--- a/etc/templates/closedVolumeRotating/system/meshQualityDict
+++ b/etc/templates/closedVolumeRotating/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
index 963ef03d90..c3dd15dd7e 100644
--- a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
+++ b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict b/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict
index 87221b9aeb..5449a26126 100644
--- a/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/T b/etc/templates/compressibleInflowOutflow/0/T
index 01917c3878..e1dc1f7e81 100644
--- a/etc/templates/compressibleInflowOutflow/0/T
+++ b/etc/templates/compressibleInflowOutflow/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/U b/etc/templates/compressibleInflowOutflow/0/U
index 39559102df..6afe38373d 100644
--- a/etc/templates/compressibleInflowOutflow/0/U
+++ b/etc/templates/compressibleInflowOutflow/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/alphat b/etc/templates/compressibleInflowOutflow/0/alphat
index cb232e3757..d3cfddf95b 100644
--- a/etc/templates/compressibleInflowOutflow/0/alphat
+++ b/etc/templates/compressibleInflowOutflow/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/epsilon b/etc/templates/compressibleInflowOutflow/0/epsilon
index b7d94cb7db..c5c3c10985 100644
--- a/etc/templates/compressibleInflowOutflow/0/epsilon
+++ b/etc/templates/compressibleInflowOutflow/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/k b/etc/templates/compressibleInflowOutflow/0/k
index f36603b179..902e44e15b 100644
--- a/etc/templates/compressibleInflowOutflow/0/k
+++ b/etc/templates/compressibleInflowOutflow/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/nut b/etc/templates/compressibleInflowOutflow/0/nut
index 85afcdc6e9..f2c8a1e34b 100644
--- a/etc/templates/compressibleInflowOutflow/0/nut
+++ b/etc/templates/compressibleInflowOutflow/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/omega b/etc/templates/compressibleInflowOutflow/0/omega
index caede07956..4d22b579d3 100644
--- a/etc/templates/compressibleInflowOutflow/0/omega
+++ b/etc/templates/compressibleInflowOutflow/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/0/p b/etc/templates/compressibleInflowOutflow/0/p
index 66dc70766c..29356ea767 100644
--- a/etc/templates/compressibleInflowOutflow/0/p
+++ b/etc/templates/compressibleInflowOutflow/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties b/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
index b396dca751..334324fc12 100644
--- a/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
+++ b/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties b/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
index 37eab49b33..1d36a92dc7 100644
--- a/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
+++ b/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/blockMeshDict b/etc/templates/compressibleInflowOutflow/system/blockMeshDict
index 62752aa1e5..e93f311e8a 100644
--- a/etc/templates/compressibleInflowOutflow/system/blockMeshDict
+++ b/etc/templates/compressibleInflowOutflow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/controlDict b/etc/templates/compressibleInflowOutflow/system/controlDict
index 8fdf499d30..0da88019d0 100644
--- a/etc/templates/compressibleInflowOutflow/system/controlDict
+++ b/etc/templates/compressibleInflowOutflow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/fvSchemes b/etc/templates/compressibleInflowOutflow/system/fvSchemes
index 7657b334d0..fa7c2ac8be 100644
--- a/etc/templates/compressibleInflowOutflow/system/fvSchemes
+++ b/etc/templates/compressibleInflowOutflow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/fvSolution b/etc/templates/compressibleInflowOutflow/system/fvSolution
index 96b552a904..55510a26df 100644
--- a/etc/templates/compressibleInflowOutflow/system/fvSolution
+++ b/etc/templates/compressibleInflowOutflow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/meshQualityDict b/etc/templates/compressibleInflowOutflow/system/meshQualityDict
index d1452e61ca..41225542c9 100644
--- a/etc/templates/compressibleInflowOutflow/system/meshQualityDict
+++ b/etc/templates/compressibleInflowOutflow/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
index d9a10522ef..f094e1d866 100644
--- a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
+++ b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
index 9a6941650b..839ce27e60 100644
--- a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/0/U b/etc/templates/inflowOutflow/0/U
index 39559102df..6afe38373d 100644
--- a/etc/templates/inflowOutflow/0/U
+++ b/etc/templates/inflowOutflow/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/0/k b/etc/templates/inflowOutflow/0/k
index f36603b179..902e44e15b 100644
--- a/etc/templates/inflowOutflow/0/k
+++ b/etc/templates/inflowOutflow/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/0/nut b/etc/templates/inflowOutflow/0/nut
index 736311e3b4..7b4f4bfbe1 100644
--- a/etc/templates/inflowOutflow/0/nut
+++ b/etc/templates/inflowOutflow/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/0/omega b/etc/templates/inflowOutflow/0/omega
index caede07956..4d22b579d3 100644
--- a/etc/templates/inflowOutflow/0/omega
+++ b/etc/templates/inflowOutflow/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/0/p b/etc/templates/inflowOutflow/0/p
index 675871a45b..edcef92bad 100644
--- a/etc/templates/inflowOutflow/0/p
+++ b/etc/templates/inflowOutflow/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/constant/transportProperties b/etc/templates/inflowOutflow/constant/transportProperties
index 818a5ecbfd..ab2c50c78b 100644
--- a/etc/templates/inflowOutflow/constant/transportProperties
+++ b/etc/templates/inflowOutflow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/constant/turbulenceProperties b/etc/templates/inflowOutflow/constant/turbulenceProperties
index 2ebd08fa01..c9f93d649d 100644
--- a/etc/templates/inflowOutflow/constant/turbulenceProperties
+++ b/etc/templates/inflowOutflow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/blockMeshDict b/etc/templates/inflowOutflow/system/blockMeshDict
index 62752aa1e5..e93f311e8a 100644
--- a/etc/templates/inflowOutflow/system/blockMeshDict
+++ b/etc/templates/inflowOutflow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/controlDict b/etc/templates/inflowOutflow/system/controlDict
index 4aa09477c1..600f4b5fe8 100644
--- a/etc/templates/inflowOutflow/system/controlDict
+++ b/etc/templates/inflowOutflow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/fvSchemes b/etc/templates/inflowOutflow/system/fvSchemes
index 3161e1d7ed..d35e4cdead 100644
--- a/etc/templates/inflowOutflow/system/fvSchemes
+++ b/etc/templates/inflowOutflow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/fvSolution b/etc/templates/inflowOutflow/system/fvSolution
index 4e33246e68..3ff798c818 100644
--- a/etc/templates/inflowOutflow/system/fvSolution
+++ b/etc/templates/inflowOutflow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/meshQualityDict b/etc/templates/inflowOutflow/system/meshQualityDict
index d1452e61ca..41225542c9 100644
--- a/etc/templates/inflowOutflow/system/meshQualityDict
+++ b/etc/templates/inflowOutflow/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/snappyHexMeshDict b/etc/templates/inflowOutflow/system/snappyHexMeshDict
index d9a10522ef..f094e1d866 100644
--- a/etc/templates/inflowOutflow/system/snappyHexMeshDict
+++ b/etc/templates/inflowOutflow/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
index 9a6941650b..839ce27e60 100644
--- a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/0/U b/etc/templates/inflowOutflowRotating/0/U
index 9fcf07a582..654417d3fa 100644
--- a/etc/templates/inflowOutflowRotating/0/U
+++ b/etc/templates/inflowOutflowRotating/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/0/k b/etc/templates/inflowOutflowRotating/0/k
index f36603b179..902e44e15b 100644
--- a/etc/templates/inflowOutflowRotating/0/k
+++ b/etc/templates/inflowOutflowRotating/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/0/nut b/etc/templates/inflowOutflowRotating/0/nut
index 736311e3b4..7b4f4bfbe1 100644
--- a/etc/templates/inflowOutflowRotating/0/nut
+++ b/etc/templates/inflowOutflowRotating/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/0/omega b/etc/templates/inflowOutflowRotating/0/omega
index caede07956..4d22b579d3 100644
--- a/etc/templates/inflowOutflowRotating/0/omega
+++ b/etc/templates/inflowOutflowRotating/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/0/p b/etc/templates/inflowOutflowRotating/0/p
index 675871a45b..edcef92bad 100644
--- a/etc/templates/inflowOutflowRotating/0/p
+++ b/etc/templates/inflowOutflowRotating/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/constant/MRFProperties b/etc/templates/inflowOutflowRotating/constant/MRFProperties
index 6b97260db2..3a3561ebe9 100644
--- a/etc/templates/inflowOutflowRotating/constant/MRFProperties
+++ b/etc/templates/inflowOutflowRotating/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict b/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
index 66e1326d5c..3253714ab1 100644
--- a/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
+++ b/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties b/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties
index 7231865612..74e5fcadb0 100644
--- a/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties
+++ b/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/constant/transportProperties b/etc/templates/inflowOutflowRotating/constant/transportProperties
index 818a5ecbfd..ab2c50c78b 100644
--- a/etc/templates/inflowOutflowRotating/constant/transportProperties
+++ b/etc/templates/inflowOutflowRotating/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties b/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
index 2ebd08fa01..c9f93d649d 100644
--- a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
+++ b/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/blockMeshDict b/etc/templates/inflowOutflowRotating/system/blockMeshDict
index d985a7739a..2d7f551e67 100644
--- a/etc/templates/inflowOutflowRotating/system/blockMeshDict
+++ b/etc/templates/inflowOutflowRotating/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/blockMeshDict-box b/etc/templates/inflowOutflowRotating/system/blockMeshDict-box
index 62752aa1e5..e93f311e8a 100644
--- a/etc/templates/inflowOutflowRotating/system/blockMeshDict-box
+++ b/etc/templates/inflowOutflowRotating/system/blockMeshDict-box
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/controlDict b/etc/templates/inflowOutflowRotating/system/controlDict
index 4aa09477c1..600f4b5fe8 100644
--- a/etc/templates/inflowOutflowRotating/system/controlDict
+++ b/etc/templates/inflowOutflowRotating/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/createBafflesDict b/etc/templates/inflowOutflowRotating/system/createBafflesDict
index 0ed5336411..85f5fa2d98 100644
--- a/etc/templates/inflowOutflowRotating/system/createBafflesDict
+++ b/etc/templates/inflowOutflowRotating/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/fvSchemes b/etc/templates/inflowOutflowRotating/system/fvSchemes
index 3161e1d7ed..d35e4cdead 100644
--- a/etc/templates/inflowOutflowRotating/system/fvSchemes
+++ b/etc/templates/inflowOutflowRotating/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/fvSolution b/etc/templates/inflowOutflowRotating/system/fvSolution
index 4e33246e68..3ff798c818 100644
--- a/etc/templates/inflowOutflowRotating/system/fvSolution
+++ b/etc/templates/inflowOutflowRotating/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/meshQualityDict b/etc/templates/inflowOutflowRotating/system/meshQualityDict
index d1452e61ca..41225542c9 100644
--- a/etc/templates/inflowOutflowRotating/system/meshQualityDict
+++ b/etc/templates/inflowOutflowRotating/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
index 4e5ef9c427..164106a086 100644
--- a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
+++ b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict
index 87221b9aeb..5449a26126 100644
--- a/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/conversion/ccm/remapping b/src/conversion/ccm/remapping
index 994189dc94..7b72d42f6d 100644
--- a/src/conversion/ccm/remapping
+++ b/src/conversion/ccm/remapping
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/conversion/common/tables/remappingDict b/src/conversion/common/tables/remappingDict
index 8e053aaee6..e94b138ad0 100644
--- a/src/conversion/common/tables/remappingDict
+++ b/src/conversion/common/tables/remappingDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/balanceParDict b/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/balanceParDict
index e8c5f01e72..2cf639e732 100644
--- a/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/balanceParDict
+++ b/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/balanceParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/dynamicMeshDict
index 373d403ecc..631b4f1e1e 100644
--- a/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/dynamicMeshDict
+++ b/src/dynamicFvMesh/dynamicRefineBalancedFvMesh/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
index 0b56d961d9..bb3fe65f14 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/fvSolution b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/fvSolution
index 2b632fe513..0760f5cf13 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/fvSolution
+++ b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/lumpedPointMotion/lumpedPointMovementDict b/src/lumpedPointMotion/lumpedPointMovementDict
index 643d453b9d..ab2f52ca1d 100644
--- a/src/lumpedPointMotion/lumpedPointMovementDict
+++ b/src/lumpedPointMotion/lumpedPointMovementDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/src/sampling/probes/probesDict b/src/sampling/probes/probesDict
index 919648a453..d91b887a48 100644
--- a/src/sampling/probes/probesDict
+++ b/src/sampling/probes/probesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.orig/U b/tutorials/DNS/dnsFoam/boxTurb16/0.orig/U
index e5768a9890..467fc79aea 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.orig/U
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.orig/p b/tutorials/DNS/dnsFoam/boxTurb16/0.orig/p
index 04c0a3511e..fc06cb386b 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.orig/p
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
index d99d871be5..dd71540ad6 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
index 3cc3f32c31..ae10426914 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
index ebe4275640..5296167750 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
index 6cfd6fd5fe..1e542cd4ca 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
index 3436ebc849..0dbf9dad56 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
index b7e84c2889..d65318d412 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
index f02ccfabc1..a01ec5fa34 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-ending1.dict b/tutorials/IO/dictionary/fatal-ending1.dict
index f0b7d90e0b..d241c5fccc 100644
--- a/tutorials/IO/dictionary/fatal-ending1.dict
+++ b/tutorials/IO/dictionary/fatal-ending1.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-ending2.dict b/tutorials/IO/dictionary/fatal-ending2.dict
index f8719f5fa1..a6121b6f20 100644
--- a/tutorials/IO/dictionary/fatal-ending2.dict
+++ b/tutorials/IO/dictionary/fatal-ending2.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-ending3.dict b/tutorials/IO/dictionary/fatal-ending3.dict
index 91591c7627..f019eed126 100644
--- a/tutorials/IO/dictionary/fatal-ending3.dict
+++ b/tutorials/IO/dictionary/fatal-ending3.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-ending4.dict b/tutorials/IO/dictionary/fatal-ending4.dict
index 54f049eea9..86204fa16b 100644
--- a/tutorials/IO/dictionary/fatal-ending4.dict
+++ b/tutorials/IO/dictionary/fatal-ending4.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-premature-ending1.dict b/tutorials/IO/dictionary/fatal-premature-ending1.dict
index 3617f7ae65..1bae12e606 100644
--- a/tutorials/IO/dictionary/fatal-premature-ending1.dict
+++ b/tutorials/IO/dictionary/fatal-premature-ending1.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-premature-ending2.dict b/tutorials/IO/dictionary/fatal-premature-ending2.dict
index 4c20307124..592dd46367 100644
--- a/tutorials/IO/dictionary/fatal-premature-ending2.dict
+++ b/tutorials/IO/dictionary/fatal-premature-ending2.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-primitive-ending1.dict b/tutorials/IO/dictionary/fatal-primitive-ending1.dict
index 7fcfd66e21..cbd39d6c4c 100644
--- a/tutorials/IO/dictionary/fatal-primitive-ending1.dict
+++ b/tutorials/IO/dictionary/fatal-primitive-ending1.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-primitive-ending2.dict b/tutorials/IO/dictionary/fatal-primitive-ending2.dict
index 4fdd2a0f5e..a87ddc6e5c 100644
--- a/tutorials/IO/dictionary/fatal-primitive-ending2.dict
+++ b/tutorials/IO/dictionary/fatal-primitive-ending2.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/fatal-primitive-ending3.dict b/tutorials/IO/dictionary/fatal-primitive-ending3.dict
index 744ad293db..f506095f35 100644
--- a/tutorials/IO/dictionary/fatal-primitive-ending3.dict
+++ b/tutorials/IO/dictionary/fatal-primitive-ending3.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-empty2.dict b/tutorials/IO/dictionary/good-empty2.dict
index 7cd9aba13b..9180673dc5 100644
--- a/tutorials/IO/dictionary/good-empty2.dict
+++ b/tutorials/IO/dictionary/good-empty2.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-ending1.dict b/tutorials/IO/dictionary/good-ending1.dict
index d3be2bc0c3..505524c223 100644
--- a/tutorials/IO/dictionary/good-ending1.dict
+++ b/tutorials/IO/dictionary/good-ending1.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-if1.dict b/tutorials/IO/dictionary/good-if1.dict
index 2041a11ef6..8be1c91bde 100644
--- a/tutorials/IO/dictionary/good-if1.dict
+++ b/tutorials/IO/dictionary/good-if1.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-if2.dict b/tutorials/IO/dictionary/good-if2.dict
index d2a6d975a0..80bde8180b 100644
--- a/tutorials/IO/dictionary/good-if2.dict
+++ b/tutorials/IO/dictionary/good-if2.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-if3.dict b/tutorials/IO/dictionary/good-if3.dict
index 09ecc4d057..5eaaf9e73b 100644
--- a/tutorials/IO/dictionary/good-if3.dict
+++ b/tutorials/IO/dictionary/good-if3.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-primitive-ending1.dict b/tutorials/IO/dictionary/good-primitive-ending1.dict
index c7ca8b85bb..617f482891 100644
--- a/tutorials/IO/dictionary/good-primitive-ending1.dict
+++ b/tutorials/IO/dictionary/good-primitive-ending1.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/good-word-expand.dict b/tutorials/IO/dictionary/good-word-expand.dict
index 90d2140a5d..50b468e020 100644
--- a/tutorials/IO/dictionary/good-word-expand.dict
+++ b/tutorials/IO/dictionary/good-word-expand.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/dictionary/missed-ending3.dict b/tutorials/IO/dictionary/missed-ending3.dict
index 060a62aae0..8a8fd04b53 100644
--- a/tutorials/IO/dictionary/missed-ending3.dict
+++ b/tutorials/IO/dictionary/missed-ending3.dict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/0.orig/U b/tutorials/IO/fileHandler/0.orig/U
index be7aae119d..ada381cfcc 100644
--- a/tutorials/IO/fileHandler/0.orig/U
+++ b/tutorials/IO/fileHandler/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/constant/g b/tutorials/IO/fileHandler/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/IO/fileHandler/constant/g
+++ b/tutorials/IO/fileHandler/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/constant/kinematicCloudPositions b/tutorials/IO/fileHandler/constant/kinematicCloudPositions
index 2ee0518a33..2ad0975bd1 100644
--- a/tutorials/IO/fileHandler/constant/kinematicCloudPositions
+++ b/tutorials/IO/fileHandler/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/constant/kinematicCloudProperties b/tutorials/IO/fileHandler/constant/kinematicCloudProperties
index 5d44a396c4..81b49ed591 100644
--- a/tutorials/IO/fileHandler/constant/kinematicCloudProperties
+++ b/tutorials/IO/fileHandler/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/constant/transportProperties b/tutorials/IO/fileHandler/constant/transportProperties
index fa41f0e560..d1bee83bae 100644
--- a/tutorials/IO/fileHandler/constant/transportProperties
+++ b/tutorials/IO/fileHandler/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/constant/turbulenceProperties b/tutorials/IO/fileHandler/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/IO/fileHandler/constant/turbulenceProperties
+++ b/tutorials/IO/fileHandler/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/system/blockMeshDict b/tutorials/IO/fileHandler/system/blockMeshDict
index df088d3a92..850e03f6ca 100644
--- a/tutorials/IO/fileHandler/system/blockMeshDict
+++ b/tutorials/IO/fileHandler/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/system/controlDict b/tutorials/IO/fileHandler/system/controlDict
index fe45e7a7fb..283ba90bb1 100644
--- a/tutorials/IO/fileHandler/system/controlDict
+++ b/tutorials/IO/fileHandler/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/system/decomposeParDict b/tutorials/IO/fileHandler/system/decomposeParDict
index a4294bd306..679d64ad5d 100644
--- a/tutorials/IO/fileHandler/system/decomposeParDict
+++ b/tutorials/IO/fileHandler/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/system/fvSchemes b/tutorials/IO/fileHandler/system/fvSchemes
index 91237570ad..1680b29832 100644
--- a/tutorials/IO/fileHandler/system/fvSchemes
+++ b/tutorials/IO/fileHandler/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/system/fvSolution b/tutorials/IO/fileHandler/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/IO/fileHandler/system/fvSolution
+++ b/tutorials/IO/fileHandler/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/U b/tutorials/IO/systemCall/0.orig/U
index 58cc8690a1..6ddbb44c2d 100644
--- a/tutorials/IO/systemCall/0.orig/U
+++ b/tutorials/IO/systemCall/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/include/fixedInlet b/tutorials/IO/systemCall/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/IO/systemCall/0.orig/include/fixedInlet
+++ b/tutorials/IO/systemCall/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/include/frontBackUpperPatches b/tutorials/IO/systemCall/0.orig/include/frontBackUpperPatches
index 3b9d18028b..55be3e502c 100644
--- a/tutorials/IO/systemCall/0.orig/include/frontBackUpperPatches
+++ b/tutorials/IO/systemCall/0.orig/include/frontBackUpperPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/include/initialConditions b/tutorials/IO/systemCall/0.orig/include/initialConditions
index dbca4e544a..479d1b696e 100644
--- a/tutorials/IO/systemCall/0.orig/include/initialConditions
+++ b/tutorials/IO/systemCall/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/k b/tutorials/IO/systemCall/0.orig/k
index 88d14e8109..a25187722d 100644
--- a/tutorials/IO/systemCall/0.orig/k
+++ b/tutorials/IO/systemCall/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/nut b/tutorials/IO/systemCall/0.orig/nut
index 94069dfcf8..db596167ac 100644
--- a/tutorials/IO/systemCall/0.orig/nut
+++ b/tutorials/IO/systemCall/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/omega b/tutorials/IO/systemCall/0.orig/omega
index 9ae6196b04..d847491092 100644
--- a/tutorials/IO/systemCall/0.orig/omega
+++ b/tutorials/IO/systemCall/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/0.orig/p b/tutorials/IO/systemCall/0.orig/p
index 9316485d69..47624d32a3 100644
--- a/tutorials/IO/systemCall/0.orig/p
+++ b/tutorials/IO/systemCall/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/constant/transportProperties b/tutorials/IO/systemCall/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/IO/systemCall/constant/transportProperties
+++ b/tutorials/IO/systemCall/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/constant/turbulenceProperties b/tutorials/IO/systemCall/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/IO/systemCall/constant/turbulenceProperties
+++ b/tutorials/IO/systemCall/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/system/blockMeshDict b/tutorials/IO/systemCall/system/blockMeshDict
index b0a2e850e7..521df2290a 100644
--- a/tutorials/IO/systemCall/system/blockMeshDict
+++ b/tutorials/IO/systemCall/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/system/controlDict b/tutorials/IO/systemCall/system/controlDict
index 73591bfb9b..4da74d5abe 100644
--- a/tutorials/IO/systemCall/system/controlDict
+++ b/tutorials/IO/systemCall/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/system/decomposeParDict b/tutorials/IO/systemCall/system/decomposeParDict
index dfe6938530..e78c1f97be 100644
--- a/tutorials/IO/systemCall/system/decomposeParDict
+++ b/tutorials/IO/systemCall/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/system/fvSchemes b/tutorials/IO/systemCall/system/fvSchemes
index f07ed2bcdf..8a7d36ccaa 100644
--- a/tutorials/IO/systemCall/system/fvSchemes
+++ b/tutorials/IO/systemCall/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/systemCall/system/fvSolution b/tutorials/IO/systemCall/system/fvSolution
index c147a6857c..4b21dfc62c 100644
--- a/tutorials/IO/systemCall/system/fvSolution
+++ b/tutorials/IO/systemCall/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/T b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/T
index 0f0d07f36c..be499ed5af 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/T
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/U b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/U
index f43f8860d1..cf3fc95bf7 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/U
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/epsilon b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/epsilon
index 262f68685f..3ea4d05724 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/epsilon
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/include/emptyPatches b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/include/emptyPatches
index 997aaef3a4..d7f10aaa26 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/include/emptyPatches
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/include/emptyPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/k b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/k
index 2b0115131c..e4e6269936 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/k
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p
index c39741da0c..914e6531f8 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p_rgh b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p_rgh
index 01afeeb35c..1fb72dff68 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p_rgh
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/g b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/g
index 580e9980aa..0d7a2c2614 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/g
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/radiationProperties b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/radiationProperties
index c27af7e476..647a036e7c 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/radiationProperties
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/thermophysicalProperties b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/thermophysicalProperties
index aa70e46b9c..2d5f4e9885 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/thermophysicalProperties
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/leftSolid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/regionProperties b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/regionProperties
index 9a0753f6ed..4218a1d1f1 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/regionProperties
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/radiationProperties b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/radiationProperties
index 92331d28c3..18ec8f4d88 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/radiationProperties
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/thermophysicalProperties b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/thermophysicalProperties
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/turbulenceProperties b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/turbulenceProperties
index 3eeaf7f423..3d9b82f999 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/turbulenceProperties
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/constant/rightFluid/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/blockMeshDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/blockMeshDict
index 4e84ace8f1..1ad9f3ba04 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/blockMeshDict
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/controlDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/controlDict
index 321547f7f3..03f17bd133 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/controlDict
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSchemes b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSchemes
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSolution b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSolution
index 5c78eb7f3c..7031b319b8 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSolution
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/changeDictionaryDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/changeDictionaryDict
index 0465caac14..b1601e797c 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/changeDictionaryDict
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSchemes b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSchemes
index 88f835db37..db834a501c 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSchemes
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSolution b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSolution
index 9d1fb4a054..14458d7fe0 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSolution
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/leftSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/changeDictionaryDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/changeDictionaryDict
index b65d20ed43..32e6735e03 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/changeDictionaryDict
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSchemes b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSchemes
index 9d3e1c319f..9a79b731f3 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSchemes
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSolution b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSolution
index 06b252b132..e20bec192f 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSolution
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict
index 90417ef968..c3932a04d0 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1 b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1
index 73ad3d2758..3298e8c65e 100644
--- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1
+++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/flange/0.orig/T b/tutorials/basic/laplacianFoam/flange/0.orig/T
index 4475f4d735..ccca01f6e8 100644
--- a/tutorials/basic/laplacianFoam/flange/0.orig/T
+++ b/tutorials/basic/laplacianFoam/flange/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/flange/constant/transportProperties b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
index 65dca53be6..ba25c811a7 100644
--- a/tutorials/basic/laplacianFoam/flange/constant/transportProperties
+++ b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict
index 81393021a9..13ce38ac6c 100644
--- a/tutorials/basic/laplacianFoam/flange/system/controlDict
+++ b/tutorials/basic/laplacianFoam/flange/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/flange/system/decomposeParDict b/tutorials/basic/laplacianFoam/flange/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/basic/laplacianFoam/flange/system/decomposeParDict
+++ b/tutorials/basic/laplacianFoam/flange/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
index 04ec90617d..45026cc07c 100644
--- a/tutorials/basic/laplacianFoam/flange/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSolution b/tutorials/basic/laplacianFoam/flange/system/fvSolution
index fce3c6eddb..f4154135fe 100644
--- a/tutorials/basic/laplacianFoam/flange/system/fvSolution
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/0/T b/tutorials/basic/laplacianFoam/implicitAMI/0/T
index afdeff6a26..b373c5374f 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/0/T
+++ b/tutorials/basic/laplacianFoam/implicitAMI/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/constant/transportProperties b/tutorials/basic/laplacianFoam/implicitAMI/constant/transportProperties
index 27db7f204b..a882117301 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/constant/transportProperties
+++ b/tutorials/basic/laplacianFoam/implicitAMI/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/system/blockMeshDict b/tutorials/basic/laplacianFoam/implicitAMI/system/blockMeshDict
index 50d05fd36b..8d30c2b726 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/implicitAMI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/system/controlDict b/tutorials/basic/laplacianFoam/implicitAMI/system/controlDict
index 353ce1f9f8..c1357af785 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/system/controlDict
+++ b/tutorials/basic/laplacianFoam/implicitAMI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/system/decomposeParDict b/tutorials/basic/laplacianFoam/implicitAMI/system/decomposeParDict
index 71d3232c07..3859840a47 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/system/decomposeParDict
+++ b/tutorials/basic/laplacianFoam/implicitAMI/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/system/fvSchemes b/tutorials/basic/laplacianFoam/implicitAMI/system/fvSchemes
index d9db71b4f0..aebfa41862 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/implicitAMI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/implicitAMI/system/fvSolution b/tutorials/basic/laplacianFoam/implicitAMI/system/fvSolution
index dd67fe590d..38c9be3986 100644
--- a/tutorials/basic/laplacianFoam/implicitAMI/system/fvSolution
+++ b/tutorials/basic/laplacianFoam/implicitAMI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/common/constant/transportProperties b/tutorials/basic/laplacianFoam/multiWorld1/common/constant/transportProperties
index 65dca53be6..ba25c811a7 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/common/constant/transportProperties
+++ b/tutorials/basic/laplacianFoam/multiWorld1/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/common/system/controlDict b/tutorials/basic/laplacianFoam/multiWorld1/common/system/controlDict
index 487637592e..4874c1848e 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/common/system/controlDict
+++ b/tutorials/basic/laplacianFoam/multiWorld1/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/common/system/decomposeParDict b/tutorials/basic/laplacianFoam/multiWorld1/common/system/decomposeParDict
index e07787e0bd..6472660886 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/common/system/decomposeParDict
+++ b/tutorials/basic/laplacianFoam/multiWorld1/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSchemes b/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSchemes
index 873a89ece1..c7c1119b10 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSolution b/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSolution
index fce3c6eddb..f4154135fe 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSolution
+++ b/tutorials/basic/laplacianFoam/multiWorld1/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/left/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld1/left/0.orig/T
index 1c44b7a92e..52c4e51a85 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/left/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld1/left/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/left/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld1/left/system/blockMeshDict
index 48e536b2b2..f2ed7b406d 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/left/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld1/left/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/right/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld1/right/0.orig/T
index d2c2b17a9e..e14ab2e236 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/right/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld1/right/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld1/right/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld1/right/system/blockMeshDict
index e5ad9b34d2..3135ab4eb9 100644
--- a/tutorials/basic/laplacianFoam/multiWorld1/right/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld1/right/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/common/constant/transportProperties b/tutorials/basic/laplacianFoam/multiWorld2/common/constant/transportProperties
index 27db7f204b..a882117301 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/common/constant/transportProperties
+++ b/tutorials/basic/laplacianFoam/multiWorld2/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/common/system/controlDict b/tutorials/basic/laplacianFoam/multiWorld2/common/system/controlDict
index 37339d06df..7af73df3df 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/common/system/controlDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/common/system/decomposeParDict b/tutorials/basic/laplacianFoam/multiWorld2/common/system/decomposeParDict
index aece4b14fb..0a079edc72 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/common/system/decomposeParDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSchemes b/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSchemes
index d9db71b4f0..aebfa41862 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSolution b/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSolution
index dd67fe590d..38c9be3986 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSolution
+++ b/tutorials/basic/laplacianFoam/multiWorld2/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab1/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld2/slab1/0.orig/T
index 67f8eaf883..37bd665bc5 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab1/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab1/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab1/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld2/slab1/system/blockMeshDict
index d6f62a2ff1..62d7539988 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab1/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab2/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld2/slab2/0.orig/T
index 82fc6d5e9c..a9149dda87 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab2/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab2/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab2/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld2/slab2/system/blockMeshDict
index fcfa56cd56..4e063cf00c 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab2/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab2/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab3/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld2/slab3/0.orig/T
index fa4500fd09..e2aff78af6 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab3/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab3/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab3/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld2/slab3/system/blockMeshDict
index 207a6e387b..26bfad6620 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab3/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab3/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab4/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld2/slab4/0.orig/T
index e1398c32a0..3a0f26c5e1 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab4/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab4/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/slab4/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld2/slab4/system/blockMeshDict
index 7d9dc6126f..3ba1280cae 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/slab4/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/slab4/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/top/0.orig/T b/tutorials/basic/laplacianFoam/multiWorld2/top/0.orig/T
index c57d3530bc..50a1f39643 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/top/0.orig/T
+++ b/tutorials/basic/laplacianFoam/multiWorld2/top/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/top/system/blockMeshDict b/tutorials/basic/laplacianFoam/multiWorld2/top/system/blockMeshDict
index ccc84e63b2..39daac954c 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/top/system/blockMeshDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/top/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/top/system/createPatchDict b/tutorials/basic/laplacianFoam/multiWorld2/top/system/createPatchDict
index 2f21631bb2..40d9c2ff90 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/top/system/createPatchDict
+++ b/tutorials/basic/laplacianFoam/multiWorld2/top/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/laplacianFoam/multiWorld2/top/system/topoSetDict.patches b/tutorials/basic/laplacianFoam/multiWorld2/top/system/topoSetDict.patches
index ee89e3d70c..c145f175a7 100644
--- a/tutorials/basic/laplacianFoam/multiWorld2/top/system/topoSetDict.patches
+++ b/tutorials/basic/laplacianFoam/multiWorld2/top/system/topoSetDict.patches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T
index 645a05ea9a..97a5cbf697 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/cellDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/cellDisplacement
index 75fd0194af..6ff2680d0a 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/cellDisplacement
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/cellDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement
index e57a354941..8681d936ea 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
index 5b664f607c..79c94d9d46 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict
index d460e1bc5a..7a2f63b343 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/transportProperties b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/transportProperties
index 9428245689..68bc0f712f 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/transportProperties
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/blockMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/blockMeshDict
index d3ecb2f116..7edf1c2535 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/blockMeshDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/controlDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/controlDict
index dedae5ae56..4fa05cd360 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/controlDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/decomposeParDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/decomposeParDict
index 2c3ae5c21b..0b93103986 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/decomposeParDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
index ae34b970f2..1fb2c39712 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSolution b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSolution
index 2c2a5f73af..07d355c787 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSolution
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/setFieldsDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/setFieldsDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict
index 9bb29e5ca9..a3570b2220 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T
index b67688241b..3b260ca027 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/cellDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/cellDisplacement
index 75fd0194af..6ff2680d0a 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/cellDisplacement
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/cellDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/pointDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/pointDisplacement
index e57a354941..8681d936ea 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/pointDisplacement
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/zoneID b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/zoneID
index 5b664f607c..79c94d9d46 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/zoneID
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/dynamicMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/dynamicMeshDict
index e2fd5733ea..31b9934967 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/dynamicMeshDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/transportProperties b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/transportProperties
index 1f1c35631d..f99b56cc58 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/transportProperties
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/blockMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/blockMeshDict
index f7fa0b091e..730c013b5c 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/blockMeshDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/controlDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/controlDict
index 78d1e1a01f..bb072c1c69 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/controlDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSchemes b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSchemes
index a692d62426..0acd36e189 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSchemes
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution
index 7a7a7f845d..ff5e387ac2 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/setFieldsDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/setFieldsDict
index 7025d376f5..50c554a5cc 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/setFieldsDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/topoSetDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/topoSetDict
index 2a0e595eda..b6155c4993 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/topoSetDict
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/U b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/U
index 29aa27b9e4..66b88f0a01 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/U
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions
index 6fdadf2ddf..958890e3e4 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/p b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/p
index bdffc7d445..094397fef9 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/p
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement
index 5d9a50c64c..df73743166 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/zoneID b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/zoneID
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
index d460e1bc5a..7a2f63b343 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/blockMeshDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/blockMeshDict
index 8c3277e76a..06184d44a8 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/blockMeshDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/controlDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/controlDict
index 571edf012b..8541a1c2fc 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/controlDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
index 967187c130..8ee1f2c6ec 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSolution b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSolution
index b947638a6c..b5d418ab52 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSolution
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/setFieldsDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/setFieldsDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict
index 243a415178..510e36c570 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/controlDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/controlDict
index 66ced0840c..25099e950c 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/controlDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/createPatchDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/createPatchDict
index 69e178bc25..77a9781452 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/createPatchDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict
index de3960a1dd..1ecf133ccf 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSchemes b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSchemes
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSolution b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSolution
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/0.orig/U b/tutorials/basic/potentialFoam/cylinder/0.orig/U
index dbbfa52ed5..c578bda543 100644
--- a/tutorials/basic/potentialFoam/cylinder/0.orig/U
+++ b/tutorials/basic/potentialFoam/cylinder/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/0.orig/p b/tutorials/basic/potentialFoam/cylinder/0.orig/p
index 1460ce9cb8..b53b2d64a3 100644
--- a/tutorials/basic/potentialFoam/cylinder/0.orig/p
+++ b/tutorials/basic/potentialFoam/cylinder/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
index b1ffd4c2e2..271c7b1549 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index 09ab257862..4dc512d4e3 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/system/decomposeParDict b/tutorials/basic/potentialFoam/cylinder/system/decomposeParDict
index 05673ffdfc..6020aef9e8 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/decomposeParDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
index a8469c8f4b..430120801b 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
index 1eefc2fa99..e325059471 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSolution
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.orig/U b/tutorials/basic/potentialFoam/pitzDaily/0.orig/U
index 930d35239e..a128f627c0 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.orig/U
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.orig/p b/tutorials/basic/potentialFoam/pitzDaily/0.orig/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.orig/p
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
index cf6195625a..f7d9129705 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
index 33f2224438..fb55eb7ebc 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
index 85156fa428..f5dc1384dc 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
index 9e28636e77..f5a7019522 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
index 107ea62c34..98bb5e753f 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
index 976efe1514..7d7d4eaf1f 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/changeDictionaryDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/changeDictionaryDict
index 657fe691c8..62ab3a417b 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/changeDictionaryDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
index 99e60726f4..a286792f09 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
index cab6658f2e..25d391aa9a 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
index 0f308aa34a..62a84d5738 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/0/U b/tutorials/basic/simpleFoam/implicitAMI/0/U
index 37c1fdc87b..06721521ad 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/0/U
+++ b/tutorials/basic/simpleFoam/implicitAMI/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/0/p b/tutorials/basic/simpleFoam/implicitAMI/0/p
index 8d2cdc6347..db7cb12f7d 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/0/p
+++ b/tutorials/basic/simpleFoam/implicitAMI/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/constant/transportProperties b/tutorials/basic/simpleFoam/implicitAMI/constant/transportProperties
index d3a8069766..957eb5a917 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/constant/transportProperties
+++ b/tutorials/basic/simpleFoam/implicitAMI/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/constant/turbulenceProperties b/tutorials/basic/simpleFoam/implicitAMI/constant/turbulenceProperties
index 75ee03c2f8..052650a257 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/constant/turbulenceProperties
+++ b/tutorials/basic/simpleFoam/implicitAMI/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/system/blockMeshDict b/tutorials/basic/simpleFoam/implicitAMI/system/blockMeshDict
index 223c849bef..4e0897113a 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/system/blockMeshDict
+++ b/tutorials/basic/simpleFoam/implicitAMI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/system/controlDict b/tutorials/basic/simpleFoam/implicitAMI/system/controlDict
index a957a82e37..8274e8c69d 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/system/controlDict
+++ b/tutorials/basic/simpleFoam/implicitAMI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/system/decomposeParDict b/tutorials/basic/simpleFoam/implicitAMI/system/decomposeParDict
index 547471ef56..5b173ff46a 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/system/decomposeParDict
+++ b/tutorials/basic/simpleFoam/implicitAMI/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/system/fvSchemes b/tutorials/basic/simpleFoam/implicitAMI/system/fvSchemes
index 4da538d8e4..efffd99f4d 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/system/fvSchemes
+++ b/tutorials/basic/simpleFoam/implicitAMI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/basic/simpleFoam/implicitAMI/system/fvSolution b/tutorials/basic/simpleFoam/implicitAMI/system/fvSolution
index 9b390258b7..81303c297b 100644
--- a/tutorials/basic/simpleFoam/implicitAMI/system/fvSolution
+++ b/tutorials/basic/simpleFoam/implicitAMI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties
index 12817c42ca..823877c12f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
index 9d7ebd211a..019ff26db0 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
index 9c8508aa73..5e2d1c5be4 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g
index 43241f4daa..51f4cd8295 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index f939baa3c6..101e4fc62e 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
index 2bf8e338c0..b1e82ed65a 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
index fb9a50666d..c0545d2a24 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
index f237ebddda..f8919e3757 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
index b79a32c31d..8721c48e81 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
index 4bccaf98a7..6aab5746f9 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict
index ca9a4ff55e..8c87c29bfe 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
index 5fbe9cc930..958a8ecfbf 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
index a2a7ca348d..e9439c4d23 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
index 1e259fc267..d24f162ff5 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep
index d7c346adda..d8ea0ec29c 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRep
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp
index da2034351c..11b1ea0acb 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/GRxp
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers
index efb737e89e..0cc57de0db 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/RPers
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su
index f45d1f9043..cf64d56458 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Su
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T
index 719652bd60..52cc97f67d 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu
index c9be0303d5..50d023eb29 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Tu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U
index 51358a366e..083d209928 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi
index bcd5b0e3f5..32f2b4f113 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp
index 2aa1bdcd4b..6a20ac51b2 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/Xp
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b
index 2130a56eb4..3995dd81a7 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/b
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon
index b33440147a..007ec0025e 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft
index 9b7d205103..4db40d3e32 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/ft
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k
index 3140645e53..1003308359 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut
index c23f984424..3917422016 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p
index 06bbba3711..bed489702e 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p
+++ b/tutorials/combustion/PDRFoam/pipeLattice/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/constant/PDRProperties b/tutorials/combustion/PDRFoam/pipeLattice/constant/PDRProperties
index 3a931cf2ba..17541166ca 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/constant/PDRProperties
+++ b/tutorials/combustion/PDRFoam/pipeLattice/constant/PDRProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/constant/combustionProperties b/tutorials/combustion/PDRFoam/pipeLattice/constant/combustionProperties
index e45bf966b9..e7ce13129a 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/constant/combustionProperties
+++ b/tutorials/combustion/PDRFoam/pipeLattice/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/constant/g b/tutorials/combustion/PDRFoam/pipeLattice/constant/g
index 8b72f70360..a164cf59d2 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/constant/g
+++ b/tutorials/combustion/PDRFoam/pipeLattice/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/pipeLattice/constant/thermophysicalProperties
index 6adc954402..46bde6d067 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/pipeLattice/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/pipeLattice/constant/turbulenceProperties
index ca8b316ad3..5c26660995 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/constant/turbulenceProperties
+++ b/tutorials/combustion/PDRFoam/pipeLattice/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/geometry/obstaclesDict b/tutorials/combustion/PDRFoam/pipeLattice/geometry/obstaclesDict
index 4361bb6843..52304ee340 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/geometry/obstaclesDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/geometry/obstaclesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/geometry/pipeLattice b/tutorials/combustion/PDRFoam/pipeLattice/geometry/pipeLattice
index a8f51b9902..cba95112fb 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/geometry/pipeLattice
+++ b/tutorials/combustion/PDRFoam/pipeLattice/geometry/pipeLattice
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/PDRblockMeshDict b/tutorials/combustion/PDRFoam/pipeLattice/system/PDRblockMeshDict
index 1a794cde1b..ac22badb6f 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/PDRblockMeshDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict b/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict
index 3b19885fb6..e4e0c8c9be 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/PDRsetFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/controlDict b/tutorials/combustion/PDRFoam/pipeLattice/system/controlDict
index 7dcc78117f..950fa924cf 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/controlDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/fvSchemes b/tutorials/combustion/PDRFoam/pipeLattice/system/fvSchemes
index 038225344b..f5dc6b6228 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/fvSchemes
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/fvSolution b/tutorials/combustion/PDRFoam/pipeLattice/system/fvSolution
index a2bd7de3e0..2512da18d9 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/fvSolution
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/probes b/tutorials/combustion/PDRFoam/pipeLattice/system/probes
index 461afeaa73..bd4632fa25 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/probes
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/probes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/setFieldsDict b/tutorials/combustion/PDRFoam/pipeLattice/system/setFieldsDict
index c4439f5130..786e401b07 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/setFieldsDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/PDRFoam/pipeLattice/system/topoSetDict b/tutorials/combustion/PDRFoam/pipeLattice/system/topoSetDict
index a88c66214e..516a473d4a 100644
--- a/tutorials/combustion/PDRFoam/pipeLattice/system/topoSetDict
+++ b/tutorials/combustion/PDRFoam/pipeLattice/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
index 3a9af21d35..1a00853c0d 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Su
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
index 6d6461e26e..532676d7d2 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
index e3c9082911..e784c5ccac 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Tu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
index 361cf31dee..2523296ef0 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
index adf2d6f86b..b5e2c1835a 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/Xi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
index db8202dcb6..e05cc8ff46 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
index 74b42885d0..9099720ad2 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/b
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
index a7c42c994c..8c0a6f0416 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/ft
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
index d060e7f5d2..b09c9f7f79 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
index d6f03d20ca..9b64c19267 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
index 788f266249..510f0d485d 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
index f966fef87e..c7fe0c84a0 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.orig/pPotential
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties
index baa9ca6cfd..63314b6685 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict
index 6f33bedf4a..bf4a505c04 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g
index 8b72f70360..a164cf59d2 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties
index 95556891e0..b61d1cd530 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties
index d4284e019d..63c6eb2f13 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/FOXiReactionRate b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/FOXiReactionRate
index a2e16f5af1..15c0dd7a22 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/FOXiReactionRate
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/FOXiReactionRate
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict
index e8126ff50a..ae49da6150 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict
index 93a2eedbd5..7bc4a5a318 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami
index 1cd067f73c..eee210697c 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic
index f6999fd802..1d8be85177 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict
index ee749e4434..6b1dcd4e7b 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes
index 77ced8be61..75c8be5f17 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
index 106c1c2156..5869dd4f33 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
index 1f4c222d7e..8d0074a3da 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict
index e51f64931c..9dd55df06d 100644
--- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Su b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Su
index a0dce73e28..6ab5ec2b67 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Su
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Su
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/T b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/T
index 72be22d031..6ac015182e 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/T
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/T
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Tu b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Tu
index 154b95f4b5..eafcf55d9b 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Tu
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Tu
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/U b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/U
index a7f27af25f..58e4407557 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/U
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/U
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Xi b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Xi
index 7caa3f3c39..7077ebc873 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Xi
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/Xi
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/alphat b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/alphat
index 83a4e202fc..c76948a8ff 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/alphat
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/b b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/b
index 18454eee25..1aa2cf1c0d 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/b
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/b
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/epsilon b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/epsilon
index 0a310edbaf..b534bc38a8 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/epsilon
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/ft b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/ft
index d5926b68b2..86afc42f6a 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/ft
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/ft
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/k b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/k
index 47a654ef66..f00bca7865 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/k
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/nut b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/nut
index 8542bf00db..75e5a06bf9 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/nut
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/p b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/p
index c6706dd393..a9cafb1408 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/p
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/p
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/pointDisplacementy b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/pointDisplacementy
index 613bca17f7..ebca490992 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/pointDisplacementy
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0.orig/pointDisplacementy
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties
index 9948495d1d..120f63d803 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
index 7d7eb9b8a1..c285b8930f 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g
index 8b72f70360..a164cf59d2 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties
index f06278c44d..d80dcf7773 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict
index 0dae7de41c..60f5b8e4f7 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict
index 1afe51de32..3c82ba5ecf 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes
index f655f7c2f8..b5121a16a4 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
index 7c9bee9f13..68c8f14f3e 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su
index 265405b0ad..d6c8abefe5 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/T b/tutorials/combustion/XiEngineFoam/kivaTest/-180/T
index 61b348ff90..b6acdb0bc4 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/T
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu
index 6d11981149..b1f45bc9bf 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/U b/tutorials/combustion/XiEngineFoam/kivaTest/-180/U
index 5d12e035e1..dd555dd15b 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/U
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi
index f6e5933f31..1ee556355b 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat b/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat
index 553c352289..cd56038f9b 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/b b/tutorials/combustion/XiEngineFoam/kivaTest/-180/b
index c395af6afe..afa0d827bb 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/b
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/b
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon b/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon
index 4c3bfe17a2..74cdfa5e3a 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft b/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft
index b9eaa4e1a5..606908279d 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu b/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu
index e94fa8dd51..e97c63ce8f 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/k b/tutorials/combustion/XiEngineFoam/kivaTest/-180/k
index 7cf171944a..5cd60a2f93 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/k
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut b/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut
index 32f0e63223..476c4aa04f 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/p b/tutorials/combustion/XiEngineFoam/kivaTest/-180/p
index dd3e291bc0..b72d571023 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/p
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties
index d03c5171ec..9d7833368e 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry
index 5b02b45e1c..987f3ee7af 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties
index 2396de823d..6546ff9983 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties
index 20e7cea132..f9f333ebd9 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict
index 95f063effe..8c0ca7426d 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/decomposeParDict b/tutorials/combustion/XiEngineFoam/kivaTest/system/decomposeParDict
index c15ec85e1e..d804ef9b5b 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/system/decomposeParDict
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes
index 91f6bd8b42..17357ee862 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution
index cfcfb7974a..8ea89be9bf 100644
--- a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su
index 0447689592..ee84b8d047 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Su
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T
index 4aace70ad6..e34922017c 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu
index 3fa3fcfe2e..04a4c133ec 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Tu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U
index 687ce4341b..40bad7061f 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi
index 154a721801..54f71c0721 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/Xi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat
index 0171f399a9..2c31a094c4 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b
index c1a1919b80..0b337f798a 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/b
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon
index 8d2eda09bc..15338c5a5b 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft
index 99725d1bf8..f4de0ebc04 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/ft
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu
index 65312c0071..6721e97b15 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/fu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k
index 340d7a48f4..81875920cf 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut
index 24a90f1a9a..cd9004c03c 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p
index 431de130ba..fa60fb7054 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/combustionProperties
index 02b7bc73fa..bec1488804 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
index 584f32fb33..4a7286b562 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
index d88f5c49ac..8e6bf20314 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties
index 33309ee30a..873bf24891 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict
index 0938080305..ed8cdc929f 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/controlDict
index 9b79f2d175..ab8a312dc8 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/controlDict
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes
index 373600b6a5..a708fe661a 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution
index 818ab3ebce..fe65e8a933 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/chemkin/transportProperties b/tutorials/combustion/chemFoam/gri/chemkin/transportProperties
index 816c266669..ba799f38df 100644
--- a/tutorials/combustion/chemFoam/gri/chemkin/transportProperties
+++ b/tutorials/combustion/chemFoam/gri/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
index e6b859584d..dcc13d8ea0 100644
--- a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/constant/initialConditions b/tutorials/combustion/chemFoam/gri/constant/initialConditions
index a0c9c392c1..d2f4475607 100644
--- a/tutorials/combustion/chemFoam/gri/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/gri/constant/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
index 2a9a0b374c..fd244a8da4 100644
--- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/system/controlDict b/tutorials/combustion/chemFoam/gri/system/controlDict
index 994716fe9d..fda74df123 100644
--- a/tutorials/combustion/chemFoam/gri/system/controlDict
+++ b/tutorials/combustion/chemFoam/gri/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/system/fvSchemes b/tutorials/combustion/chemFoam/gri/system/fvSchemes
index 3263708c82..3e355847c3 100644
--- a/tutorials/combustion/chemFoam/gri/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/gri/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/gri/system/fvSolution b/tutorials/combustion/chemFoam/gri/system/fvSolution
index a5bda26adc..b5eb7d432c 100644
--- a/tutorials/combustion/chemFoam/gri/system/fvSolution
+++ b/tutorials/combustion/chemFoam/gri/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/chemkin/transportProperties b/tutorials/combustion/chemFoam/h2/chemkin/transportProperties
index 816c266669..ba799f38df 100644
--- a/tutorials/combustion/chemFoam/h2/chemkin/transportProperties
+++ b/tutorials/combustion/chemFoam/h2/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
index e6b859584d..dcc13d8ea0 100644
--- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/constant/initialConditions b/tutorials/combustion/chemFoam/h2/constant/initialConditions
index 1b99ab86dd..15110ddda0 100644
--- a/tutorials/combustion/chemFoam/h2/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/h2/constant/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
index 6a39f31868..8b683f3a25 100644
--- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/system/controlDict b/tutorials/combustion/chemFoam/h2/system/controlDict
index c3e0d17a3f..caf46b0c94 100644
--- a/tutorials/combustion/chemFoam/h2/system/controlDict
+++ b/tutorials/combustion/chemFoam/h2/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/system/fvSchemes b/tutorials/combustion/chemFoam/h2/system/fvSchemes
index 2bb8dcd7db..18d2fafdd9 100644
--- a/tutorials/combustion/chemFoam/h2/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/h2/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/h2/system/fvSolution b/tutorials/combustion/chemFoam/h2/system/fvSolution
index a5bda26adc..b5eb7d432c 100644
--- a/tutorials/combustion/chemFoam/h2/system/fvSolution
+++ b/tutorials/combustion/chemFoam/h2/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties b/tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties
index 816c266669..ba799f38df 100644
--- a/tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
index e6b859584d..dcc13d8ea0 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions b/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions
index e88992ef99..b492d4e4b6 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
index 6a39f31868..8b683f3a25 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/system/controlDict b/tutorials/combustion/chemFoam/ic8h18/system/controlDict
index 5d6f9e27eb..d08077d32f 100644
--- a/tutorials/combustion/chemFoam/ic8h18/system/controlDict
+++ b/tutorials/combustion/chemFoam/ic8h18/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes b/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes
index 3263708c82..3e355847c3 100644
--- a/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18/system/fvSolution b/tutorials/combustion/chemFoam/ic8h18/system/fvSolution
index a5bda26adc..b5eb7d432c 100644
--- a/tutorials/combustion/chemFoam/ic8h18/system/fvSolution
+++ b/tutorials/combustion/chemFoam/ic8h18/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties
index 0d5ff03591..42e18bcc81 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
index e8e68e0d70..0edf111d79 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions
index e88992ef99..b492d4e4b6 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
index 6a39f31868..8b683f3a25 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict
index 5d6f9e27eb..d08077d32f 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSchemes b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSchemes
index 3263708c82..3e355847c3 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
index a5bda26adc..b5eb7d432c 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties b/tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties
index 816c266669..ba799f38df 100644
--- a/tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
index affb9722b6..4f0073b99d 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions b/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions
index e97a63bc98..a6da15e6bb 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
index 6a39f31868..8b683f3a25 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/system/controlDict b/tutorials/combustion/chemFoam/nc7h16/system/controlDict
index 544a279441..82fc548cf7 100644
--- a/tutorials/combustion/chemFoam/nc7h16/system/controlDict
+++ b/tutorials/combustion/chemFoam/nc7h16/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes b/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes
index 7ad68df721..f3ccc45fcf 100644
--- a/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/chemFoam/nc7h16/system/fvSolution b/tutorials/combustion/chemFoam/nc7h16/system/fvSolution
index a5bda26adc..b5eb7d432c 100644
--- a/tutorials/combustion/chemFoam/nc7h16/system/fvSolution
+++ b/tutorials/combustion/chemFoam/nc7h16/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings b/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings
index e295ee202c..a477677e5f 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings
+++ b/tutorials/combustion/coldEngineFoam/freePiston/0/include/caseSettings
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/constant/engineGeometry b/tutorials/combustion/coldEngineFoam/freePiston/constant/engineGeometry
index bcbcc71cee..fd8882be1d 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/constant/engineGeometry
+++ b/tutorials/combustion/coldEngineFoam/freePiston/constant/engineGeometry
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/constant/g b/tutorials/combustion/coldEngineFoam/freePiston/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/constant/g
+++ b/tutorials/combustion/coldEngineFoam/freePiston/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties b/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties
index 3330366272..68df4b705a 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties
+++ b/tutorials/combustion/coldEngineFoam/freePiston/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties b/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties
+++ b/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/system/blockMeshDict b/tutorials/combustion/coldEngineFoam/freePiston/system/blockMeshDict
index 209450051e..92ae2c8113 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/system/blockMeshDict
+++ b/tutorials/combustion/coldEngineFoam/freePiston/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/system/controlDict b/tutorials/combustion/coldEngineFoam/freePiston/system/controlDict
index 48bade5a41..14786da7c4 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/system/controlDict
+++ b/tutorials/combustion/coldEngineFoam/freePiston/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes
index 59a6517070..3bf70fd125 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes
+++ b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/coldEngineFoam/freePiston/system/fvSolution b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSolution
index 8f1174c4b6..0640302e76 100644
--- a/tutorials/combustion/coldEngineFoam/freePiston/system/fvSolution
+++ b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/C7H16 b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/C7H16
index 11460cbd17..d5cf311354 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/C7H16
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/C7H16
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/IDefault b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/IDefault
index 90d7db88a6..1f2519ee51 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/IDefault
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/N2 b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/N2
index 17e819230e..d8500cf75f 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/N2
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/O2 b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/O2
index ef0b1c1d8c..a1f07afa2b 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/O2
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/T
index 2c070dbecd..b8329dc956 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/T
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/U b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/U
index 9861d556d8..979a9711cf 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/U
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/Ydefault b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/Ydefault
index 10a3d5ce17..ebfb5f6071 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/Ydefault
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/alphat b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/alphat
index 74e1d41026..f1c134647e 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/alphat
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/k b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/k
index e6f1daa063..0c14304236 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/k
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/nut b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/nut
index d926e5e6a6..b64296622e 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/nut
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p
index baad14a493..3da5899258 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p_rgh b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p_rgh
index 8ed4077058..ee4e973711 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/T
index f59c2ca23d..f081706e53 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/p b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/p
index 89b5c7a3f9..156e7f19cc 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/p
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0.orig/panelRegion/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/additionalControls b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/additionalControls
index 5939aa6bcf..2a19ce8f23 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/additionalControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
index c747f2a27c..a72f608f21 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
index 19e358a6d5..81f9919ed6 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/g b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/g
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef
index c3f2d14875..79af5b3cb5 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
index 059b0497d6..8f9873e6f6 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
index 9230c3fd79..ed3301be10 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/panelRegion/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
index bfc7e03313..cec046c850 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
index 55a071b86b..6bd24979d5 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactingCloud1Properties
index 9528ee0d14..b98856bb69 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
index 3a3faa70ee..b8ecabf1f6 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermo.compressibleGas
index bd595c41be..ad5459eb1d 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties
index f121507848..9a69ac6306 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
index 81bfbc69a1..0b4fe6ae82 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4 b/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
index 2f3f304068..b3249096b8 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index 410b8073c0..66b727d309 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/createPatchDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/createPatchDict
index e22e8a4a19..b9b9527628 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/decomposeParDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/decomposeParDict
index 18a61e2c4e..8471749a05 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/decomposeParDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict
index 70db9054f7..b25ef2bc0f 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
index 70d1abe2d6..2650fcdce8 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
index 3f020e73a7..3ed09c33b8 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
index 019eec4df4..9444a0c05d 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
index 509519c350..74a648f9f2 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
index 09d3c74472..4c3bcc8495 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/panelRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict
index edccedd78c..49cad1d871 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
index b7d0110e46..1088bf9e76 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/C3H8 b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/C3H8
index 7dfec5dac3..c46cdd4ecc 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/C3H8
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/C3H8
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/IDefault b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/IDefault
index 983224a64c..c9313595f9 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/IDefault
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/N2 b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/N2
index 5c153d91f9..069cd51101 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/N2
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/O2 b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/O2
index 0a496edf9b..501b5fa869 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/O2
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/T b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/T
index c122243db8..833fd25011 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/T
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/U b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/U
index 2c5320a687..0ab1185a57 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/U
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/Ydefault b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/Ydefault
index 9d7e17f76e..59f0c9ab71 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/Ydefault
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/alphat b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/alphat
index 73e64c2941..61de7b4610 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/alphat
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Tf b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Tf
index af3ad3ae2f..bf705263da 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Tf
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Tf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Uf b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Uf
index b4517bc64e..475982cdc5 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Uf
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/Uf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/deltaf b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/deltaf
index ba111471d8..bbebc58de8 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/deltaf
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/filmRegion/deltaf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/k b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/k
index 8dabb035ed..fc94174ca2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/k
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/nut b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/nut
index d3757e974f..dd4eb08129 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/nut
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p
index 438912d2fa..03f96f6e84 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p_rgh b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p_rgh
index 2784cdda8a..fc0b7e9525 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/ph_rgh b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/ph_rgh
index b5fba92740..40c89bbf0a 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/ph_rgh
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/ph_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/T b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/T
index 811f767fe8..a81bfed6c1 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/T
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/Y0Default b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/Y0Default
index 01c1018a30..51f500b9f2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/Y0Default
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/Y0Default
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/char b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/char
index dbf088574e..69fd0ce4f5 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/char
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/char
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/p b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/p
index 39c8f31896..c705f918c8 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/p
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/qr b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/qr
index 981af6f933..fd8997c473 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/qr
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/qr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/wood b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/wood
index 2e6ac760a1..66f8cbf5d2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/wood
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/0.orig/pyrolysisRegion/wood
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/additionalControls b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/additionalControls
index 5939aa6bcf..2a19ce8f23 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/additionalControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
index c5546d31da..9815067c9d 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties
index 8e67c550cf..5b2d70f748 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g
index 43241f4daa..51f4cd8295 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef
index 75322c0c61..5759d8f1ec 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
index 2cea50d750..7e88a1e71a 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
index 895d40d4a4..c4e3199d99 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
index e2d4388ff5..3df008c1c9 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
index 2a5a2b2015..1355dd43bf 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index 2bb61b228f..2fa2398864 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
index 0021106dd0..7075e9da68 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
index 2799f3be72..1dc31317cd 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
index 9528ee0d14..b98856bb69 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index df9e8c60be..bb7f952b3c 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
index fba7d52673..3799dec5a4 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
index ec1b9d18b5..741cd543a5 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
index 256ab8cfea..8775ac305b 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict
index 00c4164035..9e6456de15 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*-----------------------------*-C++-*---------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/controlDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/controlDict
index 45e0a6c1ea..f9f379e522 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/createPatchDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/createPatchDict
index 673b0920bc..bd825ee5e2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
index e758b3c94a..a2f66605da 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
index db35b018b4..ae83118db8 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
index adf50f9600..bc233a7224 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
index 3b02a06686..9df41511f7 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
index 3ccfd0fdea..41f0d8707a 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
index 3e7a4d890d..5e8dcfdb70 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
index 46487f772c..aa98fc74d7 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSchemes
index 94ed2ea0e3..d35f80c756 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution
index 6ed3a1d204..8b5e1c0f94 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
index 4c0dda31eb..3576309769 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
index 8b32b1353a..4ace30cacc 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
index 0beac7e885..3618289509 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/C3H8 b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/C3H8
index cb25266db1..4b14a46c5c 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/C3H8
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/C3H8
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/G b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/G
index 29f8b9c75f..ccabd622e4 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/G
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/IDefault b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/IDefault
index ceeb4723fd..0f2d585ca1 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/IDefault
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/N2 b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/N2
index f7781eddf4..ac3d17a8d9 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/N2
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/O2 b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/O2
index 3daf3de3cc..70e2024aa2 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/O2
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/T b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/T
index c6ece3b12f..cd8d1e0613 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/T
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/U b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/U
index fe271cce9b..afc3684623 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/U
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/Ydefault b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/Ydefault
index 7173ce8bd2..82877d8212 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/Ydefault
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/alphat b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/alphat
index aa7b55ec3f..382491231e 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/alphat
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/k b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/k
index f4732b2255..4516759e14 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/k
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/nut b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/nut
index d9b7c904ee..8e0412f273 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/nut
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p
index 809bae7b91..93ae00adfe 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p_rgh b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p_rgh
index 1f1b08c2a1..3d777e8181 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/T b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/T
index 2cb6701f9d..413f02fc6f 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/Y0Default b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/Y0Default
index 90b3d432e3..1a4621899c 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/Y0Default
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/Y0Default
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/char b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/char
index e3785bf2ee..16dafe490b 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/char
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/char
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/p b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/p
index 39c8f31896..c705f918c8 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/p
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/qr b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/qr
index 62eb5da927..feccb2f978 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/qr
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/qr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/wood b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/wood
index f6534a5a30..1b99ef1e36 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/wood
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/panelRegion/wood
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/ph_rgh b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/ph_rgh
index 1e5be597fe..74d25be279 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/ph_rgh
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/0.orig/ph_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/additionalControls b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/additionalControls
index 5939aa6bcf..2a19ce8f23 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/additionalControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties
index 6d8821ef74..2a19a2c707 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties
index c0a624767e..a6497071cc 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/g b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/g
index d2a778b540..249cbb2e4f 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/g
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef
index ac2d3e965c..6191d2c4c4 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef
index 75322c0c61..5759d8f1ec 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/chemistryProperties
index 67836f7d9f..657bb9e4d1 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/radiationProperties
index 29b2363074..bd412b1b8a 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
index e2d4388ff5..3df008c1c9 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index d9920e4d42..6b59c852c6 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
index a06b461897..3dec0fe38f 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
index 2f3d52c44c..b6d511d4bb 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactingCloud1Properties
index 9528ee0d14..b98856bb69 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
index 3a3faa70ee..b8ecabf1f6 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
index f9dc6d09b4..f71a89c45d 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties
index dd102eafd0..0976980705 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/turbulenceProperties
index 256ab8cfea..8775ac305b 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/blockMeshDict
index 8a5822229a..547db4078a 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
index 993ab3e2ae..f5287197f0 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/controlDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/controlDict
index e5f2ee8f79..5d0f9fa518 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/createPatchDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/createPatchDict
index 6c88c3d535..bd2802c5e2 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/decomposeParDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/decomposeParDict
index 5e89f34326..e7a8901a77 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/decomposeParDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/extrudeToRegionMeshDict
index f61c98b18f..4dc56afa5b 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/extrudeToRegionMeshDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
index 9af0953f44..bad3a94f36 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
index 9ab5009386..689c214c4f 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSchemes b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSchemes
index a4fd47e57c..b1d349693e 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution
index 3ea5ebd595..e806fad3ad 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/decomposeParDict
index d1f086dc5b..608ae8dbbb 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/decomposeParDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSchemes
index 651f796d80..704371277e 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSolution
index 1aa9510e6f..1c8985e17e 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/panelRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/refineMeshDict b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/refineMeshDict
index e8f8dd3bd6..fd7048a748 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/refineMeshDict
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/CH4 b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/CH4
index 711132f3a8..78733eee35 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/CH4
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/G b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/G
index dd9cd369cb..153ebc3af7 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/G
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/N2 b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/N2
index a711713028..5e7ad417ef 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/N2
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/O2 b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/O2
index b5dd00019e..d50c321ace 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/O2
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/T b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/T
index d3e0871467..95eb979d93 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/T
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/U b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/U
index 10296cac11..85625bc326 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/U
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/Ydefault b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/Ydefault
index 0e64d500d1..2bed52b6fa 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/Ydefault
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/alphat b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/alphat
index 44dd2c5c68..bd1965af3f 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/alphat
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/k b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/k
index ab83b24046..8d8221b665 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/k
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/nut b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/nut
index bbdda399df..b02b8eb848 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/nut
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p
index 2169721d09..a3f0d3293f 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p_rgh b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p_rgh
index 53a05aac34..a953d7168a 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/PMMA b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/PMMA
index 8f79808b62..5940ecf848 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/PMMA
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/PMMA
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/T b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/T
index 7b88b05155..2ec7f5a72c 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/Y0Default b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/Y0Default
index 3fa4f201c8..66078abbea 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/Y0Default
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/Y0Default
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/p b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/p
index 89b5c7a3f9..156e7f19cc 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/p
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/qr b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/qr
index e03fd725ed..ace6a4a534 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/qr
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/0.orig/panelRegion/qr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/additionalControls b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/additionalControls
index b8d9a35bdb..b59beb5f58 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/additionalControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/boundaryRadiationProperties
index d732428d97..af69d97c70 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/combustionProperties
index 2c08470c25..11ca41d531 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g
index 1cb9ce058c..3b2aee3a2c 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/chemistryProperties
index 2b1989e51c..89a931478c 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/radiationProperties
index 727d2bd66b..b4105b9bb6 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermo.solid
index 958b3a5e07..1c3bc3505a 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermo.solid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties
index fb79a97e7a..4662d07442 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/panelRegion/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
index 3122e32e51..f401e43e36 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/radiationProperties
index 852d096956..85c927a63f 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Positions
index 0d4867cfcd..da1b85f22c 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Positions
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Positions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Properties
index 0a7416f6c3..8b21afe7d2 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
index 45ebb40ebc..a57af94ff3 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermo.compressibleGas
index 030c8c1928..f0efdb4416 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties
index 7774ebf91a..f76f17f7d0 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/turbulenceProperties
index 256ab8cfea..8775ac305b 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict
index c30a88c150..0295f505fe 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/controlDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/controlDict
index 2654cb7c81..e45f8e4da4 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict
index ff27b67c74..ba8fe9425d 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
index b8d17d8455..389eee4130 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
index 68547723a0..c2f70a0a9b 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
index 317fee1797..3ff0f9c556 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
index c1d782acb8..11e4972913 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/panelRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
index 77cba845b8..15f8b8bcfa 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/CH4 b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/CH4
index bdb140dec4..186f939ecd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/CH4
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/FSDomega b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/FSDomega
index f6f09e6241..cc3f29dc7e 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/FSDomega
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/FSDomega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/G b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/G
index 2a944ed6a2..7c34b9d45a 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/G
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/IDefault b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/IDefault
index 2687ec461a..3e911d6c9e 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/IDefault
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/N2 b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/N2
index e25c8d6f38..683e3189fa 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/N2
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/O2 b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/O2
index 78d5d24868..85f884b92f 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/O2
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/T b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/T
index 4dac314bb5..8ad7c85158 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/T
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/U b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/U
index 19d354f6a4..a5c9df97c6 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/U
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/Ydefault b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/Ydefault
index e812451816..97e828331c 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/Ydefault
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/alphat b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/alphat
index 1613f9144d..5b283b3984 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/alphat
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/k b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/k
index 4eb452524f..95817a73da 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/k
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/nut b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/nut
index 708fba8294..afb9daf47c 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/nut
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p
index 18aab27b86..ef6698435c 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p_rgh b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p_rgh
index 15248432c9..8f958268ac 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/ph_rgh b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/ph_rgh
index ea350f92dd..05e2c2c868 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/ph_rgh
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/ph_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/soot b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/soot
index ad773411c8..b9f91e34e5 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/soot
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/0.orig/soot
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls
index 5939aa6bcf..2a19ce8f23 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties
index c060b85b73..292622b113 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/chemistryProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/chemistryProperties
index 6fa67714a3..f22a102063 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/chemistryProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties
index 3c16364c6c..24caf1cadd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g
index b8d999ce12..62a43995cc 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef
index c3f2d14875..79af5b3cb5 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef
index 75322c0c61..5759d8f1ec 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
index de63769025..6e80c17cab 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
index d8ec3cac29..5400a7155c 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties
index 9528ee0d14..b98856bb69 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
index 3a3faa70ee..b8ecabf1f6 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
index da3554cb11..37d2f4dcd7 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties
index 293504c5f7..a1597fa1ad 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
index 740265a3a0..c94a9c1ad3 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties
index 4928b11684..1b13107a4a 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/blockMeshDict
index 999af875f8..49f81f3ba1 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/controlDict
index e057f1847d..0c736ddc68 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/createPatchDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/createPatchDict
index 46ba2183e8..ce2c167e66 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes
index 22f8d03bf6..f0fcf40145 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution
index 3dfe521315..1d69f784a2 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
index ce563df701..c5708327db 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/CH4 b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/CH4
index af85b3f70f..3935f44c13 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/CH4
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/G b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/G
index 62936f6ec4..d56b2ba957 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/G
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/IDefault b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/IDefault
index 0edb4e4f51..a584046a3f 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/IDefault
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/N2 b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/N2
index 2358e94a9d..76acac5310 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/N2
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/O2 b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/O2
index b04429db3f..1e4d55b1e8 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/O2
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/T b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/T
index 1110bc2423..0773bb2e82 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/T
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/U b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/U
index 0d798974bc..13941bc52a 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/U
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/Ydefault b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/Ydefault
index 7836f888a5..1a250b8848 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/Ydefault
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/alphat b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/alphat
index 17f67d8f5f..c61abb8cb3 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/alphat
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/k b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/k
index 6136864dfd..6108d6a11e 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/k
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/nut b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/nut
index efd7af88bf..49f5d919d8 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/nut
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p
index 3278104042..ad4fc73ca9 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p_rgh b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p_rgh
index de4a2b3270..e43e22fe71 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p_rgh
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/ph_rgh b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/ph_rgh
index 2ff54e52ad..e0d02c27b4 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/ph_rgh
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/0.orig/ph_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls
index 5939aa6bcf..2a19ce8f23 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties
index ba76680cc8..518096bc4c 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties
index d00bdfc1a4..500d806cd2 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g
index b8d999ce12..62a43995cc 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef
index c3f2d14875..79af5b3cb5 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef
index 75322c0c61..5759d8f1ec 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
index de63769025..6e80c17cab 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
index fe541aae35..b59cc5228d 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties
index 9528ee0d14..b98856bb69 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
index e8c0b359f5..ac73e37f58 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
index 85ad9ba776..bf3130988d 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties
index 293504c5f7..a1597fa1ad 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties
index 92a9d2fc7f..600577ce13 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/blockMeshDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/blockMeshDict
index 0e94f09707..508372facc 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/controlDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/controlDict
index 9de239b39c..b10cad7988 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/createPatchDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/createPatchDict
index 46ba2183e8..ce2c167e66 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/decomposeParDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/decomposeParDict
index 10ab32bf57..6a96a07342 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/decomposeParDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes
index e71cb360b6..2cba9f1638 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution
index 5cb62fd908..89c4f06fdc 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
index 42be937df8..76e3a06484 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/CH4 b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/CH4
index 4ef859204c..844f933456 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/G b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/G
index c2300ba9b6..65e1d5967d 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/G
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2 b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2
index 51d8f4a7d3..5fe2d6def0 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2O b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2O
index 26c6a62d86..80232c6114 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/N2 b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/N2
index 9ae05ec5dc..1d933c329a 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/N2
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/O2 b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/O2
index 08372a8c65..f49bb65e17 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/O2
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/T b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/T
index d31db8a67b..17157bce41 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/T
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/U b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/U
index 592f3c48d7..77fd4ec6e4 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/U
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/Ydefault b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/Ydefault
index 3270a48f2e..8ffa3b3a41 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/alphat b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/alphat
index a37a67535a..60786522d4 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/alphat
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/epsilon b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/epsilon
index b6fa6228b0..e22f9a312e 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/k b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/k
index ae46095291..054a5dddaa 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/k
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/nut b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/nut
index b8ee3d7982..0e4d0afff5 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/nut
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/p b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/p
index a30b1aea55..5bdb23a005 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/p
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/chemkin/transportProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/chemkin/transportProperties
index 5911e0de96..eed53dcc7a 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/chemkin/transportProperties
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties
index 38927e5092..98ceebf8fa 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/combustionProperties
index 1d1a689912..b37378991e 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/g b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/g
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties
index c83b69597c..6fb90073d1 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties
index 5ae0861f40..3536abb4a2 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/blockMeshDict
index 0285ac4679..3564b37517 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/controlDict b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/controlDict
index c70ddd6846..cfa6207616 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/decomposeParDict b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/decomposeParDict
index c00d120c26..9af2901e46 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/decomposeParDict
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSchemes b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSchemes
index 8f00a6670e..02f8e9fdb8 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution
index 5c86d4ab1a..dbe284f7c8 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/setFieldsDict b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/setFieldsDict
index 1e497e8765..9770e07be7 100644
--- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/setFieldsDict
+++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4
index 2d04f070b6..8544924c1a 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO
index 2b6085e543..5f58a91f19 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2
index def02d7568..28c432ff66 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G
index 2fd0206381..508acec66e 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H
index 434b49829f..dda8622f9c 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2
index 176bdde188..89e145aaf6 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O
index 13fca61949..ce391d461e 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2
index e12cc6acb9..053235b077 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O
index d5ffd00fb1..14fcdfc085 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2
index 91dc430993..d0903f75c8 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH
index 4b8614ccb3..efdee74dcd 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T
index b4eeebb221..285457f9e7 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U
index 52ef85918c..d3b301d987 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault
index 58ea0c013d..b73de49264 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat
index 0edfdeea1d..e852547256 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon
index 20c0b02ddf..133af89068 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k
index 81e7e76e38..785fe6033d 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut
index 727c49516f..66eda48af2 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p
index b4da8d2af5..5be3978d2a 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/chemkin/transportProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/chemkin/transportProperties
index 5911e0de96..eed53dcc7a 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/chemkin/transportProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties
index 1358bdddd8..ab8606aa4a 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties
index 5306dfbd95..f68d3a79ac 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/combustionProperties
index 1d1a689912..b37378991e 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions
index 8670f7774d..0018579791 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/g b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/g
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties
index f0995d0840..e3aadd0951 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties
index c83b69597c..6fb90073d1 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/blockMeshDict
index 990240764a..f30b740105 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict
index 20e89df4fd..ac696edadf 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSchemes b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSchemes
index 8f00a6670e..02f8e9fdb8 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution
index 2f660338ae..ba8c08c707 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict
index 81cf78bc43..739bb08313 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/setFieldsDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/setFieldsDict
index 5126311f6c..d43674f6f5 100644
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/setFieldsDict
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/CH4 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/CH4
index 90e561fef6..e3f44680ee 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2
index 1c77f4f962..8884225c69 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2O b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2O
index 09cb402e66..e69cee2131 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/N2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/N2
index 7833a6ca15..65ead55159 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/N2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/O2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/O2
index 4a5b5588a2..ed7f1e93ef 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/O2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/T b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/T
index 52cd35b45c..41d189a3af 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/T
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/U b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/U
index b1a2b5a3f4..642aed890c 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/U
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/Ydefault b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/Ydefault
index c8bdd9832f..23e22cd81b 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/alphat b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/alphat
index 7f162f40c1..8dd5205dbf 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/alphat
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/epsilon b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/epsilon
index 152747581f..df092c1a75 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/k b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/k
index a3f5e9a12f..994e6c6d9e 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/k
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/nut b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/nut
index b591eae4d3..35c0065227 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/nut
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/p b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/p
index e3e4ea2139..6cd5164604 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/p
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
index 302bd1e670..4eea444802 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/combustionProperties b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/combustionProperties
index 2da9536562..4768a6b1c8 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/g b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/g
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/thermophysicalProperties
index c116315ed5..c0c135fb1c 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/turbulenceProperties
index 5ae0861f40..3536abb4a2 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
index e1128a4451..d984615e79 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
index 05604fb220..d17c06d470 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/decomposeParDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/decomposeParDict
index c1ffca2335..6bbaa44e9c 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/decomposeParDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
index 74744c3c82..d7cbafb32c 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
index cae82f104b..ed791d3fa8 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/CH4 b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/CH4
index 7d62128e78..1d55e99894 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/N2 b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/N2
index 029bc438ec..72303362aa 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/N2
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/O2 b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/O2
index 3db6b1fb3e..0c56cd8b01 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/O2
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/T b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/T
index b913f98ff0..fdd4d75dd4 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/T
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/U b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/U
index 9fc24e57f9..a04c037324 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/U
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/Ydefault b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/Ydefault
index 490f44c29b..1f116ee0e7 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/alphat b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/alphat
index d6bad403ee..4ccd6db3a7 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/alphat
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/epsilon b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/epsilon
index a96c222c7a..92a16a8583 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/include b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/include
index 9f30c9b6ff..eae59b4359 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/include
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/include
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/k b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/k
index 7aa18a4627..6541f2210b 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/k
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/nut b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/nut
index 72d66ab2aa..ff1e13ac44 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/nut
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/p b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/p
index c48b788704..fecef0adf5 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/p
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/membrane/constant/chemistryProperties
index d36ee74acb..f90100c5b7 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/combustionProperties b/tutorials/combustion/reactingFoam/RAS/membrane/constant/combustionProperties
index 816d0954a5..f35e0e7c3a 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*-----------------m---------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/reactions b/tutorials/combustion/reactingFoam/RAS/membrane/constant/reactions
index 537dd0434c..dcff2fef9a 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/reactions
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/reactions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermo.compressibleGas
index f4b6c6139f..1ce614d5ca 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties
index f0a2af34b9..60846fbb29 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/blockMeshDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/blockMeshDict
index a2e981870f..fbeaa7db75 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/controlDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/controlDict
index 4b8739540e..0f9a82a367 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/createBafflesDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/createBafflesDict
index 26a48d2ba0..17eaa92790 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/createBafflesDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSchemes b/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSchemes
index 6d244d3780..31401c6d2d 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution
index f291302552..955494300a 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/meshQualityDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/meshQualityDict
index e9a844181f..ca4218c554 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/meshQualityDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict
index 2f2bab5ca3..28e8255d8d 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict
index fc42b92236..d02cbbf75d 100644
--- a/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
index 3d689c0328..92a5d20e5b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
index 6597dd02fc..260f63a55b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
index c0d0119584..da56e25276 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
index b18a7a5421..407e39cdd0 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
index 7f2e5c9b1a..73fdb8aa78 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
index 08dfb96fa2..df9959996f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
index 8918e70abe..441967e8a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
index 209749b56a..f8914d9918 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
index ead38ee985..0fd346c4bd 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
index 7aecf58f21..16af82f75f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
index e18c8a2a86..b635e2037f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
index e32477e35c..59762d32ff 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
index d0e45550cd..0b5aaa1306 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
index e3e09a8aab..b852d1e201 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction
index 6d065bdb29..ee90b538ba 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/blockMeshDict
index adf2f3128e..c3affe5ff1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
index aca1abc922..9379cb1708 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
index 6d244d3780..31401c6d2d 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
index 0c8dfa9f69..498ffab232 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4
index 50742e0017..201167a4ec 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2
index 5ea94faf05..ab4588274b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O
index c0d0119584..da56e25276 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2
index 1e959d60bd..37fea50565 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2
index cbc4b7e09b..d3b3879033 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T
index 2124209208..60d9682ea5 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U
index 8918e70abe..441967e8a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault
index 7e598e0e4f..2cfd6700d6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat
index 69ffc657d1..7ecec1ce24 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
index 474642acd5..36dab1a1aa 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties
index 6225220c17..4682182061 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties
index 2ee2930523..1b3da478d3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index f4b6c6139f..1ce614d5ca 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties
index f0a2af34b9..60846fbb29 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/blockMeshDict
index adf2f3128e..c3affe5ff1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
index b392cef2e1..71e94e2be6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes
index 161d1ab017..e47d66f97b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution
index bf59fcea05..3c855a8d37 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CH4
index 50742e0017..201167a4ec 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CO2
index 5ea94faf05..ab4588274b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/H2O
index c0d0119584..da56e25276 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/N2
index d3b43a5422..ee544931ab 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/O2
index cbc4b7e09b..d3b3879033 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/T
index 2124209208..60d9682ea5 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/U
index 8918e70abe..441967e8a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/Ydefault
index 7e598e0e4f..2cfd6700d6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/alphat
index 69ffc657d1..7ecec1ce24 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/p
index 474642acd5..36dab1a1aa 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/chemistryProperties
index 5f0a10dcce..ae603d99b5 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/combustionProperties
index 2ee2930523..1b3da478d3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas
index d0e45550cd..0b5aaa1306 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties
index c83b69597c..6fb90073d1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/blockMeshDict
index adf2f3128e..c3affe5ff1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict
index b392cef2e1..71e94e2be6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/decomposeParDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/decomposeParDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSchemes
index 161d1ab017..e47d66f97b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution
index 808141f983..282c962738 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4
index 50742e0017..201167a4ec 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2
index 5ea94faf05..ab4588274b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O
index c0d0119584..da56e25276 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2
index 1e959d60bd..37fea50565 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2
index cbc4b7e09b..d3b3879033 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T
index 2124209208..60d9682ea5 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U
index 8918e70abe..441967e8a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault
index 7e598e0e4f..2cfd6700d6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat
index 69ffc657d1..7ecec1ce24 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p
index 474642acd5..36dab1a1aa 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
index 9d42311e8d..452c7146cf 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
index 2ee2930523..1b3da478d3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
index d0e45550cd..0b5aaa1306 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties
index c83b69597c..6fb90073d1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict
index adf2f3128e..c3affe5ff1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
index 8c6792ee19..458d156a3a 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/decomposeParDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/decomposeParDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes
index 0d2ad351b0..6f2de19585 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
index 46f171f3fc..e015ebfcd9 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4
index 50742e0017..201167a4ec 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2
index 5ea94faf05..ab4588274b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O
index c0d0119584..da56e25276 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2
index d3b43a5422..ee544931ab 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2
index cbc4b7e09b..d3b3879033 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T
index 2124209208..60d9682ea5 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U
index 8918e70abe..441967e8a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault
index 7e598e0e4f..2cfd6700d6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat
index 69ffc657d1..7ecec1ce24 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p
index 474642acd5..36dab1a1aa 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
index 2681942348..975fc7f683 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
index 2ee2930523..1b3da478d3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
index d0e45550cd..0b5aaa1306 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties
index c83b69597c..6fb90073d1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict
index adf2f3128e..c3affe5ff1 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
index 8c6792ee19..458d156a3a 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes
index 0d2ad351b0..6f2de19585 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
index 46f171f3fc..e015ebfcd9 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/CH4 b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/CH4
index 0816bc384c..d0aca71777 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/CH4
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/N2 b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/N2
index 2358e94a9d..76acac5310 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/N2
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/O2 b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/O2
index b04429db3f..1e4d55b1e8 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/O2
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/T b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/T
index f52cdbbd19..a8fa766d93 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/T
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/U b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/U
index 19d33606cc..e6d00c2213 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/U
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/Ydefault b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/Ydefault
index 7836f888a5..1a250b8848 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/Ydefault
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/alphat b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/alphat
index 17f67d8f5f..c61abb8cb3 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/alphat
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/k b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/k
index 6136864dfd..6108d6a11e 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/k
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/nut b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/nut
index efd7af88bf..49f5d919d8 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/nut
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p
index cd972c7f78..c927e60e8c 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p_rgh b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p_rgh
index de4a2b3270..e43e22fe71 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p_rgh
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/chemistryProperties b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/chemistryProperties
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/combustionProperties b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/combustionProperties
index 446b62cf31..2e0a55b79b 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/combustionProperties
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/fvOptions b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/fvOptions
index 8fcd730573..7039f6ad2d 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/fvOptions
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/g b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/g
index b8d999ce12..62a43995cc 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/g
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/surfaceFilmProperties b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/surfaceFilmProperties
index e8c0b359f5..ac73e37f58 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/surfaceFilmProperties
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermo.compressibleGas b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermo.compressibleGas
index 85ad9ba776..bf3130988d 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermo.compressibleGas
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermophysicalProperties b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermophysicalProperties
index 556a004f8d..7a5030444b 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermophysicalProperties
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/turbulenceProperties b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/turbulenceProperties
index 04412329ad..2bde40d9b0 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/turbulenceProperties
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/blockMeshDict b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/blockMeshDict
index 4979687bee..0530b74613 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/blockMeshDict
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/controlDict b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/controlDict
index d384acf4f2..6e8d198a62 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/controlDict
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/createPatchDict b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/createPatchDict
index fb8efc4f42..4d81203f5c 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/createPatchDict
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/decomposeParDict b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/decomposeParDict
index 10ab32bf57..6a96a07342 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/decomposeParDict
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSchemes b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSchemes
index e71cb360b6..2cba9f1638 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSchemes
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSolution b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSolution
index 17d439cd91..47b46ab86b 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSolution
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/topoSetDict b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/topoSetDict
index 42be937df8..76e3a06484 100644
--- a/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/topoSetDict
+++ b/tutorials/combustion/rhoReactingFoam/groundAbsorption/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/h_vibrationShell b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/h_vibrationShell
index c6bf277e36..17db431e05 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/h_vibrationShell
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/h_vibrationShell
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/pa b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/pa
index 5910fdb8c8..7c3d6d55f9 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/pa
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ps_vibrationShell b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ps_vibrationShell
index 661f8cb547..62ef90d5dc 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ps_vibrationShell
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ps_vibrationShell
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ws_vibrationShell b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ws_vibrationShell
index acf306fffe..02de4065f0 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ws_vibrationShell
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/0.orig/ws_vibrationShell
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/transportProperties b/tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/transportProperties
index 8186edb1df..3448bcd6e9 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/transportProperties
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/blockMeshDict b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/blockMeshDict
index 60c08acb58..18a300916e 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/blockMeshDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/controlDict b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/controlDict
index 0a05031485..b06f054eb4 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/controlDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/decomposeParDict b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/decomposeParDict
index 9381011a70..0f29ff8508 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/decomposeParDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition
index 6f49322080..7879fc2195 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faOptions b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faOptions
index d4579793fa..3a7ba52494 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faOptions
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSchemes b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSchemes
index d26ae38bd9..1b94d031cc 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSchemes
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSolution b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSolution
index e675e9b112..e645feb77d 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSolution
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSchemes b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSchemes
index 423b885a5a..cc5efbf061 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSchemes
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSolution b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSolution
index 3ac4e3b324..be23602a7e 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSolution
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict
index 8a314726e4..581a6c5b03 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/T b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/T
index d4dd11c0a6..5d0aa0fd84 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/T
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/U b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/U
index 80b4ae72f8..2030a0f1f7 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/U
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/alphat b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/alphat
index 9de6f546d7..ab67a513cd 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/alphat
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nuTilda b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nuTilda
index be4e384913..80439bc8a6 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nuTilda
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nut b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nut
index f595d7b5f8..bf032fbe22 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nut
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/p b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/p
index 1a0889bc76..1370af7d18 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/p
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/thermophysicalProperties b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/thermophysicalProperties
index 91b4f80f81..2cea873144 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/thermophysicalProperties
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/turbulenceProperties b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/turbulenceProperties
index 307a822887..ea6b0f1b69 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/turbulenceProperties
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/blockMeshDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/blockMeshDict
index 3511211912..f0ddfa9ca7 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/blockMeshDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/changeDictionaryDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/changeDictionaryDict
index 2d542fc756..38a3283e8d 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/changeDictionaryDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
index c312c08c61..af2c4ffc7e 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/createPatchDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/createPatchDict
index 1e1eb55f38..6d13727ed6 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/createPatchDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/decomposeParDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/decomposeParDict
index 9381011a70..0f29ff8508 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/decomposeParDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/extrudeMeshDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/extrudeMeshDict
index 0a49f75e68..851e92ae7c 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/extrudeMeshDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSchemes b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSchemes
index 2dbcbc66d2..f9716bb23c 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSchemes
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSolution b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSolution
index 71dbb27bf8..6157bc6b14 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSolution
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/topoSetDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/topoSetDict
index 47bed1bc6e..0880e5ea1f 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/topoSetDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/T b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/T
index 423e385948..95198999e7 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/T
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/U
index 50d2b50dae..dcc5f1c6f8 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/alphat b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/alphat
index c146cdce44..600a6d6a5c 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/alphat
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon
index de4fea85a3..b15051e054 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/k b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/k
index 7a58742a3f..ba58486e4d 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/k
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/nut b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/nut
index 0c43e316f5..2ce310cbf5 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/nut
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/p
index ec7a52be34..82ce5396ce 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
index 46027412ae..4ecfdb88c2 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
index 9d093b2ff5..3168641fab 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/thermophysicalProperties b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/thermophysicalProperties
index 3d2968f79c..cf8a4ff27c 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/thermophysicalProperties
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties
index bcdafe6154..ce74d37895 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict
index 9c64cbf253..a8016428cf 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
index fc24bd6706..07af85731c 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
index 866c3d7d58..f30d71cdde 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSolution b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSolution
index c404f8f524..2e4afaa1c1 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSolution
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict
index 2880bcf4e3..dbdf970671 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
index 2341309de9..a3c38dcb0a 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/T b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/T
index 6b46f26f6a..751976d203 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/T
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/U b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/U
index 15b03ae83d..3f76689500 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/U
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/alphat b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/alphat
index 8ffb94cd38..f29d2ae541 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/alphat
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/epsilon b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/epsilon
index 0b721258e3..6f4532d134 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/epsilon
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/include/initialConditions b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/include/initialConditions
index 01b6fa9722..6b2e8a5487 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/include/initialConditions
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/k b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/k
index 25fde2c233..01664ad011 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/k
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/nut b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/nut
index 6db8e04d1c..93c1588057 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/nut
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/p b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/p
index a5f1cd5858..b1c770f858 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/p
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/pointDisplacement b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/pointDisplacement
index 5d9a50c64c..df73743166 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/pointDisplacement
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/zoneID b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/zoneID
index 1726c99b8d..d166c0e8b9 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/zoneID
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict
index 09c7ab71be..74c3ac6e11 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/thermophysicalProperties b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/thermophysicalProperties
index 07e4489396..6b92b16c57 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/thermophysicalProperties
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/transportProperties b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/transportProperties
index bb559d1c75..91e16d98da 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/transportProperties
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/turbulenceProperties b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/turbulenceProperties
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/blockMeshDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/blockMeshDict
index 76131aaa9e..d2c5f30c6a 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/blockMeshDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/controlDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/controlDict
index a6ca8e3810..17e7d7d376 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/controlDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/decomposeParDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/decomposeParDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes
index 4fb4d4513d..f63f9e9d96 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSolution b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSolution
index 59ff96da50..67b971535c 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSolution
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/setFieldsDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/setFieldsDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict
index 243a415178..510e36c570 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/controlDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/controlDict
index 66ced0840c..25099e950c 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/controlDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/createPatchDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/createPatchDict
index 69e178bc25..77a9781452 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/createPatchDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict
index c555761f3a..3182b8c59f 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSchemes b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSchemes
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSolution b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSolution
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index 359063a541..9898968c56 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
index 0045bf50f5..ed13abc63e 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
index 75b11df099..5329f6a3f0 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
index bf7a4ff105..984509781f 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
index fed36b10f2..56858ffb37 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
index be17616b60..cf676eb363 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index 77ec2e0106..4820c76782 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
index a5f5b34d87..49b2a08b28 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict
index e97c371916..d86db55dff 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index 0164c95301..a6ba1d2d5e 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
index a03bc3eeb9..f12885e69d 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
index 87e91c2134..0d86d80018 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample
index dbe81798d8..f27415101c 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
index e003847d87..62e8bc290c 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
index 6927acf6d2..ce442c0811 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
index 2cda7ff360..176c005086 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index f8b60a402e..38e44ebdf0 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
index 761f9fc96b..2838c0fa22 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
index 73b3e03767..f2fd6e3e67 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
index fed36b10f2..56858ffb37 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
index 37632a2fa3..3b0af4d2c3 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/0/T b/tutorials/compressible/rhoCentralFoam/movingCone/0/T
index 5c05c12f73..415627ac72 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/0/T
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/0/U b/tutorials/compressible/rhoCentralFoam/movingCone/0/U
index c69b450e7e..05003e916e 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/0/U
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/0/p b/tutorials/compressible/rhoCentralFoam/movingCone/0/p
index 4c3be623f4..11b9c98e6c 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/0/p
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/0/pointMotionUx b/tutorials/compressible/rhoCentralFoam/movingCone/0/pointMotionUx
index 7c0d775b02..41f254ffe1 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/0/pointMotionUx
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/0/pointMotionUx
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/rhoCentralFoam/movingCone/constant/dynamicMeshDict
index f7de446eef..2535ad9991 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/movingCone/constant/thermophysicalProperties
index 605b3a4bb4..bd21f5455a 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/movingCone/system/blockMeshDict
index 36a9952f96..e942deec71 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/system/controlDict b/tutorials/compressible/rhoCentralFoam/movingCone/system/controlDict
index 591d5a82bb..1463222f88 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane
index 0b5cb1f2e7..51447cb0a3 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/system/cuttingPlane
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSchemes
index aa6653c8c5..8885fbb0bf 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSolution b/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSolution
index 47332ad608..f55d40042c 100644
--- a/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/movingCone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
index 05948e19e4..753da3d4a6 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
index 92eeb42da3..a6b47168a6 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
index 8f681a0e63..372cde5372 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index d5c34792a7..9f8fb43f84 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
index 344a75c809..0c8725093b 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
index 36a2bbd7dc..9958c90999 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
index fed36b10f2..56858ffb37 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
index 37632a2fa3..3b0af4d2c3 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T b/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T
index 6128d37989..acf5bcbc83 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U b/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U
index 13f053f88f..eb5dd022ad 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p b/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p
index 3925f7f5e4..c0edea7126 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index b617990c54..af968722e7 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
index 1bfe161725..c13af1a757 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
index 43135bef40..4c6f0c8489 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
index fed36b10f2..56858ffb37 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
index 37632a2fa3..3b0af4d2c3 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
index bf3f0c50c6..7f22b95f4b 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
index ac17538af9..1522080c30 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
index 730c6ca539..4478a2ee9c 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
index 2cda7ff360..176c005086 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index d5c34792a7..9f8fb43f84 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
index 3dbd0e8720..3b1e1e4984 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
index 089347cfb2..9cf509455b 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
index fed36b10f2..56858ffb37 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
index 37632a2fa3..3b0af4d2c3 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/T b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/T
index f72656f9ba..0eb714c825 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/T
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/U b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/U
index 46b1492e8d..c10db67889 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/U
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/p b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/p
index 56f5e197fe..947bd02312 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/p
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/thermophysicalProperties
index b696604310..4f8681df78 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/blockMeshDict b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/blockMeshDict
index 6a1533bd61..8dc6f81a29 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict
index fd418bbdaa..348aa02511 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/decomposeParDict b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/decomposeParDict
index 998b4d2b8a..16e8961a8b 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/decomposeParDict
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSchemes b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSchemes
index 71dd83bd67..9800ca61e0 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSolution b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSolution
index e6f5816f16..8cd589a01a 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
index b057bda2c2..c01817e96d 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T
index 51bf604d6c..357664859a 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U
index 6f0dab180c..dca5660848 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat
index 453a172941..ab59a08ed3 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k
index 326e640540..e0f6ebc598 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
index c855e63c70..42257cd5ad 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut
index 92fa7d0624..00efbc1fea 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p
index a7b58cc18a..fb9eae5b6a 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
index 3a750f5101..6c04f96fc5 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties
index 011803a770..a8ac0c8675 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict
index 5bac214aa5..0fd67b4aeb 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
index b2022adbab..34fccb730f 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution
index 36712c9df5..c9d884e3ec 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/T
index 25bbda6010..1f9976e555 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/U
index 6f72b041f0..a7b8d63855 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/alphat
index 8e0f4f7b36..772cca0334 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/epsilon
index bfa998fd66..95477946a3 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/k
index f52bf071f3..00984ac08d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nuTilda b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nuTilda
index 6acacc8199..223c566d9a 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nuTilda
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nut
index ef6cee04a3..b4fdd7f9ff 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/p
index 161f0c7118..b9fd4dbacd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/fvOptions
index 00a6874f85..4b38afe612 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/thermophysicalProperties
index bc6a5a7185..b161988fd6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/blockMeshDict
index 6928049767..307fdd230d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/controlDict
index b15e62255d..e10c66f9f8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSchemes
index 970bb5adc7..89f66e2400 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSolution
index e2cc6602a1..d7b82c9e76 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunction/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/T
index 25bbda6010..1f9976e555 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/alphat
index 8e0f4f7b36..772cca0334 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/epsilon
index bfa998fd66..95477946a3 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/k
index f52bf071f3..00984ac08d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nuTilda b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nuTilda
index 6acacc8199..223c566d9a 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nuTilda
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nut
index ef6cee04a3..b4fdd7f9ff 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/fvOptions
index 00a6874f85..4b38afe612 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/thermophysicalProperties
index bc6a5a7185..b161988fd6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/blockMeshDict
index 6928049767..307fdd230d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/controlDict
index b15e62255d..e10c66f9f8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/decomposeParDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/decomposeParDict
index 3fd7f374a5..af6f2d49e8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/decomposeParDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSchemes
index 970bb5adc7..89f66e2400 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSolution
index e2cc6602a1..d7b82c9e76 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprBoundaryFieldsDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprBoundaryFieldsDict
index 6f15b2330e..981ede2103 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprBoundaryFieldsDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprBoundaryFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprFieldsDict b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprFieldsDict
index 51b8fb3892..884544f886 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprFieldsDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/system/setExprFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/T
index f063a8bdbd..efd4a6e625 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/U
index 8be2c55c7f..a76848400b 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/alphat
index 4124202fdd..602f4f97ca 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/k
index c2690b8392..0405f04023 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/nut
index 43d7988d3d..dede519bbf 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/omega b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/omega
index fe9f44bfbc..1d829f08d8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/omega
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/p
index 8ae347981a..c8f04a0184 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/thermophysicalProperties
index 9df32f7986..ddbbfca109 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict
index 6316ebc483..addf616624 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/controlDict
index e11db2b19f..4663d7f0e0 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict
index 10dd4bd4a2..996e47c33e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions
index 1a8afcf0b1..0507672652 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes
index 8e8a15f3c3..073d3f15b7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSolution
index 8f84adb82f..4a49c8aad7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/T
index 3e176bba27..109c03949f 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/U
index 49cdcf72e7..7ae24d64dc 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/alphat
index 6dc628dc0f..707e6f0f82 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/epsilon
index ecffda628e..aad9b25153 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/k
index 490ed1325c..a28f2149ca 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/nut
index 56d461f581..9180c7a361 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/p
index d2af158e76..20b0662e3c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
index ef22f2c0b3..044cc5489a 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
index 81ca7a2769..b108f9334a 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict
index d0448439c2..07a97f3a82 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/controlDict
index 01c36c844e..48e95eed42 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/decomposeParDict.example b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/decomposeParDict.example
index 42bcc089d2..7e6bd9c8f4 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/decomposeParDict.example
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/decomposeParDict.example
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes
index 782afc9a9f..32de8a176e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution
index 1e659deb8b..5ab32ed30a 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/T
index 84531126a4..c68b05d2ab 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/U
index 02c95e8da0..e4c2a52622 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/alphat
index 54e5ab29de..e826c3b659 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/epsilon
index ecffda628e..aad9b25153 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/k
index 490ed1325c..a28f2149ca 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/nut
index 56d461f581..9180c7a361 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/p
index d2af158e76..20b0662e3c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
index f9ca4f869f..be405baa7d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
index bc6a5a7185..b161988fd6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict
index cce0c65574..f1523a6b6d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict
index b1d3cce510..ffd1edd606 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes
index 7ba0f1f6fd..2abe5efddf 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution
index 36d3a2e334..98e3b335a6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/T
index 5d733aec0b..d4ea7a8e74 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/U
index c17b33f683..480522c62f 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/alphat
index cbbaa7b65c..3f1d7add21 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/epsilon
index 40596ea167..34d66dd342 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/k
index 1b976db8af..2bf519e929 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/nut
index c0950498bc..1ab8fd885d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/p
index 82b309f1ad..58cbee64b0 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions
index 033831a5f9..ce35f9ff2b 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/boundaryConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings
index 465d8fdbd8..ef9f65b2cb 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/caseSettings
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict
index 983ea0df32..dabe0e4762 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/thermophysicalProperties
index bc6a5a7185..b161988fd6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/transportProperties b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/transportProperties
index 32afe34f0f..8c76a85bd5 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/transportProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/blockMeshDict
index 7dc62e8fdd..42074cf603 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/controlDict
index f5f5014317..cdeba618aa 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
index f23a5cc0c4..15a2be9ccb 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSchemes
index 461beb4275..9679563915 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSolution
index 3ce2e7ca3c..96d9836a8e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
index 80239115fd..35b69fec85 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDict
index e3db9bd49e..6541e12473 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDictDefaults b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
index ef2087e366..25bb5b0ddd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T
index e3936a28f4..bf1fca3cc8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U
index 2d055b7208..c8691d1440 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat
index a99a4f9a71..45255fe4ec 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon
index bb73fdd941..0408ce67b4 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k
index 714b52cc5f..3b555a2a31 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut
index 8e3d1cae53..54874224b7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega
index c518ae85f0..f3dda9e8ff 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p
index 40fb3c5b8f..dc1ec06d93 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
index e7c8391bd0..e6a87c7f11 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict
index d39bfb241f..328f5db2aa 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/controlDict
index db05c0723e..d213d4548c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes
index 5adf342ec4..e6ca8e9e11 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution
index da874d3831..8f7f998fee 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/T
index 93faef1ff7..3cb3565112 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/U
index 05cc6926e0..3e85565a34 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/alphat
index b369eed453..da6d3d05fd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/epsilon
index e8662d01c6..325ed0a4f8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/k
index ce18837632..2e60a55fcd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/nut
index be8c37f6c1..e3a525963e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/p
index f98de6c605..500653b024 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/thermophysicalProperties
index 0959263f2c..87f462b2e7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/controls b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/controls
index a6091b8477..8de2be9de1 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/controls
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/controls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/blockMeshDict
index 96baac184a..cf34c99a78 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/changeDictionaryDict b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/changeDictionaryDict
index 2ee385109e..e6039a77da 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/changeDictionaryDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/controlDict
index c9214d171a..8f10367964 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/decomposeParDict b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/decomposeParDict
index e9ebc67101..2b13bcaa6c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/decomposeParDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/externalCoupled b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/externalCoupled
index 03867cd172..69df47e041 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/externalCoupled
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/externalCoupled
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSchemes
index b433fefb4b..dec4baebb5 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSolution
index 46d4740f7f..28031bd847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/T
index 5f46f3f4d2..9abf351375 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/U
index bcbd1647cd..6830c2a536 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/alphat
index b879dc0f86..f2c10b55e6 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/epsilon
index 3eabadce80..aa9c33ec23 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/k
index bd977808de..94f3bb7654 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/nut
index bd7b4754fd..adea63c108 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/p
index 3c846f2cf9..3fcc487f8d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/tracer0 b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/tracer0
index 41dbbf048d..2291e84abd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/tracer0
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/0.orig/tracer0
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties
index f48a73054e..620ed659cc 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
index 9dfff3d31a..2a5c1f92ed 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
index 88cb6beb62..d57cd78f5c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/transportProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/transportProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
index 8e2d00da4a..517ca2e15d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict
index 3653fca35a..f67285195d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes
index 5fee55ab52..9b11de6c60 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution
index eadcff8a59..492d0e56b7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/T b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/T
index ac49ef3e30..7602353566 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/U b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/U
index 00e72a2c83..d7e4f0dd44 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/alphat
index b369eed453..da6d3d05fd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/epsilon
index e8662d01c6..325ed0a4f8 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/k b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/k
index ce18837632..2e60a55fcd 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/k
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/nut b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/nut
index be8c37f6c1..e3a525963e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/nut
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/p b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/p
index f98de6c605..500653b024 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/thermophysicalProperties
index 0959263f2c..87f462b2e7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
index 76845eca3e..0d1f1e029d 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/controlDict
index fabdaec2cc..f156f1c4a7 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/decomposeParDict b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/decomposeParDict
index e9ebc67101..2b13bcaa6c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/decomposeParDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes
index 946f9b44ef..1c70e04eed 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSolution
index 46d4740f7f..28031bd847 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/topoSetDict b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/topoSetDict
index d5d0c6ae5b..73f9fc710e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/topoSetDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/T b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/T
index 0885115c81..59286cd79f 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/U b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/U
index e9f9b8443b..f1f600b6fe 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/p b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/p
index 6915421f43..3f67937885 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
index 3a750f5101..6c04f96fc5 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict
index 1befaaa3dd..94f5aa489b 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
index 8758139689..9d80f9b21c 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes
index 47690f7d95..f8b70d6803 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution
index 36712c9df5..c9d884e3ec 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/T b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/T
index e66c17b124..5e21568bf4 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/T
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/U b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/U
index 04aabd6b32..2c98bb580a 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/U
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/p b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/p
index 9eef1338d0..abe642dc7c 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/p
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/thermophysicalProperties
index bc6a5a7185..b161988fd6 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/blockMeshDict
index cf51d1447f..55ba557d18 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/controlDict
index 4403ea09f2..eb65eec394 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions
index b996e85968..92f302b54a 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSchemes
index 11692e6327..2f4842af90 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSolution
index 1264b2ff2c..f470ccaf3e 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T
index 4860100629..cb880d6bd4 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U
index fb32b23125..fac7674f9b 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat
index 8f82bde68e..ed26ae5327 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon
index f211171cb7..34bc8c4a2a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k
index 6ee8d800a9..47fdd202c0 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/nut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/nut
index ed3eb03541..777e315324 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/nut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p
index d2af158e76..20b0662e3c 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/blockMeshDict
index cce0c65574..f1523a6b6d 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/blockMeshDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions
index ca76fcb03c..79902718ed 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties
index 0ed4dbbe73..c7fefefc5c 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/thermophysicalProperties
index 6f05438a56..99c6a311f3 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/turbulenceProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict
index f19dd7ed48..0d84c40681 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes
index c939b8bb17..6db0b7fa71 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution
index 28c5c808a1..ec9a063de3 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict
index 0734b2f4f3..1a6384a6b0 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fluxSummary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fluxSummary
index dd3c7ac80a..d922529927 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fluxSummary
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fluxSummary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes
index c939b8bb17..6db0b7fa71 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution
index 31038a3287..306b628eba 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
index 5aa11fe99a..5b6fc09c03 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/sampling
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/T b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/T
index f063a8bdbd..efd4a6e625 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/T
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/U b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/U
index 33254d0066..d2218befa9 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/U
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/alphat b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/alphat
index 4124202fdd..602f4f97ca 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/k b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/k
index c2690b8392..0405f04023 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/k
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/nut b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/nut
index 2b545f8008..553eba20c3 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/nut
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/omega b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/omega
index fe9f44bfbc..1d829f08d8 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/omega
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/p b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/p
index 7ccdff90d5..5e6daf4f87 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/p
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/thermophysicalProperties
index 9df32f7986..ddbbfca109 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict
index 6316ebc483..addf616624 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/controlDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/controlDict
index 071892dddb..d49b0269d8 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/decomposeParDict
index ede10f42b5..bbadfca5be 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/decomposeParDict
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict
index 10dd4bd4a2..996e47c33e 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions
index 1a8afcf0b1..0507672652 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSchemes
index b08ee00b8b..90a50f1d42 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSolution
index 6ed5abe16f..f2422a7d54 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/topoSetDict b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/topoSetDict
index f1087099c9..d421bb2831 100644
--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/topoSetDict
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/T b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/T
index 84531126a4..c68b05d2ab 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/T
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/U b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/U
index 42d8e6cee5..8c7a4da2a1 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/U
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/alphat b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/alphat
index 54e5ab29de..e826c3b659 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/epsilon b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/epsilon
index ecffda628e..aad9b25153 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/k b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/k
index 490ed1325c..a28f2149ca 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/k
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/nut b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/nut
index 56d461f581..9180c7a361 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/nut
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/p b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/p
index d2af158e76..20b0662e3c 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/p
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
index c74cc2b086..97011a13a1 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
index 6f05438a56..99c6a311f3 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict
index d0448439c2..07a97f3a82 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict
index 7813ea8192..bc24e116fc 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
index c939b8bb17..6db0b7fa71 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
index ec3ab15e53..75e39a6c1e 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/T b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/T
index 67bbf0c913..0cc532ccbd 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/T
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/U b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/U
index ae325fda07..4e43ae9bcc 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/U
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/alphat b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/alphat
index d021f4c2e7..dc1c209be4 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/epsilon b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/epsilon
index 5a10118fc3..338fe74f18 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/k b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/k
index 457e2919fa..e0bbb521ab 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/k
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/nut b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/nut
index 7fb0268b91..ee7214fff6 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/nut
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/p b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/p
index 5733cde558..30c420e032 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/p
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/tracer0 b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/tracer0
index 636eb1cc07..5e69bf43b4 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/tracer0
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/0.orig/tracer0
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/thermophysicalProperties
index 1b9d9f8074..18547ac2f8 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/blockMeshDict
index 13d06164a8..fe7277d79c 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/controlDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/controlDict
index 1c4b64c77b..0f5fe0d10c 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/decomposeParDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSchemes
index eec3469a88..db7846fc74 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSolution
index 65e5e9679a..8f89790236 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict
index 1f4c222d7e..8d0074a3da 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict
index 88c2fcc42f..59c7fdd72b 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
index f4d92b5e63..8ddc502ed6 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/T b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/T
index 877c02d79e..a951720db8 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/U b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/U
index 6dcb6d5dc7..18e97d3388 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/alphat b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/alphat
index b369eed453..da6d3d05fd 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/epsilon
index 9ef4cce150..5be57d3147 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/k b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/k
index f2d9a6078c..b1a7b6afea 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/k
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/nut b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/nut
index be8c37f6c1..e3a525963e 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/nut
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/p b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/p
index fc07c33606..e59343425f 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/p
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
index 5d2b25fab8..4e16e09283 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
index aa6eef6833..fea30e86d9 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
index 77a23d28a5..14dc5b67a1 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict
index e9ebc67101..2b13bcaa6c 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes
index 3002866d91..85d168501d 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
index f2f9403232..6f2eb70478 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampling b/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampling
index 03533aa8b1..c10aa06a22 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampling
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampling
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/U b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/U
index 0e4cab3ba3..806755a580 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/alphat b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/alphat
index b369eed453..da6d3d05fd 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/epsilon
index e8662d01c6..325ed0a4f8 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/k b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/k
index ce18837632..2e60a55fcd 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/k
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/nut b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/nut
index be8c37f6c1..e3a525963e 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/nut
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/p b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/p
index f98de6c605..500653b024 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/p
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties
index 0959263f2c..87f462b2e7 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
index 76845eca3e..0d1f1e029d 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict
index 6d1b56d1ea..d4c9e4b1a3 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict
index e9ebc67101..2b13bcaa6c 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes
index 8e4226386a..65c777a15c 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution
index df4f59dc2c..8e7e27e1f4 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/topoSetDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/topoSetDict
index d5d0c6ae5b..73f9fc710e 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/topoSetDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/T b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/T
index ac49ef3e30..7602353566 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/U b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/U
index 85c5c1b5e3..70a1f076b6 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/alphat b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/alphat
index b369eed453..da6d3d05fd 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/epsilon
index e8662d01c6..325ed0a4f8 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/k b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/k
index ce18837632..2e60a55fcd 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/k
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/nut b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/nut
index be8c37f6c1..e3a525963e 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/nut
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/p b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/p
index f98de6c605..500653b024 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/p
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/thermophysicalProperties
index 0959263f2c..87f462b2e7 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/turbulenceProperties
index b17d09fb0e..bcb91ad5a1 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict
index 6f0a1ad567..8a87b3bbbf 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/controlDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/controlDict
index cc6c1b6f07..2d1d3fef12 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/decomposeParDict
index e9ebc67101..2b13bcaa6c 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/decomposeParDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSchemes
index caa8785bdb..5eeea00c38 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSolution
index df4f59dc2c..8e7e27e1f4 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/topoSetDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/topoSetDict
index d5d0c6ae5b..73f9fc710e 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/topoSetDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/T b/tutorials/compressible/sonicDyMFoam/movingCone/0/T
index 5c05c12f73..415627ac72 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/T
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/U b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
index c69b450e7e..05003e916e 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/U
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/p b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
index 4c3be623f4..11b9c98e6c 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/p
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
index 7c0d775b02..41f254ffe1 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
index f7de446eef..2535ad9991 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
index 605b3a4bb4..bd21f5455a 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties b/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
index 36a9952f96..e942deec71 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
index c2929adf27..8b730dab47 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
index 7ed56f8060..1c10cca278 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
index d36b344638..f4ee10ab81 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/T b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/T
index 3b91c0de14..83d0b529af 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/T
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/U b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/U
index e472d25adc..1182e26604 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/U
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/alphat b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/alphat
index 872412ec72..de2886952c 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/alphat
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/epsilon b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/epsilon
index 7319c2ba38..069b5fd82c 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/epsilon
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/include/initialConditions b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/include/initialConditions
index 17a69c832d..ecd766feb6 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/include/initialConditions
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/k b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/k
index b4949d0a37..e691ed2b92 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/k
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/nut b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/nut
index b1faf90f19..54d548a116 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/nut
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/p b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/p
index 3568f7ab69..353c8852a8 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/p
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
index 05fffd4241..045854bc0b 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties
index b85f96c9b0..2811427a80 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
index bf27524e90..d1fa04b947 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/decomposeParDict b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/decomposeParDict
index a0dbc5dcf1..5f4301b226 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/decomposeParDict
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
index f50d750eed..fa648c09d3 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
index 2a7ee73c3f..a851833c42 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/T b/tutorials/compressible/sonicFoam/RAS/prism/0/T
index fad16919ec..2da7862dc2 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/T
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/U b/tutorials/compressible/sonicFoam/RAS/prism/0/U
index e99e92f30a..acccbbd750 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/U
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/alphat b/tutorials/compressible/sonicFoam/RAS/prism/0/alphat
index 0a5bfcb41d..07279a326f 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/alphat
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/epsilon b/tutorials/compressible/sonicFoam/RAS/prism/0/epsilon
index ca9bb20dce..ae822b6e80 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/epsilon
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/k b/tutorials/compressible/sonicFoam/RAS/prism/0/k
index f01a774338..5a5b5fe646 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/k
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/nut b/tutorials/compressible/sonicFoam/RAS/prism/0/nut
index af3d00fb9e..c388288a03 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/nut
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/p b/tutorials/compressible/sonicFoam/RAS/prism/0/p
index 9bbb6ad8a1..bfd5d66490 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/0/p
+++ b/tutorials/compressible/sonicFoam/RAS/prism/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
index 05fffd4241..045854bc0b 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict b/tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict
index 15f4d51f77..e89c831869 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict b/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
index 6982e999c3..20a53ba6d1 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
+++ b/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes
index 721739a11f..e18da66b74 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution b/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
index adaaad0cda..3f513091f9 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
index ac17538af9..1522080c30 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
index c052b3294c..9f05c313a2 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
index 6752f9323b..9f3d165f1a 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index f8b60a402e..38e44ebdf0 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
index b5826fc063..00271632d2 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
index 67f651dd70..e7568db64e 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index 5e616e7f6e..be16017d0c 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
index acf678ff2e..fc40f3c2f3 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T
index 6128d37989..acf5bcbc83 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U
index 13f053f88f..eb5dd022ad 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p
index 3925f7f5e4..c0edea7126 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index bfe8bdebb8..c7aa9e900e 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
index a085650f5c..912b010ec2 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
index 43dbdd5191..78692ce0eb 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index 7866284cda..041093322e 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
index eaec5ca6dc..a7dbabbf64 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample
index 07ead1dd5a..b73d202972 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
index bf3f0c50c6..7f22b95f4b 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
index 7cef2872cd..04faac6720 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
index 4e90b2c2c1..d11cb8cb4d 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
index 915de564c7..d59afc3f95 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
index ea2c87331f..4a75039fe9 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
index 38b7abc0c8..a929423f13 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
index b8f04ff641..8dfd629042 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
index ed697adb37..3dd7b447ab 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
index ad47371c58..d03ed3b313 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT
index d729407b2f..ebf208a524 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU
index 50a8e38f30..209abdf54c 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN
index 000ce08ef0..e0db0e9461 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD
index a60a176055..2792b4d68f 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof
index 0143b0c397..57c538bed7 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE
index 5a3384fc4c..55efb246df 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE
index 3fd8b50a70..3bd3f91f5c 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum
index a8a4dfed10..c95f57bae2 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q
index dbae573181..3810a8732f 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM
index 3a82083dde..270511aaa8 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN
index 41a3c3acac..55eb4e6ccf 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
index 743b9c150d..34eb885738 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
index e83559fe15..3d5ca0f086 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index 1d353e15c2..08f1536a97 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
index 2125d77089..4ae17145ec 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
index 3a59f0e5e8..9b3479d131 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT
index 00ad02b98c..2d02159af5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU
index f37e0ac12a..68a0384d38 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN
index 48d1289331..6a1dcc6c3e 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD
index 1b45ecc9b8..01e685becd 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof
index dba78ca3f0..7d262834fe 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE
index dbec70a5ac..44531704b1 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE
index a1dcbb6c02..5055f0279a 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum
index 4e5ba3286f..3754b70864 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q
index 64ceb6cf07..dfe24daaf5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM
index b43dca295f..4f09560382 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN
index 6f7c5745fc..0b24c50440 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
index 568b32ddaf..f307a26daa 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
index 6a0bb6da1d..3862b833e5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 1d493cd985..1a86dad3d0 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
index 2125d77089..4ae17145ec 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
index f8cc487b00..3a5d8016b1 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT
index 852cd027f3..146f74b853 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU
index 6210d8f623..0141fbc93a 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN
index ce3dd99f94..455217a9da 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD
index a3e18daf65..8b8dd1bc1f 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof
index feb4e81281..1e7bd108cd 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE
index 78f0895caa..7a628ecd7a 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE
index f01bf3fc85..2bd1a88f20 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum
index 99b3dbdfa3..4ef64e6ef3 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q
index 43ad620f86..1cfb2ed705 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM
index 6a1ee5bcf9..e7c890576e 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN
index 2b3a2a5eed..c3c6311ea0 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
index 25688d94a6..6e9e59a7f0 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
index dbd33e5af2..74c320198b 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 78d91f0370..cf2b761b22 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
index a9b05ceb4e..4a271aabad 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT
index 6cbd9bef6b..8f5a583be4 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU
index df88d19f29..9db6c4c8fb 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN
index cc2500adfb..850a7f37bf 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD
index 2254629840..da040cc61c 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof
index 0e2e055a87..9cc9c644a2 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE
index 1d3fdcc0dd..26fb83e8bf 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE
index 979bde6a79..0084d44251 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum
index 571d293dd8..30cb18aca4 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q
index 9b86b4fea7..4cebdf6d09 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM
index fece1d099f..da8ded1544 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN
index b1314ef561..a53fdaf614 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
index 54d100b3c8..706f85ab83 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
index fd54a2493f..d270559484 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 9ead1190df..0cd0125735 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
index ed66e4e202..35d408a038 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U
index 04416d8589..fd2fb48094 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
index d43ad12888..cb24f1bc08 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
index 18c7296412..6690aae01a 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 7f3650c970..4c2bf7ca94 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
index d490c4e3c6..34b5e10018 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
index 7b43525c1b..1256258d5b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
index 4e6f5f324a..634c9859df 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 n|    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U
index 04416d8589..fd2fb48094 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
index 12984ffb30..6fa85634e1 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
index cc4e3999f5..1121c2a56f 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index f1c200ea50..5bd36192cb 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
index 916489eba2..10d62e156d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
index 8c26e1534c..748b28f89f 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
index 768e909c03..d622882e21 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U
index c67c29f895..18b3be2fdc 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
index 2a6fa78381..81d0168448 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
index a8b260c9ef..5892b74f1b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 22a9e0fd25..40f3023269 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
index 51f9e822f6..24744b0164 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
index 916489eba2..10d62e156d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
index 4a4c8ea158..2fbfa06d0c 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
index 768e909c03..d622882e21 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
index 8d856f72b4..a3494e99f6 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
index 404b7c616d..a9b2cdd770 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
index 2bf34f84d4..a92ba76870 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
index 91ae1fdd21..b25aa12a2f 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
index c9ff36690e..d0c00e6c20 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
index 0591f35d9d..92d4d7cc59 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
index b391064e2d..694a8e61cd 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/B b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/B
index de2851aa96..2e1a5bbdb1 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/B
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/B
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/U b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/U
index 410fa3cf4f..d82225ffe7 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/U
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/p b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/p
index 1331039982..439671fea0 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/p
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/pB b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/pB
index 4cfd5fa7ec..d80cf76d18 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/pB
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0.orig/pB
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
index f421c0ef7d..3ac870a3b7 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
index f4a2d832b9..27b7569060 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
index 1694f9476f..fe0c4bd6bf 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/decomposeParDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/decomposeParDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
index 372f720010..80fc38552a 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
index bde264a4a6..445701ff41 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/sample b/tutorials/electromagnetics/mhdFoam/hartmann/system/sample
index 2585066859..5de05cc941 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/sample
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/sample
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/0/V b/tutorials/financial/financialFoam/europeanCall/0/V
index e13e8f3a5f..54d0e845ce 100644
--- a/tutorials/financial/financialFoam/europeanCall/0/V
+++ b/tutorials/financial/financialFoam/europeanCall/0/V
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
index 59ad7ed0e0..69ad1397dd 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
+++ b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
index f7870f1660..c876aac09b 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict
index c07c338262..7aaacd91f9 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/controlDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSchemes b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
index 1d88e55d3c..c130bd453a 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
+++ b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSolution b/tutorials/financial/financialFoam/europeanCall/system/fvSolution
index 168cebc71f..9cfbd14fb4 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/fvSolution
+++ b/tutorials/financial/financialFoam/europeanCall/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/Us b/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/Us
index e80ffa7aac..2109e85c39 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/Us
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/Us
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/h b/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/h
index acc70910c7..84f722fa22 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/h
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/h
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/manningField b/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/manningField
index 72f62e14a2..c98becd90a 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/manningField
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/manningField
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/g b/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/g
index 319a516a0b..32f438cd65 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/g
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/transportProperties b/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/transportProperties
index 6d1e3eaf0e..03eff25b7e 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/transportProperties
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/blockMeshDict b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/blockMeshDict
index 1545096fec..a23ae10d36 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/blockMeshDict
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/controlDict b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/controlDict
index e4676d835a..eafcaf9cfe 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/controlDict
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/decomposeParDict b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/decomposeParDict
index 05673ffdfc..6020aef9e8 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/decomposeParDict
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition
index 2ffc89d8ba..07bf07abe2 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSchemes b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSchemes
index 4496f08161..9b7fe7125f 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSchemes
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution
index 94ba9eddd5..9afb0bbda6 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSolution b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSolution
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/setFieldsDict b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/setFieldsDict
index 5a85687929..d5ce92d8a2 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/setFieldsDict
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cs b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cs
index ff8fe10c4c..270d2209a3 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cs
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cvf b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cvf
index 71f92652c2..0f182bc6cf 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cvf
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cvf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/U b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/U
index 83f105da2f..f35c5e8e27 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/U
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict
index 68bec8b87c..3d746f2509 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/decomposeParDict b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/decomposeParDict
index 5c768e4ef8..cf1b298b27 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/decomposeParDict
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition
index 7d3b937f59..83a333c13b 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSchemes b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSchemes
index b7becb4651..d6c52dd00d 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSchemes
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSolution b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSolution
index 734bc7d2b7..bac2f7ec74 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSolution
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSchemes b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSchemes
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSolution b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSolution
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Cs b/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Cs
index 697ea4aeb4..77e03b47c4 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Cs
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Cs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Us b/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Us
index 288379a59a..f5f3e0e204 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Us
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Us
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/constant/transportProperties b/tutorials/finiteArea/surfactantFoam/planeTransport/constant/transportProperties
index 4b52e3056e..2022f1d1b3 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/constant/transportProperties
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict b/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict
index de6f18dae2..cceb0968e8 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/controlDict b/tutorials/finiteArea/surfactantFoam/planeTransport/system/controlDict
index 6e495ac259..d08020b615 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/controlDict
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict
index 05673ffdfc..6020aef9e8 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4 b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4
index 9ec399e378..ec9d4e85b6 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8 b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8
index 98a535f72b..b6f5f55a79 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/decomposeParDict-procBoundary8
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition
index ac314939d3..36ceba9e4a 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSchemes b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSchemes
index e1044318a9..bad82f7f93 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSchemes
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSolution b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSolution
index 372612b2f1..aaf53df891 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSolution
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes b/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSolution b/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSolution
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/T b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/T
index 66bbf22e9a..9c8f616d30 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/U b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/U
index 877603943f..2e1466d094 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/alphat
index 2b5cedabe1..83c15ddd68 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/epsilon
index 676e74eb3d..e5dc618176 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/k b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/k
index 64338d7c4e..26413fde73 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/nut b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/nut
index 521b94d6dc..a1107cc5f4 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p
index e167d63e6e..9356aae190 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p_rgh
index 1975c76259..af6bf90062 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/g b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/transportProperties
index 420adceebd..00c81005bc 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/turbulenceProperties
index 59c47c40d3..0cbe87bba1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/blockMeshDict
index 222b9edbe7..8395f39ab0 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/controlDict
index d4ebeef101..ffcce485ba 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSchemes
index 495a577965..bbf979f8d7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSolution
index cf0123f995..45bf9cb4ec 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/T b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/T
index b502032d72..520a4419eb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/U b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/U
index ff6f660ea5..53e1191336 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/alphat b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/alphat
index ae8bb95625..50e7d9ad40 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/epsilon b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/epsilon
index c327900a73..670b597cf0 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/k b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/k
index f810a3daa1..0ec0fe4838 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/nut b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/nut
index d93ee2b1d5..549d2dfb91 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p
index 8d2bc974f7..3e00aed553 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p_rgh
index 730f40b51c..3d770338b7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
index 09234c855b..cca30b4b50 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
index 906d89f982..dcc34c5ca1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
index bf09059d49..f4abbff16b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
index d2f4494d55..a57f3fa3b1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
index 3c5e0a3dd3..57f79dea70 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
index 32cae225e8..0e7a101e40 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/T
index b502032d72..520a4419eb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/U
index ff6f660ea5..53e1191336 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/alphat
index ae8bb95625..50e7d9ad40 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/epsilon
index c327900a73..670b597cf0 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/k
index f810a3daa1..0ec0fe4838 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/nut
index d93ee2b1d5..549d2dfb91 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p
index 8d2bc974f7..3e00aed553 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p_rgh
index 730f40b51c..3d770338b7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
index 09234c855b..cca30b4b50 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
index 906d89f982..dcc34c5ca1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
index 5f0481e268..e3f89f17cd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index fb1ea50dad..7b687ec8d9 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
index c91102aca5..7809a3ee2d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
index 32cae225e8..0e7a101e40 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/T
index 8c26901cf0..d4995531d8 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/U
index f2420f34fb..562b947a93 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/alphat
index 5c9d789eb8..a8502f4bf9 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/epsilon
index e54c5f1f80..c5185ca9c2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/k
index 75ddc6f98f..2a804daa96 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/nut
index 3fc073f03a..8dfea82aed 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p
index b8550752a8..2bf42102be 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p_rgh
index b3e04bb1f6..f0f0dd6a8d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
index 09234c855b..cca30b4b50 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
index 9fde359d17..d7bd00d283 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 9e5e5d3ef2..3f40cc9937 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
index f9b108d808..cac126a2fb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 567d5dc2cf..1295c7e16b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
index 41310da59b..181616432e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 68629b1644..e8a74b98df 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
index f4684b4925..7650be478c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
index ff6f660ea5..53e1191336 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
index c27364375d..ceeb8f3ecc 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
index c327900a73..670b597cf0 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
index f810a3daa1..0ec0fe4838 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
index d93ee2b1d5..549d2dfb91 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
index b28febeaba..47cf66949f 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
index 89ff134597..00398d1587 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index 087e6a45fa..969499a805 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
index 906d89f982..dcc34c5ca1 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
index 3d670fd3f0..b3206af8a4 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
index ac527a8d37..3b565bc6ed 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
index 71455926fc..6fd2db90b4 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
index 32cae225e8..0e7a101e40 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/IDefault b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/IDefault
index 9278329a04..923b2b5c16 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/IDefault
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/T
index d519e31773..2a055fd3c8 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/Ts_ceilingShell b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/Ts_ceilingShell
index d2cd922591..2e9e36be02 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/Ts_ceilingShell
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/Ts_ceilingShell
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/U
index ecb4ec7640..1d354049fe 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/U
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/alphat
index 768efe0ee4..42fc33b34c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/alphat
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/epsilon
index dcd0cfcf6f..c36b7b4431 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/epsilon
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/h_ceilingShell b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/h_ceilingShell
index ae33b1301d..26a5a6bb98 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/h_ceilingShell
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/h_ceilingShell
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/k
index f078206456..0499e1c850 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/k
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/nut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/nut
index 1077f0f716..5490da869c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/nut
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p
index c7609b355c..7c5e535903 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p_rgh
index 118d32f7e2..fe3eb2e22c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/boundaryRadiationProperties
index a10c0a753f..c55084729f 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/g
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/radiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/radiationProperties
index fb59f6b9e8..82bb4d98a4 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/thermophysicalProperties
index 12154ce6d6..23cf3e5eff 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/turbulenceProperties
index dad2cedc6a..9ae32e649a 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/blockMeshDict
index eb48498005..b6934220b1 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/controlDict
index 4e138f19f3..3c2956c930 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/createPatchDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/createPatchDict
index f650b677b7..2bda469573 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/createPatchDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/decomposeParDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/decomposeParDict
index dbce94389b..defafa3aa9 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/decomposeParDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition
index 41900408d3..ab37582b1d 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faOptions b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faOptions
index 02f27e011b..a5476969fc 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faOptions
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSchemes
index 6745002ee2..00d318d540 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSolution b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSolution
index 226d7e8379..64abcae9a3 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSchemes
index b472323b65..f83a596eae 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSolution
index 9687ebf066..f6e11b51cd 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/topoSetDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/topoSetDict
index c0ede11eb9..e316389030 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/topoSetDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomWithThermalShell/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/IDefault b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/IDefault
index 87d744de93..9618d380ca 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/IDefault
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/T b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/T
index a10a15a8c7..f4b8f2b805 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/U b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/U
index da8cc9ff98..d5c9855c30 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/U
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p
index b9e6f9e813..56893fab02 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p_rgh
index 9b3e0e7095..f45ca0ceaa 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties
index cffe650398..98ef010f73 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/g
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties
index 8d3b68c73b..043962f24b 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/blockMeshDict
index fba3722415..0e0f42d61f 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/controlDict
index 8e01416572..b3433867cd 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSchemes
index 01cd659d18..6d55b0abc2 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution
index 78819083a3..69cc53752a 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/T
index efcf655d78..7013ee31bd 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/U
index 426717728e..f5804ccaf0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/alphat
index af0809c537..800573a420 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/epsilon
index 72de055426..8e85892ea2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/k
index 0d18fa6ea0..7022c2d55b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/nut
index 4517fc8f45..66ddb94734 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/omega b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/omega
index 6db8c1c690..9c040679e3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/omega
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p
index 68ee578985..6bd5c04406 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p_rgh
index 7122b33c39..35f9ca1788 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 5016ecab1f..9b540f319f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
index 32ce249f12..0384a2497c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
index 3d426a63ca..4f96596fad 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index 8c8c4fa0a9..1702b1f9dd 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
index 0023fd94bb..413538d909 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample
index aef4f9a890..353ca99481 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T
index f43c60672b..75f209f1a0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U
index ab471a2ef2..9f0a1c1d69 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat
index e6d64d395c..42055179fa 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q
index 120f6413be..ed0042d8f4 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/Q
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
index a5eaf62a71..78c1cb3ae8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/p
index f71dd4efa0..dc36d019ee 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon
index ab070c5268..90c4ed5a98 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
index 628e675635..c24f790fee 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
index b3e4df395c..2551c025ff 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
index 7bae6b762e..ecf7922709 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
index 23c32b64a2..772bf80a7f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel
index 47babbe6eb..b64cf46538 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
index 8417bba9c2..8ae793cb46 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/wallBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/wallBafflePatches
index a50d8be6ac..5f73ce928c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/wallBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/wallBafflePatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k
index f0952c8937..646bd7e082 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut
index d779aab8e9..4f2b84e259 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p
index dd2c1b52ab..7472610452 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh
index 8bdc3178e1..fd2eee3f02 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
index 5016ecab1f..9b540f319f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
index f0a1b766d8..607c432e6d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
index 1dfb558d10..1c56e65d54 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
index 8e2919ef90..b9c33d795d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
index 3649822058..c78203810c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
index 75b133fb7f..77a55fdabc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
index 099d305bc0..002ce386af 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution
index 656ad2cb36..5d6f6097a0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/DR b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/DR
index ba01883eea..0866de24f2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/DR
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/DR
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PMV b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PMV
index 46006a6108..5c1d46f595 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PMV
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PMV
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PPD b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PPD
index 5fb5d7d801..380600f966 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PPD
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/PPD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/T
index 14b36c925b..4fed43d13b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/U
index 1869c36d69..41f962cd14 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/alphat
index 9c89c03b22..b5954fc453 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/epsilon
index 004a382d51..a668102233 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/k
index f894a0f058..59c548d6ce 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/nut
index eb0cbf1afe..6f24151ac1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p
index 58356fc2b6..7591872697 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p_rgh
index 6455c59d5e..f964b3fb2f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/thermophysicalProperties
index 4e71944f1b..7f999f4b10 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties
index 3102a9ef20..9830e7ac2b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOage b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOage
index f984b607c9..55685f4a7e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOage
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOcomfort b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOcomfort
index 9199137dc9..0465da8d86 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOcomfort
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/FOcomfort
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict
index ef898a7631..bd5e42b3d1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict
index d02d0a478d..e0095264ae 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/createPatchDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/createPatchDict
index c09511d1a3..5ac4573c4d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/createPatchDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/decomposeParDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/decomposeParDict
index 6c8b2266fb..1b5ddcc14c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/decomposeParDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvOptions b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvOptions
index e2a124473f..4cd62c55e7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvOptions
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes
index c70418d4d9..f6713e0596 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution
index 71ee327530..08842a06be 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict
index 902fd289fd..d456f536f8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/G b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/G
index 9536e1c3de..ed5d5217da 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/G
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/T
index c68aa7bf84..19e9e1b98c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/U
index dfbdbf88a9..1d19df82bc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/alphat
index d1d90e6481..cc4c0a1e8d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/epsilon
index c8cae76e6b..74602b41a6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/k
index 2a8c101920..4d849523bf 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/nut
index a8d601e2f0..d866d9cc37 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p
index 81867bf65d..c679f6ea09 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p_rgh
index 7bd0e5344a..5749628dc7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties
index 8de815c8eb..58526aaa29 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
index bfa4d79bb2..3e0fb5584d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
index 087e6a45fa..969499a805 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
index 5d5d5429cc..98ab234aeb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict
index 14f859b7ae..12876dce5b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
index fccd2f5ec4..de422e73b6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
index 0bd3bfc8d3..d238ea0aa9 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/G b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/G
index 425bd81832..b373a1f12f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/G
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/IDefault b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/IDefault
index 0edb4e4f51..a584046a3f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/IDefault
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/T
index c68aa7bf84..19e9e1b98c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/U
index dfbdbf88a9..1d19df82bc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/alphat
index 9af91d9502..a2496a4fd1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/epsilon
index b6a8c021e2..b90025c40d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/k
index 2a8c101920..4d849523bf 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/nut
index 276aeb93c5..d794ef9420 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p
index 23cb6c2eef..f31c23f1f6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p_rgh
index 7bd0e5344a..5749628dc7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties
index cffe650398..98ef010f73 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
index 5ff94d7b9c..f797ef8b4c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index 087e6a45fa..969499a805 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
index 5d5d5429cc..98ab234aeb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict
index 1b647ecc15..780b1ec441 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
index 4185295262..f64bdec307 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
index 38e078c7f4..7f32fa1f13 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/T
index 71cee98def..b56bb9ab2c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/U
index 3fb1368d23..9fea1adddf 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/alphat
index df889b16d8..b27a38f826 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/T b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/T
index dfca96d9f0..a5e9996899 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/p b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/p
index f71dd4efa0..dc36d019ee 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/baffle3DRegion/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/epsilon
index 3724179f1b..ed0b9eee08 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/k b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/k
index 83f41504a3..75c10edf06 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/nut b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/nut
index b6713c2390..a8e696254d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p
index dd2c1b52ab..7472610452 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p_rgh
index 6b881d192f..3979fd6ae3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/thermophysicalProperties
index 5016ecab1f..9b540f319f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/turbulenceProperties
index eae82bb138..928f883847 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSchemes
index f0a1b766d8..607c432e6d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSolution
index 1dfb558d10..1c56e65d54 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/baffle3DRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/blockMeshDict
index 460888a128..d52147dcde 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/changeDictionaryDict
index 36d65cf3be..3296559501 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/controlDict
index 730e35d856..b6f93fab66 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSchemes
index dc7b268a8e..cb325defb2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSolution
index 0319d5ecbf..2b8e165dce 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/roomWithThickCeiling/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/T b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/T
index abc6af75dd..8f0d7410d2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/U b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/U
index 3950bda6af..fe917f583e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p
index 70b64840d1..1b115150db 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p_rgh
index 6c1200d294..efe9b9919f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties
index f2df7c4c66..042d34d7b0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/g
index 28fdc5fc45..24f5d0aeb6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/radiationProperties
index 41c9715f11..c882ddac2d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/thermophysicalProperties
index 416d95853c..2f73cb5dd9 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/turbulenceProperties
index bef362d56e..e436a41ceb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/blockMeshDict
index cad33bf697..93bcc68da4 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/controlDict
index f90addd98d..abece8df75 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSchemes
index 16d7a1e3f6..e62b305d5c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSolution
index bb7f442fff..437fd8dd68 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/meshQualityDict b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/meshQualityDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/snappyHexMeshDict
index ce82837cc8..6fb1ae6a74 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/surfaceFeatureExtractDict
index dc6683c92c..bef6798e89 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/T
index 4e6654bfbb..e5783af100 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/U b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/U
index 902aac3f45..55e4d5dec6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/epsilon
index da95144060..3b59291dd9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/k b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/k
index d0d3488caa..28c3887b2c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p
index 672d53759d..2f259d6ac0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p_rgh
index a286f4ef06..55a0df7148 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties
index 80579fe119..6fe9e0cf19 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/radiationProperties
index 336ca25977..a13d94bec5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/thermophysicalProperties
index b747928de4..a82ce62cf5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/regionProperties
index e1f8641b06..6cc4b46cf0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/blockMeshDict
index 37259cd515..edf328ef4e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict
index 2881092c42..568787a8c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSchemes
index fd5b9a5a02..b7d9c427b6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSolution
index fcce36e67f..c5675b46cb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/bottomWater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/controlDict
index 3bd628cca9..40f2c11027 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled
index 1ec8eb0faa..6f3d08dd88 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/externalCoupled
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/changeDictionaryDict
index de889873c1..19b12febc6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict
index 99b2f13ab1..ef89ba8781 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict
index 7ca4da1b41..fed7cfaf1f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topAir/changeDictionaryDict
index 9517461a3f..15fdb428a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict
index ee14429c49..923b0b2d67 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/G b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/G
index 66b96cb871..d8ba671da7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/G
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault
index 95d834912d..0cc43364fa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/T
index a86af6c731..e3c4cccc97 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/U b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/U
index 7fe9ab76a3..a2a9ad908b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat
index 266a92ecd3..53740442fe 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon
index 88f7d589b7..30a68f8aa9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/k b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/k
index 398366afe6..b798469e9f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut
index 2ffec00424..4c274bf727 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p
index d417eb0e07..cbbdb653af 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh
index b2cf78095a..12deaaa88d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr
index 4b2020c436..e0e8fb5f52 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/air/qr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T
index 22286bc8ea..2fef6f4207 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p
index 6e030a0cd0..ab7cc65c24 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/floor/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T
index d5edcf0195..e8f1da5929 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p
index c65d30dba8..4d7a7e92a4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0.orig/solid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties
index 1b67e19d06..97714df4e6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties
index 72afbbbb0e..b667399291 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict
index f2dcc52672..2844f4725e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/air/viewFactorsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/radiationProperties
index 5c8ba04583..97b97e6555 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/thermophysicalProperties
index 112e4ebba6..205cbea202 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/floor/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/regionProperties
index 4fa79679a2..ab7c9d64b6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/radiationProperties
index c0d0e29ca5..efb785ad20 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/thermophysicalProperties
index 752e062367..65fa1154dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/constant/solid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
index 193404c166..b542b563b3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes
index 8541e977d6..5b7b37a0f6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution
index 70b99699a5..e4a7032e35 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/blockMeshDict
index 9b255650bf..6f28ec1225 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict
index d8564db39a..5ef0e29eb9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/extrudeToRegionMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/extrudeToRegionMeshDict
index ce6ef9d78b..babcd39c7f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/extrudeToRegionMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict
index 5b320c18d0..eda70c23a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes
index 294d8e15a2..8ce6160864 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSolution
index 811cbb5c06..85c9dd7e63 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSolution
index 5c78eb7f3c..7031b319b8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict
index e5be603e0e..e81b794182 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSolution
index 396834d859..36c4f156c5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict
index c2b2023379..37eac24d09 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/T
index 4e6654bfbb..e5783af100 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/U
index 902aac3f45..55e4d5dec6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/epsilon
index da95144060..3b59291dd9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/k
index d0d3488caa..28c3887b2c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p
index 672d53759d..2f259d6ac0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p_rgh
index a286f4ef06..55a0df7148 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
index 80579fe119..6fe9e0cf19 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
index 336ca25977..a13d94bec5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index b747928de4..a82ce62cf5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
index e1f8641b06..6cc4b46cf0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
index 37259cd515..edf328ef4e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
index 2881092c42..568787a8c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
index 16a2fa3eff..b867515a62 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
index aef9b953ab..4dd81a5c8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index a822c9dd12..4bf3f491b4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
index a157847d70..b14caf2c12 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index de889873c1..19b12febc6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 99b2f13ab1..ef89ba8781 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 7ca4da1b41..fed7cfaf1f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 9517461a3f..15fdb428a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
index aef9b953ab..4dd81a5c8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
index ee14429c49..923b0b2d67 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/CH4 b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/CH4
index 948ad4de16..f8dd7ac450 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/CH4
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/N2 b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/N2
index 586121f067..45bcc350ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/N2
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/O2 b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/O2
index e7c3c5fea8..ff53de5ad2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/O2
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/T b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/T
index 0eee46f085..18c5ddb8a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/U b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/U
index e75aefb75d..bf91dfa898 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/Ydefault b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/Ydefault
index fbba80396e..9b0f5f0cb5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/Ydefault
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/alphat
index 098240d931..bce1a36392 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/epsilon
index c825ac9957..5e2e364c31 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/k b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/k
index d6866ce49e..50553ec903 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/nut b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/nut
index 4823bfa670..1fe4d346f1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p
index 746c7e081e..90fd9bb3be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p_rgh
index e24ddcc7fa..3a26e019f1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/gas/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/T b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/T
index 607f146cd3..d835599ff7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/p b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/p
index 529d179690..7ec5528dae 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/0.orig/solid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/chemistryProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/chemistryProperties
index be167a9096..9b7fb4619a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/chemistryProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/combustionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/combustionProperties
index 4c90a86154..aefd3a7898 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/combustionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions
index 805c9d8ef1..34c52dd6e1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/reactions b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/reactions
index bb88878dd1..a807300c14 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/reactions
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/reactions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermo.compressibleGas b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermo.compressibleGas
index f4b6c6139f..1ce614d5ca 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermo.compressibleGas
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties
index cf46036897..d5bcc634c7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/regionProperties
index f80e070d05..e43af92b1b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/thermophysicalProperties
index b747928de4..a82ce62cf5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/solid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/blockMeshDict
index be14ca796a..eb14c5bb4d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict
index a77e89e68d..5a4a383e4a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/decomposeParDict
index 03e30c74a1..00c7c215fc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes
index ee145b7ade..7988470257 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution
index dde68d74f4..b57c303d0b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
index c9b97d0f02..b2b4b3dfee 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSchemes
index 3da68c99cf..0dc8db77e7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSolution
index c4d6c66de1..81891a4613 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/solid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/T
index 5480f70d13..1dbf43a960 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/U
index f5a0c5218a..fad403f8a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/alphat
index 001f6b3d80..b7ac18ffe3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/epsilon
index c9440a0baa..1556332482 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/k b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/k
index 378d7b9e87..421c9611a7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p
index 413bdad3bb..cf76045498 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p_rgh
index 7ce9db1258..2e298370e5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/rho
index bc56ffa454..2b76288594 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/rho
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0.orig/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
index 14a1476a6f..4bb11997c9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index d558bc8c85..bb05483582 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
index 2445eb7dc6..a9179dfdae 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
index 37259cd515..edf328ef4e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index 1003021b82..94f67ca07a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index cd7bb9410d..da8814e23a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
index cb7afebffe..007b5777be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index 285b8cb010..ab474cc19c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
index 588424d5d2..421cf8a98e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict.6 b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict.6
index 589f2b0c72..b8c6e67935 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict.6
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict.6
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index e52ff15a8f..4ad04fb1ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 7614cf080a..3f54ce0ae4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index fe914a95e1..094c5fb4fb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
index f1e8aa661d..138d9507b4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index 03d709237c..9c51d2cbd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index ff465ab6fa..d06a873499 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
index cb7afebffe..007b5777be 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/T
index 0af0489a63..560f9fc2b5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/U
index 87e40d0238..2aed65f2d0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/alphat
index 50cc74c2f0..291a434670 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/epsilon
index 9540d9d516..b762b59527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/k b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/k
index a9ac835ffa..692ecc7347 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p
index 3a3b6f0f1a..28805c3e8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p_rgh
index 2f9cd150a4..236930cac4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/rho
index d9e3e9e3a0..a5ca650bec 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/rho
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/0.orig/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/turbulenceProperties
index 3eeaf7f423..3d9b82f999 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/bottomAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/g
index cc323c988f..e4c1d4f712 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/radiationProperties
index e2d4843b20..9d00a8bc8c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/thermophysicalProperties
index a18ea53e2b..63a0b706bd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/regionProperties
index f9c29782bb..9bc5afd0b8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/blockMeshDict
index 4a77f788ea..828971a115 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/changeDictionaryDict
index ae0447e901..4d058b03ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSchemes
index acdd421af8..706688a3e8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSolution
index 4845860739..ebb7a42b5e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/bottomAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/controlDict
index eff13bb3c8..2376b5f180 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/decomposeParDict
index 09b1a0f682..3bf2711c51 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSolution
index 89234aad1c..8e4000dfff 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/changeDictionaryDict
index 7a8a0b1586..4b6d97bf39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSolution
index 5897a50ff2..b99eb57aac 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/changeDictionaryDict
index 2f1b2f31d2..ec611ab733 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/fvSolution
index 5897a50ff2..b99eb57aac 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/leftSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/meshQualityDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/meshQualityDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/changeDictionaryDict
index 380cfda376..c1e28fb30c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/fvSolution
index 5897a50ff2..b99eb57aac 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/rightSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/snappyHexMeshDict
index 2b8115bdec..507c4f6992 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/surfaceFeatureExtractDict
index 03d709237c..9c51d2cbd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/changeDictionaryDict
index 4fa8b9921e..c49ee16f6a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/fvSolution
index 8148947905..f5ebecbbb7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1 b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1
index 23901f631b..0ae871e63a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/G b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/G
index 66b96cb871..d8ba671da7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/G
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/IDefault b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/IDefault
index 5f4de282e2..cc4f74bfe4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/IDefault
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/T b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/T
index a86af6c731..e3c4cccc97 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/U b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/U
index 7fe9ab76a3..a2a9ad908b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/alphat
index 266a92ecd3..53740442fe 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/epsilon
index 88f7d589b7..30a68f8aa9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/k b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/k
index 398366afe6..b798469e9f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/nut b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/nut
index 2ffec00424..4c274bf727 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p
index d417eb0e07..cbbdb653af 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p_rgh
index b2cf78095a..12deaaa88d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/qr b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/qr
index 778f9c2c23..6fa68d173f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/qr
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/air/qr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/T b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/T
index 22286bc8ea..2fef6f4207 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/p b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/p
index 6e030a0cd0..ab7cc65c24 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/floor/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/T b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/T
index d5edcf0195..e8f1da5929 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/p b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/p
index c65d30dba8..4d7a7e92a4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/0.orig/solid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/boundaryRadiationProperties
index 6f210b0493..8f6a70f9c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/radiationProperties
index 56e94d8219..9b6144fcfa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/air/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/radiationProperties
index ac2391baac..a2d9018db8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/thermophysicalProperties
index 112e4ebba6..205cbea202 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/floor/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/regionProperties
index 4fa79679a2..ab7c9d64b6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/radiationProperties
index 4d94575231..9c0345cab8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/thermophysicalProperties
index 752e062367..65fa1154dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/constant/solid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/changeDictionaryDict
index e043884944..501284f781 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSchemes
index c7d40d8681..ee4350ceb3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSolution
index c7a5924c03..d82f4dae56 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/topoSetDict
index 19655b2346..8fe25c7878 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/air/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/blockMeshDict
index 9b255650bf..6f28ec1225 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/controlDict
index 440e89d398..6b14f6c212 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/extrudeToRegionMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/extrudeToRegionMeshDict
index ce6ef9d78b..babcd39c7f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/extrudeToRegionMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/changeDictionaryDict
index 5b320c18d0..eda70c23a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSchemes
index 294d8e15a2..8ce6160864 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSolution
index 811cbb5c06..85c9dd7e63 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/floor/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSolution
index 5c78eb7f3c..7031b319b8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/changeDictionaryDict
index e5be603e0e..e81b794182 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSolution
index 396834d859..36c4f156c5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/solid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/topoSetDict
index 727aa747c2..49fcb30eb2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O
index b1b8cccedd..4753d4e036 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
index 32c8115a7b..37b925acab 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U
index a4145d9cdf..13785594c6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/alphat
index dd7a80d1e5..f41ae9d32d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k
index fcf7e11d3b..930b4d4904 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut
index 42e93f81ae..33e101fe62 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/omega
index 69d1b666fe..42ee24c06a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/omega
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p
index ce894af197..b5a9df39b0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p_rgh
index 5861e89f46..32d99085dc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
index 5ca18c995d..fac78c95a0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/p
index 94c7cf0cc6..e09b78f126 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties
index 084e4914b8..3071075f5b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties
index 7e76840100..6099493664 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties
index fd75653198..2f47b92b8c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict
index fab7e1df48..09e5bf0c88 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions
index 6901330d35..c3033367a3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
index f8c79e2819..f512123b3a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution
index bc53661240..24d2f39dfd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
index b512f678b6..b0fbb799aa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
index df40fcf7fa..7d9bbb9e1e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
index 997bcb1fe9..2b453edf44 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls
index 181dd51cb1..eba7a64210 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.0 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.0
index 7c7397ef36..a9ae862eaf 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.0
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.0
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.20 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.20
index 89e803943b..e95b425044 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.20
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.20
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.5 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.5
index cf7a3bdb44..95c14d2c18 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.5
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.60 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.60
index 181dd51cb1..eba7a64210 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.60
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/solverControls.60
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
index b33a34076a..183ca47757 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution
index b8080dd0f4..8a1b2f0c2f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
index 9e5d33945c..f403df9ace 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U
index c98e911b8a..bba39b6530 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat
index 4ebc9f7419..80c3740127 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k
index ee5b9a9d23..07adc62953 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
index d0deea15ab..3a4b0ff2eb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut
index d8096f43ec..c42446c76d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega
index a46fef1180..f1f2c309ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p
index fa38b6f7ae..cb26a59161 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
index 45875daa7d..af0d01c1e3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
index 30db4b3108..6dc07c1340 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U
index 8f7579648a..3cd141dc58 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat
index 863f2b258f..72d3bd0708 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k
index b8f71fec6c..9740b5b2c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut
index d9dca81c74..77c7977bbc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega
index cab41ce014..991e199470 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p
index f0b2ac498e..adfa132dd8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
index b6dbc3a501..7a64e931f4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
index daf997d025..d24749034f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U
index b8f5fee66c..f3cb498001 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p
index 4d4575bdb4..67f07f043e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh
index 5ace763c22..1368c223c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/thermophysicalProperties
index 02be46623c..f734a95636 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/cabin/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/thermophysicalProperties
index 02be46623c..f734a95636 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/exterior/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/thermophysicalProperties
index 2de01c87bc..73bf3013af 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/ice/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/regionProperties
index 4eac75f4b7..0a38d92139 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/blockMeshDict
index 6622f86794..485b5b1bdf 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes
index c3bf6012f1..e40d2446bc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSolution
index f0d484faf2..745dba7f20 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/cabin/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict
index d33de96652..a78808cb82 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/decomposeParDict
index c930f2efad..933b924ad4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes
index b48f98d2c1..5906e5b9fb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution
index 6d4ed2e9d4..b9c0d10fb9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/exterior/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSolution
index b0d4bcec4f..c7134b8d96 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvOptions
index 3fd99f8f64..486c997b5d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes
index e918fb3a8a..05ab36b2de 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution
index a1a47b385b..4ccb806e9e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/ice/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict
index b512f678b6..b0fbb799aa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/T
index 971a546fbe..4444144df4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/U
index 17d5e9f558..dce3274586 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/alphat b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/alphat
index 42fb49e41e..2d281ccc21 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/epsilon
index 701de03684..20613ec8a8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/k
index 840da9a03c..78cf5d1fca 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/nut b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/nut
index 23deddd201..f71e4e61cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/nut
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p
index 9af33ed5e3..0d8311bed8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p_rgh
index f2b25f43ca..7cbddb01cc 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/domain0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/T
index 5a9882aeb2..24cb2bacfa 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/p
index 78283e7208..863a360fac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_CPU/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/T
index 99208a90be..4e56f28efb 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/p
index a9dbb0d957..1a741cfb44 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/0.orig/v_fins/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/MRFProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/MRFProperties
index ddefece216..a5683a8850 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/MRFProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/thermophysicalProperties
index 945008cca0..73329e9b04 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/turbulenceProperties
index d68c1c2215..88a1339084 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/domain0/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/g
index 81dbc58f10..f1af05bc1d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/regionProperties
index 225e5168d2..25abdf473f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_CPU/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_CPU/thermophysicalProperties
index 1bbcd65883..ce8e05e6c4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_CPU/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_CPU/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_fins/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_fins/thermophysicalProperties
index 1bbcd65883..ce8e05e6c4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_fins/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/constant/v_fins/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/blockMeshDict
index 349527914b..c7ec517670 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/controlDict
index 357cae9bec..e62fb2944a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/createBafflesDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/createBafflesDict
index e4a1d4fe38..b41fe05600 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/createBafflesDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/decomposeParDict
index 39a94df24b..995f05cb60 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/decomposeParDict
index 28fc768a65..a407685b24 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSchemes
index 52f7bdf4da..7349c5e0a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSolution
index 6e5948254b..e848ee87a7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict
index de2c880f7f..8acda894f7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSchemes
index 765b94c8a1..77bd9b34e0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSolution
index db0b77b604..96580074d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/meshQualityDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/meshQualityDict
index 0a15eba1dc..76aef08188 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/meshQualityDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/snappyHexMeshDict
index cc6db3f58e..65ad25fc0f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/surfaceFeatureExtractDict
index 854a0181b8..e511168086 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1
index 1950a51a62..620bc9043b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/decomposeParDict
index d2f7d81c2f..0d23eb26a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions
index 6be86e8a0c..ac64c6e872 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSchemes
index 222c6292b3..2ef3ec4ca6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSolution
index 0cfb44ab86..bf1080ca53 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/decomposeParDict
index d2f7d81c2f..0d23eb26a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSchemes
index ebbe23e3ad..fa626c44e7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSolution
index 64ba7f4c11..76bfda760b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_fins/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/T
index 4e6654bfbb..e5783af100 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/U
index 902aac3f45..55e4d5dec6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/epsilon
index da95144060..3b59291dd9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/k
index d0d3488caa..28c3887b2c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p
index 672d53759d..2f259d6ac0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p_rgh
index a286f4ef06..55a0df7148 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties
index 80579fe119..6fe9e0cf19 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/bottomWater/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/radiationProperties
index 336ca25977..a13d94bec5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/thermophysicalProperties
index b747928de4..a82ce62cf5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/regionProperties
index e1f8641b06..6cc4b46cf0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/blockMeshDict
index 37259cd515..edf328ef4e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSchemes
index e6c2dbef82..dd6d91feb4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSolution
index cf92d41b35..c6acd9cefe 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict
index 2881092c42..568787a8c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSchemes
index 16a2fa3eff..b867515a62 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSolution
index d9f05ad161..b37bae6b26 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/bottomWater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/controlDict
index e25539da95..7e7b39009a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/decomposeParDict
index a96e39618d..41d54adefd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled
index 0316737791..49c60517d9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/externalCoupled
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSolution
index 7986e5e1f1..fd9c67f3f9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/changeDictionaryDict
index de889873c1..19b12febc6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSchemes
index 70b47f1626..0f60b0011b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSolution
index 8feada1dd9..84a6eda410 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict
index 99b2f13ab1..ef89ba8781 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/fvSolution
index 8feada1dd9..84a6eda410 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/leftSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict
index 7ca4da1b41..fed7cfaf1f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/fvSolution
index 8feada1dd9..84a6eda410 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/rightSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/changeDictionaryDict
index 4aa87489ec..632a6484c0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/fvSolution
index cf92d41b35..c6acd9cefe 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict
index d9bc4afe76..32d8f03633 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T
index 0cd5e86596..fe8908f277 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U
index 6f71d8e083..48981946ac 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat
index 2c7feb99c7..a2c0f43a7e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon
index d81291ffe5..11a09e4e49 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k
index 031a428d7f..690ed24645 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut
index d33e9c283b..e85583619a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p
index 7bf5a2a8d0..e93f905620 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh
index a80b25e2ff..c9f015a1bd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV
index d140c7e749..6833a6cea2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T
index 5345db3788..cbcdfda030 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U
index b0466b8b67..48054f5a66 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/htcConst b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/htcConst
index 3ff7e420d4..ea50d9420e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/htcConst
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/htcConst
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p
index 8c5bffca28..a412194177 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
index 060ec183eb..ea58fcce56 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
index 252f502c23..d45d945f58 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index ba7b0e7f13..8b23534cf9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
index c1c926c4a6..08ec44f1f5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/g
index 22200636ec..b7f49ddc82 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 867780a342..9f6fe5db58 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
index a65e4e52ea..5a0aa4789b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
index 005aaf11ce..b1beb18dd2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
index adeb90bfb6..f709e0f689 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
index 4a31f15055..ce01640d47 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
index 51f9e822f6..24744b0164 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
index 3294126661..8a04626d29 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
index 16ba097f95..e97bfbe1f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
index fbbc32ca45..9716e0f344 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
index 0fbaa2a9d9..0fc0f9b02b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
index 324595327f..86af3d4908 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
index 51f9e822f6..24744b0164 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
index 34b4d2044e..8d7eac765a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
index 9c95e40638..36065abe02 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
index 6e8f288ab4..86b6ba7fb9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/T
index 66bdda4a44..954b0d5c18 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:V b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:V
index f3ae0a0e12..3c2c28a45e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:V
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:V
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:sigma b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:sigma
index e009b30835..eed4648a2c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:sigma
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/jouleHeatingSource:sigma
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/p
index 69833b486b..fe1c5896e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/0.orig/solid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/regionProperties
index 94bd4786cf..156e8fd73d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/solid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/solid/thermophysicalProperties
index 1c995d3897..3883c5ef3e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/solid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/constant/solid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict
index b2c43015f5..7bafc98986 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/fvSolution
index d53dd2a2b1..ed0186bc36 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/blockMeshDict
index a90e51f19a..d2694ce85d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvOptions
index ab7ccb198b..53a2a9a7c3 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSchemes
index cd66c3072d..413c1b98d7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSolution
index 41ac132008..189b0e232d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/solid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/G b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/G
index 516730683a..b73a4ea288 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/G
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/IDefault b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/IDefault
index 8452a4c575..74417078b0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/IDefault
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/IDefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/T
index 4e6654bfbb..e5783af100 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/U
index 59d907da6a..9c2154cdbe 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/epsilon
index da95144060..3b59291dd9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/k
index d0d3488caa..28c3887b2c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p
index 672d53759d..2f259d6ac0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p_rgh
index a286f4ef06..55a0df7148 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/qr b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/qr
index 7d53a58eeb..3e1e9bf56c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/qr
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0.orig/qr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties
index 6b44b73a44..ed29d49be3 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
index 104c6e803e..0d5479ee97 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
index f9f9ddbb76..d6af4f8a1c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
index 628348f766..cec05a9f79 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 112e4ebba6..205cbea202 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
index 2445eb7dc6..a9179dfdae 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties
index 103ecba8a4..8952f4431b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
index 1556ccd9c9..dea44ce17d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
index 37259cd515..edf328ef4e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index fa3cfcdd60..1ca8b855d0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
index e6c2dbef82..dd6d91feb4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
index cf92d41b35..c6acd9cefe 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
index cf69aabc57..8a0b94e4c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
index b9e484d11f..050e00f48a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
index db0b77b604..96580074d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index 2d6bc03012..7957529546 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
index 70b47f1626..0f60b0011b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
index 8feada1dd9..84a6eda410 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index 4e91540b87..df89164182 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
index 8feada1dd9..84a6eda410 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index be200e749d..3acb9706c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
index 8feada1dd9..84a6eda410 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index 84f593a658..321db4d599 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
index cf92d41b35..c6acd9cefe 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
index f8d2df1d35..c73a9d4dcb 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/T b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/T
index e56ae68f44..23e54b7aeb 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/T
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/p b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/p
index 18559b4fbf..4ab64c264e 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/p
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/solid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.gas
index 77b67f1d59..da5e6c18c9 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.liquid
index 2bfe66c1df..8bbbdbfb92 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.gas
index be8951d120..db859de164 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.liquid
index c6c94658cf..86be2e8b84 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.gas
index 487b9b94b0..b0dad9543e 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.liquid
index 60980463a5..0fd650f4f2 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.gas
index 56be5f3b95..6ea15dc0e2 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.liquid
index 5dc2d74cde..1ee2ea4487 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/alphat.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.gas
index 26591c23ff..656a5a0dc3 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.liquid
index eb2475a4a9..3f5a99e3e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/epsilon.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/f.gas.bubbles b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/f.gas.bubbles
index 07a786d509..5bd007a7d3 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/f.gas.bubbles
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/f.gas.bubbles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.gas
index 8a8df20e00..e06369b4c0 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.liquid
index 755831e4ba..047681fc66 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/k.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.gas
index 496201b3dc..153c4db913 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.liquid
index ac8e8fc93d..3b96d5cd0e 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/nut.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p
index 746c7e081e..90fd9bb3be 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p_rgh b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p_rgh
index 6e3e8893c0..0d0e4c24ab 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/0.orig/water/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/g b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/regionProperties
index 5ac0a49552..06646d7073 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/radiationProperties
index 336ca25977..a13d94bec5 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/thermophysicalProperties
index d7c46bdc6a..cbc01c26e1 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/solid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/fvOptions b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/fvOptions
index 6ecdad037c..c8ef561956 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/phaseProperties b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/phaseProperties
index 38036e61b8..60428ccd13 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/phaseProperties
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.gas
index 89fdbe0e55..28a92fc013 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.liquid
index e064c6d492..07d5c1168c 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.gas b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.gas
index b906eea1c9..320e317308 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.gas
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.liquid b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.liquid
index 4d2bf70249..5934f5519a 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.liquid
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/constant/water/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/blockMeshDict
index f9210beccb..31d7fe70ca 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict
index 3ec235041b..2547824293 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/decomposeParDict
index 7cfa30a9ca..a0030af071 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/changeDictionaryDict
index 61e83be91c..80319a523a 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSolution b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/solid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/topoSetDict
index 6d9ce4855f..461b2f983e 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/changeDictionaryDict
index b7b648b07f..eb114588db 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSchemes b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSchemes
index 7c5cb51891..95ae4609a6 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSolution b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSolution
index b340bbefad..c46df4983e 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/setFieldsDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/setFieldsDict
index 97716970ed..e211950898 100644
--- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/setFieldsDict
+++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/water/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/T b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/T
index 7b29fbcf76..a5d267c902 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/T
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/U b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/U
index 7bc63ea18b..f4405548b7 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/U
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/alphat b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/alphat
index f4fd206614..b0b62e898c 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/alphat
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/epsilon b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/epsilon
index 02d6483ff4..acd2aeae7b 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/epsilon
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/k b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/k
index f3640f52f7..a281c192da 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/k
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/nut b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/nut
index e9cef90471..0f9053b9cf 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/nut
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p
index 732886058e..c331a4d2b8 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p_rgh b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p_rgh
index d66b584d31..413a79af81 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p_rgh
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/pointDisplacement b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/pointDisplacement
index 00daacefa0..3f70e4c481 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/pointDisplacement
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/zoneID b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/zoneID
index 09761e7ba5..1dc9fd995c 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/zoneID
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/dynamicMeshDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/dynamicMeshDict
index 703413b77e..d43a7c2d07 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/dynamicMeshDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/g b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/g
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/thermophysicalProperties b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/thermophysicalProperties
index e1cf0b02cc..e920d764b8 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/turbulenceProperties b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/turbulenceProperties
index 23b8869bfa..3b565d8e0d 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/blockMeshDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/blockMeshDict
index 7a86940187..5667bca255 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/blockMeshDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/controlDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/controlDict
index 803a6671e4..a552100a7f 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/controlDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict
index 3f00ac51e1..5630f5a478 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSchemes b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSchemes
index ffcf09fed2..bd86c5b1e0 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSchemes
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSolution b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSolution
index 5c69ac5658..9db7bac94e 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSolution
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/setFieldsDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/setFieldsDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/topoSetDict b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/topoSetDict
index 8c92ffbbec..3a4d1b74db 100644
--- a/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/topoSetDict
+++ b/tutorials/heatTransfer/overBuoyantPimpleDyMFoam/movingBox/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/0/T b/tutorials/heatTransfer/solidFoam/movingCone/0/T
index dd0ed9d3b1..9b3220671b 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/0/T
+++ b/tutorials/heatTransfer/solidFoam/movingCone/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/0/U b/tutorials/heatTransfer/solidFoam/movingCone/0/U
index c69b450e7e..05003e916e 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/0/U
+++ b/tutorials/heatTransfer/solidFoam/movingCone/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/0/p b/tutorials/heatTransfer/solidFoam/movingCone/0/p
index a43c76b1ec..dc1f8f176a 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/0/p
+++ b/tutorials/heatTransfer/solidFoam/movingCone/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/0/pointMotionUx b/tutorials/heatTransfer/solidFoam/movingCone/0/pointMotionUx
index 2dc37c4386..1e9e312fd0 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/0/pointMotionUx
+++ b/tutorials/heatTransfer/solidFoam/movingCone/0/pointMotionUx
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/constant/dynamicMeshDict b/tutorials/heatTransfer/solidFoam/movingCone/constant/dynamicMeshDict
index f7de446eef..2535ad9991 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/heatTransfer/solidFoam/movingCone/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/constant/radiationProperties b/tutorials/heatTransfer/solidFoam/movingCone/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/constant/radiationProperties
+++ b/tutorials/heatTransfer/solidFoam/movingCone/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/constant/thermophysicalProperties b/tutorials/heatTransfer/solidFoam/movingCone/constant/thermophysicalProperties
index d558bc8c85..bb05483582 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/solidFoam/movingCone/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/system/blockMeshDict b/tutorials/heatTransfer/solidFoam/movingCone/system/blockMeshDict
index 36a9952f96..e942deec71 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/system/blockMeshDict
+++ b/tutorials/heatTransfer/solidFoam/movingCone/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/system/controlDict b/tutorials/heatTransfer/solidFoam/movingCone/system/controlDict
index 5915372e36..d37d184542 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/system/controlDict
+++ b/tutorials/heatTransfer/solidFoam/movingCone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/system/fvSchemes b/tutorials/heatTransfer/solidFoam/movingCone/system/fvSchemes
index de3f9a7f87..9838688c95 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/system/fvSchemes
+++ b/tutorials/heatTransfer/solidFoam/movingCone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/solidFoam/movingCone/system/fvSolution b/tutorials/heatTransfer/solidFoam/movingCone/system/fvSolution
index aad77c10ee..105750885c 100644
--- a/tutorials/heatTransfer/solidFoam/movingCone/system/fvSolution
+++ b/tutorials/heatTransfer/solidFoam/movingCone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/Urel b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/Urel
index 53ec0ada36..0ab48db3f7 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/Urel
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/Urel
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/epsilon b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/epsilon
index bbb0fdb1df..27162246e4 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/epsilon
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/k b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/k
index 215a4434ec..b4b99bc57a 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/k
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/nut b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/nut
index b86bbb8329..8eb6c9bee4 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/nut
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/p b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/p
index 7f592eff75..e348e82a29 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/p
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties
index 05cd117611..e8198c2dde 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4 b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
index 21fde7a35f..593c73ae38 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict
index 7582ce3472..1c87aaa8bf 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
index 0e313344ec..d2ee836a36 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
index c09bf15203..2c4ffb8eb6 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
index aab45ff7e9..6923012a86 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
index 6ec5ef3b8a..31ea674fa4 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/k b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
index a7fcc1bf24..ea5b80417f 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
index 878d208d0e..f9b656766d 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
index 42fbb617de..5759acbb4d 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/p b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
index 7353abe51b..a726cafaea 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties
index 0a1be22cec..9a522f4f20 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict b/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
index 811aacbf14..15973da2ba 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict b/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict
index 3cc14965e6..9692b99133 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
index 87c1afddf1..5a6e99c6cc 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
index 85d447796a..d9dab3a1b2 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/U
index 58cc8690a1..6ddbb44c2d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/Ua
index b44ec00061..8418a66a52 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/fixedInlet b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/frontBackUpperPatches b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/frontBackUpperPatches
index 3b9d18028b..55be3e502c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/frontBackUpperPatches
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/frontBackUpperPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/initialConditions b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/initialConditions
index 040bf4a5e7..bfae952ada 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/initialConditions
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuTilda
index 0fd11a6182..f3a4ddb13e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuaTilda
index 3ad2939608..161b266194 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nut
index 6f7dff5ea7..c218fe63b6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/p
index 9316485d69..47624d32a3 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/pa
index cc47a3c576..8ab71c69b0 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/adjointRASProperties
index a8e089bdcf..a6ff79f328 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/turbulenceProperties
index bd62042765..ea3f0f04bd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/blockMeshDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/blockMeshDict
index b0a2e850e7..521df2290a 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/blockMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/controlDict
index acc69de020..3b23e8698c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/decomposeParDict.20 b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/decomposeParDict.20
index 023595e372..e7b05a8851 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/decomposeParDict.20
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/decomposeParDict.20
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSchemes
index 037db4bdba..b37c8932c9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSolution
index d255494c9d..ecd15e18d9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSchemes
index f96d915a11..f7c1feee70 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSolution
index bb5899bfb7..888b5d2040 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/meshQualityDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/meshQualityDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/optimisationDict
index 4d125d76f1..4b831c0f71 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/snappyHexMeshDict
index 0096bdf7fe..318b3f25f7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/surfaceFeatureExtractDict
index 7952ec94df..a34c88a5ae 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/motorBike/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/U
index 1039afb759..d8537a8039 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/transportProperties
index 8ad80c6f44..6cd7eac19c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSchemes
index 43c16ec4b8..61d7d544aa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSolution
index 7661969f8b..0cf47221cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/optimisationDict
index 5fe0136084..31b902b7d9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/drag/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/U
index 1039afb759..d8537a8039 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/transportProperties
index 8ad80c6f44..6cd7eac19c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSchemes
index 43c16ec4b8..61d7d544aa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSolution
index 7661969f8b..0cf47221cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/optimisationDict
index e7fc4419fc..dee8234a76 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/lift/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/U
index 1039afb759..d8537a8039 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/transportProperties
index 8ad80c6f44..6cd7eac19c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSchemes
index 43c16ec4b8..61d7d544aa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSolution
index 7661969f8b..0cf47221cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/optimisationDict
index 2bb8a2a6cf..59a3b2268c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/laminar/moment/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/U
index 170eb4b28a..bf61310fee 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuTilda
index 85d4f885e5..808e99371e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuaTilda
index e9c3ad7ae0..09abe1cf27 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nut
index 52e1903804..ac02f3d8ee 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/adjointRASProperties
index 5f8b5054e4..86db820f5d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/transportProperties
index e8ba3a7256..8546046708 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSchemes
index 7e792fe366..be4624c623 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSolution
index 8259f51d95..cbe4af8d72 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/optimisationDict
index 77336a3b8b..bf0f6f3427 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftFullSetup/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/U
index 170eb4b28a..bf61310fee 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuTilda
index 85d4f885e5..808e99371e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuaTilda
index e9c3ad7ae0..09abe1cf27 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nut
index 52e1903804..ac02f3d8ee 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/transportProperties
index e8ba3a7256..8546046708 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSchemes
index 7e792fe366..be4624c623 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSolution
index 8259f51d95..cbe4af8d72 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/optimisationDict
index fd481a9ae9..b4b5f2512b 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/naca0012/turbulent/liftMinimumSetup/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/ma b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/ma
index 9ed27fe6fc..8896a4bd68 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/ma
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/ma
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSchemes
index 646780ec0c..340889b234 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSolution
index d66bf80811..c162c57353 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/optimisationDict
index 537800df62..220f2f7c57 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/laminar/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nut
index daab5582c6..275e71e285 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSchemes
index 247ea90d44..8361544008 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/optimisationDict
index 51f1b458b6..398f6fe2a2 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/highRe/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/U
index 2b8539c9e7..5797045ff4 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Up2 b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Up2
index 2a7baee86a..1d94ab5f7c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Up2
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/Up2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/controlDict
index 827ca7cafe..fcd9e03717 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSchemes
index 3941fac24b..abc3716ffe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSolution
index 7521cf9780..3128b2378d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/optimisationDict
index 6b5c1ecfa9..a60e75897e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/multiPoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSchemes
index 247ea90d44..8361544008 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/optimisationDict
index 51f1b458b6..398f6fe2a2 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/sensitivityMaps/sbend/turbulent/lowRe/singlePoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/U
index 7cddb72856..d31331e2cb 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/Ua
index edf088e815..edee0635cd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/p
index 26ac19b7c3..cf41fc357e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/pa
index 82c948f2a6..fae932d1be 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/0/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/adjointRASProperties
index f726a61d70..161ad9f638 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/dynamicMeshDict
index 6bc59dabd4..62cc96e010 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/transportProperties
index ef6ba97c6a..c1b2791b35 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/turbulenceProperties
index 3eeaf7f423..3d9b82f999 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/blockMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/blockMeshDict
index 1c5cf72353..e88d95cdbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/blockMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/controlDict
index 889ff65f56..2af65bebe2 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/decomposeParDict
index 5d1ebf9a6c..07cfcff9b9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSchemes
index f218f02321..b7f3b38b05 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSolution
index 981c72fa51..4287e7af29 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/optimisationDict
index 9b3c11016b..b273bf66d0 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRate/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/U
index 7cddb72856..d31331e2cb 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/Ua
index edf088e815..edee0635cd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/p
index 26ac19b7c3..cf41fc357e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/pa
index 82c948f2a6..fae932d1be 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/0/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/adjointRASProperties
index f726a61d70..161ad9f638 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/dynamicMeshDict
index a96a2ea246..6d67f45c89 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/transportProperties
index ef6ba97c6a..c1b2791b35 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/turbulenceProperties
index 3eeaf7f423..3d9b82f999 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/blockMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/blockMeshDict
index 1c5cf72353..e88d95cdbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/blockMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/controlDict
index 742ca1727a..0e82d20591 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/decomposeParDict
index 5d1ebf9a6c..07cfcff9b9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSchemes
index f218f02321..b7f3b38b05 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSolution
index 981c72fa51..4287e7af29 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/optimisationDict
index 5a2532a3ca..04e72416da 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/flowRatePartition/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/U
index 7cddb72856..d31331e2cb 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/Ua
index edf088e815..edee0635cd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/p
index 26ac19b7c3..cf41fc357e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/pa
index 82c948f2a6..fae932d1be 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/0/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/adjointRASProperties
index f726a61d70..161ad9f638 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/dynamicMeshDict
index a96a2ea246..6d67f45c89 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/transportProperties
index ef6ba97c6a..c1b2791b35 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/turbulenceProperties
index 3eeaf7f423..3d9b82f999 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/blockMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/blockMeshDict
index 1c5cf72353..e88d95cdbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/blockMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/controlDict
index 889ff65f56..2af65bebe2 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/decomposeParDict
index 5d1ebf9a6c..07cfcff9b9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSchemes
index f218f02321..b7f3b38b05 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSolution
index 981c72fa51..4287e7af29 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/optimisationDict
index 0a64f40e9a..cd43525df3 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/fork-uneven/uniformityPatch/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/U
index 58cc8690a1..6ddbb44c2d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/Ua
index b44ec00061..8418a66a52 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/fixedInlet b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/frontBackUpperPatches b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/frontBackUpperPatches
index 3b9d18028b..55be3e502c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/frontBackUpperPatches
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/frontBackUpperPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/initialConditions b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/initialConditions
index 040bf4a5e7..bfae952ada 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/initialConditions
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuTilda
index 0fd11a6182..f3a4ddb13e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuaTilda
index 3ad2939608..161b266194 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nut
index 6f7dff5ea7..c218fe63b6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/p
index 9316485d69..47624d32a3 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/pa
index cc47a3c576..8ab71c69b0 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/adjointRASProperties
index b6135ad185..d67e49d097 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/controlPoints.org/boxcpsBsplines0 b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/controlPoints.org/boxcpsBsplines0
index 50c89a1c02..23e03fd2d3 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/controlPoints.org/boxcpsBsplines0
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/controlPoints.org/boxcpsBsplines0
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict
index 17808d4523..d2839563eb 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/blockMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/blockMeshDict
index 02d6158be5..87c09f5c6b 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/blockMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/controlDict
index 8d072a6d63..7ff842485b 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/decomposeParDict.20 b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/decomposeParDict.20
index 9de20eb5f0..c55ea086af 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/decomposeParDict.20
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/decomposeParDict.20
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSchemes
index f96d915a11..f7c1feee70 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSolution
index 6e3278858e..cf43c25d2d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/meshQualityDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/meshQualityDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/optimisationDict
index d6ec031dbb..e27a4dbf61 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/snappyHexMeshDict
index 0096bdf7fe..318b3f25f7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/surfaceFeatureExtractDict
index 7952ec94df..a34c88a5ae 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/motorBike/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/U
index 041b02ca9c..7a41d0b0cf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/Ua
index 3d03f66a9d..c374f446e8 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/k b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/k
index 3410af0449..c8c499f5b6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/k
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/ka b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/ka
index 6e0ae17d11..d6443111e6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/ka
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/ka
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/nut
index 1a72ce7c40..da5f811943 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/omega b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/omega
index 06f1726db7..070defe915 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/omega
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/p
index 32e55c6cfd..8a4f76887c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/pa
index f0f21b8179..d496048b59 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/wa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/wa
index 70487fd84c..5444281b86 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/wa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/0/wa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/adjointRASProperties
index 5453077026..d7b7ba7e4e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/dynamicMeshDict
index bab4d37022..c99f778532 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/transportProperties
index 312db2bb02..84aef29d06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/turbulenceProperties
index 632f6dca57..a5f7797244 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/controlDict
index 369caddbc4..dcf7379f0c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/decomposeParDict
index c788254481..53b2d3731f 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSchemes
index eaccad5c8c..d95272966c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSolution
index b0a0fe2369..91095d5311 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/optimisationDict
index 4fe8710ed3..708f7c9e40 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/kOmegaSST/lift/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/U
index 1039afb759..d8537a8039 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/transportProperties
index 8ad80c6f44..6cd7eac19c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSchemes
index 43c16ec4b8..61d7d544aa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSolution
index 7661969f8b..0cf47221cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/optimisationDict
index 81712e78d1..1d6ddd34a6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/drag/primalAdjoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/U
index 1039afb759..d8537a8039 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/dynamicMeshDict
index 8e20c7ec23..4d398250a7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/transportProperties
index 8ad80c6f44..6cd7eac19c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/controlDict
index dd461164a8..af61d62ce7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSchemes
index 695261f0b4..269b4d047e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSolution
index 7661969f8b..0cf47221cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/optimisationDict
index 57ff561a3a..4b5e2335bb 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/lift/opt/constraintProjection/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/U
index 1039afb759..d8537a8039 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/Ua
index 5f33820d40..341b0a2e6d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/p
index c362ee33da..793c128485 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/pa
index 51166bb944..3b86962f06 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/transportProperties
index 8ad80c6f44..6cd7eac19c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/decomposeParDict
index 94f906022b..f08b244e42 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSchemes
index 43c16ec4b8..61d7d544aa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSolution
index 7661969f8b..0cf47221cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/optimisationDict
index 238d832acd..c18f88e42e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/laminar/moment/primalAdjoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/controlDict
index 4c4642757a..b7d404d728 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSchemes
index f7d9a38a1c..871ac822c8 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSolution
index a29ee975b7..e19c50c78c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/optimisationDict
index 1287ce9d76..881ac144c5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/dynamicMeshDict
index 008ae85893..dc4b3b1116 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/controlDict
index 4c4642757a..b7d404d728 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSchemes
index ad6a9dbf0d..dbd23332e1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSolution
index d66bf80811..c162c57353 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/optimisationDict
index abc6ff2abb..b072281b84 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS-transformBox/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/controlDict
index 4c4642757a..b7d404d728 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSchemes
index ad6a9dbf0d..dbd23332e1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSolution
index d66bf80811..c162c57353 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/optimisationDict
index abc6ff2abb..b072281b84 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/BFGS/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/controlDict
index 4c4642757a..b7d404d728 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSchemes
index ad6a9dbf0d..dbd23332e1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSolution
index d66bf80811..c162c57353 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/optimisationDict
index 052dcb4ea0..cddc8885b1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/losses/SD/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/controlDict
index c7b95dc723..986c1112cc 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSchemes
index ad6a9dbf0d..dbd23332e1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSolution
index d66bf80811..c162c57353 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/optimisationDict
index 9997123376..51028cddc9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/topoSetDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/topoSetDict
index c6d7adc830..bd6280f74a 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/topoSetDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/unconstrained/uniformityCellZone/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/U
index ba99fe23e0..9236aecb17 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/ma b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/ma
index 1ab1d23aed..e076433534 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/ma
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/ma
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/adjointRASProperties
index be427cce24..725053b295 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSchemes
index ad6a9dbf0d..dbd23332e1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSolution
index d66bf80811..c162c57353 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/optimisationDict
index 40b0eaf1b2..ba6f484792 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/primalAdjoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSchemes
index 376afa20a3..ed268f49fe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/optimisationDict
index acd47b428d..38b87855c1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSchemes
index 376afa20a3..ed268f49fe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/optimisationDict
index acd47b428d..38b87855c1 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/U
index 2b8539c9e7..5797045ff4 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Up2 b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Up2
index 2a7baee86a..1d94ab5f7c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Up2
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/Up2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/controlDict
index 4c4642757a..b7d404d728 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSchemes
index 3941fac24b..abc3716ffe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSolution
index 7521cf9780..3128b2378d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/optimisationDict
index dfcc81da0d..14bca2ce56 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/multiPoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/U
index b9f41d394d..659b5720b6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSchemes
index 247ea90d44..8361544008 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/optimisationDict
index 2b51ee930a..bd10cc6a18 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U
index 2b8539c9e7..5797045ff4 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/controlDict
index 4c4642757a..b7d404d728 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSchemes
index 247ea90d44..8361544008 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/optimisationDict
index abc6ff2abb..b072281b84 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/adjointRASProperties
index 3636d28976..e1744758f9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/dynamicMeshDict
index e5d1fdf7b5..975abf18dd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/transportProperties
index 026f654927..1b57e8131e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/turbulenceProperties
index 2e53847241..6ad95e51de 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/decomposeParDict
index e6ac394ebb..22e4362011 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSchemes
index 95cc66ec66..9637d14d01 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSolution
index 40617ccc89..a0691a4518 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/optimisationDict
index 7f6ed6de0a..2fb015f5e3 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/topoSetDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/topoSetDict
index 89144c4b38..24bb386a0c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/topoSetDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/adjointRASProperties
index 3636d28976..e1744758f9 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/dynamicMeshDict
index e5d1fdf7b5..975abf18dd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/transportProperties
index 026f654927..1b57e8131e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/turbulenceProperties
index 2e53847241..6ad95e51de 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/decomposeParDict
index e6ac394ebb..22e4362011 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSchemes
index 95cc66ec66..9637d14d01 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSolution
index 40617ccc89..a0691a4518 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/optimisationDict
index f1655d275c..395fb48ee6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/topoSetDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/topoSetDict
index 7e2397b921..c40b2b666a 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/topoSetDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSchemes
index 247ea90d44..8361544008 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/optimisationDict
index 40b0eaf1b2..ba6f484792 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjoint/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/U
index f6c67da041..8ad67ee3ca 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/Ua
index 86ef709ba5..a1efafa541 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuTilda
index 9fe371ba97..821fdd0b9c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuaTilda b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuaTilda
index 3971894d6e..35f8dbf906 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuaTilda
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nuaTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nut
index 37d4b3d84d..925819b4fa 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/p
index 59bde1d7b5..7819dbfb39 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/pa
index 0cbd7af95e..a5439dcfbe 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/adjointRASProperties
index 9735002aa6..759035cda7 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/dynamicMeshDict
index a3f6fb9ce5..42f695c825 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/controlDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/controlDict
index cca6295f7a..b43127ddd5 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/decomposeParDict
index 99badf3850..ac8a664c8d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSchemes
index 247ea90d44..8361544008 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSolution
index 73713b371d..134f1615bf 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/optimisationDict
index 1b347c3eac..03f7f9d479 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/primalAdjointFullSetup/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/U b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/U
index 881185ec7d..64d7053488 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/Ua b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/Ua
index bee3a7408c..091edb15bb 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/Ua
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/k b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/k
index b3e092be43..d230c5b02c 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/k
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/ka b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/ka
index da58e7dd96..252920e96e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/ka
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/ka
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/nut b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/nut
index b5454f8743..e012cda31d 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/nut
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/omega b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/omega
index 9182e4b0f0..11436ed4a0 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/omega
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/p b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/p
index caebcaa0ae..cb708cd933 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/p
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/pa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/pa
index b0d9d202ac..fb59a8e66f 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/pa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/wa b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/wa
index 591f9a9423..60f4db2038 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/wa
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/0.orig/wa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/adjointRASProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/adjointRASProperties
index 5453077026..d7b7ba7e4e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/adjointRASProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/adjointRASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/dynamicMeshDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/dynamicMeshDict
index e5d1fdf7b5..975abf18dd 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/dynamicMeshDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/transportProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/transportProperties
index 026f654927..1b57e8131e 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/transportProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/turbulenceProperties b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/turbulenceProperties
index 632f6dca57..a5f7797244 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/decomposeParDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/decomposeParDict
index e6ac394ebb..22e4362011 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSchemes b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSchemes
index 52b999e690..1e328c646b 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution
index 65eafc14c5..3d4bc41cb6 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/optimisationDict b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/optimisationDict
index bd848c56b6..4adb513df4 100644
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/optimisationDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
index 586dee20f3..3629c87104 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
index 26d9e1a029..6dd7b6b40c 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon
index 4041d1b61c..f6d727820b 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k
index b554a70c8c..f23394d5a0 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut
index 21042ad3d0..686f84603c 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
index fa723f5a5c..1776ee7cf4 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
index 6246201597..98c246e5f6 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
index 4ead0a5e69..97a9a74d7b 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
index a2501b61d4..ca24f3d3bb 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
index 5848d2c31a..32e9f528c6 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/nut b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/nut
index fe9962df63..fcecdd76be 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/nut
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/turbulenceProperties
index 33309ee30a..873bf24891 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/turbulenceProperties
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/LaunderSharmaKE-nutkWallFunction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/U b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/U
index 65ab4e19f2..a3edd91939 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/U
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/epsilon b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/epsilon
index ac05fbdda6..ed37f5eeb7 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/epsilon
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/k b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/k
index b54e2291a2..1275f0a7a9 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/k
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/nuTilda b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/nuTilda
index 811571d7a0..5959e6e244 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/omega b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/omega
index 2da732a1d3..4b847c1af2 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/omega
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/constant/transportProperties.template b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/constant/transportProperties.template
index bea1123945..b2b40802dd 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/constant/transportProperties.template
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/constant/transportProperties.template
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/blockMeshDict b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/blockMeshDict
index ac034f2103..697fe90ab6 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/controlDict b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/controlDict
index e38221b3cc..51992c1773 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/decomposeParDict b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/decomposeParDict
index 67872ffae1..a2923120a9 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/decomposeParDict
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSchemes b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSchemes
index 3116a21d6d..ac8ec0716e 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSolution b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSolution
index 526e5b255c..b29f4c0d5c 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/nut b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/nut
index fe9962df63..fcecdd76be 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/nut
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/turbulenceProperties
+++ b/tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/setups.orig/kEpsilon-nutkWallFunction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/cavity/0/U
index b231f451d8..7325fb400b 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/0/U
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/0/p b/tutorials/incompressible/icoFoam/cavity/cavity/0/p
index 7019744453..13954fbcc8 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/0/p
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/cavity/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/PDRblockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/PDRblockMeshDict
index 3d3a8d8962..391d2659e4 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/PDRblockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/blockMeshDict
index d1f8f77392..3a2a8c4ac0 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
index f1efa53d07..19b7fa7c02 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/decomposeParDict b/tutorials/incompressible/icoFoam/cavity/cavity/system/decomposeParDict
index b6d2b4b74f..8fb0ce4971 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/decomposeParDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes
index 1697f551de..1fe4971e6b 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSolution
index d8fa2b5f98..31b000ea02 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U
index 5b32befb4a..7ccbc70b36 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p b/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p
index 51c6dba5bc..fda52b7ebb 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/cavityClipped/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/blockMeshDict
index 4c52164425..2a7fea4677 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/controlDict
index cf79478deb..396f84d97c 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSchemes
index bf20b876fb..a95358213b 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSolution
index d8fa2b5f98..31b000ea02 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/mapFieldsDict
index e5875a8112..3bba83aac2 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/mapFieldsDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavityClipped/system/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U
index b231f451d8..7325fb400b 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p b/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p
index 7019744453..13954fbcc8 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/cavityGrade/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/blockMeshDict
index 3ab67dfaa3..2e05b6a917 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/controlDict
index 0edcf688b8..8550cc5eaa 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes
index aa5b8e287f..51d2f65bae 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSolution
index d8fa2b5f98..31b000ea02 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
index 299b7ebe86..16c4d30c10 100644
--- a/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavityGrade/system/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/U b/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/U
index 2d055b7208..c8691d1440 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/U
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/p b/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/p
index 7019744453..13954fbcc8 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/p
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityMappingTest/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.coarse b/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.coarse
index 23d652a071..19982d9f21 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.coarse
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.coarse
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.fine b/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.fine
index ee5049f0d1..73ad39c824 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.fine
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/blockMeshDict.fine
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/decomposeParDict b/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/decomposeParDict
index 7bc834cfa7..88e293dc25 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/decomposeParDict
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSchemes b/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSolution b/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/coarseMesh/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict b/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict
index 6d837e4497..8d65039f09 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/decomposeParDict b/tutorials/incompressible/icoFoam/cavityMappingTest/system/decomposeParDict
index 7bc834cfa7..88e293dc25 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/decomposeParDict
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSchemes
index 1697f551de..1fe4971e6b 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSolution b/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSolution
index d8fa2b5f98..31b000ea02 100644
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/0.orig/U b/tutorials/incompressible/icoFoam/elbow/0.orig/U
index 4aed89143e..822ba97eef 100644
--- a/tutorials/incompressible/icoFoam/elbow/0.orig/U
+++ b/tutorials/incompressible/icoFoam/elbow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/0.orig/p b/tutorials/incompressible/icoFoam/elbow/0.orig/p
index b33dbeb0c2..7a1db24e5b 100644
--- a/tutorials/incompressible/icoFoam/elbow/0.orig/p
+++ b/tutorials/incompressible/icoFoam/elbow/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict
index d04f60353e..5ecdf289df 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/controlDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict b/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
index ceba0662f4..52d26a116d 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSchemes b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
index 1c8c1a5364..2065e6061b 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSolution b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
index e36550ccbc..fa1df755d8 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/U b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/U
index d228a56858..fd991e44d1 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/U
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/epsilon b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/epsilon
index d6d125498b..2a48399300 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/epsilon
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/controllers b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/controllers
index bc43b06e64..f0d0c017d1 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/controllers
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/controllers
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/environ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/environ
index 42c22528b6..3d1d180120 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/environ
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/environ
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/initialConditions b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/initialConditions
index acf2571d31..35cb767b05 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/initialConditions
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/k b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/k
index 26ab53a8e0..2a3ac810d6 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/k
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/nut b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/nut
index 7f66ad3176..14d8ed9c9f 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/nut
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/omega b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/omega
index ac63684346..1506260fa7 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/omega
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/p b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/p
index f6aa6a5d98..c9ea1b7d76 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/p
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/pointDisplacement b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/pointDisplacement
index 4cd550873d..2d7c5f0c22 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/pointDisplacement
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/dynamicMeshDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/dynamicMeshDict
index 6d0136e3d1..8609532680 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/dynamicMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/transportProperties b/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/transportProperties
index 34d04b844c..0eb44cee1b 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/transportProperties
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/turbulenceProperties b/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/turbulenceProperties
index 72fe9fd6d6..4c06f740a5 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/turbulenceProperties
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/PDRblockMeshDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/PDRblockMeshDict
index 581cc13e8e..0f9a30c175 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/PDRblockMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/blockMeshDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/blockMeshDict
index c1eb637828..6ee64228f7 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/blockMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/controlDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/controlDict
index 1a1c9cea0b..f7541d4243 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/controlDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/decomposeParDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/decomposeParDict
index a77e437099..edb8da87c1 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/decomposeParDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSchemes b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSchemes
index f48fee2194..7e4c265f23 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSchemes
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSolution b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSolution
index 152fbbb5fb..551d32fd5c 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSolution
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointControllers b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointControllers
index a21d632a45..d2d489b20e 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointControllers
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointControllers
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointMovement b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointMovement
index b4ddd08761..df05067a3e 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointMovement
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/lumpedPointMovement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/meshQualityDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/meshQualityDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/snappyHexMeshDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/snappyHexMeshDict
index ad2ae5764e..5bffca3c6f 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/snappyHexMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/surfaceFeatureExtractDict b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/surfaceFeatureExtractDict
index 90a6d645c5..f30e7e0799 100644
--- a/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/lumpedPointMotion/bridge/steady/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/U b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/U
index e94ced3a29..539dcec665 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/U
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/epsilon b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/epsilon
index 11b93afb19..1ceac74bcf 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/epsilon
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/environ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/environ
index f767ea60fa..f5360a6aad 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/environ
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/environ
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/fixedInlet b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/initialConditions b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/initialConditions
index acf2571d31..35cb767b05 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/initialConditions
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/k b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/k
index 6448c74489..bac9eb4ff4 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/k
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/nut b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/nut
index 63bd760b4c..57284e1cf3 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/nut
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega
index beb742fb0f..e840ff53a1 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/p b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/p
index 039d2d681c..72e0818f77 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/p
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/pointDisplacement b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/pointDisplacement
index 12c7aea97b..1a06f3767b 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/pointDisplacement
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict
index 276a97e172..89c4ab8a3e 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/transportProperties b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/transportProperties
index 34d04b844c..0eb44cee1b 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/transportProperties
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/turbulenceProperties b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/turbulenceProperties
index 72fe9fd6d6..4c06f740a5 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/constant/turbulenceProperties
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/blockMeshDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/blockMeshDict
index c4ea3e83ab..d841949751 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/blockMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict
index 1a1c9cea0b..f7541d4243 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/decomposeParDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/decomposeParDict
index 1bad8fa801..4131615f00 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/decomposeParDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSchemes b/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSchemes
index f48fee2194..7e4c265f23 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSchemes
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSolution b/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSolution
index 152fbbb5fb..551d32fd5c 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSolution
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointControllers b/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointControllers
index fd12389fd7..ad0f26efe9 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointControllers
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointControllers
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement b/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement
index 766bc035be..cd731a675e 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/lumpedPointMovement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/meshQualityDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/meshQualityDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict
index 0b23ac9752..5bfda7e968 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/surfaceFeatureExtractDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/surfaceFeatureExtractDict
index ab007ba863..1657a5cd50 100644
--- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
index 6d4ade7d8d..a64f047444 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
index dda9ace056..51d35366e6 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
index f7893b19eb..8e947120e4 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
index ebb4d3b8cf..fb1ea16b14 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
index c6f07baf69..8ea8ad4c69 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
index 6d0e98710c..929fe18304 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
index a2d88b12ce..9af095c2db 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
index 29aa27b9e4..66b88f0a01 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
index f793be13c1..f00a3b0533 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/fixedInlet b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions
index 94c8f39f2a..8cca144b08 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
index 1b3d8d111d..110004604f 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
index 39e1c81232..7993dce436 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
index 867a0d590f..2c1590c9be 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement
index 5d9a50c64c..df73743166 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
index 09c7ab71be..74c3ac6e11 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/transportProperties b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/transportProperties
index 3275045140..cdf627b222 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/transportProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/turbulenceProperties b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/turbulenceProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/blockMeshDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/blockMeshDict
index 29ed7f303a..a32e2712b1 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/blockMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/controlDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/controlDict
index 02cac262ba..4e6b84449b 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/controlDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/decomposeParDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/decomposeParDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes
index 69d63ca960..7a6b4d04a1 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSolution b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSolution
index 5caee24d57..678ebbad9b 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSolution
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/setFieldsDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/setFieldsDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict
index 07378ff86f..c8710aaf18 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/controlDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/controlDict
index 66ced0840c..25099e950c 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/controlDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/createPatchDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/createPatchDict
index f01edea7ba..47511fe0a9 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/createPatchDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict
index de3960a1dd..1ecf133ccf 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSchemes b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSchemes
index 8ae26ff541..b89270cd48 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSolution b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSolution
index e04742fab9..64da1fd6cb 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSolution
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/U
index 89bf5cb07a..58afd45a78 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/epsilon b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/epsilon
index 6064c4bbb9..11a99707a8 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/k b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/k
index ff71a921a3..45f89adebb 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nuTilda b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nuTilda
index 14a4343c92..34658ef20c 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nuTilda
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nut b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nut
index 210ab02f5f..df2c10dba3 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/p
index 118ad03a11..bda53a4afe 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/pointDisplacement b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/pointDisplacement
index 0abab48227..d763fbc340 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/pointDisplacement
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/zoneID
index 5d7500001a..d0389e66b3 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/dynamicMeshDict b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/dynamicMeshDict
index 26a85f3f57..c4f0b17e7c 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/fvOptions b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/fvOptions
index 1c7d2b4186..694296103d 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/fvOptions
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/transportProperties b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/transportProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/turbulenceProperties b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/turbulenceProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/blockMeshDict b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/blockMeshDict
index bd698c64a2..a47fdcc8ba 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/blockMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/controlDict b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/controlDict
index 9184c0a59f..1151ba729a 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/controlDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/decomposeParDict b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/decomposeParDict
index cbe7f1104b..e9dcceb425 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/decomposeParDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSchemes b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSchemes
index 232881fda0..53c940d1c1 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSolution b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSolution
index c1f72dc31a..27cd37ca5b 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSolution
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/setFieldsDict b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/setFieldsDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/topoSetDict
index f70991eed9..1d6f1e6246 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/rotatingSquare/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
index b8e738cbc5..1b93099ebd 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
index 7f689cd717..52eb49ea34 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
index 1e8a10b710..5c1ad58fcf 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
index 900c65a9f0..68eaaee021 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
index 648006fbac..203690a5e9 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
index 2d4778f19d..b4ef78cecb 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/pointDisplacement b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/pointDisplacement
index 0abab48227..d763fbc340 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/pointDisplacement
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
index fbc78227ba..cc57c9d8bb 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict
index 28f3d1e9fb..eb95e506e4 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/transportProperties b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/transportProperties
index e722f63693..4c9c964b72 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/transportProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/turbulenceProperties b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/turbulenceProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/blockMeshDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/blockMeshDict
index 24ae8f9b33..250af0f4b8 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/blockMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/controlDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/controlDict
index c0175c367c..b2ea402b6f 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/controlDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/decomposeParDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/decomposeParDict
index cbe7f1104b..e9dcceb425 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/decomposeParDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSchemes b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSchemes
index 02a249a1a9..a1ce9bee93 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSolution b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSolution
index 0f1e96b2f7..a33747acd1 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSolution
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/setFieldsDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/setFieldsDict
index e58d203965..9205e08a1a 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/setFieldsDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict
index 522bd8e461..fffd8bc159 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
index 50880c2279..39a59f9a7b 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon
index e902055fc4..e5b7a750c1 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/k b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/k
index 6b9a75e111..2ea707d380 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/nut b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/nut
index 98462d24b5..4bb9b4bc4c 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
index e2eea00b2a..050b10e7de 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/pointDisplacement b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
index 786e0676ee..c4ac48cedc 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
index 176c028908..916fcd8ea0 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/transportProperties
index d0a18369cf..67c1b22c93 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/transportProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties
index ce1d0a588d..f2f5463c04 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict
index d0b91a9bee..7e18fcba31 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict
index 57a2578d83..b704b9e696 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/decomposeParDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/decomposeParDict
index cbe7f1104b..e9dcceb425 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/decomposeParDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
index 65df61fbc1..18d5e27538 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSolution b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSolution
index 56a3642c20..2df99de342 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSolution
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict
index cc4e7470c6..cbea7b2df6 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
index 544ea8f22c..4bcc63ec37 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/transportProperties b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/transportProperties
index 04967487cd..df5a08e89d 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/transportProperties
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/turbulenceProperties b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/turbulenceProperties
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict
index fe6ec3f81f..f6d4fdd821 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/createPatchDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/createPatchDict
index 69ed18e3f6..c89d083123 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/createPatchDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/extrudeMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/extrudeMeshDict
index 42d1e202c4..3e95d8ee2a 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/extrudeMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSchemes b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSchemes
index 2a6b2445af..5bf75b9149 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSchemes
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSolution b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSolution
index 7fb63fdef9..f1b5a8de1e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSolution
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/blockMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/blockMeshDict
index 201e7d76cf..275361c48e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/blockMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/controlDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/controlDict
index feb5a80d1d..3291bbb029 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/controlDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/decomposeParDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/decomposeParDict
index b7dbdbdd4f..14c2b19e2d 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/decomposeParDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSchemes
index 8ae26ff541..b89270cd48 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSolution b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSolution
index e04742fab9..64da1fd6cb 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSolution
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict
index c233734784..1f87686e35 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
index 15407a48ae..3995d20dae 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
index 2025ed77a7..a5dd6ae02d 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/frontBackTopBottomfreePatches b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/frontBackTopBottomfreePatches
index 3f4c7ddd8f..b6886e6ddd 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/frontBackTopBottomfreePatches
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/frontBackTopBottomfreePatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/initialConditions b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/initialConditions
index dab0b81ade..c95ae69fd1 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/initialConditions
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
index 91cd415d7a..9cee64f0a0 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
index 60b0f0b90a..72a5b6633a 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
index b8f377f4e8..572cab988e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
index c63641fbb6..5dabe957e6 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
index a951cf1701..8c2694a855 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/pointDisplacement b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/pointDisplacement
index 1dfc554169..ca9ffb85c4 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/pointDisplacement
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
index 6af1c0c714..e775c1b598 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/RASProperties b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/RASProperties
index 156e5fd6a3..cabd39b557 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/RASProperties
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/RASProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict
index 09c7ab71be..74c3ac6e11 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/transportProperties b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/transportProperties
index 09713fcdb8..d65c572141 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/transportProperties
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/turbulenceProperties b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/turbulenceProperties
index 56fc086fc6..8144b9aaf9 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/turbulenceProperties
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/blockMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/blockMeshDict
index 3a366da147..32f1c5fe5e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/blockMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/controlDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/controlDict
index a256e547ed..3be26e61af 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/controlDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/createPatchDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/createPatchDict
index 1bd434b5cc..0448f0d40f 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/createPatchDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/decomposeParDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/decomposeParDict
index 72c71fba7d..5969964b3e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/decomposeParDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/extrudeMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/extrudeMeshDict
index cdb11abc61..0b1d8a55a2 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/extrudeMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes
index 223e0b8843..bc4bc2412b 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSolution b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSolution
index 208245ef73..76de74cd91 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSolution
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/postProcessingDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/postProcessingDict
index a322aaf1dd..e3b2b2ab7e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/postProcessingDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/postProcessingDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/setFieldsDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/setFieldsDict
index f2ce1aae45..3f3757908f 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/setFieldsDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict
index e7d3a8afe3..7fc6cedd1b 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/blockMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/blockMeshDict
index 1660715997..3135e3e282 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/blockMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/controlDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/controlDict
index feb5a80d1d..3291bbb029 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/controlDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSchemes
index 27dc3937f0..3afcddc76e 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSolution b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSolution
index 7bed0efb41..bb17f08aae 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSolution
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict
index 9ce456e01d..aeb4453528 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/nut
index d43fb05684..ec4a0d9712 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/p
index c2403f5611..8b98309af5 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/createBoxTurbDict b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/createBoxTurbDict
index 1b11e9f41f..43776bbea2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/createBoxTurbDict
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/createBoxTurbDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/blockMeshDict
index b4c5e824cc..aba8f71823 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/controlDict
index bd29745643..c0654d2672 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/decomposeParDict
index 717fb3211c..f11c2d1445 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSchemes
index 586be275db..a682d8c99b 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSolution
index 105e39de67..2699425063 100644
--- a/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/decayIsoTurb/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/U
index 46cceb5f54..a3c63e6f95 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/k b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/k
index 8e6e30fe49..c2dc1acf30 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nuTilda
index d81e63e63e..04f7bf5b54 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nut
index 2f7dd022b4..220fcbfea8 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/p
index f06459e372..100c0ea1f2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/transportProperties
index a3cebbf571..d927723ed9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/turbulenceProperties
index c7bd5617ac..6b5cdf70ad 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict
index 5ceb29904f..55777d20f6 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/controlDict
index ed76d84497..66b6c0b19a 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict
index 4661c68550..1e750206b2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvOptions b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvOptions
index df79361a0f..a469a5ce68 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvOptions
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSchemes
index aca009947e..df0e69a724 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSolution
index 21a7b22e8b..d83a824b25 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict
index 072b48ff2b..a358a7f1ca 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/transportProperties
index a3cebbf571..d927723ed9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/turbulenceProperties
index 79315c0e04..7c26bd2571 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
index a9ed392231..4d9632bce0 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
index ad34ebaf7d..c277b115ac 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
index 0ef769ea05..5643146c9e 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict
index 4661c68550..1e750206b2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvOptions b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvOptions
index df79361a0f..a469a5ce68 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvOptions
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSchemes
index 59b68cd50d..21186b6d4c 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSolution
index 3928710063..521d16124a 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/fvOptions b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/fvOptions
index 27f11fb33f..e094270f07 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/fvOptions
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/postChannelDict b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/postChannelDict
index 76a4e73f07..0e367cd8a0 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/postChannelDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/postChannelDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/transportProperties
index 1742ac7f44..74e66a4afe 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/turbulenceProperties
index 13716fea79..a45c9e49a2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/blockMeshDict
index b4c5e824cc..aba8f71823 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/controlDict
index d9faaae34d..6c178402eb 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/decomposeParDict
index c930f2efad..933b924ad4 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSchemes
index b58b8b7204..ffc155a2c9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSolution
index 681669250c..648e1c831a 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicPlaneChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFM/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFM/0.orig/U
index c78a71d6b7..72aef4c412 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFM/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFSEM/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFSEM/0.orig/U
index 40fb136214..5aed7347cd 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFSEM/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/DFSEM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/FSM/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/FSM/0.orig/U
index 585e892777..7a41f5e04f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/FSM/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/FSM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/nut
index a2b0a2710d..6c0294a8de 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/p
index b9a1b287a7..5c2a6a3c05 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/transportProperties
index 2f5086bdd3..1603012596 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/turbulenceProperties
index add5ea5c84..0cc5dec26d 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/blockMeshDict
index 870e53b0c4..6c354537ab 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/decomposeParDict
index 0a36b69891..7d3846d66f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSchemes
index 13b21846a3..49941f364b 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSolution
index ec72630bda..413c1c7477 100644
--- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/U
index a6912a5b08..915a78a4ed 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/k b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/k
index 3f4c17c473..844ed8b317 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nuTilda
index c0be6b0fa0..1b62754540 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nut
index fc8b837ec2..9aa1e3da2d 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/p
index 1a2c7b328e..aca880ea38 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/transportProperties
index 509cced0af..8dd8e5f279 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties
index edc00150dd..c9fed165c5 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/blockMeshDict
index 01adf5d50b..db7c986278 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/decomposeParDict
index e31da9930f..0c0ca474a0 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSchemes
index 46310febcb..5c9e6a9c13 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSolution
index dd3036ea54..904dbc3ff8 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
index 0b3b837f7a..7a2c811d8e 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/U
index 0b160c34d2..7e9abc4b10 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/epsilon
index ac7f75f63c..e7803ee6cb 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/k b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/k
index 2ab369e641..eea6be0d40 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nuTilda
index cb8e4600d3..99c581edd8 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nut
index 6c411f654b..e03aa456ff 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/transportProperties
index d1f879c0b1..c9c457d3ca 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/turbulenceProperties
index 33309ee30a..873bf24891 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/blockMeshDict
index 17ded69ec8..c63009c18f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/controlDict
index 9c79a2b2f8..2dcec8b4cb 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSchemes
index 85566fd921..d2bbc46eac 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSolution
index dbbd388ab4..e86b5d98fa 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/initChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/U
index f5efa33477..03ac629c4d 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nuTilda
index 972aef0185..987a2c52c8 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nut
index c31b0e8a74..ef02db387a 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/p
index efa5e5f27a..dbc0ab2790 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/turbulenceProperties
index 5ad1ef2cea..788d7bbe5d 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/blockMeshDict.m4
index ea300a9548..da17091ee2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/blockMeshDict.m4
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
index ab8188921b..22e57c2192 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSchemes
index 5435035659..50d7b2beb9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSolution
index 5b881a809b..a7287bfdbb 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point
index 41ee7810d3..b2b6bfdcd2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-point
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface
index aa40ebfcb8..701fed642b 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/noiseDict-surface
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties
index a7ad2d27fd..cfc9bcc846 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-SLADelta-useSigmaFalse/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-SLADelta-useSigmaFalse/constant/turbulenceProperties
index 2c02769ea7..b7fcc9d60f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-SLADelta-useSigmaFalse/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-SLADelta-useSigmaFalse/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-maxDeltaxyzCubeRoot/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-maxDeltaxyzCubeRoot/constant/turbulenceProperties
index 05b3f06762..744f04858c 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-maxDeltaxyzCubeRoot/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasDDES-maxDeltaxyzCubeRoot/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasIDDES-IDDESDelta/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasIDDES-IDDESDelta/constant/turbulenceProperties
index 48c1794037..4c9b75ab96 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasIDDES-IDDESDelta/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/SpalartAllmarasIDDES-IDDESDelta/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/U b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/U
index 8a16039405..4ddd56d8f2 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/k b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/k
index b8a276a82a..b74b709919 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nuTilda
index 22e2d13c31..36e822a8d9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nut b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nut
index 8476fcc8a4..3656e6fdf7 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/omega b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/omega
index fbe825874c..377ed0da2d 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/omega
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/p b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/p
index 99fee49849..fe66315ca7 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/constant/transportProperties
index 2b233579ae..e02656b2c1 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/columnAverage b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/columnAverage
index d7df5cadde..62d71ebf6f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/columnAverage
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/columnAverage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/controlDict
index a89a02030a..61e0e29294 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/decomposeParDict
index d471edf77a..2d8cd2a717 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fieldAverage b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fieldAverage
index 59bea5cbd8..fa82dbb6dc 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fieldAverage
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fieldAverage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSchemes
index 6df3f006bb..2b38592fe0 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSolution
index 69e3d40892..38f44ea30f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/sampleDict b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/sampleDict
index af62de1011..fe9270db0e 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/sampleDict
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/sampleDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/volFields b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/volFields
index 305c21222a..7c57aa0c29 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/volFields
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/common/system/volFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/kOmegaSSTDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/kOmegaSSTDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties
index f925d58d24..208f39d883 100644
--- a/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/kOmegaSSTDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/LES/wallMountedHump/setups.orig/kOmegaSSTDDES-DeltaOmegaTilde-useSigmaTrue/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U
index 8bb05baa18..3a5c325124 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon
index 771396295a..f49d0b5be0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k
index eb8a22078e..02cf482fd1 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda
index 6acacc8199..223c566d9a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut
index ef6cee04a3..b4fdd7f9ff 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p
index 02b5fc0556..62e01540f5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s
index 0c2cea0430..a75b8c0190 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/0/s
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
index 6928049767..307fdd230d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
index 2205389786..85c831ceda 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
index 273e64fddd..0f89600c2e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
index 0413df448b..e3d11f2f08 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T
index cc5d657f00..1c2046072e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/U b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/U
index 8bb05baa18..3a5c325124 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/epsilon b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/epsilon
index 771396295a..f49d0b5be0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/k b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/k
index eb8a22078e..02cf482fd1 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nuTilda
index 6acacc8199..223c566d9a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nut b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nut
index ef6cee04a3..b4fdd7f9ff 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/p b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/p
index 02b5fc0556..62e01540f5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/transportProperties
index b7c7221488..e6a5d524dd 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/blockMeshDict
index 6928049767..307fdd230d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSchemes
index a1e99507ae..d8832330b8 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSolution
index 1a89794853..c264546345 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U
index 431163011b..4cd8f9d3f8 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon
index 2010c48b97..8ee52dcbcf 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k
index 1ca135e2f1..bb450be67a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda
index 99140313cb..7f170bd134 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut
index 43a531a90e..bb2716f165 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
index 1cbb877677..f06a941d8d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
index 5ef598073f..3fc3a3c266 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/controlDict
index 8a7c1f99a8..74064a0af6 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
index adaa62185f..abf88bfdab 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes
index 273e64fddd..0f89600c2e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution
index 22e4beaa51..983396c8cc 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
index 5d63f38d07..3ccba7382f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/U
index 88d653672b..0481138e6a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/epsilon
index 96b8330710..d3af0534da 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/k
index 38f5060666..f23f9c7d05 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nuTilda
index e9ea7c7fed..ccf83ecd1e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nut
index 974f08b555..d694fbcc76 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/p
index 348e366c45..d7a19908f9 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/blockMeshDict
index 196c09d6d2..d3c2dbe04d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/controlDict
index 5952e5e36c..0e1db38bb1 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/decomposeParDict
index c1ffca2335..6bbaa44e9c 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSchemes
index 273e64fddd..0f89600c2e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSolution
index e425a832f3..ab44cb4b1e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionSwitching/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/U
index 964b2dc163..61eb50d263 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kl b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kl
index 4ff8181c99..c964a6cde5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kl
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kl
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kt b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kt
index 47a0853de5..4271ad5f35 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kt
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/kt
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/nut
index 27fc82a5ce..eef18a063c 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/omega
index aa436a29fa..99acfc265e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/omega
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/p
index e4c413183e..0dc60634d8 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/transportProperties
index f4217d7614..f46712a91d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/turbulenceProperties
index 101020f1ee..c802395e0d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/blockMeshDict
index c94ddb0ca2..772499750e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/changeDictionaryDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/changeDictionaryDict
index cb3ac7baf1..f8fe7a3fb6 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/changeDictionaryDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/controlDict
index 08d347723f..98dd320abf 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/createPatchDict
index 3ecadaa973..9f295fa433 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/createPatchDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/decomposeParDict
index d8cb655ff5..e52afc6702 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSchemes
index eb1a10b952..eb5ce17524 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSolution
index 85d687ccbf..7b32f9e8a5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict
index 05d23706ed..6eea309cff 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.X b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.X
index 8f17ed99c5..7e750c6e8d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.X
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.X
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.Y b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.Y
index 4da229e2ee..6772cc67bf 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.Y
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/mirrorMeshDict.Y
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/sampling b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/sampling
index b27e687129..8c36136d5a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/sampling
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/sampling
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/streamLines b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/streamLines
index b78b529f15..552fa62424 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/streamLines
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/streamLines
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/topoSetDict
index 8f429855ec..e3dfd42c76 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/visualization b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/visualization
index 7748466ea7..b5872f2019 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/visualization
+++ b/tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/system/visualization
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U
index 9c1cad5d57..5af946864f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon
index f27fbc4866..a06887c6c8 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k
index 711641ae9b..5ca726f33a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut
index ecf2750f08..b040f96591 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p
index eefcb28d28..dc3258af52 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict
index 7ac342b87b..172233655a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/transportProperties
index c774c98a6c..cd247187f4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict
index cb894b2a9c..0f6504e2d8 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict
index 65f9e55406..853c7cad25 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes
index d6d9768919..3d9b3aff2d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution
index 34178bbeb7..3731355b33 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict
index e7260d2a46..42a502edfa 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/U b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/U
index d7352c7baa..37d955c475 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/epsilon b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/epsilon
index a57fcb4a3d..aa303cbd75 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/k b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/k
index fa2ab269ac..b732080bd9 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/nut b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/nut
index 961b868e6b..166207a977 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/p b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/p
index 6c67fecf4f..a0c2c7dbda 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict
index 148f00bd0c..7af88a4bb9 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/transportProperties
index c774c98a6c..cd247187f4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/blockMeshDict
index d208ec9cc4..24f2d40d81 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/controlDict
index 5b92cd38ac..62ca06f76a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSchemes
index d6d9768919..3d9b3aff2d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution
index 7c6ba5a226..95148a9b69 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U
index 930d35239e..a128f627c0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon
index 1843167dd1..c62eb525b4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k
index b554a70c8c..f23394d5a0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda
index fc3415d301..2994f15eaa 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut
index facc69b85a..96ca00fe19 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
index 4d664a09f2..b425a77f62 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes
index 1815dbdfb3..6924da502c 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution
index b3bae3d120..0d05aa76cb 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U
index 34a417aa2d..e66803cfa4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon
index 01185e3b8d..2c3663a946 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k
index c053c3772b..987cf72ea5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut
index 166355074e..513d1b054e 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p
index cea654b528..3dcab10a1b 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict
index 7514b64bed..25ca6b8680 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/transportProperties
index c774c98a6c..cd247187f4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/AMIWeights b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/AMIWeights
index 4ce360fd30..18eec9537b 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/AMIWeights
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/AMIWeights
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/blockMeshDict
index 6adb94b721..8193fc06a2 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict
index d947edda15..aac6819e2d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict
index de94e2c765..d56704b807 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict
index 2cd7f8e86c..361cdf6d25 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/decomposeParDict
index 03e30c74a1..00c7c215fc 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces
index 0b68ee0bea..b32b2ce079 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/forces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSchemes
index d6d9768919..3d9b3aff2d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution
index 4c21923170..6996444bb2 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
index ba878f0389..1d71193abe 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict
index 7a04c73cc9..22001e499b 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces
index fcaf7e8466..399654a51d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/U
index 5c725b60ca..c275468b8d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/k
index 871df4a120..c6c44b0b34 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/nut
index 2f20203638..8756d6ac09 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/omega
index 7f18e00237..dc680b1dff 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/omega
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/p
index 68a19e85bc..62601fdda0 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict
index 202abdd697..ec58ecb7e4 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/g b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/g
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/blockMeshDict
index 7bdd3cbdc5..2ebc156539 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/controlDict
index 0afcfddc32..90606d1246 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/createPatchDict
index 97e5c3ebd9..6bb6bf6908 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/createPatchDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSchemes
index 11dff3723e..0bb44d15cf 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSolution
index 6bf444b01e..58c5183e64 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/snappyHexMeshDict
index 9d64eebbf6..f6176622ba 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/surfaceFeatureExtractDict
index 78bb613853..64e04c9b50 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U
index 630f6cb5e3..06718a09d3 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches
index f6e927699e..b00eba6c19 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions
index 8c3c917cd5..3760aeaf49 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k
index 68061fe1be..93b4391b37 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut
index ac67264bb1..0804dd4d98 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega
index c6b5fd0d23..c7a6f46878 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p
index 4b4793919a..c3adf9caee 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement
index 94b5cfc650..9fbefa40e6 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict
index 12b33a1a08..06647daf79 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict
index 4526a52c16..4c90b3bc29 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
index 2f586cf7d8..4380add864 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes
index 72aaee4264..54d82442e5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution
index d64cde4694..64debb737f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U
index c82ad609b1..88a7787414 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches
index f6e927699e..b00eba6c19 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions
index 8c3c917cd5..3760aeaf49 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k
index 68061fe1be..93b4391b37 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut
index ac67264bb1..0804dd4d98 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega
index c6b5fd0d23..c7a6f46878 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p
index 4b4793919a..c3adf9caee 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict
index 6c6f343b3f..e69ec6b2e5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
index 564e7bf47c..a92567173a 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
index c14b7921fa..b2195ff2fe 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/forces b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/forces
index ac9703e46e..1259114804 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/forces
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/forces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
index bf071223f2..a24f6cdcdc 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
index 551dc837e9..6b1f777653 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
index 11b2868ead..278c7df52f 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict
index 66ced0840c..25099e950c 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
index b7dbdbdd4f..14c2b19e2d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
index 648f42e4e1..d2e99dd632 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution
index e04742fab9..64da1fd6cb 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
index 81941a8679..0724290606 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/U
index a09e0bab01..049239c898 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/contactAngle b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/contactAngle
index 50f94cab96..25288efd66 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/contactAngle
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/contactAngle
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/p
index 7714c98e64..bfd2f271c3 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/pointMotionU b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/pointMotionU
index 6994eebbaa..9f5fc66ed0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/pointMotionU
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/0.orig/pointMotionU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict
index e1bc932a6c..7f7f5d36b0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/g b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/g
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/transportProperties
index e223a8e1bd..d506e55e01 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/blockMeshDict
index b23764c481..c2abe40ef5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict
index 6d397cb098..b61e353efe 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/decomposeParDict
index aa48422bb7..4204a120b0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition
index 050b1977f8..2bc01a9567 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSchemes b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSchemes
index 099100be74..2ff5ade98d 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSolution b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSolution
index dd40f81612..6a71ddc50c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSchemes
index 1113195ee9..aad42ec7dd 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution
index 70b4d1a305..453eb55e02 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/C b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/C
index fe2c0750cb..70387f5f58 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/C
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/C
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/Cs b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/Cs
index c75b282962..2620fb18ab 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/Cs
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/Cs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/U
index dc0c45daab..288eee9ece 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/p
index 396c68d575..37b3c1c18e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/pointMotionU b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/pointMotionU
index 9359fc3ae3..1baa3144bd 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/pointMotionU
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/0.orig/pointMotionU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict
index 1c7b9d7662..47ad4cf75e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/g b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/g
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/transportProperties
index 8d17959208..d3f4dbf1d2 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/blockMeshDict.m4
index b1a3ef09aa..3346cf0861 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict
index c220861f7a..6afabc6923 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict
index c043f03269..cf885b10fc 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict.4 b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict.4
index 340febc076..ee6bfc7e8b 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict.4
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/decomposeParDict.4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition
index 85ec2b7180..c4532c5dd7 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSchemes b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSchemes
index 4057e25844..3cf9b12102 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSolution b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSolution
index d9c777dd56..3d519b1e5e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSchemes
index 5b0fe67868..79ee419bfc 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution
index e5d852b05d..f31b7ead9a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/U
index 68288bd161..c8013f2f30 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/p
index 8a1c3223e2..b08c880794 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/transportProperties
index 144e84eb77..b4b49dcfe5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.coarse b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.coarse
index a7f56b32be..65cab9b806 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.coarse
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.coarse
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.main b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.main
index f1d3c09051..8e41cd2bc5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.main
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/blockMeshDict.main
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSchemes
index ad9b570072..8ed14953e1 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSolution
index 75aaa96810..a2d8e87377 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/coarseMesh/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/decomposeParDict
index 7caec4995d..e0e45f0e72 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSchemes
index b550922305..a79c118913 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSolution
index ab45dfa831..3ca9f2fc90 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/mirrorMeshDict b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/mirrorMeshDict
index 948afc1a17..ca702aeb17 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/mirrorMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/mirrorMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict
index 2e7b86770b..3a2073040b 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/U
index 1c2ebc6780..c86dfb2ace 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/Uf_film b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/Uf_film
index fd8c4daa6c..5d7dd5181b 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/Uf_film
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/Uf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/hf_film b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/hf_film
index 22229d432c..24bea55060 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/hf_film
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/hf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/p
index 8f7015ef70..639ff8f9fa 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/g b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/g
index b1796fb306..ba243325b0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/g
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/transportProperties
index f62b6fb84f..c606201a34 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/turbulenceProperties
index 75ee03c2f8..052650a257 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/blockMeshDict
index 4593ad1dd1..a0f934742c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/controlDict
index d60ccb9aac..2f594eed02 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict
index b49da69493..2c192e3065 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.16 b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.16
index b7ca7ac35f..ce2b3f32ad 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.16
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.16
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.4 b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.4
index bbcde4c620..0895467a7c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.4
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.8 b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.8
index ff678e1c6b..77b6e341a0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.8
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/decomposeParDict.8
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition
index aa05b9f6e6..39e4b05c49 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSchemes b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSchemes
index bdd44966b4..cc1a1ec5c0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSolution b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSolution
index f6402822b0..8b03d0f112 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSchemes
index 8b23a2130b..2b02cee8ca 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution
index 6f9479de33..2a8eebf38a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U
index a8d63e02d8..3825c46c9e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/Uf_film b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/Uf_film
index 1f723e71a4..c3ecbc8d7a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/Uf_film
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/Uf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/hf_film b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/hf_film
index d24c38c8fb..25b1932df7 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/hf_film
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/hf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/p b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/p
index e443f4c50b..8c1a98018c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/g b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/g
index 319a516a0b..32f438cd65 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/g
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/transportProperties
index b274228fa4..a01c48199e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/blockMeshDict
index 4aa21c0e34..497b2fab27 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/controlDict
index 964be52574..98c6b964c8 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/decomposeParDict
index 05673ffdfc..6020aef9e8 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition
index 6d811b00cd..e47aaee463 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSchemes b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSchemes
index d2add46d64..83e5191625 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSolution b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSolution
index 0b89a066f6..37edd4ac93 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSchemes
index aa3877ee3d..ae182e054e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution
index 80490dae3e..1181627ef1 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/U
index 04bc2091c6..0453db654d 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/epsilon
index 37fcd342aa..d7f18ca599 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/k b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/k
index 302beac1de..ea20e13a98 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/nut b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/nut
index cadb31f85a..62e92d7529 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/p
index 10ca0b37a8..a5962db3c5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/dynamicMeshDict
index 18495c9375..bffb9e20b6 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/blockMeshDict.m4
index 7c7d3e19f6..b10feed5d7 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/blockMeshDict.m4
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/controlDict
index 5ce44e57b0..c11e90db16 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/decomposeParDict
index 3d02aa9143..dcb32a5a1e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSchemes
index aa3877ee3d..ae182e054e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSolution
index 958b1d6e2d..1c25f4cbff 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/topoSetDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/topoSetDict
index f9488198e9..fdb2821114 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D-topologyChange/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/U
index 8a3fa79c54..b9104a72ca 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/epsilon
index 0493ae776f..08be517485 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/k b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/k
index d4a21b34c2..cd6f7d61d5 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/k
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/nut b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/nut
index 5f000f85a9..be1b21cd9b 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/nut
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/p
index a279fcd702..31d8018b3a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/dynamicMeshDict
index b381a92353..e51f9c2504 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/blockMeshDict.m4
index 14e2488e7e..079b4e4d49 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/controlDict
index 4eb0fcf158..12b7328e85 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/decomposeParDict
index 992c12dd62..7f9ec8d22f 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSchemes
index aa3877ee3d..ae182e054e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution
index 958b1d6e2d..1c25f4cbff 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/topoSetDict
index f9488198e9..fdb2821114 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U
index c69b450e7e..05003e916e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p
index a43c76b1ec..dc1f8f176a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx
index 2dc37c4386..1e9e312fd0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/0/pointMotionUx
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict
index f7de446eef..2535ad9991 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/blockMeshDict
index b93eadebb7..e2c78e515f 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict
index e9adbcb6ec..bc47f1094f 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
index 0b5cb1f2e7..51447cb0a3 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/cuttingPlane
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSchemes
index ada8bd51b3..fdb23ac7d7 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
index a9866692c8..ef44c8ccfc 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U
index 8fce4d478c..a4ed318387 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p
index a19c140af7..0034a57876 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
index 6d572f1efe..ae96875ae8 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/0/sigma
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties
index b274228fa4..a01c48199e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties
index 4f7931bbb5..db60970e74 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict
index c4f70627b8..ea281226db 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
index 7e3625fb4b..3b2cba3dbe 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes
index 25b2a4e995..ac03edf4f2 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution
index 41712ceb0b..736f3a301f 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/turbulenceProperties
index e3b4556e89..023983bcad 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Maxwell/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/turbulenceProperties
index ca63eb2b45..e543a88b82 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/Stokes/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/U
index d01835428e..38cd2faef4 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/p
index cb097318ba..8dad002357 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/sigma b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/sigma
index c5d045b6c1..7bf59db24c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/sigma
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/0.orig/sigma
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions
index eabd879b6f..19e29afbc4 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/transportProperties
index 0572e473c0..b97d808562 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/blockMeshDict
index 124bf2d549..4b3cae3176 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/controlDict
index 6a3fc17af4..258a88e15a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/decomposeParDict
index fb6f153fd3..e8c43d7b9a 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSchemes
index 48fb20dfa2..f534128a57 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSolution
index 8547c6fc1a..3fdd33b326 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/U b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/U
index a09e0bab01..049239c898 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/U
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/p b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/p
index 7714c98e64..bfd2f271c3 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/pointMotionU b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/pointMotionU
index 6994eebbaa..9f5fc66ed0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/pointMotionU
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/0.orig/pointMotionU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict
index d6eafd1be3..2a6abaa4df 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/g b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/g
index 1ed7b5a644..3b9f3fd837 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/g
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/transportProperties
index 3c8618bc90..b61bdce4b9 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict
index 281e4119e0..df0698c9b4 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
index 1c4c2ccca9..c9dc01a261 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict
index aa48422bb7..4204a120b0 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition
index 050b1977f8..2bc01a9567 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes
index d8315bfac8..ea11865d9f 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution
index eaa8407f81..18bbb6e4a6 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes
index 1113195ee9..aad42ec7dd 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
index 61c157d9d9..790903bef6 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
index 7e0fc056cd..dc6de574e4 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes
index 376533a45d..23142131d8 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution
index ded0f556dd..769de34774 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties
index 867844a900..01c841e4c1 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U
index 066524fc4e..e7ec3d6b8c 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches
index 45a6f96438..dc0002966b 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions
index dbca4e544a..479d1b696e 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k
index a4c5ab77a5..23b60b1462 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda
index dcfd6ff24c..e59f7672f9 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut
index a4cce9436e..9be76fbfe9 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p
index fec1f2e2fd..88e7286ac8 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/transportProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/blockMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/blockMeshDict
index bebcc49c3f..c7cd84353b 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
index 926dd90b72..e250112f68 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict
index f9a0e49a58..c445a5fdcc 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.hierarchical b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.hierarchical
index f9a0e49a58..c445a5fdcc 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.hierarchical
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.hierarchical
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.ptscotch b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.ptscotch
index 0ee19ccb00..96418a5e12 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.ptscotch
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/decomposeParDict.ptscotch
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/forceCoeffs
index 7d8af558b9..18046383e4 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/forceCoeffs
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSchemes b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSchemes
index 81cc7de499..50be20bca1 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSolution b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSolution
index 66bfbd6425..f550deb971 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/samples b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/samples
index 4f4394603a..be9252e534 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/samples
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/samples
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
index 7c4ee7f341..c4c8d9117d 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes
index 2f357f2e94..4728b24fad 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/stabilizationSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
index b8f64844c7..b4dfa8b9c4 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
index cfd7e58221..e0a18294a5 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U
index cbf5787fa1..a9aa6df0fe 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k
index 326e640540..e0f6ebc598 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda
index 7cfe18f01e..6b747e0cf5 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut
index 92fa7d0624..00efbc1fea 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s
index 6d76321788..41edfc3556 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/0/s
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/transportProperties b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties
index 8aa8de3714..91df1f3119 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
index a9d7dbab74..785cafb469 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes
index 12cfbe98f2..bbfcf9af33 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSolution
index 02e51a1241..492f2a2845 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U
index ffad41ddb8..6d79fb260f 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k
index e7177a6943..477d954047 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda
index 7f06ba15e4..34dcb7d807 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut
index 92fa7d0624..00efbc1fea 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/transportProperties b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties
index 011803a770..a8ac0c8675 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict
index 2c37432518..f1a462b0ec 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
index c57193ef91..f78ca05163 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/decomposeParDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/decomposeParDict
index 53ef274957..d3242b64fc 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSchemes
index 16b9d0f857..ac369b32f2 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSolution
index 0f1eb17f96..5a790128be 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/U b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/U
index b231f451d8..7325fb400b 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/U
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/epsilon b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/epsilon
index 7005eb67ed..e07783d238 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/epsilon
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/k b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/k
index 9ad6913a2a..6ea7038569 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/k
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nuTilda b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nuTilda
index 06be6025c5..85a9767e9e 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nuTilda
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nut b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nut
index 345de0c3ee..e4bbb032ef 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nut
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/omega b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/omega
index 5b508c80ab..3856daf917 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/omega
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/p b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/p
index ab5f1fc3c2..4314e4e873 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/p
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/constant/transportProperties b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOCourantNo b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOCourantNo
index 21439b9d3d..a566ac1824 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOCourantNo
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOCourantNo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambVector b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambVector
index 9d82c354b5..4d7b495260 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambVector
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambVector
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambda2 b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambda2
index 43c4dc6592..3549bdd927 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambda2
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOLambda2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOPecletNo b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOPecletNo
index acdd9afc6e..4308b28759 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOPecletNo
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOPecletNo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOQ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOQ
index e7ef724fcf..beb9bd593e 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOQ
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOQ
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOadd b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOadd
index b6801549da..4de5c31068 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOadd
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOadd
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOblendingFactor b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOblendingFactor
index 35ce16d728..09896308fc 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOblendingFactor
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOblendingFactor
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcomponents b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcomponents
index f9a0924c3e..de5bc609ab 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcomponents
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcomponents
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcontinuityError b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcontinuityError
index f6198fbe69..9c881fc880 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcontinuityError
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOcontinuityError
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt
index 45e1e67d49..5bb04782e6 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt2 b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt2
index 6bf45563a2..fbea1eee3f 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt2
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOddt2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOdiv b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOdiv
index 0e9027e61f..4a33169ef2 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOdiv
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOdiv
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOenstrophy b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOenstrophy
index 023c4a0e17..b0101ffbe7 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOenstrophy
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOenstrophy
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOfieldAverage b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOfieldAverage
index 3556cee68d..a7047ad5e0 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOfieldAverage
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOfieldAverage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflowType b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflowType
index e6160270c5..f66f72022a 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflowType
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflowType
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflux b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflux
index 0bf2760636..c0759fce2f 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflux
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOflux
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOgrad b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOgrad
index 3a0861f023..9ca516ebfa 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOgrad
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOgrad
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOhistogram b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOhistogram
index 5a8af9cb3c..0a5e8fd90d 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOhistogram
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOhistogram
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlimitFields b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlimitFields
index bd403b7353..768d3f7b25 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlimitFields
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlimitFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlog b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlog
index 7b0c446c01..c50cee78b8 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlog
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOlog
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmag b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmag
index 991219e7bd..937d3d7a75 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmag
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmag
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmagSqr b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmagSqr
index 31cb265e97..7d439ed83a 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmagSqr
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmagSqr
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmomentum b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmomentum
index 0f4385a325..2f623aad81 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmomentum
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmomentum
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiFieldValue b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiFieldValue
index 09e0bd3df8..9db056f72a 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiFieldValue
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiFieldValue
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiply b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiply
index d29ce710fd..5d4f27a8c8 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiply
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOmultiply
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnearWallFields b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnearWallFields
index 7dfbcd1530..f3b648d584 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnearWallFields
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnearWallFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnorm b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnorm
index 8a2be3d147..0a83bbc216 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnorm
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOnorm
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpow b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpow
index 5041180b91..6b86da462c 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpow
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpow
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpressure b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpressure
index 0de8c6fa80..7079ce8551 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpressure
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOpressure
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOprocessorField b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOprocessorField
index 4db98fa49e..e3455f083a 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOprocessorField
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOprocessorField
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOproudmanAcousticPower b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOproudmanAcousticPower
index bb5105c3c4..2075ad7a0d 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOproudmanAcousticPower
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOproudmanAcousticPower
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOrandomise b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOrandomise
index 1df4a52225..657a89e737 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOrandomise
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOrandomise
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreadFields b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreadFields
index 5e3b91d019..930266c24d 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreadFields
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreadFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreference b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreference
index 7d2970408c..15a44e90bd 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreference
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOreference
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsetFlow b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsetFlow
index 97056d7682..6697574d63 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsetFlow
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsetFlow
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsolverInfo b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsolverInfo
index 7d57550d64..8da657664d 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsolverInfo
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsolverInfo
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamFunction b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamFunction
index 2cc3260036..9860361800 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamFunction
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamFunction
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamLine b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamLine
index dcd7c00407..563626444a 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamLine
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOstreamLine
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsubtract b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsubtract
index 8e5f60f417..87c99d325e 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsubtract
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsubtract
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceDistance b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceDistance
index 442306467e..e13a6eb0f4 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceDistance
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceDistance
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceInterpolate b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceInterpolate
index 37638fee7b..9eaa584c7b 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceInterpolate
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOsurfaceInterpolate
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOturbulenceFields b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOturbulenceFields
index df3f018404..cc8c1a68f7 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOturbulenceFields
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOturbulenceFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvalueAverage b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvalueAverage
index 00733ffe7b..23491abc19 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvalueAverage
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvalueAverage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvolFieldValue b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvolFieldValue
index 2690ef3d13..345235da06 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvolFieldValue
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvolFieldValue
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvorticity b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvorticity
index 3a25bf9ee1..3c8ee3ae03 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvorticity
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOvorticity
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellCentres b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellCentres
index 78c0fb9203..2158ff2adb 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellCentres
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellCentres
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellVolumes b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellVolumes
index 1ec79941e2..a1dc66711f 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellVolumes
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOwriteCellVolumes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOzeroGradient b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOzeroGradient
index 9d61079aee..8275a737fe 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOzeroGradient
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/FOs/FOzeroGradient
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/blockMeshDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/blockMeshDict
index 82abd9a71d..15eb812cce 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict
index cb9f93ee13..7d7efa59c0 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/decomposeParDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/decomposeParDict
index 90aecf8f48..f86a931e9e 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes b/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes
index 6ad8d9e7f5..3735ff9915 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution
index ef1de11b93..bf624e93cf 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict
index e3878fbcbc..19f5459e7f 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict
+++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U
index b231f451d8..7325fb400b 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon
index 173d607218..db240c3f57 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k
index 714b52cc5f..3b555a2a31 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda
index 83b97ab8ae..45dd9aa234 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut
index 8970ab4b60..9430e22c60 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p
index 7019744453..13954fbcc8 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/transportProperties b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/blockMeshDict b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/blockMeshDict
index d39bfb241f..328f5db2aa 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/controlDict b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/controlDict
index 1250642d95..73192b9e9d 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes
index cf15a88978..ac7392ea8d 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSolution b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSolution
index 092cea6a0d..c360753f70 100644
--- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/U b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/U
index cbe3b1ed01..b52b49b3b2 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/U
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/p b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/p
index 5d7a5f4e4d..1151a5f315 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/p
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
index 4b387d49bf..2ab1074120 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties
index 57296e0c50..75c7d93ae3 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict
index 96e296c8ee..16e53b0f10 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict
index 8ca3e3515d..71e8675975 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes
index 4dc6638b1e..8c8ebf8401 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution
index ef1de11b93..bf624e93cf 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
index 9d5cfd4890..53933a89ac 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/T b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/T
index 4860100629..cb880d6bd4 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/T
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/U b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/U
index 1be8553012..cae6e27a0c 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/U
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/epsilon
index f211171cb7..34bc8c4a2a 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/k b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/k
index d9ee57413b..2735311a65 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/k
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/nut b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/nut
index ed3eb03541..777e315324 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/nut
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/p b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/p
index c9c4418c32..87930cae38 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/p
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/blockMeshDict b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/blockMeshDict
index 7d676cc628..baa58b2f58 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/blockMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties
index 71723690b4..fd03671262 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/turbulenceProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/controlDict
index 405f95e53d..086907bcac 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSchemes
index 3e57d99959..5d8af23001 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSolution
index 22526bd211..c0a738a352 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/controlDict
index 9ff6fdd4e9..1cd2287a9b 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSchemes
index 8fb3e46b25..4e591a2393 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSolution
index 1a5351aefe..3b6915836d 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/T b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/T
index 8c0cc314f4..c0a9830469 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/T
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/U b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/U
index 401856c059..ce301a3f9a 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/U
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/epsilon b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/epsilon
index cf395c6c52..d24fb7a965 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/k b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/k
index 3b7f0e7871..eb5536b0bc 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/k
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/nut b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/nut
index ddf9a3b16c..9c84307953 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/nut
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/p b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/p
index 32d0d19b5a..99afcfb58b 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/p
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
index 48b5650f37..40a2c12276 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution
index 01d2f62376..68286bd341 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution
index 01d2f62376..68286bd341 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict
index 6bf24ab4ee..d422a4499f 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces
index 6bf24ab4ee..d422a4499f 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces
index 8f6fe27dfd..94506b733a 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict
index 4e9144c533..4cd20b5201 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
index c35573db89..ef8f8960a9 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
index 8fb3e46b25..4e591a2393 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution
index 01d2f62376..68286bd341 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces
index e992dd97ce..1b2af35c9e 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
index e93b5d114c..2a464a2911 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions
index 5c8b32ab18..bdf85ea2d4 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
index c36e913d22..24c28c542b 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h
index 5393fe9f38..d5a2591523 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h0 b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h0
index edc49596c1..ad7f31d613 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h0
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/h0
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hTotal b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hTotal
index df2472f43a..24c758708f 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hTotal
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hTotal
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hU b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hU
index ec10751b5b..eb7b4c41d2 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hU
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0.orig/hU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
index e61567a2f4..860c1a20c4 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
index fc28170bdb..9d9b216867 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index 89c99b5983..30fe054c83 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
index a8bb6fb5cb..4ab85c3cbd 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index f2446d0477..3ea752bbaa 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
index b5574e8f73..f7202d144b 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/ReThetat b/tutorials/incompressible/simpleFoam/T3A/0.orig/ReThetat
index 3284d9142b..3cac164b15 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/ReThetat
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/ReThetat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/U b/tutorials/incompressible/simpleFoam/T3A/0.orig/U
index cdd3f51130..7fad37c2bf 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/gammaInt b/tutorials/incompressible/simpleFoam/T3A/0.orig/gammaInt
index 55768ce343..afb76173ba 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/gammaInt
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/gammaInt
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/k b/tutorials/incompressible/simpleFoam/T3A/0.orig/k
index dd9628d7b1..03d6e81cd2 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/nut b/tutorials/incompressible/simpleFoam/T3A/0.orig/nut
index 4537d94138..c9ab54c2d1 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/omega b/tutorials/incompressible/simpleFoam/T3A/0.orig/omega
index 1e4262f1bd..db0da10327 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/0.orig/p b/tutorials/incompressible/simpleFoam/T3A/0.orig/p
index 16d8d40bce..0e37f1b486 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/T3A/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties b/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties
index 192cc12ae8..e863db7b4f 100644
--- a/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties
index 0ea1410840..91fcab6ddf 100644
--- a/tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict b/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict
index b41d573b63..99b7d16384 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/controlDict b/tutorials/incompressible/simpleFoam/T3A/system/controlDict
index 0cda533d6f..c99d592833 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/T3A/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes b/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
index e35f6b45ef..22f5b60c92 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/fvSolution b/tutorials/incompressible/simpleFoam/T3A/system/fvSolution
index 30e75da8bf..96624f967e 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/T3A/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/U b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/U
index 40f59d7b01..70c8304f0c 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda
index 814a80dd07..a849c461e2 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut
index 29b9783281..7d210f08ca 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/p b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/p
index c0e99feec0..b8f68d3a35 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
index bd62042765..ea3f0f04bd 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
index 1e1666d82c..48fd96747f 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/decomposeParDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/decomposeParDict
index 6c8b2266fb..1b5ddcc14c 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
index 024130bf1f..6ebccacc54 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
index 72ecf3b874..8e51ea09f8 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/U b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/U
index 16c4dde3a0..135174ee47 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/epsilon b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/epsilon
index 35c032cd4a..0bad8f256f 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/k b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/k
index 8a7a0a1897..3d7453b0bf 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nuTilda b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nuTilda
index 9564aea4a1..8a20deb783 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nuTilda
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nut b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nut
index abdb16a3e7..4b9e229931 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/omega b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/omega
index cbbfddf740..c43f1bb09c 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/p b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/p
index ad51f6aee0..0cbb8d196e 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/transportProperties
index 00ab47565b..227772dab7 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/blockMeshDict b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/blockMeshDict
index 7811823bae..89eee17789 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/controlDict b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/controlDict
index 32f974c595..f0d7027d6f 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSchemes
index 251efebef6..2e9c690a28 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSolution b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSolution
index df1e90e428..43934cbddf 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nuTilda b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nuTilda
index 734bb1f282..362284a621 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nuTilda
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/turbulenceProperties
index 0aca70ef80..358414f0ad 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/SpalartAllmaras/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/U b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/U
index 1e91ba55c3..5439c2c081 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/nut b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/nut
index daa9e59d4a..702ff50da3 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/p b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/p
index 8d083ff4d6..3b68857d54 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/constant/transportProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/constant/transportProperties
index 128e5dd69a..9674050a10 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/blockMeshDict b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/blockMeshDict
index 1d628995d4..5a34628156 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/decomposeParDict b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/decomposeParDict
index 05f387e449..74689219be 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSchemes b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSchemes
index b2fc08a6c5..c00416e229 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSolution b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSolution
index e2433c1221..5a5843c71f 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/epsilon b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/epsilon
index a81ef961c2..44dc06ace7 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/f b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/f
index 8c57d1126a..6cc9bb73b9 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/f
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/f
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/k b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/k
index 6ff9150c8f..69cf4f544a 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/phit b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/phit
index f561685ee5..163d006baa 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/phit
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/0.orig/phit
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/turbulenceProperties
index eccd1563fe..aa927479e8 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kEpsilonPhitF/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/k b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/k
index 6ff9150c8f..69cf4f544a 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/omega b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/omega
index fb05c542f0..5831e80cae 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/bump2D/setups.orig/kOmegaSST/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/U b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/U
index bcbd1647cd..6830c2a536 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/epsilon b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/epsilon
index 45dd36ac16..0d8d7b2f98 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/k b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/k
index bd977808de..94f3bb7654 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/nut b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/nut
index bd7b4754fd..adea63c108 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/p b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/p
index c4a4dc7ce3..9c2bf2f9af 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties
index efa41dc8ff..a758a51421 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
index 6532dfe601..46e3e0ac1e 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
index 57f9c94947..e7382c7c13 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution
index 0f018c91f9..e9f4fee742 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/U b/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
index 58cc8690a1..6ddbb44c2d 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/fixedInlet b/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/frontBackUpperPatches b/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/frontBackUpperPatches
index 3b9d18028b..55be3e502c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/frontBackUpperPatches
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/frontBackUpperPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/initialConditions b/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/initialConditions
index dbca4e544a..479d1b696e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/initialConditions
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/k b/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
index 88d14e8109..a25187722d 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut b/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
index 94069dfcf8..db596167ac 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega b/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
index 9ae6196b04..d847491092 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.orig/p b/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
index 9316485d69..47624d32a3 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
index b0a2e850e7..521df2290a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 21b16190dc..9aecedd86a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index 8d13ccb411..810d43a8ae 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6 b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
index dfe6938530..e78c1f97be 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index f07ed2bcdf..8a7d36ccaa 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index c147a6857c..4b21dfc62c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict b/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 6c88d35008..f2736a04bf 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index cb3e4e389f..f955a9f23a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
index 7952ec94df..a34c88a5ae 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/topoSetDict b/tutorials/incompressible/simpleFoam/motorBike/system/topoSetDict
index 7f0142e8ce..ee9b0d82df 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 7f10283e61..8d27bff2ae 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
index df4c9d7015..a4b4bd81b6 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
index 5e4d6082b8..cdba718a94 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
index 3e62bf676f..618bbbc8dc 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
index 1482715711..d2ee573fa1 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
index 83128d3e31..be1fd0e74d 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
index 6c67fecf4f..a0c2c7dbda 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
index 2294fba7ae..4a12f05cc4 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
index 040228c11b..92de121054 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
index 8ee4ffc464..df4a12f34c 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
index d8b1447e97..ab959bf036 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict
index 042d6b7840..32c1f56cc5 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
index aa483d3833..a9a1ec58ed 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
index e04fe2cc03..9a94f169f5 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
index 450da1ea4b..62768163a8 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/U b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
index 930d35239e..a128f627c0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
index 1843167dd1..c62eb525b4 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/k b/tutorials/incompressible/simpleFoam/pitzDaily/0/k
index b554a70c8c..f23394d5a0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
index fc3415d301..2994f15eaa 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
index facc69b85a..96ca00fe19 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/omega b/tutorials/incompressible/simpleFoam/pitzDaily/0/omega
index 637ec79b0e..95e07743b7 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/omega
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/p b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
index 2b999dfe3d..ff65099087 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 91036f262f..16d8f53356 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
index a8f7b02f64..7a793acaaf 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index 3bb7f018d9..ea8649dbf5 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
index 2d340e7eec..13540f32f0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
index a1c69a353a..c3575dfe65 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
index 8681cc2055..420d3557c5 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
index fc3415d301..2994f15eaa 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
index facc69b85a..96ca00fe19 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
index 069fb5732c..d6f7759be3 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
index 6cc5a123b0..d11d7b65d0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index eecec74561..62e9c88624 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
index 8fef7d836b..27a4b861b2 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
index fc795ca529..f00e55b18d 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U
index 7ae0241968..c661d80f6c 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p
index c8e5d605de..83fbaa343c 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/MRFProperties b/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/MRFProperties
index 78da2c7ae4..c4d0eb786a 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/MRFProperties
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/transportProperties b/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/transportProperties
index dbf280b95a..cf186607d8 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/turbulenceProperties
index 1d19e7c656..dfac3d18a4 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict
index fbf56d7f0e..0a107ae883 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict
index f6f722ccae..b256c219c3 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSchemes b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSchemes
index 5d79ed8efe..673948c3b8 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSolution b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSolution
index 86b4c206d7..2362e27aa5 100644
--- a/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/rotatingCylinders/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/U b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/U
index 02cba6ce98..c80cd26b63 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/k b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/k
index f84ab13a6d..487fee1c57 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/nut b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/nut
index 8a583396f4..7063fae4ae 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/omega b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/omega
index bd6276ed90..69c3746fb7 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/p b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/p
index 91093c5f55..c56138701d 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties b/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict
index 6356948fe8..96848d2485 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict
index c6e0c054f6..0fa1ac7238 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
index 4c7749af70..174919730b 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
index 8048f2d99b..4e5cf23dbe 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution
index 8cda80056e..4e8f537bee 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict
index ec23d31e93..9f1dd2bf6a 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
index 78c851daea..fe6142bff9 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict
index b00854baf7..657d89a853 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/U b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/U
index b0fb2cc438..8e0923656f 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/epsilon b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/epsilon
index 95a75d9715..ab4ed752ad 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/k b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/k
index fbbb8d7d0a..669ba7605b 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/nut b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/nut
index eb8afd83a9..f7625e7f9d 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/p b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/p
index 753cd19d67..eb50f7a8b9 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/simpleCar/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/constant/transportProperties b/tutorials/incompressible/simpleFoam/simpleCar/constant/transportProperties
index e64d2912ee..dda90a3b45 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/simpleCar/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/simpleCar/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/simpleCar/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/blockMeshDict b/tutorials/incompressible/simpleFoam/simpleCar/system/blockMeshDict
index 57a66d0d30..5c4f18bac3 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict b/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict
index 7a09ee7f56..3fc5b84e8c 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/createPatchDict b/tutorials/incompressible/simpleFoam/simpleCar/system/createPatchDict
index 7caa4a5e4e..5d3e548fe2 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/createPatchDict
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions b/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions
index c1f36f9331..abe6ee009d 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes b/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes
index 3e57d99959..5d8af23001 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/fvSolution b/tutorials/incompressible/simpleFoam/simpleCar/system/fvSolution
index 07f4f0abdc..35ea5c8d0d 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure b/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure
index 82cb76de02..15d5d0379a 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict b/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict
index a0381519c2..0b64d39f71 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/0.orig/U b/tutorials/incompressible/simpleFoam/squareBend/0.orig/U
index d7722edf39..e4b1c969c3 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/squareBend/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/0.orig/epsilon b/tutorials/incompressible/simpleFoam/squareBend/0.orig/epsilon
index e8662d01c6..325ed0a4f8 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/squareBend/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/0.orig/k b/tutorials/incompressible/simpleFoam/squareBend/0.orig/k
index ce18837632..2e60a55fcd 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/squareBend/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/0.orig/nut b/tutorials/incompressible/simpleFoam/squareBend/0.orig/nut
index be8c37f6c1..e3a525963e 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/squareBend/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/0.orig/p b/tutorials/incompressible/simpleFoam/squareBend/0.orig/p
index 758a13fd2d..ea88668895 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/squareBend/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/constant/transportProperties b/tutorials/incompressible/simpleFoam/squareBend/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/squareBend/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/squareBend/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/squareBend/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict b/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict
index 76845eca3e..0d1f1e029d 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/controlDict b/tutorials/incompressible/simpleFoam/squareBend/system/controlDict
index 34255b6020..bb00354469 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/decomposeParDict b/tutorials/incompressible/simpleFoam/squareBend/system/decomposeParDict
index 5b4c22f8fd..bcc21c4b6f 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes b/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes
index 91a3f6db61..c749892850 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/fvSolution b/tutorials/incompressible/simpleFoam/squareBend/system/fvSolution
index c2c196112b..797ab81d2d 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/sampling b/tutorials/incompressible/simpleFoam/squareBend/system/sampling
index d7e16352c7..34008351b0 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/sampling
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/sampling
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/topoSetDict b/tutorials/incompressible/simpleFoam/squareBend/system/topoSetDict
index d5d0c6ae5b..73f9fc710e 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U
index e1c65d153b..06852cfb54 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/epsilon b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/epsilon
index d8afed0a01..f969a1d9f4 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/ABLConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/ABLConditions
index c27666121b..1839764837 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/ABLConditions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/ABLConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/fixedInlet b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/fixedInlet
index 8f3a7c232b..32732d5186 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/fixedInlet
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/fixedInlet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/initialConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/initialConditions
index 3f6b14e451..986d29ab14 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/initialConditions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches
index 48d2c022e0..c725f10898 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k
index 2c7ade8ca7..8051254c88 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut
index 3ca7b28a6e..1d618a5fad 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p
index 5998d31c8f..2732c9d416 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
index d57e3ff1aa..2407024157 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
index 4b69dabf9d..3d01748a52 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
index 7483b6e614..1113e9015e 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
index b7a1dd502e..25060de153 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
index 4af20b843f..4f80c652fd 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution
index ee708a6c89..e2ef14eaee 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprBoundaryFieldsDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprBoundaryFieldsDict
index 174dc92fe3..4ba930ef24 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprBoundaryFieldsDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprBoundaryFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprFieldsDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprFieldsDict
index 1d8f6b3714..28fac47bca 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprFieldsDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/setExprFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
index e919b3ba97..ddf13e530e 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
index cdf670fa2d..841237c460 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/U b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/U
index 64baf122f4..f4f54b65f1 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/p b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/p
index 8990135ae1..efa213ab0e 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/constant/transportProperties
index c1feb4cb47..73b3849b75 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/blockMeshDict.template b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/blockMeshDict.template
index 977a811c13..0c92e89178 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/blockMeshDict.template
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/blockMeshDict.template
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/decomposeParDict b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/decomposeParDict
index 433d8fe5c8..91cd140582 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSchemes
index 7c123f7b42..574781cd8f 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution
index dfdd0f1491..5f64b46f73 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/epsilon b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/epsilon
index 2964efdb4c..bb679ddd0b 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/k b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/k
index d5a7fd34c8..09db769075 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/nut b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/nut
index e7fdadac4a..b97c5032d5 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kEpsilon/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/k b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/k
index d5a7fd34c8..09db769075 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/nut b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/nut
index e882d7dba4..2dff923a84 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/omega b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/omega
index 96ca16c883..3001e2a2eb 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/setups.orig/kOmegaSST/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
index eb1ee65fc2..5c8b76fdd1 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
index 4f9854a87a..d707667c69 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
index 6d052d5570..45f7e8cfd2 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
index 4e44d98c7e..540774aef2 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
index 1396438a4b..8a375bac29 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict
index feaabba521..acc548a5d9 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
index 3b33241848..1dad269096 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/decomposeParDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/decomposeParDict
index 02eb77a65c..6c02cf2f87 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
index df1b6cd9e1..fc6960f11e 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution
index fe636fb4b7..e501b09550 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict
index ec23d31e93..9f1dd2bf6a 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
index 658624df61..f80a4232ae 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict
index 325903ca40..3f01199bf7 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
index aa6143060d..6fdf5c59b8 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
index 411f6f8c58..aec951f2b6 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions
index 712e9e6a39..5493dfff3b 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
index e2610ced1e..4259bd6e14 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index 6382d9a338..5545a38e66 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
index 6ebf75a417..7fa11fef6f 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
index aaf41fcd4c..d59e02fd43 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
index 2fb742de6d..d5677187f4 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes
index 4f447c7b1a..5a636d3b0d 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
index 35404d35fc..f8677fe548 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air b/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air
index a7363651c8..7ebb083f61 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/0/p b/tutorials/lagrangian/MPPICDyMFoam/column/0/p
index bdd676a675..e97a27d5df 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/0/p
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/dynamicMeshDict b/tutorials/lagrangian/MPPICDyMFoam/column/constant/dynamicMeshDict
index 1e7be80b24..03f02371f1 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/dynamicMeshDict
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/g b/tutorials/lagrangian/MPPICDyMFoam/column/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/g
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudPositions b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudPositions
index 223898d26f..eb06eb98b4 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties
index 42ee4dddde..8bdcd09c7a 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICDyMFoam/column/constant/transportProperties
index 6382d9a338..5545a38e66 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICDyMFoam/column/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/system/blockMeshDict b/tutorials/lagrangian/MPPICDyMFoam/column/system/blockMeshDict
index 1ebc408f08..ceccac3dcf 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/system/controlDict b/tutorials/lagrangian/MPPICDyMFoam/column/system/controlDict
index 45137f4d03..3d439490e2 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/system/controlDict
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSchemes b/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSchemes
index 70c7c730f8..7ae1974553 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSolution
index 4d84aa5a79..dc83cebe05 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSolution
+++ b/tutorials/lagrangian/MPPICDyMFoam/column/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/U.air b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/U.air
index f5e1586cee..f8e6e47bf3 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/U.air
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/p b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/p
index 21946e5409..f8d7ca9aef 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/p
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/dynamicMeshDict b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/dynamicMeshDict
index aaccaa0404..8e6d2eba66 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/dynamicMeshDict
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/g b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/g
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties
index ed66d88152..23cfd0c648 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/transportProperties b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/transportProperties
index 6382d9a338..5545a38e66 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/turbulenceProperties.air
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/blockMeshDict b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/blockMeshDict
index 0cf11bc206..29d3a60953 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/controlDict b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/controlDict
index c149405650..f2ee93d3f4 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/controlDict
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSchemes b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSchemes
index b712b5c3c6..23a1642f17 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSolution b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSolution
index d8449625c8..712f95b84d 100644
--- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSolution
+++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
index 1937ccf776..6649cf270e 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
index 7207a9c831..d071fe3860 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions
index 712e9e6a39..5493dfff3b 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
index 2bde4e46a5..a3aab3e217 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index 7aa9f4ff47..f81d20872e 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
index 9cea34847b..ac970f3a01 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
index 4a70fd3dfe..efb5490617 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
index f42a8ba551..2532cff43c 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
index d90b791b90..5d076d9614 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
index faa1794fe6..5df8cddf65 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/U.air b/tutorials/lagrangian/MPPICFoam/column/0/U.air
index a7363651c8..7ebb083f61 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/column/0/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/p b/tutorials/lagrangian/MPPICFoam/column/0/p
index bdd676a675..e97a27d5df 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/p
+++ b/tutorials/lagrangian/MPPICFoam/column/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/g b/tutorials/lagrangian/MPPICFoam/column/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions
index 6357cff8d2..623c442671 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
index 3d33ea42d0..e9966a0c31 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index 6382d9a338..5545a38e66 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
index 4175d6c75e..ce51ab0e1e 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/controlDict b/tutorials/lagrangian/MPPICFoam/column/system/controlDict
index 45137f4d03..3d439490e2 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/column/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
index 70c7c730f8..7ae1974553 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
index 5316ee3dfd..957bb21bb8 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air
index 16a9edbbc8..a2bd77d860 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air
index 2da16f5c89..66597b8529 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air
index e46829b176..2fd3b722a6 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p
index b535a61a29..9e7ad9b6ee 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index ebf450c656..829d3937bb 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index 7aa9f4ff47..f81d20872e 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
index 8784e89d47..5512b61602 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
index eb77e5ab5a..5fe1ed6edf 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
index c577c78b36..1c5dc1f7c2 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
index 9744f4d5f8..80ef0702e3 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes
index 10869977f6..86cb67be8f 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
index c16dda3838..b88bd06b8f 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
index 5dbc2bcd46..ebf6ec695c 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
index 11ef8cd552..b359024c11 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
index 753f3485cc..149980c065 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index 22bee792bd..c4c4cf1571 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index 6382d9a338..5545a38e66 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
index b6f47f3902..402ada8f7a 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
index 630aa1795a..4a8e1324ea 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
index 5e15c85f87..9e70ef1c4f 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
index 68d29fcd87..c937f9fbc5 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4
index 146f284ac3..05b642b535 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO
index c8697709fb..9c8b8f95c6 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2
index 79d4cf84b0..1f001c2ef7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G
index 97c0947368..ded9affac2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2
index a4744b1ecb..a2a9d109b8 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O
index 4c64440f38..63fff47449 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2
index a14931ea17..5b5de6b592 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2
index f6ca6e0ac2..457fb0a499 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T
index 7f6676d73d..7b7ffa9d23 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U
index c13f724cdc..dc5865d75d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat
index 425841ae98..933000ec7b 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon
index b55ee479ca..bd13fad0fa 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k
index 0cfb4da056..2177301040 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut
index 9dfbc09aea..ea539cb56a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p
index 3d62fccc90..b50e18ec84 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
index f88948ca34..8423c2dafd 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index bd77771082..2c3b23e203 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
index 6b9a889225..ae5b0107b2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index afd6d42a19..e34f882893 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
index b8b253b232..2fcdb584ed 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
index 3c4b72890d..e108c95848 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
index b908f3cf9b..df160c276a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index 10f0f83e67..275be67275 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
index dc46560758..9793a69ebd 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
index ed350a2c19..f141b0a18b 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 74831d2d3f..cc10638a52 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
index 4f18e369c2..7672e30ab6 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
index b7a34b176d..8bf0528e76 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index e08bb69075..d22f41d946 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
index ff2df684eb..2a6c206b6f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index 747b64a038..8d67221d0c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index 36a5559487..71aabf944a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U
index 8a3fa79c54..b9104a72ca 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
index cd97b1b3b8..8692d5f9c4 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions
index dc8f61bd4b..d69166dda0 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
index 8a041cefe2..0c4c96af5f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties
index 305514ef55..5d3e4b2d41 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
index 9fc575a35b..7b630c973a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
index 00310a1e37..098cfda347 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes
index 160b53c980..38c21968ba 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U
index 9fd32a0795..0d9073f42b 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu
index 87b47b86f4..25e526f761 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho
index e5161614f9..890ffaec46 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
index d79e8a43a6..d7c0046147 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
index fa41f0e560..d1bee83bae 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
index 3f860508dd..c52673d126 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
index b4e9b37d53..61435665ec 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
index a4294bd306..679d64ad5d 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
index 91237570ad..1680b29832 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
index db0b77b604..96580074d8 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
index 12d5bdae6c..87112d5999 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
index be7aae119d..ada381cfcc 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
index dd1b01b2e5..cc8c75fabf 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
index 38f1a147cf..2431452589 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
index fa41f0e560..d1bee83bae 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
index 00952b7e40..02b30ffd30 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
index a51802a839..f79339c3ae 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
index a4294bd306..679d64ad5d 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
index 91237570ad..1680b29832 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
index db0b77b604..96580074d8 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/T b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/T
index 70dde3e341..53a191fc74 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/T
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/U b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/U
index dc8d3bc222..17c443eb5c 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/U
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/Uf_film b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/Uf_film
index dd9a293268..0c7533a1af 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/Uf_film
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/Uf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/epsilon b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/epsilon
index ddc1d0e830..4824c9fd2a 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/epsilon
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/hf_film b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/hf_film
index 7cbb15781c..d2ec9e32bf 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/hf_film
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/hf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/k b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/k
index ac190b5193..54dc2587ba 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/k
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/nut b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/nut
index 290515669f..98c60591db 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/nut
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/p b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/p
index 894b73fb0b..30cd1e0167 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/p
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/g b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/g
index 43241f4daa..51f4cd8295 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/g
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties
index 8d0e0b0fe7..daa6671c6a 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/transportProperties b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/transportProperties
index 305514ef55..5d3e4b2d41 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/transportProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/turbulenceProperties b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/turbulenceProperties
index dad2cedc6a..9ae32e649a 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/turbulenceProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/blockMeshDict b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/blockMeshDict
index d17c563f79..ca238fbf0a 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/blockMeshDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/controlDict b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/controlDict
index e05261400e..50d9f17762 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/controlDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/decomposeParDict b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/decomposeParDict
index 48930fe6fc..a6c7dcffbf 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/decomposeParDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition
index f0d04c2ebb..cf6673c198 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSchemes b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSchemes
index d9486d904b..591064f947 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSchemes
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSolution b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSolution
index 5f2347c30c..e917d1f42b 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSolution
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSchemes b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSchemes
index 7e879f69b7..41bc096572 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSchemes
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSolution b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSolution
index 378275d5bf..cb5ac24f14 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSolution
+++ b/tutorials/lagrangian/kinematicParcelFoam/pitzDailyWithSprinklers/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/U b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/U
index 77294a774f..124d2be74e 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/U
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/p b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/p
index 26f1e7c516..549b91c20c 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/p
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/g b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/g
index 43241f4daa..51f4cd8295 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/g
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties
index d2c39f4271..0fc5b2d4bc 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/transportProperties b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/transportProperties
index 305514ef55..5d3e4b2d41 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/transportProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/turbulenceProperties b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/turbulenceProperties
index 04412329ad..2bde40d9b0 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/turbulenceProperties
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/blockMeshDict b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/blockMeshDict
index 44c1fcfa21..640761fc0f 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/blockMeshDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/controlDict b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/controlDict
index fb9fce0975..65b5f6c254 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/controlDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/decomposeParDict b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/decomposeParDict
index 48930fe6fc..a6c7dcffbf 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/decomposeParDict
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSchemes b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSchemes
index 7a134aab0a..b32b0a8ea8 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSchemes
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSolution b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSolution
index 1f80fc3dd7..1dd378e953 100644
--- a/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSolution
+++ b/tutorials/lagrangian/kinematicParcelFoam/spinningDisk/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2 b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2
index 4a74fa6709..d24afd8967 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2 b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2
index 5cb0c03077..b822cb6246 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T
index 0de98326a3..07162bf02c 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U
index d56fe23696..ce34dd4e11 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat
index 5743618a67..2781e6df12 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k
index 566063452e..b60260148b 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut
index 3068f5fc91..699c140bb2 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega
index 26df9d992f..8a32adab13 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p
index 986cee3c83..d2cf55fab2 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh
index 7d1f07dfce..f95caa23f6 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties
index 731022fe72..32cbcb01fa 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties
index 9fd0cec98d..dafd472e4c 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat
index 6ff4bf0f13..3ad836fcb3 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict
index 718fa4cbd7..e0fc2f0d7f 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties
index 646f1488aa..2bea53a6a1 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties
index 29650e8313..b34db7311d 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties
index 2b5f669791..a442925522 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict
index 7cc8a88b97..13b45e99c9 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict
index f6823d1285..33e4104b16 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes
index f183d668fd..1f08dd45c9 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution
index 856cc1aa25..c7d9adb59d 100644
--- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution
+++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/T
index 804ea946e8..afbc059620 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/U
index 6e16a85652..3906b53dc1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/alphat
index acafc7329a..47b17ae331 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/k
index 25080e756d..392f5965f4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/nut
index e6c18dde4a..bcbe39057f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/omega
index 216f6bd4bf..09a0ea1cd7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/p
index ccffc1d878..14050ab210 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/fvOptions
index 220ebf725f..e62166e354 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/fvOptions
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/g b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/g
index 771559d6a8..af3f186d02 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/thermophysicalProperties
index 86337ebf77..830af8ea11 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/turbulenceProperties
index 31bc03f807..e0977a4a25 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/blockMeshDict
index 944d14c29d..f2e05c4cf1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict
index efddfda14b..16ea7e5bee 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/decomposeParDict
index b9df6409df..d89c8a79e4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSchemes
index fd40ea452c..6076e8bb8d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSolution
index 2145a3144d..0baf93ba09 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/snappyHexMeshDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/snappyHexMeshDict
index e396f01402..67dc3b8de7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/snappyHexMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/surfaceFeatureExtractDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/surfaceFeatureExtractDict
index b4ae4769be..3961b6e46c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/surfaceFeatureExtractDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/CO2 b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/CO2
index 6a20d443ef..6ea148c3a5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/CO2
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/G b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/G
index 9b7bcd524a..8d112875b4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/G
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/H2O
index 7fa2076997..c0b595a960 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/N2
index e40d3198d9..c061bc2f21 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/O2
index 2cf224c022..c0a200f244 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/T
index 675f3826e1..9477d93f25 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/alphat
index acafc7329a..47b17ae331 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/k
index 7b2da5d6ab..2fc47efeed 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/nut
index 42204114c3..affa86149d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/omega
index 07f605f62e..f0c868f050 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/p_rgh
index c7441b4b43..4e0b8f5e39 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/chemistryProperties
index f7c07605fe..ad0bc04374 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/fvOptions
index 93f0aacc73..5ac19529f1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/fvOptions
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/g b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/g
index 771559d6a8..af3f186d02 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/particleTrackProperties
index 8f2431b5a4..fc719a6821 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/particleTrackProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
index 7046b1e6bf..a31789a92c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermo.incompressiblePoly
index cd14c0ed2a..b73ff6884d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermophysicalProperties
index ff8b418527..df656084fb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/turbulenceProperties
index 7fd18d6af3..1a55113569 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/controlDict
index 51826326ec..1be19b6e54 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/decomposeParDict
index b9df6409df..d89c8a79e4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSchemes
index ef5bd8032a..bd746adfc7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSolution
index f3ba6eaa8b..3915b52909 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/transient/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
index 50742e0017..201167a4ec 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
index 5ea94faf05..ab4588274b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
index c0d0119584..da56e25276 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
index 1e959d60bd..37fea50565 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
index cbc4b7e09b..d3b3879033 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
index b5acc94b98..78a6265bca 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
index 8918e70abe..441967e8a7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
index f0907ade95..e1791e2dda 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
index 7532cb0498..b0ff56d34d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh
index ceec231a56..18a2c0bab1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
index dfe44efe65..9b4b5863c3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
index 6225220c17..4682182061 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
index 2f01892acc..d49f3097b2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
index cceb0ae8c7..aa9c99c9d0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index f4b6c6139f..1ce614d5ca 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
index b14f4ebd8c..ac60ca3b5d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict
index d373be89ed..26647407a1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
index d51d12f47f..21debfce4d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
index 24531c3191..d538079431 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
index 230b702316..3289abff89 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O
index c22816c7c1..0c2cc82e73 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2
index 1e1c1b7026..2db67ffef3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2
index bc66d549c5..b013560b33 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T
index c7e8f03241..8804834a8c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U
index 9e5617baee..4441176739 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p
index dab718faef..6772665aa9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh
index f00604b32c..a308077a4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf
index 7f58fb423d..2e1de092ed 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf
index 38bd928f1a..010bc4d6c4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf
index 116913a028..0f24a63f5c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat
index 7da282584e..9798d2bbe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
index 130ae0eebd..d994d4fe65 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties
index 328edbac91..bdf0477c5a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties
index a47610243f..12e1c26e31 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
index 4c3be49c52..bfc9934c3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/blockMeshDict
index a894be1169..90e55f7f1f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict
index 2994a491c9..674b764925 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict
index 08774bcfb1..23b8386c51 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict
index 2e65f3ce10..f8a973829b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes
index 45044603ec..310acb0203 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
index 6f4ffc5f82..520d21a2e7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
index b2ed668311..1498425697 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes
index 6489f7be73..2fce857c5a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution
index 8eeb43b8a3..9cce144698 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
index 6901c3ea5b..5b4f925a79 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O
index 9b3e16810e..659ca1c9fd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2
index 791d32cb25..94d873e4c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2
index 693ecc376b..566a8a89c6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T
index 0ef071cfe6..dbcd38bbd5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U
index a3cca4bfd0..54609cf702 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat
index 5aed0b2a94..a2bfb42bad 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon
index 7c5fe71828..290009e12b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k
index 25c64db12b..7f5aff847c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut
index a2f1939ea4..07b51b1d29 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p
index 16ad70ab85..75bb48802e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh
index ec9cbce68a..7f8674c51c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index 87381469fe..b376080cd5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
index 5a2fee6982..83121a7a1a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
index 0766771a93..bdbe478e59 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index 42f1935847..ed64416aa9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.animate b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.animate
index 42f1935847..ed64416aa9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.animate
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.animate
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.static b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.static
index 8e8d7f85fa..bb79669e66 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.static
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties.static
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
index 109fe2bcb9..23962b2ae7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
index 3940171829..6d97224d01 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index 01010444c0..10572bda71 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
index c936b6b044..7a3629d0f1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
index 6e9ecb5feb..fe5f3833fc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
index 413ce19ce8..a35d76a6b1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
index 4185102f47..30654c5c69 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict
index f82df813db..a5e1994e16 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
index b879dde496..db197f06b3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
index 5b330b1f7d..0f6ecfb031 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
index ec3c1b8784..26e6b08122 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
index 1cbe8e421b..af64b5e348 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O
index 92882ae4c6..b4472cacb6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2
index 7a30b059c3..8e67b94af6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2
index e38b6a9509..11a76ec574 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T
index 8eee308311..72bb670529 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U
index 02e201ac40..eb7d23abcc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat
index 2f18299252..a3c0921dbe 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon
index 7a7e06cb47..921fd9499b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv
index 708eb5c52b..998b0de5bc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k
index 0e02d1dc2a..35bbb74a20 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut
index 55b2d4c752..2b9105fce2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p
index 2bdb6b2090..e77bb32d78 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh
index 5d70b5a5e4..a0530f932a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf
index cceba7a79c..d5c8466d83 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf
index 68ee69ea9c..234c642205 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf
index 527a0d1b74..92b7acf065 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat
index 7da282584e..9798d2bbe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
index a6ffd17650..9b12cacc62 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
index 2c14b538e3..6b9db2c654 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
index 4c3be49c52..bfc9934c3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties
index d292cceec7..0a993c106e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/patchifyObstacles b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/patchifyObstacles
index 4ed7cf1347..4b5ab91f89 100755
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/patchifyObstacles
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/patchifyObstacles
@@ -2,7 +2,7 @@
 #-----------------------------------------------------------------------------#
 # =========                 |                                                 #
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           #
-#  \\    /   O peration     | Version:  v2212                                 #
+#  \\    /   O peration     | Version:  v2306                                 #
 #   \\  /    A nd           | Website:  www.openfoam.com                      #
 #    \\/     M anipulation  |                                                 #
 #-----------------------------------------------------------------------------#
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/blockMeshDict
index 9fcdf34e7d..0677c1c4b4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict
index b1b035bb95..99d62135e8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict
index a11bfcd781..5f3a433178 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/decomposeParDict
index 340febc076..ee6bfc7e8b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict
index 9ae0930507..c1e6c4d304 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes
index 33b2f8ecf6..109e9d07ab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
index 32279bf608..fa67936ea1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
index 73fab48382..c4cd4c508e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/decomposeParDict
index 340febc076..ee6bfc7e8b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes
index 6a89003197..af351fde12 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution
index 4fdc43e963..9aaf7afe1a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/T b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/T
index 70dde3e341..53a191fc74 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/U b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/U
index 604633fdde..ec3e59020a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film
index dd9a293268..0c7533a1af 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault
index 27b7ce11bb..90ceb9cfc5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat
index 81c4c33217..6d64471665 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon
index ddc1d0e830..4824c9fd2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film
index 43d86ec29e..c45d40f7b9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/k b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/k
index ac190b5193..54dc2587ba 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/k
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut
index 290515669f..98c60591db 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p
index 672d53759d..2f259d6ac0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh
index 9dfe9d6dca..8e1f3f8735 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.dat
index a8abc3c4d8..90f7adbcf6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g
index 43241f4daa..51f4cd8295 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/reactingCloud1Properties
index c836a15aa7..4b26af2859 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/thermophysicalProperties
index 70b607a8c0..e798869a7f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/turbulenceProperties
index dad2cedc6a..9ae32e649a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/blockMeshDict
index d17c563f79..ca238fbf0a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/controlDict
index a98189c070..098f0d6302 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/decomposeParDict
index 02a585a1f7..d681ca5e5d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition
index f0d04c2ebb..cf6673c198 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSchemes b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSchemes
index d55ef23410..fc93f98c13 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSolution b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSolution
index 1ace92e688..3427de4114 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSchemes
index 8ab681ee36..070f0f8f94 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSolution
index c823a22e42..69b0cf6c82 100644
--- a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/G b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/G
index 3bc77b9439..1d4ea90a82 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/G
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/H2O b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/H2O
index 5299b85f56..f687555367 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/T b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/T
index e67310310f..8264f25d0f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/U b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/U
index 7c371e8342..418327b0f2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/air b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/air
index 7ee12e4fb2..5c77507ef1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/air
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p
index f7aba158d0..fd1428ebb0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p_rgh
index c3607492f3..71729c6e55 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/chemistryProperties
index a798d3c042..00145c3f46 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/combustionProperties
index 86f48520e6..5e80d4be4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/g b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/g
index 8e37eca269..3bf872aa1c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/reactingCloud1Properties
index 8e85d9239a..e4b856b69d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermo.incompressiblePoly
index 638eb74a94..dbfbb2d2e2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermophysicalProperties
index 069f969faf..7674037b3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/blockMeshDict
index 692ed7ca87..4767431b60 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/controlDict
index 3affe7fbf7..6644e0cdc6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSchemes
index 4969521f90..2a5e105135 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSolution
index d7cd46927e..e646ed0004 100644
--- a/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/movingInjectorBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G
index 3bc77b9439..1d4ea90a82 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O
index 7561e9b4df..fdb9092bb9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T
index c212b30933..8ddd7392bb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U
index becf8fa584..7e9988cfd0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air
index fafb283b84..f98f881a58 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p
index 431899e4a0..8eb517eb64 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh
index a8691a6260..53ad71451e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
index a798d3c042..00145c3f46 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
index 86f48520e6..5e80d4be4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g
index 8e37eca269..3bf872aa1c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
index 88f70e68ad..650d58c1b6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
index d212c0d793..f1da9b5ce5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index a34874d5a5..c64a174daa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
index bdbfb26b01..43d297901d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index 4eec6b46e1..cff28c1b69 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
index a688516e20..3f501d8758 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict
index bccde276df..dab50a3ba6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
index e43e495580..7e9072795f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
index 47514d80a5..243743ae57 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict
index c62c3e5287..d8057d9fa7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
index 8a581c0192..78b69c5ec5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
index 4a74fa6709..d24afd8967 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
index 3a641b1486..1aa71de16b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
index b313688072..37a429f2db 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
index d3936c18e1..22e1a4ee86 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
index 5743618a67..2781e6df12 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
index 566063452e..b60260148b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
index 3068f5fc91..699c140bb2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
index 26df9d992f..8a32adab13 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
index 3d49034987..1ede517d55 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
index be8c0da257..4040fecbcd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
index 8323217e89..9c112cbf2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
index 9fd0cec98d..dafd472e4c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
index 7da282584e..9798d2bbe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
index cb7153a778..c23e7f74b6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
index 5ad6c89c2b..ad26936ac3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
index d21ad558c6..1c07602fd5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
index 7cc8a88b97..13b45e99c9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
index 50f39721c1..65071a63dc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
index 2042bee1e8..cf9721a5bd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
index d0b17aa928..ea7a69e41d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
index fe818171ba..6d8b2ea3b2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O
index 1f1d61ea71..68f6f86f1f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/T
index 596d1e5946..ec925acda1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/U
index 67f84e223c..e8d163cb60 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/air
index f29b0064a4..cac029b2a4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/air
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/alphat
index cda1b8551e..92b576a82d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/epsilon
index 4ce402aab0..f9e1177d9b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/k
index bde1422cc5..c5f4e3c5df 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut
index 6af7ff713f..458abbeed5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p
index a95ad1467c..92633354b0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh
index 9bcdc0c526..7b36cb7b38 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/chemistryProperties
index c6fad32c30..53c40349d4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/g b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/g
index b6355a7b13..001dda509e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/reactingCloud1Properties
index 159e8616f8..f5ad82c54d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermo.incompressiblePoly
index 2d483319bf..a9bedb2688 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermophysicalProperties
index 56251b21cd..81b58ac453 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/turbulenceProperties
index 499d29f1e6..4b7238315f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/blockMeshDict
index f18e7a801c..51d3a5af38 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/controlDict
index 32878f11df..ad063a144f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/decomposeParDict
index 820210b1fe..e83f5994e0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSchemes
index 62d152a468..3b8aadf463 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSolution
index 21e74ae16a..e131d44e9f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/recycleParticles/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O
index 1365f45a12..4a71158172 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2
index feab576f06..cb6e73f0bb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2
index 5602f5cd29..a22af0b205 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T
index 55f6299249..326ca6e831 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U
index 4ecf55503c..dc43976796 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p
index 69c89cddc1..e8d621f9b1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh
index 5874d66698..d881ec498b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf
index 71675098c5..cd1e3703a1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf
index ecc9ab31d6..9bfdae5ddc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf
index f2da130271..1032c81fa4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat
index 7da282584e..9798d2bbe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
index e6d699b397..52281e0d23 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties
index 23c98a884f..071fe04b43 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
index 860273d46b..17a67c5245 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
index 4c3be49c52..bfc9934c3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/blockMeshDict
index 3029588270..73e5728789 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
index 45bba1addb..dd25d821f8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict
index 7d558fa1c2..e1fab99017 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict
index afd3461baa..b7385cd6d3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes
index 3ebbd7e10c..ff27c9797f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution
index e7201a554b..61717901b9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
index b2ed668311..1498425697 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
index 18bb2edf5d..454133001d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
index 1b7c1c1853..38fdb25b17 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution
index 605379ab2c..464bf5968a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O
index d1b6457912..c49f0f8ef6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2
index 7794825dcb..5dc14ec5d6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2
index 382ac9f58b..5610101d2f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T
index 04acf53c55..6c79bdf915 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U
index 4b27cc78ae..6e222d8ca8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p
index f94a2ea892..c0b8f19b3a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh
index 4dae609c74..5b3b44a9b9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Tf
index 35f87314d0..7c30e7341b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Tf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Uf
index 54fbfc7417..4daafc9678 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/Uf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/deltaf
index 98689e2d30..59c04f4095 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/wallFilmRegion/deltaf
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat
index 7da282584e..9798d2bbe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
index d75747d45a..b8f270fd9f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties
index 1f10ca109d..55008c31c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
index 49e5021984..7604408aee 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
index 4c3be49c52..bfc9934c3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/blockMeshDict
index b360951360..751a0a1036 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict
index 016534884a..285bcbb1c3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict
index 7d558fa1c2..e1fab99017 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict
index afd3461baa..b7385cd6d3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes
index 33b2f8ecf6..109e9d07ab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
index c163b887e6..ca0a88a511 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
index b2ed668311..1498425697 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict
index 01a064732a..9665e2d23d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
index 80b2bbb7ea..97549944e3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes
index da1a34124b..edff5992d5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution
index be302903a8..305cc8d2d2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/H2O
index 592ee46202..fa0019d34f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/N2
index 2517eba89d..acf25f4f18 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/O2
index 16a2a08b5d..d03eb9eb81 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/T
index e04cdefa46..1155407cd7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Tf_film b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Tf_film
index e8f66edf62..5851edece2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Tf_film
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Tf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/U
index fbf0aa9b9d..9c1fcf8f58 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Uf_film b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Uf_film
index 1a18b43996..5e9edf0d82 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Uf_film
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/Uf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/hf_film b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/hf_film
index 8ca7ae0aab..67a3e11bc7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/hf_film
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/hf_film
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p
index 009dd3c19d..d3046f8d3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p_rgh
index 1e5515109a..5be04864de 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/chemistryProperties
index 7ecb40e7c1..557729787f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/foam.dat
index 7da282584e..9798d2bbe8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/foam.dat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/g b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/parcelInjectionProperties
index d75747d45a..b8f270fd9f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/parcelInjectionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/reactingCloud1Properties
index 1f10ca109d..55008c31c5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/surfaceFilmProperties.remove b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/surfaceFilmProperties.remove
index 49e5021984..7604408aee 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/surfaceFilmProperties.remove
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/surfaceFilmProperties.remove
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/thermophysicalProperties
index 4c3be49c52..bfc9934c3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/blockMeshDict
index b073d47479..ef3c92464c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/controlDict
index 016534884a..285bcbb1c3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/createPatchDict
index 14aadbbaeb..01c6626e1f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faMeshDefinition b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faMeshDefinition
index 3b5f6a2ef7..7db5e10ad6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faMeshDefinition
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faMeshDefinition
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSchemes
index d55ef23410..fc93f98c13 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSolution
index 1ace92e688..3427de4114 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/faSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSchemes
index 33b2f8ecf6..109e9d07ab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSolution
index c163b887e6..ca0a88a511 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/topoSetDict
index 75342edf61..31f4dd3049 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanelFilm/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O
index 4205096ea6..fc60997ac7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T
index 4b28d411d5..1cf55fda10 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U
index 1cd836a206..cfce1c7461 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air
index d14c4388c8..9fab750e09 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat
index bf767a614c..cd77fb1fab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k
index f2ad64f0f5..bbe046374e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut
index 167286b6c6..4dc65d4952 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega
index e4fffa2ff1..06c5b616cf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p
index 3a65c59335..597f9ce1e2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh
index fa93d96043..a12058b3e2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index 87381469fe..b376080cd5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index 8f2431b5a4..fc719a6821 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
index dbedbcf1c3..ae380fe747 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 78a56cb859..568b146d0a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index e16a29befc..4b8d25d89a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 62fd12e6a7..2e95018e3e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
index 2b5f669791..a442925522 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
index b4a24e820e..fb31e93f78 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index 058fdaee5f..3159e82d32 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict
index 2042bee1e8..cf9721a5bd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
index f636d19721..be4cec46e4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
index f71a0bc1df..e58379f504 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O
index 4205096ea6..fc60997ac7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T
index 4b28d411d5..1cf55fda10 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U
index 0a0622e672..821468dda1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air
index d14c4388c8..9fab750e09 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat
index bf767a614c..cd77fb1fab 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k
index f2ad64f0f5..bbe046374e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut
index 167286b6c6..4dc65d4952 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega
index e4fffa2ff1..06c5b616cf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p
index 3a65c59335..597f9ce1e2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh
index 1359ce56e8..9de2ff0863 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
index 731022fe72..32cbcb01fa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index 718fa4cbd7..e0fc2f0d7f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 187b44cdf3..b04ad4ad21 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
index 91c9e897ad..75c8d61f2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
index 9a4e3d1a29..12f6e5e807 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties
index 2b5f669791..a442925522 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
index b4a24e820e..fb31e93f78 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
index 12b3e60d40..4fbe20c524 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
index 1b75ba8098..8bb0592424 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
index 81141a5775..e31e2d5204 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O
index 4205096ea6..fc60997ac7 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T
index 4b28d411d5..1cf55fda10 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U
index f6c239ac22..16b586dfdc 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air
index d14c4388c8..9fab750e09 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat
index bf767a614c..cd77fb1fab 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k
index f2ad64f0f5..bbe046374e 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut
index 167286b6c6..4dc65d4952 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega
index e4fffa2ff1..06c5b616cf 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p
index 489474166f..343883ab75 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 731022fe72..32cbcb01fa 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
index 9fd0cec98d..dafd472e4c 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index 718fa4cbd7..e0fc2f0d7f 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index eaf32c6253..5a5bbf4bf3 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index e16a29befc..4b8d25d89a 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index c092c20dd5..4ffeaac21e 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index 2b5f669791..a442925522 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
index b4a24e820e..fb31e93f78 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
index 0502e86bd4..554009d498 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvOptions b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvOptions
index 44f088f3b2..df1d0a950d 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvOptions
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
index 466e7e588d..e8eec0160b 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
index 1b60030f36..31440f4f40 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/N2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/N2
index 4a20908ddc..42f0dc11cf 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/N2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/O2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/O2
index f5ef3f9524..9e260cc82f 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/O2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/T b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/T
index 1ed4b88bf0..fcd8b764e7 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/T
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/U b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/U
index 4e0a38840b..4d0d3d3f2d 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/U
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/Ydefault b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/Ydefault
index 58a012df29..61ee744cde 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/Ydefault
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/alphat b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/alphat
index 256d5d892a..bf88937a77 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/alphat
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/epsilon b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/epsilon
index 733418f39d..983fb22bf2 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/epsilon
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/k b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/k
index 9d60cd270f..673edae07f 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/k
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/nut b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/nut
index 8b30e3c713..6f959429f1 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/nut
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/p b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/p
index 6ec5692ced..4fa127560a 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/p
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties
index 18b83be8f6..07c05cb2ef 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index da7f90ecde..5e9799fe2e 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
index 4c90a86154..aefd3a7898 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index 3eef84ff10..8c48fb7475 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index 3658b12242..fe039b5686 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
index 5b285baace..d8c9d7e007 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
index b08fd865a0..6d7525bfd3 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
index 830380ec1a..39da01e2b7 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/decomposeParDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/decomposeParDict
index 428d05bec2..db306d4641 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/decomposeParDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
index 70e937db30..0cc8ca333f 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
index 77c6103e54..0059071e51 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/T b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/T
index ef5f104708..296fd49fd5 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/T
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/U b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/U
index 4559d2c123..28b12be05f 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/U
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/p b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/p
index af23e828da..bb37c32db2 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/p
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/dynamicMeshDict b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/dynamicMeshDict
index aaccaa0404..8e6d2eba66 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/dynamicMeshDict
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/g b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/g
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties
index f2a6636287..0ffdac88c0 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/thermophysicalProperties b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/thermophysicalProperties
index 3a750f5101..6c04f96fc5 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/turbulenceProperties b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/turbulenceProperties
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/blockMeshDict b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/blockMeshDict
index d1cb5bc862..9001133849 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/blockMeshDict
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/controlDict b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/controlDict
index d119644e25..69e6d67a64 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/controlDict
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSchemes b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSchemes
index d0f67a9f72..f4f38b31f9 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSchemes
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSolution b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSolution
index a23c3437d6..eda0c48516 100644
--- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSolution
+++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/PDRblockMesh/box0/system/PDRblockMeshDict b/tutorials/mesh/PDRblockMesh/box0/system/PDRblockMeshDict
index 6cda78dc0a..dd6daf31c0 100644
--- a/tutorials/mesh/PDRblockMesh/box0/system/PDRblockMeshDict
+++ b/tutorials/mesh/PDRblockMesh/box0/system/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/PDRblockMesh/box0/system/controlDict b/tutorials/mesh/PDRblockMesh/box0/system/controlDict
index d9ddfa8087..df8aea22a9 100644
--- a/tutorials/mesh/PDRblockMesh/box0/system/controlDict
+++ b/tutorials/mesh/PDRblockMesh/box0/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/PDRblockMesh/box0/system/fvSchemes b/tutorials/mesh/PDRblockMesh/box0/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/PDRblockMesh/box0/system/fvSchemes
+++ b/tutorials/mesh/PDRblockMesh/box0/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/PDRblockMesh/box0/system/fvSolution b/tutorials/mesh/PDRblockMesh/box0/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/PDRblockMesh/box0/system/fvSolution
+++ b/tutorials/mesh/PDRblockMesh/box0/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/mergePairs/system/blockMeshDict b/tutorials/mesh/blockMesh/mergePairs/system/blockMeshDict
index aaa0d5c705..60ddbc7afd 100644
--- a/tutorials/mesh/blockMesh/mergePairs/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/mergePairs/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/mergePairs/system/controlDict b/tutorials/mesh/blockMesh/mergePairs/system/controlDict
index d311d24300..1e383eb8ac 100644
--- a/tutorials/mesh/blockMesh/mergePairs/system/controlDict
+++ b/tutorials/mesh/blockMesh/mergePairs/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/pipe/system/blockMeshDict b/tutorials/mesh/blockMesh/pipe/system/blockMeshDict
index d1cbe11c49..07f8eba8bd 100644
--- a/tutorials/mesh/blockMesh/pipe/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/pipe/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/pipe/system/controlDict b/tutorials/mesh/blockMesh/pipe/system/controlDict
index 43af4f1c35..4e24e24c9d 100644
--- a/tutorials/mesh/blockMesh/pipe/system/controlDict
+++ b/tutorials/mesh/blockMesh/pipe/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/pipe/system/fvSchemes b/tutorials/mesh/blockMesh/pipe/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/blockMesh/pipe/system/fvSchemes
+++ b/tutorials/mesh/blockMesh/pipe/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/pipe/system/fvSolution b/tutorials/mesh/blockMesh/pipe/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/blockMesh/pipe/system/fvSolution
+++ b/tutorials/mesh/blockMesh/pipe/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere/system/blockMeshDict b/tutorials/mesh/blockMesh/sphere/system/blockMeshDict
index 5f7ea07a45..961c3bc941 100644
--- a/tutorials/mesh/blockMesh/sphere/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/sphere/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere/system/controlDict b/tutorials/mesh/blockMesh/sphere/system/controlDict
index d311d24300..1e383eb8ac 100644
--- a/tutorials/mesh/blockMesh/sphere/system/controlDict
+++ b/tutorials/mesh/blockMesh/sphere/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere/system/fvSchemes b/tutorials/mesh/blockMesh/sphere/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/blockMesh/sphere/system/fvSchemes
+++ b/tutorials/mesh/blockMesh/sphere/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere/system/fvSolution b/tutorials/mesh/blockMesh/sphere/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/blockMesh/sphere/system/fvSolution
+++ b/tutorials/mesh/blockMesh/sphere/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict b/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
index 655b43e74f..d1d340831c 100644
--- a/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7/system/controlDict b/tutorials/mesh/blockMesh/sphere7/system/controlDict
index d311d24300..1e383eb8ac 100644
--- a/tutorials/mesh/blockMesh/sphere7/system/controlDict
+++ b/tutorials/mesh/blockMesh/sphere7/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7/system/fvSchemes b/tutorials/mesh/blockMesh/sphere7/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/blockMesh/sphere7/system/fvSchemes
+++ b/tutorials/mesh/blockMesh/sphere7/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7/system/fvSolution b/tutorials/mesh/blockMesh/sphere7/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/blockMesh/sphere7/system/fvSolution
+++ b/tutorials/mesh/blockMesh/sphere7/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
index 32fa8e1ae1..94d1c7f211 100644
--- a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/controlDict b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/controlDict
index d311d24300..1e383eb8ac 100644
--- a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/controlDict
+++ b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSchemes b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSchemes
+++ b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSolution b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSolution
+++ b/tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroid7Projected/system/blockMeshDict b/tutorials/mesh/blockMesh/spheroid7Projected/system/blockMeshDict
index 268bbbbd57..55cd31801a 100644
--- a/tutorials/mesh/blockMesh/spheroid7Projected/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/spheroid7Projected/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroid7Projected/system/controlDict b/tutorials/mesh/blockMesh/spheroid7Projected/system/controlDict
index d311d24300..1e383eb8ac 100644
--- a/tutorials/mesh/blockMesh/spheroid7Projected/system/controlDict
+++ b/tutorials/mesh/blockMesh/spheroid7Projected/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSchemes b/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSchemes
+++ b/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSolution b/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSolution
+++ b/tutorials/mesh/blockMesh/spheroid7Projected/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroidProjected/system/blockMeshDict b/tutorials/mesh/blockMesh/spheroidProjected/system/blockMeshDict
index 788a04d02c..4e700fa6fa 100644
--- a/tutorials/mesh/blockMesh/spheroidProjected/system/blockMeshDict
+++ b/tutorials/mesh/blockMesh/spheroidProjected/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroidProjected/system/controlDict b/tutorials/mesh/blockMesh/spheroidProjected/system/controlDict
index d311d24300..1e383eb8ac 100644
--- a/tutorials/mesh/blockMesh/spheroidProjected/system/controlDict
+++ b/tutorials/mesh/blockMesh/spheroidProjected/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroidProjected/system/fvSchemes b/tutorials/mesh/blockMesh/spheroidProjected/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/blockMesh/spheroidProjected/system/fvSchemes
+++ b/tutorials/mesh/blockMesh/spheroidProjected/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/blockMesh/spheroidProjected/system/fvSolution b/tutorials/mesh/blockMesh/spheroidProjected/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/blockMesh/spheroidProjected/system/fvSolution
+++ b/tutorials/mesh/blockMesh/spheroidProjected/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/T b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/T
index 495ca829a0..0974fbd634 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/T
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/p b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/p
index 8e0fce5118..ece44759c2 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/p
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/bottomSolid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/T b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/T
index de836c7d87..796005e65a 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/T
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/p b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/p
index 8e0fce5118..ece44759c2 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/p
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/leftSolid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/T b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/T
index de836c7d87..796005e65a 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/T
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/p b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/p
index 8e0fce5118..ece44759c2 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/p
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/rightSolid/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/T b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/T
index 2ee2c68647..0edbbcc0d0 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/T
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/U b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/U
index deab70c0a2..33323ccbe6 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/U
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/epsilon b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/epsilon
index 58516c1860..6817828c3b 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/epsilon
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/k b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/k
index c61599200c..3ed2241473 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/k
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p
index cde9bd7430..26c9da1949 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p_rgh b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p_rgh
index 4d28948f5a..c0aae9d19b 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p_rgh
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/0.orig/topAir/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/radiationProperties b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/radiationProperties
index 336ca25977..a13d94bec5 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/radiationProperties
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/thermophysicalProperties b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/thermophysicalProperties
index b747928de4..a82ce62cf5 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/thermophysicalProperties
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/bottomSolid/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/g b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/g
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/regionProperties b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/regionProperties
index 0a3114bb27..5cee865892 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/regionProperties
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/radiationProperties b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/radiationProperties
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/thermophysicalProperties b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/thermophysicalProperties
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/turbulenceProperties b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/turbulenceProperties
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/constant/topAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/blockMeshDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/blockMeshDict
index 0d5592f652..bf513ce64a 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/blockMeshDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/createPatchDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/createPatchDict
index ecbb7a09d2..1ed0a661fb 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/createPatchDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSchemes b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSchemes
index 410bb1fef2..08ef9fc773 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSchemes
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSolution b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSolution
index bc838ef851..55709cd2cd 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSolution
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/bottomSolid/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/controlDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/controlDict
index 0c0e9ed947..11f4093b2f 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/controlDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/decomposeParDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/decomposeParDict
index 25fefae2e8..acdff68cf2 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/decomposeParDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSchemes b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSchemes
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSolution b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSolution
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/leftSolid/blockMeshDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/leftSolid/blockMeshDict
index 73c6f0c2ad..2c0cc2defe 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/leftSolid/blockMeshDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/leftSolid/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/rightSolid/blockMeshDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/rightSolid/blockMeshDict
index b8606c8c30..24b6e1d9f8 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/rightSolid/blockMeshDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/rightSolid/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/blockMeshDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/blockMeshDict
index e51596655c..65bfa4adda 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/blockMeshDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/createPatchDict b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/createPatchDict
index e8b1ae8cba..5b1d38b80e 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/createPatchDict
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSchemes b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSchemes
index 16a2fa3eff..b867515a62 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSchemes
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSolution b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSolution
index aef9b953ab..4dd81a5c8e 100644
--- a/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSolution
+++ b/tutorials/mesh/createPatch/multiRegionHeater_autoPatch/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/constant/transportProperties b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/constant/transportProperties
index afcaedf488..9071b8b124 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/constant/transportProperties
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/blockMeshDict b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/blockMeshDict
index f6d8c53a25..dd935e13cc 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/blockMeshDict
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/controlDict b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/controlDict
index 03f933f8ab..00ce5e48bf 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/controlDict
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/decomposeParDict b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/decomposeParDict
index b6d2b4b74f..8fb0ce4971 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/decomposeParDict
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict
index 22ec4a838a..7ff56dbde1 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict.flip b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict.flip
index 22ec4a838a..7ff56dbde1 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict.flip
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/extrudeMeshDict.flip
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSchemes b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSchemes
index e7eca24ea7..e6055f061a 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSchemes
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSolution b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSolution
index 18c0871add..34ff00cf3f 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSolution
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict
index ef3d00e93b..52ec2b3089 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip
index 67bdd994a9..88047505d3 100644
--- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip
+++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/polyline/system/controlDict b/tutorials/mesh/extrudeMesh/polyline/system/controlDict
index e336869076..aac5f4f253 100644
--- a/tutorials/mesh/extrudeMesh/polyline/system/controlDict
+++ b/tutorials/mesh/extrudeMesh/polyline/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/polyline/system/extrudeMeshDict b/tutorials/mesh/extrudeMesh/polyline/system/extrudeMeshDict
index ceaeb42a9e..38d31a3566 100644
--- a/tutorials/mesh/extrudeMesh/polyline/system/extrudeMeshDict
+++ b/tutorials/mesh/extrudeMesh/polyline/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/polyline/system/fvSchemes b/tutorials/mesh/extrudeMesh/polyline/system/fvSchemes
index 03fefe0560..720c5a2612 100644
--- a/tutorials/mesh/extrudeMesh/polyline/system/fvSchemes
+++ b/tutorials/mesh/extrudeMesh/polyline/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/extrudeMesh/polyline/system/fvSolution b/tutorials/mesh/extrudeMesh/polyline/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/extrudeMesh/polyline/system/fvSolution
+++ b/tutorials/mesh/extrudeMesh/polyline/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
index 7797ba46fe..895eae1332 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict
index 820210b1fe..e83f5994e0 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/collapseDict b/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
index 4c74dd88e0..73faeaaf34 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/controlDict b/tutorials/mesh/foamyHexMesh/blob/system/controlDict
index 472d316122..7ce4ba72e0 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
index 820210b1fe..e83f5994e0 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
index 5b71f90151..dd0b7dbe12 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes b/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
index 3ecda7ffc5..905fa15e34 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
index 0a74a245ce..ba4da1262e 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict
index 8454b5db7d..2aab4f1ab2 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution
index 3714645a6c..f98c79f034 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/collapseDict b/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
index 4c74dd88e0..73faeaaf34 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/controlDict b/tutorials/mesh/foamyHexMesh/flange/system/controlDict
index 6346b2c1dd..384b50d95e 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict b/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
index 921920a04f..8b5557b4ea 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
index f495e9f4f9..c0be35aaeb 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes b/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
index 56279212d9..eaa55901d9 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
index 3714645a6c..f98c79f034 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry b/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry
index 8aaab9917f..e96c2dd3c2 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry
+++ b/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
index 5be0b1e1f4..7322d4c880 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
index 223b08b722..bcb808742c 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
index 04fb00defe..e3a70773df 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
index fbd3b5eec4..5add11e4cc 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1 b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1
index 8a1d24821d..65a42a7ba7 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon
index 2f0d6985c0..f869841d6a 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k
index e2e9350cf7..ba183aba37 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut
index 3c6d4d3a6f..4cfaa884b4 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh
index bf7bbe24db..f4e80e2401 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
index 647b9b3323..a571d03cbe 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
index 3de4ad2f03..faf5ed54b6 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
index 17a7cc841f..81fe57bcbc 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict
index a71c83ed2d..e3e9ac3ac0 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
index 60975c9648..4a2dbffd9e 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
index 8f6fe27dfd..94506b733a 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces
index 6bf24ab4ee..d422a4499f 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces
index 8f6fe27dfd..94506b733a 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict
index d5b3934a43..0df24aa08f 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow
index d5b3934a43..0df24aa08f 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh
index 28f3d6030a..2a1e71231a 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict
index f4e79fcf52..a62af74ae7 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
index 97d1f067cc..a2992e0c8d 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
index dc867a1514..822851976d 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
index 60975c9648..4a2dbffd9e 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl
index c67b179b0a..9c47830ead 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces
index 771200c92a..e3d22f7519 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
index fe11be6c52..d983b4df18 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
index ec97e65eec..c6364d939d 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict
index a42a381651..ae48337ac4 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
index 6be34fba4d..40bd015cb7 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
index 0007ca58aa..91bb5f9340 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
index 29b691be59..f5d37d2df5 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
index 12743723d5..e5a7075f6b 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
index 7525a97f21..c83477a50d 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
index 84e0cdbf2d..a86c8cb650 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
index 72135297a5..b2b53edaa3 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
index 7e2e97350a..e80aa032fb 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T
index dff07cc96f..5eef32b506 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U
index 837adb66a8..d90e1944f4 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p
index cf7adc2715..fcc1edd5a8 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
index 3e00077b0e..c32c77096c 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
index 443c148791..5c52e87437 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
index 443c148791..5c52e87437 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
index 8f0a0b66e3..a8b1928129 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
index 9e785ce809..d70bf66794 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
index 3ee4f6d9c4..50d1793dfd 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
index 6dbee58da0..c6e7a93e99 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
index 37632a2fa3..3b0af4d2c3 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
index 2532a4a786..54f71d2f07 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
index a54af8b572..5b4e77a391 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
index 9e785ce809..d70bf66794 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
index 8736fd39da..9b8544d255 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
index 53b94d8b2d..e218e71e91 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/controlDict b/tutorials/mesh/foamyQuadMesh/square/system/controlDict
index 1864539f6b..71a3028401 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/controlDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
index 62dda32fda..cf6be8e01b 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict b/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
index 5f5b2364a1..2d1a8ae7be 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
+++ b/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/fvSolution b/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
+++ b/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
index 19e520a0af..a0048e00e8 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0.orig/pointDisplacement b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0.orig/pointDisplacement
index d99a726e70..192cf66851 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0.orig/pointDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
index 5da9039389..a5859b04e6 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
index abf923e4bd..946b22f634 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
index 45697fd458..a771be9a5e 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
index 2c3ae5c21b..0b93103986 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
index 5694c8b2ea..a714ee1052 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
index f15458f579..27c9f9d43d 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/cellDisplacement b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/cellDisplacement
index a12933853e..a72b5f4a67 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/cellDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/cellDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement
index cc462fe87f..55c97a2e83 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/dynamicMeshDict
index b10db0bd3c..e81fb60b32 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/transportProperties
index c774c98a6c..cd247187f4 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/turbulenceProperties b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/turbulenceProperties
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/controlDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/controlDict
index 703383c265..a4c80100b3 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/extrudeMeshDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/extrudeMeshDict
index cc95a4c164..06da3eded5 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/extrudeMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSchemes
index 21785e8002..dad16b81e0 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSolution b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSolution
index 73f307a241..1a42255b6e 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box2D_moveDynamicMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/transportProperties
index c774c98a6c..cd247187f4 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/turbulenceProperties b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/turbulenceProperties
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/blockMeshDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/blockMeshDict
index 1411396988..4692630fde 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/blockMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/controlDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/controlDict
index 703383c265..a4c80100b3 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/createPatchDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/createPatchDict
index e3dba0155f..00cb7cca3a 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/createPatchDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSchemes
index 21785e8002..dad16b81e0 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution
index dff2b80de5..b39ccd2990 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict
index b6ad5cecfe..b27e24bf2e 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict
index 697fa86f3b..e5729db567 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/blockMeshDict b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/blockMeshDict
index 7c7492495d..a131449e1b 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/blockMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/controlDict b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/controlDict
index 0123a0d759..c455ffa960 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/decomposeParDict
index 6ebff3300f..ee47adf68b 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSchemes
index aa5b8e287f..51d2f65bae 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSolution b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSolution
index f15458f579..27c9f9d43d 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/0.orig/U b/tutorials/mesh/parallel/cavity/0.orig/U
index 2d055b7208..c8691d1440 100644
--- a/tutorials/mesh/parallel/cavity/0.orig/U
+++ b/tutorials/mesh/parallel/cavity/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/0.orig/p b/tutorials/mesh/parallel/cavity/0.orig/p
index 7019744453..13954fbcc8 100644
--- a/tutorials/mesh/parallel/cavity/0.orig/p
+++ b/tutorials/mesh/parallel/cavity/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/constant/transportProperties b/tutorials/mesh/parallel/cavity/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/mesh/parallel/cavity/constant/transportProperties
+++ b/tutorials/mesh/parallel/cavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/blockMeshDict b/tutorials/mesh/parallel/cavity/system/blockMeshDict
index d39bfb241f..328f5db2aa 100644
--- a/tutorials/mesh/parallel/cavity/system/blockMeshDict
+++ b/tutorials/mesh/parallel/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/controlDict b/tutorials/mesh/parallel/cavity/system/controlDict
index f1efa53d07..19b7fa7c02 100644
--- a/tutorials/mesh/parallel/cavity/system/controlDict
+++ b/tutorials/mesh/parallel/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/controlDict-latestTime b/tutorials/mesh/parallel/cavity/system/controlDict-latestTime
index edc140eb51..4310f22654 100644
--- a/tutorials/mesh/parallel/cavity/system/controlDict-latestTime
+++ b/tutorials/mesh/parallel/cavity/system/controlDict-latestTime
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/controlDict-startTime b/tutorials/mesh/parallel/cavity/system/controlDict-startTime
index f1efa53d07..19b7fa7c02 100644
--- a/tutorials/mesh/parallel/cavity/system/controlDict-startTime
+++ b/tutorials/mesh/parallel/cavity/system/controlDict-startTime
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/decomposeParDict b/tutorials/mesh/parallel/cavity/system/decomposeParDict
index 4adf1fca54..17c198619e 100644
--- a/tutorials/mesh/parallel/cavity/system/decomposeParDict
+++ b/tutorials/mesh/parallel/cavity/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/decomposeParDict.5 b/tutorials/mesh/parallel/cavity/system/decomposeParDict.5
index c854564bc9..c7b0dad718 100644
--- a/tutorials/mesh/parallel/cavity/system/decomposeParDict.5
+++ b/tutorials/mesh/parallel/cavity/system/decomposeParDict.5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/fvSchemes b/tutorials/mesh/parallel/cavity/system/fvSchemes
index 1697f551de..1fe4971e6b 100644
--- a/tutorials/mesh/parallel/cavity/system/fvSchemes
+++ b/tutorials/mesh/parallel/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/fvSolution b/tutorials/mesh/parallel/cavity/system/fvSolution
index c9a4a860e2..e757ef1329 100644
--- a/tutorials/mesh/parallel/cavity/system/fvSolution
+++ b/tutorials/mesh/parallel/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random b/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random
index 8a6d90d060..719d8c11fd 100644
--- a/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random
+++ b/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/G b/tutorials/mesh/parallel/filter/0.orig/G
index 29f6e2d9f5..6463ade195 100644
--- a/tutorials/mesh/parallel/filter/0.orig/G
+++ b/tutorials/mesh/parallel/filter/0.orig/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/H2O b/tutorials/mesh/parallel/filter/0.orig/H2O
index 99b6c982d2..c3042de1c5 100644
--- a/tutorials/mesh/parallel/filter/0.orig/H2O
+++ b/tutorials/mesh/parallel/filter/0.orig/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/N2 b/tutorials/mesh/parallel/filter/0.orig/N2
index 1f88ca8357..4d1bf6d1f3 100644
--- a/tutorials/mesh/parallel/filter/0.orig/N2
+++ b/tutorials/mesh/parallel/filter/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/O2 b/tutorials/mesh/parallel/filter/0.orig/O2
index 3eebbfa15a..f40a3a949b 100644
--- a/tutorials/mesh/parallel/filter/0.orig/O2
+++ b/tutorials/mesh/parallel/filter/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/T b/tutorials/mesh/parallel/filter/0.orig/T
index 1b0ef2e475..78351cd6e1 100644
--- a/tutorials/mesh/parallel/filter/0.orig/T
+++ b/tutorials/mesh/parallel/filter/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/U b/tutorials/mesh/parallel/filter/0.orig/U
index a3cca4bfd0..54609cf702 100644
--- a/tutorials/mesh/parallel/filter/0.orig/U
+++ b/tutorials/mesh/parallel/filter/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/alphat b/tutorials/mesh/parallel/filter/0.orig/alphat
index 3931a8569b..5c3bfc56fe 100644
--- a/tutorials/mesh/parallel/filter/0.orig/alphat
+++ b/tutorials/mesh/parallel/filter/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/epsilon b/tutorials/mesh/parallel/filter/0.orig/epsilon
index a803bdfd79..52a15f4d82 100644
--- a/tutorials/mesh/parallel/filter/0.orig/epsilon
+++ b/tutorials/mesh/parallel/filter/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/k b/tutorials/mesh/parallel/filter/0.orig/k
index d350ba166d..b07642177c 100644
--- a/tutorials/mesh/parallel/filter/0.orig/k
+++ b/tutorials/mesh/parallel/filter/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/nut b/tutorials/mesh/parallel/filter/0.orig/nut
index d9fd800e88..f34af7304a 100644
--- a/tutorials/mesh/parallel/filter/0.orig/nut
+++ b/tutorials/mesh/parallel/filter/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/p b/tutorials/mesh/parallel/filter/0.orig/p
index 16ad70ab85..75bb48802e 100644
--- a/tutorials/mesh/parallel/filter/0.orig/p
+++ b/tutorials/mesh/parallel/filter/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/0.orig/p_rgh b/tutorials/mesh/parallel/filter/0.orig/p_rgh
index ec9cbce68a..7f8674c51c 100644
--- a/tutorials/mesh/parallel/filter/0.orig/p_rgh
+++ b/tutorials/mesh/parallel/filter/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/chemistryProperties b/tutorials/mesh/parallel/filter/constant/chemistryProperties
index 384ead617a..fd4a5025ab 100644
--- a/tutorials/mesh/parallel/filter/constant/chemistryProperties
+++ b/tutorials/mesh/parallel/filter/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/combustionProperties b/tutorials/mesh/parallel/filter/constant/combustionProperties
index da7dc07f7f..356a8c765d 100644
--- a/tutorials/mesh/parallel/filter/constant/combustionProperties
+++ b/tutorials/mesh/parallel/filter/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/g b/tutorials/mesh/parallel/filter/constant/g
index 8b72f70360..a164cf59d2 100644
--- a/tutorials/mesh/parallel/filter/constant/g
+++ b/tutorials/mesh/parallel/filter/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties b/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
index 0766771a93..bdbe478e59 100644
--- a/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
+++ b/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/particleTrackProperties b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
index 8f2431b5a4..fc719a6821 100644
--- a/tutorials/mesh/parallel/filter/constant/particleTrackProperties
+++ b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/radiationProperties b/tutorials/mesh/parallel/filter/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/mesh/parallel/filter/constant/radiationProperties
+++ b/tutorials/mesh/parallel/filter/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties b/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
index 3de4532bc9..9ae8e09c0c 100644
--- a/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
+++ b/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly b/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly
index 3940171829..6d97224d01 100644
--- a/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
index 01010444c0..10572bda71 100644
--- a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
+++ b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/constant/turbulenceProperties b/tutorials/mesh/parallel/filter/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/mesh/parallel/filter/constant/turbulenceProperties
+++ b/tutorials/mesh/parallel/filter/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/blockMeshDict b/tutorials/mesh/parallel/filter/system/blockMeshDict
index 6e9ecb5feb..fe5f3833fc 100644
--- a/tutorials/mesh/parallel/filter/system/blockMeshDict
+++ b/tutorials/mesh/parallel/filter/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/controlDict b/tutorials/mesh/parallel/filter/system/controlDict
index 35d8c9a5ac..693d67ad95 100644
--- a/tutorials/mesh/parallel/filter/system/controlDict
+++ b/tutorials/mesh/parallel/filter/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/createBafflesDict b/tutorials/mesh/parallel/filter/system/createBafflesDict
index f82df813db..a5e1994e16 100644
--- a/tutorials/mesh/parallel/filter/system/createBafflesDict
+++ b/tutorials/mesh/parallel/filter/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/decomposeParDict b/tutorials/mesh/parallel/filter/system/decomposeParDict
index 64e9de9343..dc4dbde439 100644
--- a/tutorials/mesh/parallel/filter/system/decomposeParDict
+++ b/tutorials/mesh/parallel/filter/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/fvOptions b/tutorials/mesh/parallel/filter/system/fvOptions
index 1cf5b905fe..34d6628009 100644
--- a/tutorials/mesh/parallel/filter/system/fvOptions
+++ b/tutorials/mesh/parallel/filter/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/fvSchemes b/tutorials/mesh/parallel/filter/system/fvSchemes
index a3293d67ec..7857d77c62 100644
--- a/tutorials/mesh/parallel/filter/system/fvSchemes
+++ b/tutorials/mesh/parallel/filter/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/fvSolution b/tutorials/mesh/parallel/filter/system/fvSolution
index ec3c1b8784..26e6b08122 100644
--- a/tutorials/mesh/parallel/filter/system/fvSolution
+++ b/tutorials/mesh/parallel/filter/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/parallel/filter/system/topoSetDict b/tutorials/mesh/parallel/filter/system/topoSetDict
index 9360892b89..45f50977d1 100644
--- a/tutorials/mesh/parallel/filter/system/topoSetDict
+++ b/tutorials/mesh/parallel/filter/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
index 065c982eb0..334d2afb89 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
index d0bd46d9e8..93ad5d52f5 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes
index f1ff597103..5e35a9a032 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1
index 6ec23f2aed..41fec0952b 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2
index 6ec23f2aed..41fec0952b 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3
index 6ec23f2aed..41fec0952b 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1
index bcf4423128..1f50a071d2 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2
index 76f25389fa..7d8d2f576a 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3
index 1d17591b74..f8b1bdff80 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4
index 27efe05c2a..233684148d 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5
index d60380cacc..bb3ff31c5f 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6
index 1291ab378a..13ef253839 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
index 4c98d2b5a4..d7666bdae5 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
index c05c4f0b29..3013de28a1 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
index 1389b8920c..c3a73832ab 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
index d9e2147356..0f28e05934 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
index d9d61ffa3a..ee3c4cb025 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
index deaa684c09..60dca8ffca 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
index d00953b20a..b61b1df498 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
index aa9fd8860e..c928712b5f 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
index 4fb5e2e630..8fdc41b933 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/U b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/U
index 9561a1336b..025b7a06eb 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/U
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/p b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/p
index f0faaa96dc..c667452845 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/p
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties
index 265176de78..0a53d07d25 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict
index 2678717525..e3602b5176 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict
index e34d47361e..8bfe2055d1 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict
index abd3f3b4f9..433ce729f0 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes
index fd498a3798..3a81015e32 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution
index 87c5c86fe3..61b8512237 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict
index ea734d6b45..0b45f2cc6f 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
index 4d72f8aeb6..d8889b481a 100644
--- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/thermophysicalProperties b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/thermophysicalProperties
index 9df32f7986..ddbbfca109 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/thermophysicalProperties
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/turbulenceProperties b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/turbulenceProperties
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/blockMeshDict
index 3bfe2e4185..749af13669 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/controlDict b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/controlDict
index ee0a78f48c..e3edf8a580 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSchemes b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSchemes
index 1a44e1216b..297c16b4ee 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSolution b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSolution
index 6ed5abe16f..f2422a7d54 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/snappyHexMeshDict
index 09a3968b93..d3cbcf76ea 100644
--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/blockMeshDict
index 16829854ce..633bfd4567 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/controlDict b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/controlDict
index 7afd6e2c6e..d00ac7af72 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSchemes b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSchemes
index 37d1398232..4d6efb987d 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSolution b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/meshQualityDict
index 3b602f3564..7cfdb251b8 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict
index d97ff06275..d42f23acc2 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/surfaceFeatureExtractDict
index e1ad6b55ad..83982342d2 100644
--- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/blockMeshDict
index e004640b7f..f7b3004834 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/controlDict b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/controlDict
index 7afd6e2c6e..d00ac7af72 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSchemes b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSchemes
index 37d1398232..4d6efb987d 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSolution b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/meshQualityDict
index 3b602f3564..7cfdb251b8 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict
index d936c74797..0125550b14 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict.orig b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict.orig
index 7ee0c1da79..08313f0d82 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict.orig
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/snappyHexMeshDict.orig
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/surfaceFeatureExtractDict
index c1330e30fd..4adf82c964 100644
--- a/tutorials/mesh/snappyHexMesh/block_with_curvature/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/block_with_curvature/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/blockMeshDict
index 1e55ae547d..a04ffb79df 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/controlDict b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/controlDict
index 100b600eb8..79493c0809 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212 s                               |
+|  \\    /   O peration     | Version:  v2306 s                               |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSchemes b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSolution b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/snappyHexMeshDict
index 522e867b25..80e5d12aca 100644
--- a/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/distributedTriSurfaceMesh/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/blockMeshDict
index 6356948fe8..96848d2485 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/controlDict b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/controlDict
index c6e0c054f6..0fa1ac7238 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSchemes b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSchemes
index d54f37a019..9d45bc4447 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSolution b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSolution
index aadb16476c..ff262241b5 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/meshQualityDict
index 9d6fbdaf70..f663f4de94 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/snappyHexMeshDict
index 2560c52722..c61ed391c2 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/surfaceFeatureExtractDict
index b00854baf7..657d89a853 100644
--- a/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/faceZoneRegions/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
index 5fbd7b50d1..08c61e65a0 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/controlDict b/tutorials/mesh/snappyHexMesh/flange/system/controlDict
index b9bb8a115c..f806598d4b 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes b/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes
index 3608a58945..beaec8de04 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/fvSolution b/tutorials/mesh/snappyHexMesh/flange/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/flange/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
index 4e5012541c..92e687df9a 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
index 72b3aed23c..938c25395f 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict
index 5e44a74134..adfc349bc6 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict
index 19cb348298..14c0b3812b 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212 s                               |
+|  \\    /   O peration     | Version:  v2306 s                               |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict
index ffddc22cfd..ec63882381 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict
index b80f0e16eb..bb41454ff8 100644
--- a/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/blockMeshDict
index 9fde359d17..d7bd00d283 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/controlDict b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/controlDict
index 9e5e5d3ef2..3f40cc9937 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/decomposeParDict
index 820210b1fe..e83f5994e0 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSchemes b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSchemes
index 41a93e924d..a04abadf64 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSolution b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSolution
index 1c9ea395c3..f20dd5d182 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict
index c2e0fb213d..d034066d9d 100644
--- a/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridgesDirectionalRefinement/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/blockMeshDict
index 4480fa75e5..2a3067220f 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict
index ae58998f22..2e2a54a2bc 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/decomposeParDict
index dfe6938530..e78c1f97be 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSchemes b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSchemes
index d54f37a019..9d45bc4447 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSolution b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/snappyHexMeshDict
index c6bf0d3130..02cbdca044 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/surfaceFeatureExtractDict
index 7471fea297..10fb628a71 100644
--- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/opposite_walls/system/blockMeshDict
index b9d48ba275..c849fb7799 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/controlDict b/tutorials/mesh/snappyHexMesh/opposite_walls/system/controlDict
index 19cb348298..14c0b3812b 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212 s                               |
+|  \\    /   O peration     | Version:  v2306 s                               |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/opposite_walls/system/decomposeParDict
index 5f5e4e4d12..5af025f833 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSchemes b/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSolution b/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/opposite_walls/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/opposite_walls/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/opposite_walls/system/snappyHexMeshDict
index 8024c7e784..bc5171d3b1 100644
--- a/tutorials/mesh/snappyHexMesh/opposite_walls/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/opposite_walls/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/constant/transportProperties b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/constant/transportProperties
index afcaedf488..9071b8b124 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/constant/transportProperties
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/blockMeshDict
index c4e55caec3..d842fcc87b 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/controlDict b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/controlDict
index 223cfaba33..ba56f81f48 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict
index 01759fdc16..eee80a14bd 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict.16 b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict.16
index ad0731d234..577b699891 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict.16
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/decomposeParDict.16
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSchemes b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSchemes
index e7eca24ea7..e6055f061a 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSolution b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSolution
index 18c0871add..34ff00cf3f 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/snappyHexMeshDict
index a3a8e0d83d..1f336bbc8e 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/topoSetDict b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/topoSetDict
index 23d117560b..14fc7e5e94 100644
--- a/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/topoSetDict
+++ b/tutorials/mesh/snappyHexMesh/sphere_gapClosure/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/blockMeshDict b/tutorials/mesh/stitchMesh/simple-cube1/system/blockMeshDict
index 6a56422343..d4b52331fc 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/blockMeshDict
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/controlDict b/tutorials/mesh/stitchMesh/simple-cube1/system/controlDict
index c959e3d831..960974e16d 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/controlDict
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/createPatchDict b/tutorials/mesh/stitchMesh/simple-cube1/system/createPatchDict
index 582da2ea82..e40aacad0b 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/createPatchDict
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/fvSchemes b/tutorials/mesh/stitchMesh/simple-cube1/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/fvSchemes
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/fvSolution b/tutorials/mesh/stitchMesh/simple-cube1/system/fvSolution
index a98a3f8b97..f59e45d526 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/fvSolution
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/stitchMeshDict b/tutorials/mesh/stitchMesh/simple-cube1/system/stitchMeshDict
index 59ff0e1877..d8313f2781 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/stitchMeshDict
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/stitchMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict
index 509bb9c5c6..bcd73c2cd5 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches
index efc86ea8c0..66dc42fb9b 100644
--- a/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches
+++ b/tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U
index 8f6d1184a4..c929273377 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water
index cf6fc2e1f1..25746de4f8 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/epsilon b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/epsilon
index d09471a1f4..62315faf9f 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/epsilon
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/k b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/k
index 464e1cc537..123a10d652 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/k
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/nut b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/nut
index 6bd271492c..e47e1b86c9 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/nut
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh
index e0b1f73af8..df97842c4d 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g
index 403fa6515d..e0d5df8928 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 5736abc305..ec1381cb55 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/blockMeshDict.m4 b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/blockMeshDict.m4
index d35b2fb0a4..e8e4c88832 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/blockMeshDict.m4
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict
index a5edf76d42..3321d41f4d 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict
index d3d5b62106..4a16133766 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/decomposeParDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/decomposeParDict
index f5939dcacd..1446f00e5c 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/decomposeParDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
index fa1c70c66b..492d670c31 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
index 5bf23b7c0a..8fe65c5b1d 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict
index 8aff22c4bb..3f3b7a110f 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
index 7261752f1d..5eb4c50da2 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U
index 4818c88b4b..d450409afb 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour
index ab324c72d0..aeb7f5c6e6 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/k b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/k
index c52a25c26e..5419c3eb01 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/k
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/nut b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/nut
index 36afb0bd14..d544be2b29 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/nut
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p
index a5aa0cd1aa..bfdedd749c 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho
index 1390ac2ac2..89fd9f817f 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
index 5d3fb5e0c0..1803f43709 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
index 68c63d1f95..9197252b7d 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
index af60d187a3..45e0179934 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
index d409e32d9b..598e11398f 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
index 8410300485..8363165228 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
index f15d602004..aeac8ece11 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
index 7428bca969..3e5e11ab05 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
index ab5eca552a..b905dfff39 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
index 45caba3168..edb1e9369c 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
index e3947eb114..7c79945501 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
index 8f8e9c84b1..ff2ad30592 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
index 53fba6cc73..0dc8866a15 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
index 0c30249801..d4c31c1cdf 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
index 2d4587cbe3..74aac7fbb1 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut
index a0894d22b9..09fde398b8 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
index f55abd88e0..9f4fc9482f 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
index 6115066419..b9198b2067 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
index 5d3fb5e0c0..1803f43709 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
index 68c63d1f95..9197252b7d 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
index af60d187a3..45e0179934 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
index 8d5359a3f7..c334a20240 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
index 6a8510831d..607fcf546f 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
index f15d602004..aeac8ece11 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
index bb88190505..56daab2a31 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
index 4c52d8e28c..d7fa976a79 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
index 45caba3168..edb1e9369c 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
index e3947eb114..7c79945501 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
index 8f8e9c84b1..ff2ad30592 100644
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U
index 9afcf620e8..8d733c3c42 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour
index ab324c72d0..aeb7f5c6e6 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/k b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/k
index c52a25c26e..5419c3eb01 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/k
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/nut b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/nut
index b53ff3cc69..b0c390cad3 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/nut
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/omega b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/omega
index 130a6fb4ea..7b9a4f6d28 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/omega
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p
index a5aa0cd1aa..bfdedd749c 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho
index 1390ac2ac2..89fd9f817f 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
index 5d3fb5e0c0..1803f43709 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
index 68c63d1f95..9197252b7d 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
index d409e32d9b..598e11398f 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
index ac08e0eae8..d3ab4edfb0 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
index a7b1bb2b82..9568ad9e88 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
index 7428bca969..3e5e11ab05 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
index ab5eca552a..b905dfff39 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
index 45caba3168..edb1e9369c 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
index e3947eb114..7c79945501 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
index 8f8e9c84b1..ff2ad30592 100644
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T
index d7e7e54998..1eaa6bf68e 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U
index 68af5bdfbc..0763f91db7 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water
index 848a41df4e..2d29b9884e 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p
index fa85e7c95a..b1e870222a 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh
index 0b97be17d7..37a49e87e4 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
index d2781057ae..5e2be78dc1 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties
index 65ca66aa61..a9a6aaf1c3 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water
index e5c7f62889..b56b5f3ce7 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties
index f93b290e9b..3478b1dfc9 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/blockMeshDict.m4
index 5dda2c1b9b..aa3ad58119 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
index dc73fe6437..22845735e8 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict
index 50182d35a2..ed2afb7a7d 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes
index 17cce74302..b15e761b48 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
index fdf98f8c59..20f96ad8ef 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T
index 88a131927c..dfe95670f5 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.air
index e9d30d7278..2a1065e6e7 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.water
index df424586c5..17e1a71c60 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/U b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/U
index 850f3aa4b4..14b0d726b5 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/U
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/alpha.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/alpha.water
index fce5e2c4f1..56f71652df 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p
index 88999faaf2..89b19a2880 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p_rgh
index 0f0368b59e..a4cbec0508 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
index fe45307409..5060d7f619 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g
index f556bf0901..248cf786b4 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties
index 46daced170..32c99b7c40 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water
index 9876247025..9ef5fdc7c9 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
index 2f7010e011..a75d828c87 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/include/meshModifiers b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/include/meshModifiers
index 5e85b242f0..f84db3860a 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/include/meshModifiers
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/include/meshModifiers
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/blockMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/blockMeshDict
index a7c373c44e..4c1e56abeb 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM Extend Project: Open Source CFD        |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict
index caa0c81f07..74182b8171 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict
index cd8538fa06..f39608b785 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/decomposeParDict
index e202c4f5aa..6199a5e4b7 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes
index 72e9911ce5..143b630662 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSolution
index b1f1086f8f..c0950bc615 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/setFieldsDict
index 8030657183..98b68263d0 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict
index d304285fdb..2c30861a31 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T
index 0a96cddc28..f1004f6d32 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/U
index 5ceb6ca1cc..3b1d31e140 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid
index 4de769bf00..fc5bb5c4dd 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p
index 45f36d22db..8c5f6ba3cf 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh
index 5a509bbbcf..c1e6fe387a 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/sigma.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/sigma.liquid
index 1c6fa43c07..54685acbd4 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/sigma.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/sigma.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions
index 6ad56b2f8f..e64635c335 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties
index 521dcc2509..c1625c997b 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air
index cc881541e1..977babaa79 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
index 15bfaec24f..1d97bc9a74 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties
index 9d3c58357c..f9c188fc79 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
index 7255980994..dfb4697f1f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict
index dcf8057af9..ce88e92268 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
index 24dc0b74c0..dc49f28726 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
index c3b21ef190..33c7c5a8e9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes
index eaedb5c9fa..19b907952f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution
index e184ee9caf..960d2f5b91 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict
index fd2db57b7a..a6afb201f8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T
index 706b1f9d17..566f813ada 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U
index 5d9965ce3d..41094113ee 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water
index 7897d88c06..794a1c9912 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p
index 8b4b8e668c..9fae14f742 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh
index 127dfd2abb..e1c224c9e2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
index 3ddfaadf30..790d94ceaf 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index e5c7f62889..b56b5f3ce7 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
index b0e647e26d..ecbe363566 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
index aabc5cd5f7..d880c716a8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
index 7e5420dd33..7aead161da 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index b479523234..29086163e9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
index 18d7e7266a..ad0d3910ca 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T
index 706b1f9d17..566f813ada 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U
index 5d9965ce3d..41094113ee 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
index 7897d88c06..794a1c9912 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p
index 8b4b8e668c..9fae14f742 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh
index cf8aef7413..c44de76d7b 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
index 20109fd348..cc303098a1 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
index ec6e33f54a..598ed041fa 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
index de0f30a71c..a836c2e511 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
index 775f3fc1fd..d44d495ff8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict
index 03e30c74a1..00c7c215fc 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
index 7e5420dd33..7aead161da 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index 84b33b1847..c4138d7b60 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
index 8e246bbacc..6a1bcd1fd9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T
index e98f85b478..951ffba390 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U
index 0e925c3fa1..1d0c0bca94 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water
index f2b78def9f..f4fee33b51 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p
index 4537b9155a..8ab13ba913 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh
index 3b6acaaa55..9923d0da0f 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties
index 3ddfaadf30..790d94ceaf 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water
index e5c7f62889..b56b5f3ce7 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict
index de49f2d848..949b25f13b 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict
index 477a60232e..7a66832686 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict
index c1ffca2335..6bbaa44e9c 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes
index 7e5420dd33..7aead161da 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution
index b479523234..29086163e9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict
index 5a81b3e6a6..c64aa615a6 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T
index 636c34fa04..82c3db0bf4 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p
index 529d179690..7ec5528dae 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties
index 336ca25977..a13d94bec5 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties
index b747928de4..a82ce62cf5 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict
index a6ea2c4af2..6cc43cf8b2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict
index 29b1d70a08..6ed537afcb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict
index 820210b1fe..e83f5994e0 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes
index ba54632d95..6d52ff83e3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution
index 7e543109f1..d76d602da8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T
index 0a96cddc28..f1004f6d32 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U
index 9ff89765f0..155f617309 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid
index 4de769bf00..fc5bb5c4dd 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p
index 45f36d22db..8c5f6ba3cf 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh
index 5a509bbbcf..c1e6fe387a 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/sigma.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/sigma.liquid
index 1c6fa43c07..54685acbd4 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/sigma.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/sigma.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions
index 6ad56b2f8f..e64635c335 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties
index 521dcc2509..c1625c997b 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air
index cc881541e1..977babaa79 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
index 15bfaec24f..1d97bc9a74 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties
index 9d3c58357c..f9c188fc79 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
index 7255980994..dfb4697f1f 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict
index dcf8057af9..ce88e92268 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict
index 4d86b4c686..326d0bd35e 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict
index c3b21ef190..33c7c5a8e9 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes
index ca7d3b191d..db6579d907 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution
index f91ee7e6fe..2f4b29facf 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict
index fd2db57b7a..a6afb201f8 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T
index 706b1f9d17..566f813ada 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U
index 5d9965ce3d..41094113ee 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water
index 7897d88c06..794a1c9912 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p
index 8b4b8e668c..9fae14f742 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh
index 127dfd2abb..e1c224c9e2 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties
index 3ddfaadf30..790d94ceaf 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index e5c7f62889..b56b5f3ce7 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict
index b0e647e26d..ecbe363566 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict
index 85a204a865..72f060eb61 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/decomposeParDict
index f9a0e49a58..c445a5fdcc 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes
index 9883cb0564..b8e243e3e3 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution
index 5792bab2fe..5f5c3b75be 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict
index 1933724d73..0436e4ed2c 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict
index ea46bc2c72..2d4412b908 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T
index 706b1f9d17..566f813ada 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U
index 5d9965ce3d..41094113ee 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water
index 7897d88c06..794a1c9912 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p
index 8b4b8e668c..9fae14f742 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh
index cf8aef7413..c44de76d7b 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties
index 20109fd348..cc303098a1 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
index e5c7f62889..b56b5f3ce7 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict
index de0f30a71c..a836c2e511 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict
index 5e1afafe46..4820146838 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict
index 03e30c74a1..00c7c215fc 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes
index 9883cb0564..b8e243e3e3 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution
index 8dcd8ea961..4041e4ec54 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict
index 8e246bbacc..6a1bcd1fd9 100644
--- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/T b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/T
index d73320839e..b0847011b6 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/T
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/U b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/U
index 92ead7f503..16b63d7698 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/U
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
index 9fbbae2ecf..827fff15d9 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
index 90186f97aa..a5ecbe296e 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
index 82a2f29b8b..8eae10b7d0 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
index 9697cf3a95..d551f1d719 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p
index 52c65cac54..102b7f87a2 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
index 9427a4aae0..fbf44233c6 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
index f26c29302a..2bd06fde50 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
index 2bec73f571..5aeba38f59 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
index 39e9a30355..e364fe697c 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
index 6dbc7004ff..60714ce5c6 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index 7f8c256718..f77637e8ff 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index fcab10e3dd..f3499516e8 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 11ede0c4de..9b8f7e1882 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
index 4d52ca03ed..28fb41767e 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
index 735a3dc654..dd36b1dc28 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
index 69f9b896b7..ff240e2094 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
index c184ef2421..500f553f49 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
index 9ee877336e..fbfd9fdf97 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut
index c41ff2efd4..e004a5d545 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
index 03dbe117ee..9d7adf82df 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
index b3433e7ae0..ee4be3002d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
index 100e728b08..1cbb012894 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
index 46b4e8ad5f..0a5fb3b521 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
index b950c08a4b..e5f3c7c9ee 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
index ff0f96d07d..c75e9f70a8 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
index 54f8d9fd31..3dcb3d6191 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/U b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/U
index bcbd1647cd..6830c2a536 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/U
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge
index 37d0865fcf..95e84ca9fa 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/epsilon
index 25fe109473..b024127a8d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/k b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/k
index b3bb4ebc28..9f9928b8d6 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/k
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/nut b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/nut
index 797d5bbab7..346cd127f0 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/nut
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh
index 2a1e9aac44..5da21efa7d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
index b20c6deb82..ea84be28f5 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
index b3433e7ae0..ee4be3002d 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
index 100e728b08..1cbb012894 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
index 5eacc378d0..7c61a1760b 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
index e33c0e4e13..e5e617cc06 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
index 21244a2674..08b2f64c75 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
index 1ee34a8ac5..88faa71846 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
index 7b40c519c5..bfb3b36012 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U
index c7983cdbfa..400918f380 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge
index 8c8a02450c..303cb2cae0 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon
index 14b9613a62..31f399b294 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k
index 574f7e0e63..0a8726ec6b 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut
index 3dee6f355c..b1e7d883c9 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh
index 67f12a0030..c8ea62d86b 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
index 137d3132b2..01ba2584e4 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
index 100e728b08..1cbb012894 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
index 18ef577b2d..75f6a4f03a 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
index c000f03596..6dffac87c9 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
index bf86730712..6621b1a7d5 100644
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/T
index 1f5ad5d6c0..b2003c9ded 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/U
index c1cbc7bb1d..a1f1189e69 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/air.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/air.gas
index 5377ff9ffe..76321b45d9 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/air.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/air.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas
index 42de1c6de5..7012525336 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid
index 06cea55176..ff66d6605f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alphat b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alphat
index 61e4968e73..2f9845ff60 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alphat
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/epsilon b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/epsilon
index c70721cb4d..08216ed0cc 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/epsilon
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/k b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/k
index 17e3803b40..a508749314 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/k
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/nut b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/nut
index cbb6cd56f3..8e199de93c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/nut
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p
index 10c3003cf4..5b1fdb7eed 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p_rgh
index 4f710d1015..8eec82ae42 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/vapour.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/vapour.gas
index 698d10f471..7919b1a92e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/vapour.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/0.orig/vapour.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/phaseProperties
index 0e5833551c..1623b903d0 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas
index ae0d5b81b8..e4c014113b 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.liquid
index b1ecc0a800..8f5fa928aa 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties
index 553b821f8d..e13614f7b8 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/blockMeshDict
index cedfd8a482..ffd8531469 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/controlDict
index 686d7c90bf..2b6800e0ae 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSchemes
index fdf24a7b23..38c038da62 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSolution
index 124375f07b..53c085573f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/setFieldsDict
index b2636e41ec..dda60d7504 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/evaporationMultiComponent/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/CO2.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/CO2.gas
index 7994f6ac0f..5c96fee071 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/CO2.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/CO2.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/O2.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/O2.liquid
index 76374bca4e..3bfdd4dceb 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/O2.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/O2.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/T
index fd839e7e44..0bccccc903 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/U
index 8777ced7d6..4f175e9f33 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/air.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/air.gas
index 40fd8a66f0..d24b53fb5d 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/air.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/air.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.gas
index 42de1c6de5..7012525336 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.liquid
index 11f3db3a8e..248c570e59 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.mercury b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.mercury
index e7b00781b5..87b10a0508 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.mercury
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.oil b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.oil
index 2c338733b4..d90a312b05 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.oil
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alphat b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alphat
index 3f18126ed9..e6cc0f647b 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alphat
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p
index 10c3003cf4..5b1fdb7eed 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh
index a6655cdcb6..74d8cec6e2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/vapour.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/vapour.gas
index 698d10f471..7919b1a92e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/vapour.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/vapour.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/water.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/water.liquid
index 72b9f1518d..2646cb6ef9 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/water.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/0.orig/water.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/phaseProperties
index b72072559f..536382c47a 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.gas
index d003d5c325..3d7db7ea66 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid
index 343db6a285..7b2205ef54 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury
index 2d405e765e..86e4050b8e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil
index 9b6f8034b9..631cf614d3 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties
index 4413e9cbfb..07125e82f2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict
index cd78506c26..58d129faeb 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/controlDict
index 689ba40b66..93acd0c23f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes
index b2d57a990d..327877b99e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution
index 80addd6b15..5a885a1ed3 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict
index 2f0c9b0ef3..c11eb6101d 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/T
index 393957d7cb..ab79391dc7 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/U
index 8a3fa79c54..b9104a72ca 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.gas
index 42fb3be965..467d83b37f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.liquid
index 3733280ebe..d7e2345951 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury
index b90128a419..aaddf0e98e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.oil b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.oil
index 0b163fe385..3f6f4e2df6 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alphat b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alphat
index f77d6c67f9..ffadec9362 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alphat
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/epsilon b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/epsilon
index 0493ae776f..08be517485 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/epsilon
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/k b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/k
index d4a21b34c2..cd6f7d61d5 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/k
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh
index f1814789f1..202ed444b6 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict
index c89d90031b..f4534f6dbc 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/phaseProperties
index e3d8d8209d..ed06f9227c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.gas
index b5a0b9fb1d..4b6cc7465a 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.liquid
index ea94e90354..25be5fbf9d 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury
index 2d405e765e..86e4050b8e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil
index 9b6f8034b9..631cf614d3 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/blockMeshDict.m4
index 14e2488e7e..079b4e4d49 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/controlDict
index d0709d82b2..033f62b35d 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/decomposeParDict
index 992c12dd62..7f9ec8d22f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSchemes
index 39745e2980..2eea06718d 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSolution
index 57f66692da..aee919c268 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/setFieldsDict
index afd7a31262..93419abada 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/topoSetDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/topoSetDict
index f9488198e9..fdb2821114 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/mixerVesselAMI2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/T
index 4b9b174f4a..4efa34544c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/U
index 69e21c4c17..d59deee50a 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.gas
index 53023ba9d0..66fb11096f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.liquid
index 8d20c66a98..81dbcb2db8 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.oxide b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.oxide
index e4acefd261..711b86887c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.oxide
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/alpha.oxide
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/p_rgh
index 199d183494..7e375e90a4 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/phaseProperties
index 171c67f36b..9e0a470fdd 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.gas
index 9f04f9d13c..cea30f1ff8 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.liquid
index 4962da0ede..b6f8b0a7c3 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.oxide b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.oxide
index 9fab72b9d3..9d4714e290 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.oxide
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/thermophysicalProperties.oxide
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/blockMeshDict
index d70bd72e76..31e07ece4f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/controlDict
index cd1a5ad777..b7d4ec0f10 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSchemes
index d230294bc4..bf49734545 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSolution
index 5e330091d5..4550ad7b85 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/oxideFormation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/T
index 6d3b1e768c..1dae05cabe 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/U
index 1f2c61ed37..240af251dd 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/air.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/air.gas
index 30560982a4..cf97b73def 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/air.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/air.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.gas
index 1af59d941f..4ec90ce32e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.liquid
index a2c56472b2..853ecc0211 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/p_rgh
index 641a19e08a..d684629fae 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/vapour.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/vapour.gas
index df81af2aff..0dd29b8dad 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/vapour.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/0.orig/vapour.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/phaseProperties
index f03f8965bf..010b2100a5 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas
index bd81cce552..c7c62b9019 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid
index 64d60312bb..eacfe0cee1 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/blockMeshDict
index b2f10157a8..4e65ff8493 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/controlDict
index 4dca0affcc..cea2beec6c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSchemes
index 88574af2bc..2a4af1ebf7 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSolution
index 799525d105..7f6f673d25 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/setFieldsDict
index a1fc092ea5..1d44f06fb4 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporation/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/T
index 1f5ad5d6c0..b2003c9ded 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/U
index 24dce8d113..99ed1eb024 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/air.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/air.gas
index a5f36c087c..ea2e0d42ba 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/air.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/air.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.gas
index 42de1c6de5..7012525336 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.liquid
index 06cea55176..ff66d6605f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alphat b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alphat
index ad79a660e4..a43c4fe948 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alphat
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/epsilon b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/epsilon
index c70721cb4d..08216ed0cc 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/epsilon
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/k b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/k
index 17e3803b40..a508749314 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/k
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/nut b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/nut
index cbb6cd56f3..8e199de93c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/nut
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p
index 10c3003cf4..5b1fdb7eed 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p_rgh
index 4f710d1015..8eec82ae42 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/vapour.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/vapour.gas
index 2d2fdd2931..e7b4fe0d6e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/vapour.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/0.orig/vapour.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/phaseProperties
index 7031824d06..7b2202f26f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.gas
index 7724b72246..f3ad5ccf8c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.liquid
index b1ecc0a800..8f5fa928aa 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/turbulenceProperties
index 5c54b7633e..c6d57b871e 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/blockMeshDict
index 18ba88682a..d25e5fceaa 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/controlDict
index 3134755c58..83f259ec01 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/decomposeParDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSchemes
index fdf24a7b23..38c038da62 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSolution
index edfc092003..181222ebdb 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/setFieldsDict
index fb59021364..fe1df5c234 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/setFieldsDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/poolEvaporationMultiComponent/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/T b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/T
index 12d449ed61..0f53b304e4 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/T
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/U b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/U
index 8f022af1ee..5fffe1de46 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/U
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.liquid
index 9b1ccf727f..b59088cb8b 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.solid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.solid
index 4c7949bcf7..e14e6978c3 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.solid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/alpha.solid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/p_rgh b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/p_rgh
index 6c1aefcd4f..becba093a7 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/p_rgh
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/g b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/g
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/phaseProperties
index 76789395ab..260ca09ad6 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/phaseProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid
index 7698769728..acb76e47db 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid
index eba77213b1..fb7e780815 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/blockMeshDict
index 580cd18da2..7c1f26c2d5 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/controlDict b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/controlDict
index 4130a3c905..795ccedf2f 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/controlDict
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSchemes b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSchemes
index b826c49b95..d8617b427d 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSchemes
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSolution b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSolution
index d81da6cd67..aacff0559a 100644
--- a/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSolution
+++ b/tutorials/multiphase/icoReactingMultiphaseInterFoam/solidMelting2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T
index 71afdb3553..5409f7d93a 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U
index 8777ced7d6..4f175e9f33 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid
index 3a2d56fe9f..5113567529 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/epsilon b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/epsilon
index 99397cc0d3..de0c8e898a 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/epsilon
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/k b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/k
index 597ff5e41a..912fe54d64 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/k
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/nut b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/nut
index cbb6cd56f3..8e199de93c 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/nut
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/omega b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/omega
index 5cf907a98d..83f716a942 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/omega
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p
index 10c3003cf4..5b1fdb7eed 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh
index 28288a1d46..287ae89428 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties
index 0cd68c0bef..51eeb2b6e0 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties
index 9a9f4dafab..31a097a38e 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties
index 41424df55b..9e77444a12 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties
index 1b048e5964..de11cc9dc9 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict
index dbf5a8c958..ad08bd20d0 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict
index 448f184b63..b78f478ba5 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes
index 0f49f75bbd..9d8a701687 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution
index 42bf130364..0d6852b1a5 100644
--- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution
+++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U
index 88b6f06009..4ba7da23de 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel
index fcbeaaeecf..5e9b9be4a9 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k
index 6623b8f536..2d9991f7c4 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda
index a08d37ab4b..e23ae27673 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut
index f7022e9312..6e79284f3d 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh
index 34a7b935d3..9cbfef4517 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
index 1ddad2f979..6429d98541 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
index af60d187a3..45e0179934 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
index 8b3fdd2b9a..3292894cfa 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
index 2ce1c49c06..e5cc274b9e 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
index 28a83d7a3a..fc50dd51d1 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
index 275b6b5841..d6a1f13e49 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
index 97bd237294..0eaf84f5dc 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
index 3ee7240731..b46deb784b 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
index 21f5393ced..49c577aa0d 100644
--- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
index 8ade3acaee..4e4e5ebee6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
index 9e7e449cef..6ae3f80669 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
index d128e3312e..1671cfa174 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
index 4a8ccfcb8f..dd31b3b029 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
index 6f6783aa64..8a925adb79 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
index 5bda177de9..7168d41d70 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
index f3e3163993..a107e12997 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
index 613010095b..632c00e968 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
index 22dd0f4c1f..e60fe8a731 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
index 9a8220b137..d248a1f1d8 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
index 6cd3fdf196..d6e42caf54 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/decomposeParDict
index 7929c979c7..4461518409 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
index ec5f8c7342..8af7522417 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
index 1241682db1..c3af530005 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
index 63cdf6c2f3..c3a9a23c4f 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
index b86f38521b..b9922c39c2 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
index 7de4e73536..a57f8981e6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict
index 30209c6ffd..63af4025fc 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 94210ca615..5253a4be96 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
index 31ea040fdc..67aabb7d2f 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
index 5245bfc196..5da2447e1e 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
index 6c26af0c45..c95b627ef3 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
index ad76d3c09f..8186880b1a 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
index 78d61bf7d3..29d89c225f 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
index b64bd29cd1..2ef1c3a441 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U
index a6fc950aac..c4e646d271 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water
index 9e7e449cef..6ae3f80669 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k
index d128e3312e..1671cfa174 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut
index 4a8ccfcb8f..dd31b3b029 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega
index e3ea656b7a..32255852a1 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh
index 5bda177de9..7168d41d70 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement
index f3e3163993..a107e12997 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict
index 1d2d67321c..ed416fc24a 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF
index c76bd0b123..c0c7b878a6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/dynamicMeshDict.sixDoF
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef
index 613010095b..632c00e968 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties
index 22dd0f4c1f..e60fe8a731 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
index 9a8220b137..d248a1f1d8 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict
index 5ad25ccb4e..6ac1423a2b 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/decomposeParDict
index 7929c979c7..4461518409 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes
index 4c29235375..2ad6108369 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
index fe9ecc4c10..69f810d7c9 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
index c62497f3a2..46b4932961 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
index b86f38521b..b9922c39c2 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict
index 7de4e73536..a57f8981e6 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict
index 0b10a64103..cf7af1ca22 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/surfaceFeatureExtractDict
index 94210ca615..5253a4be96 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
index 31ea040fdc..67aabb7d2f 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
index 5245bfc196..5da2447e1e 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
index 6c26af0c45..c95b627ef3 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
index ad76d3c09f..8186880b1a 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
index 78d61bf7d3..29d89c225f 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
index b64bd29cd1..2ef1c3a441 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U
index 7019b03c75..f3d183ce1b 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water
index f3fdf800d1..068e9b74ea 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/epsilon
index 5642f11b6d..3bf3f3e186 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/k b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/k
index 281b481f29..17905521d8 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/nut b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/nut
index c4fb2d39a6..22d7f69576 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh
index 0a4718d026..5cd8b0544c 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/s b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/s
index 9930c20362..d64e8b0b85 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/s
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/s
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
index 68722d27c6..34033fefe5 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict
index cce0c65574..f1523a6b6d 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
index 1affdbb6a2..c208fd7ec9 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
index 73805cd522..435b507afc 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
index 53390e5954..76409d87bd 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/U b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/U
index 92ead7f503..16b63d7698 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/epsilon
index acde0a00e1..d39e8610b8 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/k b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/k
index d1aa28a6ee..c6dd79be73 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda
index 0df96e25f6..41fa7f0d7f 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nut b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nut
index 4d30f05d00..fc86fe2533 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh
index 8a1cf25d9a..2132a727c1 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
index f295e01ce4..f8b058eed9 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
index 626d5b167a..7362d0d5b2 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
index 0115589e45..157a9a4ae0 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
index 56c336dfbf..3166fb0714 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
index 3e80b3b9a5..6aa8dbc6ea 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/U b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/U
index 5eed1eb1e0..3ddea60609 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/alpha.water
index 9d46af8e44..1f9f2cb361 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/epsilon
index 451d241214..40d764a581 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/k b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/k
index 9a39a01f86..0dda0331fc 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nuTilda b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nuTilda
index 5c6523275f..ddc7b61aed 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nuTilda
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nuTilda
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nut b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nut
index 7426281b43..c04326069b 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/p_rgh
index 4b42561af9..594c899749 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
index 1135633067..f93d30d27d 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
index 5171717e11..fefaf8a807 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
index 5d22e27684..46698e0c15 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
index 2bfb59a547..5759fa0e89 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
index 3e80b3b9a5..6aa8dbc6ea 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
index 474dc1932c..334821abe0 100644
--- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/U b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/U
index 950cf47ba2..07df39ecc1 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/alpha.water
index 86be84eab5..cfccd5d0ca 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/electricPotential:V b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/electricPotential:V
index 28ad7dd4e6..c69f9e02b3 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/electricPotential:V
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/electricPotential:V
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/k b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/k
index 9c9bce9ec3..cf0b7811ff 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/nut b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/nut
index d39de722eb..21f183c6f2 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/omega b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/omega
index b6e906af97..4d00d5d00b 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/p_rgh
index f856b9c4b3..33355c475c 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/dynamicMeshDict
index cc180534b2..bafd24847f 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/g b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/hRef b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/hRef
index 081d98a3e8..86522b663d 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/hRef
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/transportProperties
index 037f509c51..5b5dead07a 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/turbulenceProperties
index 6d1e6834b5..2216bdaf5f 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential
index e2fa163f66..79723fd6e0 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/blockMeshDict
index f505d36b51..b01bffea8f 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/controlDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/controlDict
index 1a42266009..564587fddd 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/decomposeParDict
index e6326ee705..7afb0cc272 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSchemes
index 64d7e909fe..01743573d1 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSolution b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSolution
index 9a1529d4b5..6060d52803 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/meshQualityDict
index 533c7af6ee..e6557ba4a1 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/setFieldsDict
index 07dc734b89..4896ba2f86 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/snappyHexMeshDict
index 0ff0db0e7c..1fa31eb585 100644
--- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U
index 13ae13383b..3d9330b504 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water
index 2dfa28a909..89e2ced306 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/epsilon
index 3a369a3d42..1b4695ddc2 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k
index 8804c691c9..ef564ea6b0 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut
index 5f7fbbbcba..ee6653e187 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh
index 0d5c25163d..0b19e16d2d 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement
index 8a7b2be1f6..cc5383cda8 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
index d5f3286924..f88ebc130f 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
index e4e9083b7b..07f6f230ea 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/dynamicMeshDict.sixDoF
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict
index 6ebde88e8b..09d06aff21 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict
index 29bfbb1e89..534a069e97 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/decomposeParDict
index 53ef274957..d3242b64fc 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes
index 1c8512b73b..bd7299979c 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
index 20dd540759..805321064f 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict
index 69990b3cc4..e98c2d2a14 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
index c28e8e4642..fb36854374 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U
index fbd3b5eec4..5add11e4cc 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water
index fed1dc159b..26c924fc78 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon
index 2f0d6985c0..f869841d6a 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k
index e2e9350cf7..ba183aba37 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut
index 3c6d4d3a6f..4cfaa884b4 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh
index 05da95573b..573d79779b 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
index 647b9b3323..a571d03cbe 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties
index 5212d11943..a4c0758f95 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
index 17a7cc841f..81fe57bcbc 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict
index 5800818062..5616e870de 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict
index 6b86ae51be..ef35f38522 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
index 7cf9ff8b2b..91efbb674b 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/createBafflesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/decomposeParDict
index d4d751e6e0..57a60ee4df 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes
index 7a7daf33cf..6f747a14b2 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
index 45c7a707e0..d90e9c24da 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict
index df87eee5fc..33a68ad0cd 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
index c3ef6b5b52..825221617f 100644
--- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/U b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/U
index e30523aaa7..46b44c81c7 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water
index d715f1b84e..9e208952b6 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k
index 4620a265fe..000d962e66 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/nut b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/nut
index 36268e02e9..afe8b27e79 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega
index 305729d615..27eac77815 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh
index 71a0ff5b10..12ed44b4de 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict
index 54d569d8a6..d225ab4a1f 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/g b/tutorials/multiphase/interFoam/RAS/motorBike/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict
index 7fb898d729..603008dc5a 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict
index 2e09117134..a2e0c644da 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite
index 1b68460205..4b88e8bdbc 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run
index 2e09117134..a2e0c644da 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/decomposeParDict
index 7031fe5d4f..37a0be10ce 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes
index 3895b9c279..5a32adf8d0 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
index ce4374ec1d..3d5efb2f66 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/meshQualityDict
index 5d6776db6e..5404e0a76e 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
index db57434e7a..45d8eb6ad5 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict
index 499057fda2..72aef6422b 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict
index dcd962014e..f586a3c9ed 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/surfaceFeatureExtractDict
index 7952ec94df..a34c88a5ae 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/U b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/U
index 705b8fc92f..00f7403e70 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water
index e57590812a..8f4da6ee2a 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k
index e2d15e0aff..3a9077a0d5 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/nut b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/nut
index 7902d173a3..a5d9f580ed 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega
index 1625cdeb18..5a043841e4 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh
index 8059d84923..d73fc41e83 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s
index 24165b6f76..3f0aba4bb1 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
index 7f2e94cd0e..2a78431893 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
index 6cde9ef15b..cf9c6c330c 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
index f2abb64472..cd221eed2c 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
index 171737a8dd..18927cbc72 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
index f2abb64472..cd221eed2c 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
index cb4b942928..60d5b08365 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
index 016fcbeae1..2b07b70103 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
index 1c7366d077..101c1645fc 100644
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
index dbd949cf54..d644d93ff9 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water
index 8e63bfcdc7..e6f6736507 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon
index 3a0db2a7e1..0e2e352856 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions
index f23dc2b68a..e9ddba3882 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k
index 0af16ac772..c1a9717584 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
index 4f5005bae6..8c47c84365 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
index 7b77f0c8cc..ca49a95d1c 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
index ecd9a3d22d..ccaa2179d8 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
index 63bd4dbad0..890d6db155 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
index 758f027aed..b6140a32dc 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSolution
index f9dca7daa0..e6c1c20e67 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
index ed3fda93f7..f6002916d9 100644
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/U b/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/U
index cf4e2bc22b..b0ef21881c 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/alpha.water
index 9815918d17..713152a9ce 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/p_rgh
index 75b223b99c..a18f072cde 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
index b8697e241b..d7129eff62 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
index a42d633688..5b33ae7c75 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
index df06a83c20..7d6fbe1fd4 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
index 0a5bcb407a..f7bb4161fd 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
index 55b73350e7..bfff966372 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
index c0d04ce752..83148db958 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
index fa1a9e6fe3..08fa84a69e 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/U b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/U
index 92ead7f503..16b63d7698 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh
index 8a1cf25d9a..2132a727c1 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
index f4509c5e47..bcf51ddc1a 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
index 9539ea9d05..2a130f6d8d 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
index 66d996cd01..94d86d6e3e 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
index 04beeae69b..879056c594 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
index 3e80b3b9a5..6aa8dbc6ea 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/U b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/U
index 0b3822c238..d8a83a773a 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/epsilon
index acde0a00e1..d39e8610b8 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/k b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/k
index d1aa28a6ee..c6dd79be73 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/nut b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/nut
index 4d30f05d00..fc86fe2533 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/p_rgh
index 767fd72ae0..112b35418d 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/g b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/turbulenceProperties
index f295e01ce4..f8b058eed9 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/controlDict
index 626d5b167a..7362d0d5b2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSchemes
index 0115589e45..157a9a4ae0 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSolution
index 56c336dfbf..3166fb0714 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/setFieldsDict
index f4b3ccb431..aed1a05666 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakPermeable/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U
index deab70ede5..8e2757b517 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water
index 68c14341cd..c3bbc6ba26 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k
index 65c12b8b15..d72bf488c0 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut
index 5886a6e49a..ad1fbdb305 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega
index f53ed2ae93..b3470f17ef 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh
index 854b86b8f1..60fdb6b23e 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict
index ae47bc48c7..59a70412c3 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict
index 02e515c50e..5e0f08abe1 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict
index 2352052550..f3bffe8216 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict
index 589f2b0c72..b8c6e67935 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes
index 451469933d..2772a648dc 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
index 9cc74f8d24..5b1ff5255f 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict
index 2cd4a8d68b..a50465acc7 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
index e2806a0b31..763c8516ea 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/U b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/U
index bcbd1647cd..6830c2a536 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water
index ed1d386772..aa46238cce 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 2a1e9aac44..5da21efa7d 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
index b20c6deb82..ea84be28f5 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
index 3395c60723..77769cbf9f 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
index 078e8a9da2..216ee91dc0 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
index af99612b42..37551d8c9e 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
index 43e5ab7c13..859f4cce63 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
index 1ee34a8ac5..88faa71846 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
index 7b40c519c5..bfb3b36012 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/U b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/U
index 3f28d0a51e..bcdc9401c9 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/alpha.water
index 68c14341cd..c3bbc6ba26 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/nut b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/nut
index 5886a6e49a..ad1fbdb305 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/p_rgh
index 854b86b8f1..60fdb6b23e 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/dynamicMeshDict
index 837d435683..eb7b8143b3 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/g b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/blockMeshDict
index f8a69a8aa5..2768284c77 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/controlDict b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/controlDict
index 56916daa17..87d666366d 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/decomposeParDict
index 589f2b0c72..b8c6e67935 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSchemes
index 451469933d..2772a648dc 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSolution b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSolution
index d59dc06f38..8cc4bb422e 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/setFieldsDict
index 9f63f51d3c..e0ebce1e90 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/topoSetDict
index a51a96d68e..5dca565f80 100644
--- a/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/oscillatingBox/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U
index f6a3d320df..1ff6e7e3c4 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water
index ec51a4ac7b..78bece2dea 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh
index 63e6d45fa1..b473437aa9 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict
index 1dc1d27b4f..c7271a304a 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties
index d879868263..70038764a8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
index 189f31e2e7..1fa694aaa2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict
index cebbd03df9..697b839e5d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/decomposeParDict
index 48930fe6fc..a6c7dcffbf 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes
index da114bfb2f..40b4094c5d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
index be80dcde6f..bfa8157bf1 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict
index ec23d31e93..9f1dd2bf6a 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict
index b171282f14..4164bcca77 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
index 0457c2d920..017d634ffb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U
index 68af5bdfbc..0763f91db7 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water
index 848a41df4e..2d29b9884e 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh
index 7802f2bee4..dbd09096dc 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
index d2781057ae..5e2be78dc1 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/blockMeshDict.m4
index 5dda2c1b9b..aa3ad58119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
index ec7ebf9089..3a553ffa03 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict
index 50182d35a2..ed2afb7a7d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes
index 11eae571a8..9ceba70fa2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
index 658fa6e3b1..02bbf7a945 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U
index 68af5bdfbc..0763f91db7 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water
index 848a41df4e..2d29b9884e 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh
index 7802f2bee4..dbd09096dc 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict
index a48707b12b..1fc9845da8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/blockMeshDict.m4
index 5dda2c1b9b..aa3ad58119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
index ec7ebf9089..3a553ffa03 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict
index 50182d35a2..ed2afb7a7d 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes
index 11eae571a8..9ceba70fa2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
index 658fa6e3b1..02bbf7a945 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U
index 67fe230622..df706872b9 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water
index b49b7ae509..5ad29dabdb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh
index 167648393e..aff37b1171 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict
index d2781057ae..5e2be78dc1 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/blockMeshDict.m4
index 0c62e8bc76..c3a373f396 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict
index 3a5b7927ca..8f28c457d0 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict
index 79949ca96c..9ffdbf1763 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes
index 11eae571a8..9ceba70fa2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
index da3a19e145..dd3f1e3acc 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U
index 67fe230622..df706872b9 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water
index b49b7ae509..5ad29dabdb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh
index 167648393e..aff37b1171 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict
index a48707b12b..1fc9845da8 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/blockMeshDict.m4
index 0c62e8bc76..c3a373f396 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict
index 1425f2601a..0a94b72c46 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict
index 79949ca96c..9ffdbf1763 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes
index 11eae571a8..9ceba70fa2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
index da3a19e145..dd3f1e3acc 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U
index 67fe230622..df706872b9 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water
index b49b7ae509..5ad29dabdb 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh
index 167648393e..aff37b1171 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict
index be2c2b499e..d538cf9686 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/blockMeshDict.m4
index 0c62e8bc76..c3a373f396 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict
index 1425f2601a..0a94b72c46 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict
index 79949ca96c..9ffdbf1763 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes
index 11eae571a8..9ceba70fa2 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
index da3a19e145..dd3f1e3acc 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U
index 67fe230622..df706872b9 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water
index b49b7ae509..5ad29dabdb 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh
index 167648393e..aff37b1171 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict
index a7ec0c427f..6f334e7b37 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/blockMeshDict
index 8809061dd3..680344d2d7 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict
index d6c530c677..a42f1a7640 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict
index 79949ca96c..9ffdbf1763 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes
index 11eae571a8..9ceba70fa2 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
index a5deae4f83..40563264ed 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict
index 8bf5d5f7b6..73f242dd37 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U
index bddbbb6214..fec53561f2 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water
index 92096e2977..65c3b6cc2c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh
index 30e8fcfa63..6ea366f03c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties
index 1a9d1285ea..79aa8cef33 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict
index 10dba40913..2f76a1a499 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict
index 0e77bfd830..2c811ef9df 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/decomposeParDict
index 457ea14bec..19c6818aed 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes
index 1a982aaee8..f3f816435d 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution
index 1a95d5322a..e84540680f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict
index 5f959cbe14..1016ac46f5 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage
index b057ba46e5..02b43b8bf1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
index d66e749c25..60abab0d6e 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
index 27e71c4b4e..265b7a4860 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2
index b95b448ed9..64f7818532 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2
index 293d7095fb..71048b055b 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T
index 15a73ba715..107ed4f1df 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U
index ed84961dc1..f470562fa1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault
index 2ee10ed658..8806a1c4ad 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat
index 256d5d892a..bf88937a77 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon
index 733418f39d..983fb22bf2 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k
index 9d60cd270f..673edae07f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut
index 8b30e3c713..6f959429f1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p
index a367758102..e3b4eba2c9 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties
index d905761a63..df5aa7c17f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
index 9fd0cec98d..dafd472e4c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
index 135cd81d92..9d52ac0c08 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties
index b35106ebba..128dae56cb 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict
index d96006c595..fa13e1aee1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict
index cbf969c820..d7e8c66d0f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/decomposeParDict
index 457ea14bec..19c6818aed 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes
index 70e937db30..0cc8ca333f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution
index 77c6103e54..0059071e51 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2
index b95b448ed9..64f7818532 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2
index 293d7095fb..71048b055b 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T
index 15a73ba715..107ed4f1df 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U
index ed84961dc1..f470562fa1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault
index 2ee10ed658..8806a1c4ad 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat
index 256d5d892a..bf88937a77 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon
index 733418f39d..983fb22bf2 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k
index 9d60cd270f..673edae07f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut
index 8b30e3c713..6f959429f1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p
index a367758102..e3b4eba2c9 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties
index d905761a63..df5aa7c17f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
index 9fd0cec98d..dafd472e4c 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
index 68ab8335cd..bdced1f593 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties
index b35106ebba..128dae56cb 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict
index d96006c595..fa13e1aee1 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict
index cbf969c820..d7e8c66d0f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict
index 457ea14bec..19c6818aed 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes
index 70e937db30..0cc8ca333f 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution
index 77c6103e54..0059071e51 100644
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
index aa623908b2..c72fca5a66 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
index 03d69f1669..d84ff30a91 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
index cebf6b421a..dc219e0a8d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
index ba0e4d3959..6e464d80c1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
index a132674af7..9c696f3943 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
index a2a6933635..99da2fecaf 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/p_rgh
index 2e7bcb87c9..4ced60a3e4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
index 5904f7d3e1..86318daae8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
index 691021c766..c216b00d1d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
index e3c9bc2813..22ec7890bc 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
index d99bdfbf0c..9f4dd8ea8d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
index a92f58b35e..47e9d84710 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex
index 7ca4420b31..299484211b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
index 925bf1ab39..63c95fc954 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
index cf6201e22f..5e4fab660b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon
index 126a973fdc..fc3363a4e5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/k b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/k
index 42b17c9483..435c63b0b4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/k
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/nut b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/nut
index d014bc0f60..ad05245302 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/nut
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh
index 5a70a092fe..117a2ddf4a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
index 2b5339caca..7197e55ebd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
index 80e7cf2bc2..e4780aa129 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
index c288bb0479..b2c9f2cd9c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
index 6baccdf0f6..8ae089e210 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
index bcca6844dd..1e6058bf07 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
index 3af4caa806..21bf403cbc 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
index d7fa03741c..5dd60fc2f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
index c4c215634e..e57215ccd5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
index bfbf6ee3c2..1f7a8c3eb7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
index 2b5339caca..7197e55ebd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
index 14a66d64bf..871082fbf5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
index 6553770a15..08e6f4f549 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
index e7afce8060..07a93c13c7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
index 846ed1c7bf..30cd7ccd10 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
index 925bf1ab39..63c95fc954 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
index cf6201e22f..5e4fab660b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh
index 5a70a092fe..117a2ddf4a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
index 2b5339caca..7197e55ebd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
index dddfb95648..3d5cdb3376 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
index b00c00fb89..95b78ae7a8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
index 54063a127b..3a01138608 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
index 8feccf6c1c..d5fd6b9428 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
index 925bf1ab39..63c95fc954 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
index cf6201e22f..5e4fab660b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh
index 5a70a092fe..117a2ddf4a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
index 2b5339caca..7197e55ebd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
index a4446b1643..8e741df420 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
index b00c00fb89..95b78ae7a8 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
index 54063a127b..3a01138608 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
index 8feccf6c1c..d5fd6b9428 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
index e6c9418187..efcfb1c0dc 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
index a072b9d87c..b29b9e6969 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
index f431700368..91942f2922 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
index 6242d5bc2f..49d9e31cdd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
index 1c66dde1dc..093344590b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
index af55228872..de06a7b6a3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
index bceee2562b..13d977c84b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
index ba0e4d3959..6e464d80c1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
index 3f3d482f99..497c29cc12 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
index 03d69f1669..d84ff30a91 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
index 89240be3ae..2e4e005e04 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
index ba0e4d3959..6e464d80c1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
index f8cbfdea6b..03f8fc8cf5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
index ab148ebc41..e3a544276e 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
index b9f38c9aa4..385f92ef2c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
index 4c3a5ca6a0..4ed0b3627a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
index de199bc601..989169719c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
index 527462cad6..a2210d4fef 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
index 9d7c28b6ba..bcbf71e6f9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
index 99e11788a4..0611e28615 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
index 2d03c72132..9c345e7f3b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement
index f2bd25a4cf..3d364de370 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
index 229fbb52e0..4b30b675ab 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
index 627460535b..5816c918c4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
index 2dfee94707..d71576f7b6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
index 068c15b0c3..113ea94f46 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
index a4294bd306..679d64ad5d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
index 1446837490..35bd8383d2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
index 76fd40517e..dd669c72d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
index 53327228c8..53725d8dd0 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U
index 8944d55878..22d7d53344 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water
index 985151a933..f73dfa87b6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh
index 23f2ffe7a3..cb585d5bb1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/pointDisplacement
index ce77f9dba5..9a0663cd20 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/dynamicMeshDict
index 906339bb62..a96bf255e6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties
index a32eeb848f..56484c250a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict
index 54a9ed4653..269c0271d1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
index 49f1306a79..0d1424b03d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict
index 8e961eb1a3..2c5b92cad3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes
index 1446837490..35bd8383d2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
index b0133d5e70..d7aec6b158 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict
index 53327228c8..53725d8dd0 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U
index 8944d55878..22d7d53344 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water
index 985151a933..f73dfa87b6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh
index 23f2ffe7a3..cb585d5bb1 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/pointDisplacement
index 13d8fe6699..a3a4a4a53c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/dynamicMeshDict
index 906339bb62..a96bf255e6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties
index a32eeb848f..56484c250a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict
index 7cd671012c..76305c0a71 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
index a0219cba28..9c3bdb4ab2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict
index 8e961eb1a3..2c5b92cad3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes
index 1446837490..35bd8383d2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
index b0133d5e70..d7aec6b158 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict
index 53327228c8..53725d8dd0 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
index 9d7c28b6ba..bcbf71e6f9 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
index 99e11788a4..0611e28615 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
index 2d03c72132..9c345e7f3b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement
index 88a8b2c66b..9121f5f39b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
index 229fbb52e0..4b30b675ab 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
index 627460535b..5816c918c4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
index f02e4edf60..1f6cfc909c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
index df93be0acc..afc6ca8683 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
index a4294bd306..679d64ad5d 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
index 1446837490..35bd8383d2 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
index 76fd40517e..dd669c72d3 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
index 53327228c8..53725d8dd0 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
index f4bed3d9f4..b1de6581fd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
index 7661c30b6b..2693fe9bbe 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh
index 2460bbc46e..226a291e1c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement
index 59d791d86f..5963c9d704 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
index e06336e48e..c99f07fc16 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
index e7cd433e6e..61ef7f45e7 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++-*----------------------------------*\\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
index 2b5339caca..7197e55ebd 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
index 868c652882..720ed89894 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++-*----------------------------------*\\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
index 38e8b8a73e..aee998af0b 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
index c482608702..60e4b2d9ca 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
index dc3a7e8d94..978242895c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
index e36ad617de..0681e2887c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
index dbfd213349..e5666c6495 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
index 8fb6577112..10940792f4 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
index 6d7226268c..b619ee9e77 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++-*----------------------------------*\\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/0.orig/U b/tutorials/multiphase/interIsoFoam/damBreak/0.orig/U
index b6a2a9649e..fc283b8112 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/damBreak/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/damBreak/0.orig/alpha.water
index 88cfe340d3..8f669408de 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/damBreak/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/damBreak/0.orig/p_rgh
index 4f62d6fe3e..49df5ab518 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/damBreak/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/damBreak/constant/dynamicMeshDict
index 5a8b147877..77fc3a4972 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/damBreak/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/constant/g b/tutorials/multiphase/interIsoFoam/damBreak/constant/g
index 88d52645e2..08095e37d6 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/constant/g
+++ b/tutorials/multiphase/interIsoFoam/damBreak/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/constant/transportProperties b/tutorials/multiphase/interIsoFoam/damBreak/constant/transportProperties
index 0ff6a3d3fc..4d33bff8a9 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/damBreak/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/damBreak/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/damBreak/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/damBreak/system/blockMeshDict
index 24d87e413c..8b4d8d6b6c 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/damBreak/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/system/controlDict b/tutorials/multiphase/interIsoFoam/damBreak/system/controlDict
index cbecc53961..c8a0ce3d8f 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/damBreak/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/damBreak/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/damBreak/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/system/fvSchemes b/tutorials/multiphase/interIsoFoam/damBreak/system/fvSchemes
index 741e60922e..43d166f0a1 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/damBreak/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/system/fvSolution b/tutorials/multiphase/interIsoFoam/damBreak/system/fvSolution
index 26abe6d85a..56d2b7b967 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/damBreak/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreak/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/damBreak/system/setFieldsDict
index fd81248b8a..d6794855a9 100644
--- a/tutorials/multiphase/interIsoFoam/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/damBreak/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U
index dd1869f041..552e6607b1 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water
index 2c35d12f41..1746ab4096 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh
index 5d5559c019..84318eb59a 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict
index c8a4d8f1cb..35e72c0ef6 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g
index 4dd08ece17..3f7709ad0b 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties
index 4c82968c2f..5a5f5167ac 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict
index fc92a7de77..141479fbea 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
index 7fb069d6c3..79e99ed0d5 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict
index 3617d979be..118472ca59 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes
index 7aa86cc4f2..2205719669 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
index 8857080bfc..348bb3cf9b 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict
index bf5346d613..df21d64060 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
index 807ab78de0..be481cd348 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/U b/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/U
index d941b6758d..073abe0be6 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/alpha.water
index 5beb5fd952..e49d391930 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/p_rgh
index 5df942904e..d5d3123602 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/g b/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/g
index 88d52645e2..08095e37d6 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/g
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/transportProperties b/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/transportProperties
index 9ab8a67efe..23fcc04030 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/blockMeshDict
index 4991020d3c..e5e7a63a41 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/controlDict b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/controlDict
index b4d336fdf1..74725e5ea7 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSchemes b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSchemes
index 4b804fbdfc..d249f54aab 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSolution b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSolution
index 55e5a57fb3..2d9eab18af 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
index 51cfdf05de..bfafb4adb8 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlow/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U
index 6d693f5959..803433b8b9 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/alpha.water
index 7e505f92f2..63a41f9198 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/p_rgh
index 48965d341a..52825e0055 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict
index 5a8b147877..77fc3a4972 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g
index 9607265e07..18a2134bc6 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties
index 4382bb3f8a..8da43ffa3c 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict
index f8ce47d4f0..d23f97985e 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict
index c35cb5932f..4560e4506f 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict
index c318a043fa..d7165a2747 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes
index bc1442fa87..cafdd31b55 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution
index e76766a25d..94c4ac74ca 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
index 5b1bf36660..1ea7ec7c4c 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/U b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/U
index d941b6758d..073abe0be6 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/alpha.water
index 4132352567..97f94d6921 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/p_rgh
index 27f80d96f6..1d9ef749cb 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/porosity b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/porosity
index 4612f0b172..3385e7b349 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/porosity
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/0.orig/porosity
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/g b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/g
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/porosityProperties b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/porosityProperties
index 8539dd2b93..392a516c08 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/porosityProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/porosityProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/transportProperties b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/transportProperties
index 37b52b25ef..3e9d69d00b 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/blockMeshDict
index c08ce80895..996a572309 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/controlDict b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/controlDict
index 27f9c831fb..d0795c28f3 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/decomposeParDict
index 99011fce7b..b92aa4d237 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSchemes b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSchemes
index 15727a0365..a011c4da35 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSolution b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSolution
index 81f2431308..3b88510435 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setAlphaFieldDict
index a7d48328ff..ee9a415053 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setFieldsDict
index 44492f21da..85ce2845c9 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantPorousFlow/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/U b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/U
index 47d2c97641..902a5fbdd4 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/alpha.water
index abfe8392ab..14a3f3c8f9 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/p_rgh
index 5df942904e..d5d3123602 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/g b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/g
index 88d52645e2..08095e37d6 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/g
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/transportProperties b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/transportProperties
index 576c66983e..2090bee99c 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/blockMeshDict
index 63dca52071..d246d7983a 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/controlDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/controlDict
index dd83ab6893..a063d37cae 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/decomposeParDict
index 8f8e1341b0..bbea8f59df 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSchemes b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSchemes
index 28929d1b5e..b49d658e81 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSolution b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSolution
index e09dcd5f29..155490fc17 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/refineMeshDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/refineMeshDict
index f9b361fc92..8a2865ff84 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/refineMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
index 5bf252c842..abc2dc5b8f 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict
index 855d62c8ca..1065d7800b 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2 b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2
index 8810c405d6..5ee50e5881 100644
--- a/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2
+++ b/tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/0.orig/U b/tutorials/multiphase/interIsoFoam/iobasin/0.orig/U
index 7e179aa570..7fa51b85bb 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/iobasin/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/iobasin/0.orig/alpha.water
index eb9da34679..f75e482e5d 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/iobasin/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/iobasin/0.orig/p_rgh
index e05799f7a5..9778adc0cb 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/iobasin/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/constant/g b/tutorials/multiphase/interIsoFoam/iobasin/constant/g
index a9002a861a..7e3757942e 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/constant/g
+++ b/tutorials/multiphase/interIsoFoam/iobasin/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/constant/transportProperties b/tutorials/multiphase/interIsoFoam/iobasin/constant/transportProperties
index 4c82968c2f..5a5f5167ac 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/iobasin/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/iobasin/constant/turbulenceProperties
index 0d09268dab..bd8a7d1d89 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/iobasin/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/iobasin/system/blockMeshDict
index 89d5ce8a26..317f884c05 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/controlDict b/tutorials/multiphase/interIsoFoam/iobasin/system/controlDict
index 326e5cde17..c254c7bd8b 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/createPatchDict b/tutorials/multiphase/interIsoFoam/iobasin/system/createPatchDict
index b3afaf5adc..6eedeb9e06 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/createPatchDict
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/iobasin/system/decomposeParDict
index dd7a72165d..983f131401 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/fvSchemes b/tutorials/multiphase/interIsoFoam/iobasin/system/fvSchemes
index cd68847f74..4dbfae2e04 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/fvSolution b/tutorials/multiphase/interIsoFoam/iobasin/system/fvSolution
index e09a7f596f..8dfdef0918 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/iobasin/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/iobasin/system/setFieldsDict
index c8b0bc311c..c7da6f607e 100644
--- a/tutorials/multiphase/interIsoFoam/iobasin/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/iobasin/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/U b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/U
index 47d2c97641..902a5fbdd4 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/alpha.water
index 5237c2d68f..c521a5bed5 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/p_rgh
index 5df942904e..d5d3123602 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/g b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/g
index 88d52645e2..08095e37d6 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/g
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/transportProperties b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/transportProperties
index 9ab8a67efe..23fcc04030 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/blockMeshDict
index 63dca52071..d246d7983a 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/controlDict b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/controlDict
index f6bb7b7370..59e00fdcfc 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSchemes b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSchemes
index 9ec5164c79..bfdb2d35bf 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSolution b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSolution
index 9333ebd873..7bfa5343c5 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
index d316e2fb44..f47a12e452 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setFieldsDict
index 52c67d289c..9204f64f77 100644
--- a/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/notchedDiscInSolidBodyRotation/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
index 68af5bdfbc..0763f91db7 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
index 848a41df4e..2d29b9884e 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
index 7802f2bee4..dbd09096dc 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
index d2781057ae..5e2be78dc1 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
index 97f691fc35..6f69ec7262 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/blockMeshDict.m4
index 5dda2c1b9b..aa3ad58119 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
index f6b418f2f4..267401ad3c 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
index 50182d35a2..ed2afb7a7d 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
index 57f5ac2bee..a0ebd3d5af 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
index 0634b6318b..85ea2abaa3 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
index 6bc0f1fb38..f37d06d119 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/U b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/U
index 5854ccec45..90e82227b7 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/alpha.water
index 37eab8076e..38f12dd73e 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/p_rgh
index a4d560050e..58e96bafd6 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/g b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/g
index 88d52645e2..08095e37d6 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/g
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/transportProperties b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/transportProperties
index 576c66983e..2090bee99c 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/blockMeshDict
index 41cf33d0db..cef69828a9 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/controlDict b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/controlDict
index 41393e222a..e5b213990d 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/decomposeParDict
index cc51674711..57a4f3e101 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSchemes b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSchemes
index b4c2e219df..cf5f2b3e62 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSolution b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSolution
index d6a95beeca..d2917df695 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
index b4f69c98a9..27551285e8 100644
--- a/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/sphereInReversedVortexFlow/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/0.orig/U b/tutorials/multiphase/interIsoFoam/standingWave/0.orig/U
index db556f0abc..f9976a7059 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/standingWave/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/standingWave/0.orig/alpha.water
index 6cc11a7edb..d5a6c33860 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/standingWave/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/standingWave/0.orig/p_rgh
index 629243200d..555f0f3000 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/standingWave/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/standingWave/constant/dynamicMeshDict
index 5a8b147877..77fc3a4972 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/constant/g b/tutorials/multiphase/interIsoFoam/standingWave/constant/g
index 9607265e07..18a2134bc6 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/constant/g
+++ b/tutorials/multiphase/interIsoFoam/standingWave/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/constant/transportProperties b/tutorials/multiphase/interIsoFoam/standingWave/constant/transportProperties
index 6366f37ccf..f074a06810 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/standingWave/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/standingWave/constant/turbulenceProperties
index 36af57f613..d22d951830 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/standingWave/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/standingWave/system/blockMeshDict
index 65bc25cc0a..84bfde0f01 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/controlDict b/tutorials/multiphase/interIsoFoam/standingWave/system/controlDict
index fa03dc00e3..387faa63b7 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/standingWave/system/decomposeParDict
index 1188f873f6..58a253ef25 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/fvSchemes b/tutorials/multiphase/interIsoFoam/standingWave/system/fvSchemes
index a0bdc915f8..265fe77f94 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/fvSolution b/tutorials/multiphase/interIsoFoam/standingWave/system/fvSolution
index 250a1a347c..4b5d8b5da2 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict1 b/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict1
index f9b361fc92..8a2865ff84 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict1
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict2 b/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict2
index f768563c19..5eec624a45 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict2
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/refineMeshDict2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
index 3c4bcac5b3..1d83a14eb4 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1 b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1
index daabf29cec..9694359e5f 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2 b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2
index 582cd52972..8c9cd938f4 100644
--- a/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2
+++ b/tutorials/multiphase/interIsoFoam/standingWave/system/topoSetDict2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
index cac1b2ab55..53fd22c66b 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
index dc8dcaa600..7e419decc5 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/p_rgh
index 807aa9eddd..bf24fd352d 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
index b85e4a2bff..44c727d974 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
index 90ef542fcf..e62afc15d4 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
index ab148ebc41..e3a544276e 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
index fe5709e8bf..805be06330 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
index fd4a43080b..5780fa5c9f 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
index bb3a9255d8..7dfd1490dc 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
index bad215f79f..310d52a0f2 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
index 527462cad6..a2210d4fef 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/U b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/U
index ed413ddabe..e03373d115 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/alpha.water
index e54d75cc4b..788a3af88b 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/epsilon b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/epsilon
index 3a0db2a7e1..0e2e352856 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/epsilon
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/include/initialConditions b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/include/initialConditions
index f23dc2b68a..e9ddba3882 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/include/initialConditions
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/include/initialConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/k b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/k
index 0af16ac772..c1a9717584 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/k
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/nut b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/nut
index 4f5005bae6..8c47c84365 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/nut
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/p_rgh
index e8b149c335..4bc260eafa 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/constant/g b/tutorials/multiphase/interIsoFoam/weirOverflow/constant/g
index cb5507044b..9de7c474c4 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/constant/g
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/constant/transportProperties b/tutorials/multiphase/interIsoFoam/weirOverflow/constant/transportProperties
index 4c82968c2f..5a5f5167ac 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/weirOverflow/constant/turbulenceProperties
index 813f377f63..a2fe4d1ac6 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/weirOverflow/system/blockMeshDict
index 03a21113a0..50088b523e 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/system/controlDict b/tutorials/multiphase/interIsoFoam/weirOverflow/system/controlDict
index 3e568a6adf..008d6b226c 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSchemes b/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSchemes
index 25ac2130da..5822d5fe4e 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSolution b/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSolution
index f00949ccf5..888f38bf3d 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interIsoFoam/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/weirOverflow/system/setFieldsDict
index df521c74ca..b1b8528f9f 100644
--- a/tutorials/multiphase/interIsoFoam/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/weirOverflow/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/U b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/U
index 92ead7f503..16b63d7698 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/U
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air
index 76092e946b..ee38d9390f 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other
index 531854a0db..00f8839147 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh
index 8a1cf25d9a..2132a727c1 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
index 18b3e382b2..cea294394c 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
index 80feb91fc1..55faf8d2db 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
index c601fe6cfb..517664cd7c 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
index 410cb133b9..cae5857e89 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
index 7615a9662e..993903ab62 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
index e8a19ec93b..0ef9f32102 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U
index 5c254fca5a..cb2a549399 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
index ba24c90c81..ec4219939e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon
index 01185e3b8d..2c3663a946 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k
index c053c3772b..987cf72ea5 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut
index 166355074e..513d1b054e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
index 5117ad5901..bef5f6c3db 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
index 8285d05fa8..42783076c1 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
index 19c60a17c6..aa93a4cccd 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
index 6adb94b721..8193fc06a2 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
index 723dca8727..76131b4d82 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
index de94e2c765..d56704b807 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
index 2cd7f8e86c..361cdf6d25 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict
index 03e30c74a1..00c7c215fc 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
index 3d4077102c..bc2774ad82 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index 144eb9f954..37dd19ffe4 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
index d153294e99..00e9df82aa 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict
index 7a04c73cc9..22001e499b 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi
index cad812f703..b407a901f8 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
index 0ce455a9a3..8d60b3adbd 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water
index 2e2e8f0a0a..13763b2ef5 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh
index 0b3faf41e8..5008f2962f 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
index a3d651b1da..f0116803dc 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
index 672a9c0f21..4090bbf518 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------* \
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
index 8da7145b18..ab90afc84e 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
index 1b8bec2293..026a63d8a0 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index accaab6aca..2157e9927d 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index 33978b1f5d..88dc125cf7 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 2c19c9bcf5..d1c090172f 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air
index 3c18c40833..7101f067b7 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water
index 3112d1f657..604c180522 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta
index 1f47128525..f47a7914c7 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air
index b2c6060fc4..9788a44065 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water
index 46b8f81e4b..8384529f4c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh
index 280308f804..12213976c1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
index b1f4fe8de8..e706e0fd11 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
index fb41669ee4..1831444980 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
index bce579f2fa..4c16e2a234 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
index 671a5d33b2..f28bb8ce88 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
index 7c0e2e390a..11d8b7af7d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U
index a64314aecd..682df5ac3a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air
index 187f11ff2e..b9f3b7196a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury
index ef4d9fdb97..40dc02c0d6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil
index 2b242bc3a2..657f259acf 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water
index 9c2d6cde98..9d084b0f9c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air
index 654bebbe13..0a52dc7877 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury
index 90186f97aa..a5ecbe296e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil
index 82a2f29b8b..8eae10b7d0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh
index e9a668ce39..f2b446089a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
index ab571d5170..88a79cd716 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
index 5618597cca..733b186a91 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
index 2335937397..f4f0dbd572 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
index 4b244af9af..57dcdacde2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
index 0f0af0f5af..272da85b1d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
index 4d52ca03ed..28fb41767e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U
index a64314aecd..682df5ac3a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air
index 187f11ff2e..b9f3b7196a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury
index ef4d9fdb97..40dc02c0d6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil
index 2b242bc3a2..657f259acf 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water
index 9c2d6cde98..9d084b0f9c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air
index 654bebbe13..0a52dc7877 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury
index 90186f97aa..a5ecbe296e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil
index 82a2f29b8b..8eae10b7d0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
index 8a1cf25d9a..2132a727c1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
index ab571d5170..88a79cd716 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
index 5618597cca..733b186a91 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
index 83d8004ec7..04d4349ad6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
index 5708c57a64..68e9b878ce 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
index 4b244af9af..57dcdacde2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
index 0f0af0f5af..272da85b1d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
index 4d52ca03ed..28fb41767e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta
index 2c4028e60b..003edf8061 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air
index f28af72138..8a52979e5a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury
index 4aa15f3ed0..aa31d58cbd 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil
index b27c864294..48dedf2549 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water
index c22fdf1d86..29209f8011 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air
index d199067a03..606c70fc3c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury
index e8c6adb5db..19a71e6051 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil
index afcae5e651..78311b7f2b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water
index 9ac7c6ef12..375ac3aac6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/epsilon b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/epsilon
index cbfb499579..139d03086d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/epsilon
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/k b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/k
index a255933fbf..8e9571d971 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/k
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh
index 0de1041e50..83477e2c4e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
index 70035f6e5f..7966ca608e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
index d1b13f5c69..d19ec35a14 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
index 2ba4b7d8aa..630c524f9c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
index d972bd7839..958d687009 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
index 4b244af9af..57dcdacde2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
index 8948ca0eac..db32fbf26d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
index 7b40c519c5..bfb3b36012 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U
index 92ead7f503..16b63d7698 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
index 9fbbae2ecf..827fff15d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
index 90186f97aa..a5ecbe296e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
index 82a2f29b8b..8eae10b7d0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
index 9697cf3a95..d551f1d719 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
index 8a1cf25d9a..2132a727c1 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
index ab571d5170..88a79cd716 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
index aca95f980b..6db549df18 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
index 1f702a0865..808c4c4555 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index f6e61853ee..b5a46c0827 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 054f59c6c7..7364809433 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index dcfc6ebac4..72c19256ff 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
index 7b63ca5d99..6ddc733c31 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U
index 92ead7f503..16b63d7698 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air
index 9fbbae2ecf..827fff15d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury
index 90186f97aa..a5ecbe296e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil
index 82a2f29b8b..8eae10b7d0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water
index 1f5a22bdec..58001fdb89 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas
index 9697cf3a95..d551f1d719 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
index 8a1cf25d9a..2132a727c1 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
index ab571d5170..88a79cd716 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
index aca95f980b..6db549df18 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
index 83d8004ec7..04d4349ad6 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
index 41652c2b82..e688cef0d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
index 054f59c6c7..7364809433 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 5bec0d1da9..8274d37d19 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
index 7b63ca5d99..6ddc733c31 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T
index 494f9eb228..089ddcd66c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U
index bcbd1647cd..6830c2a536 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air
index 82369fe52d..b9d370d538 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
index f6cbbab2bf..ca67c87180 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil
index 4ac6f63b87..4b264e9b4f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water
index ed1d386772..aa46238cce 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 2a1e9aac44..5da21efa7d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
index 6f22588204..f24be94cae 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
index e70267dc17..598d7d1e1c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
index c1b57f5cec..29a332c70e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
index 34fa610c4a..54634bfeb3 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
index d5037a1a42..dabc21b600 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
index dc5e202fa1..5073f89a1d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
index 7b40c519c5..bfb3b36012 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/T b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/T
index da642a94ae..ee1472cef1 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/T
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/U b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/U
index 8e8a724692..8500be9a09 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/U
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alpha.water b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alpha.water
index fabd7402f7..683e08ce89 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alpha.water
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alphat b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alphat
index 2f8b0666da..8d10d34216 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alphat
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/epsilon b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/epsilon
index e902055fc4..e5b7a750c1 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/epsilon
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/k b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/k
index 6b9a75e111..2ea707d380 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/k
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/nut b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/nut
index 98462d24b5..4bb9b4bc4c 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/nut
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p
index d9d0ce4ba3..2302f8e534 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p_rgh b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p_rgh
index c662be8f37..939da444c5 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p_rgh
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/pointDisplacement b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/pointDisplacement
index 786e0676ee..c4ac48cedc 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/zoneID b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/zoneID
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/dynamicMeshDict b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/dynamicMeshDict
index b85400394f..b3d348d3fe 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/g b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/g
index d0c5b337ba..31bb7196f9 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/g
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties
index 3ddfaadf30..790d94ceaf 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.air b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.air
index a316dd11fe..87e87d4997 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.water b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.water
index e5c7f62889..b56b5f3ce7 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties
index d26c48df39..64cf79a80f 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/blockMeshDict
index 272773e520..90e2d83ad3 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/blockMeshDict
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/controlDict b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/controlDict
index cf32f78fc9..875f80db30 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/controlDict
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/decomposeParDict b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/decomposeParDict
index a343e0e802..2dd453b69a 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/decomposeParDict
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSchemes b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSchemes
index b6a4a38b38..a4689c54e5 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSchemes
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution
index 0c79fb3cc6..fa30731b5c 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/setFieldsDict b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/setFieldsDict
index e67dd184c0..03964c9624 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/setFieldsDict
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/topoSetDict b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/topoSetDict
index bf67b90641..6074a2a12a 100644
--- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/topoSetDict
+++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
index 5553d322a8..d213d6d1b9 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
index 822c3a3e99..accc77307f 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
index c64c783d29..74f6934cdc 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
index 3a7a9dcffe..d5c0210f2e 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
index f057ad5b7f..51acd97058 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh
index e5fd67d9fd..fb9d10fd34 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
index 1fac58d5dc..b75017c682 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
index b8d6bf6c1d..fe89e25f2c 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
index aa90f21399..a762852f2c 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties
index 96f9dc0b0a..39580312ab 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict
index d369f44ea8..900dc87ff0 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict
index 094c9424a2..dd4a8f73f9 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict
index b3f3c0dca7..fb3e1b0765 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes
index f18c6e50c9..1d8421b2fd 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution
index 4f2456b948..d1d986ab86 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict
index 4feafc3b46..b6363bffca 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
index 23fd047082..7f93bb02aa 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict
index 4c953f0b86..144906a838 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict
index 5fe55c4951..3c8c5ff5a3 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes
index 85ad16d13f..3b623b4d34 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
index 755433b313..a1efd6235a 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
index 37e0e07d1c..3ebddb7841 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U
index 27f9bc9e71..bd252a448e 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water
index f5053d80d7..47f2189df4 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon
index 4e032033e1..23d674b581 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k
index 805239aaa5..b0eb08bc60 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut
index d9d3d63096..93bea5701d 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh
index e16a3a2148..bf62194aa9 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement
index b8e4fdaaef..265024e31c 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID
index 2ab541aa32..cf90c7f78a 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
index 48f9a7e6ab..0d55a97755 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g
index e1c992123f..722298d8d5 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties
index 96f9dc0b0a..39580312ab 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict
index a891b507d0..57333f9197 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/controlDict
index 076113d402..7bb113e44f 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict
index ce11795f84..1069209256 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes
index f1189366ea..5bd3e2d5d4 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution
index 954d1a2be8..90cd737325 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict
index ed4b9edb88..4271773722 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict
index 23fd047082..7f93bb02aa 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict
index 4c953f0b86..144906a838 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict
index 5fe55c4951..3c8c5ff5a3 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes
index 85ad16d13f..3b623b4d34 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
index f3918db8ca..9898918598 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict
index 37e0e07d1c..3ebddb7841 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U
index 77f7caca94..c1dce4cbbc 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water
index 66042fd54d..7edbfe8dd5 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
index 7f0aad7c6e..3c3e143689 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k
index 8e3b9b5415..435a1905f8 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut
index b97e04af81..14220b4a4c 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh
index c2fd69ce71..5f499134a2 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement
index fec783b921..cdcc813c34 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID
index d3ef4fd402..3da69d381b 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict
index 2892c8ed53..dce097b0bc 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef
index 086bbe08b1..93c3c7a0fd 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties
index 22dd0f4c1f..e60fe8a731 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties
index 04f5c033ad..82045a2982 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict
index 3fcfdee5c2..6982b2c0fb 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict
index c810c19a3f..dd6f50dbee 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict
index 99bde2f80b..033f9f9fa7 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict
index 72a07e807f..81165dbc82 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions
index 7913fd75ce..98160d0ccb 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes
index 21333923f2..b705432db0 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution
index 3b29f7663c..a26138f67f 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict
index 98303f5fe0..75867ce947 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict
index f9d18f7723..c9942da7a9 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict
index 1ca7a346da..0474375be9 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp
index 3a4af9b608..a40d112120 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict
index e944e6793d..726295c01d 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict
index e48b0f8882..831f5ba75a 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict
index 5b4c22f8fd..bcc21c4b6f 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes
index 5d80f02180..373901a362 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution
index 6b546515df..dc2de05bd5 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict
index 2a833a2c88..531ad70cab 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict
index 180a50d1a2..4828327762 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict
index bde92223ff..ca61826029 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict
index e48b0f8882..831f5ba75a 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict
index 5b4c22f8fd..bcc21c4b6f 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes
index 5d80f02180..373901a362 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution
index 6b546515df..dc2de05bd5 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict
index f573ba0703..9c32f53355 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict
index 6143f2b6f6..4f1edd4c24 100644
--- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/U b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/U
index 93d4b038c3..475eb11cb4 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/alpha.water
index ff1fbf6d75..4cba72c80b 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p
index bb5fb0dd92..10b375b7f5 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh
index a481ad99a5..6d01eb15e7 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/pointDisplacement
index 0abab48227..d763fbc340 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/zoneID
index 9951b14c47..9afbcfc324 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/dynamicMeshDict
index c7110b3988..6116455ae2 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/fvOptions b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/fvOptions
index 087a613489..1229e01382 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/fvOptions
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/g b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/g
index d0c5b337ba..31bb7196f9 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/transportProperties
index 50f4057c02..7b7af77047 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/turbulenceProperties
index 04412329ad..2bde40d9b0 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/blockMeshDict
index f7ccef1b7b..5bde136958 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict
index a6fb36a70f..089169d5eb 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/decomposeParDict
index cbe7f1104b..e9dcceb425 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSchemes
index 23b7def788..d36fbba1dd 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSolution
index 25dcbb1f36..c072a8f4c0 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/setFieldsDict
index 57e577402b..a13e290704 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/topoSetDict
index 8a27fa34f6..8569136afe 100644
--- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U
index 43441323c7..8bec28f89d 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water
index fabd7402f7..683e08ce89 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon
index e902055fc4..e5b7a750c1 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k
index 6b9a75e111..2ea707d380 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut
index 98462d24b5..4bb9b4bc4c 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p
index cf0fbc3636..f9219e6f87 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh
index 190ca45b32..8a96f4db8f 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
index 786e0676ee..c4ac48cedc 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
index b85400394f..b3d348d3fe 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g
index d0c5b337ba..31bb7196f9 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties
index 50f4057c02..7b7af77047 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict
index 272773e520..90e2d83ad3 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
index 9251c16eca..00b5a5e711 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict
index cbe7f1104b..e9dcceb425 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes
index bc1999c4b7..270a212048 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution
index 7e7adb67ed..a8412268be 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict
index e67dd184c0..03964c9624 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
index bf67b90641..6074a2a12a 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/U b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/U
index 43441323c7..8bec28f89d 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/alpha.water
index fabd7402f7..683e08ce89 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/epsilon
index e902055fc4..e5b7a750c1 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/epsilon
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/k b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/k
index 6b9a75e111..2ea707d380 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/nut
index 98462d24b5..4bb9b4bc4c 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/nut
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p
index cf0fbc3636..f9219e6f87 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p_rgh
index 190ca45b32..8a96f4db8f 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/pointDisplacement
index 786e0676ee..c4ac48cedc 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/dynamicMeshDict
index 2f24a083d7..dd371dd21b 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/fvOptions b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/fvOptions
index 848f59e620..922349dbc1 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/fvOptions
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/g b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/g
index d0c5b337ba..31bb7196f9 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/transportProperties
index 45b9b77b90..6103896ef1 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/turbulenceProperties
index d81c2e6949..2adb2ef751 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/blockMeshDict
index 272773e520..90e2d83ad3 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/blockMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/controlDict b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/controlDict
index 19fa1678e0..b9d45b9823 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/decomposeParDict
index cbe7f1104b..e9dcceb425 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSchemes
index dd36b3a203..3fcf7e9d7b 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSolution
index f06d9949ae..3c5cc102ae 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/setFieldsDict
index e67dd184c0..03964c9624 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/topoSetDict
index bf67b90641..6074a2a12a 100644
--- a/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/topoSetDict
+++ b/tutorials/multiphase/overInterDyMFoam/twoSquaresOutDomain/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/U
index 8e8a724692..8500be9a09 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alpha.water b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alpha.water
index fabd7402f7..683e08ce89 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alphat b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alphat
index 2f8b0666da..8d10d34216 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alphat
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/epsilon b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/epsilon
index e902055fc4..e5b7a750c1 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/epsilon
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/k b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/k
index 6b9a75e111..2ea707d380 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/k
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/nut b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/nut
index 98462d24b5..4bb9b4bc4c 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/nut
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p
index d9d0ce4ba3..2302f8e534 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p_rgh b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p_rgh
index c662be8f37..939da444c5 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/pointDisplacement b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
index 786e0676ee..c4ac48cedc 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/zoneID
index 2542ce5358..b79963ce41 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/0.orig/zoneID
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/dynamicMeshDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
index 31702e36d5..0df8774781 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/g b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/g
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties
index 0317820b1a..9c2bd86d69 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties
index 920cda900b..ac7f46dd50 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict
index bc4ca03cb0..1ce119da5f 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/controlDict
index f0e69b9d8f..abc78d710c 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/decomposeParDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/decomposeParDict
index a343e0e802..2dd453b69a 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/decomposeParDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSchemes
index 4af7fb7d74..008d09eb51 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSolution b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSolution
index e980109930..f816acd353 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSolution
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/setFieldsDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/setFieldsDict
index ebc4e629a0..7d46da2e78 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/setFieldsDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/topoSetDict
index bf67b90641..6074a2a12a 100644
--- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/topoSetDict
+++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U
index 2b3c6ab3f2..38d8eb99e4 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p
index 5e668d3f76..3c0ac7f31d 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh
index 219ec379da..1a6a71353b 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement
index 5a356c961e..2da5e6f9b7 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
index a9ab82f17f..526f238a45 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
index 2294fba7ae..4a12f05cc4 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
index 7ef0267514..672f128b1e 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index f17d944137..6bbcebcf5c 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
index a9573e7e29..e2f7d01a72 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
index 1caad7bc45..63d38cb426 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
index 1efc91199f..4ae3165d68 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
index e8d263c94c..14335ff34b 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
index 391740b0cb..aebc41fd68 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U
index 504b9ef9de..56789b2b2a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p
index e3ca4a8426..810e1862f8 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh
index d8e2d17aa6..925bb90339 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
index 2294fba7ae..4a12f05cc4 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
index 1ceddba2c0..8adfe23335 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index 2611a0512a..eb16e2077f 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
index abe3626863..8544f5a738 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
index a152ce304e..6a1571dad5 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
index e8d263c94c..14335ff34b 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.gas
index 2c5ed670a1..320e0ea9e2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.liquid
index d0cd4f6b06..03b1d24e8c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas2
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.liquid
index 31b122a146..ac7b35cb85 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.gas
index f6fe76f481..1abd0267ef 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.liquid
index fe60f3027d..a7bde64b63 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.gas
index b84c68d85a..8b2b01c602 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.liquid
index 6fa83f38d2..2aa2d5c761 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/alphat.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.gas
index 53171fa5f0..0cd72f530a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.liquid
index 5435d5f5c2..6948da184b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/epsilon.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.gas
index ef70738c82..ca47782212 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.liquid
index 188f3d4d41..d880f96e4f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/k.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.gas
index 4bed9742b5..d8dbdb2bc2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.liquid
index 2313619723..bd8d3ed464 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/nut.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p
index 814c1d1395..29d83e24b1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p_rgh
index 5ce79a5645..5fd776d2b9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties
index cf0752cd2e..33c451750e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas
index effbe53956..0812b452c8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid
index d1a11f6301..1aa7bfc8f1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas
index c935517310..0cdab0911c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid
index 16f069b030..10041c09a1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict
index d0262ae2ff..b6f0c593d7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict
index 40745aa7e8..92dedec4c3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes
index ca33034340..f443cfba6b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
index 1580192feb..be1cacb50c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas
index 2c5ed670a1..320e0ea9e2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas2
index 8448468af6..42541bd0c1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.liquid
index d0cd4f6b06..03b1d24e8c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas2
index c85bdb8b80..314ea6edc8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.liquid
index 31b122a146..ac7b35cb85 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas
index f6fe76f481..1abd0267ef 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas2
index c75dda3f3b..0ede4502ce 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.liquid
index fe60f3027d..a7bde64b63 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas
index 93f829c7a9..d347c1910b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2
index 3fcda5552a..1d33b31be3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.liquid
index 3f3a5b14b0..dc46068ec5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas
index 53171fa5f0..0cd72f530a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas2
index 1ae3c8224d..ff12675ab5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.liquid
index 06d3c17c2e..42c627c137 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/epsilon.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas
index ef70738c82..ca47782212 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas2
index 8814ff723b..b1ceb09c75 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.liquid
index 188f3d4d41..d880f96e4f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/k.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas
index 4bed9742b5..d8dbdb2bc2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas2
index 4bed9742b5..d8dbdb2bc2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.liquid
index 2313619723..bd8d3ed464 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/nut.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p
index 814c1d1395..29d83e24b1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p_rgh
index 5ce79a5645..5fd776d2b9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties
index b71a428fff..c84fe533ea 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas
index effbe53956..0812b452c8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2
index effbe53956..0812b452c8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid
index d1a11f6301..1aa7bfc8f1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas
index c935517310..0cdab0911c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2
index c935517310..0cdab0911c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid
index 16f069b030..10041c09a1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict
index d0262ae2ff..b6f0c593d7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict
index 40745aa7e8..92dedec4c3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes
index ca33034340..f443cfba6b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
index 1580192feb..be1cacb50c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
index 3c18c40833..7101f067b7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
index df9ff95393..0929c2eded 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
index 1f47128525..f47a7914c7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water
index 46b8f81e4b..8384529f4c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
index fd7d3cb083..52b424a990 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 117afecc6f..9886c6c1a0 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
index ed0ad20298..6c95b98416 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 4e954823f6..95f5224f27 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index 2c5d67288c..5e1e9acb3d 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 7c0e2e390a..11d8b7af7d 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
index 5a5f0aa582..c1412aa2d7 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury
index 6834177b23..130623f192 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.oil
index b7e7b7b637..8ca4db8803 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
index 6c67e9313a..4111f38b4f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
index 2c4028e60b..003edf8061 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
index f28af72138..8a52979e5a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury
index 4aa15f3ed0..aa31d58cbd 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil
index b27c864294..48dedf2549 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
index c22fdf1d86..29209f8011 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
index 5d5bd0312b..fad7506bcd 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
index 50e90727df..b82703d6c5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil
index 066bc52268..ca9780c590 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water
index d3c78b2b7b..f3d4ed8adc 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p
index 49d760ef43..1d46e974e6 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
index 0de1041e50..83477e2c4e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index 63ebd2a998..057bb98208 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 2c69f1838b..37b85120b5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index b59e615497..3d8237462c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
index 107eca2b57..6c47631b27 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
index f3a618fe7d..cc0dfb2f56 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
index a49508e259..32a07d0718 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
index 62bc5b68bf..97c8cb0f46 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 6b8023322f..3a2be176ca 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index f4580deda8..74a5cbe62c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index f54c587a34..d9151e1fe9 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 7b40c519c5..bfb3b36012 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
index 42deecd88e..0f4164d9ed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
index ee98325ee0..c3b3afdb75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
index 24cce7c4c1..00757cd8b3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
index db6673befa..5ee293f8cc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
index b59c9159ea..4858271d88 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
index 7477e7f640..fcec4a6081 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
index 1bc25390b0..42d5150e7f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
index d449b8d373..083ff8aced 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
index 388a13661d..35082b84c0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
index 3dc8564005..262d508df8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
index 7fe7725d73..9dd81ef655 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
index 95dd1895c0..4912c99bc0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 15d74a80f9..e5cc986ca4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
index be6bf0fe0c..14739fa64a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
index c4547a50f6..390a0167e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 0ebc04bc9d..fef63336f4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index 05b2a38837..586b6a2a3a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
index 8a75421509..a4068685da 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
index 15a4bf57b2..b50374f10b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
index 7875bb72e6..2ee42db509 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
index a69a5355dd..90fce5d2f7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
index fa56dcff1d..b253801756 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
index 84c34e219a..ee7fa59945 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
index d1414a988e..3a11618ad8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
index ff48a2b085..3efbad9c2c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
index e2829cf41d..583cb6c3d7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
index 25a2fa251b..7584410a17 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
index 1376b1b5ca..1837298d00 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
index 75193a18dc..716d05890f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
index 96dd1193e0..2df7584569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
index dda159b7ab..530a078118 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
index f2a4366dcd..5a9425f850 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
index fc2d626df7..456fd0ef56 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
index 667159748e..e2a03c36ac 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
index 2b0c2c0bb2..fcd52a6dff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
index 744ea3b4f1..f1d77f4c6d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
index aa707d9f93..2e8ceb3132 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
index 3ae1ebb52b..9201d1ee97 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
index 1b9b73a77b..e9d96ed1c5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
index bb5fb4fa44..fe0307db3b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
index 45cdef3313..8c4ef41967 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
index 42deecd88e..0f4164d9ed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
index ee98325ee0..c3b3afdb75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
index 24cce7c4c1..00757cd8b3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
index 88a188e023..d755acd0eb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
index 6415c2f8b0..5055efbe35 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
index 16586735e4..ad58dcc55b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
index f2affb797b..5cfca153c6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
index 97ff3f71af..cea2b2bf35 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
index e5ec799d33..edcb240d8d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
index 71e33d024a..33bf28bc4c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
index 703250fd78..27b6ad0cbf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
index dc2a3b5249..2f1688e18d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
index 3259a11179..4c9cdd590c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
index e57edf8052..636c311c0a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
index 7f688563f7..53fe4d9fd8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 15d74a80f9..e5cc986ca4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index 642b60f62e..78850e2d8b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
index 5545d07436..7c9bb4ac1d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
index 451cabdda7..4e07221e28 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 0ebc04bc9d..fef63336f4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index 7b3aae3a14..df8a6ea3dc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
index 85f81d725f..a815da0181 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas
index 35cff1f745..4e817213c8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid
index cc04706720..2816d7fb20 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas
index 5175ea8f7e..09f669f569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas
index 6a5f79ce56..dc8a85d1a2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid
index 1581faa761..edb9b16b5f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas
index 04be36227c..a9809e320c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid
index 8ce4958f40..dd64eb79ba 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas
index 279cb3f376..4cf9225d10 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid
index 30490dc8f2..e5bd58cae2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas
index 043162c5d6..69caad5775 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas
index 8479cf6ba6..2728fcc49f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid
index 9ba0a253f9..3b224c0978 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas
index 7b87dc727b..2d2f2eebbc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas
index 1269015edf..35c8ef6624 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas
index 6f6e32882a..cde0b022b5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas
index 4ca881099c..e81585996d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p
index 6d6fe43c41..cca97044e0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh
index fe9a42a130..abd9badf8a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
index af0c19a328..03ba56b355 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
index 8e1cef9fdc..c6ae650dee 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
index e376c57be5..11fdc1ea20 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
index e9d807099f..4dd4d8ed47 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
index cd352f472f..617b35c09f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
index 5c3f59fc15..c77c7951fe 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
index 85e84c3f9b..3be01ab72f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
index 486d98574f..f7fdd8da5a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
index d89ebb2f43..7509a11e50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
index 7afe96c164..8909e4745f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
index 339d8b4c8f..b7107a6ff4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
index 450fe9e89f..cb0c8a3362 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air
index 42deecd88e..0f4164d9ed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water
index ee98325ee0..c3b3afdb75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta
index 24cce7c4c1..00757cd8b3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air
index 6415c2f8b0..5055efbe35 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water
index 16586735e4..ad58dcc55b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air
index f2affb797b..5cfca153c6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water
index 97ff3f71af..cea2b2bf35 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm
index e5ec799d33..edcb240d8d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles
index 2f8b816cae..2056fac88a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air
index 71e33d024a..33bf28bc4c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water
index 703250fd78..27b6ad0cbf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km
index dc2a3b5249..2f1688e18d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air
index 3dc8564005..262d508df8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water
index 7fe7725d73..9dd81ef655 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh
index 95dd1895c0..4912c99bc0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties
index 30e0aebc4d..0f3995834f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air
index d60b5c7105..4388545183 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water
index a8339b68a6..d2e5242f1f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict
index 3b5236f321..72c2bcb53a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes
index 769090737e..32845fcd2e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution
index 92593ea504..e79a9c2589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict
index 140586f959..1fb11df695 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
index 3443e8172c..e2c3fe8bcb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
index 58aa1fd3fb..836c7de953 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
index e8b7fd27de..c909b08690 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
index 1f30ea07fb..9cb956b68c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
index ee9cd782c1..2f80b30c96 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
index 1651c10c82..8f2eb629b2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
index ac84f98b5c..04c1e52ff9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
index db6673befa..5ee293f8cc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
index e25bd6b0d5..d980bfa767 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
index 99d2740fde..b2bd36b4fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
index 46736cbd37..963e2e2008 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
index 5d6ceaf898..b96e78b72a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
index 652d302165..05d00c0ded 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
index 7a4e8aa334..0c0b04b219 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
index 1f1be4b630..80cd425353 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index 1e7b440159..31e3a8a211 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index ce427deadb..7c0370aedf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
index c0ea75a9ea..e8c9a4e56e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 81a0066900..0d35f066a7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
index d3c56155f6..fbf61401c1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index 47ea40a29b..1d930cca4b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index 5b74bb6b0c..0173adcb44 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index dcc02c1d64..6f584bdc92 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
index bf509ed9ac..ab92e7e8a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.gas
index aa2f95233f..e0586c579b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.liquid
index 8e1e8c7da6..29225ce22a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.gas
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.liquid
index 31b122a146..ac7b35cb85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.gas
index f6fe76f481..1abd0267ef 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.liquid
index fe60f3027d..a7bde64b63 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.gas
index 4b8a997e55..c1f41f46ce 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.liquid
index f2f086ef48..d7cea739e6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/alphat.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.gas
index 2f013b0090..e3b1a07f1f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.liquid
index 6630854c65..9e8e67429b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/epsilon.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.gas
index ef70738c82..ca47782212 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.liquid
index 188f3d4d41..d880f96e4f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/k.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.gas
index 7843009872..fac286ae18 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.liquid
index 15c680d304..9f8c8762fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/nut.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p
index 814c1d1395..29d83e24b1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p_rgh
index 5ce79a5645..5fd776d2b9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
index 440b57057e..ee6a4c4abe 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
index eef841abca..0ee8baf305 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
index c52d71745f..930fadb607 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
index 1203d1a064..4dec81e365 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
index bf8556a966..66ca289db0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
index 8e16f44ab7..c8bf5b55a6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
index e4fc5e6bd2..2a99355e8c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
index f3b4a08164..8f21e8c7b7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
index d2594d3786..22b1e4ea1b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.gas
index 2c5ed670a1..320e0ea9e2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.liquid
index c9f2481e33..962a316af9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas2 b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas2
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas2
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.gas2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.liquid
index 31b122a146..ac7b35cb85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.gas
index f6fe76f481..1abd0267ef 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.liquid
index fe60f3027d..a7bde64b63 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.gas
index 46cefb3f5e..0f4682aed3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.liquid
index d88cb38a79..b55a7c7f91 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/alphat.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.gas
index 2f013b0090..e3b1a07f1f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.liquid
index 6630854c65..9e8e67429b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/epsilon.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.gas
index ef70738c82..ca47782212 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.liquid
index 188f3d4d41..d880f96e4f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/k.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.gas
index 7843009872..fac286ae18 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.liquid
index 15c680d304..9f8c8762fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/nut.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p
index 814c1d1395..29d83e24b1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p_rgh
index 5ce79a5645..5fd776d2b9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties
index 09d91dc9bf..f1def29b80 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas
index effbe53956..0812b452c8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid
index d1a11f6301..1aa7bfc8f1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas
index c935517310..0cdab0911c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid
index 16f069b030..10041c09a1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict
index d0262ae2ff..b6f0c593d7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict
index 792a6e82c6..a40e575994 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes
index ca33034340..f443cfba6b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
index 1580192feb..be1cacb50c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.gas
index aa2f95233f..e0586c579b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.liquid
index 3a1fd14766..4826d8f229 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.gas
index 21c2731437..2898e27fb9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.liquid
index 31b122a146..ac7b35cb85 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.gas
index f6fe76f481..1abd0267ef 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.liquid
index fe60f3027d..a7bde64b63 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.gas
index 4b8a997e55..c1f41f46ce 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.liquid
index 30cb4da361..cf2e9f642f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/alphat.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.gas
index 2f013b0090..e3b1a07f1f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.liquid
index 6630854c65..9e8e67429b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/epsilon.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.gas
index ef70738c82..ca47782212 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.liquid
index 188f3d4d41..d880f96e4f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/k.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/kappai.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/kappai.gas
index 8e79a434d2..fa87e15543 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/kappai.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/kappai.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.gas
index 7843009872..fac286ae18 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.liquid
index 15c680d304..9f8c8762fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/nut.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p
index 814c1d1395..29d83e24b1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p_rgh
index 5ce79a5645..5fd776d2b9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.gas
index 90aec4f840..1da6146ec5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.liquid
index e635449fbc..768a4e1908 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0.orig/water.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
index de27f0abdb..d3b3c51f63 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
index eef841abca..0ee8baf305 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
index 5e60348f33..8ad12a7521 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas
index 1203d1a064..4dec81e365 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid
index bf8556a966..66ca289db0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict
index 8e16f44ab7..c8bf5b55a6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict
index e4fc5e6bd2..2a99355e8c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
index e45b2c814c..7afb7821b5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
index a4a4bbf3d3..f5768f523f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
index 42deecd88e..0f4164d9ed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
index ee98325ee0..c3b3afdb75 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
index 24cce7c4c1..00757cd8b3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
index 95dd1895c0..4912c99bc0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index f979fb05ef..58fbb5a8e5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 0ebc04bc9d..fef63336f4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 77862ae4db..8b8c30264d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index 2c5d67288c..5e1e9acb3d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas
index 5175ea8f7e..09f669f569 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas
index 6a5f79ce56..dc8a85d1a2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid
index 1581faa761..edb9b16b5f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas
index e2f99cc782..122efb7e62 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid
index d43b08e08e..ccd68d6ed9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas
index 279cb3f376..4cf9225d10 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid
index 30490dc8f2..e5bd58cae2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault
index 1bdf93d654..d9591e8eee 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas
index 038cb4ab97..f3e7033557 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid
index 20dc30f228..a32142f8c6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas
index 8479cf6ba6..2728fcc49f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid
index 9ba0a253f9..3b224c0978 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh
index 95dd1895c0..4912c99bc0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
index 0c9d2e49eb..84a6f3ff97 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
index 5f7ae79240..a264fac3f0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
index a5d4bf3c8c..e4d184e093 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
index 6f9934c8fd..f71f694f99 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
index 85e84c3f9b..3be01ab72f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index eed20ab52b..e36f8b6ed4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
index 814d7ab994..18f1400c3c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
index d89ebb2f43..7509a11e50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
index 1852756ee1..be8e89765d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
index 215cdf44be..1edd72c7a8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
index 450fe9e89f..cb0c8a3362 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas
index 8d0f594f75..fc87fa5fc7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid
index 78df64ac49..70385d3162 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas
index 89e28fb0e8..51460c4982 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid
index 2b0c97b081..4f7260e781 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas
index d41850e9f5..d90a7ff2ef 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid
index 20dc30f228..a32142f8c6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.gas
index 7c68c06d4e..65774e3a23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.liquid
index 9ba0a253f9..3b224c0978 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh
index 95dd1895c0..4912c99bc0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas
index 8caf866e79..c87b77d61f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid
index 509163d50d..3776e01225 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
index 44dbcf6b1e..b9a1b67f49 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
index aa052bdd18..82bb5c166c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
index a1be257acb..eb44949194 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
index 6f9934c8fd..f71f694f99 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
index 85e84c3f9b..3be01ab72f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
index 814d7ab994..18f1400c3c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
index 1852756ee1..be8e89765d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
index 52e9ae06ae..b289f84598 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
index 6ec9c713c7..d7e37945bd 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
index 42deecd88e..0f4164d9ed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
index 11ed489b32..96ec726f2c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
index 24cce7c4c1..00757cd8b3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
index 4f13745c15..771e4b082a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
index 95dd1895c0..4912c99bc0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index 37cea64999..a6ba71c8d3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index b9656f67c8..079a076f0f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index d1945966e5..9ed460dfc4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
index 7c3dbfe4a1..0ca4f9ed23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
index 3443e8172c..e2c3fe8bcb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
index a0e13d4f80..7a5be2c98c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
index e8b7fd27de..c909b08690 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
index 1f30ea07fb..9cb956b68c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
index ee9cd782c1..2f80b30c96 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
index ac84f98b5c..04c1e52ff9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
index e25bd6b0d5..d980bfa767 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
index 99d2740fde..b2bd36b4fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
index ffb0270e7a..738798b063 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
index 5d6ceaf898..b96e78b72a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
index 652d302165..05d00c0ded 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
index 7a4e8aa334..0c0b04b219 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
index 1f1be4b630..80cd425353 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index 5603456fdb..eac2d4985e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index ce427deadb..7c0370aedf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index 03b94adf7d..c9e5dfd9eb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
index d3c56155f6..fbf61401c1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 80ff69f403..c4c2340349 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 898b9f40e4..da30a6b552 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index 587e9d6c0f..4a084b77a3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
index cc729bf5db..5a6e6d39f6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air
index 057c960447..f29529b13b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water
index d08d7c1f2a..d5d19a869d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air
index b58d2798b2..16330e3548 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water
index 1e14b59c39..0b5d7e2257 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
index 665dad7a2c..3a5ccb825a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p
index 5f433869a5..220126f322 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
index 12c5087463..40e78d0af3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
index e9c989ca1a..ec284068c9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
index 7e184f4b05..163bc15caa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
index 7ec9b368e1..a5db45d5cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
index 50ac335d16..32369fac20 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
index f1985aa44f..27f6b5175e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
index 2c5d67288c..5e1e9acb3d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
index 75197d5e49..081d15fa25 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
index af9653952c..864f41330e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
index 2c4028e60b..003edf8061 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
index f28af72138..8a52979e5a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
index c22fdf1d86..29209f8011 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
index f3edc1f8ad..1dbce4bd8c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
index da058059c1..d3fd901e04 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
index cf65cd3bc7..a1fe35c47d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index 63ebd2a998..057bb98208 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index fe43272924..a2394de805 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 246ac125e3..4f20b77025 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index db96cf41c7..0d7da285bb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index 87ee2ce18b..d37e180784 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index e69a3f7ea2..fdfe317f04 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam
index 0848138e8b..88cb12bd46 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water
index 5df9ecdb63..1a27554246 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam
index b983c1b442..464ab76548 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water
index b46cd6e77e..fff58724b6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.steam
index ce868020fe..455fca6b8c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.steam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.water
index a3267c552b..7dd1406b31 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water
index 0408b3e272..616f6993c8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p
index 60a8f7bc9d..a89a555be6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh
index bc3bd0220f..a2680e86bc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam
index d69c6cefde..4f239a78c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water
index 411d4594d0..f31a62c565 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
index 591176521c..79d359b2c8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
index d410b42385..362e3a8ff1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
index c885fb7023..218517e5f3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
index 5bb3094812..6ba3ae35ff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
index da7aa6417a..1e7a866d82 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
index 7338c11b36..88a5e98f0f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
index 6fc77aa82e..e850eb9574 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
index 7afe96c164..8909e4745f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
index a5f90a3799..c71c577278 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U
index c496a4f548..cd470c1811 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge
index af46a35363..f2d28b4e8d 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh
index a0fe9ccb1a..790dd4c477 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
index e0f2ebb28b..4bff667e12 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
index 34d7efc5d8..6b836033a8 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
index 8bd13791e3..e74673fdae 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
index 40645cb8ef..b1b199051b 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
index aeac7cba2a..c91b6c81ef 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
index 38c3227bfa..abb935fa04 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
index 3c18c40833..7101f067b7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
index df9ff95393..0929c2eded 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
index 1f47128525..f47a7914c7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
index db6673befa..5ee293f8cc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
index b59c9159ea..4858271d88 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
index e0486ebae7..9fe4008538 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
index f39265b941..c7d7c013db 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
index af72d1655e..17f187c6e5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
index b13b72d2da..d3d707d623 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
index 3259a11179..4c9cdd590c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
index e57edf8052..636c311c0a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
index 7e3321dd3e..4eacec5674 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 995318bb9e..62385dc87b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
index be6bf0fe0c..14739fa64a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
index c4547a50f6..390a0167e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index e1ff425131..4c97827e49 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index 05b2a38837..586b6a2a3a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
index df578851f5..f07d6aae19 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
index 3c18c40833..7101f067b7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
index df9ff95393..0929c2eded 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
index 1f47128525..f47a7914c7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
index db6673befa..5ee293f8cc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
index b59c9159ea..4858271d88 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
index e0486ebae7..9fe4008538 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
index f39265b941..c7d7c013db 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
index 240ff3aa68..5a1e1d36a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
index af72d1655e..17f187c6e5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
index b13b72d2da..d3d707d623 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
index 58649cbdb9..7ce32c99ca 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
index 3259a11179..4c9cdd590c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
index e57edf8052..636c311c0a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
index 7e3321dd3e..4eacec5674 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 995318bb9e..62385dc87b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
index 5545d07436..7c9bb4ac1d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
index 451cabdda7..4e07221e28 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index bdf3b93a7d..da78b2a5f4 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index 7b3aae3a14..df8a6ea3dc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
index da02ce9ef6..5182fd30a4 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
index 3443e8172c..e2c3fe8bcb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
index a0e13d4f80..7a5be2c98c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
index e8b7fd27de..c909b08690 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
index 1f30ea07fb..9cb956b68c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
index ee9cd782c1..2f80b30c96 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
index 1651c10c82..8f2eb629b2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
index ac84f98b5c..04c1e52ff9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
index db6673befa..5ee293f8cc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
index e25bd6b0d5..d980bfa767 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
index 99d2740fde..b2bd36b4fb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
index ffb0270e7a..738798b063 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
index 5d6ceaf898..b96e78b72a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
index 652d302165..05d00c0ded 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
index 7a4e8aa334..0c0b04b219 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
index 5e2e3404d7..c46d06cf45 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index a8b60a0a77..4ab8d7389d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index ce427deadb..7c0370aedf 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
index c0ea75a9ea..e8c9a4e56e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 81a0066900..0d35f066a7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
index d3c56155f6..fbf61401c1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index a427c7a62c..8d09e36fa1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index 3d2c84bb3d..1ad747307c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index 4f87dfd38d..e2cc98546f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
index bf509ed9ac..ab92e7e8a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
index 3c18c40833..7101f067b7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
index df9ff95393..0929c2eded 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
index 1f47128525..f47a7914c7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
index 7e3321dd3e..4eacec5674 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index a5338db18e..e5f7895f5e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index 1be5148429..80d55679f5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 2e1f776980..2180ed39c9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 77862ae4db..8b8c30264d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index 66e14fd0ae..f0e3a45570 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
index 3c18c40833..7101f067b7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
index df9ff95393..0929c2eded 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
index 1f47128525..f47a7914c7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
index e2340e8658..2cd355b27a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
index 7caf26d5fe..a2296b7c50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
index 2f4c9394fb..1cbf879882 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
index 32927b1967..0d5ff37c6d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
index f03aa9d5ce..ee11348792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
index 7e3321dd3e..4eacec5674 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index 006d5f37b7..93f006104f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
index 55b36cb6d5..2ba098c412 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
index 073aafddbd..9b95296f6d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 1245f79c82..fbec302379 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index d1945966e5..9ed460dfc4 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
index 56b3a71123..cc9eab38b3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
index 3443e8172c..e2c3fe8bcb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
index a0e13d4f80..7a5be2c98c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
index e8b7fd27de..c909b08690 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
index 1f30ea07fb..9cb956b68c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
index ee9cd782c1..2f80b30c96 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
index ac84f98b5c..04c1e52ff9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
index e25bd6b0d5..d980bfa767 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
index 99d2740fde..b2bd36b4fb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
index ffb0270e7a..738798b063 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
index 5d6ceaf898..b96e78b72a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
index 652d302165..05d00c0ded 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
index 7a4e8aa334..0c0b04b219 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
index 5e2e3404d7..c46d06cf45 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index b887c3ef17..f79e59eae3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index ce427deadb..7c0370aedf 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index 03b94adf7d..c9e5dfd9eb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
index 210a02611b..c73388f49c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 6d19d12a41..d9d91aeece 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 898b9f40e4..da30a6b552 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index 508d327074..75f7bd5de6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
index bf509ed9ac..ab92e7e8a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
index 057c960447..f29529b13b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
index d08d7c1f2a..d5d19a869d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
index b58d2798b2..16330e3548 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
index 1e14b59c39..0b5d7e2257 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
index 665dad7a2c..3a5ccb825a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
index 5f433869a5..220126f322 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
index 12c5087463..40e78d0af3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
index ca5a2d7caf..70b7e3be93 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
index c0f9efa609..56a5e35e90 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
index 7ec9b368e1..a5db45d5cb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
index 728242ced4..0978731fa3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
index f1985aa44f..27f6b5175e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
index 66e14fd0ae..f0e3a45570 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
index 918c8a2e28..481326a753 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
index 75197d5e49..081d15fa25 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
index af9653952c..864f41330e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
index 2c4028e60b..003edf8061 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
index f28af72138..8a52979e5a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
index c22fdf1d86..29209f8011 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
index f3edc1f8ad..1dbce4bd8c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
index da058059c1..d3fd901e04 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
index cf65cd3bc7..a1fe35c47d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index 63ebd2a998..057bb98208 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 5876749bcd..bdd1292399 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index b6e1c0d79a..7e45d95966 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index 4550bce1dd..dcd85ad12b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index b331d2653b..e3872e5b0e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 1b83c1f9f9..87839fa35e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index ec796e5401..85e45c60a5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 462a04bbb0..b098ea6dda 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index db96cf41c7..0d7da285bb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index 0613ec0b61..0226201dd7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index 7b40c519c5..bfb3b36012 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep
index d7c346adda..d8ea0ec29c 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRep
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp
index da2034351c..11b1ea0acb 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/GRxp
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers
index efb737e89e..0cc57de0db 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/RPers
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su
index f45d1f9043..cf64d56458 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Su
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T
index 719652bd60..52cc97f67d 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu
index c9be0303d5..50d023eb29 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Tu
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U
index 51358a366e..083d209928 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi
index bcd5b0e3f5..32f2b4f113 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xi
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp
index 2aa1bdcd4b..6a20ac51b2 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/Xp
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b
index 2130a56eb4..3995dd81a7 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/b
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon
index 31cb968f7f..0458cde8a7 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft
index 9b7d205103..4db40d3e32 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/ft
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k
index d489919b74..696b22d90c 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p
index 06bbba3711..bed489702e 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/PDRProperties b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/PDRProperties
index ba50552d58..2ed1599b22 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/PDRProperties
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/PDRProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/combustionProperties b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/combustionProperties
index 9d7ebd211a..019ff26db0 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/combustionProperties
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/combustionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/dynamicMeshDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/dynamicMeshDict
index 9c8508aa73..5e2d1c5be4 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/dynamicMeshDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/dynamicMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/g b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/g
index 43241f4daa..51f4cd8295 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/g
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/thermophysicalProperties b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/thermophysicalProperties
index 5ab0e045f8..a895671017 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/thermophysicalProperties
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/turbulenceProperties b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/turbulenceProperties
index 2bf8e338c0..b1e82ed65a 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/turbulenceProperties
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group01 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group01
index 067c48d356..d5df92bbd6 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group01
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group01
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group11 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group11
index f75fdb8d61..f9b6083c50 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group11
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group11
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group14 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group14
index 9940948dfb..512dd34f3e 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group14
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group14
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group15 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group15
index d3b9084d5c..d1739b7c30 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group15
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group15
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group17 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group17
index 6f7e78387f..f8b6172a57 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group17
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group17
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group21 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group21
index c6f3282848..b1558d2f35 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group21
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group21
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group31 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group31
index 0be7f896e1..a6c793d153 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group31
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group31
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group41 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group41
index f465fb58f3..bc02c776f0 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group41
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/groups/group41
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/obstaclesDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/obstaclesDict
index f190e4abd7..a7901b838a 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/obstaclesDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/geometry/obstaclesDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRblockMeshDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRblockMeshDict
index a1c78a068b..1bb9891863 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRblockMeshDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRblockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict
index 04620e7a03..6e0d63e001 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/PDRsetFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/controlDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/controlDict
index 61bad0e889..1eb9e9d398 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/controlDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/createPatchDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/createPatchDict
index 7a2ee2ede5..e94ff3bc07 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/createPatchDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/decomposeParDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/decomposeParDict
index 9ea1d72f04..49ec4d48a5 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/decomposeParDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSchemes b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSchemes
index 345fa665d4..c7ee8f2ca4 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSchemes
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSolution b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSolution
index 6a11c95866..ee5dbe5194 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSolution
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/mapFieldsDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/mapFieldsDict
index 299b7ebe86..16c4d30c10 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/mapFieldsDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes
index 605356da7e..5adb9e79cc 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/probes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/refineMeshDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/refineMeshDict
index e54441c021..6b2fb46d5f 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/refineMeshDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/refineMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict
index 9a760fe649..05248016ba 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict1 b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict1
index d2a67d3218..029a04654b 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict1
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/setFieldsDict1
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/topoSetDict b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/topoSetDict
index 7dc69b8be1..d66fa0f3d0 100644
--- a/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/topoSetDict
+++ b/tutorials/preProcessing/PDRsetFields/simplePipeCage/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties b/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties
index 75f257baae..d3a7aaf7ed 100644
--- a/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict b/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict
index d39bfb241f..328f5db2aa 100644
--- a/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties b/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties
index 4ae5877fed..ef9e426f2a 100644
--- a/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict b/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict
index c7dc65be5e..fae4faa44b 100644
--- a/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes
index f636a9a8a8..af8c7b7a09 100644
--- a/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution
index d8fa2b5f98..31b000ea02 100644
--- a/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict
index b0a2e850e7..521df2290a 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict
index ab6dcecb81..559562a7e5 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict
index dfe6938530..e78c1f97be 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes
index 0660b5fd2f..24779d2d23 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution
index 4dba3fd9b3..e20201ceaf 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict
index 426eca5bcb..68ab8af37e 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict
index 8c86af5b73..37baae0011 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
index 09d60d97a4..d3f449211f 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/g b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/g
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties
index 2261c8b3e7..49566cdda4 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index d558bc8c85..bb05483582 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
index 2261c8b3e7..49566cdda4 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties
index 2445eb7dc6..a9179dfdae 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
index 2261c8b3e7..49566cdda4 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g
index 1c5aff5538..24d3c2e9c2 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties
index a462983d60..7cc6634527 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 76b24fa0bf..e779c14d4c 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict
index 37259cd515..edf328ef4e 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index be9d25ef8c..8c78eec6ab 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
index 1ba3592ecf..e2ada1baa5 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 4bc059450c..78d50d85df 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
index 983ab7419c..9b90ff1af6 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict
index 8e80c82e98..f29f4df9dc 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict
index 300e46cc5f..58b2b0dd00 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes
index 7343760d95..203e6fa9e9 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution
index da871fdd10..84aacf6d68 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 07175b76de..f00510eadf 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict
index 1ba3592ecf..e2ada1baa5 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes
index 452270f7ec..a4c8667bda 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution
index 8fe47b88bd..d021b02b32 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 39b75d4ec3..181fdf4897 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
index 1ba3592ecf..e2ada1baa5 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes
index 452270f7ec..a4c8667bda 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index 39b75d4ec3..181fdf4897 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
index e559a3ac93..270e4d4429 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes
index 452270f7ec..a4c8667bda 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
index a3060f8907..2689bbbd68 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index a560d38867..e074765dcc 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index 2951b537c6..90332ed78b 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict
index e559a3ac93..270e4d4429 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes
index 4bc059450c..78d50d85df 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
index 15b280748c..3998fb67a1 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/constant/transportProperties b/tutorials/preProcessing/decompositionConstraints/geometric/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/constant/transportProperties
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/constant/turbulenceProperties b/tutorials/preProcessing/decompositionConstraints/geometric/constant/turbulenceProperties
index d4bc7a31cf..47cc649617 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/constant/turbulenceProperties
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/blockMeshDict b/tutorials/preProcessing/decompositionConstraints/geometric/system/blockMeshDict
index 6931110909..39fbc8a1eb 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/blockMeshDict
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/controlDict b/tutorials/preProcessing/decompositionConstraints/geometric/system/controlDict
index e7a5959695..1153155db2 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/controlDict
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeConstraints b/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeConstraints
index c1df841102..b8e81a694a 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeConstraints
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeConstraints
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict b/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict
index f9d74d9676..1f9a2bcfc3 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict.8 b/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict.8
index cdbca1b79e..5196f3172a 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict.8
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/decomposeParDict.8
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSchemes b/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSchemes
index f07ed2bcdf..8a7d36ccaa 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSchemes
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSolution b/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSolution
index 4dba3fd9b3..e20201ceaf 100644
--- a/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSolution
+++ b/tutorials/preProcessing/decompositionConstraints/geometric/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/resources/geometry/fridgeA.eMesh b/tutorials/resources/geometry/fridgeA.eMesh
index 327960c9cd..5f609fd102 100644
--- a/tutorials/resources/geometry/fridgeA.eMesh
+++ b/tutorials/resources/geometry/fridgeA.eMesh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/D b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/D
index 3e3d70b9ef..429e5df611 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/D
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/D
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/T b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/T
index 335d365e41..4f7168421e 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/T
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
index 2ae70b3f5d..3655a59f8e 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
index 228b8917ed..31c8d48033 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
index f08ac128b8..fc4862f9c1 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
index 6cbc0260b0..d400cf63ad 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/decomposeParDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/decomposeParDict
index 6e1c20af23..00e1ffa49f 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/decomposeParDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
index 797f574fcc..7dc92b7645 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
index 502ccfa207..a9ea857965 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
index 747bb3e090..e03f317b60 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
index 2036a493f7..18bc8c383f 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
index 279d95707a..72d5cabbbd 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
index 94458c7ae2..05d4a6e8f3 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
index 228b8917ed..31c8d48033 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
index 7ad977331f..bdcfefa901 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
index 65c0a89c52..457ba15cce 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
index 7525a97f21..c83477a50d 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
index 661f25f30e..3cbc09b121 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/U
index 58c9884de4..09e454d82b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/include/ABLConditions b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/include/ABLConditions
index 1578343091..546c38eaab 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/include/ABLConditions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/include/ABLConditions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/k
index 6678cb5a74..88ac13078a 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/k
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/nut
index ecb2ba34c8..39dc6a8367 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/p b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/p
index b2d97b403c..4c00d7095f 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/p
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/constant/transportProperties
index 50ea8f0a97..408d84ffcf 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/blockMeshDict
index d92dec53ca..a359f14493 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
index 494b31ff2f..d17af87dd6 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/decomposeParDict
index ac342bd6d0..b72bc911e1 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSchemes
index e53d4d59b9..a29cd4346a 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSolution
index 6f42f2d609..2081fbb667 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/epsilon
index 75a41d01e9..d9b76b8268 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/epsilon
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/turbulenceProperties
index c91c381fa1..e78f96883e 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kEpsilon/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/omega
index 3d8a978cea..6433fc09ff 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/omega
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/turbulenceProperties
index 69ce6f33a7..d992d8b0d6 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/kOmegaSST/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd
index 6b2d3cf662..9922d6778c 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD
index 6198836c3b..415b029ca7 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/T
index 8585ec38db..167c5decdc 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/T
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/U
index 88f650d713..2cb2a44a63 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/alphat
index b90b28ae1d..3d7da07461 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/alphat
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/k
index a284c20590..182d50118d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/k
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/nut
index f0bebdb5e6..8aa3372070 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/p_rgh
index f041f1da53..0e4a5d310e 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/p_rgh
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/g
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/transportProperties
index cdf3fac172..054df52468 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/blockMeshDict
index 7b7e2cfbe8..ef2929664d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/controlDict
index da63f63e0f..5d19eeaa08 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/decomposeParDict
index 820210b1fe..e83f5994e0 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSchemes
index 82b6d04ff9..32a317cfc1 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSolution
index a215575762..9f16c53a10 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/epsilon
index 69844cf390..02efd7ee3f 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/epsilon
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/qPlant
index ffa4c19f6e..6e3a01988b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions
index 6f93273d40..e96cfe494d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/turbulenceProperties
index 761cc958b8..58b5a202de 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/qPlant
index ffa4c19f6e..6e3a01988b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions
index 7985dad832..5dc53d42f9 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/turbulenceProperties
index 6ffeafedc1..eb4a21a1e0 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/omega
index dd43e847b0..e40fa1e154 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/omega
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/qPlant
index ffa4c19f6e..6e3a01988b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions
index 6f93273d40..e96cfe494d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/turbulenceProperties
index 5a1f48f8e6..e1bb484d32 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/T
index f8572be8f6..17fa0133ce 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/T
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/U
index b0fe34675e..74ff700474 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/alphat
index f711643ab7..22909efb87 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/alphat
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/k
index 67d482dfc6..0faa8fe510 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/k
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/nut
index e309325ddd..41c8a1a4e9 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/p_rgh
index 3530c6a5e4..854b02d9f8 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/p_rgh
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions
index 6dff17709f..5ee8c7494c 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/g
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/transportProperties
index 05e4ad174e..b2f629cc24 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/blockMeshDict
index b9718a03fd..906231f818 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/controlDict
index e63a306d50..c03b180f1b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/createPatchDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/createPatchDict
index ed06ec40a4..cb1f4105e6 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/createPatchDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/createPatchDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/decomposeParDict
index ede10f42b5..bbadfca5be 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSchemes
index 2a22402b3d..0d8314750e 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSolution
index 6c8c1ecf7e..9b64cdd61d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/mapFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/mapFieldsDict
index 26f927d501..994fcaf2bc 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/mapFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/mapFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/topoSetDict b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/topoSetDict
index 2f610acd87..d84d4c0b9b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/topoSetDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/system/topoSetDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/epsilon
index ecd154a3dc..415fd9813e 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/epsilon
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/turbulenceProperties
index ecca064024..b7beb4ba58 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kEpsilon/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions
index de75434751..f47deb7ed7 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/turbulenceProperties
index 959af62898..5081cb599b 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/omega
index c0a6d5bc57..174d1d4d0d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/omega
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/turbulenceProperties
index 6df7b8cd3a..902a69c9c9 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kOmegaSST/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/Cd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/Cd
index 14a7118b66..776775e795 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/Cd
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/Cd
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD
index 7e0ad20d9e..fb8d5257eb 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/T b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/T
index a390d9c587..042bcbe025 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/T
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/U
index 88f650d713..2cb2a44a63 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/alphat b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/alphat
index a0f517f4d6..0ddbbe854c 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/alphat
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/alphat
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/epsilon b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/epsilon
index 31fe9219e8..2017b2679f 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/epsilon
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/k b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/k
index a284c20590..182d50118d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/k
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/nut
index 690cc777fd..cc4bbf38a1 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/omega b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/omega
index 29ff73e1a8..b5e7484ef7 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/omega
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/p_rgh b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/p_rgh
index f041f1da53..0e4a5d310e 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/p_rgh
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/g b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/g
index 7d7d5e0b76..52ab2ef850 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/g
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/transportProperties
index f3bc862c13..9c712a8c2f 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/turbulenceProperties b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/turbulenceProperties
index 7dc70418de..7c4aeec6d0 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/blockMeshDict
index 3a2aefd8c9..615e0ea18d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict
index 0202bf885c..2aaf9c809a 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/decomposeParDict
index ec10d393d3..c15ec4ffba 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSchemes
index 6a6f1f1361..ba56947724 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSolution
index a215575762..9f16c53a10 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/qPlant
index 2835420059..d5f4f68eaf 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions
index c57604ccee..0853e018c4 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict
index 1fbf372165..e1ddec9a4d 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/qPlant
index c8077e1ad2..7d75bd2101 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions
index f6223f429a..f3a102db71 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict
index 0c69043979..e01d2eb748 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/qPlant
index e4f205f208..c26fa5c05a 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions
index 3aa7ee6a5d..be9f157af1 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict
index 6b48cbc26b..5341143f17 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/qPlant
index 6e926593ed..d7f4d06966 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions
index 783e90f716..bcd52c1b2a 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict
index c59b5d61e6..0e426e6928 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/qPlant
index 1b240e2312..a3ea6b8aff 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions
index 28898d5128..ce8b68e070 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict
index 3cbe315035..2baeb8d323 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/qPlant b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/qPlant
index 994f8e10ad..8c330beed2 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/qPlant
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/0.orig/qPlant
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions
index 6202284a2c..4dbe36308c 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict
index be54620f1f..2550acb115 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/U
index e7629ddb4a..79abde32cc 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/p_rgh b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/p_rgh
index 620d54d85c..29af297275 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/p_rgh
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/g b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/g
index 70a74acabf..2415a7f518 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/g
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/transportProperties
index 17c132c7b9..7b5e08cbd0 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/turbulenceProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/blockMeshDict
index a63488caac..847abb0d4e 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/decomposeParDict
index 7689a110fc..7910b88dd4 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/T b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/T
index f3e4fb6f8b..9b34d26d0a 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/T
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.gas b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.gas
index c22d9eabd6..1113fd5bfd 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.gas
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.liquid b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.liquid
index 4f86072980..5fdfe8c2b9 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.liquid
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/phaseProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/phaseProperties
index dc9d27b340..0570ca89cb 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/phaseProperties
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/phaseProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.gas b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.gas
index bbe1e06887..66ecb0c9b8 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.gas
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.liquid b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.liquid
index 03038695e6..8f8cccd513 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.liquid
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/constant/thermophysicalProperties.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/controlDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/controlDict
index fada63fed0..12c648e384 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/controlDict
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSchemes b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSchemes
index ca8f820196..7496a2613a 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSchemes
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSolution b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSolution
index cdacc3feb7..32878378cf 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSolution
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.gas b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.gas
index 3513b629d9..29feb598dd 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.gas
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.gas
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.liquid b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.liquid
index 49b4071ebc..2641208f5f 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.liquid
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/icoReactingMultiphaseInterFoam/system/setAlphaFieldDict.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/T b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/T
index a220188462..43c31e2224 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/T
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/alpha.liquid b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/alpha.liquid
index 20c23afa7e..add7a60ebc 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/alpha.liquid
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/alpha.liquid
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p
index 2d255921c1..046426329d 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/phaseChangeProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/phaseChangeProperties
index a4aef196c5..fb4e0fd1fa 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/phaseChangeProperties
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/phaseChangeProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/thermophysicalProperties b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/thermophysicalProperties
index 2ccfab9e3f..831d610f7d 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/thermophysicalProperties
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/controlDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/controlDict
index 97b747650f..cbc4b5feac 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/controlDict
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSchemes b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSchemes
index 44eaf6723c..b631ff05d5 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSchemes
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSolution b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSolution
index 0ed2742c9f..315c2ae791 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSolution
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/setAlphaFieldDict b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/setAlphaFieldDict
index 5d0ebb85ab..f2ba733824 100644
--- a/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/setAlphaFieldDict
+++ b/tutorials/verificationAndValidation/multiphase/StefanProblem/setups.orig/interCondensatingEvaporatingFoam/system/setAlphaFieldDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/U b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/U
index c9a82e0317..6f2edd923e 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/U
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/alpha.water b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/alpha.water
index 349ef1c216..90a2207d76 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/alpha.water
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/alpha.water
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/p_rgh b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/p_rgh
index e123140053..12b04186a0 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/p_rgh
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/p_rgh
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/porosity b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/porosity
index e66949ed70..baa577a795 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/porosity
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/0.orig/porosity
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/g b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/g
index 02ff062683..5f8db56060 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/g
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/porosityProperties b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/porosityProperties
index 5ebfb6bb42..19543f0c13 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/porosityProperties
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/porosityProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/transportProperties b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/transportProperties
index eef9d1642d..5950d6ba3c 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/transportProperties
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/turbulenceProperties b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/turbulenceProperties
index 23e2871af7..4188f1e77c 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/blockMeshDict b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/blockMeshDict
index dd24f6de1e..9bd07efb76 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/controlDict b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/controlDict
index b8d486ce4a..15bf0d9e35 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/controlDict
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/decomposeParDict b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/decomposeParDict
index 27cd0cf0d8..b537794e6f 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSchemes b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSchemes
index cb3082e78d..3da4653034 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSchemes
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSolution b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSolution
index 5b1b4d01b2..c4de9a2bf9 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSolution
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/setFieldsDict b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/setFieldsDict
index db521ef9d0..506bd6f793 100644
--- a/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/multiphase/interIsoFoam/porousDamBreak/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/T b/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/T
index 64ad7c7f45..2bb24271c9 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/T
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/U b/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/U
index 536d4e1653..4ad46b7a61 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/U
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/constant/transportProperties b/tutorials/verificationAndValidation/schemes/divergenceExample/constant/transportProperties
index e963dff9a5..8a359d097f 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/constant/transportProperties
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/divergenceExample/system/blockMeshDict
index 3ff4c1c153..6665997c96 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict b/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict
index 806aea2bc2..5a629b1000 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes b/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes
index 34cc2522e1..f359afec8c 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes.template b/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes.template
index 93e72ffc2d..6e6c75e05d 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes.template
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSchemes.template
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSolution b/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSolution
index 3210d40772..12af99c7be 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSolution
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/blockMeshDict
index 3ef324b5c6..23e6557221 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/0/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/blockMeshDict
index 17555388f4..02575bfc0a 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/10/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/blockMeshDict
index ff6cd09a6a..3daafbc8fc 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/20/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/blockMeshDict
index 675fe576ec..1374c8d559 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/30/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/blockMeshDict
index add27a3026..2141eb1f5a 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/40/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/blockMeshDict
index d59545146d..1caa499e4b 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/50/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/blockMeshDict
index 44fe4c85d3..12be45152e 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/60/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/blockMeshDict
index 9a66beebbc..dcaa6cca9b 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/70/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/blockMeshDict
index 4842c6c69c..c49360d931 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/80/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/blockMeshDict
index 1a37f29dc7..22ea167cec 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/85/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/U
index fd8dee7680..dccec9fb79 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/k b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/k
index e9d8369ef9..e0a337d872 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/k
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/nut
index 3df9eaebee..f0868e2745 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/omega b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/omega
index 9b52ca3a98..665dbda8ef 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/omega
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/p b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/p
index 4fa76d27ce..4d918df88f 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/p
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/transportProperties
index b00f116866..a48b2069e2 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/turbulenceProperties b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/turbulenceProperties
index 71439ba93c..aee639449e 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/decomposeParDict
index 4adf1fca54..17c198619e 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSchemes
index 0e1362496f..b5056ef737 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSolution
index 339af4c7f3..3f8a1fead8 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon
index 3b5a828a32..32c54d2e0b 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG
index 1e38f49dd5..8e191abcd1 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK
index f54efab19a..dea9f9d34a 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleK
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR
index 2064c6b41b..782ed1852f 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleR
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU
index 2b19a4ea18..5962d18752 100644
--- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU
+++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSchemes
index 54d767e132..d1b8f3a3c8 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-linear/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSchemes
index 97ab7e6918..7b3789c33b 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/Gauss-pointLinear/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSchemes
index 878a27a728..47337c2e9e 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-linear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSchemes
index a1ed48b9d5..5dc64eb242 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-Gauss-pointLinear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSchemes
index a03bb17e90..b5511de2f2 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-iterativeGauss-linear-5-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSchemes
index 21c18709b8..73553e8188 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellLimited-leastSquares-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSchemes
index a159ba3046..353e4482cf 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-linear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSchemes
index 3e681b0978..f77ee84c98 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-Gauss-pointLinear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSchemes
index 89493c39bb..01bbadec7e 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-iterativeGauss-linear-5-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSchemes
index a51000b94a..5e3e06b2e9 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/cellMDLimited-leastSquares-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/constant/transportProperties
index e963dff9a5..8a359d097f 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
index ff56a961d8..faa5d73ed6 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/cuttingPlane b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/cuttingPlane
index 40b876f174..e776aa209c 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/cuttingPlane
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/cuttingPlane
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/decomposeParDict
index 4adf1fca54..17c198619e 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/fvSolution
index 3210d40772..12af99c7be 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSchemes
index 73cd117dc1..b1f59c83d6 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-linear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSchemes
index ca3187e605..2aab0c2f3a 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-Gauss-pointLinear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSchemes
index 1ba117c666..ec2fe6cac8 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-iterativeGauss-linear-5-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSchemes
index 3dacf8a61c..6ee187c55a 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceLimited-leastSquares-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSchemes
index 403ed5bea0..e293fef286 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-linear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSchemes
index 3288de95a5..5d30d88b65 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-Gauss-pointLinear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSchemes
index 86576678ff..0b36eb9a75 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-iterativeGauss-linear-5-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSchemes
index 08da24c510..eb6f2df5d3 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/faceMDLimited-leastSquares-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSchemes
index 80e3135710..f19260557f 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-1/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSchemes
index cc6eee0e65..0070783bdb 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-10/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSchemes
index 55a6f55f14..58299025c9 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-2/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSchemes
index de208b4cff..d21648702f 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-20/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSchemes
index 1473df45ad..eab5602ed5 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-3/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSchemes
index 33ba14ba16..a809f68be4 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-4/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSchemes
index 834154bcb3..206f7e0f1f 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/iterativeGauss-linear-5/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSchemes b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSchemes
index 8ecd4c7673..c446033ac1 100644
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSchemes
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/leastSquares/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/DT b/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/DT
index 8e39732ce4..f3be3eed33 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/DT
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/DT
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/T b/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/T
index 636d0f19d6..8fc44ac0eb 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/T
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/constant/transportProperties b/tutorials/verificationAndValidation/schemes/weightedFluxExample/constant/transportProperties
index 97225007c2..64b2c48071 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/constant/transportProperties
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict
index 63a24a7ed5..5b3fda412e 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template
index 497aa3590b..5c2b10f7eb 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template
index 0a8354e9d7..8055f0b064 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution
index f428b074ca..1a7635ce3d 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict
index be4ec0619b..e29f2339cc 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph
index dd7d392de9..459c3ddb95 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/R b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/R
index eafa107957..e59a10852b 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/R
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/R
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/epsilon b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/epsilon
index f4bc3799a0..16c4dd689b 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/epsilon
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/f b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/f
index a4bea0c626..815c8531a0 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/f
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/f
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/k b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/k
index 42a6506405..7f957f2ae9 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/k
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/constant/turbulenceProperties b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/constant/turbulenceProperties
index 4bf499b336..19dcd2942d 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/system/setTurbulenceFieldsDict b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/system/setTurbulenceFieldsDict
index 76463d2483..b1dfbf424a 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/system/setTurbulenceFieldsDict
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM.setTurbulenceFields/system/setTurbulenceFieldsDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/R b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/R
index eafa107957..e59a10852b 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/R
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/R
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/epsilon b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/epsilon
index f4bc3799a0..16c4dd689b 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/epsilon
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/f b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/f
index a4bea0c626..815c8531a0 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/f
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/f
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/k b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/k
index 42a6506405..7f957f2ae9 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/k
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/constant/turbulenceProperties b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/constant/turbulenceProperties
index 4bf499b336..19dcd2942d 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/EBRSM/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/U b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/U
index e981824c3a..26dc3ab388 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/U
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/nut
index 7c076d215a..79b9c1ff4d 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/p b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/p
index 75e7eb782b..2feeaca9db 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/p
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/fvOptions b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/fvOptions
index f909fe80c9..9bb7523bc2 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/fvOptions
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/fvOptions
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/transportProperties
index 876a5b38ac..d67c07005e 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/blockMeshDict
index e0197fac70..1a79c41896 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/decomposeParDict
index 4959258e64..d4ee2ebf7a 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSchemes
index e9eed2061d..d22734cf28 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSolution
index 061844a913..1cd29b1e46 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleEpsilon b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleEpsilon
index faff17fca6..ba3bbfdf93 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleEpsilon
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleEpsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleF b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleF
index 9c68e5cea2..a43c9e73cc 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleF
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleF
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleG b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleG
index 827288e726..f1a45621db 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleG
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleG
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleK b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleK
index b4d69bc8f8..56ac4ed9c8 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleK
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleK
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleR b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleR
index 721c089416..9df153da0a 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleR
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleR
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleU b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleU
index c9a6f37561..2fecca375c 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleU
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/common/system/sampleU
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/k b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/k
index 42a6506405..7f957f2ae9 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/k
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/omega b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/omega
index 03c5ad28cd..601546479a 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/omega
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/0.orig/omega
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/constant/turbulenceProperties b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/constant/turbulenceProperties
index 5c4d41c009..ec827fb717 100644
--- a/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/turbulenceModels/planeChannel/setups.orig/kOmegaSST/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/T b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/T
index 033e382359..49f6aeab00 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/T
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/U b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/U
index 8cd70c9e5d..cb90a07b78 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/U
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFSEM/0.orig/U b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFSEM/0.orig/U
index 79dcb891d5..8ad5c184fe 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFSEM/0.orig/U
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/DFSEM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/T b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/T
index 8b4192942f..32d7528ae9 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/T
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/U b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/U
index 62cb26cb5d..3bf9ad242f 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/U
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/FSM/0.orig/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/T b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/T
index 93e88f1c7b..ff82c32abd 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/T
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/nut b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/nut
index a2b0a2710d..6c0294a8de 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/nut
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/nut
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/p b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/p
index b9a1b287a7..5c2a6a3c05 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/p
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/0.orig/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/transportProperties b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/transportProperties
index 2f5086bdd3..1603012596 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/transportProperties
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/turbulenceProperties b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/turbulenceProperties
index add5ea5c84..0cc5dec26d 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/turbulenceProperties
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/blockMeshDict b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/blockMeshDict
index 994025df9b..060341ce14 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/controlDict
index 772fafa6f1..941d395014 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/decomposeParDict b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/decomposeParDict
index ebc60f5459..556a2f47fb 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/decomposeParDict
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSchemes b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSchemes
index 766103e488..5d86923699 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSchemes
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSolution b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSolution
index 7882fdf2a5..91710fe3e5 100644
--- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSolution
+++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

From fbf00d6bf2893511d97e65fe048967938edae59e Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 26 Jun 2023 22:07:57 +0100
Subject: [PATCH 348/348] RELEASE: Updated version to v2306

---
 etc/bashrc | 2 +-
 etc/cshrc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index 02d084f060..857ffaa370 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -55,7 +55,7 @@
 
 # [WM_PROJECT_VERSION] - A human-readable version name
 # A development version is often named 'com' - as in www.openfoam.com
-export WM_PROJECT_VERSION=com
+export WM_PROJECT_VERSION=v2306
 
 #------------------------------------------------------------------------------
 # Configuration environment variables.
diff --git a/etc/cshrc b/etc/cshrc
index 7f19beec7b..b294d99e79 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -55,7 +55,7 @@
 
 # [WM_PROJECT_VERSION] - A human-readable version name
 # A development version is often named 'com' - as in www.openfoam.com
-setenv WM_PROJECT_VERSION com
+setenv WM_PROJECT_VERSION v2306
 
 #------------------------------------------------------------------------------
 # Configuration environment variables.